From e5b608ac1d51e645fe72552bbbf6611aaf22236c Mon Sep 17 00:00:00 2001 From: AvnishPal Date: Tue, 23 Aug 2016 14:37:34 +0530 Subject: [PATCH] Fix tempest.conf generation [service_available] is not being generated. This patch fixes it. Change-Id: I2813ff9c483b5bc97600d2b33decfcff9b3bda33 Closes-Bug: #1613542 --- vmware_nsx_tempest/config.py | 9 +++++++++ vmware_nsx_tempest/plugin.py | 9 ++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/vmware_nsx_tempest/config.py b/vmware_nsx_tempest/config.py index 78e1032ef6..bda0cac2cc 100644 --- a/vmware_nsx_tempest/config.py +++ b/vmware_nsx_tempest/config.py @@ -13,6 +13,15 @@ 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"), +] + scenario_group = config.scenario_group ScenarioGroup = [ cfg.FloatOpt('waitfor_disassoc', diff --git a/vmware_nsx_tempest/plugin.py b/vmware_nsx_tempest/plugin.py index 53f28be2f6..6ad768e4d4 100644 --- a/vmware_nsx_tempest/plugin.py +++ b/vmware_nsx_tempest/plugin.py @@ -41,6 +41,10 @@ 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) config.register_opt_group( conf, config_nsx.scenario_group, config_nsx.ScenarioGroup) @@ -58,4 +62,7 @@ class VMwareNsxTempestPlugin(plugins.TempestPlugin): config_nsx.nsxv3_group, config_nsx.NSXv3Group) def get_opt_lists(self): - return [(config_nsx.scenario_group.name, config_nsx.scenario_group)] + return [ + (config_nsx.scenario_group.name, config_nsx.scenario_group), + ('service_available', config_nsx.ServiceAvailableGroup) + ]