Merge ~andreserl/maas:lp1790015_ipv6 into maas:master

[Andres Rodriguez]

LP: #1790015 - Fix no_proxy to also use IPv6 addresses inside brackets.

[MAAS Lander (maas-lander)]

UNIT TESTS
-b lp1790015_ipv6 lp:~andreserl/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/3821/console
COMMIT: 15682bf000493f2c953f163fada25f6b2a0bc4af

review: Needs Fixing

[MAAS Lander (maas-lander)]

UNIT TESTS
-b lp1790015_ipv6 lp:~andreserl/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/3822/console
COMMIT: 3497b173d796be08ebf43465c13771316bb3af80

review: Needs Fixing

[Blake Rouse (blake-rouse)]

Looks good.

review: Approve

[MAAS Lander (maas-lander)]

UNABLE TO START LANDING

STATUS: MISSING COMMIT MESSAGE

2bb405d... by Andres Rodriguez on 2018-09-01

Fix tests which was cuasing infinite loop

diff --git a/src/provisioningserver/rpc/boot_images.py b/src/provisioningserver/rpc/boot_images.py
index def25e3..9a23d49 100644
--- a/src/provisioningserver/rpc/boot_images.py
+++ b/src/provisioningserver/rpc/boot_images.py
@@ -63,12 +63,19 @@ def reload_boot_images():
 
 
 def get_hosts_from_sources(sources):
-    """Return set of hosts that are contained in the given sources."""
+    """Return set of hosts that are contained in the given sources.
+
+    If the host is an IPv6 address, we also return it in the format
+    of [<ipv6-address>] because things like no_proxy (which this
+    function is used for), need it that way."""
     hosts = set()
     for source in sources:
         url = urlparse(source['url'])
         if url.hostname is not None:
             hosts.add(url.hostname)
+        # If it's the IPv6 address, we add also add it inside []
+        if ':' in url.hostname:
+            hosts.add('[%s]' % url.hostname)
     return hosts
 
 
@@ -110,7 +117,9 @@ def _run_import(sources, maas_url, http_proxy=None, https_proxy=None):
     if https_proxy is not None:
         variables['https_proxy'] = https_proxy
     # Communication to the sources and loopback should not go through proxy.
-    no_proxy_hosts = ["localhost", "::ffff:127.0.0.1", "127.0.0.1", "::1"]
+    no_proxy_hosts = [
+        "localhost", "::ffff:127.0.0.1", "127.0.0.1", "::1",
+        "[::ffff:127.0.0.1]", "[::1]"]
     no_proxy_hosts += list(get_hosts_from_sources(sources))
     variables['no_proxy'] = ','.join(no_proxy_hosts)
     with environment_variables(variables):
diff --git a/src/provisioningserver/rpc/tests/test_boot_images.py b/src/provisioningserver/rpc/tests/test_boot_images.py
index bc7e797..43e00cd 100644
--- a/src/provisioningserver/rpc/tests/test_boot_images.py
+++ b/src/provisioningserver/rpc/tests/test_boot_images.py
@@ -11,6 +11,7 @@ from unittest.mock import (
     ANY,
     sentinel,
 )
+from urllib.parse import urlparse
 
 from maastesting.factory import factory
 from maastesting.matchers import (
@@ -57,7 +58,9 @@ from twisted.internet.task import Clock
 
 
 def make_sources():
-    hosts = [factory.make_name('host').lower() for _ in range(3)]
+    hosts = [factory.make_hostname().lower() for _ in range(2)]
+    hosts.append(factory.make_ipv4_address())
+    hosts.append("[%s]" % factory.make_ipv6_address())
     urls = [
         'http://%s:%s/images-stream/streams/v1/index.json' % (
             host, randint(1, 1000))
@@ -119,7 +122,16 @@ class TestReloadBootImages(MAASTestCase):
 class TestGetHostsFromSources(MAASTestCase):
 
     def test__returns_set_of_hosts_from_sources(self):
-        sources, hosts = make_sources()
+        sources, _ = make_sources()
+        hosts = set()
+        for source in sources:
+            # Use the source to obtain the hosts and add it to a list.
+            host = urlparse(source["url"]).hostname
+            hosts.add(host)
+            # If the host is an IPv6 address, add an extra fixed IPv6
+            # with brackets.
+            if ':' in host:
+                hosts.add("[%s]" % host)
         self.assertItemsEqual(hosts, get_hosts_from_sources(sources))
 
 
@@ -240,7 +252,8 @@ class TestRunImport(MAASTestCase):
         _run_import(sources=[], maas_url=factory.make_simple_http_url())
         self.assertEqual(
             fake.env['no_proxy'],
-            "localhost,::ffff:127.0.0.1,127.0.0.1,::1")
+            ("localhost,::ffff:127.0.0.1,127.0.0.1,::1,"
+             "[::ffff:127.0.0.1],[::1]"))
 
     def test__run_import_sets_proxy_for_source_host(self):
         host = factory.make_name("host").lower()
@@ -250,7 +263,8 @@ class TestRunImport(MAASTestCase):
         _run_import(sources=sources, maas_url=maas_url)
         self.assertItemsEqual(
             fake.env['no_proxy'].split(','),
-            ["localhost", "::ffff:127.0.0.1", "127.0.0.1", "::1"] + [host])
+            ["localhost", "::ffff:127.0.0.1", "127.0.0.1", "::1",
+             "[::ffff:127.0.0.1]", "[::1]"] + [host])
 
     def test__run_import_accepts_sources_parameter(self):
         fake = self.patch(boot_resources, 'import_images')