Merge "Rename SwiftScenarioTest to ObjectStorageScenarioTest"
diff --git a/tempest/scenario/manager.py b/tempest/scenario/manager.py
index 9ff434d..7ab3864 100644
--- a/tempest/scenario/manager.py
+++ b/tempest/scenario/manager.py
@@ -1343,9 +1343,9 @@
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 @@
@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 @@
@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
diff --git a/tempest/scenario/test_swift_basic_ops.py b/tempest/scenario/test_object_storage_basic_ops.py
similarity index 97%
rename from tempest/scenario/test_swift_basic_ops.py
rename to tempest/scenario/test_object_storage_basic_ops.py
index 69e0c4c..49768c5 100644
--- a/tempest/scenario/test_swift_basic_ops.py
+++ b/tempest/scenario/test_object_storage_basic_ops.py
@@ -24,7 +24,7 @@
LOG = logging.getLogger(__name__)
-class TestSwiftBasicOps(manager.SwiftScenarioTest):
+class TestObjectStorageBasicOps(manager.ObjectStorageScenarioTest):
"""
Test swift basic ops.
* get swift stat.
diff --git a/tempest/scenario/test_swift_telemetry_middleware.py b/tempest/scenario/test_object_storage_telemetry_middleware.py
similarity index 95%
rename from tempest/scenario/test_swift_telemetry_middleware.py
rename to tempest/scenario/test_object_storage_telemetry_middleware.py
index c5a0e7c..3376a7c 100644
--- a/tempest/scenario/test_swift_telemetry_middleware.py
+++ b/tempest/scenario/test_object_storage_telemetry_middleware.py
@@ -34,7 +34,7 @@
NOTIFICATIONS_SLEEP = 1
-class TestSwiftTelemetry(manager.SwiftScenarioTest):
+class TestObjectStorageTelemetry(manager.ObjectStorageScenarioTest):
"""
Test that swift uses the ceilometer middleware.
* create container.
@@ -45,7 +45,7 @@
@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 @@
@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):