Skip to content

Commit 5de803b

Browse files
Zuulopenstack-gerrit
authored andcommitted
Merge "Show final image state after image create"
2 parents d2d7219 + 4f95e0a commit 5de803b

File tree

2 files changed

+9
-0
lines changed

2 files changed

+9
-0
lines changed

openstackclient/image/v2/image.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -576,6 +576,9 @@ def _take_action_image(self, parsed_args):
576576
if parsed_args.filename:
577577
fp.close()
578578

579+
# NOTE(pas-ha): create_image returns the image object as it was created
580+
# before the data was uploaded, need a refresh to show the final state
581+
image = image_client.get_image(image)
579582
return _format_image(image)
580583

581584
def _take_action_volume(self, parsed_args):

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ def setUp(self):
5555
self.new_image = image_fakes.create_one_image()
5656
self.image_client.create_image.return_value = self.new_image
5757
self.image_client.update_image.return_value = self.new_image
58+
self.image_client.get_image.return_value = self.new_image
5859

5960
self.project_mock.get.return_value = self.project
6061

@@ -89,6 +90,7 @@ def test_image_reserve_no_options(self, raw_input):
8990
container_format=_image.DEFAULT_CONTAINER_FORMAT,
9091
disk_format=_image.DEFAULT_DISK_FORMAT,
9192
)
93+
self.image_client.get_image.assert_called_once_with(self.new_image)
9294

9395
self.assertEqual(self.expected_columns, columns)
9496
self.assertCountEqual(self.expected_data, data)
@@ -146,6 +148,7 @@ def test_image_reserve_options(self, raw_input):
146148
is_protected=self.new_image.is_protected,
147149
visibility=self.new_image.visibility,
148150
)
151+
self.image_client.get_image.assert_called_once_with(self.new_image)
149152

150153
self.assertEqual(self.expected_columns, columns)
151154
self.assertCountEqual(self.expected_data, data)
@@ -243,6 +246,7 @@ def test_image_create_file(self):
243246
tags=self.new_image.tags,
244247
filename=imagefile.name,
245248
)
249+
self.image_client.get_image.assert_called_once_with(self.new_image)
246250

247251
self.assertEqual(self.expected_columns, columns)
248252
self.assertCountEqual(self.expected_data, data)
@@ -275,6 +279,7 @@ def test_image_create__progress_ignore_with_stdin(
275279
data=fake_stdin,
276280
validate_checksum=False,
277281
)
282+
self.image_client.get_image.assert_called_once_with(self.new_image)
278283

279284
self.assertEqual(self.expected_columns, columns)
280285
self.assertCountEqual(self.expected_data, data)
@@ -315,6 +320,7 @@ def test_image_create_import(self, raw_input):
315320
disk_format=_image.DEFAULT_DISK_FORMAT,
316321
use_import=True,
317322
)
323+
self.image_client.get_image.assert_called_once_with(self.new_image)
318324

319325
@mock.patch('osc_lib.utils.find_resource')
320326
@mock.patch('openstackclient.image.v2.image.get_data_from_stdin')

0 commit comments

Comments
 (0)