openstack
/
trove-tempest-plugin
Code Issues Proposed changes

Merge "Stop adding ServiceAvailable group option"

This commit is contained in:
Jenkins 2016-09-14 20:32:54 +00:00 committed by Gerrit Code Review
parent 9fc467f963 dd4e3c40da
commit 357c1924f6
2 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
trove/tests/tempest/config.py
View File

@ -14,14 +14,10 @@
from oslo_config import cfg
ServiceAvailableGroup = [
cfg.BoolOpt('trove',
default=True,
help="Whether or not Trove is expected to be available")
]
service_available_group = cfg.OptGroup(name='service_available',
title='Available OpenStack services')
service_option = cfg.BoolOpt('trove',
default=True,
help="Whether or not Trove is expected to be "
"available")
database_group = cfg.OptGroup(name='database',
title='Database Service Options')

15
trove/tests/tempest/plugin.py
View File

@ -15,7 +15,6 @@
import os
from tempest import config
from tempest.test_discover import plugins
from trove.tests.tempest import config as trove_config
@ -32,15 +31,11 @@ class TroveTempestPlugin(plugins.TempestPlugin):
return full_test_dir, base_path
def register_opts(self, conf):
config.register_opt_group(
conf, trove_config.service_available_group,
trove_config.ServiceAvailableGroup
)
config.register_opt_group(
conf, trove_config.database_group,
trove_config.DatabaseGroup
)
conf.register_group(trove_config.database_group)
conf.register_opts(trove_config.DatabaseGroup, group='database')
conf.register_opt(trove_config.service_option,
group='service_available')
def get_opt_lists(self):
return [('database', trove_config.DatabaseGroup),
('service_available', trove_config.ServiceAvailableGroup)]
('service_available', [trove_config.service_option])]