Merge ~ack/maas:1950827-3.1 into maas:3.1

[Alberto Donato]

LP:1950827 urlparse doesn't work if scheme is missing

[Alberto Donato (ack)]

review: Approve

diff --git a/src/maasserver/tests/test_vmhost.py b/src/maasserver/tests/test_vmhost.py
index 4850aed..a46f7a3 100644
--- a/src/maasserver/tests/test_vmhost.py
+++ b/src/maasserver/tests/test_vmhost.py
@@ -281,6 +281,7 @@ class TestCleanPowerAddress(MAASServerTestCase):
     def test_clean_power_address(self):
         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"),
             ("lxd-1", "lxd-1:8443"),
             ("lxd.cluster.com", "lxd.cluster.com:8443"),
diff --git a/src/maasserver/vmhost.py b/src/maasserver/vmhost.py
index dba36da..882e533 100644
--- a/src/maasserver/vmhost.py
+++ b/src/maasserver/vmhost.py
@@ -137,21 +137,24 @@ def _clean_power_address(vmhost_address):
     HTTPS or the user omits the protocol. This MUST be
     generalized to support other services.
     """
-    vmhost_url = urlparse(vmhost_address)
-
     lxd_schemes = ["https", ""]
+
+    # urlparse() doesn't work if scheme is missing
+    if "://" not in vmhost_address:
+        vmhost_address = f"{lxd_schemes[0]}://{vmhost_address}"
+
+    vmhost_url = urlparse(vmhost_address)
     if vmhost_url.port:
         port = f":{vmhost_url.port}"
     else:
         port = ":8443" if vmhost_url.scheme in lxd_schemes else ""
 
-    # parsing just an IP as a url results in the IP stored in path
-    host = vmhost_url.hostname or vmhost_url.path
-    new_path = vmhost_url.path if vmhost_url.hostname else ""
-    if valid_ipv6(host):
-        host = f"[{host}]"
-
-    vmhost_url = vmhost_url._replace(netloc=f"{host}{port}", path=new_path)
+    host = (
+        f"[{vmhost_url.hostname}]"
+        if valid_ipv6(vmhost_url.hostname)
+        else vmhost_url.hostname
+    )
+    vmhost_url = vmhost_url._replace(netloc=f"{host}{port}")
     vmhost_address = vmhost_url.geturl()
 
     if vmhost_url.scheme in lxd_schemes: