x/vmware-nsx
Code Issues Proposed changes

Merge "Fix tempest.conf generation"

Browse Source
This commit is contained in:
Jenkins 2016-08-24 17:19:09 +00:00 committed by Gerrit Code Review
commit 490b2b6520
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
vmware_nsx_tempest/config.py
View File

@ -13,6 +13,15 @@
from oslo_config import cfg from oslo_config import cfg
from tempest import config 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 scenario_group = config.scenario_group
ScenarioGroup = [ ScenarioGroup = [
cfg.FloatOpt('waitfor_disassoc', cfg.FloatOpt('waitfor_disassoc',

9
vmware_nsx_tempest/plugin.py
View File

@ -41,6 +41,10 @@ class VMwareNsxTempestPlugin(plugins.TempestPlugin):
return (test_fullpath, base_path) return (test_fullpath, base_path)
def register_opts(self, conf): def register_opts(self, conf):
config.register_opt_group(
conf,
config_nsx.service_available_group,
config_nsx.ServiceAvailableGroup)
config.register_opt_group( config.register_opt_group(
conf, conf,
config_nsx.scenario_group, config_nsx.ScenarioGroup) config_nsx.scenario_group, config_nsx.ScenarioGroup)
@ -58,4 +62,7 @@ class VMwareNsxTempestPlugin(plugins.TempestPlugin):
config_nsx.nsxv3_group, config_nsx.NSXv3Group) config_nsx.nsxv3_group, config_nsx.NSXv3Group)
def get_opt_lists(self): 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)
]