Code Review
/
doctor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
refactor sample inspector
[doctor.git]
/
tests
/
config.py
diff --git
a/tests/config.py
b/tests/config.py
index
7a0bef2
..
969d829
100644
(file)
--- a/
tests/config.py
+++ b/
tests/config.py
@@
-7,23
+7,34
@@
# http://www.apache.org/licenses/LICENSE-2.0
\r
##############################################################################
\r
import itertools
\r
# http://www.apache.org/licenses/LICENSE-2.0
\r
##############################################################################
\r
import itertools
\r
+
\r
from oslo_config import cfg
\r
\r
from oslo_config import cfg
\r
\r
+import alarm
\r
+import consumer
\r
import image
\r
import image
\r
+import instance
\r
+import network
\r
+import inspector
\r
import os_clients
\r
import user
\r
\r
\r
def list_opts():
\r
return [
\r
import os_clients
\r
import user
\r
\r
\r
def list_opts():
\r
return [
\r
+ ('consumer', consumer.OPTS),
\r
+ ('inspector', inspector.OPTS),
\r
('DEFAULT', itertools.chain(
\r
os_clients.OPTS,
\r
image.OPTS,
\r
('DEFAULT', itertools.chain(
\r
os_clients.OPTS,
\r
image.OPTS,
\r
- user.OPTS))
\r
+ user.OPTS,
\r
+ network.OPTS,
\r
+ instance.OPTS,
\r
+ alarm.OPTS))
\r
]
\r
\r
\r
]
\r
\r
\r
-def prepare_conf(
conf
=None):
\r
+def prepare_conf(
args=None, conf=None, config_files
=None):
\r
if conf is None:
\r
conf = cfg.ConfigOpts()
\r
\r
if conf is None:
\r
conf = cfg.ConfigOpts()
\r
\r
@@
-31,4
+42,7
@@
def prepare_conf(conf=None):
conf.register_opts(list(options),
\r
group=None if group == 'DEFAULT' else group)
\r
\r
conf.register_opts(list(options),
\r
group=None if group == 'DEFAULT' else group)
\r
\r
+ conf(args, project='doctor', validate_default_values=True,
\r
+ default_config_files=config_files)
\r
+
\r
return conf
\r
return conf
\r