From 43ce049d43ce7aa0e4d25b0630cbcd1c423156b9 Mon Sep 17 00:00:00 2001 From: Wilder Rodrigues Date: Fri, 11 Dec 2015 15:03:50 +0100 Subject: [PATCH] CLOUDSTACK-9135 - Makes test compliant with Redundant VPCs --- test/integration/smoke/test_internal_lb.py | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/test/integration/smoke/test_internal_lb.py b/test/integration/smoke/test_internal_lb.py index 7f03eb1a1d5..c4be42b6702 100644 --- a/test/integration/smoke/test_internal_lb.py +++ b/test/integration/smoke/test_internal_lb.py @@ -137,8 +137,8 @@ class Services: "Dhcp": 'VpcVirtualRouter', "Dns": 'VpcVirtualRouter', "SourceNat": 'VpcVirtualRouter', + "Lb" : ["InternalLbVm", "VpcVirtualRouter"], "PortForwarding": 'VpcVirtualRouter', - "Lb": 'VpcVirtualRouter', "UserData": 'VpcVirtualRouter', "StaticNat": 'VpcVirtualRouter', "NetworkACL": 'VpcVirtualRouter' @@ -146,14 +146,24 @@ class Services: "serviceCapabilityList": { "SourceNat": { "RedundantRouter": 'true' - } + }, }, }, "vpc_offering": { "name": "VPC off", "displaytext": "VPC off", - "supportedservices": - "Dhcp,Dns,SourceNat,PortForwarding,Vpn,Lb,UserData,StaticNat,NetworkACL" + "supportedservices": "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": { "name": "TestVPC",