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

Author: Jenkins

openstackclient/common/quota.py

@@ -142,11 +142,6 @@ def take_action(self, parsed_args):
                 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,

openstackclient/compute/v2/flavor.py

@@ -320,9 +320,6 @@ def take_action(self, parsed_args):
 
         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 @@ def take_action(self, parsed_args):
 
         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:

openstackclient/image/v1/image.py

@@ -691,10 +691,6 @@ def take_action(self, parsed_args):
                 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

openstackclient/tests/compute/v2/test_flavor.py

@@ -596,8 +596,12 @@ def test_flavor_set_nothing(self):
             ('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 @@ def test_flavor_unset_nothing(self):
             ('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()

openstackclient/tests/image/v1/test_image.py

@@ -475,8 +475,8 @@ def test_image_set_no_options(self):
 
         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):

releasenotes/notes/bug-1588588-39927ef06ca35730.yaml

@@ -1,6 +1,6 @@
 ---
 upgrade:
-  - All ``set`` and ``unset`` commands in network, identity, image, and volume now
-    return normally when nothing specified to modify. This will become the default
-    behavior of OSC ``set`` and ``unset`` commands.
+  - All ``set`` and ``unset`` commands now return normally when nothing
+    specified to modify. This will become the default behavior of OSC
+    ``set`` and ``unset`` commands.
     [Bug `1588588 <https://bugs.launchpad.net/python-openstackclient/+bug/1588588>`_]