cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject [3/4] git commit: updated refs/heads/master to 7fa62a5
Date Sat, 12 Dec 2015 10:31:30 GMT
CLOUDSTACK-9135 - Makes test compliant with Redundant VPCs


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/43ce049d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/43ce049d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/43ce049d

Branch: refs/heads/master
Commit: 43ce049d43ce7aa0e4d25b0630cbcd1c423156b9
Parents: 590af14
Author: Wilder Rodrigues <wrodrigues@schubergphilis.com>
Authored: Fri Dec 11 15:03:50 2015 +0100
Committer: Wilder Rodrigues <wrodrigues@schubergphilis.com>
Committed: Fri Dec 11 15:03:50 2015 +0100

----------------------------------------------------------------------
 test/integration/smoke/test_internal_lb.py | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/43ce049d/test/integration/smoke/test_internal_lb.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_internal_lb.py b/test/integration/smoke/test_internal_lb.py
index 7f03eb1..c4be42b 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",


Mime
View raw message