openstack/python-openstackclient
Code Issues Proposed changes

Merge "v3 endpoint set shouldn't always need service option"

Browse Source
This commit is contained in:
Jenkins
2014-08-07 20:25:26 +00:00
committed by Gerrit Code Review
parent b5001e4b21 a9fb5fa102
commit 043572bc3f
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
openstackclient/identity/v3/endpoint.py
View File

@@ -181,16 +181,20 @@ class SetEndpoint(command.Command):
identity_client = self.app.client_manager.identity identity_client = self.app.client_manager.identity
endpoint = utils.find_resource(identity_client.endpoints, endpoint = utils.find_resource(identity_client.endpoints,
parsed_args.endpoint) parsed_args.endpoint)
service = common.find_service(identity_client, parsed_args.service)
if (not parsed_args.interface and not parsed_args.url if (not parsed_args.interface and not parsed_args.url
and not parsed_args.service and not parsed_args.region): and not parsed_args.service and not parsed_args.region):
sys.stdout.write("Endpoint not updated, no arguments present") sys.stdout.write("Endpoint not updated, no arguments present")
return return
service_id = None
if parsed_args.service:
service = common.find_service(identity_client, parsed_args.service)
service_id = service.id
identity_client.endpoints.update( identity_client.endpoints.update(
endpoint.id, endpoint.id,
service=service.id, service=service_id,
url=parsed_args.url, url=parsed_args.url,
interface=parsed_args.interface, interface=parsed_args.interface,
region=parsed_args.region, region=parsed_args.region,