From 658555a7e236d3f7b48f31c8b0a93dba53a3bc88 Mon Sep 17 00:00:00 2001 From: Federico Ressi <fressi@redhat.com> Date: Fri, 8 Mar 2019 16:02:57 +0100 Subject: [PATCH] Move tobiko test config to new tobiko.openstack package. Change-Id: Ifc64d68fe2db9337ffd6be76a6b1927ff06403ae --- tobiko/config.py | 2 +- tobiko/openstack/__init__.py | 0 tobiko/{tests => openstack}/config.py | 21 +++++++++++++-------- 3 files changed, 14 insertions(+), 9 deletions(-) create mode 100644 tobiko/openstack/__init__.py rename tobiko/{tests => openstack}/config.py (71%) diff --git a/tobiko/config.py b/tobiko/config.py index 2713f20e8..afdf72048 100644 --- a/tobiko/config.py +++ b/tobiko/config.py @@ -22,7 +22,7 @@ from oslo_log import log LOG = log.getLogger(__name__) -CONFIG_MODULES = ['tobiko.tests.config'] +CONFIG_MODULES = ['tobiko.openstack.config'] CONFIG_DIRS = [os.getcwd(), os.path.expanduser("~/.tobiko"), diff --git a/tobiko/openstack/__init__.py b/tobiko/openstack/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/tobiko/tests/config.py b/tobiko/openstack/config.py similarity index 71% rename from tobiko/tests/config.py rename to tobiko/openstack/config.py index 3adbadeaa..7d05ebe47 100644 --- a/tobiko/tests/config.py +++ b/tobiko/openstack/config.py @@ -20,17 +20,22 @@ def register_tobiko_options(conf): conf.register_opts( group=cfg.OptGroup('identity'), - opts=[cfg.StrOpt('auth_url', - help="Default identity service URL"), + opts=[cfg.StrOpt('http_proxy', + help="HTTP proxy URL for Rest APIs"), + cfg.IntOpt('api_version', + help="Identity API version"), + cfg.StrOpt('auth_url', + help="Identity service URL"), cfg.StrOpt('username', - help="Default username"), + help="Username"), cfg.StrOpt('password', - help="Default password"), - cfg.StrOpt('domain_name', - help="Default domain name"), + help="Password"), cfg.StrOpt('project_name', - help="Default project name"), - ]) + help="Project name"), + cfg.StrOpt('user_domain_name', + help="User domain name"), + cfg.StrOpt('project_domain_name', + help="Project domain name")]) conf.register_opts( group=cfg.OptGroup('compute'),