refactor the monitor

[doctor.git] / tests / main.py

diff --git a/tests/main.py b/tests/main.py
index 45683d1..6644b54 100644 (file)
--- a/tests/main.py
+++ b/tests/main.py
@@ -14,9 +14,12 @@ from alarm import Alarm
 import config
 from image import Image
 from instance import Instance
+from inspector import get_inspector
 import logger as doctor_log
 from user import User
 from network import Network
+from monitor import get_monitor
+
 
 LOG = doctor_log.Logger('doctor').getLogger()
 
@@ -30,6 +33,10 @@ class DoctorTest(object):
         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)
+        self.monitor = get_monitor(self.conf,
+                                   self.inspector.get_inspector_url(),
+                                   LOG)
 
     def setup(self):
         # prepare the cloud env
@@ -49,6 +56,10 @@ class DoctorTest(object):
         # creating alarm...
         self.alarm.create()
 
+        # starting doctor sample components...
+        self.inspector.start()
+        self.monitor.start()
+
     def run(self):
         """run doctor test"""
         try:
@@ -72,11 +83,13 @@ class DoctorTest(object):
         self.network.delete()
         self.image.delete()
         self.user.delete()
+        self.inspector.stop()
+        self.monitor.stop()
 
 
 def main():
     """doctor main"""
-    doctor_root_dir = os.path.dirname(os.getcwd())
+    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))]