From 234db0561ffd7499f1237fb5b7428c0b6fc51601 Mon Sep 17 00:00:00 2001 From: Girish Shilamkar Date: Wed, 17 Jul 2013 00:39:18 -0400 Subject: [PATCH] CLOUDSTACK-3586: Fixed regression test cases for Affinity Groups Signed-off-by: Prasanna Santhanam --- test/integration/component/test_affinity_groups.py | 4 ++-- tools/marvin/marvin/integration/lib/base.py | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/test/integration/component/test_affinity_groups.py b/test/integration/component/test_affinity_groups.py index 44bf90c26dd..be93827d3f0 100644 --- a/test/integration/component/test_affinity_groups.py +++ b/test/integration/component/test_affinity_groups.py @@ -1078,7 +1078,7 @@ class TestDeployVMAffinityGroups(cloudstackTestCase): templateid=self.template.id, serviceofferingid=self.service_offering.id, affinitygroupnames=ag_list, - affinitygroupids=ag_ids + affinitygroupids=ag_ids ) self.debug('Created VM=%s in Affinity Group=%s' % (vm.id, ag_list)) @@ -1114,7 +1114,7 @@ class TestDeployVMAffinityGroups(cloudstackTestCase): """ self.create_aff_grp(aff_grp=self.services["host_anti_affinity_0"]) - vm1, hostid1 = self.create_vm_in_aff_grps([self.aff_grp[0].name]) + vm1, hostid1 = self.create_vm_in_aff_grps(ag_list=[self.aff_grp[0].name]) vm1.delete(self.api_client) wait_for_cleanup(self.apiclient, ["expunge.delay", "expunge.interval"]) diff --git a/tools/marvin/marvin/integration/lib/base.py b/tools/marvin/marvin/integration/lib/base.py index bc8c603ac53..161d03c0522 100755 --- a/tools/marvin/marvin/integration/lib/base.py +++ b/tools/marvin/marvin/integration/lib/base.py @@ -237,7 +237,7 @@ class VirtualMachine: def create(cls, apiclient, services, templateid=None, accountid=None, domainid=None, zoneid=None, networkids=None, serviceofferingid=None, securitygroupids=None, projectid=None, startvm=None, - diskofferingid=None, affinitygroupnames=None, group=None, + diskofferingid=None, affinitygroupnames=None, affinitygroupids=None, group=None, hostid=None, keypair=None, mode='basic', method='GET'): """Create the instance""" @@ -299,6 +299,9 @@ class VirtualMachine: elif affinitygroupnames: cmd.affinitygroupnames = affinitygroupnames + if affinitygroupids: + cmd.affinitygroupids = affinitygroupids + if projectid: cmd.projectid = projectid @@ -2988,7 +2991,7 @@ class AffinityGroup: if name is not None: cmd.name = name if account is not None: - cmd.account = account + cmd.accountname = account if domainid is not None: cmd.domaindid = domainid