Skip to content

Commit e5a3c40

Browse files
author
Huanxuan Ao
committed
Make set/unset commands pass normally when nothing specified in identityv3
Change-Id: I554b41969f96b62a2c6d37024caa56b1441d5ed1 Partial-bug: #1588588
1 parent 5a21eb2 commit e5a3c40

19 files changed

Lines changed: 32 additions & 94 deletions

openstackclient/identity/v3/consumer.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515

1616
"""Identity v3 Consumer action implementations"""
1717

18-
import sys
19-
2018
from osc_lib.command import command
2119
from osc_lib import utils
2220
import six
@@ -102,10 +100,6 @@ def take_action(self, parsed_args):
102100
if parsed_args.description:
103101
kwargs['description'] = parsed_args.description
104102

105-
if not len(kwargs):
106-
sys.stdout.write(_('Consumer not updated, no arguments present\n'))
107-
return
108-
109103
consumer = identity_client.oauth1.consumers.update(
110104
consumer.id, **kwargs)
111105

openstackclient/identity/v3/domain.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
"""Identity v3 Domain action implementations"""
1717

1818
import logging
19-
import sys
2019

2120
from keystoneauth1 import exceptions as ks_exc
2221
from osc_lib.command import command
@@ -168,9 +167,6 @@ def take_action(self, parsed_args):
168167
if parsed_args.disable:
169168
kwargs['enabled'] = False
170169

171-
if not kwargs:
172-
sys.stdout.write(_("Domain not updated, no arguments present\n"))
173-
return
174170
identity_client.domains.update(domain.id, **kwargs)
175171

176172

openstackclient/identity/v3/endpoint.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515

1616
"""Identity v3 Endpoint action implementations"""
1717

18-
import sys
19-
2018
from osc_lib.command import command
2119
from osc_lib import utils
2220
import six
@@ -212,12 +210,6 @@ def take_action(self, parsed_args):
212210
endpoint = utils.find_resource(identity_client.endpoints,
213211
parsed_args.endpoint)
214212

215-
if (not parsed_args.interface and not parsed_args.url
216-
and not parsed_args.service and not parsed_args.region
217-
and not parsed_args.enabled and not parsed_args.disabled):
218-
sys.stdout.write(_("Endpoint not updated, no arguments present\n"))
219-
return
220-
221213
service_id = None
222214
if parsed_args.service:
223215
service = common.find_service(identity_client, parsed_args.service)

openstackclient/identity/v3/federation_protocol.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -149,10 +149,6 @@ def get_parser(self, prog_name):
149149
def take_action(self, parsed_args):
150150
identity_client = self.app.client_manager.identity
151151

152-
if not parsed_args.mapping:
153-
LOG.error(_("No changes requested"))
154-
return
155-
156152
protocol = identity_client.federation.protocols.update(
157153
parsed_args.identity_provider, parsed_args.federation_protocol,
158154
parsed_args.mapping)

openstackclient/identity/v3/group.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -343,9 +343,6 @@ def take_action(self, parsed_args):
343343
if parsed_args.description:
344344
kwargs['description'] = parsed_args.description
345345

346-
if not len(kwargs):
347-
sys.stderr.write("Group not updated, no arguments present\n")
348-
return
349346
identity_client.groups.update(group.id, **kwargs)
350347

351348

openstackclient/identity/v3/identity_provider.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -169,14 +169,6 @@ def get_parser(self, prog_name):
169169
def take_action(self, parsed_args):
170170
federation_client = self.app.client_manager.identity.federation
171171

172-
# Basic argument checking
173-
if (not parsed_args.enable and not parsed_args.disable and
174-
not parsed_args.remote_id and
175-
not parsed_args.remote_id_file and
176-
not parsed_args.description):
177-
LOG.error(_('No changes requested'))
178-
return (None, None)
179-
180172
# Always set remote_ids if either is passed in
181173
if parsed_args.remote_id_file:
182174
file_content = utils.read_blob_file_contents(

openstackclient/identity/v3/mapping.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -162,10 +162,6 @@ def get_parser(self, prog_name):
162162
def take_action(self, parsed_args):
163163
identity_client = self.app.client_manager.identity
164164

165-
if not parsed_args.rules:
166-
LOG.error(_("No changes requested"))
167-
return
168-
169165
rules = self._read_rules(parsed_args.rules)
170166

171167
mapping = identity_client.federation.mappings.update(

openstackclient/identity/v3/policy.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515

1616
"""Identity v3 Policy action implementations"""
1717

18-
import sys
19-
2018
from osc_lib.command import command
2119
from osc_lib import utils
2220
import six
@@ -136,9 +134,6 @@ def take_action(self, parsed_args):
136134
if parsed_args.type:
137135
kwargs['type'] = parsed_args.type
138136

139-
if not kwargs:
140-
sys.stdout.write(_('Policy not updated, no arguments present\n'))
141-
return
142137
identity_client.policies.update(parsed_args.policy, **kwargs)
143138

144139

openstackclient/identity/v3/project.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -263,13 +263,6 @@ def get_parser(self, prog_name):
263263
def take_action(self, parsed_args):
264264
identity_client = self.app.client_manager.identity
265265

266-
if (not parsed_args.name
267-
and not parsed_args.domain
268-
and not parsed_args.description
269-
and not parsed_args.enable
270-
and not parsed_args.property
271-
and not parsed_args.disable):
272-
return
273266
project = common.find_project(identity_client,
274267
parsed_args.project,
275268
parsed_args.domain)

openstackclient/identity/v3/region.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,6 @@ def get_parser(self, prog_name):
132132
def take_action(self, parsed_args):
133133
identity_client = self.app.client_manager.identity
134134

135-
if not parsed_args.parent_region and not parsed_args.description:
136-
return
137135
kwargs = {}
138136
if parsed_args.description:
139137
kwargs['description'] = parsed_args.description

0 commit comments

Comments
 (0)