openstack/shade
Code Issues Proposed changes

Clarify some variable names in glance discovery

Browse Source 
I'm bad at naming things. This was unreadable. Update the variable names
so it makes sense and add a comment.

Change-Id: Iacbaeed91d71dca35c6fdd7d07999bd5956430fa
This commit is contained in:
Monty Taylor 2017-04-19 07:41:21 -05:00
parent afed15f371
commit 49fe112b85
No known key found for this signature in database
GPG Key ID: 7BAE94BC7141A594
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
shade/openstackcloud.py
View File

@ -489,17 +489,18 @@ class OpenStackCloud(_normalize.Normalizer):
" the catalog is already versioned. {e}".format(e=str(e)))
image_url = image_client.get_endpoint()
service_url = image_client.get_endpoint()
parsed_image_url = urllib.parse.urlparse(image_url)
parsed_service_url = urllib.parse.urlparse(service_url)
# Sometimes version discovery documents have broken endpoints, but
# the catalog has good ones (what?)
catalog_endpoint = urllib.parse.urlparse(image_client.get_endpoint())
discovered_endpoint = urllib.parse.urlparse(image_url)
image_url = urllib.parse.ParseResult(
parsed_service_url.scheme,
parsed_image_url.netloc,
parsed_image_url.path,
parsed_image_url.params,
parsed_image_url.query,
parsed_image_url.fragment).geturl()
return urllib.parse.ParseResult(
catalog_endpoint.scheme,
discovered_endpoint.netloc,
discovered_endpoint.path,
discovered_endpoint.params,
discovered_endpoint.query,
discovered_endpoint.fragment).geturl()
return image_url
@property