From a102853fb9cf7a74fccf80f1ea42513f11316d8e Mon Sep 17 00:00:00 2001 From: Sheng Yang Date: Sun, 21 Jul 2013 20:11:16 -0700 Subject: [PATCH] CLOUDSTACK-3643: Automation: Fix test_vpc_network.py 1. Port 80 won't help on ICMP 2. RvR doesn't support VPC now. --- test/integration/component/test_vpc_network.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/test/integration/component/test_vpc_network.py b/test/integration/component/test_vpc_network.py index d76996ae85b..477c79e58e8 100644 --- a/test/integration/component/test_vpc_network.py +++ b/test/integration/component/test_vpc_network.py @@ -148,9 +148,9 @@ class Services: # Any network (For creating FW rule) "protocol": "TCP" }, - "http_rule": { - "startport": 80, - "endport": 80, + "icmp_rule": { + "icmptype": -1, + "icmpcode": -1, "cidrlist": '0.0.0.0/0', "protocol": "ICMP" }, @@ -690,6 +690,7 @@ class TestVPCNetwork(cloudstackTestCase): self.debug("Network creation failed") return + @unittest.skip("skipped - RvR didn't support VPC currently ") @attr(tags=["advanced", "intervlan"]) def test_06_create_network_with_rvr(self): """ Test create network with redundant router capability @@ -1823,7 +1824,7 @@ class TestVPCNetworkUpgrade(cloudstackTestCase): nwacl_internet_1 = NetworkACL.create( self.apiclient, networkid=network_1.id, - services=self.services["http_rule"], + services=self.services["icmp_rule"], traffictype='Egress' ) @@ -2212,7 +2213,7 @@ class TestVPCNetworkGc(cloudstackTestCase): cls.nwacl_internet_1 = NetworkACL.create( cls.api_client, networkid=cls.network_1.id, - services=cls.services["http_rule"], + services=cls.services["icmp_rule"], traffictype='Egress' ) cls._cleanup = [