Merge "Make set/unset commands pass normally when nothing specified in identityv3"

Author: Jenkins

openstackclient/identity/v3/consumer.py

@@ -15,8 +15,6 @@
 
 """Identity v3 Consumer action implementations"""
 
-import sys
-
 from osc_lib.command import command
 from osc_lib import utils
 import six
@@ -102,10 +100,6 @@ def take_action(self, parsed_args):
         if parsed_args.description:
             kwargs['description'] = parsed_args.description
 
-        if not len(kwargs):
-            sys.stdout.write(_('Consumer not updated, no arguments present\n'))
-            return
-
         consumer = identity_client.oauth1.consumers.update(
             consumer.id, **kwargs)
 

openstackclient/identity/v3/domain.py

@@ -16,7 +16,6 @@
 """Identity v3 Domain action implementations"""
 
 import logging
-import sys
 
 from keystoneauth1 import exceptions as ks_exc
 from osc_lib.command import command
@@ -168,9 +167,6 @@ def take_action(self, parsed_args):
         if parsed_args.disable:
             kwargs['enabled'] = False
 
-        if not kwargs:
-            sys.stdout.write(_("Domain not updated, no arguments present\n"))
-            return
         identity_client.domains.update(domain.id, **kwargs)
 
 

openstackclient/identity/v3/endpoint.py

@@ -15,8 +15,6 @@
 
 """Identity v3 Endpoint action implementations"""
 
-import sys
-
 from osc_lib.command import command
 from osc_lib import utils
 import six
@@ -212,12 +210,6 @@ def take_action(self, parsed_args):
         endpoint = utils.find_resource(identity_client.endpoints,
                                        parsed_args.endpoint)
 
-        if (not parsed_args.interface and not parsed_args.url
-                and not parsed_args.service and not parsed_args.region
-                and not parsed_args.enabled and not parsed_args.disabled):
-            sys.stdout.write(_("Endpoint not updated, no arguments present\n"))
-            return
-
         service_id = None
         if parsed_args.service:
             service = common.find_service(identity_client, parsed_args.service)

openstackclient/identity/v3/federation_protocol.py

@@ -149,10 +149,6 @@ def get_parser(self, prog_name):
     def take_action(self, parsed_args):
         identity_client = self.app.client_manager.identity
 
-        if not parsed_args.mapping:
-            LOG.error(_("No changes requested"))
-            return
-
         protocol = identity_client.federation.protocols.update(
             parsed_args.identity_provider, parsed_args.federation_protocol,
             parsed_args.mapping)

openstackclient/identity/v3/group.py

@@ -343,9 +343,6 @@ def take_action(self, parsed_args):
         if parsed_args.description:
             kwargs['description'] = parsed_args.description
 
-        if not len(kwargs):
-            sys.stderr.write("Group not updated, no arguments present\n")
-            return
         identity_client.groups.update(group.id, **kwargs)
 
 

openstackclient/identity/v3/identity_provider.py

@@ -169,14 +169,6 @@ def get_parser(self, prog_name):
     def take_action(self, parsed_args):
         federation_client = self.app.client_manager.identity.federation
 
-        # Basic argument checking
-        if (not parsed_args.enable and not parsed_args.disable and
-                not parsed_args.remote_id and
-                not parsed_args.remote_id_file and
-                not parsed_args.description):
-            LOG.error(_('No changes requested'))
-            return (None, None)
-
         # Always set remote_ids if either is passed in
         if parsed_args.remote_id_file:
             file_content = utils.read_blob_file_contents(

openstackclient/identity/v3/mapping.py

@@ -162,10 +162,6 @@ def get_parser(self, prog_name):
     def take_action(self, parsed_args):
         identity_client = self.app.client_manager.identity
 
-        if not parsed_args.rules:
-            LOG.error(_("No changes requested"))
-            return
-
         rules = self._read_rules(parsed_args.rules)
 
         mapping = identity_client.federation.mappings.update(

openstackclient/identity/v3/policy.py

@@ -15,8 +15,6 @@
 
 """Identity v3 Policy action implementations"""
 
-import sys
-
 from osc_lib.command import command
 from osc_lib import utils
 import six
@@ -136,9 +134,6 @@ def take_action(self, parsed_args):
         if parsed_args.type:
             kwargs['type'] = parsed_args.type
 
-        if not kwargs:
-            sys.stdout.write(_('Policy not updated, no arguments present\n'))
-            return
         identity_client.policies.update(parsed_args.policy, **kwargs)
 
 

openstackclient/identity/v3/project.py

@@ -263,13 +263,6 @@ def get_parser(self, prog_name):
     def take_action(self, parsed_args):
         identity_client = self.app.client_manager.identity
 
-        if (not parsed_args.name
-                and not parsed_args.domain
-                and not parsed_args.description
-                and not parsed_args.enable
-                and not parsed_args.property
-                and not parsed_args.disable):
-            return
         project = common.find_project(identity_client,
                                       parsed_args.project,
                                       parsed_args.domain)

openstackclient/identity/v3/region.py

@@ -132,8 +132,6 @@ def get_parser(self, prog_name):
     def take_action(self, parsed_args):
         identity_client = self.app.client_manager.identity
 
-        if not parsed_args.parent_region and not parsed_args.description:
-            return
         kwargs = {}
         if parsed_args.description:
             kwargs['description'] = parsed_args.description