X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=doctor_tests%2Fmain.py;h=cdb4af55611deb354e8aa8177f28d4c3152f3e5f;hb=a0528f67abe01f0bb4be3565cfef4fd049afa1fa;hp=2a8abda765788f819ee68d1743607cf71016560f;hpb=b54cbc5dd2d32fcb27238680b4657ed384d021c5;p=doctor.git

diff --git a/doctor_tests/main.py b/doctor_tests/main.py
index 2a8abda7..cdb4af55 100644
--- a/doctor_tests/main.py
+++ b/doctor_tests/main.py
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright (c) 2017 ZTE Corporation and others.
+# Copyright (c) 2019 ZTE Corporation and others.
 #
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Apache License, Version 2.0
@@ -53,9 +53,10 @@ class DoctorTest(object):
     def test_fault_management(self):
         try:
             LOG.info('doctor fault management test starting.......')
-
+            transport_url = self.installer.get_transport_url()
             self.fault_management = \
-                FaultManagement(self.conf, self.installer, self.user, LOG)
+                FaultManagement(self.conf, self.installer, self.user, LOG,
+                                transport_url)
 
             # prepare test env
             self.fault_management.setup()
@@ -79,6 +80,7 @@ class DoctorTest(object):
         except Exception as e:
             LOG.error('doctor fault management test failed, '
                       'Exception=%s' % e)
+            LOG.error(format_exc())
             sys.exit(1)
         finally:
             self.fault_management.cleanup()
@@ -94,17 +96,26 @@ class DoctorTest(object):
             LOG.info('not enough compute nodes, skipping doctor '
                      'maintenance test')
             return
-        elif self.conf.installer.type != 'apex':
+        elif self.conf.installer.type not in ['apex', 'fuel']:
             LOG.info('not supported installer, skipping doctor '
                      'maintenance test')
             return
         try:
             LOG.info('doctor maintenance test starting.......')
-
-            maintenance = Maintenance(self.conf, LOG)
+            trasport_url = self.installer.get_transport_url()
+            maintenance = Maintenance(trasport_url, self.conf, LOG)
             maintenance.setup_maintenance(self.user)
 
-            # TODO (tojuvone) actual test
+            # wait for aodh alarms are updated in caches for event evaluator,
+            # sleep time should be larger than event_alarm_cache_ttl
+            # (default 60)
+            LOG.info('wait aodh for 120s.......')
+            time.sleep(120)
+
+            session_id = maintenance.start_maintenance()
+            maintenance.wait_maintenance_complete(session_id)
+
+            LOG.info('doctor maintenance complete.......')
 
         except Exception as e:
             LOG.error('doctor maintenance test failed, Exception=%s' % e)
@@ -134,6 +145,7 @@ class DoctorTest(object):
                                     % function)
         except Exception as e:
             LOG.error('doctor test failed, Exception=%s' % e)
+            LOG.error(format_exc())
             sys.exit(1)
         finally:
             self.cleanup()