openstack/keystone
Code Issues Proposed changes

Merge "Reuse already existing groups from upstream tempest config"

Browse Source
This commit is contained in:
Jenkins 2017-01-28 03:01:13 +00:00 committed by Gerrit Code Review
commit d005a50acc
2 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
keystone_tempest_plugin/config.py
View File

@ -15,16 +15,7 @@
from oslo_config import cfg from oslo_config import cfg
identity_feature_option = [
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 = [
cfg.BoolOpt('federation', cfg.BoolOpt('federation',
default=False, default=False,
help='Does the environment support the Federated Identity ' help='Does the environment support the Federated Identity '

12
keystone_tempest_plugin/plugin.py
View File

@ -31,17 +31,13 @@ class KeystoneTempestPlugin(plugins.TempestPlugin):
return full_test_dir, base_path return full_test_dir, base_path
def register_opts(self, conf): def register_opts(self, conf):
config.register_opt_group(conf, project_config.identity_group, config.register_opt_group(conf, config.identity_feature_group,
project_config.IdentityGroup) project_config.identity_feature_option)
config.register_opt_group(conf, project_config.identity_feature_group,
project_config.IdentityFeatureGroup)
config.register_opt_group(conf, project_config.fed_scenario_group, config.register_opt_group(conf, project_config.fed_scenario_group,
project_config.FedScenarioGroup) project_config.FedScenarioGroup)
def get_opt_lists(self): def get_opt_lists(self):
return [(project_config.identity_group.name, return [(config.identity_feature_group.name,
project_config.IdentityGroup), project_config.identity_feature_option),
(project_config.identity_feature_group.name,
project_config.IdentityFeatureGroup),
(project_config.fed_scenario_group.name, (project_config.fed_scenario_group.name,
project_config.FedScenarioGroup)] project_config.FedScenarioGroup)]