Code Review
/
doctor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Bug - Testing in Apex with OpenStack master fails
[doctor.git]
/
doctor_tests
/
inspector
/
__init__.py
diff --git
a/doctor_tests/inspector/__init__.py
b/doctor_tests/inspector/__init__.py
index
3be79e5
..
50365a6
100644
(file)
--- a/
doctor_tests/inspector/__init__.py
+++ b/
doctor_tests/inspector/__init__.py
@@
-11,10
+11,12
@@
import os
from oslo_config import cfg
from oslo_utils import importutils
from oslo_config import cfg
from oslo_utils import importutils
+from doctor_tests.common.constants import Inspector
+
OPTS = [
cfg.StrOpt('type',
OPTS = [
cfg.StrOpt('type',
- default=os.environ.get('INSPECTOR_TYPE',
'sample'
),
+ default=os.environ.get('INSPECTOR_TYPE',
Inspector.SAMPLE
),
choices=['sample', 'congress', 'vitrage'],
help='the component of doctor inspector',
required=True),
choices=['sample', 'congress', 'vitrage'],
help='the component of doctor inspector',
required=True),
@@
-26,15
+28,24
@@
OPTS = [
default='12345',
help='the port of default for inspector',
required=False),
default='12345',
help='the port of default for inspector',
required=False),
+ cfg.BoolOpt('update_neutron_port_dp_status',
+ default=False,
+ help='Update data plane status of affected neutron ports',
+ required=False),
]
_inspector_name_class_mapping = {
]
_inspector_name_class_mapping = {
- 'sample': 'doctor_tests.inspector.sample.SampleInspector',
- 'congress': 'doctor_tests.inspector.congress.CongressInspector',
+ Inspector.SAMPLE: 'doctor_tests.inspector.sample.SampleInspector',
+ Inspector.CONGRESS: 'doctor_tests.inspector.congress.CongressInspector',
+ Inspector.VITRAGE: 'doctor_tests.inspector.vitrage.VitrageInspector',
}
}
-def get_inspector(conf, log):
+def get_inspector(conf, log
, transport_url=None
):
inspector_class = _inspector_name_class_mapping[conf.inspector.type]
inspector_class = _inspector_name_class_mapping[conf.inspector.type]
- return importutils.import_object(inspector_class, conf, log)
+ if conf.inspector.type == 'sample':
+ return importutils.import_object(inspector_class, conf, log,
+ transport_url)
+ else:
+ return importutils.import_object(inspector_class, conf, log)