mirror of https://github.com/apache/cloudstack.git
serviceCapabilityList is case sensitive
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
This commit is contained in:
parent
6e63bb7822
commit
24258648bf
|
|
@ -104,7 +104,7 @@ class Services:
|
|||
"UserData": 'VirtualRouter',
|
||||
"StaticNat": 'VirtualRouter',
|
||||
},
|
||||
"servicecapabilitylist": {
|
||||
"serviceCapabilityList": {
|
||||
"SourceNat": {
|
||||
"SupportedSourceNatTypes": "peraccount"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -93,7 +93,7 @@ class Services:
|
|||
"UserData": 'VirtualRouter',
|
||||
"StaticNat": 'VirtualRouter',
|
||||
},
|
||||
"servicecapabilitylist": {
|
||||
"serviceCapabilityList": {
|
||||
"SourceNat": {
|
||||
"SupportedSourceNatTypes": "peraccount"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -117,7 +117,7 @@ class Services:
|
|||
"UserData": 'VirtualRouter',
|
||||
"StaticNat": 'VirtualRouter',
|
||||
},
|
||||
"servicecapabilitylist": {
|
||||
"serviceCapabilityList": {
|
||||
"SourceNat": {
|
||||
"SupportedSourceNatTypes": "peraccount"
|
||||
},
|
||||
|
|
@ -157,11 +157,10 @@ class Services:
|
|||
"publicport": 22,
|
||||
"openfirewall": False,
|
||||
},
|
||||
"ostypeid": '01853327-513e-4508-9628-f1f55db1946f',
|
||||
"ostype": 'Cent OS 5.3 (64 bit)',
|
||||
# Cent OS 5.3 (64 bit)
|
||||
"sleep": 60,
|
||||
"timeout": 10,
|
||||
"mode": 'advanced'
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -752,7 +752,7 @@ class TestVPCNetwork(cloudstackTestCase):
|
|||
self.validate_vpc_network(vpc)
|
||||
|
||||
# Enable redundant router capability for the network offering
|
||||
self.services["network"]["servicecapabilitylist"] = {
|
||||
self.services["network"]["serviceCapabilityList"] = {
|
||||
"SourceNat": {
|
||||
"RedundantRouter": "true",
|
||||
},
|
||||
|
|
|
|||
|
|
@ -87,8 +87,6 @@ class Services:
|
|||
"StaticNat": 'VpcVirtualRouter',
|
||||
"NetworkACL": 'VpcVirtualRouter'
|
||||
},
|
||||
"servicecapabilitylist": {
|
||||
},
|
||||
},
|
||||
"network_offering_no_lb": {
|
||||
"name": 'VPC Network offering',
|
||||
|
|
@ -176,7 +174,6 @@ class Services:
|
|||
"ostype": 'CentOS 5.3 (64-bit)',
|
||||
"sleep": 60,
|
||||
"timeout": 10,
|
||||
"mode": 'advanced'
|
||||
}
|
||||
|
||||
class TestVPCNetworkLBRules(cloudstackTestCase):
|
||||
|
|
|
|||
|
|
@ -84,8 +84,6 @@ class Services:
|
|||
"StaticNat": 'VpcVirtualRouter',
|
||||
"NetworkACL": 'VpcVirtualRouter'
|
||||
},
|
||||
"servicecapabilitylist": {
|
||||
},
|
||||
},
|
||||
"network_offering_no_lb": {
|
||||
"name": 'VPC Network offering',
|
||||
|
|
@ -175,7 +173,6 @@ class Services:
|
|||
"ostype": 'CentOS 5.3 (64-bit)',
|
||||
"sleep": 60,
|
||||
"timeout": 10,
|
||||
"mode": 'advanced'
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -83,8 +83,6 @@ class Services:
|
|||
"StaticNat": 'VpcVirtualRouter',
|
||||
"NetworkACL": 'VpcVirtualRouter'
|
||||
},
|
||||
"servicecapabilitylist": {
|
||||
},
|
||||
},
|
||||
"network_offering_no_lb": {
|
||||
"name": 'VPC Network offering',
|
||||
|
|
@ -174,7 +172,6 @@ class Services:
|
|||
"ostype": 'CentOS 5.3 (64-bit)',
|
||||
"sleep": 60,
|
||||
"timeout": 10,
|
||||
"mode": 'advanced'
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue