Skip to content

Commit 475f2ce

Browse files
Zuulopenstack-gerrit
authored andcommitted
Merge "Fix limit list --service passing object instead of ID"
2 parents 4a823a5 + f179a1f commit 475f2ce

2 files changed

Lines changed: 42 additions & 1 deletion

File tree

openstackclient/identity/v3/limit.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ def take_action(
171171
if parsed_args.service:
172172
kwargs["service_id"] = common_utils.find_service_sdk(
173173
identity_client, parsed_args.service
174-
)
174+
).id
175175

176176
if parsed_args.region:
177177
kwargs["region_id"] = identity_client.get_region(

openstackclient/tests/unit/identity/v3/test_limit.py

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -450,3 +450,44 @@ def test_limit_list(self):
450450
),
451451
)
452452
self.assertEqual(datalist, tuple(data))
453+
454+
def test_limit_list_with_service_filter(self):
455+
self.identity_sdk_client.find_service.return_value = self.service
456+
457+
arglist = [
458+
'--service',
459+
self.service.name,
460+
]
461+
verifylist = [
462+
('service', self.service.name),
463+
]
464+
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
465+
466+
columns, data = self.cmd.take_action(parsed_args)
467+
468+
self.identity_sdk_client.limits.assert_called_with(
469+
service_id=self.service.id,
470+
)
471+
472+
collist = (
473+
'ID',
474+
'Project ID',
475+
'Service ID',
476+
'Resource Name',
477+
'Resource Limit',
478+
'Description',
479+
'Region ID',
480+
)
481+
self.assertEqual(collist, columns)
482+
datalist = (
483+
(
484+
self.limit.id,
485+
self.project.id,
486+
self.service.id,
487+
self.limit.resource_name,
488+
self.limit.resource_limit,
489+
None,
490+
None,
491+
),
492+
)
493+
self.assertEqual(datalist, tuple(data))

0 commit comments

Comments
 (0)