Merge "Make set/unset commands in compute/image/common return normally when nothing specified"

5 files changed, 13 insertions, 21 deletions

diff --git a/openstackclient/common/quota.py b/openstackclient/common/quota.py
index 087d8ea3..69415f0d 100644
--- a/openstackclient/common/quota.py
+++ b/openstackclient/common/quota.py
@@ -142,11 +142,6 @@ class SetQuota(command.Command):
                 if value is not None:
                     compute_kwargs[k] = value
 
-        if (compute_kwargs == {} and volume_kwargs == {}
-                and network_kwargs == {}):
-            sys.stderr.write("No quotas updated\n")
-            return
-
         if parsed_args.project:
             project = utils.find_resource(
                 identity_client.projects,
diff --git a/openstackclient/compute/v2/flavor.py b/openstackclient/compute/v2/flavor.py
index f2acfc39..01d7da75 100644
--- a/openstackclient/compute/v2/flavor.py
+++ b/openstackclient/compute/v2/flavor.py
@@ -320,9 +320,6 @@ class SetFlavor(command.Command):
 
         flavor = _find_flavor(compute_client, parsed_args.flavor)
 
-        if not parsed_args.property and not parsed_args.project:
-            raise exceptions.CommandError(_("Nothing specified to be set."))
-
         result = 0
         if parsed_args.property:
             try:
@@ -409,9 +406,6 @@ class UnsetFlavor(command.Command):
 
         flavor = _find_flavor(compute_client, parsed_args.flavor)
 
-        if not parsed_args.property and not parsed_args.project:
-            raise exceptions.CommandError(_("Nothing specified to be unset."))
-
         result = 0
         if parsed_args.property:
             try:
diff --git a/openstackclient/image/v1/image.py b/openstackclient/image/v1/image.py
index 27467b0c..e7b60e5a 100644
--- a/openstackclient/image/v1/image.py
+++ b/openstackclient/image/v1/image.py
@@ -691,10 +691,6 @@ class SetImage(command.Command):
                 image.properties.update(kwargs['properties'])
                 kwargs['properties'] = image.properties
 
-            if not kwargs:
-                LOG.warning(_('no arguments specified'))
-                return
-
             image = image_client.images.update(image.id, **kwargs)
         finally:
             # Clean up open files - make sure data isn't a string
diff --git a/openstackclient/tests/compute/v2/test_flavor.py b/openstackclient/tests/compute/v2/test_flavor.py
index aea31644..da76b6d7 100644
--- a/openstackclient/tests/compute/v2/test_flavor.py
+++ b/openstackclient/tests/compute/v2/test_flavor.py
@@ -596,8 +596,12 @@ class TestFlavorSet(TestFlavor):
             ('flavor', self.flavor.id),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-        self.assertRaises(exceptions.CommandError, self.cmd.take_action,
-                          parsed_args)
+        result = self.cmd.take_action(parsed_args)
+
+        self.flavors_mock.find.assert_called_with(name=parsed_args.flavor,
+                                                  is_public=None)
+        self.flavor_access_mock.add_tenant_access.assert_not_called()
+        self.assertIsNone(result)
 
 
 class TestFlavorShow(TestFlavor):
@@ -771,5 +775,8 @@ class TestFlavorUnset(TestFlavor):
             ('flavor', self.flavor.id),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-        self.assertRaises(exceptions.CommandError, self.cmd.take_action,
-                          parsed_args)
+
+        result = self.cmd.take_action(parsed_args)
+        self.assertIsNone(result)
+
+        self.flavor_access_mock.remove_tenant_access.assert_not_called()
diff --git a/openstackclient/tests/image/v1/test_image.py b/openstackclient/tests/image/v1/test_image.py
index 99c0b0ee..14aa331f 100644
--- a/openstackclient/tests/image/v1/test_image.py
+++ b/openstackclient/tests/image/v1/test_image.py
@@ -475,8 +475,8 @@ class TestImageSet(TestImage):
 
         result = self.cmd.take_action(parsed_args)
 
-        # Verify update() was not called, if it was show the args
-        self.assertEqual(self.images_mock.update.call_args_list, [])
+        self.images_mock.update.assert_called_with(image_fakes.image_id,
+                                                   **{})
         self.assertIsNone(result)
 
     def test_image_set_options(self):