Code Review
/
doctor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "fix some bugs for python verify jobs:"
[doctor.git]
/
tests
/
main.py
diff --git
a/tests/main.py
b/tests/main.py
index
50e0821
..
797e28b
100644
(file)
--- a/
tests/main.py
+++ b/
tests/main.py
@@
-6,12
+6,18
@@
# which accompanies this distribution, and is available at
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
# which accompanies this distribution, and is available at
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
+import os
+from os.path import isfile, join
import sys
import sys
+from alarm import Alarm
import config
from image import Image
import config
from image import Image
+from instance import Instance
+from inspector import get_inspector
import logger as doctor_log
import logger as doctor_log
-
+from user import User
+from network import Network
LOG = doctor_log.Logger('doctor').getLogger()
LOG = doctor_log.Logger('doctor').getLogger()
@@
-20,38
+26,69
@@
class DoctorTest(object):
def __init__(self, conf):
self.conf = conf
def __init__(self, conf):
self.conf = conf
- self.image = Image(self.conf)
+ self.image = Image(self.conf, LOG)
+ self.user = User(self.conf, LOG)
+ self.network = Network(self.conf, LOG)
+ self.instance = Instance(self.conf, LOG)
+ self.alarm = Alarm(self.conf, LOG)
+ self.inspector = get_inspector(self.conf, LOG)
- def run(self):
- """run doctor test"""
- try:
- LOG.info('doctor test starting.......')
- # prepare the cloud env
+ def setup(self):
+ # prepare the cloud env
+
+ # preparing VM image...
+ self.image.create()
+
+ # creating test user...
+ self.user.create()
+ self.user.update_quota()
- # preparing VM image...
- self.image.create()
+ # creating VM...
+ self.network.create()
+ self.instance.create()
+ self.instance.wait_for_vm_launch()
- # creating test user...
+ # creating alarm...
+ self.alarm.create()
- # creating VM...
+ # starting doctor sample components...
+ self.inspector.start()
- # creating alarm...
+ def run(self):
+ """run doctor test"""
+ try:
+ LOG.info('doctor test starting.......')
- # starting doctor sample components...
+ self.setup()
# injecting host failure...
# verify the test results
# injecting host failure...
# verify the test results
+
except Exception as e:
LOG.error('doctor test failed, Exception=%s' % e)
sys.exit(1)
finally:
except Exception as e:
LOG.error('doctor test failed, Exception=%s' % e)
sys.exit(1)
finally:
- self.image.delete()
+ self.cleanup()
+
+ def cleanup(self):
+ self.alarm.delete()
+ self.instance.delete()
+ self.network.delete()
+ self.image.delete()
+ self.user.delete()
+ self.inspector.stop()
def main():
"""doctor main"""
def main():
"""doctor main"""
- conf = config.prepare_conf()
+ doctor_root_dir = os.path.dirname(sys.path[0])
+ config_file_dir = '{0}/{1}'.format(doctor_root_dir, 'etc/')
+ config_files = [join(config_file_dir, f) for f in os.listdir(config_file_dir)
+ if isfile(join(config_file_dir, f))]
+
+ conf = config.prepare_conf(args=sys.argv[1:],
+ config_files=config_files)
doctor = DoctorTest(conf)
doctor.run()
doctor = DoctorTest(conf)
doctor.run()