From 97ae87e9702875fc0bdc38d065865baf4a74b32f Mon Sep 17 00:00:00 2001 From: Clifford Emeka Date: Wed, 22 Mar 2023 12:18:37 +0100 Subject: [PATCH] adds share server uuid on migration cancel Closes-bug: #1989819 Change-Id: I6064d31d20eb10c5e0d42e9aff18d512c200e378 (cherry picked from commit 86e0e3887f466195c073a210b67c2407597c6bec) (cherry picked from commit c924c4ce10c167fc8bcb8cb1f4791908d465a5df) (cherry picked from commit bd344c8781dfac12136caeda92bdd19c33665f76) (cherry picked from commit deee9ae1e40d90c8f951a880a4cf8d844f1db972) (cherry picked from commit 5415c64efda29301e74da2f6c75a767191e47b96) --- manila/share/api.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/manila/share/api.py b/manila/share/api.py index 835db84258..e01087330b 100644 --- a/manila/share/api.py +++ b/manila/share/api.py @@ -2663,7 +2663,8 @@ class API(base.Base): """Attempts to cancel share server migration.""" if share_server['status'] != constants.STATUS_SERVER_MIGRATING: msg = _("Migration of share server %s cannot be cancelled because " - "the provided share server is not being migrated.") + "the provided share server is not being migrated." + % (share_server['id'])) LOG.error(msg) raise exception.InvalidShareServer(reason=msg)