openstack/manila
Code Issues Proposed changes

Stop adding ServiceAvailable group option

Browse Source 
Service available group already exists.Therefore we don't need to
register this group here again.

Change-Id: I9680abe0a177a80860ec6ba1dbacc04fac41758d
Closes-Bug: #1621036
This commit is contained in:
Nishant Kumar 2016-10-01 12:50:39 +05:30
parent 360be9607e
commit 5041d4a710
2 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manila_tempest_tests/config.py
View File

@ -17,14 +17,10 @@ from __future__ import print_function
from oslo_config import cfg from oslo_config import cfg
service_available_group = cfg.OptGroup(name="service_available", service_option = cfg.BoolOpt("manila",
title="Available OpenStack Services") default=True,
help="Whether or not manila is expected to be "
ServiceAvailableGroup = [ "available")
cfg.BoolOpt("manila",
default=True,
help="Whether or not manila is expected to be available"),
]
share_group = cfg.OptGroup(name="share", title="Share Service Options") share_group = cfg.OptGroup(name="share", title="Share Service Options")

12
manila_tempest_tests/plugin.py
View File

@ -16,7 +16,6 @@
import os import os
from tempest import config
from tempest.test_discover import plugins from tempest.test_discover import plugins
from manila_tempest_tests import config as config_share from manila_tempest_tests import config as config_share
@ -31,11 +30,10 @@ class ManilaTempestPlugin(plugins.TempestPlugin):
return full_test_dir, base_path return full_test_dir, base_path
def register_opts(self, conf): def register_opts(self, conf):
config.register_opt_group( conf.register_opt(config_share.service_option,
conf, config_share.service_available_group, group='service_available')
config_share.ServiceAvailableGroup) conf.register_group(config_share.share_group)
config.register_opt_group(conf, config_share.share_group, conf.register_opts(config_share.ShareGroup, group='share')
config_share.ShareGroup)
# NOTE(vponomaryov): set opt 'capability_snapshot_support' by # NOTE(vponomaryov): set opt 'capability_snapshot_support' by
# default equal to opt 'run_snapshot_tests'. # default equal to opt 'run_snapshot_tests'.
@ -48,4 +46,4 @@ class ManilaTempestPlugin(plugins.TempestPlugin):
def get_opt_lists(self): def get_opt_lists(self):
return [(config_share.share_group.name, config_share.ShareGroup), return [(config_share.share_group.name, config_share.ShareGroup),
('service_available', config_share.ServiceAvailableGroup)] ('service_available', [config_share.service_option])]