diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-04-23 23:11:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-04-23 23:11:49 +0000 |
| commit | 2643df740514376c66b38032fb64a30a73eabe0b (patch) | |
| tree | 523b2b9f8ccb9e6f16871e2a9d351f00cb92aaee /openstackclient/identity/v3/endpoint.py | |
| parent | 845f6705bf65725830b1a7bba22870f177668d86 (diff) | |
| parent | bea6e6ac23e893a85f4b0a49bab52934aca86726 (diff) | |
| download | python-openstackclient-2643df740514376c66b38032fb64a30a73eabe0b.tar.gz | |
Merge "Make endpoint commands more consistent"
Diffstat (limited to 'openstackclient/identity/v3/endpoint.py')
| -rw-r--r-- | openstackclient/identity/v3/endpoint.py | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/openstackclient/identity/v3/endpoint.py b/openstackclient/identity/v3/endpoint.py index 64334c63..3cd5e086 100644 --- a/openstackclient/identity/v3/endpoint.py +++ b/openstackclient/identity/v3/endpoint.py @@ -24,6 +24,7 @@ from cliff import lister from cliff import show from openstackclient.common import utils +from openstackclient.identity import common class CreateEndpoint(show.ShowOne): @@ -69,8 +70,7 @@ class CreateEndpoint(show.ShowOne): def take_action(self, parsed_args): self.log.debug('take_action(%s)' % parsed_args) identity_client = self.app.client_manager.identity - service = utils.find_resource(identity_client.services, - parsed_args.service) + service = common.find_service(identity_client, parsed_args.service) endpoint = identity_client.endpoints.create( service=service.id, @@ -122,8 +122,7 @@ class ListEndpoint(lister.Lister): data = identity_client.endpoints.list() for ep in data: - service = utils.find_resource( - identity_client.services, ep.service_id) + service = common.find_service(identity_client, ep.service_id) ep.service_name = service.name ep.service_type = service.type return (columns, @@ -182,8 +181,7 @@ class SetEndpoint(command.Command): identity_client = self.app.client_manager.identity endpoint = utils.find_resource(identity_client.endpoints, parsed_args.endpoint) - service = utils.find_resource(identity_client.services, - parsed_args.service) + service = common.find_service(identity_client, parsed_args.service) if (not parsed_args.interface and not parsed_args.url and not parsed_args.service and not parsed_args.region): @@ -221,8 +219,7 @@ class ShowEndpoint(show.ShowOne): endpoint = utils.find_resource(identity_client.endpoints, parsed_args.endpoint) - service = utils.find_resource(identity_client.services, - endpoint.service_id) + service = common.find_service(identity_client, endpoint.service_id) info = {} info.update(endpoint._info) |