From be8ba2c27aa8a64f72716e2af39841675e056914 Mon Sep 17 00:00:00 2001 From: Martin Kopec Date: Thu, 17 Dec 2020 21:33:32 +0000 Subject: [PATCH] Use proper kwargs in rebuild_server Use proper kwargs arg instead of the named arg in rebuild_server. The method is not used anywhere with the rebuild_kwargs set so this change should affect anybody. Implements: blueprint tempest-scenario-manager-stable Change-Id: Id445d3f1daee4dec1f771580667a35baffa18e62 --- tempest/scenario/manager.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/tempest/scenario/manager.py b/tempest/scenario/manager.py index f369d5d997..e0cfc49e62 100644 --- a/tempest/scenario/manager.py +++ b/tempest/scenario/manager.py @@ -402,19 +402,17 @@ class ScenarioTest(tempest.test.BaseTestCase): self.assertEqual(backup_id, restore['backup_id']) return restore - def rebuild_server(self, server_id, image=None, - preserve_ephemeral=False, wait=True, - rebuild_kwargs=None): + def rebuild_server(self, server_id, image=None, preserve_ephemeral=False, + wait=True, **kwargs): if image is None: image = CONF.compute.image_ref - rebuild_kwargs = rebuild_kwargs or {} LOG.debug("Rebuilding server (id: %s, image: %s, preserve eph: %s)", server_id, image, preserve_ephemeral) self.servers_client.rebuild_server( server_id=server_id, image_ref=image, preserve_ephemeral=preserve_ephemeral, - **rebuild_kwargs) + **kwargs) if wait: waiters.wait_for_server_status(self.servers_client, server_id, 'ACTIVE')