Fix vlan mode precedence to match documentation (#581)

* Fix vlan mode attribute precedence to match documentation * Add 'mode' to no-propagate, otherwise global 'mode' copied into nodes overrides global per-VLAN settings * Updated test results Co-authored-by: Jeroen van Bemmel <jeroen.van_bemmel@nokia.com>
ipspace · Oct 15, 2022 · 76df3c3 · 76df3c3
1 parent e3ce92d
commit 76df3c3
Show file tree

Hide file tree

Showing 21 changed files with 4 additions and 77 deletions.
diff --git a/netsim/modules/vlan.py b/netsim/modules/vlan.py
@@ -114,11 +114,10 @@ def interface_vlan_mode(intf: Box, node: Box, topology: Box) -> str:
   vlan = get_from_box(intf,'vlan.access') or get_from_box(intf,'vlan.native')
   if not vlan:
     return 'irb'
-
   return get_from_box(intf,'vlan.mode') or \
          get_from_box(node,f'vlans.{vlan}.mode') or \
-         get_from_box(topology,f'vlans.{vlan}.mode') or \
          get_from_box(node,'vlan.mode') or \
+         get_from_box(topology,f'vlans.{vlan}.mode') or \
          get_from_box(topology,'vlan.mode') or 'irb'
 
 #

diff --git a/netsim/topology-defaults.yml b/netsim/topology-defaults.yml
@@ -47,7 +47,7 @@ bgp:
   transform_after: [ vlan ]
   next_hop_self: true
   attributes:
-    global: [ 
+    global: [
       af, as, next_hop_self, rr_cluster_id, rr_list, ebgp_role, as_list, sessions, activate,
       advertise_loopback, advertise_roles, community, replace_global_as ]
     node: [
@@ -149,7 +149,7 @@ vrf: # Basic VRF support
 
 vlan: # VLAN support
   supported_on: [ eos, iosv, vyos, dellos10, srlinux, none, routeros, nxos, frr, cumulus, sros, routeros7 ]
-  no_propagate: [ start_vlan_id, start_vni, auto_vni ]
+  no_propagate: [ start_vlan_id, start_vni, auto_vni, mode ]
   vlan_no_propagate: [ id, vni, mode, pool, prefix, evpn ]
   start_vlan_id: 1000
   start_vni: 100000
@@ -948,7 +948,7 @@ devices:
     external:
       image: none
     graphite.icon: router
-  
+
   routeros7:
     interface_name: ether%d
     mgmt_if: ether1

diff --git a/tests/topology/expected/bgp-vrf-local-as.yml b/tests/topology/expected/bgp-vrf-local-as.yml
@@ -201,7 +201,6 @@ nodes:
     name: r1
     vlan:
       max_bridge_group: 2
-      mode: irb
     vlans:
       blue:
         bridge_group: 1
@@ -425,7 +424,6 @@ nodes:
     name: r2
     vlan:
       max_bridge_group: 3
-      mode: irb
     vlans:
       blue:
         bridge_group: 2
@@ -592,7 +590,6 @@ nodes:
     name: r3
     vlan:
       max_bridge_group: 2
-      mode: irb
     vlans:
       blue:
         bridge_group: 1
@@ -648,8 +645,6 @@ nodes:
         rd: '65000:1'
         vrfidx: 100
 provider: libvirt
-vlan:
-  mode: irb
 vlans:
   blue:
     id: 1001

diff --git a/tests/topology/expected/group-data-vlan.yml b/tests/topology/expected/group-data-vlan.yml
@@ -175,7 +175,6 @@ nodes:
       router_id: 10.0.0.1
     vlan:
       max_bridge_group: 2
-      mode: irb
     vlans:
       blue:
         bridge_group: 1
@@ -281,7 +280,6 @@ nodes:
       router_id: 10.0.0.2
     vlan:
       max_bridge_group: 2
-      mode: irb
     vlans:
       blue:
         bridge_group: 1
@@ -385,7 +383,6 @@ nodes:
       router_id: 10.0.0.3
     vlan:
       max_bridge_group: 2
-      mode: irb
     vlans:
       blue:
         bridge_group: 1
@@ -424,8 +421,6 @@ nodes:
 ospf:
   area: 0.0.0.0
 provider: libvirt
-vlan:
-  mode: irb
 vlans:
   blue:
     host_count: 0

diff --git a/tests/topology/expected/rt-vlan-native-routed.yml b/tests/topology/expected/rt-vlan-native-routed.yml
@@ -186,7 +186,6 @@ nodes:
     name: s1
     vlan:
       max_bridge_group: 2
-      mode: irb
     vlans:
       blue:
         bridge_group: 2
@@ -205,8 +204,6 @@ nodes:
 ospf:
   area: 0.0.0.0
 provider: libvirt
-vlan:
-  mode: irb
 vlans:
   blue:
     host_count: 0

diff --git a/tests/topology/expected/rt-vlan-no-gateway.yml b/tests/topology/expected/rt-vlan-no-gateway.yml
@@ -154,7 +154,6 @@ nodes:
     name: s1
     vlan:
       max_bridge_group: 1
-      mode: irb
     vlans:
       red:
         bridge_group: 1
@@ -164,8 +163,6 @@ nodes:
           ipv4: 172.16.0.0/24
         vni: 101000
 provider: libvirt
-vlan:
-  mode: irb
 vlans:
   blue:
     id: 1001

diff --git a/tests/topology/expected/rt-vlan-role-unnumbered.yml b/tests/topology/expected/rt-vlan-role-unnumbered.yml
@@ -119,7 +119,6 @@ nodes:
     name: leaf
     vlan:
       max_bridge_group: 1
-      mode: irb
     vlans:
       vxlan:
         bridge_group: 1
@@ -131,8 +130,6 @@ nodes:
           ipv6: true
         vni: 101000
 provider: clab
-vlan:
-  mode: irb
 vlans:
   vxlan:
     host_count: 0

diff --git a/tests/topology/expected/vlan-access-neighbors.yml b/tests/topology/expected/vlan-access-neighbors.yml
@@ -204,7 +204,6 @@ nodes:
     name: s1
     vlan:
       max_bridge_group: 1
-      mode: irb
     vlans:
       red:
         bridge_group: 1
@@ -225,5 +224,3 @@ nodes:
           ipv4: 172.16.0.0/24
         vni: 101000
 provider: clab
-vlan:
-  mode: irb
diff --git a/tests/topology/expected/vlan-access-node.yml b/tests/topology/expected/vlan-access-node.yml
@@ -158,7 +158,6 @@ nodes:
     name: s1
     vlan:
       max_bridge_group: 1
-      mode: irb
     vlans:
       red:
         bridge_group: 1
@@ -225,7 +224,6 @@ nodes:
     name: s2
     vlan:
       max_bridge_group: 1
-      mode: irb
     vlans:
       blue:
         bridge_group: 1

diff --git a/tests/topology/expected/vlan-access-single.yml b/tests/topology/expected/vlan-access-single.yml
@@ -208,7 +208,6 @@ nodes:
       router_id: 10.0.0.2
     vlan:
       max_bridge_group: 1
-      mode: irb
     vlans:
       red:
         bridge_group: 1
@@ -290,7 +289,6 @@ nodes:
       router_id: 10.0.0.3
     vlan:
       max_bridge_group: 1
-      mode: irb
     vlans:
       red:
         bridge_group: 1
@@ -303,8 +301,6 @@ nodes:
 ospf:
   area: 0.0.0.0
 provider: clab
-vlan:
-  mode: irb
 vlans:
   red:
     host_count: 2

diff --git a/tests/topology/expected/vlan-bridge-trunk-router.yml b/tests/topology/expected/vlan-bridge-trunk-router.yml
@@ -302,7 +302,6 @@ nodes:
     name: s1
     vlan:
       max_bridge_group: 2
-      mode: irb
     vlans:
       blue:
         bridge_group: 2
@@ -401,7 +400,6 @@ nodes:
     name: s2
     vlan:
       max_bridge_group: 2
-      mode: irb
     vlans:
       blue:
         bridge_group: 2
@@ -440,8 +438,6 @@ nodes:
           ipv4: 172.16.0.0/24
         vni: 101000
 provider: libvirt
-vlan:
-  mode: irb
 vlans:
   blue:
     host_count: 1

diff --git a/tests/topology/expected/vlan-coverage.yml b/tests/topology/expected/vlan-coverage.yml
@@ -233,7 +233,6 @@ nodes:
     name: s1
     vlan:
       max_bridge_group: 1
-      mode: bridge
     vlans:
       red:
         bridge_group: 1
@@ -326,7 +325,6 @@ nodes:
     name: s2
     vlan:
       max_bridge_group: 2
-      mode: bridge
     vlans:
       blue:
         bridge_group: 2

diff --git a/tests/topology/expected/vlan-native-routed.yml b/tests/topology/expected/vlan-native-routed.yml
@@ -157,7 +157,6 @@ nodes:
     name: r1
     vlan:
       max_bridge_group: 3
-      mode: irb
     vlans:
       blue:
         bridge_group: 2
@@ -261,7 +260,6 @@ nodes:
     name: r2
     vlan:
       max_bridge_group: 3
-      mode: irb
     vlans:
       blue:
         bridge_group: 2
@@ -298,8 +296,6 @@ nodes:
           ipv4: 172.16.0.0/24
         vni: 101000
 provider: libvirt
-vlan:
-  mode: irb
 vlans:
   blue:
     host_count: 0

diff --git a/tests/topology/expected/vlan-routed-access.yml b/tests/topology/expected/vlan-routed-access.yml
@@ -96,7 +96,6 @@ nodes:
       router_id: 10.0.0.1
     vlan:
       max_bridge_group: 1
-      mode: irb
     vlans:
       red:
         bridge_group: 1
@@ -151,7 +150,6 @@ nodes:
       router_id: 10.0.0.3
     vlan:
       max_bridge_group: 1
-      mode: irb
     vlans:
       red:
         bridge_group: 1
@@ -222,7 +220,6 @@ nodes:
       router_id: 10.0.0.2
     vlan:
       max_bridge_group: 1
-      mode: irb
     vlans:
       red:
         bridge_group: 1
@@ -236,8 +233,6 @@ nodes:
 ospf:
   area: 0.0.0.0
 provider: libvirt
-vlan:
-  mode: irb
 vlans:
   red:
     host_count: 0

diff --git a/tests/topology/expected/vlan-routed-vrf.yml b/tests/topology/expected/vlan-routed-vrf.yml
@@ -417,7 +417,6 @@ nodes:
     name: r1
     vlan:
       max_bridge_group: 3
-      mode: irb
     vlans:
       blue:
         bridge_group: 1
@@ -598,7 +597,6 @@ nodes:
     name: r2
     vlan:
       max_bridge_group: 3
-      mode: irb
     vlans:
       blue:
         bridge_group: 1
@@ -803,7 +801,6 @@ nodes:
     name: s1
     vlan:
       max_bridge_group: 3
-      mode: irb
     vlans:
       blue:
         bridge_group: 2
@@ -1048,7 +1045,6 @@ nodes:
     name: s2
     vlan:
       max_bridge_group: 3
-      mode: irb
     vlans:
       blue:
         bridge_group: 1
@@ -1154,8 +1150,6 @@ nodes:
         rd: '65000:1'
         vrfidx: 100
 provider: clab
-vlan:
-  mode: irb
 vlans:
   blue:
     host_count: 0

diff --git a/tests/topology/expected/vlan-routed.yml b/tests/topology/expected/vlan-routed.yml
@@ -152,7 +152,6 @@ nodes:
     name: r1
     vlan:
       max_bridge_group: 1
-      mode: irb
     vlans:
       red:
         bridge_group: 1
@@ -162,8 +161,6 @@ nodes:
           ipv4: 172.16.0.0/24
         vni: 101000
 provider: libvirt
-vlan:
-  mode: irb
 vlans:
   red:
     id: 1000

diff --git a/tests/topology/expected/vlan-router-stick.yml b/tests/topology/expected/vlan-router-stick.yml
@@ -495,7 +495,6 @@ nodes:
     name: s2
     vlan:
       max_bridge_group: 2
-      mode: irb
     vlans:
       blue:
         bridge_group: 1
@@ -538,8 +537,6 @@ nodes:
 ospf:
   area: 0.0.0.0
 provider: libvirt
-vlan:
-  mode: irb
 vlans:
   blue:
     host_count: 0