CLOUDSTACK-9135 - Makes test compliant with Redundant VPCs

This commit is contained in:
Wilder Rodrigues 2015-12-11 15:03:50 +01:00
parent 590af145b0
commit 43ce049d43

View File

@ -137,8 +137,8 @@ class Services:
"Dhcp": 'VpcVirtualRouter', "Dhcp": 'VpcVirtualRouter',
"Dns": 'VpcVirtualRouter', "Dns": 'VpcVirtualRouter',
"SourceNat": 'VpcVirtualRouter', "SourceNat": 'VpcVirtualRouter',
"Lb" : ["InternalLbVm", "VpcVirtualRouter"],
"PortForwarding": 'VpcVirtualRouter', "PortForwarding": 'VpcVirtualRouter',
"Lb": 'VpcVirtualRouter',
"UserData": 'VpcVirtualRouter', "UserData": 'VpcVirtualRouter',
"StaticNat": 'VpcVirtualRouter', "StaticNat": 'VpcVirtualRouter',
"NetworkACL": 'VpcVirtualRouter' "NetworkACL": 'VpcVirtualRouter'
@ -146,14 +146,24 @@ class Services:
"serviceCapabilityList": { "serviceCapabilityList": {
"SourceNat": { "SourceNat": {
"RedundantRouter": 'true' "RedundantRouter": 'true'
} },
}, },
}, },
"vpc_offering": { "vpc_offering": {
"name": "VPC off", "name": "VPC off",
"displaytext": "VPC off", "displaytext": "VPC off",
"supportedservices": "supportedservices": "Dhcp,Dns,SourceNat,PortForwarding,Vpn,Lb,UserData,StaticNat,NetworkACL",
"Dhcp,Dns,SourceNat,PortForwarding,Vpn,Lb,UserData,StaticNat,NetworkACL" "serviceProviderList": {
"Vpn": 'VpcVirtualRouter',
"Dhcp": 'VpcVirtualRouter',
"Dns": 'VpcVirtualRouter',
"SourceNat": 'VpcVirtualRouter',
"Lb" : ["InternalLbVm", "VpcVirtualRouter"],
"PortForwarding": 'VpcVirtualRouter',
"UserData": 'VpcVirtualRouter',
"StaticNat": 'VpcVirtualRouter',
"NetworkACL": 'VpcVirtualRouter'
},
}, },
"vpc": { "vpc": {
"name": "TestVPC", "name": "TestVPC",