Code Review
/
doctor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add setup and cleanup for maintenance test
[doctor.git]
/
doctor_tests
/
main.py
diff --git
a/doctor_tests/main.py
b/doctor_tests/main.py
index
61facb6
..
2a8abda
100644
(file)
--- a/
doctor_tests/main.py
+++ b/
doctor_tests/main.py
@@
-10,6
+10,7
@@
import os
from os.path import isfile, join
import sys
import time
from os.path import isfile, join
import sys
import time
+from traceback import format_exc
from doctor_tests import config
from doctor_tests.identity_auth import get_identity_auth
from doctor_tests import config
from doctor_tests.identity_auth import get_identity_auth
@@
-17,8
+18,9
@@
from doctor_tests.identity_auth import get_session
from doctor_tests.image import Image
from doctor_tests.installer import get_installer
import doctor_tests.logger as doctor_log
from doctor_tests.image import Image
from doctor_tests.installer import get_installer
import doctor_tests.logger as doctor_log
-from doctor_tests.os_clients import nova_client
from doctor_tests.scenario.fault_management import FaultManagement
from doctor_tests.scenario.fault_management import FaultManagement
+from doctor_tests.os_clients import nova_client
+from doctor_tests.scenario.maintenance import Maintenance
from doctor_tests.user import User
from doctor_tests.user import User
@@
-67,7
+69,7
@@
class DoctorTest(object):
# injecting host failure...
# NOTE (umar) add INTERFACE_NAME logic to host injection
self.fault_management.start()
# injecting host failure...
# NOTE (umar) add INTERFACE_NAME logic to host injection
self.fault_management.start()
- time.sleep(
1
0)
+ time.sleep(
3
0)
# verify the test results
# NOTE (umar) copy remote monitor.log file when monitor=collectd
# verify the test results
# NOTE (umar) copy remote monitor.log file when monitor=collectd
@@
-92,20
+94,33
@@
class DoctorTest(object):
LOG.info('not enough compute nodes, skipping doctor '
'maintenance test')
return
LOG.info('not enough compute nodes, skipping doctor '
'maintenance test')
return
+ elif self.conf.installer.type != 'apex':
+ LOG.info('not supported installer, skipping doctor '
+ 'maintenance test')
+ return
try:
LOG.info('doctor maintenance test starting.......')
try:
LOG.info('doctor maintenance test starting.......')
- # TODO (tojuvone) test setup and actual test
+
+ maintenance = Maintenance(self.conf, LOG)
+ maintenance.setup_maintenance(self.user)
+
+ # TODO (tojuvone) actual test
+
except Exception as e:
LOG.error('doctor maintenance test failed, Exception=%s' % e)
except Exception as e:
LOG.error('doctor maintenance test failed, Exception=%s' % e)
+ LOG.error(format_exc())
sys.exit(1)
sys.exit(1)
- # TODO (tojuvone) finally: test case specific cleanup
+ finally:
+ maintenance.cleanup_maintenance()
def run(self):
"""run doctor tests"""
try:
LOG.info('doctor test starting.......')
def run(self):
"""run doctor tests"""
try:
LOG.info('doctor test starting.......')
+
# prepare common test env
self.setup()
# prepare common test env
self.setup()
+
if self.conf.test_case == 'all':
self.test_fault_management()
self.test_maintenance()
if self.conf.test_case == 'all':
self.test_fault_management()
self.test_maintenance()