diff --git a/tempest/api/compute/base.py b/tempest/api/compute/base.py index 5c4767cdc3..2b32a86d86 100644 --- a/tempest/api/compute/base.py +++ b/tempest/api/compute/base.py @@ -301,7 +301,7 @@ class BaseV2ComputeTest(api_version_utils.BaseMicroversionTest, return image @classmethod - def rebuild_server(cls, server_id, validatable=False, **kwargs): + def recreate_server(cls, server_id, validatable=False, **kwargs): """Destroy an existing class level server and creates a new one Some test classes use a test server that can be used by multiple diff --git a/tempest/api/compute/images/test_images_oneserver_negative.py b/tempest/api/compute/images/test_images_oneserver_negative.py index 4de00cef28..a2e58c9b7d 100644 --- a/tempest/api/compute/images/test_images_oneserver_negative.py +++ b/tempest/api/compute/images/test_images_oneserver_negative.py @@ -52,7 +52,7 @@ class ImagesOneServerNegativeTestJSON(base.BaseV2ComputeTest): self._reset_server() def _reset_server(self): - self.__class__.server_id = self.rebuild_server(self.server_id) + self.__class__.server_id = self.recreate_server(self.server_id) @classmethod def skip_checks(cls): diff --git a/tempest/api/compute/servers/test_server_actions.py b/tempest/api/compute/servers/test_server_actions.py index 4cfc665b28..6fe4d82bc8 100644 --- a/tempest/api/compute/servers/test_server_actions.py +++ b/tempest/api/compute/servers/test_server_actions.py @@ -55,7 +55,7 @@ class ServerActionsTestJSON(base.BaseV2ComputeTest): self.__class__.server_id = server['id'] except Exception: # Rebuild server if something happened to it during a test - self.__class__.server_id = self.rebuild_server( + self.__class__.server_id = self.recreate_server( self.server_id, validatable=True) def tearDown(self): @@ -75,7 +75,7 @@ class ServerActionsTestJSON(base.BaseV2ComputeTest): @classmethod def resource_setup(cls): super(ServerActionsTestJSON, cls).resource_setup() - cls.server_id = cls.rebuild_server(None, validatable=True) + cls.server_id = cls.recreate_server(None, validatable=True) @decorators.idempotent_id('6158df09-4b82-4ab3-af6d-29cf36af858d') @testtools.skipUnless(CONF.compute_feature_enabled.change_password, diff --git a/tempest/api/compute/servers/test_servers_negative.py b/tempest/api/compute/servers/test_servers_negative.py index 8170b28666..d067bb3398 100644 --- a/tempest/api/compute/servers/test_servers_negative.py +++ b/tempest/api/compute/servers/test_servers_negative.py @@ -37,7 +37,7 @@ class ServersNegativeTestJSON(base.BaseV2ComputeTest): waiters.wait_for_server_status(self.client, self.server_id, 'ACTIVE') except Exception: - self.__class__.server_id = self.rebuild_server(self.server_id) + self.__class__.server_id = self.recreate_server(self.server_id) def tearDown(self): self.server_check_teardown() @@ -551,7 +551,7 @@ class ServersNegativeTestMultiTenantJSON(base.BaseV2ComputeTest): waiters.wait_for_server_status(self.servers_client, self.server_id, 'ACTIVE') except Exception: - self.__class__.server_id = self.rebuild_server(self.server_id) + self.__class__.server_id = self.recreate_server(self.server_id) @classmethod def setup_clients(cls):