From d3d4418cb198d18108f5b6e93013d1255f8f5d49 Mon Sep 17 00:00:00 2001 From: PRAMOD KUMAR SINGH Date: Thu, 2 Feb 2017 17:33:50 +0530 Subject: [PATCH] Make use of already registered group service_available_group - We don't need this group in plugin code because it is already being registered in tempest config and since we are using the same config object from tempest, we can make use of this group directly here instead of using a new group with the same name. closes-Bug: #1661213 Change-Id: Iabd4a7c356b1f454585054218bf07801e0339bde --- murano_tempest_tests/config.py | 5 +---- murano_tempest_tests/plugin.py | 8 ++++---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/murano_tempest_tests/config.py b/murano_tempest_tests/config.py index a88e2af..08694b1 100644 --- a/murano_tempest_tests/config.py +++ b/murano_tempest_tests/config.py @@ -15,10 +15,7 @@ from oslo_config import cfg -service_available_group = cfg.OptGroup(name="service_available", - title="Available OpenStack Services") - -ServiceAvailableGroup = [ +service_option = [ cfg.BoolOpt("murano", default=True, help="Whether or not murano is expected to be available"), diff --git a/murano_tempest_tests/plugin.py b/murano_tempest_tests/plugin.py index 5fca208..9231b09 100644 --- a/murano_tempest_tests/plugin.py +++ b/murano_tempest_tests/plugin.py @@ -31,8 +31,8 @@ class MuranoTempestPlugin(plugins.TempestPlugin): def register_opts(self, conf): config.register_opt_group( - conf, config_application_catalog.service_available_group, - config_application_catalog.ServiceAvailableGroup) + conf, config.service_available_group, + config_application_catalog.service_option) config.register_opt_group( conf, config_application_catalog.application_catalog_group, config_application_catalog.ApplicationCatalogGroup) @@ -48,7 +48,7 @@ class MuranoTempestPlugin(plugins.TempestPlugin): config_application_catalog.ApplicationCatalogGroup), (config_application_catalog.service_broker_group.name, config_application_catalog.ServiceBrokerGroup), - ('service_available', - config_application_catalog.ServiceAvailableGroup), + (config.service_available_group.name, + config_application_catalog.service_option), (config_application_catalog.artifacts_group.name, config_application_catalog.ArtifactsGroup)]