Remove unused service tags and client
This commit removes unused service tags and a client. We should keep our
code clean as possible.
Change-Id: I428ac6740feaaabdd17a02a03ea5230d202d89d2
diff --git a/tempest/scenario/manager.py b/tempest/scenario/manager.py
index 600a559..f889c44 100644
--- a/tempest/scenario/manager.py
+++ b/tempest/scenario/manager.py
@@ -79,8 +79,6 @@
cls.security_groups_client = cls.manager.security_groups_client
cls.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:
cls.volumes_client = cls.manager.volumes_client
diff --git a/tempest/test.py b/tempest/test.py
index f84bf6b..97ab25c 100644
--- a/tempest/test.py
+++ b/tempest/test.py
@@ -72,13 +72,9 @@
'image': CONF.service_available.glance,
'baremetal': CONF.service_available.ironic,
'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,
'identity': True,
'object_storage': CONF.service_available.swift,
- 'data_processing': CONF.service_available.sahara,
}
return service_list
@@ -90,8 +86,8 @@
exercised by a test case.
"""
def decorator(f):
- services = ['compute', 'image', 'baremetal', 'volume', 'orchestration',
- 'network', 'identity', 'object_storage', 'data_processing']
+ services = ['compute', 'image', 'baremetal', 'volume',
+ 'network', 'identity', 'object_storage']
for service in args:
if service not in services:
raise exceptions.InvalidServiceTag('%s is not a valid '