Merge ~ack/maas:1992185-vmhost-find-addr-interface-children into maas:master

[Alberto Donato]

LP:1992185 look at all children to find the VM host address

[MAAS Lander (maas-lander)]

UNIT TESTS
-b 1992185-vmhost-find-addr-interface-children lp:~ack/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas-tester/1113/consoleText
COMMIT: 83619edd2db79380df3082ab5839cd099be5691c

review: Needs Fixing

[Alberto Donato (ack)]

jenkins: !test

[MAAS Lander (maas-lander)]

UNIT TESTS
-b 1992185-vmhost-find-addr-interface-children lp:~ack/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 83619edd2db79380df3082ab5839cd099be5691c

review: Approve

[Adam Collard (adam-collard)]

review: Approve

diff --git a/src/metadataserver/api_twisted.py b/src/metadataserver/api_twisted.py
index c5f3789..d71c03c 100644
--- a/src/metadataserver/api_twisted.py
+++ b/src/metadataserver/api_twisted.py
@@ -18,7 +18,7 @@ from twisted.web.server import NOT_DONE_YET
 from maasserver.api.utils import extract_oauth_key_from_auth_header
 from maasserver.enum import NODE_STATUS, NODE_TYPE
 from maasserver.forms.pods import PodForm
-from maasserver.models import Node
+from maasserver.models import Interface, Node, StaticIPAddress
 from maasserver.preseed import CURTIN_INSTALL_LOG
 from maasserver.secrets import SecretManager
 from maasserver.utils.orm import (
@@ -209,11 +209,7 @@ def _create_vmhost_for_deployment(node):
 
     # the IP is associated to the bridge the boot interface is in, not the
     # interface itself
-    boot_if = node.get_boot_interface()
-    ifaces = list(boot_if.children.all())
-    ip = node.ip_addresses(ifaces=ifaces + [boot_if])[0]
-    if ":" in ip:
-        ip = f"[{ip}]"
+    ip = _get_ip_address_for_vmhost(node)
 
     for secret_key, secret_value in deploy_secrets.items():
         is_lxd = secret_key == DEPLOY_SECRETS_LXD_KEY
@@ -275,6 +271,31 @@ def _create_vmhost_for_deployment(node):
     node.update_status(NODE_STATUS.DEPLOYED)
 
 
+def _get_ip_address_for_vmhost(node):
+    boot_interface = node.get_boot_interface()
+    interface_ids = {boot_interface.id}
+
+    # recursively find all children interface IDs
+    new_ids = {boot_interface.id}
+    while new_ids:
+        new_ids = set(
+            Interface.objects.filter(parents__in=new_ids).values_list(
+                "id", flat=True
+            )
+        )
+        interface_ids |= new_ids
+
+    ip = (
+        StaticIPAddress.objects.exclude(ip__isnull=True)
+        .filter(interface__in=interface_ids)
+        .values_list("ip", flat=True)
+        .first()
+    )
+    if ":" in ip:
+        ip = f"[{ip}]"
+    return ip
+
+
 class StatusWorkerService(TimerService):
     """Service to update nodes from received status messages."""
 
diff --git a/src/metadataserver/tests/test_api_twisted.py b/src/metadataserver/tests/test_api_twisted.py
index 1689ed9..7b36e79 100644
--- a/src/metadataserver/tests/test_api_twisted.py
+++ b/src/metadataserver/tests/test_api_twisted.py
@@ -1210,7 +1210,7 @@ class TestCreateVMHostForDeployment(MAASServerTestCase):
             )
         )
 
-    def test_creates_vmhost_pick_right_interface(self):
+    def test_creates_vmhost_pick_right_interface_address(self):
         user = factory.make_User()
         node = factory.make_Node_with_Interface_on_Subnet(
             owner=user,
@@ -1244,6 +1244,47 @@ class TestCreateVMHostForDeployment(MAASServerTestCase):
             f"qemu+ssh://virsh@{addr}/system",
         )
 
+    def test_creates_vmhost_pick_right_interface_with_bond(self):
+        user = factory.make_User()
+        node = factory.make_Node_with_Interface_on_Subnet(
+            owner=user,
+            status=NODE_STATUS.DEPLOYING,
+            agent_name="maas-kvm-pod",
+            install_kvm=True,
+        )
+        iface = factory.make_Interface(node=node)
+        bond = factory.make_Interface(
+            iftype=INTERFACE_TYPE.BOND,
+            node=node,
+            parents=[node.get_boot_interface(), iface],
+        )
+        # deploying a machine as a VM host bridges the boot interface, which is
+        # now the bond
+        bridge = factory.make_Interface(
+            iftype=INTERFACE_TYPE.BRIDGE,
+            node=node,
+            parents=[bond],
+        )
+        ip = factory.make_StaticIPAddress(interface=bridge)
+        another_if = factory.make_Interface(INTERFACE_TYPE.PHYSICAL, node=node)
+        factory.make_StaticIPAddress(interface=another_if)
+        SecretManager().set_composite_secret(
+            "deploy-metadata",
+            {"virsh-password": "xyz123"},
+            obj=node,
+        )
+        _create_vmhost_for_deployment(node)
+        self.assertEqual(node.status, NODE_STATUS.DEPLOYED)
+        virsh_vmhost = Pod.objects.get(power_type="virsh")
+
+        addr = ip.ip
+        if IPAddress(addr).version == 6:
+            addr = f"[{addr}]"
+        self.assertEqual(
+            virsh_vmhost.power_parameters.get("power_address"),
+            f"qemu+ssh://virsh@{addr}/system",
+        )
+
     def test_marks_failed_if_form_invalid(self):
         mock_form = self.patch(api_twisted_module, "PodForm").return_value
         mock_form.is_valid.return_value = False