From 4f8799315f71e30ce9edf1e10b39d1bb433ae36b Mon Sep 17 00:00:00 2001 From: Chandan Purushothama Date: Wed, 26 Nov 2014 16:12:12 -0800 Subject: [PATCH] CLOUDSTACK-7979 : Fixed the script 'test_security_groups.py' - Zone Network Type Information should to be passed to VirtualMachine create method --- .../component/test_security_groups.py | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/test/integration/component/test_security_groups.py b/test/integration/component/test_security_groups.py index 89317f43736..eb242c78658 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)