Use https proxy for redirected image downloads

get_urllib_opener only set an http proxy from TEST_HTTP_PROXY. Image
downloads start on http://download.cirros-cloud.net but the server now
redirects to https://github.com, and with an http-only ProxyHandler the
https request bypasses the proxy and connects directly. Where external
access is only reachable through a proxy this times out.

Also set an https proxy from TEST_HTTPS_PROXY (falling back to
TEST_HTTP_PROXY) so the redirected https request goes through the proxy.

Signed-off-by: Seyeong Kim <seyeong.kim@canonical.com>

Author: xtrusia

unit_tests/utilities/test_zaza_utilities_openstack.py

@@ -327,7 +327,8 @@ def test_get_urllib_opener_proxy(self):
         self.ProxyHandler.return_value = ProxyHandler_mock
         openstack_utils.get_urllib_opener()
         self.build_opener.assert_called_once_with(ProxyHandler_mock)
-        self.ProxyHandler.assert_called_once_with({'http': 'http://squidy'})
+        self.ProxyHandler.assert_called_once_with(
+            {'http': 'http://squidy', 'https': 'http://squidy'})
 
     def test_get_images_by_name(self):
         image_mock1 = mock.MagicMock()

zaza/openstack/utilities/openstack.py

@@ -2434,15 +2434,27 @@ def get_urllib_opener():
     via TEST_HTTP_PROXY rather than http_proxy so a ProxyHandler is needed
     explicitly stating the proxies.
 
+    Both http and https proxies are configured: some image downloads are
+    served over http but redirect to https (cirros now redirects to
+    github.com), so an http-only proxy would let the https request bypass
+    the proxy and fail where external access is proxy-only.
+
     :returns: An opener which opens URLs via BaseHandlers chained together
     :rtype: urllib.request.OpenerDirector
     """
     deploy_env = deployment_env.get_deployment_context()
     http_proxy = deploy_env.get('TEST_HTTP_PROXY')
-    logging.debug('TEST_HTTP_PROXY: {}'.format(http_proxy))
+    https_proxy = deploy_env.get('TEST_HTTPS_PROXY') or http_proxy
+    logging.debug('TEST_HTTP_PROXY: {} TEST_HTTPS_PROXY: {}'.format(
+        http_proxy, https_proxy))
 
+    proxies = {}
     if http_proxy:
-        handler = urllib.request.ProxyHandler({'http': http_proxy})
+        proxies['http'] = http_proxy
+    if https_proxy:
+        proxies['https'] = https_proxy
+    if proxies:
+        handler = urllib.request.ProxyHandler(proxies)
     else:
         handler = urllib.request.HTTPHandler()
     return urllib.request.build_opener(handler)