openstack/tempest
Code Issues Proposed changes

Remove unused service tags and client

Browse Source 
This commit removes unused service tags and a client. We should keep our
code clean as possible.

Change-Id: I428ac6740feaaabdd17a02a03ea5230d202d89d2
This commit is contained in:
Masayuki Igawa 2016-06-27 16:18:59 +09:00
parent 5e2ebd5ccf
commit 22b3008661
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tempest/scenario/manager.py
View File

@ -79,8 +79,6 @@ class ScenarioTest(tempest.test.BaseTestCase):
cls.security_groups_client = cls.manager.security_groups_client cls.security_groups_client = cls.manager.security_groups_client
cls.security_group_rules_client = ( cls.security_group_rules_client = (
cls.manager.security_group_rules_client) cls.manager.security_group_rules_client)
# Heat client
cls.orchestration_client = cls.manager.orchestration_client
if CONF.volume_feature_enabled.api_v1: if CONF.volume_feature_enabled.api_v1:
cls.volumes_client = cls.manager.volumes_client cls.volumes_client = cls.manager.volumes_client

8
tempest/test.py
View File

@ -72,13 +72,9 @@ def get_service_list():
'image': CONF.service_available.glance, 'image': CONF.service_available.glance,
'baremetal': CONF.service_available.ironic, 'baremetal': CONF.service_available.ironic,
'volume': CONF.service_available.cinder, 'volume': CONF.service_available.cinder,
'orchestration': CONF.service_available.heat,
# NOTE(mtreinish) nova-network will provide networking functionality
# if neutron isn't available, so always set to True.
'network': True, 'network': True,
'identity': True, 'identity': True,
'object_storage': CONF.service_available.swift, 'object_storage': CONF.service_available.swift,
'data_processing': CONF.service_available.sahara,
} }
return service_list return service_list
@ -90,8 +86,8 @@ def services(*args):
exercised by a test case. exercised by a test case.
""" """
def decorator(f): def decorator(f):
services = ['compute', 'image', 'baremetal', 'volume', 'orchestration', services = ['compute', 'image', 'baremetal', 'volume',
'network', 'identity', 'object_storage', 'data_processing'] 'network', 'identity', 'object_storage']
for service in args: for service in args:
if service not in services: if service not in services:
raise exceptions.InvalidServiceTag('%s is not a valid ' raise exceptions.InvalidServiceTag('%s is not a valid '