From 8acead32ee0a22b6e3339ae62cdb0a501e4134fd Mon Sep 17 00:00:00 2001 From: Jan Hartkopf Date: Tue, 8 Mar 2022 15:55:55 +0100 Subject: [PATCH] volume: fix backup list of deleted volume When trying to list backups of a deleted volume with --volume, openstackclient fails because the volume does not exist. However, for listing a volume's backups, the volume itself does not need to be present. Fix this issue by allowing the volume of the requested backups to not exist. Story: 2009901 Task: 44716 Change-Id: Iea1a567151f427fa0e1ccff3af5cbeab620defcd Signed-off-by: Jan Hartkopf --- openstackclient/volume/v2/volume_backup.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/openstackclient/volume/v2/volume_backup.py b/openstackclient/volume/v2/volume_backup.py index 96b22a681c..f2d89dc73f 100644 --- a/openstackclient/volume/v2/volume_backup.py +++ b/openstackclient/volume/v2/volume_backup.py @@ -310,9 +310,17 @@ class ListVolumeBackup(command.Lister): filter_volume_id = None if parsed_args.volume: - filter_volume_id = utils.find_resource( - volume_client.volumes, parsed_args.volume, - ).id + try: + filter_volume_id = utils.find_resource( + volume_client.volumes, parsed_args.volume, + ).id + except exceptions.CommandError: + # Volume with that ID does not exist, but search for backups + # for that volume nevertheless + LOG.debug("No volume with ID %s existing, continuing to " + "search for backups for that volume ID", + parsed_args.volume) + filter_volume_id = parsed_args.volume marker_backup_id = None if parsed_args.marker: