From 417a7ad2039c09adbd497392c0199b7667e65ef7 Mon Sep 17 00:00:00 2001 From: Pavlo Shchelokovskyy Date: Mon, 15 May 2023 11:25:31 +0000 Subject: Allow server rebuild --wait for SHUTOFF servers currently the command is waiting only for ACTIVE server status, but if the server was SHUTOFF before, it will be SHUTOFF after rebuild as well, so the command is stuck in waiting forever. Additionally, we now also pre-validate the server status on client side, and raise an error if the server to be rebuilt is not in ACTIVE, ERROR or SHUTOFF state. Change-Id: If90a4bbba9a7ecd972f8b594c52fee4f75a0ae5e Co-Authored-By: Oleksiy Molchanov Story: 2010751 Task: 48005 --- openstackclient/compute/v2/server.py | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'openstackclient/compute') diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py index cde4ab05..73d66d19 100644 --- a/openstackclient/compute/v2/server.py +++ b/openstackclient/compute/v2/server.py @@ -3536,6 +3536,15 @@ class RebuildServer(command.ShowOne): 'future release.' ) + status = getattr(server, 'status', '').lower() + if status == 'shutoff': + success_status = ['shutoff'] + elif status in ('error', 'active'): + success_status = ['active'] + else: + msg = _("The server status is not ACTIVE, SHUTOFF or ERROR.") + raise exceptions.CommandError(msg) + try: server = server.rebuild(image, parsed_args.password, **kwargs) finally: @@ -3547,6 +3556,7 @@ class RebuildServer(command.ShowOne): compute_client.servers.get, server.id, callback=_show_progress, + success_status=success_status, ): self.app.stdout.write(_('Complete\n')) else: -- cgit v1.2.1