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

8 files changed, 0 insertions, 44 deletions

diff --git a/openstackclient/volume/v1/qos_specs.py b/openstackclient/volume/v1/qos_specs.py
index b9eb8752..c49477a0 100644
--- a/openstackclient/volume/v1/qos_specs.py
+++ b/openstackclient/volume/v1/qos_specs.py
@@ -202,8 +202,6 @@ class SetQos(command.Command):
         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 @@ class UnsetQos(command.Command):
         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"))
diff --git a/openstackclient/volume/v1/snapshot.py b/openstackclient/volume/v1/snapshot.py
index bf5bf264..5132d71e 100644
--- a/openstackclient/volume/v1/snapshot.py
+++ b/openstackclient/volume/v1/snapshot.py
@@ -208,10 +208,6 @@ class SetSnapshot(command.Command):
         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 @@ class UnsetSnapshot(command.Command):
                 snapshot.id,
                 parsed_args.property,
             )
-        else:
-            self.app.log.error(_("No changes requested\n"))
diff --git a/openstackclient/volume/v1/volume.py b/openstackclient/volume/v1/volume.py
index 11e42f83..ffec1803 100644
--- a/openstackclient/volume/v1/volume.py
+++ b/openstackclient/volume/v1/volume.py
@@ -363,9 +363,6 @@ class SetVolume(command.Command):
         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 @@ class UnsetVolume(command.Command):
                 volume.id,
                 parsed_args.property,
             )
-        else:
-            self.app.log.error(_("No changes requested\n"))
diff --git a/openstackclient/volume/v1/volume_type.py b/openstackclient/volume/v1/volume_type.py
index 73927022..4e9b1920 100644
--- a/openstackclient/volume/v1/volume_type.py
+++ b/openstackclient/volume/v1/volume_type.py
@@ -181,5 +181,3 @@ class UnsetVolumeType(command.Command):
 
         if parsed_args.property:
             volume_type.unset_keys(parsed_args.property)
-        else:
-            self.app.log.error(_("No changes requested\n"))
diff --git a/openstackclient/volume/v2/qos_specs.py b/openstackclient/volume/v2/qos_specs.py
index 3cea3303..90e11c77 100644
--- a/openstackclient/volume/v2/qos_specs.py
+++ b/openstackclient/volume/v2/qos_specs.py
@@ -202,8 +202,6 @@ class SetQos(command.Command):
         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 @@ class UnsetQos(command.Command):
         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"))
diff --git a/openstackclient/volume/v2/snapshot.py b/openstackclient/volume/v2/snapshot.py
index 2886aaef..d9017080 100644
--- a/openstackclient/volume/v2/snapshot.py
+++ b/openstackclient/volume/v2/snapshot.py
@@ -205,11 +205,6 @@ class SetSnapshot(command.Command):
         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 @@ class UnsetSnapshot(command.Command):
                 snapshot.id,
                 parsed_args.property,
             )
-        else:
-            self.app.log.error(_("No changes requested\n"))
diff --git a/openstackclient/volume/v2/volume.py b/openstackclient/volume/v2/volume.py
index 0e07aa78..18473da3 100644
--- a/openstackclient/volume/v2/volume.py
+++ b/openstackclient/volume/v2/volume.py
@@ -385,10 +385,6 @@ class SetVolume(command.Command):
         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"""
diff --git a/openstackclient/volume/v2/volume_type.py b/openstackclient/volume/v2/volume_type.py
index 200d9bd5..e44e39ff 100644
--- a/openstackclient/volume/v2/volume_type.py
+++ b/openstackclient/volume/v2/volume_type.py
@@ -176,13 +176,6 @@ class SetVolumeType(command.Command):
         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 @@ class UnsetVolumeType(command.Command):
             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: