image set should not show the resource

the rest of OSC set commands do not show the resource after it has
been updated. unless the update fails then we report back a failure,
otherwise the user should assume everything went fine.

Change-Id: I2bd4188450c3853b4a1bc25f80fc9450cda32bdd

Author: Steve Martinelli

doc/source/backwards-incompatible.rst

@@ -90,6 +90,18 @@ List of Backwards Incompatible Changes
   * Bug: https://bugs.launchpad.net/python-openstackclient/+bug/1453229
   * Commit: https://review.openstack.org/#/c/181514/
 
+7. `image set` commands will no longer return the modified resource
+
+  Previously, modifying an image would result in the new image being displayed
+  to the user. To keep things consistent with other `set` commands, we will
+  no longer be showing the modified resource.
+
+  * In favor of: Use `set` then `show`
+  * As of: NA
+  * Removed in: NA
+  * Bug: NA
+  * Commit: NA
+
 For Developers
 ==============
 

functional/tests/image/v1/test_image.py

@@ -35,10 +35,9 @@ def setUpClass(cls):
     @classmethod
     def tearDownClass(cls):
         # Rename test
-        opts = cls.get_show_opts(cls.FIELDS)
-        raw_output = cls.openstack(
-            'image set --name ' + cls.OTHER_NAME + ' ' + cls.NAME + opts)
-        cls.assertOutput(cls.OTHER_NAME + "\n", raw_output)
+        raw_output = cls.openstack('image set --name ' + cls.OTHER_NAME + ' '
+                                   + cls.NAME)
+        cls.assertOutput('', raw_output)
         # Delete test
         raw_output = cls.openstack('image delete ' + cls.OTHER_NAME)
         cls.assertOutput('', raw_output)
@@ -56,13 +55,13 @@ def test_image_show(self):
     def test_image_set(self):
         opts = self.get_show_opts([
             "disk_format", "is_public", "min_disk", "min_ram", "name"])
-        raw_output = self.openstack('image set --min-disk 4 --min-ram 5 ' +
-                                    '--disk-format qcow2  --public ' +
-                                    self.NAME + opts)
+        self.openstack('image set --min-disk 4 --min-ram 5 ' +
+                       '--disk-format qcow2  --public ' + self.NAME)
+        raw_output = self.openstack('image show ' + self.NAME + opts)
         self.assertEqual("qcow2\nTrue\n4\n5\n" + self.NAME + '\n', raw_output)
 
     def test_image_metadata(self):
         opts = self.get_show_opts(["name", "properties"])
-        raw_output = self.openstack(
-            'image set --property a=b --property c=d ' + self.NAME + opts)
+        self.openstack('image set --property a=b --property c=d ' + self.NAME)
+        raw_output = self.openstack('image show ' + self.NAME + opts)
         self.assertEqual(self.NAME + "\na='b', c='d'\n", raw_output)

openstackclient/image/v1/image.py

@@ -452,7 +452,7 @@ def take_action(self, parsed_args):
         gc_utils.save_image(data, parsed_args.file)
 
 
-class SetImage(show.ShowOne):
+class SetImage(command.Command):
     """Set image properties"""
 
     log = logging.getLogger(__name__ + ".SetImage")
@@ -629,7 +629,7 @@ def take_action(self, parsed_args):
                         volume_client.volumes,
                         parsed_args.volume,
                     )
-                    response, body = volume_client.volumes.upload_to_image(
+                    volume_client.volumes.upload_to_image(
                         source_volume.id,
                         parsed_args.force,
                         parsed_args.image,
@@ -640,7 +640,6 @@ def take_action(self, parsed_args):
                          if parsed_args.disk_format
                          else image.disk_format),
                     )
-                    info = body['os-volume_upload_image']
                 elif parsed_args.file:
                     # Send an open file handle to glanceclient so it will
                     # do a chunked transfer
@@ -673,10 +672,7 @@ def take_action(self, parsed_args):
                kwargs['data'] != sys.stdin):
                     kwargs['data'].close()
 
-        info = {}
-        info.update(image._info)
-        info['properties'] = utils.format_dict(info.get('properties', {}))
-        return zip(*sorted(six.iteritems(info)))
+        return
 
 
 class ShowImage(show.ShowOne):

openstackclient/image/v2/image.py

@@ -521,7 +521,7 @@ def take_action(self, parsed_args):
         gc_utils.save_image(data, parsed_args.file)
 
 
-class SetImage(show.ShowOne):
+class SetImage(command.Command):
     """Set image properties"""
 
     log = logging.getLogger(__name__ + ".SetImage")
@@ -717,9 +717,6 @@ def take_action(self, parsed_args):
             kwargs['tags'] = list(set(image.tags).union(set(parsed_args.tags)))
 
         image = image_client.images.update(image.id, **kwargs)
-        info = {}
-        info.update(image)
-        return zip(*sorted(six.iteritems(info)))
 
 
 class ShowImage(show.ShowOne):

openstackclient/tests/image/v1/test_image.py

@@ -499,8 +499,7 @@ def test_image_set_options(self):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        # DisplayCommandBase.take_action() returns two tuples
-        columns, data = self.cmd.take_action(parsed_args)
+        self.cmd.take_action(parsed_args)
 
         kwargs = {
             'name': 'new-name',
@@ -517,9 +516,6 @@ def test_image_set_options(self):
             **kwargs
         )
 
-        self.assertEqual(image_fakes.IMAGE_columns, columns)
-        self.assertEqual(image_fakes.IMAGE_data, data)
-
     def test_image_set_bools1(self):
         arglist = [
             '--protected',
@@ -644,8 +640,7 @@ def test_image_update_volume(self):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        # DisplayCommandBase.take_action() returns two tuples
-        columns, data = self.cmd.take_action(parsed_args)
+        self.cmd.take_action(parsed_args)
 
         # VolumeManager.upload_to_image(volume, force, image_name,
         #     container_format, disk_format)
@@ -664,9 +659,6 @@ def test_image_update_volume(self):
             volume='volly',
         )
 
-        self.assertEqual(image_fakes.IMAGE_columns, columns)
-        self.assertEqual(image_fakes.IMAGE_data, data)
-
 
 class TestImageShow(TestImage):
 

openstackclient/tests/image/v2/test_image.py

@@ -676,7 +676,7 @@ def test_image_set_options(self):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         # DisplayCommandBase.take_action() returns two tuples
-        columns, data = self.cmd.take_action(parsed_args)
+        self.cmd.take_action(parsed_args)
 
         kwargs = {
             'name': 'new-name',
@@ -690,9 +690,6 @@ def test_image_set_options(self):
         self.images_mock.update.assert_called_with(
             image_fakes.image_id, **kwargs)
 
-        self.assertEqual(image_fakes.IMAGE_columns, columns)
-        self.assertEqual(image_fakes.IMAGE_data, data)
-
     def test_image_set_bools1(self):
         arglist = [
             '--protected',