From 514495b1a0a44f03ddb870c7946bbd2101506e8b Mon Sep 17 00:00:00 2001 From: Matt Riedemann Date: Sat, 4 May 2019 17:34:12 +0000 Subject: [PATCH] Revert "Refactor random naming" This reverts commit e3e7b2722e6b78216373f392af5bfeba1e2da5ec. After that change, if the test creates a volume type with a given name, it's not unique and therefore can hit a 409 conflict trying to create a volume type with a name that already exists, which can happen when running scenario tests concurrently since several encrypted volume tests use the same volume type name "luks". See Iecf62d411d2da17c4c983915018e3ed9180ecd11 for an alternative but this is easier. It's not entirely clear why the original change was made anyway - why do we care if the tests create long names? They weren't unnecessary because they were random to avoid conflicts. Change-Id: I9f5a967514f3c79f861d286f65402e9ec2832cc4 Closes-Bug: #1826953 --- tempest/scenario/manager.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tempest/scenario/manager.py b/tempest/scenario/manager.py index d09f20c7d8..86d37f1796 100644 --- a/tempest/scenario/manager.py +++ b/tempest/scenario/manager.py @@ -346,8 +346,10 @@ class ScenarioTest(tempest.test.BaseTestCase): def create_volume_type(self, client=None, name=None, backend_name=None): if not client: client = self.os_admin.volume_types_client_latest - randomized_name = name or data_utils.rand_name( - 'volume-type-' + self.__class__.__name__) + if not name: + class_name = self.__class__.__name__ + name = data_utils.rand_name(class_name + '-volume-type') + randomized_name = data_utils.rand_name('scenario-type-' + name) LOG.debug("Creating a volume type: %s on backend %s", randomized_name, backend_name)