etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed issues in regression suite project cpu limits 

Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
This commit is contained in:
Gaurav Aradhye 2014-05-21 03:56:42 -07:00 committed by Abhinandan Prateek
parent 7dc0fca2e9
commit c3c8096476
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/integration/component/test_cpu_project_limits.py
View File

@ -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")

6
tools/marvin/marvin/lib/base.py
View File

@ -578,7 +578,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])