You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ya...@apache.org on 2013/07/22 07:37:58 UTC
[49/50] [abbrv] git commit: updated refs/heads/master to d893cb4
CLOUDSTACK-3643: Automation: Fix test_vpc_network.py
1. Port 80 won't help on ICMP
2. RvR doesn't support VPC now.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a102853f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a102853f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a102853f
Branch: refs/heads/master
Commit: a102853fb9cf7a74fccf80f1ea42513f11316d8e
Parents: 982c0b5
Author: Sheng Yang <sh...@citrix.com>
Authored: Sun Jul 21 20:11:16 2013 -0700
Committer: Sheng Yang <sh...@citrix.com>
Committed: Sun Jul 21 22:24:10 2013 -0700
----------------------------------------------------------------------
test/integration/component/test_vpc_network.py | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a102853f/test/integration/component/test_vpc_network.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc_network.py b/test/integration/component/test_vpc_network.py
index d76996a..477c79e 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 = [