fix(drivers): prefer the logical network name when reporting a port's source

A type='network' interface backed by a libvirt network with <forward
mode='bridge'/> (e.g. a boot network riding the same bridge as the
main network) gets rewritten by libvirt to type='bridge' in the live
domain XML, but its <source> element keeps both the original 'network'
attribute and the underlying 'bridge' one. Reading by iface type alone
picked up the bridge name, permanently diverging from the target
state's logical network name and leaving update_on_dp() stuck logging
"Unknown update action" every iteration since no tracked field
actually looked different to it.

Author: VasilyStepanov

exordos_core/compute/pool/drivers/libvirt.py

@@ -41,6 +41,25 @@
 CONSOLE_LOG_DIR = "/var/log/libvirt/qemu"
 
 
+def _interface_source(
+    iface: ET.Element, source_el: tp.Optional[ET.Element]
+) -> tp.Optional[str]:
+    """Return the logical network/bridge name this interface connects to.
+
+    A domain interface created as type='network' backed by a libvirt
+    network with <forward mode='bridge'/> gets rewritten by libvirt in
+    the live/persistent XML to type='bridge', but its <source> element
+    keeps both the original 'network' attribute (the logical name the
+    orchestrator/target state actually tracks) and the 'bridge' one
+    (the real underlying device). Prefer 'network' when present so a
+    boot port riding such a network still reports its logical name
+    instead of the bridge it happens to be implemented with.
+    """
+    if source_el is None:
+        return None
+    return source_el.get("network") or source_el.get(iface.get("type"))
+
+
 class StoragePoolType(enum.Enum):
     DIR = "dir"
     ZFS = "zfs"
@@ -611,11 +630,7 @@ def _domain2machine(
             mac_el = iface.find("mac")
             source_el = iface.find("source")
             mac = mac_el.get("address")
-            # The boot-network port is always type='network' regardless of
-            # the hypervisor's own network_type (see create_machine) - read
-            # the source attribute this specific interface actually has
-            # ('network' or 'bridge'), not the hypervisor's configured type.
-            source = source_el.get(iface.get("type"))
+            source = _interface_source(iface, source_el)
 
             if not mac or not source:
                 raise ValueError(f"Interface {iface} has no mac or source")
@@ -694,9 +709,7 @@ def _list_interfaces(self, machine: models.Machine) -> tp.List[models.Port]:
             mac_el = iface.find("mac")
             source_el = iface.find("source")
             mac = mac_el.get("address")
-            # See _domain2machine: read the source attribute this specific
-            # interface actually has, not the hypervisor's network_type.
-            source = source_el.get(iface.get("type"))
+            source = _interface_source(iface, source_el)
 
             if not mac or not source:
                 raise ValueError(f"Interface {iface} has no mac or source")