feat(device): cx6 update of 1n-alt device jobspec

Update the jobspec according to the current Arm policy:
1. Run most of the tests on cx6, crypto coverage being the most
   important,
2. Match the cx6 ipv4 crypto coverage with x710 with the DPDK driver,
3. Run basic ipv4 and l2 tests with x710 with borh DPDK and native (avf)
   drivers.

The above is the policy used in performance testing where time is a
major constraint. The same is true for functional testing to some
extent, so it makes sense to apply the same logic for choosing the tests.

There are 10 tests which are failing on cx6 without an identified
reason. They are disabled until we find the root cause and address it.
In the meantime, the tests are enabled for x710 with the DPDK driver:
ethip4-l2xcbase-eth-2memif-1dcr
ethip4-l2bdbasemaclrn-eth-2memif-1dcr
ethip4-l2bdbasemaclrn-eth-2tap
ethip4-l2bdbasemaclrn
ethip4-l2bdbasemaclrn-iacl1sf
ethip4-l2bdbasemaclrn-iacl1sl
ethip4-l2bdbasemaclrn-oacl1sf
ethip4-l2bdbasemaclrn-oacl1sl
ethip4-l2patch
ethip4-l2xcbase

When the cx6 issue has been resolved, these should be enabled for cx6
and disabled for x710, with the exception of ethip4-l2bdbasemaclrn,
which should be running on both.

Change-Id: Id48f450063e405b1faca57431676f91d62e829b9
Signed-off-by: Juraj Linkeš <juraj.linkes@pantheon.tech>

diff --git a/resources/job_specs/vpp_device/vpp-1n-alt.md b/resources/job_specs/vpp_device/vpp-1n-alt.md
index 6f7c026..9d9c8e5 100644 (file)
--- a/resources/job_specs/vpp_device/vpp-1n-alt.md
+++ b/resources/job_specs/vpp_device/vpp-1n-alt.md
@@ -1,14 +1,29 @@
 # 1n-alt
 ## ./container_memif
+### mellanox-cx6dx
+#### mlx5-core
+##### ethip4-l2xcbase-eth-2memif-1dcr
+# 0c AND 64b AND scapy AND cx6dx AND drv_mlx5_core AND ethip4-l2xcbase-eth-2memif-1dcr
+##### ethip4-l2bdbasemaclrn-eth-2memif-1dcr
+# 0c AND 64b AND scapy AND cx6dx AND drv_mlx5_core AND ethip4-l2bdbasemaclrn-eth-2memif-1dcr
+##### ethip4-ip4base-eth-2memif-1dcr
+0c AND 64b AND scapy AND cx6dx AND drv_mlx5_core AND ethip4-ip4base-eth-2memif-1dcr
 ### intel-x710
 #### dpdk-vfio-pci
 ##### ethip4-l2xcbase-eth-2memif-1dcr
 0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-l2xcbase-eth-2memif-1dcr
 ##### ethip4-l2bdbasemaclrn-eth-2memif-1dcr
 0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-l2bdbasemaclrn-eth-2memif-1dcr
-##### ethip4-ip4base-eth-2memif-1dcr
-0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-ip4base-eth-2memif-1dcr
 ## ./crypto/ethip4
+### mellanox-cx6dx
+#### mlx5-core
+0c AND 64b AND scapy AND cx6dx AND drv_mlx5_core AND ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha
+##### ethip4ipsec11tnlsw-ip4base-int-aes128cbc-hmac512sha
+0c AND 64b AND scapy AND cx6dx AND drv_mlx5_core AND ethip4ipsec11tnlsw-ip4base-int-aes128cbc-hmac512sha
+##### ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha
+0c AND 64b AND scapy AND cx6dx AND drv_mlx5_core AND ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha
+##### ethip4ipsec1tptsw-ip4base-policy-aes128cbc-hmac512sha
+0c AND 64b AND scapy AND cx6dx AND drv_mlx5_core AND ethip4ipsec1tptsw-ip4base-policy-aes128cbc-hmac512sha
 ### intel-x710
 #### dpdk-vfio-pci
 ##### ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha
@@ -20,85 +35,108 @@
 ##### ethip4ipsec1tptsw-ip4base-policy-aes128cbc-hmac512sha
 0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4ipsec1tptsw-ip4base-policy-aes128cbc-hmac512sha
 ## ./crypto/ethip6
-### intel-x710
-#### dpdk-vfio-pci
+### mellanox-cx6dx
+#### mlx5-core
 ##### ethip6ipsec1tnlsw-ip6base-policy-aes128cbc-hmac512sha
-0c AND 78b AND scapy AND x710 AND drv_vfio_pci AND ethip6ipsec1tnlsw-ip6base-policy-aes128cbc-hmac512sha
+0c AND 78b AND scapy AND cx6dx AND drv_mlx5_core AND ethip6ipsec1tnlsw-ip6base-policy-aes128cbc-hmac512sha
 ##### ethip6ipsec1tptsw-ip6base-policy-aes128cbc-hmac512sha
-0c AND 78b AND scapy AND x710 AND drv_vfio_pci AND ethip6ipsec1tptsw-ip6base-policy-aes128cbc-hmac512sha
+0c AND 78b AND scapy AND cx6dx AND drv_mlx5_core AND ethip6ipsec1tptsw-ip6base-policy-aes128cbc-hmac512sha
 ## ./interfaces
-### intel-x710
-#### dpdk-vfio-pci
+### mellanox-cx6dx
+#### mlx5-core
 ##### ethicmp4-ip4base-eth-1tap
-0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethicmp4-ip4base-eth-1tap
+0c AND 64b AND scapy AND cx6dx AND drv_mlx5_core AND ethicmp4-ip4base-eth-1tap
 ##### ethicmp4-ip4base-eth-1tap-namespace
-0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethicmp4-ip4base-eth-1tap-namespace
+0c AND 64b AND scapy AND cx6dx AND drv_mlx5_core AND ethicmp4-ip4base-eth-1tap-namespace
 ##### ethip4-l2bdbasemaclrn-eth-2tap
-0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-l2bdbasemaclrn-eth-2tap
-## ./ip4
+# 0c AND 64b AND scapy AND cx6dx AND drv_mlx5_core AND ethip4-l2bdbasemaclrn-eth-2tap
 ### intel-x710
 #### dpdk-vfio-pci
+##### ethip4-l2bdbasemaclrn-eth-2tap
+0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-l2bdbasemaclrn-eth-2tap
+## ./ip4
+### mellanox-cx6dx
+#### mlx5-core
 ##### ethip4-ip4base-adlalwlistbase
-0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-ip4base-adlalwlistbase
+0c AND 64b AND scapy AND cx6dx AND drv_mlx5_core AND ethip4-ip4base-adlalwlistbase
 ##### ethip4-ip4base-adlblklistbase
-0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-ip4base-adlblklistbase
+0c AND 64b AND scapy AND cx6dx AND drv_mlx5_core AND ethip4-ip4base-adlblklistbase
 ##### ethip4-ip4base
-0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-ip4base
+0c AND 64b AND scapy AND cx6dx AND drv_mlx5_core AND ethip4-ip4base
 ##### ethip4-ip4base-iacldstbase
-0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-ip4base-iacldstbase
+0c AND 64b AND scapy AND cx6dx AND drv_mlx5_core AND ethip4-ip4base-iacldstbase
 ##### ethip4-ip4base-ipolicemarkbase
-0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-ip4base-ipolicemarkbase
+0c AND 64b AND scapy AND cx6dx AND drv_mlx5_core AND ethip4-ip4base-ipolicemarkbase
 ##### ethip4tcp-nat44det
-0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4tcp-nat44det
+0c AND 64b AND scapy AND cx6dx AND drv_mlx5_core AND ethip4tcp-nat44det
 ##### ethip4tcp-nat44ed
-0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4tcp-nat44ed
+0c AND 64b AND scapy AND cx6dx AND drv_mlx5_core AND ethip4tcp-nat44ed
 ##### ethip4udp-nat44det
-0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4udp-nat44det
+0c AND 64b AND scapy AND cx6dx AND drv_mlx5_core AND ethip4udp-nat44det
 ##### ethip4udp-nat44ed
-0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4udp-nat44ed
-## ./ip4_tunnel/lisp
+0c AND 64b AND scapy AND cx6dx AND drv_mlx5_core AND ethip4udp-nat44ed
 ### intel-x710
 #### dpdk-vfio-pci
+##### ethip4-ip4base
+0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-ip4base
+### intel-x710
+#### avf
+##### ethip4-ip4base
+0c AND 64b AND scapy AND x710 AND drv_avf AND ethip4-ip4base
+## ./ip4_tunnel/lisp
+### mellanox-cx6dx
+#### mlx5-core
 ##### ethip4lisp-ip4base
-0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4lisp-ip4base
+0c AND 64b AND scapy AND cx6dx AND drv_mlx5_core AND ethip4lisp-ip4base
 ##### ethip4lispgpe-ip4base
-0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4lispgpe-ip4base
+0c AND 64b AND scapy AND cx6dx AND drv_mlx5_core AND ethip4lispgpe-ip4base
 ##### ethip4lispgpe-ip6base
-0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4lispgpe-ip6base
+0c AND 64b AND scapy AND cx6dx AND drv_mlx5_core AND ethip4lispgpe-ip6base
 ## ./ip4_tunnel
-### intel-x710
-#### dpdk-vfio-pci
+### mellanox-cx6dx
+#### mlx5-core
 ##### ethip4--ethip4udpgeneve-1tun-ip4base
-0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4--ethip4udpgeneve-1tun-ip4base
+0c AND 64b AND scapy AND cx6dx AND drv_mlx5_core AND ethip4--ethip4udpgeneve-1tun-ip4base
 ##### ethip4vxlan-l2bdbasemaclrn
-0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4vxlan-l2bdbasemaclrn
+0c AND 64b AND scapy AND cx6dx AND drv_mlx5_core AND ethip4vxlan-l2bdbasemaclrn
 ##### ethip4vxlan-l2xcbase
-0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4vxlan-l2xcbase
+0c AND 64b AND scapy AND cx6dx AND drv_mlx5_core AND ethip4vxlan-l2xcbase
 ## ./ip6
-### intel-x710
-#### dpdk-vfio-pci
+### mellanox-cx6dx
+#### mlx5-core
 ##### ethip6-ip6base-adlalwlistbase
-0c AND 78b AND scapy AND x710 AND drv_vfio_pci AND ethip6-ip6base-adlalwlistbase
+0c AND 78b AND scapy AND cx6dx AND drv_mlx5_core AND ethip6-ip6base-adlalwlistbase
 ##### ethip6-ip6base-adlblklistbase
-0c AND 78b AND scapy AND x710 AND drv_vfio_pci AND ethip6-ip6base-adlblklistbase
+0c AND 78b AND scapy AND cx6dx AND drv_mlx5_core AND ethip6-ip6base-adlblklistbase
 ##### ethip6-ip6base-iacldstbase
-0c AND 78b AND scapy AND x710 AND drv_vfio_pci AND ethip6-ip6base-iacldstbase
+0c AND 78b AND scapy AND cx6dx AND drv_mlx5_core AND ethip6-ip6base-iacldstbase
 ##### ethip6-ip6base-ipolicemarkbase
-0c AND 78b AND scapy AND x710 AND drv_vfio_pci AND ethip6-ip6base-ipolicemarkbase
+0c AND 78b AND scapy AND cx6dx AND drv_mlx5_core AND ethip6-ip6base-ipolicemarkbase
 ##### ethip6-ip6base
-0c AND 78b AND scapy AND x710 AND drv_vfio_pci AND ethip6-ip6base
+0c AND 78b AND scapy AND cx6dx AND drv_mlx5_core AND ethip6-ip6base
 ## ./ip6_tunnels/lisp
-### intel-x710
-#### dpdk-vfio-pci
+### mellanox-cx6dx
+#### mlx5-core
 ##### ethip6lispgpe-ip4base
-0c AND 78b AND scapy AND x710 AND drv_vfio_pci AND ethip6lispgpe-ip4base
+0c AND 78b AND scapy AND cx6dx AND drv_mlx5_core AND ethip6lispgpe-ip4base
 ##### ethip6lispgpe-ip6base
-0c AND 78b AND scapy AND x710 AND drv_vfio_pci AND ethip6lispgpe-ip6base
+0c AND 78b AND scapy AND cx6dx AND drv_mlx5_core AND ethip6lispgpe-ip6base
 ## ./l2bd
-### intel-x710
-#### avf
+### mellanox-cx6dx
+#### mlx5-core
 ##### ethip4-l2bdbasemaclrn
-#0c AND 64b AND scapy AND x710 AND drv_avf AND ethip4-l2bdbasemaclrn
+# 0c AND 64b AND scapy AND cx6dx AND drv_mlx5_core AND ethip4-l2bdbasemaclrn
+##### ethip4-l2bdbasemaclrn-iacl1sf
+# 0c AND 64b AND scapy AND cx6dx AND drv_mlx5_core AND ethip4-l2bdbasemaclrn-iacl1sf
+##### ethip4-l2bdbasemaclrn-iacl1sl
+# 0c AND 64b AND scapy AND cx6dx AND drv_mlx5_core AND ethip4-l2bdbasemaclrn-iacl1sl
+##### ethip4-l2bdbasemaclrn-macip-iacl1sl
+0c AND 64b AND scapy AND cx6dx AND drv_mlx5_core AND ethip4-l2bdbasemaclrn-macip-iacl1sl
+##### ethip4-l2bdbasemaclrn-oacl1sf
+# 0c AND 64b AND scapy AND cx6dx AND drv_mlx5_core AND ethip4-l2bdbasemaclrn-oacl1sf
+##### ethip4-l2bdbasemaclrn-oacl1sl
+# 0c AND 64b AND scapy AND cx6dx AND drv_mlx5_core AND ethip4-l2bdbasemaclrn-oacl1sl
+### intel-x710
 #### dpdk-vfio-pci
 ##### ethip4-l2bdbasemaclrn
 0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-l2bdbasemaclrn
@@ -106,53 +144,62 @@
 0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-l2bdbasemaclrn-iacl1sf
 ##### ethip4-l2bdbasemaclrn-iacl1sl
 0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-l2bdbasemaclrn-iacl1sl
-##### ethip4-l2bdbasemaclrn-macip-iacl1sl
-0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-l2bdbasemaclrn-macip-iacl1sl
 ##### ethip4-l2bdbasemaclrn-oacl1sf
 0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-l2bdbasemaclrn-oacl1sf
 ##### ethip4-l2bdbasemaclrn-oacl1sl
 0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-l2bdbasemaclrn-oacl1sl
+#### avf
+##### ethip4-l2bdbasemaclrn
+0c AND 64b AND scapy AND x710 AND drv_avf AND ethip4-l2bdbasemaclrn
 ## ./l2patch
+### mellanox-cx6dx
+#### mlx5-core
+##### ethip4-l2patch
+# 0c AND 64b AND scapy AND cx6dx AND drv_mlx5_core AND ethip4-l2patch
 ### intel-x710
 #### dpdk-vfio-pci
 ##### ethip4-l2patch
 0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-l2patch
 ## ./l2xc
+### mellanox-cx6dx
+#### mlx5-core
+##### ethip4-l2xcbase
+# 0c AND 64b AND scapy AND cx6dx AND drv_mlx5_core AND ethip4-l2xcbase
 ### intel-x710
 #### dpdk-vfio-pci
 ##### ethip4-l2xcbase
 0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-l2xcbase
 ## ./srv6
-### intel-x710
-#### dpdk-vfio-pci
+### mellanox-cx6dx
+#### mlx5-core
 ##### ethip6ip6-ip6base-srv6enc1sid
-0c AND 78b AND scapy AND x710 AND drv_vfio_pci AND ethip6ip6-ip6base-srv6enc1sid
+0c AND 78b AND scapy AND cx6dx AND drv_mlx5_core AND ethip6ip6-ip6base-srv6enc1sid
 ##### ethip6srhip6-ip6base-srv6enc2sids
-0c AND 78b AND scapy AND x710 AND drv_vfio_pci AND ethip6srhip6-ip6base-srv6enc2sids
+0c AND 78b AND scapy AND cx6dx AND drv_mlx5_core AND ethip6srhip6-ip6base-srv6enc2sids
 ##### ethip6srhip6-ip6base-srv6enc2sids-nodecaps
-0c AND 78b AND scapy AND x710 AND drv_vfio_pci AND ethip6srhip6-ip6base-srv6enc2sids-nodecaps
+0c AND 78b AND scapy AND cx6dx AND drv_mlx5_core AND ethip6srhip6-ip6base-srv6enc2sids-nodecaps
 ##### ethip6srhip6-ip6base-srv6proxy-dyn
-0c AND 78b AND scapy AND x710 AND drv_vfio_pci AND ethip6srhip6-ip6base-srv6proxy-dyn
+0c AND 78b AND scapy AND cx6dx AND drv_mlx5_core AND ethip6srhip6-ip6base-srv6proxy-dyn
 ##### ethip6srhip6-ip6base-srv6proxy-masq
-0c AND 78b AND scapy AND x710 AND drv_vfio_pci AND ethip6srhip6-ip6base-srv6proxy-masq
+0c AND 78b AND scapy AND cx6dx AND drv_mlx5_core AND ethip6srhip6-ip6base-srv6proxy-masq
 ##### ethip6srhip6-ip6base-srv6proxy-stat
-0c AND 78b AND scapy AND x710 AND drv_vfio_pci AND ethip6srhip6-ip6base-srv6proxy-stat
+0c AND 78b AND scapy AND cx6dx AND drv_mlx5_core AND ethip6srhip6-ip6base-srv6proxy-stat
 ## ./stats
-### intel-x710
-#### dpdk-vfio-pci
+### mellanox-cx6dx
+#### mlx5-core
 ##### ethip4-l2xcbase-stats
-0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-l2xcbase-stats
+0c AND 64b AND scapy AND cx6dx AND drv_mlx5_core AND ethip4-l2xcbase-stats
 ## ./vm/ethip4
-### intel-x710
-#### dpdk-vfio-pci
+### mellanox-cx6dx
+#### mlx5-core
 ##### ethip4-ip4base-eth-2vhost-1vm
-# 0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-ip4base-eth-2vhost-1vm
+# 0c AND 64b AND scapy AND cx6dx AND drv_mlx5_core AND ethip4-ip4base-eth-2vhost-1vm
 ##### ethip4-l2bdbasemaclrn-eth-2vhost-1vm
-# 0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-l2bdbasemaclrn-eth-2vhost-1vm
+# 0c AND 64b AND scapy AND cx6dx AND drv_mlx5_core AND ethip4-l2bdbasemaclrn-eth-2vhost-1vm
 ##### ethip4-l2xcbase-eth-2vhost-1vm
-# 0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-l2xcbase-eth-2vhost-1vm
+# 0c AND 64b AND scapy AND cx6dx AND drv_mlx5_core AND ethip4-l2xcbase-eth-2vhost-1vm
 ## ./vm/ethip6
-### intel-x710
-#### dpdk-vfio-pci
+### mellanox-cx6dx
+#### mlx5-core
 ##### ethip6-ip6base-eth-2vhost-1vm
-# 0c AND 78b AND scapy AND x710 AND drv_vfio_pci AND ethip6-ip6base-eth-2vhost-1vm
\ No newline at end of file
+# 0c AND 78b AND scapy AND cx6dx AND drv_mlx5_core AND ethip6-ip6base-eth-2vhost-1vm
\ No newline at end of file

diff --git a/resources/libraries/bash/function/device.sh b/resources/libraries/bash/function/device.sh
index ee0ebdf..4d39cd2 100644 (file)
--- a/resources/libraries/bash/function/device.sh
+++ b/resources/libraries/bash/function/device.sh
@@ -173,13 +173,17 @@ function clean_environment () {
     }
 
     # Rebind interfaces back to kernel drivers.
+    i=0
     for ADDR in ${TG_PCIDEVS[@]}; do
-        DRIVER="${TG_DRIVERS[0]}"
+        DRIVER="${TG_DRIVERS[${i}]}"
         bind_interfaces_to_driver || die
+        ((i++))
     done
+    i=0
     for ADDR in ${DUT1_PCIDEVS[@]}; do
-        DRIVER="${DUT1_DRIVERS[0]}"
+        DRIVER="${DUT1_DRIVERS[${i}]}"
         bind_interfaces_to_driver || die
+        ((i++))
     done
 }
 
@@ -315,9 +319,11 @@ function get_available_interfaces () {
        "1n_alt")
             # Add Intel Corporation XL710/X710 Virtual Function to the
             # whitelist.
-            pci_id="0x154c"
-            tg_netdev=(enp1s0f0 enp1s0f1)
-            dut1_netdev=(enP3p2s0f0 enP3p2s0f1)
+            # Add MT2892 Family [ConnectX-6 Dx] Virtual Function to the
+            # whitelist.
+            pci_id="0x154c\|0x101e"
+            tg_netdev=(enp1s0f0 enp1s0f1 enP1p1s0f0)
+            dut1_netdev=(enP3p2s0f0 enP3p2s0f1 enP1p1s0f1)
             ports_per_nic=2
             ;;
         "1n_spr")
@@ -503,6 +509,9 @@ function get_csit_model () {
             "0x1572"|"0x154c")
                 MODEL="Intel-X710"
                 ;;
+            "0x101e")
+                MODEL="Mellanox-CX6DX"
+                ;;
             *)
                 MODEL="virtual"
         esac