Merge ~r00ta/maas:lp-2045020-preseed-ipv6 into maas:master

[Jacopo Rota]

fix: format ipv6 address in cloud init preseed_url

Bugfix for https://bugs.launchpad.net/maas/+bug/2045020

[MAAS Lander (maas-lander)]

UNIT TESTS
-b lp-2045020-preseed-ipv6 lp:~r00ta/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas-tester/4168/console
COMMIT: 3337672525e906378c67178dcbc7401a4ba7f0d1

review: Needs Fixing

[MAAS Lander (maas-lander)]

UNIT TESTS
-b lp-2045020-preseed-ipv6 lp:~r00ta/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: accfb7de33173179cc0ffe07a1803dd30948139f

review: Approve

[Anton Troyanov (troyanov)]

review: Approve

[MAAS Lander (maas-lander)]

UNIT TESTS
-b lp-2045020-preseed-ipv6 lp:~r00ta/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 294ca29cbee701d4a6d8a674d5cdfb72e8e65878

review: Approve

diff --git a/src/maasserver/rpc/boot.py b/src/maasserver/rpc/boot.py
index 5b0a4d7..4ec6512 100644
--- a/src/maasserver/rpc/boot.py
+++ b/src/maasserver/rpc/boot.py
@@ -9,6 +9,7 @@ import shlex
 
 from django.core.exceptions import ObjectDoesNotExist, ValidationError
 from django.db.models import Q
+from netaddr import IPAddress
 
 from maasserver.compose_preseed import RSYSLOG_PORT
 from maasserver.dns.config import get_resource_name_for_subnet
@@ -346,7 +347,11 @@ def get_base_url_for_local_ip(
         # Either no subnet, the subnet has DNS servers defined, or the VLAN
         # that the subnet belongs to doesn't have DHCP enabled. In
         # that case fallback to using IP address only.
-        return "http://%s:5248/" % local_ip
+        return (
+            "http://[%s]:5248/" % local_ip
+            if IPAddress(local_ip).version == 6
+            else "http://%s:5248/" % local_ip
+        )
 
 
 def get_final_boot_purpose(machine, arch, purpose):
diff --git a/src/maasserver/rpc/tests/test_boot.py b/src/maasserver/rpc/tests/test_boot.py
index 6f6caa0..9d3ee54 100644
--- a/src/maasserver/rpc/tests/test_boot.py
+++ b/src/maasserver/rpc/tests/test_boot.py
@@ -5,7 +5,7 @@ from datetime import timedelta
 import random
 from unittest.mock import ANY, DEFAULT
 
-from netaddr import IPNetwork
+from netaddr import IPAddress, IPNetwork
 from testtools.matchers import ContainsAll, StartsWith
 
 from maasserver import server_address
@@ -607,10 +607,10 @@ class TestGetConfig(MAASServerTestCase):
         self.assertEqual(host, observed_config.get("hostname"))
         self.assertEqual(domainname, observed_config.get("domain"))
 
-    def test_has_enlistment_preseed_url_with_local_ip_no_subnet(self):
+    def test_has_enlistment_preseed_url_with_local_ip_no_subnet_ipv4(self):
         rack_controller = factory.make_RackController()
-        local_ip = factory.make_ip_address()
-        remote_ip = factory.make_ip_address()
+        local_ip = factory.make_ip_address(ipv6=False)
+        remote_ip = factory.make_ip_address(ipv6=False)
         factory.make_default_ubuntu_release_bootable()
         self.patch_autospec(boot_module, "event_log_pxe_request")
         observed_config = get_config(
@@ -623,6 +623,22 @@ class TestGetConfig(MAASServerTestCase):
             observed_config["preseed_url"],
         )
 
+    def test_has_enlistment_preseed_url_with_local_ip_no_subnet_ipv6(self):
+        rack_controller = factory.make_RackController()
+        local_ip = factory.make_ip_address(ipv6=True)
+        remote_ip = factory.make_ip_address(ipv6=True)
+        factory.make_default_ubuntu_release_bootable()
+        self.patch_autospec(boot_module, "event_log_pxe_request")
+        observed_config = get_config(
+            rack_controller.system_id, local_ip, remote_ip
+        )
+        assert (
+            compose_enlistment_preseed_url(
+                base_url="http://[%s]:5248/" % local_ip
+            )
+            == observed_config["preseed_url"]
+        )
+
     def test_has_enlistment_preseed_url_with_local_ip_subnet_with_dns(self):
         rack_controller = factory.make_RackController()
         subnet = factory.make_Subnet()
@@ -633,11 +649,14 @@ class TestGetConfig(MAASServerTestCase):
         observed_config = get_config(
             rack_controller.system_id, local_ip, remote_ip
         )
-        self.assertEqual(
-            compose_enlistment_preseed_url(
-                base_url="http://%s:5248/" % local_ip
-            ),
-            observed_config["preseed_url"],
+        base_url = (
+            "http://[%s]:5248/" % local_ip
+            if IPAddress(local_ip).version == 6
+            else "http://%s:5248/" % local_ip
+        )
+        assert (
+            compose_enlistment_preseed_url(base_url=base_url)
+            == observed_config["preseed_url"]
         )
 
     def test_has_enlistment_preseed_url_internal_domain(self):
@@ -732,10 +751,12 @@ class TestGetConfig(MAASServerTestCase):
         observed_config = get_config(
             rack_controller.system_id, local_ip, remote_ip, mac=mac
         )
-        self.assertThat(
-            observed_config["preseed_url"],
-            StartsWith("http://%s:5248" % local_ip),
+        base_url = (
+            "http://[%s]:5248/" % local_ip
+            if IPAddress(local_ip).version == 6
+            else "http://%s:5248/" % local_ip
         )
+        assert observed_config["preseed_url"].startswith(base_url)
 
     def test_preseed_url_for_known_node_local_ip_subnet_with_dns(self):
         rack_url = "http://%s" % factory.make_name("host")
@@ -752,10 +773,12 @@ class TestGetConfig(MAASServerTestCase):
         observed_config = get_config(
             rack_controller.system_id, local_ip, remote_ip, mac=mac
         )
-        self.assertThat(
-            observed_config["preseed_url"],
-            StartsWith("http://%s:5248" % local_ip),
+        base_url = (
+            "http://[%s]:5248/" % local_ip
+            if IPAddress(local_ip).version == 6
+            else "http://%s:5248/" % local_ip
         )
+        assert observed_config["preseed_url"].startswith(base_url)
 
     def test_preseed_url_for_known_node_internal_domain(self):
         rack_url = "http://%s" % factory.make_name("host")