apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-3586: Fixed regression test cases for Affinity Groups

Browse Source 
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
This commit is contained in:
Girish Shilamkar 2013-07-17 00:39:18 -04:00 committed by Prasanna Santhanam
parent 9f9510be91
commit 234db0561f
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/integration/component/test_affinity_groups.py
View File

@ -1078,7 +1078,7 @@ class TestDeployVMAffinityGroups(cloudstackTestCase):
templateid=self.template.id, templateid=self.template.id,
serviceofferingid=self.service_offering.id, serviceofferingid=self.service_offering.id,
affinitygroupnames=ag_list, affinitygroupnames=ag_list,
affinitygroupids=ag_ids affinitygroupids=ag_ids
) )
self.debug('Created VM=%s in Affinity Group=%s' % self.debug('Created VM=%s in Affinity Group=%s' %
(vm.id, ag_list)) (vm.id, ag_list))
@ -1114,7 +1114,7 @@ class TestDeployVMAffinityGroups(cloudstackTestCase):
""" """
self.create_aff_grp(aff_grp=self.services["host_anti_affinity_0"]) 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) vm1.delete(self.api_client)
wait_for_cleanup(self.apiclient, ["expunge.delay", "expunge.interval"]) wait_for_cleanup(self.apiclient, ["expunge.delay", "expunge.interval"])

7
tools/marvin/marvin/integration/lib/base.py
View File

@ -237,7 +237,7 @@ class VirtualMachine:
def create(cls, apiclient, services, templateid=None, accountid=None, def create(cls, apiclient, services, templateid=None, accountid=None,
domainid=None, zoneid=None, networkids=None, serviceofferingid=None, domainid=None, zoneid=None, networkids=None, serviceofferingid=None,
securitygroupids=None, projectid=None, startvm=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'): hostid=None, keypair=None, mode='basic', method='GET'):
"""Create the instance""" """Create the instance"""
@ -299,6 +299,9 @@ class VirtualMachine:
elif affinitygroupnames: elif affinitygroupnames:
cmd.affinitygroupnames = affinitygroupnames cmd.affinitygroupnames = affinitygroupnames
if affinitygroupids:
cmd.affinitygroupids = affinitygroupids
if projectid: if projectid:
cmd.projectid = projectid cmd.projectid = projectid
@ -2988,7 +2991,7 @@ class AffinityGroup:
if name is not None: if name is not None:
cmd.name = name cmd.name = name
if account is not None: if account is not None:
cmd.account = account cmd.accountname = account
if domainid is not None: if domainid is not None:
cmd.domaindid = domainid cmd.domaindid = domainid