You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ts...@apache.org on 2013/07/17 15:58:17 UTC
[3/4] git commit: updated refs/heads/master to 22cb5be
CLOUDSTACK-3586: Fixed regression test cases for Affinity Groups
Signed-off-by: Prasanna Santhanam <ts...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/234db056
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/234db056
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/234db056
Branch: refs/heads/master
Commit: 234db0561ffd7499f1237fb5b7428c0b6fc51601
Parents: 9f9510b
Author: Girish Shilamkar <gi...@clogeny.com>
Authored: Wed Jul 17 00:39:18 2013 -0400
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Wed Jul 17 19:23:58 2013 +0530
----------------------------------------------------------------------
test/integration/component/test_affinity_groups.py | 4 ++--
tools/marvin/marvin/integration/lib/base.py | 7 +++++--
2 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/234db056/test/integration/component/test_affinity_groups.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_affinity_groups.py b/test/integration/component/test_affinity_groups.py
index 44bf90c..be93827 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"])
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/234db056/tools/marvin/marvin/integration/lib/base.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base.py b/tools/marvin/marvin/integration/lib/base.py
index bc8c603..161d03c 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