Merge "image: Ignore '--progress' if providing image data from stdin"

Author: Zuul

openstackclient/image/v2/image.py

@@ -476,7 +476,9 @@ def _take_action_image(self, parsed_args):
             LOG.warning(_("Failed to get an image file."))
             return {}, {}
 
-        if fp is not None and parsed_args.progress:
+        if parsed_args.progress and parsed_args.file:
+            # NOTE(stephenfin): we only show a progress bar if the user
+            # requested it *and* we're reading from a file (not stdin)
             filesize = os.path.getsize(fname)
             if filesize is not None:
                 kwargs['validate_checksum'] = False

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

@@ -252,6 +252,37 @@ def test_image_create_file(self):
             self.expected_data,
             data)
 
+    @mock.patch('openstackclient.image.v2.image.get_data_file')
+    def test_image_create__progress_ignore_with_stdin(
+        self, mock_get_data_file,
+    ):
+        fake_stdin = io.StringIO('fake-image-data')
+        mock_get_data_file.return_value = (fake_stdin, None)
+
+        arglist = [
+            '--progress',
+            self.new_image.name,
+        ]
+        verifylist = [
+            ('progress', True),
+            ('name', self.new_image.name),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        columns, data = self.cmd.take_action(parsed_args)
+
+        self.client.create_image.assert_called_with(
+            name=self.new_image.name,
+            allow_duplicates=True,
+            container_format=image.DEFAULT_CONTAINER_FORMAT,
+            disk_format=image.DEFAULT_DISK_FORMAT,
+            data=fake_stdin,
+            validate_checksum=False,
+        )
+
+        self.assertEqual(self.expected_columns, columns)
+        self.assertCountEqual(self.expected_data, data)
+
     def test_image_create_dead_options(self):
 
         arglist = [