feat(core): Add 2n-spr topology

Signed-off-by: pmikus <peter.mikus@protonmail.ch>
Change-Id: I3f7efcbfc82f683e7afc986d00fa71ae7413d93d

diff --git a/docs/content/infrastructure/fdio_csit_testbed_specifications.md b/docs/content/infrastructure/fdio_csit_testbed_specifications.md
index 0711477..f1ef7a8 100644 (file)
--- a/docs/content/infrastructure/fdio_csit_testbed_specifications.md
+++ b/docs/content/infrastructure/fdio_csit_testbed_specifications.md
@@ -1806,26 +1806,26 @@ To be completed.
 ```
 - testbed21:
     - ring1 200GE-ports ConnectX7-2p200GE:
-        - s52-t21-tg1-c2/p1  to s53-t21-sut1-c2/p1
-        - s52-t21-tg1-c7/p1  to s53-t21-sut1-c7/p1
-        - s53-t21-sut1-c4/p2 to s53-t21-sut1-c9/p2
+        - s53-t21-tg1-c2/p1 to s52-t21-sut1-c2/p1
+        - s53-t21-tg1-c7/p1 to s52-t21-sut1-c7/p1
+        - s52-t21-sut1-c4/p2 to s52-t21-sut1-c9/p2
     - ring2 200GE-ports ConnectX7-2p200GE:
-        - s52-t21-tg1-c2/p2   to s53-t21-sut1-c2/p2
-        - s52-t21-tg1-c7/p2   to s53-t21-sut1-c7/p2
-        - s53-t21-sut1-c10/p1 to s53-t21-sut1-c11/p1
+        - s53-t21-tg1-c2/p2 to s52-t21-sut1-c2/p2
+        - s53-t21-tg1-c7/p2 to s52-t21-sut1-c7/p2
+        - s52-t21-sut1-c10/p1 to s52-t21-sut1-c11/p1
     - ring3 200GE-ports ConnectX7-2p200GE:
-        - s52-t21-tg1-c4/p1   to s53-t21-sut1-c4/p1
-        - s52-t21-tg1-c9/p1   to s53-t21-sut1-c9/p1
-        - s53-t21-sut1-c10/p2 to s53-t21-sut1-c11/p2
+        - s53-t21-tg1-c4/p1 to s52-t21-sut1-c4/p1
+        - s53-t21-tg1-c9/p1 to s52-t21-sut1-c9/p1
+        - s52-t21-sut1-c10/p2 to s52-t21-sut1-c11/p2
 - testbed22:
     - ring1 100GE-ports e810-2CQDA2-2p100GE:
-        - s54-t22-tg1-c2/p1  to s55-t22-sut1-c2/p1
-        - s54-t22-tg1-c2/p2  to s55-t22-sut1-c7/p1
-        - s54-t22-sut1-c2/p2 to s55-t22-sut1-c7/p2
+        - s55-t22-tg1-c2/p1  to s54-t22-sut1-c2/p1
+        - s55-t22-tg1-c2/p2  to s54-t22-sut1-c7/p1
+        - s54-t22-sut1-c2/p2 to s54-t22-sut1-c7/p2
     - ring2 25GE-ports e810-XXVDA4-4p25GE:
-        - s54-t22-tg1-c4/p1  to s55-t22-sut1-c4/p1
-        - s54-t22-tg1-c4/p2  to s55-t22-sut1-c9/p1
-        - s54-t22-sut1-c4/p2 to s55-t22-sut1-c9/p2
+        - s55-t22-tg1-c4/p1  to s54-t22-sut1-c4/p1
+        - s55-t22-tg1-c4/p2  to s54-t22-sut1-c9/p1
+        - s54-t22-sut1-c4/p2 to s54-t22-sut1-c9/p2
 - testbed23:
     - ring1 200GE-ports ConnectX7-2p200GE:
         - s56-t23-sut1-c2/p1 to s57-t23-tg1-c2/p1.

diff --git a/resources/libraries/bash/function/common.sh b/resources/libraries/bash/function/common.sh
index d98db18..de290eb 100644 (file)
--- a/resources/libraries/bash/function/common.sh
+++ b/resources/libraries/bash/function/common.sh
@@ -892,6 +892,7 @@ function select_tags () {
     awk_nics_sub_cmd+='gsub("xl710","40ge2p1xl710");'
     awk_nics_sub_cmd+='gsub("x520-da2","10ge2p1x520");'
     awk_nics_sub_cmd+='gsub("cx556a","100ge2p1cx556a");'
+    awk_nics_sub_cmd+='gsub("cx7veat","200ge2p1cx7veat");'
     awk_nics_sub_cmd+='gsub("e810cq","100ge2p1e810cq");'
     awk_nics_sub_cmd+='gsub("vic1227","10ge2p1vic1227");'
     awk_nics_sub_cmd+='gsub("vic1385","40ge2p1vic1385");'

diff --git a/resources/libraries/python/Constants.py b/resources/libraries/python/Constants.py
index 01e3a01..eda94fe 100644 (file)
--- a/resources/libraries/python/Constants.py
+++ b/resources/libraries/python/Constants.py
@@ -308,6 +308,7 @@ class Constants:
         u"Intel-E822CQ": 24500000000,
         u"Intel-E810CQ": 100000000000,
         u"Mellanox-CX556A": 100000000000,
+        u"Mellanox-CX7VEAT": 200000000000,
         u"Amazon-Nitro-50G": 10000000000,
         u"virtual": 100000000,
     }
@@ -322,6 +323,7 @@ class Constants:
         u"Intel-E822CQ": 29000000,
         u"Intel-E810CQ": 58500000,
         u"Mellanox-CX556A": 148809523,
+        u"Mellanox-CX7VEAT": 297619046,
         u"Amazon-Nitro-50G": 1200000,
         u"virtual": 14880952,
     }
@@ -337,6 +339,7 @@ class Constants:
         u"Intel-E810CQ": u"100ge2p1e810cq",
         u"Amazon-Nitro-50G": u"50ge1p1ena",
         u"Mellanox-CX556A": u"100ge2p1cx556a",
+        u"Mellanox-CX7VEAT": u"200ge2p1cx7veat",
     }
 
     # Shortened lowercase NIC model name, useful for presentation.
@@ -350,6 +353,7 @@ class Constants:
         u"100ge2p1e810cq": u"e810cq",
         u"50ge1p1ena": u"ena",
         u"100ge2p1cx556a": u"cx556a",
+        u"200ge2p1cx7veat": u"cx7veat",
     }
 
     # Not each driver is supported by each NIC.
@@ -363,6 +367,7 @@ class Constants:
         u"Intel-E810CQ": [u"vfio-pci", u"avf", u"af_xdp"],
         u"Amazon-Nitro-50G": [u"vfio-pci"],
         u"Mellanox-CX556A": [u"rdma-core", u"mlx5_core", u"af_xdp"],
+        u"Mellanox-CX7VEAT": [u"rdma-core", u"mlx5_core", u"af_xdp"],
     }
 
     # Each driver needs different plugin to work.
@@ -412,6 +417,7 @@ class Constants:
         u"Intel-E810CQ": [u"vfio-pci"],
         u"Amazon-Nitro-50G": [u"vfio-pci"],
         u"Mellanox-CX556A": [u"mlx5_core"],
+        u"Mellanox-CX7VEAT": [u"mlx5_core"],
     }
 
     # Tags to differentiate tests for different NIC driver.

diff --git a/topologies/available/lf_2n_spr_testbed23.yaml b/topologies/available/lf_2n_spr_testbed23.yaml
new file mode 100644 (file)
index 0000000..90bf838
--- /dev/null
+++ b/topologies/available/lf_2n_spr_testbed23.yaml
@@ -0,0 +1,187 @@
+---
+metadata:
+  version: 0.1
+  schema:
+    - resources/topology_schemas/2_node_topology.sch.yaml
+    - resources/topology_schemas/topology.sch.yaml
+  tags: [hw, 2-node]
+
+nodes:
+  TG:
+    type: TG
+    subtype: TREX
+    host: "10.30.51.57"
+    arch: x86_64
+    port: 22
+    username: testuser
+    password: Csit1234
+    interfaces:
+      port1:
+        # s57-t23-tg1-c2/p1 - 200GE port1 Mellanox ConnectX7-2p200GE.
+        mac_address: "b8:3f:d2:b7:a0:28"
+        pci_address: "0000:3d:00.0"
+        ip4_address: "172.16.10.2"
+        driver: mlx5_core
+        link: link1
+        model: Mellanox-CX7VEAT
+      port2:
+        # s57-t23-tg1-c2/p2 - 200GE port2 Mellanox ConnectX7-2p200GE.
+        mac_address: "b8:3f:d2:b7:a0:29"
+        pci_address: "0000:3d:00.0"
+        ip4_address: "172.16.20.2"
+        driver: mlx5_core
+        link: link2
+        model: Mellanox-CX7VEAT
+      port3:
+        # s57-t23-tg1-c4/p1 - 100GE port1 Intel E810-CQDA2 2p100GE.
+        mac_address: "40:a6:b7:9e:e9:a8"
+        pci_address: "0000:2a:00.0"
+        ip4_address: "172.16.30.2"
+        driver: ice
+        link: link3
+        model: Intel-E810CQ
+      port4:
+        # s57-t23-tg1-c4/p2 - 100GE port2 Intel E810-CQDA2 2p100GE.
+        mac_address: "40:a6:b7:9e:e9:ac"
+        pci_address: "0000:2c:00.0"
+        ip4_address: "172.16.40.2"
+        driver: ice
+        link: link4
+        model: Intel-E810CQ
+      port5:
+        # s57-t23-tg1-c10/p1 - 25GE port1 Intel E810-XXVDA4 4p25GE.
+        mac_address: "50:7c:6f:48:4a:54"
+        pci_address: "0000:17:00.0"
+        ip4_address: "172.16.50.2"
+        driver: ice
+        link: link5
+        model: Intel-E810XXV
+      port6:
+        # s57-t23-tg1-c10/p2 - 25GE port2 Intel E810-XXVDA4 4p25GE.
+        mac_address: "50:7c:6f:48:4a:55"
+        pci_address: "0000:17:00.1"
+        ip4_address: "172.16.60.2"
+        driver: ice
+        link: link6
+        model: Intel-E810XXV
+      port7:
+        # s57-t23-tg1-c10/p3 - 25GE port3 Intel E810-XXVDA4 4p25GE.
+        mac_address: "50:7c:6f:48:4a:56"
+        pci_address: "0000:17:00.2"
+        ip4_address: "172.16.70.2"
+        driver: ice
+        link: link7
+        model: Intel-E810XXV
+      port8:
+        # s57-t23-tg1-c10/p4 - 25GE port4 Intel E810-XXVDA4 4p25GE.
+        mac_address: "50:7c:6f:48:4a:57"
+        pci_address: "0000:17:00.3"
+        ip4_address: "172.16.80.2"
+        driver: ice
+        link: link8
+        model: Intel-E810XXV
+      port9:
+        # s57-t23-tg1-c7/p1 - 200GE port1 Mellanox ConnectX7-2p200GE.
+        mac_address: "b8:3f:d2:b7:a0:68"
+        pci_address: "0000:ab:00.0"
+        ip4_address: "172.16.90.2"
+        driver: mlx5_core
+        link: link9
+        model: Mellanox-CX7VEAT
+      port10:
+        # s57-t23-tg1-c7/p2 - 200GE port2 Mellanox ConnectX7-2p200GE.
+        mac_address: "b8:3f:d2:b7:a0:69"
+        pci_address: "0000:ab:00.1"
+        ip4_address: "172.16.100.2"
+        driver: mlx5_core
+        link: link9
+        model: Mellanox-CX7VEAT
+      port11:
+        # s57-t23-tg1-c9/p1 - 100GE port1 Intel E810-CQDA2 2p100GE.
+        mac_address: "40:a6:b7:9e:e2:20"
+        pci_address: "0000:bd:00.0"
+        ip4_address: "172.16.110.2"
+        driver: ice
+        link: link10
+        model: Intel-E810CQ
+      port12:
+        # s57-t23-tg1-c9/p2 - 100GE port2 Intel E810-CQDA2 2p100GE.
+        mac_address: "40:a6:b7:9e:e2:24"
+        pci_address: "0000:bf:00.0"
+        ip4_address: "172.16.120.2"
+        driver: ice
+        link: link10
+        model: Intel-E810CQ
+  DUT1:
+    type: DUT
+    host: "10.30.51.56"
+    arch: x86_64
+    port: 22
+    username: testuser
+    password: Csit1234
+    uio_driver: vfio-pci
+    interfaces:
+      port1:
+        # s56-t23-sut1-c2/p1 - 200GE port1 Mellanox ConnectX7-2p200GE.
+        mac_address: "b8:3f:d2:b7:a0:30"
+        pci_address: "0000:3d:00.0"
+        ip4_address: "172.16.10.1"
+        driver: mlx5_core
+        link: link1
+        model: Mellanox-CX7VEAT
+      port2:
+        # s56-t23-sut1-c2/p2 - 200GE port2 Mellanox ConnectX7-2p200GE.
+        mac_address: "b8:3f:d2:b7:a0:31"
+        pci_address: "0000:3d:00.0"
+        ip4_address: "172.16.20.1"
+        driver: mlx5_core
+        link: link2
+        model: Mellanox-CX7VEAT
+      port3:
+        # s56-t23-sut1-c4/p1 - 100GE port1 Intel E810-CQDA2 2p100GE.
+        mac_address: "40:a6:b7:9e:e2:70"
+        pci_address: "0000:2a:00.0"
+        ip4_address: "172.16.30.1"
+        driver: ice
+        link: link3
+        model: Intel-E810CQ
+      port4:
+        # s56-t23-sut1-c4/p2 - 100GE port2 Intel E810-CQDA2 2p100GE.
+        mac_address: "40:a6:b7:9e:e2:74"
+        pci_address: "0000:2c:00.0"
+        ip4_address: "172.16.40.1"
+        driver: ice
+        link: link4
+        model: Intel-E810CQ
+      port5:
+        # s56-t23-sut1-c10/p1 - 25GE port1 Intel E810-XXVDA4 4p25GE.
+        mac_address: "50:7c:6f:48:45:70"
+        pci_address: "0000:17:00.0"
+        ip4_address: "172.16.50.1"
+        driver: ice
+        link: link5
+        model: Intel-E810XXV
+      port6:
+        # s56-t23-sut1-c10/p2 - 25GE port2 Intel E810-XXVDA4 4p25GE.
+        mac_address: "50:7c:6f:48:45:71"
+        pci_address: "0000:17:00.1"
+        ip4_address: "172.16.60.1"
+        driver: ice
+        link: link6
+        model: Intel-E810XXV
+      port7:
+        # s56-t23-sut1-c10/p3 - 25GE port3 Intel E810-XXVDA4 4p25GE.
+        mac_address: "50:7c:6f:48:45:72"
+        pci_address: "0000:17:00.2"
+        ip4_address: "172.16.70.1"
+        driver: ice
+        link: link7
+        model: Intel-E810XXV
+      port8:
+        # s56-t23-sut1-c10/p4 - 25GE port4 Intel E810-XXVDA4 4p25GE.
+        mac_address: "50:7c:6f:48:45:73"
+        pci_address: "0000:17:00.3"
+        ip4_address: "172.16.80.1"
+        driver: ice
+        link: link8
+        model: Intel-E810XXV