Stop adding ServiceAvailable group option

Service available group already exists.Therefore we don't need to
register this group here again.

Change-Id: I608925ea6f15c302279a688d9f32e3e7688d12b6
Closes-Bug: #1621036
This commit is contained in:
Nishant Kumar 2016-10-10 15:06:53 +05:30
parent 9a4cddba6d
commit adaa4a6c90
2 changed files with 11 additions and 17 deletions

View File

@ -15,14 +15,10 @@
from oslo_config import cfg from oslo_config import cfg
service_available_group = cfg.OptGroup(name="service_available", service_option = cfg.BoolOpt("vitrage",
title="Available OpenStack Services") default=True,
help="Whether or not vitrage is expected to be "
ServiceAvailableGroup = [ "available")
cfg.BoolOpt("vitrage",
default=True,
help="Whether or not vitrage is expected to be available"),
]
rca_service_group = cfg.OptGroup(name="root_cause_analysis_service", rca_service_group = cfg.OptGroup(name="root_cause_analysis_service",
title="Root Cause Analysis Service Options") title="Root Cause Analysis Service Options")

View File

@ -16,8 +16,6 @@
import os import os
# noinspection PyPackageRequirements
from tempest import config
# noinspection PyPackageRequirements # noinspection PyPackageRequirements
from tempest.test_discover import plugins from tempest.test_discover import plugins
@ -33,13 +31,13 @@ class VitrageTempestPlugin(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.register_opt(config_rca_service.service_option,
conf, config_rca_service.service_available_group, group='service_available')
config_rca_service.ServiceAvailableGroup) conf.register_group(config_rca_service.rca_service_group)
config.register_opt_group( conf.register_opts(config_rca_service.RcaServiceGroup,
conf, config_rca_service.rca_service_group, group='root_cause_analysis_service')
config_rca_service.RcaServiceGroup)
def get_opt_lists(self): def get_opt_lists(self):
return [(config_rca_service.rca_service_group.name, return [(config_rca_service.rca_service_group.name,
config_rca_service.rca_service_group)] config_rca_service.rca_service_group),
('service_available', [config_rca_service.service_option])]