CLOUDSTACK-7978 : Fixed the script 'test_egress_rules.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/b81cf5ea Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b81cf5ea Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b81cf5ea Branch: refs/heads/useraccount-refactoring Commit: b81cf5eab19a00b12c2c39c105442f8c12d5cd82 Parents: 960b7bb Author: Chandan Purushothama <chandan.purushoth...@citrix.com> Authored: Wed Nov 26 16:06:26 2014 -0800 Committer: Sangeetha Hariharan <sangeetha.hariha...@citrix.com> Committed: Wed Nov 26 19:32:46 2014 -0800 ---------------------------------------------------------------------- test/integration/component/test_egress_rules.py | 21 +++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b81cf5ea/test/integration/component/test_egress_rules.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_egress_rules.py b/test/integration/component/test_egress_rules.py index 0f05c07..138c765 100644 --- a/test/integration/component/test_egress_rules.py +++ b/test/integration/component/test_egress_rules.py @@ -412,7 +412,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 @@ -586,7 +587,8 @@ class TestDefaultGroupEgress(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) @@ -766,7 +768,8 @@ class TestDefaultGroupEgressAfterDeploy(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) @@ -982,7 +985,8 @@ class TestRevokeEgressRule(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) @@ -1379,7 +1383,8 @@ class TestMultipleAccountsEgressRuleNeg(cloudstackTestCase): accountid=self.accountA.name, domainid=self.accountA.domainid, serviceofferingid=self.service_offering.id, - securitygroupids=[security_group.id] + securitygroupids=[security_group.id], + mode=self.services['mode'] ) self.cleanup.append(self.virtual_machineA) self.debug("Deploying VM in account: %s" % self.accountA.name) @@ -1650,7 +1655,8 @@ class TestMultipleAccountsEgressRule(cloudstackTestCase): accountid=self.accountA.name, domainid=self.accountA.domainid, serviceofferingid=self.service_offering.id, - securitygroupids=[security_groupA.id] + securitygroupids=[security_groupA.id], + mode=self.services['mode'] ) self.cleanup.append(self.virtual_machineA) self.debug("Deploying VM in account: %s" % self.accountA.name) @@ -1880,7 +1886,8 @@ class TestStartStopVMWithEgressRule(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)