openstack/monasca-api
Code Issues Proposed changes

Merge "Stop adding ServiceAvailable group option"

Browse Source
This commit is contained in:
Jenkins 2017-01-03 21:03:28 +00:00 committed by Gerrit Code Review
commit 784ea2d3ab
2 changed files with 11 additions and 15 deletions
monasca_tempest_tests
config.pyplugin.py

12
monasca_tempest_tests/config.py

@ -15,14 +15,10 @@
from oslo_config import cfg
service_available_group = cfg.OptGroup(name="service_available",
title="Available OpenStack Services")
ServiceAvailableGroup = [
cfg.BoolOpt("monasca",
default=True,
help="Whether or not Monasca is expected to be available"),
]
service_option = cfg.BoolOpt("monasca",
default=True,
help="Whether or not Monasca is expected to be "
"available")
monitoring_group = cfg.OptGroup(name="monitoring",
title="Monitoring Service Options")

14
monasca_tempest_tests/plugin.py

@ -14,7 +14,6 @@
import os
from tempest import config
from tempest.test_discover import plugins
from monasca_tempest_tests import config as config_monitoring
@ -29,12 +28,13 @@ class MonascaTempestPlugin(plugins.TempestPlugin):
return full_test_dir, base_path
def register_opts(self, conf):
config.register_opt_group(
conf, config_monitoring.service_available_group,
config_monitoring.ServiceAvailableGroup)
config.register_opt_group(conf, config_monitoring.monitoring_group,
config_monitoring.MonitoringGroup)
conf.register_opt(config_monitoring.service_option,
group='service_available')
conf.register_group(config_monitoring.monitoring_group)
conf.register_opts(config_monitoring.MonitoringGroup,
group='monitoring')
def get_opt_lists(self):
return [(config_monitoring.monitoring_group.name,
config_monitoring.MonitoringGroup)]
config_monitoring.MonitoringGroup),
('service_available', [config_monitoring.service_option])]