X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2Fconfig.py;h=94b85f7f17cfbdea36e088462885e41e721c0904;hb=7e0ab6e2149df22455e58eb363eb291a985514de;hp=7a0bef2da3ad5d3bf7a273f4ff1d84be17c14acf;hpb=9ae13f88c29d7babea19fb65bef208e631a12be4;p=doctor.git diff --git a/tests/config.py b/tests/config.py index 7a0bef2d..94b85f7f 100644 --- a/tests/config.py +++ b/tests/config.py @@ -7,23 +7,32 @@ # 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 os_clients import user def list_opts(): return [ + ('consumer', consumer.OPTS), ('DEFAULT', itertools.chain( os_clients.OPTS, image.OPTS, - user.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() @@ -31,4 +40,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