Merge "Make set/unset command in identity and image pass normally when nothing specified"

1 files changed, 0 insertions, 13 deletions

diff --git a/openstackclient/image/v2/image.py b/openstackclient/image/v2/image.py
index d20fdba6..53f9530b 100644
--- a/openstackclient/image/v2/image.py
+++ b/openstackclient/image/v2/image.py
@@ -817,11 +817,6 @@ class SetImage(command.Command):
                 parsed_args.project_domain,
             ).id
 
-        # Checks if anything that requires getting the image
-        if not (kwargs or parsed_args.deactivate or parsed_args.activate):
-            msg = _("No arguments specified")
-            raise exceptions.CommandError(msg)
-
         image = utils.find_resource(
             image_client.images, parsed_args.image)
 
@@ -833,10 +828,6 @@ class SetImage(command.Command):
             image_client.images.reactivate(image.id)
             activation_status = "activated"
 
-        # Check if need to do the actual update
-        if not kwargs:
-            return {}, {}
-
         if parsed_args.tags:
             # Tags should be extended, but duplicates removed
             kwargs['tags'] = list(set(image.tags).union(set(parsed_args.tags)))
@@ -909,10 +900,6 @@ class UnsetImage(command.Command):
             parsed_args.image,
         )
 
-        if not (parsed_args.tags or parsed_args.properties):
-            msg = _("No arguments specified")
-            raise exceptions.CommandError(msg)
-
         kwargs = {}
         tagret = 0
         propret = 0