You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ap...@apache.org on 2014/05/26 07:23:24 UTC
git commit: updated refs/heads/master to 2218053
Repository: cloudstack
Updated Branches:
refs/heads/master a0ad836fd -> 2218053fb
Fixed issues in regression suite project cpu limits
Signed-off-by: Abhinandan Prateek <ap...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2218053f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2218053f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2218053f
Branch: refs/heads/master
Commit: 2218053fb11d501950e4beb80e9bee4ae472b5b4
Parents: a0ad836
Author: Gaurav Aradhye <ga...@clogeny.com>
Authored: Wed May 21 03:56:42 2014 -0700
Committer: Abhinandan Prateek <ap...@apache.org>
Committed: Mon May 26 10:53:14 2014 +0530
----------------------------------------------------------------------
test/integration/component/test_cpu_project_limits.py | 3 ++-
tools/marvin/marvin/lib/base.py | 6 +++++-
2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2218053f/test/integration/component/test_cpu_project_limits.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_cpu_project_limits.py b/test/integration/component/test_cpu_project_limits.py
index b33b9f1..e795828 100644
--- a/test/integration/component/test_cpu_project_limits.py
+++ b/test/integration/component/test_cpu_project_limits.py
@@ -172,7 +172,8 @@ class TestProjectsCPULimits(cloudstackTestCase):
projectid=project.id,
networkids=networks,
serviceofferingid=service_off.id)
- vms = VirtualMachine.list(api_client, id=self.vm.id, listall=True)
+ vms = VirtualMachine.list(api_client, projectid=project.id,
+ id=self.vm.id, listall=True)
self.assertIsInstance(vms,
list,
"List VMs should return a valid response")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2218053f/tools/marvin/marvin/lib/base.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/lib/base.py b/tools/marvin/marvin/lib/base.py
index a7d62e0..b37ba06 100755
--- a/tools/marvin/marvin/lib/base.py
+++ b/tools/marvin/marvin/lib/base.py
@@ -572,7 +572,11 @@ class VirtualMachine:
while timeout>0:
try:
- vms = VirtualMachine.list(apiclient, id=self.id, listAll=True)
+ projectid = None
+ if hasattr(self, "projectid"):
+ projectid = self.projectid
+ vms = VirtualMachine.list(apiclient, projectid=projectid,
+ id=self.id, listAll=True)
validationresult = validateList(vms)
if validationresult[0] == FAIL:
raise Exception("VM list validation failed: %s" % validationresult[2])