Code Review
/
doctor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Maintenance support for latest Fenix, python3 and Fuel
[doctor.git]
/
doctor_tests
/
main.py
diff --git
a/doctor_tests/main.py
b/doctor_tests/main.py
index
438d832
..
cdb4af5
100644
(file)
--- a/
doctor_tests/main.py
+++ b/
doctor_tests/main.py
@@
-1,5
+1,5
@@
##############################################################################
##############################################################################
-# Copyright (c) 201
7
ZTE Corporation and others.
+# Copyright (c) 201
9
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
#
# 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.......')
def test_fault_management(self):
try:
LOG.info('doctor fault management test starting.......')
-
+ transport_url = self.installer.get_transport_url()
self.fault_management = \
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()
# 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)
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()
sys.exit(1)
finally:
self.fault_management.cleanup()
@@
-94,7
+96,7
@@
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'
:
+ elif self.conf.installer.type
not in ['apex', 'fuel']
:
LOG.info('not supported installer, skipping doctor '
'maintenance test')
return
LOG.info('not supported installer, skipping doctor '
'maintenance test')
return
@@
-143,6
+145,7
@@
class DoctorTest(object):
% function)
except Exception as e:
LOG.error('doctor test failed, Exception=%s' % e)
% function)
except Exception as e:
LOG.error('doctor test failed, Exception=%s' % e)
+ LOG.error(format_exc())
sys.exit(1)
finally:
self.cleanup()
sys.exit(1)
finally:
self.cleanup()