X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2Fconfig.py;h=88910f6d852a1b9460ed3c66e22284fcd9f78734;hb=dbd84d95163fb492962ebacdea7bc2a89a8b56f9;hp=2288d36ef20625c94ad466172c880480a1edd61a;hpb=d5918a87f12fdef9bd7408c4554c42606c4896d8;p=doctor.git diff --git a/tests/config.py b/tests/config.py index 2288d36e..88910f6d 100644 --- a/tests/config.py +++ b/tests/config.py @@ -6,20 +6,37 @@ # which accompanies this distribution, and is available at # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## +import itertools + from oslo_config import cfg +import alarm +import consumer import image +import instance +import network +import inspector +import monitor import os_clients +import user def list_opts(): return [ - ('os_clients', os_clients.OPTS), - ('image', image.IMAGE_OPTS), + ('monitor', monitor.OPTS), + ('inspector', inspector.OPTS), + ('consumer', consumer.OPTS), + ('DEFAULT', itertools.chain( + os_clients.OPTS, + image.OPTS, + user.OPTS, + network.OPTS, + instance.OPTS, + alarm.OPTS)) ] -def prepare_conf(conf=None): +def prepare_conf(args=None, conf=None, config_files=None): if conf is None: conf = cfg.ConfigOpts() @@ -27,4 +44,7 @@ def prepare_conf(conf=None): conf.register_opts(list(options), group=None if group == 'DEFAULT' else group) + conf(args, project='doctor', validate_default_values=True, + default_config_files=config_files) + return conf