cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject [15/24] git commit: updated refs/heads/4.4 to e33d4a5
Date Mon, 28 Jul 2014 15:44:42 GMT
Fixed issues in regression suite project cpu limits

Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
(cherry picked from commit c3c809647667229c4e46096a85dbbf75eec4d005)


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e51a9f13
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e51a9f13
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e51a9f13

Branch: refs/heads/4.4
Commit: e51a9f13205d64755003aa5f7ce782206a026586
Parents: 26f3995
Author: Gaurav Aradhye <gaurav.aradhye@clogeny.com>
Authored: Wed May 21 03:56:42 2014 -0700
Committer: Daan Hoogland <daan@onecht.net>
Committed: Mon Jul 28 17:43:25 2014 +0200

----------------------------------------------------------------------
 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/e51a9f13/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/e51a9f13/tools/marvin/marvin/lib/base.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/lib/base.py b/tools/marvin/marvin/lib/base.py
index b70789f..c7b7083 100644
--- a/tools/marvin/marvin/lib/base.py
+++ b/tools/marvin/marvin/lib/base.py
@@ -551,7 +551,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])


Mime
View raw message