Skip to content

Commit c079e13

Browse files
Steve Martinelligildub
authored andcommitted
better format remote IDs for identity providers
remote-ids are a list, and we should format these values as such, rather than python representations of lists/arrays. Closes-Bug: 1478995 Change-Id: Ia6ced0fab2435b8cb486822c676c0dee32613abe
1 parent 6611f37 commit c079e13

3 files changed

Lines changed: 15 additions & 10 deletions

File tree

openstackclient/identity/v3/identity_provider.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,8 @@ def take_action(self, parsed_args):
8888
enabled=parsed_args.enabled)
8989

9090
idp._info.pop('links', None)
91+
remote_ids = utils.format_list(idp._info.pop('remote_ids', []))
92+
idp._info['remote_ids'] = remote_ids
9193
return zip(*sorted(six.iteritems(idp._info)))
9294

9395

@@ -221,9 +223,11 @@ def get_parser(self, prog_name):
221223
@utils.log_method(log)
222224
def take_action(self, parsed_args):
223225
identity_client = self.app.client_manager.identity
224-
identity_provider = utils.find_resource(
226+
idp = utils.find_resource(
225227
identity_client.federation.identity_providers,
226228
parsed_args.identity_provider)
227229

228-
identity_provider._info.pop('links', None)
229-
return zip(*sorted(six.iteritems(identity_provider._info)))
230+
idp._info.pop('links', None)
231+
remote_ids = utils.format_list(idp._info.pop('remote_ids', []))
232+
idp._info['remote_ids'] = remote_ids
233+
return zip(*sorted(six.iteritems(idp._info)))

openstackclient/tests/identity/v3/fakes.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,7 @@
261261
idp_id = 'test_idp'
262262
idp_description = 'super exciting IdP description'
263263
idp_remote_ids = ['entity1', 'entity2']
264+
formatted_idp_remote_ids = 'entity1, entity2'
264265

265266
IDENTITY_PROVIDER = {
266267
'id': idp_id,

openstackclient/tests/identity/v3/test_identity_provider.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ def test_create_identity_provider_no_options(self):
6969
identity_fakes.idp_description,
7070
True,
7171
identity_fakes.idp_id,
72-
identity_fakes.idp_remote_ids
72+
identity_fakes.formatted_idp_remote_ids
7373
)
7474
self.assertEqual(datalist, data)
7575

@@ -103,7 +103,7 @@ def test_create_identity_provider_description(self):
103103
identity_fakes.idp_description,
104104
True,
105105
identity_fakes.idp_id,
106-
identity_fakes.idp_remote_ids
106+
identity_fakes.formatted_idp_remote_ids
107107
)
108108
self.assertEqual(datalist, data)
109109

@@ -137,7 +137,7 @@ def test_create_identity_provider_remote_id(self):
137137
identity_fakes.idp_description,
138138
True,
139139
identity_fakes.idp_id,
140-
identity_fakes.idp_remote_ids
140+
identity_fakes.formatted_idp_remote_ids
141141
)
142142
self.assertEqual(datalist, data)
143143

@@ -172,7 +172,7 @@ def test_create_identity_provider_remote_ids_multiple(self):
172172
identity_fakes.idp_description,
173173
True,
174174
identity_fakes.idp_id,
175-
identity_fakes.idp_remote_ids
175+
identity_fakes.formatted_idp_remote_ids
176176
)
177177
self.assertEqual(datalist, data)
178178

@@ -211,7 +211,7 @@ def test_create_identity_provider_remote_ids_file(self):
211211
identity_fakes.idp_description,
212212
True,
213213
identity_fakes.idp_id,
214-
identity_fakes.idp_remote_ids
214+
identity_fakes.formatted_idp_remote_ids
215215
)
216216
self.assertEqual(datalist, data)
217217

@@ -253,7 +253,7 @@ def test_create_identity_provider_disabled(self):
253253
None,
254254
False,
255255
identity_fakes.idp_id,
256-
identity_fakes.idp_remote_ids
256+
identity_fakes.formatted_idp_remote_ids
257257
)
258258
self.assertEqual(datalist, data)
259259

@@ -363,7 +363,7 @@ def test_identity_provider_show(self):
363363
identity_fakes.idp_description,
364364
True,
365365
identity_fakes.idp_id,
366-
identity_fakes.idp_remote_ids
366+
identity_fakes.formatted_idp_remote_ids
367367
)
368368
self.assertEqual(datalist, data)
369369

0 commit comments

Comments
 (0)