From cab2734a942698a915e57e132bdd138d6f8b40b3 Mon Sep 17 00:00:00 2001 From: Nishant Kumar Date: Sat, 1 Oct 2016 12:58:37 +0530 Subject: [PATCH] Stop adding ServiceAvailable group option Service available group already exists.Therefore we don't need to register this group here again. Change-Id: I570cb7c1d2e13318a102b9f01a85fd24ffb89f9a Closes-Bug: #1621036 --- mistral_tempest_tests/config.py | 12 ++++-------- mistral_tempest_tests/plugin.py | 10 +++------- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/mistral_tempest_tests/config.py b/mistral_tempest_tests/config.py index 8a42a10f..23fe8621 100644 --- a/mistral_tempest_tests/config.py +++ b/mistral_tempest_tests/config.py @@ -15,11 +15,7 @@ from oslo_config import cfg -service_available_group = cfg.OptGroup(name="service_available", - title="Available OpenStack Services") - -ServiceAvailableGroup = [ - cfg.BoolOpt('mistral', - default=True, - help="Whether or not Mistral is expected to be available."), -] +service_option = cfg.BoolOpt('mistral', + default=True, + help="Whether or not Mistral is expected to be" + "available") diff --git a/mistral_tempest_tests/plugin.py b/mistral_tempest_tests/plugin.py index c7b1bde4..15a9a95e 100644 --- a/mistral_tempest_tests/plugin.py +++ b/mistral_tempest_tests/plugin.py @@ -16,7 +16,6 @@ import os -from tempest import config from tempest.test_discover import plugins from mistral_tempest_tests import config as mistral_config @@ -31,11 +30,8 @@ class MistralTempestPlugin(plugins.TempestPlugin): return full_test_dir, base_path def register_opts(self, conf): - config.register_opt_group( - conf, - mistral_config.service_available_group, - mistral_config.ServiceAvailableGroup - ) + conf.register_opt(mistral_config.service_option, + group='service_available') def get_opt_lists(self): - pass + return [('service_available', [mistral_config.service_option])]