X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2Fconfig.py;h=99f335f2fe1b6f06f1b0b5f90eb6820b307dbfdd;hb=183dee7dc0d1c5086ad5d919b7eba955d1d011e9;hp=2a062c22920974f4753af1050c8bb88030e7bea4;hpb=51b2ad855f0dad6527e5ec436f6b29758c21fb80;p=doctor.git diff --git a/tests/config.py b/tests/config.py index 2a062c22..99f335f2 100644 --- a/tests/config.py +++ b/tests/config.py @@ -6,14 +6,29 @@ # which accompanies this distribution, and is available at # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## +import itertools + from oslo_config import cfg +import image +import instance +import network +import os_clients +import user + def list_opts(): - return [] + return [ + ('DEFAULT', itertools.chain( + os_clients.OPTS, + image.OPTS, + user.OPTS, + network.OPTS, + instance.OPTS)) + ] -def prepare_conf(conf=None): +def prepare_conf(args=None, conf=None, config_files=None): if conf is None: conf = cfg.ConfigOpts() @@ -21,4 +36,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