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

pep8'ed the file

This commit is contained in:
Daan Hoogland 2013-06-20 15:55:45 +02:00 committed by Sebastien Goasguen
parent d08a6a4e7b
commit e8f0b2a48b
1 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
tools/marvin/marvin/testSetupSuccess.py
View File

@ -5,9 +5,9 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
#
# http://www.apache.org/licenses/LICENSE-2.0
#
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@ -21,6 +21,7 @@ from marvin.cloudstackTestCase import *
from marvin.cloudstackAPI import *
from time import sleep as delay
class TestSetupSuccess(cloudstackTestCase):
"""
Test to verify if the cloudstack is ready to launch tests upon
@ -29,12 +30,13 @@ class TestSetupSuccess(cloudstackTestCase):
"""
@classmethod
def setUpClass(cls):
cls.apiClient = super(TestSetupSuccess, cls).getClsTestClient().getApiClient()
testClient = super(TestSetupSuccess, cls).getClsTestClient()
cls.apiClient = testClient.getApiClient()
zones = listZones.listZonesCmd()
cls.zones_list = cls.apiClient.listZones(zones)
cls.retry = 2
def test_systemVmReady(self):
"""
system VMs need to be ready and Running for each zone in cloudstack
@ -42,19 +44,23 @@ class TestSetupSuccess(cloudstackTestCase):
for z in self.zones_list:
retry = self.retry
while retry != 0:
self.debug("looking for system VMs in zone: %s, %s"%(z.id, z.name))
self.debug("looking for system VMs in zone: %s, %s" %
(z.id, z.name))
sysvms = listSystemVms.listSystemVmsCmd()
sysvms.zoneid = z.id
sysvms.state = 'Running'
sysvms_list = self.apiClient.listSystemVms(sysvms)
if sysvms_list is not None and len(sysvms_list) == 2:
assert len(sysvms_list) == 2
self.debug("found %d system VMs running {%s}"%(len(sysvms_list), sysvms_list))
self.debug("found %d system VMs running {%s}" %
(len(sysvms_list), sysvms_list))
break
retry = retry - 1
delay(60) #wait a minute for retry
self.assertNotEqual(retry, 0, "system VMs not Running in zone %s"%z.name)
delay(60) # wait a minute for retry
self.assertNotEqual(retry, 0,
"system VMs not Running in zone %s" %
z.name)
def test_templateBuiltInReady(self):
"""
built-in templates CentOS to be ready
@ -68,13 +74,19 @@ class TestSetupSuccess(cloudstackTestCase):
templates.listall = 'true'
templates_list = self.apiClient.listTemplates(templates)
if templates_list is not None:
builtins = [tmpl for tmpl in templates_list if tmpl.templatetype == 'BUILTIN' and tmpl.isready == True]
builtins = [tmpl
for tmpl in templates_list
if tmpl.templatetype == 'BUILTIN'
and tmpl.isready]
if len(builtins) > 0:
self.debug("Found %d builtins ready for use %s"%(len(builtins), builtins))
self.debug("Found %d builtins ready for use %s" %
(len(builtins), builtins))
break
retry = retry - 1
delay(60) #wait a minute for retry
self.assertNotEqual(retry, 0, "builtIn templates not ready in zone %s"%z.name)
delay(60) # wait a minute for retry
self.assertNotEqual(retry, 0,
"builtIn templates not ready in zone %s" %
z.name)
def test_deployVmWithBuiltIn(self):
"""