From d6a05f568d6e63ac16d20a10292998745812d453 Mon Sep 17 00:00:00 2001 From: Nishant Kumar Date: Fri, 27 Jan 2017 01:05:10 -0500 Subject: [PATCH] Reuse already existing groups from upstream tempest config Tempest plugin tests uses the same config file/object from the upstream tempest, therefore instead of registering the same group again in plugin tests we should reuse already existing groups and register only plugin specific option here. Change-Id: I948fdcf20732b98d5ba5d34fe0352ea9cff59f91 Closes-Bug: #1659596 --- keystone_tempest_plugin/config.py | 11 +---------- keystone_tempest_plugin/plugin.py | 12 ++++-------- 2 files changed, 5 insertions(+), 18 deletions(-) diff --git a/keystone_tempest_plugin/config.py b/keystone_tempest_plugin/config.py index 2f3e7e227d..87872c598b 100644 --- a/keystone_tempest_plugin/config.py +++ b/keystone_tempest_plugin/config.py @@ -15,16 +15,7 @@ from oslo_config import cfg - -identity_group = cfg.OptGroup(name='identity', - title="Keystone Configuration Options") - -IdentityGroup = [] - -identity_feature_group = cfg.OptGroup(name='identity-feature-enabled', - title='Enabled Identity Features') - -IdentityFeatureGroup = [ +identity_feature_option = [ cfg.BoolOpt('federation', default=False, help='Does the environment support the Federated Identity ' diff --git a/keystone_tempest_plugin/plugin.py b/keystone_tempest_plugin/plugin.py index 9311409830..76f7a9c1dd 100644 --- a/keystone_tempest_plugin/plugin.py +++ b/keystone_tempest_plugin/plugin.py @@ -31,17 +31,13 @@ class KeystoneTempestPlugin(plugins.TempestPlugin): return full_test_dir, base_path def register_opts(self, conf): - config.register_opt_group(conf, project_config.identity_group, - project_config.IdentityGroup) - config.register_opt_group(conf, project_config.identity_feature_group, - project_config.IdentityFeatureGroup) + config.register_opt_group(conf, config.identity_feature_group, + project_config.identity_feature_option) config.register_opt_group(conf, project_config.fed_scenario_group, project_config.FedScenarioGroup) def get_opt_lists(self): - return [(project_config.identity_group.name, - project_config.IdentityGroup), - (project_config.identity_feature_group.name, - project_config.IdentityFeatureGroup), + return [(config.identity_feature_group.name, + project_config.identity_feature_option), (project_config.fed_scenario_group.name, project_config.FedScenarioGroup)]