X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2Fmain.py;h=6547835ee6eba23a9f448acaa5b60d6e5ea71316;hb=162c3ae179f69bd326325b135c3831ae12843e49;hp=182680cedf288d9cdb5c312900f9ee8796e75a84;hpb=6b117129e778b4877b17cf594aec57fb029cb83d;p=doctor.git diff --git a/tests/main.py b/tests/main.py index 182680ce..6547835e 100644 --- a/tests/main.py +++ b/tests/main.py @@ -12,12 +12,15 @@ import sys from alarm import Alarm import config +from consumer import get_consumer 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() @@ -32,6 +35,10 @@ class DoctorTest(object): 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) + self.consumer = get_consumer(self.conf, LOG) def setup(self): # prepare the cloud env @@ -53,6 +60,8 @@ class DoctorTest(object): # starting doctor sample components... self.inspector.start() + self.monitor.start() + self.consumer.start() def run(self): """run doctor test""" @@ -78,11 +87,13 @@ class DoctorTest(object): self.image.delete() self.user.delete() self.inspector.stop() + self.monitor.stop() + self.consumer.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))]