SR-OS: Set correct port mode for all VLAN combinations (#2326)

A combination of SVI VLAN and routed VLAN on the same interface
requires "hybrid" port mode due to the way routed VLAN interfaces
are configured on SR-OS (they are in "router Base", not in IES
service).

This commit moves the calculation of port mode into SR-OS device
module, making it much easier to understand and debug than the
attempts to reverse-engineer it in the Jinja2 template.

Author: ipspace

netsim/ansible/templates/initial/sros.j2

@@ -152,12 +152,8 @@
 {%   if l.mtu is defined and '_use_ip_mtu' not in l %}
     mtu: {{ l.mtu + eth_header }} # max 9800
 {%   endif %}
-{%   if l.vlan.trunk_id is defined or (l.parent_ifindex is defined and interfaces[l.parent_ifindex-1].vlan.trunk_id is defined) %}
-    mode: hybrid # Support mixed trunks by using hybrid ports
-{%   elif not in_base %}
-    mode: access
-{%   else %}
-    mode: network
+{%   if l._port_mode is defined %}
+    mode: {{ l._port_mode }}
 {%   endif %}
 {%   if tagged %}
 {%    set portname = portname + ':' + vlan|string %}

netsim/devices/sros.py

@@ -37,10 +37,36 @@ def evpn_vrf_rp(node: Box) -> None:
         node=node,
         category=log.IncorrectValue)
 
+def set_port_mode(intf: Box, mode: str) -> None:
+  if '_port_mode' not in intf:
+    intf._port_mode = mode
+  elif intf._port_mode != mode:
+    intf._port_mode = 'hybrid'
+
+def set_port_modes(node: Box) -> None:
+  for intf in node.interfaces:
+    if intf.type in ['svi', 'loopback']:
+      continue
+
+    t_intf = intf
+    if intf.type == 'vlan_member':
+      pif_list = [ p_if for p_if in node.interfaces if p_if.ifname == intf.parent_ifname ]
+      if not pif_list:
+        log.fatal(f'SROS: Cannot find parent interface {intf.parent_ifname} on node {node.name}')
+      t_intf = pif_list[0]
+
+    if 'vrf' in intf:
+      set_port_mode(t_intf,'access')
+    elif 'ipv4' in intf or 'ipv6' in intf:
+      set_port_mode(t_intf,'network')
+    else:
+      set_port_mode(t_intf,'access')
+
 class SROS(_Quirks):
 
   @classmethod
   def device_quirks(self, node: Box, topology: Box) -> None:
+    set_port_modes(node)
     ipv4_unnumbered(node)
     vrf_route_leaking(node)
     evpn_vrf_rp(node)