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:57 UTC

[48/50] [abbrv] git commit: updated refs/heads/master to d893cb4

CLOUDSTACK-3643: Automation: Fix wrong network acl rule for ping


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

Branch: refs/heads/master
Commit: 982c0b5dfb41b90ba5ee7f2c478f26384e89c316
Parents: 2df1d7f
Author: Sheng Yang <sh...@citrix.com>
Authored: Sun Jul 21 19:40:10 2013 -0700
Committer: Sheng Yang <sh...@citrix.com>
Committed: Sun Jul 21 22:24:03 2013 -0700

----------------------------------------------------------------------
 test/integration/component/test_vpc.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/982c0b5d/test/integration/component/test_vpc.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc.py b/test/integration/component/test_vpc.py
index c503be8..3a661d5 100644
--- a/test/integration/component/test_vpc.py
+++ b/test/integration/component/test_vpc.py
@@ -143,11 +143,11 @@ 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": "TCP"
+                                    "protocol": "ICMP"
                                 },
                          "virtual_machine": {
                                     "displayname": "Test VM",
@@ -1066,13 +1066,13 @@ class TestVPC(cloudstackTestCase):
         nwacl_internet_1 = NetworkACL.create(
                                 self.apiclient,
                                 networkid=network_1.id,
-                                services=self.services["http_rule"],
+                                services=self.services["icmp_rule"],
                                 traffictype='Egress'
                                 )
         nwacl_internet_2 = NetworkACL.create(
                                 self.apiclient,
                                 networkid=network_2.id,
-                                services=self.services["http_rule"],
+                                services=self.services["icmp_rule"],
                                 traffictype='Egress'
                                 )
 
@@ -1411,13 +1411,13 @@ class TestVPC(cloudstackTestCase):
         nwacl_internet_1 = NetworkACL.create(
                                 self.apiclient,
                                 networkid=network_1.id,
-                                services=self.services["http_rule"],
+                                services=self.services["icmp_rule"],
                                 traffictype='Egress'
                                 )
         nwacl_internet_2 = NetworkACL.create(
                                 self.apiclient,
                                 networkid=network_2.id,
-                                services=self.services["http_rule"],
+                                services=self.services["icmp_rule"],
                                 traffictype='Egress'
                                 )