Merge "Make set/unset commands in volume return normally when nothing specified"

Author: Jenkins

openstackclient/tests/volume/v1/test_volume.py

@@ -578,9 +578,6 @@ def test_volume_set_no_options(self):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         result = self.cmd.take_action(parsed_args)
-
-        self.assertEqual("No changes requested\n",
-                         self.app.log.messages.get('error'))
         self.assertIsNone(result)
 
     def test_volume_set_name(self):

openstackclient/volume/v1/qos_specs.py

@@ -202,8 +202,6 @@ def take_action(self, parsed_args):
         if parsed_args.property:
             volume_client.qos_specs.set_keys(qos_spec.id,
                                              parsed_args.property)
-        else:
-            self.app.log.error(_("No changes requested\n"))
 
 
 class ShowQos(command.ShowOne):
@@ -263,5 +261,3 @@ def take_action(self, parsed_args):
         if parsed_args.property:
             volume_client.qos_specs.unset_keys(qos_spec.id,
                                                parsed_args.property)
-        else:
-            self.app.log.error(_("No changes requested\n"))

openstackclient/volume/v1/snapshot.py

@@ -208,10 +208,6 @@ def take_action(self, parsed_args):
         if parsed_args.description:
             kwargs['display_description'] = parsed_args.description
 
-        if not kwargs and not parsed_args.property:
-            self.app.log.error(_("No changes requested\n"))
-            return
-
         snapshot.update(**kwargs)
 
 
@@ -270,5 +266,3 @@ def take_action(self, parsed_args):
                 snapshot.id,
                 parsed_args.property,
             )
-        else:
-            self.app.log.error(_("No changes requested\n"))

openstackclient/volume/v1/volume.py

@@ -363,9 +363,6 @@ def take_action(self, parsed_args):
         if kwargs:
             volume_client.volumes.update(volume.id, **kwargs)
 
-        if not kwargs and not parsed_args.property and not parsed_args.size:
-            self.app.log.error(_("No changes requested\n"))
-
 
 class ShowVolume(command.ShowOne):
     """Show volume details"""
@@ -428,5 +425,3 @@ def take_action(self, parsed_args):
                 volume.id,
                 parsed_args.property,
             )
-        else:
-            self.app.log.error(_("No changes requested\n"))

openstackclient/volume/v1/volume_type.py

@@ -181,5 +181,3 @@ def take_action(self, parsed_args):
 
         if parsed_args.property:
             volume_type.unset_keys(parsed_args.property)
-        else:
-            self.app.log.error(_("No changes requested\n"))

openstackclient/volume/v2/qos_specs.py

@@ -202,8 +202,6 @@ def take_action(self, parsed_args):
         if parsed_args.property:
             volume_client.qos_specs.set_keys(qos_spec.id,
                                              parsed_args.property)
-        else:
-            self.app.log.error(_("No changes requested\n"))
 
 
 class ShowQos(command.ShowOne):
@@ -263,5 +261,3 @@ def take_action(self, parsed_args):
         if parsed_args.property:
             volume_client.qos_specs.unset_keys(qos_spec.id,
                                                parsed_args.property)
-        else:
-            self.app.log.error(_("No changes requested\n"))

openstackclient/volume/v2/snapshot.py

@@ -205,11 +205,6 @@ def take_action(self, parsed_args):
         if parsed_args.description:
             kwargs['description'] = parsed_args.description
 
-        if (not kwargs and not parsed_args.property and not
-                parsed_args.state):
-            self.app.log.error(_("No changes requested\n"))
-            return
-
         if parsed_args.property:
             volume_client.volume_snapshots.set_metadata(snapshot.id,
                                                         parsed_args.property)
@@ -271,5 +266,3 @@ def take_action(self, parsed_args):
                 snapshot.id,
                 parsed_args.property,
             )
-        else:
-            self.app.log.error(_("No changes requested\n"))

openstackclient/volume/v2/volume.py

@@ -385,10 +385,6 @@ def take_action(self, parsed_args):
         if kwargs:
             volume_client.volumes.update(volume.id, **kwargs)
 
-        if (not kwargs and not parsed_args.property
-           and not parsed_args.image_property and not parsed_args.size):
-            self.app.log.error(_("No changes requested\n"))
-
 
 class ShowVolume(command.ShowOne):
     """Display volume details"""

openstackclient/volume/v2/volume_type.py

@@ -176,13 +176,6 @@ def take_action(self, parsed_args):
         volume_type = utils.find_resource(
             volume_client.volume_types, parsed_args.volume_type)
 
-        if (not parsed_args.name
-                and not parsed_args.description
-                and not parsed_args.property
-                and not parsed_args.project):
-            self.app.log.error(_("No changes requested\n"))
-            return
-
         result = 0
         kwargs = {}
         if parsed_args.name:
@@ -285,11 +278,6 @@ def take_action(self, parsed_args):
             parsed_args.volume_type,
         )
 
-        if (not parsed_args.property
-                and not parsed_args.project):
-            self.app.log.error(_("No changes requested\n"))
-            return
-
         result = 0
         if parsed_args.property:
             try: