Skip to content

Commit 21c3c33

Browse files
Zuulopenstack-gerrit
authored andcommitted
Merge "image: Fail if we can't find an image"
2 parents 1d96a89 + 799a073 commit 21c3c33

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
@@ -191,7 +191,8 @@ def take_action(self, parsed_args):
191191
).id
192192

193193
image = image_client.find_image(
194-
parsed_args.image, ignore_missing=False
194+
parsed_args.image,
195+
ignore_missing=False,
195196
)
196197

197198
obj = image_client.add_member(
@@ -664,7 +665,8 @@ def take_action(self, parsed_args):
664665
for image in parsed_args.images:
665666
try:
666667
image_obj = image_client.find_image(
667-
image, ignore_missing=False
668+
image,
669+
ignore_missing=False,
668670
)
669671
image_client.delete_image(image_obj.id)
670672
except Exception as e:
@@ -835,7 +837,10 @@ def take_action(self, parsed_args):
835837
if parsed_args.limit:
836838
kwargs['limit'] = parsed_args.limit
837839
if parsed_args.marker:
838-
kwargs['marker'] = image_client.find_image(parsed_args.marker).id
840+
kwargs['marker'] = image_client.find_image(
841+
parsed_args.marker,
842+
ignore_missing=False,
843+
).id
839844
if parsed_args.name:
840845
kwargs['name'] = parsed_args.name
841846
if parsed_args.status:
@@ -932,7 +937,10 @@ def take_action(self, parsed_args):
932937
image_client = self.app.client_manager.image
933938
columns = ("Image ID", "Member ID", "Status")
934939

935-
image_id = image_client.find_image(parsed_args.image).id
940+
image_id = image_client.find_image(
941+
parsed_args.image,
942+
ignore_missing=False,
943+
).id
936944

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

@@ -977,7 +985,8 @@ def take_action(self, parsed_args):
977985
).id
978986

979987
image = image_client.find_image(
980-
parsed_args.image, ignore_missing=False
988+
parsed_args.image,
989+
ignore_missing=False,
981990
)
982991

983992
image_client.remove_member(member=project_id, image=image.id)
@@ -1003,7 +1012,10 @@ def get_parser(self, prog_name):
10031012

10041013
def take_action(self, parsed_args):
10051014
image_client = self.app.client_manager.image
1006-
image = image_client.find_image(parsed_args.image)
1015+
image = image_client.find_image(
1016+
parsed_args.image,
1017+
ignore_missing=False,
1018+
)
10071019

10081020
output_file = parsed_args.filename
10091021
if output_file is None:
@@ -1371,7 +1383,8 @@ def take_action(self, parsed_args):
13711383
image_client = self.app.client_manager.image
13721384

13731385
image = image_client.find_image(
1374-
parsed_args.image, ignore_missing=False
1386+
parsed_args.image,
1387+
ignore_missing=False,
13751388
)
13761389

13771390
info = _format_image(image, parsed_args.human_readable)
@@ -1415,7 +1428,8 @@ def get_parser(self, prog_name):
14151428
def take_action(self, parsed_args):
14161429
image_client = self.app.client_manager.image
14171430
image = image_client.find_image(
1418-
parsed_args.image, ignore_missing=False
1431+
parsed_args.image,
1432+
ignore_missing=False,
14191433
)
14201434

14211435
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)