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

4 files changed, 7 insertions, 25 deletions

diff --git a/openstackclient/image/v1/image.py b/openstackclient/image/v1/image.py
index 68c81cd5..23f57136 100644
--- a/openstackclient/image/v1/image.py
+++ b/openstackclient/image/v1/image.py
@@ -452,7 +452,7 @@ class SaveImage(command.Command):
         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 @@ class SetImage(show.ShowOne):
                         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 @@ class SetImage(show.ShowOne):
                          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 @@ class SetImage(show.ShowOne):
                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):
diff --git a/openstackclient/image/v2/image.py b/openstackclient/image/v2/image.py
index 7ef1f780..7d8b1412 100644
--- a/openstackclient/image/v2/image.py
+++ b/openstackclient/image/v2/image.py
@@ -521,7 +521,7 @@ class SaveImage(command.Command):
         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 @@ class SetImage(show.ShowOne):
             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):
diff --git a/openstackclient/tests/image/v1/test_image.py b/openstackclient/tests/image/v1/test_image.py
index a79df8b4..d10d3b15 100644
--- a/openstackclient/tests/image/v1/test_image.py
+++ b/openstackclient/tests/image/v1/test_image.py
@@ -499,8 +499,7 @@ class TestImageSet(TestImage):
         ]
         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 @@ class TestImageSet(TestImage):
             **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 @@ class TestImageSet(TestImage):
         ]
         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 @@ class TestImageSet(TestImage):
             volume='volly',
         )
 
-        self.assertEqual(image_fakes.IMAGE_columns, columns)
-        self.assertEqual(image_fakes.IMAGE_data, data)
-
 
 class TestImageShow(TestImage):
 
diff --git a/openstackclient/tests/image/v2/test_image.py b/openstackclient/tests/image/v2/test_image.py
index 46da9c68..4ce85475 100644
--- a/openstackclient/tests/image/v2/test_image.py
+++ b/openstackclient/tests/image/v2/test_image.py
@@ -676,7 +676,7 @@ class TestImageSet(TestImage):
         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 @@ class TestImageSet(TestImage):
         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',