openstack
/
tempest
Code Issues Proposed changes

Merge "Rename SwiftScenarioTest to ObjectStorageScenarioTest"

This commit is contained in:
Jenkins 2015-09-21 13:01:52 +00:00 committed by Gerrit Code Review
parent 9f7568ad76 0870db54bd
commit b25603c2c9
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tempest/scenario/manager.py
View File

@ -1343,9 +1343,9 @@ class EncryptionScenarioTest(ScenarioTest):
control_location=control_location)['encryption']
class SwiftScenarioTest(ScenarioTest):
class ObjectStorageScenarioTest(ScenarioTest):
"""
Provide harness to do Swift scenario tests.
Provide harness to do Object Storage scenario tests.
Subclasses implement the tests that use the methods provided by this
class.
@ -1353,7 +1353,7 @@ class SwiftScenarioTest(ScenarioTest):
@classmethod
def skip_checks(cls):
super(SwiftScenarioTest, cls).skip_checks()
super(ObjectStorageScenarioTest, cls).skip_checks()
if not CONF.service_available.swift:
skip_msg = ("%s skipped as swift is not available" %
cls.__name__)
@ -1362,13 +1362,13 @@ class SwiftScenarioTest(ScenarioTest):
@classmethod
def setup_credentials(cls):
cls.set_network_resources()
super(SwiftScenarioTest, cls).setup_credentials()
super(ObjectStorageScenarioTest, cls).setup_credentials()
operator_role = CONF.object_storage.operator_role
cls.os_operator = cls.get_client_manager(roles=[operator_role])
@classmethod
def setup_clients(cls):
super(SwiftScenarioTest, cls).setup_clients()
super(ObjectStorageScenarioTest, cls).setup_clients()
# Clients for Swift
cls.account_client = cls.os_operator.account_client
cls.container_client = cls.os_operator.container_client

2
tempest/scenario/test_swift_basic_ops.py → tempest/scenario/test_object_storage_basic_ops.py
View File

@ -24,7 +24,7 @@ CONF = config.CONF
LOG = logging.getLogger(__name__)
class TestSwiftBasicOps(manager.SwiftScenarioTest):
class TestObjectStorageBasicOps(manager.ObjectStorageScenarioTest):
"""
Test swift basic ops.
* get swift stat.

6
tempest/scenario/test_swift_telemetry_middleware.py → tempest/scenario/test_object_storage_telemetry_middleware.py
View File

@ -34,7 +34,7 @@ NOTIFICATIONS_WAIT = 120
NOTIFICATIONS_SLEEP = 1
class TestSwiftTelemetry(manager.SwiftScenarioTest):
class TestObjectStorageTelemetry(manager.ObjectStorageScenarioTest):
"""
Test that swift uses the ceilometer middleware.
* create container.
@ -45,7 +45,7 @@ class TestSwiftTelemetry(manager.SwiftScenarioTest):
@classmethod
def skip_checks(cls):
super(TestSwiftTelemetry, cls).skip_checks()
super(TestObjectStorageTelemetry, cls).skip_checks()
if not CONF.service_available.ceilometer:
skip_msg = ("%s skipped as ceilometer is not available" %
cls.__name__)
@ -53,7 +53,7 @@ class TestSwiftTelemetry(manager.SwiftScenarioTest):
@classmethod
def setup_clients(cls):
super(TestSwiftTelemetry, cls).setup_clients()
super(TestObjectStorageTelemetry, cls).setup_clients()
cls.telemetry_client = cls.os_operator.telemetry_client
def _confirm_notifications(self, container_name, obj_name):