Be careful when fetching 'parentindex' from a VLAN interface (fixes #…

…1892)
ipspace · Feb 8, 2025 · 6e2ee05 · 6e2ee05
1 parent 830725f
commit 6e2ee05
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/netsim/modules/vlan.py b/netsim/modules/vlan.py
@@ -1043,7 +1043,7 @@ def rename_vlan_subinterfaces(node: Box, topology: Box) -> None:
       remove_vlan_from_trunk(parent_intf,intf.vlan.access_id)
 
   if has_vlan_loopbacks:
-    node.interfaces = [ intf for intf in node.interfaces if intf.parentindex != 'loopback']
+    node.interfaces = [ intf for intf in node.interfaces if intf.get('parentindex',None) != 'loopback']
 
 """
 If we have a routed native VLAN, and there are no other bridged VLANs left

diff --git a/tests/topology/expected/vxlan-router-stick.yml b/tests/topology/expected/vxlan-router-stick.yml
@@ -211,7 +211,6 @@ nodes:
       - ifname: Ethernet3
         ipv4: 10.1.0.6/30
         node: s2
-      parentindex: {}
       type: p2p
     - bridge_group: 1
       ifindex: 40000
@@ -227,7 +226,6 @@ nodes:
       - ifname: Vlan1000
         ipv4: 172.16.0.3/24
         node: r1
-      parentindex: {}
       type: svi
       virtual_interface: true
       vlan:
@@ -247,7 +245,6 @@ nodes:
       - ifname: Vlan1001
         ipv4: 172.16.1.3/24
         node: r1
-      parentindex: {}
       type: svi
       virtual_interface: true
       vlan: