From ea974706743ffb5e0a0c56f52dceb26dde6ddbe5 Mon Sep 17 00:00:00 2001
From: Nishant Kumar <nishant.e.kumar@ericsson.com>
Date: Mon, 10 Oct 2016 13:08:36 +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: Ie4597e7faa87c768d19b1192a9a81e20c6f22637
Closes-Bug: #1621036
---
 vmware_nsx_tempest/config.py | 12 ++++--------
 vmware_nsx_tempest/plugin.py |  8 +++-----
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/vmware_nsx_tempest/config.py b/vmware_nsx_tempest/config.py
index 6f475efd78..8f24ec03f0 100644
--- a/vmware_nsx_tempest/config.py
+++ b/vmware_nsx_tempest/config.py
@@ -13,14 +13,10 @@
 from oslo_config import cfg
 from tempest import config
 
-service_available_group = cfg.OptGroup(name="service_available",
-                                       title="Available OpenStack Services")
-
-ServiceAvailableGroup = [
-    cfg.BoolOpt("vmware_nsx",
-                default=True,
-                help="Whether or not vmware_nsx is expected to be available"),
-]
+service_option = cfg.BoolOpt("vmware_nsx",
+                             default=True,
+                             help="Whether or not vmware_nsx is expected to be"
+                                  " available")
 
 scenario_group = config.scenario_group
 ScenarioGroup = [
diff --git a/vmware_nsx_tempest/plugin.py b/vmware_nsx_tempest/plugin.py
index 6ad768e4d4..3d5a5bfdd6 100644
--- a/vmware_nsx_tempest/plugin.py
+++ b/vmware_nsx_tempest/plugin.py
@@ -41,10 +41,8 @@ class VMwareNsxTempestPlugin(plugins.TempestPlugin):
         return (test_fullpath, base_path)
 
     def register_opts(self, conf):
-        config.register_opt_group(
-            conf,
-            config_nsx.service_available_group,
-            config_nsx.ServiceAvailableGroup)
+        conf.register_opt(config_nsx.service_option,
+                          group='service_available')
         config.register_opt_group(
             conf,
             config_nsx.scenario_group, config_nsx.ScenarioGroup)
@@ -64,5 +62,5 @@ class VMwareNsxTempestPlugin(plugins.TempestPlugin):
     def get_opt_lists(self):
         return [
             (config_nsx.scenario_group.name, config_nsx.scenario_group),
-            ('service_available', config_nsx.ServiceAvailableGroup)
+            ('service_available', [config_nsx.service_option])
         ]