Stop adding ServiceAvailable group option
Service available group already exists.Therefore we don't need to
register this group here again.
Change-Id: I7822e1f5fd2fae8b34aeb1dd4eaf68d9ae03c8b0
Closes-Bug: #1621036
diff --git a/ceilometer/tests/tempest/config.py b/ceilometer/tests/tempest/config.py
index dea33f6..6df0ff4 100644
--- a/ceilometer/tests/tempest/config.py
+++ b/ceilometer/tests/tempest/config.py
@@ -16,14 +16,10 @@
from oslo_config import cfg
-service_available_group = cfg.OptGroup(name="service_available",
- title="Available OpenStack Services")
-
-ServiceAvailableGroup = [
- cfg.BoolOpt('ceilometer',
- default=True,
- help="Whether or not Ceilometer is expected to be available"),
-]
+service_option = cfg.BoolOpt('ceilometer',
+ default=True,
+ help="Whether or not Ceilometer is expected to be"
+ "available")
telemetry_group = cfg.OptGroup(name='telemetry',
title='Telemetry Service Options')
diff --git a/ceilometer/tests/tempest/plugin.py b/ceilometer/tests/tempest/plugin.py
index 1a7aa10..bfc6b40 100644
--- a/ceilometer/tests/tempest/plugin.py
+++ b/ceilometer/tests/tempest/plugin.py
@@ -15,7 +15,6 @@
import os
-from tempest import config
from tempest.test_discover import plugins
import ceilometer
@@ -32,16 +31,13 @@
return full_test_dir, base_path
def register_opts(self, conf):
- config.register_opt_group(conf,
- tempest_config.service_available_group,
- tempest_config.ServiceAvailableGroup)
- config.register_opt_group(conf,
- tempest_config.telemetry_group,
- tempest_config.TelemetryGroup)
+ conf.register_group(tempest_config.telemetry_group)
+ conf.register_opts(tempest_config.TelemetryGroup, group='telemetry')
+ conf.register_opt(tempest_config.service_option,
+ group='service_available')
def get_opt_lists(self):
return [
(tempest_config.telemetry_group.name,
tempest_config.TelemetryGroup),
- ('service_available', tempest_config.ServiceAvailableGroup)
- ]
+ ('service_available', [tempest_config.service_option])]