From 49fe112b85a80935065809f0c6b80b4c867caae5 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Wed, 19 Apr 2017 07:41:21 -0500 Subject: [PATCH] Clarify some variable names in glance discovery I'm bad at naming things. This was unreadable. Update the variable names so it makes sense and add a comment. Change-Id: Iacbaeed91d71dca35c6fdd7d07999bd5956430fa --- shade/openstackcloud.py | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/shade/openstackcloud.py b/shade/openstackcloud.py index a291ccb3c..c9e127843 100644 --- a/shade/openstackcloud.py +++ b/shade/openstackcloud.py @@ -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