X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2Fmain.py;h=46f0c8941edf81b6f01b1d628aeb4dbfe3fe762f;hb=9ae13f88c29d7babea19fb65bef208e631a12be4;hp=e36bb4f0ac6aa411c79c856e4bbbbe6eaeaad4e9;hpb=e3f9edb5064e280056addd6fc47535d3ee1a2435;p=doctor.git

diff --git a/tests/main.py b/tests/main.py
index e36bb4f0..46f0c894 100644
--- a/tests/main.py
+++ b/tests/main.py
@@ -9,38 +9,51 @@
 import sys
 
 import config
+from image import Image
 import logger as doctor_log
+from user import User
 
 
-LOG = doctor_log.Logger(__name__).getLogger()
+LOG = doctor_log.Logger('doctor').getLogger()
 
 
 class DoctorTest(object):
 
     def __init__(self, conf):
         self.conf = conf
+        self.image = Image(self.conf, LOG)
+        self.user = User(self.conf, LOG)
+
+    def setup(self):
+        # prepare the cloud env
+
+        # preparing VM image...
+        self.image.create()
+
+        # creating test user...
+        self.user.create()
+        self.user.update_quota()
 
     def run(self):
         """run doctor test"""
         try:
             LOG.info('doctor test starting.......')
-            # prepare the cloud env
-
-            # preparing VM image...
 
-            # creating test user...
-
-            # creating VM...
-
-            # creating alarm...
-
-            # starting doctor sample components...
+            self.setup()
 
             # injecting host failure...
 
             # verify the test results
+
         except Exception as e:
-            LOG.error('doctor test failed: %s ', e)
+            LOG.error('doctor test failed, Exception=%s' % e)
+            sys.exit(1)
+        finally:
+            self.cleanup()
+
+    def cleanup(self):
+        self.image.delete()
+        self.user.delete()
 
 
 def main():