Merge "identity: Fix filtering endpoints by project with domain"
This commit is contained in:
@@ -231,11 +231,22 @@ class ListEndpoint(command.Lister):
|
|||||||
endpoint = None
|
endpoint = None
|
||||||
if parsed_args.endpoint:
|
if parsed_args.endpoint:
|
||||||
endpoint = identity_client.find_endpoint(parsed_args.endpoint)
|
endpoint = identity_client.find_endpoint(parsed_args.endpoint)
|
||||||
project = None
|
|
||||||
|
project_domain_id = None
|
||||||
|
if parsed_args.project_domain:
|
||||||
|
project_domain_id = common._find_sdk_id(
|
||||||
|
identity_client.find_domain,
|
||||||
|
name_or_id=parsed_args.project_domain,
|
||||||
|
)
|
||||||
|
|
||||||
|
project_id = None
|
||||||
if parsed_args.project:
|
if parsed_args.project:
|
||||||
project = identity_client.find_project(
|
project_id = common._find_sdk_id(
|
||||||
parsed_args.project,
|
identity_client.find_project,
|
||||||
parsed_args.project_domain,
|
name_or_id=common._get_token_resource(
|
||||||
|
identity_client, 'project', parsed_args.project
|
||||||
|
),
|
||||||
|
domain_id=project_domain_id,
|
||||||
)
|
)
|
||||||
|
|
||||||
if endpoint:
|
if endpoint:
|
||||||
@@ -273,9 +284,9 @@ class ListEndpoint(command.Lister):
|
|||||||
region = identity_client.get_region(parsed_args.region)
|
region = identity_client.get_region(parsed_args.region)
|
||||||
kwargs['region_id'] = region.id
|
kwargs['region_id'] = region.id
|
||||||
|
|
||||||
if project:
|
if project_id:
|
||||||
data = list(
|
data = list(
|
||||||
identity_client.project_endpoints(project=project.id)
|
identity_client.project_endpoints(project=project_id)
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
data = list(identity_client.endpoints(**kwargs))
|
data = list(identity_client.endpoints(**kwargs))
|
||||||
|
|||||||
Reference in New Issue
Block a user