Merge ~lloydwaltersj/maas:ipv6-address-fail into maas:master

[Jack Lloyd-Walters]

Include extra sanitation for bracketless ipv6 in vmhost address

[Anton Troyanov (troyanov)]

review: Approve

[MAAS Lander (maas-lander)]

UNIT TESTS
-b ipv6-address-fail lp:~lloydwaltersj/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/13110/console
COMMIT: b009bff52f997ec1aad74a90911972241099ab08

review: Needs Fixing

[Anton Troyanov (troyanov)]

jenkins: !test

[MAAS Lander (maas-lander)]

UNIT TESTS
-b ipv6-address-fail lp:~lloydwaltersj/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: b009bff52f997ec1aad74a90911972241099ab08

review: Approve

diff --git a/src/maasserver/tests/test_vmhost.py b/src/maasserver/tests/test_vmhost.py
index 408418d..cf9ea62 100644
--- a/src/maasserver/tests/test_vmhost.py
+++ b/src/maasserver/tests/test_vmhost.py
@@ -282,11 +282,13 @@ class TestCleanPowerAddress(MAASServerTestCase):
         cases = [
             ("10.0.0.1", "10.0.0.1:8443"),
             ("10.0.0.1:8443", "10.0.0.1:8443"),
+            ("2001:db8::1", "[2001:db8::1]:8443"),
             ("[2001:db8::1]", "[2001:db8::1]:8443"),
             ("lxd-1", "lxd-1:8443"),
             ("lxd.cluster.com", "lxd.cluster.com:8443"),
             ("https://lxd-1", "lxd-1:8443"),
             ("https://lxd-1:8080", "lxd-1:8080"),
+            ("https://[2001:db8::1]", "[2001:db8::1]:8443"),
             ("https://[2001:db8::1]:8080", "[2001:db8::1]:8080"),
             ("qemu+ssh://10.0.0.1/system", "qemu+ssh://10.0.0.1/system"),
             (
diff --git a/src/maasserver/vmhost.py b/src/maasserver/vmhost.py
index 882e533..3c50f57 100644
--- a/src/maasserver/vmhost.py
+++ b/src/maasserver/vmhost.py
@@ -141,6 +141,12 @@ def _clean_power_address(vmhost_address):
 
     # urlparse() doesn't work if scheme is missing
     if "://" not in vmhost_address:
+        if (
+            vmhost_address.count(":") > 1
+            and "[" not in vmhost_address
+            and "]" not in vmhost_address
+        ):
+            vmhost_address = f"[{vmhost_address}]"
         vmhost_address = f"{lxd_schemes[0]}://{vmhost_address}"
 
     vmhost_url = urlparse(vmhost_address)