Merge ~bjornt/maas:update-node-interfaces-missing into maas:master

[Björn Tillenius]

update_node_interfaces() failed if some interface parents didn't exist.

This happens if there are veth interfaces in bridges, since LXD will
include that in the bridge information, but it won't create network
entries for them.

[Alberto Donato (ack)]

+1

minor nit inline

review: Approve

5412d70... by Björn Tillenius on 2021-05-04

Use different variable in list comprehension.

diff --git a/src/metadataserver/builtin_scripts/network.py b/src/metadataserver/builtin_scripts/network.py
index e51b3c5..44d8691 100644
--- a/src/metadataserver/builtin_scripts/network.py
+++ b/src/metadataserver/builtin_scripts/network.py
@@ -41,7 +41,12 @@ def get_interface_dependencies(data):
             parents = [network["vlan"]["lower_device"]]
         else:
             parents = []
-        dependencies[name].extend(parents)
+        # Only add devices that are defined in the data. Some virtual
+        # interfaces might be defined as a parent, but they are not a
+        # network, so we don't have any information about them.
+        dependencies[name].extend(
+            iface for iface in parents if iface in data["networks"]
+        )
     return dependencies
 
 
diff --git a/src/metadataserver/builtin_scripts/tests/test_network.py b/src/metadataserver/builtin_scripts/tests/test_network.py
index 32cb095..4b6d0b4 100644
--- a/src/metadataserver/builtin_scripts/tests/test_network.py
+++ b/src/metadataserver/builtin_scripts/tests/test_network.py
@@ -1454,6 +1454,23 @@ class TestUpdateInterfaces(MAASServerTestCase, UpdateInterfacesMixin):
             ["eth0", "eth1"],
         )
 
+    def test_bridge_with_missing_parents(self):
+        controller = self.create_empty_controller()
+        data = FakeCommissioningData()
+        data.create_bridge_network("br0", parents=[])
+        data.networks["br0"].bridge.upper_devices = ["tap0", "veth1"]
+        self.update_interfaces(controller, data)
+
+        self.assertEqual(1, controller.interface_set.count())
+        bridge_interface = BridgeInterface.objects.get(
+            node=controller,
+            name="br0",
+        )
+        self.assertEqual(
+            sorted(parent.name for parent in bridge_interface.parents.all()),
+            [],
+        )
+
     def test_bridge_with_existing_parents(self):
         controller = self.create_empty_controller()
         fabric = factory.make_Fabric()
@@ -2788,3 +2805,37 @@ class TestGetInterfaceDependencies(MAASTestCase):
             },
             dependencies,
         )
+
+    def test_ignores_missing_parents(self):
+        data = FakeCommissioningData()
+        data.create_physical_network("eth0")
+        data.create_physical_network("eth1")
+        data.create_physical_network("eth2")
+        data.create_physical_network("eth3")
+        data.create_bridge_network("br0", parents=[data.networks["eth0"]])
+        data.create_bond_network(
+            "bond0", parents=[data.networks["eth1"], data.networks["eth2"]]
+        )
+        data.networks["bond0"].bond.lower_devices.append("missing1")
+        data.create_vlan_network(
+            "bond0.10", vid=10, parent=data.networks["bond0"]
+        )
+        data.networks["bond0.10"].vlan.lower_device = "missing2"
+        data.create_bridge_network(
+            "br1", parents=[data.networks["bond0.10"], data.networks["eth3"]]
+        )
+        data.networks["br1"].bridge.upper_devices.append("missing3")
+        dependencies = get_interface_dependencies(data.render())
+        self.assertEqual(
+            {
+                "eth0": [],
+                "eth1": [],
+                "eth2": [],
+                "eth3": [],
+                "br0": ["eth0"],
+                "bond0": ["eth1", "eth2"],
+                "bond0.10": [],
+                "br1": ["bond0.10", "eth3"],
+            },
+            dependencies,
+        )