Merge pull request #1 from scottlaird/push-uumokqtkosru

mlxsw: T8878: Add basic support for Mellanox SN2* switches

Author: scottlaird

interface-definitions/interfaces_ethernet.xml.in

@@ -14,7 +14,7 @@
             <description>Ethernet interface name</description>
           </valueHelp>
           <constraint>
-            <regex>((eth|lan)[0-9]+|(eno|ens|enp|enx).+)</regex>
+            <regex>((eth|lan)[0-9]+|(eno|ens|enp|enx).+|sw[0-9]*p[0-9]+(s[0-9]+)?)</regex>
           </constraint>
           <constraintErrorMessage>Invalid Ethernet interface name</constraintErrorMessage>
         </properties>

interface-definitions/interfaces_vxlan.xml.in

@@ -87,6 +87,12 @@
                   <valueless/>
                 </properties>
               </leafNode>
+              <leafNode name="noudpcsum">
+                <properties>
+                  <help>Do not require UDP checksums.  Required for mellanox switch support</help>
+                  <valueless/>
+                </properties>
+              </leafNode>
               <leafNode name="neighbor-suppress">
                 <properties>
                   <help>Enable neighbor discovery (ARP and ND) suppression</help>

python/vyos/ifconfig/ethernet.py

@@ -38,11 +38,11 @@ class EthernetIf(Interface):
         **Interface.definition,
         **{
             'section': 'ethernet',
-            'prefixes': ['lan', 'eth', 'eno', 'ens', 'enp', 'enx'],
+            'prefixes': ['lan', 'eth', 'eno', 'ens', 'enp', 'enx', 'sw', 'swp'],
             'bondable': True,
             'broadcast': True,
             'bridgeable': True,
-            'eternal': '(lan|eth|eno|ens|enp|enx)[0-9]+$',
+            'eternal': '(lan|eth|eno|ens|enp|enx)[0-9]+|sw[0-9]*p[0-9]+(s[0-9]+)?$',
         },
     }
 

python/vyos/ifconfig/vxlan.py

@@ -75,6 +75,7 @@ def _create(self):
             'parameters.ip.ttl'          : 'ttl',
             'parameters.ipv6.flowlabel'  : 'flowlabel',
             'parameters.nolearning'      : 'nolearning',
+            'parameters.noudpcsum'       : 'noudpcsum',
             'parameters.vni_filter'      : 'vnifilter',
             'remote'                     : 'remote',
             'source_address'             : 'local',

src/etc/udev/rules.d/65-vyos-net.rules

@@ -4,6 +4,9 @@
 ACTION!="add", 				GOTO="vyos_net_end"
 SUBSYSTEM!="net",			GOTO="vyos_net_end"
 
+# Use switchport names for Mellanox switches, so interface names match the front-panel labels
+DRIVERS=="mlxsw_spectrum*", NAME="sw$attr{phys_port_name}", GOTO="vyos_net_end"
+
 # Do name change for ethernet and wireless devices only
 KERNEL!="eth*|wlan*|e*", 			GOTO="vyos_net_end"
 

src/helpers/vyos-interface-rescan.py

@@ -87,7 +87,7 @@ def get_wireless_physical_device(intf: str) -> str:
     return phy
 
 def get_interface_type(intf: str) -> str:
-    if 'eth' in intf:
+    if 'eth' in intf or 'sw' in intf:
         intf_type = 'ethernet'
     elif 'wlan' in intf:
         intf_type = 'wireless'

src/ocaml/completion/list_interfaces/list_interfaces.ml

@@ -23,7 +23,7 @@ let type_to_prefix it =
     | "bonding" -> "bond"
     | "bridge" -> "br"
     | "dummy" -> "dum"
-    | "ethernet" -> "eth"
+    | "ethernet" -> "eth|sw|swp"
     | "geneve" -> "gnv"
     | "input" -> "ifb"
     | "l2tpeth" -> "l2tpeth"
@@ -44,13 +44,13 @@ let type_to_prefix it =
 
 (* filter_section to match the constraint of python.vyos.ifconfig.section
  *)
-let rx = Pcre2.regexp {|\d(\d|v|\.)*$|}
+let rx = Pcre2.regexp {|\d(\d|[psv]|\.)*$|}
 
 let filter_section s =
     let r = Pcre2.qreplace_first ~rex:rx ~templ:"" s in
     match r with
     |"bond"|"br"|"dum"|"eth"|"gnv"|"ifb"|"l2tpeth"|"lo"|"macsec" -> true
-    |"peth"|"pppoe"|"sstpc"|"tun"|"veth"|"vti"|"vtun"|"vxlan"|"wg"|"wlan"|"wwan" -> true
+    |"peth"|"pppoe"|"sstpc"|"sw"|"swp"|"tun"|"veth"|"vti"|"vtun"|"vxlan"|"wg"|"wlan"|"wwan" -> true
     | _ -> false
 
 let filter_from_prefix p s =
@@ -76,15 +76,15 @@ let filter_broadcast s =
     with Not_found -> false
 
 let filter_bridgeable s =
-    let pattern = {|^(bond|eth|gnv|l2tpeth|lo|tun|veth|vtun|vxlan|wlan)(.*)$|}
+    let pattern = {|^(bond|eth|gnv|l2tpeth|lo|sw|tun|veth|vtun|vxlan|wlan)(.*)$|}
     in
     try
         let _ = Pcre2.exec ~pat:pattern s in
         true
     with Not_found -> false
 
 let filter_bondable s =
-    let pattern = {|^(eth|lan|eno|ens)[A-Za-z0-9_-]*$|}
+    let pattern = {|^(eth|lan|eno|ens|sw)[A-Za-z0-9_-]*$|}
     in
     try
         let _ = Pcre2.exec ~pat:pattern s in

src/services/vyos-netlinkd

@@ -38,7 +38,7 @@ from vyos.utils.process import stop_systemd_unit
 running = True
 
 # compile regex once during startup for fast match
-IFACE_RE = re.compile(r"^(?:eth|br|bond|wlan)")
+IFACE_RE = re.compile(r"^(?:eth|lan|eno|ens|enp|enx|br|bond|sw|wlan)")
 
 def match_iface(ifname: str) -> bool:
     """ Helper function returning true if interface name is a match for further

src/validators/ethernet-interface

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-if ! [[ "$1" =~ ^(lan|eth|eno|ens|enp|enx)[0-9]+$ ]]; then
+if ! [[ "$1" =~ ^(lan|eth|eno|ens|enp|enx)[0-9]+|sw[0-9]*p[0-9]+(s[0-9]+)? $ ]]; then
     echo "Error: $1 is not an ethernet interface"
     exit 1
 fi

src/validators/vrf-name

@@ -41,8 +41,9 @@ if __name__ == '__main__':
 
     # VRF name must not conflict with local interface type prefix
     pattern = r'^(?!(bond|br|dum|eth|lan|eno|ens|enp|enx|gnv|ipoe|l2tp|l2tpeth|\
-       vtun|ppp|pppoe|peth|tun|vti|vxlan|wg|wlan|wwan|\d)\d*(\.\d+)?(v.+)?).*$'
+       vtun|ppp|pppoe|peth|sw|tun|vti|vxlan|wg|wlan|wwan|\d)\d*(\.\d+)?(v.+)?).*$'
     if not re.match(pattern, vrf):
         exit(1)
 
     exit(0)
+