You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2014/11/28 19:03:55 UTC

[41/51] [abbrv] git commit: updated refs/heads/useraccount-refactoring to 1e25886

CLOUDSTACK-7979 : Fixed the script 'test_security_groups.py' - Zone Network Type Information should to be passed to VirtualMachine create method


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

Branch: refs/heads/useraccount-refactoring
Commit: 4f8799315f71e30ce9edf1e10b39d1bb433ae36b
Parents: b81cf5e
Author: Chandan Purushothama <Ch...@citrix.com>
Authored: Wed Nov 26 16:12:12 2014 -0800
Committer: Sangeetha Hariharan <sa...@citrix.com>
Committed: Wed Nov 26 19:33:06 2014 -0800

----------------------------------------------------------------------
 .../component/test_security_groups.py           | 21 +++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4f879931/test/integration/component/test_security_groups.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_security_groups.py b/test/integration/component/test_security_groups.py
index 89317f4..eb242c7 100644
--- a/test/integration/component/test_security_groups.py
+++ b/test/integration/component/test_security_groups.py
@@ -502,7 +502,8 @@ class TestAuthorizeIngressRule(cloudstackTestCase):
                                     accountid=self.account.name,
                                     domainid=self.account.domainid,
                                     serviceofferingid=self.service_offering.id,
-                                    securitygroupids=[security_group.id]
+                                    securitygroupids=[security_group.id],
+                                    mode=self.services['mode']
                                 )
         self.debug("Deploying VM in account: %s" % self.account.name)
         # Should be able to SSH VM
@@ -643,7 +644,8 @@ class TestRevokeIngressRule(cloudstackTestCase):
                                     accountid=self.account.name,
                                     domainid=self.account.domainid,
                                     serviceofferingid=self.service_offering.id,
-                                    securitygroupids=[security_group.id]
+                                    securitygroupids=[security_group.id],
+                                    mode=self.services['mode']
                                 )
         self.debug("Deploying VM in account: %s" % self.account.name)
 
@@ -729,7 +731,8 @@ class TestDhcpOnlyRouter(cloudstackTestCase):
                                     cls.services["virtual_machine"],
                                     accountid=cls.account.name,
                                     domainid=cls.account.domainid,
-                                    serviceofferingid=cls.service_offering.id
+                                    serviceofferingid=cls.service_offering.id,
+                                    mode=cls.services['mode']
                                 )
         cls._cleanup = [
                         cls.account,
@@ -955,7 +958,8 @@ class TestdeployVMWithUserData(cloudstackTestCase):
                                     accountid=self.account.name,
                                     domainid=self.account.domainid,
                                     serviceofferingid=self.service_offering.id,
-                                    securitygroupids=[security_group.id]
+                                    securitygroupids=[security_group.id],
+                                    mode=self.services['mode']
                                 )
         self.debug("Deploying VM in account: %s" % self.account.name)
         # Should be able to SSH VM
@@ -1348,7 +1352,8 @@ class TestIngressRule(cloudstackTestCase):
                                     accountid=self.account.name,
                                     domainid=self.account.domainid,
                                     serviceofferingid=self.service_offering.id,
-                                    securitygroupids=[security_group.id]
+                                    securitygroupids=[security_group.id],
+                                    mode=self.services['mode']
                                 )
         self.debug("Deploying VM in account: %s" % self.account.name)
 
@@ -1466,7 +1471,8 @@ class TestIngressRule(cloudstackTestCase):
                                     accountid=self.account.name,
                                     domainid=self.account.domainid,
                                     serviceofferingid=self.service_offering.id,
-                                    securitygroupids=[security_group.id]
+                                    securitygroupids=[security_group.id],
+                                    mode=self.services['mode']
                                 )
         self.debug("Deploying VM in account: %s" % self.account.name)
 
@@ -1619,7 +1625,8 @@ class TestIngressRule(cloudstackTestCase):
                                     accountid=self.account.name,
                                     domainid=self.account.domainid,
                                     serviceofferingid=self.service_offering.id,
-                                    securitygroupids=[security_group.id]
+                                    securitygroupids=[security_group.id],
+                                    mode=self.services['mode']
                                 )
         self.debug("Deploying VM in account: %s" % self.account.name)