Skip to content

Commit 799a073

Browse files
committed
image: Fail if we can't find an image
Whenever we attempt to find a provided image, we generally want to fail fast if they can't be found. This wasn't happening. Fix it. Change-Id: Ibea38354a78381cb87d287f03726ecd03ecd246d Signed-off-by: Stephen Finucane <sfinucan@redhat.com>
1 parent a538104 commit 799a073

2 files changed

Lines changed: 26 additions & 9 deletions

File tree

openstackclient/image/v2/image.py

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,8 @@ def take_action(self, parsed_args):
190190
).id
191191

192192
image = image_client.find_image(
193-
parsed_args.image, ignore_missing=False
193+
parsed_args.image,
194+
ignore_missing=False,
194195
)
195196

196197
obj = image_client.add_member(
@@ -663,7 +664,8 @@ def take_action(self, parsed_args):
663664
for image in parsed_args.images:
664665
try:
665666
image_obj = image_client.find_image(
666-
image, ignore_missing=False
667+
image,
668+
ignore_missing=False,
667669
)
668670
image_client.delete_image(image_obj.id)
669671
except Exception as e:
@@ -834,7 +836,10 @@ def take_action(self, parsed_args):
834836
if parsed_args.limit:
835837
kwargs['limit'] = parsed_args.limit
836838
if parsed_args.marker:
837-
kwargs['marker'] = image_client.find_image(parsed_args.marker).id
839+
kwargs['marker'] = image_client.find_image(
840+
parsed_args.marker,
841+
ignore_missing=False,
842+
).id
838843
if parsed_args.name:
839844
kwargs['name'] = parsed_args.name
840845
if parsed_args.status:
@@ -931,7 +936,10 @@ def take_action(self, parsed_args):
931936
image_client = self.app.client_manager.image
932937
columns = ("Image ID", "Member ID", "Status")
933938

934-
image_id = image_client.find_image(parsed_args.image).id
939+
image_id = image_client.find_image(
940+
parsed_args.image,
941+
ignore_missing=False,
942+
).id
935943

936944
data = image_client.members(image=image_id)
937945

@@ -976,7 +984,8 @@ def take_action(self, parsed_args):
976984
).id
977985

978986
image = image_client.find_image(
979-
parsed_args.image, ignore_missing=False
987+
parsed_args.image,
988+
ignore_missing=False,
980989
)
981990

982991
image_client.remove_member(member=project_id, image=image.id)
@@ -1002,7 +1011,10 @@ def get_parser(self, prog_name):
10021011

10031012
def take_action(self, parsed_args):
10041013
image_client = self.app.client_manager.image
1005-
image = image_client.find_image(parsed_args.image)
1014+
image = image_client.find_image(
1015+
parsed_args.image,
1016+
ignore_missing=False,
1017+
)
10061018

10071019
output_file = parsed_args.filename
10081020
if output_file is None:
@@ -1370,7 +1382,8 @@ def take_action(self, parsed_args):
13701382
image_client = self.app.client_manager.image
13711383

13721384
image = image_client.find_image(
1373-
parsed_args.image, ignore_missing=False
1385+
parsed_args.image,
1386+
ignore_missing=False,
13741387
)
13751388

13761389
info = _format_image(image, parsed_args.human_readable)
@@ -1414,7 +1427,8 @@ def get_parser(self, prog_name):
14141427
def take_action(self, parsed_args):
14151428
image_client = self.app.client_manager.image
14161429
image = image_client.find_image(
1417-
parsed_args.image, ignore_missing=False
1430+
parsed_args.image,
1431+
ignore_missing=False,
14181432
)
14191433

14201434
kwargs = {}

openstackclient/tests/unit/image/v2/test_image.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -905,7 +905,10 @@ def test_image_list_marker_option(self, fr_mock):
905905
marker=self._image.id,
906906
)
907907

908-
self.client.find_image.assert_called_with('graven')
908+
self.client.find_image.assert_called_with(
909+
'graven',
910+
ignore_missing=False,
911+
)
909912

910913
def test_image_list_name_option(self):
911914
arglist = [

0 commit comments

Comments
 (0)