Merge "Stop adding ServiceAvailable group option"

This commit is contained in:
Jenkins 2017-01-25 21:48:51 +00:00 committed by Gerrit Code Review
commit 3a68a6616b
2 changed files with 7 additions and 13 deletions

View File

@ -13,14 +13,10 @@
from oslo_config import cfg
from tempest import config
service_available_group = cfg.OptGroup(name="service_available",
title="Available OpenStack Services")
ServiceAvailableGroup = [
cfg.BoolOpt("vmware_nsx",
service_option = cfg.BoolOpt("vmware_nsx",
default=True,
help="Whether or not vmware_nsx is expected to be available"),
]
help="Whether or not vmware_nsx is expected to be"
" available")
scenario_group = config.scenario_group
ScenarioGroup = [

View File

@ -41,10 +41,8 @@ class VMwareNsxTempestPlugin(plugins.TempestPlugin):
return (test_fullpath, base_path)
def register_opts(self, conf):
config.register_opt_group(
conf,
config_nsx.service_available_group,
config_nsx.ServiceAvailableGroup)
conf.register_opt(config_nsx.service_option,
group='service_available')
config.register_opt_group(
conf,
config_nsx.scenario_group, config_nsx.ScenarioGroup)
@ -64,5 +62,5 @@ class VMwareNsxTempestPlugin(plugins.TempestPlugin):
def get_opt_lists(self):
return [
(config_nsx.scenario_group.name, config_nsx.scenario_group),
('service_available', config_nsx.ServiceAvailableGroup)
('service_available', [config_nsx.service_option])
]