X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=topologies%2Favailable%2Flf_3na_spr_testbed21.yaml;h=73dc9bad440101c1c8da86c18343f742d6166eb5;hb=575941328d025997c20ee30e7f85835a9510415e;hp=8e32563d5664da877a4da669968be8621fb620f0;hpb=d452dcd3d3102a5e344a7e3a9a0ca9a65a7ff1b7;p=csit.git

diff --git a/topologies/available/lf_3na_spr_testbed21.yaml b/topologies/available/lf_3na_spr_testbed21.yaml
index 8e32563d56..73dc9bad44 100644
--- a/topologies/available/lf_3na_spr_testbed21.yaml
+++ b/topologies/available/lf_3na_spr_testbed21.yaml
@@ -15,84 +15,78 @@ nodes:
     port: 6001
     username: testuser
     password: Csit1234
+    bus:
+      device1:
+        pci_address: "0000:75:01.0"
+        driver: idxd
+        model: Intel-DSA
+      device2:
+        pci_address: "0000:f2:01.0"
+        driver: idxd
+        model: Intel-DSA
+    cryptodev: "0000:76:00.0"
     interfaces:
-#      port1:
-#        # s53-t21-tg1-c10/p1 - 200GE port1 Mellanox ConnectX7-2p200GE.
-#        mac_address: "b8:3f:d2:b7:a0:70"
-#        pci_address: "0000:17:00.0"
-#        ip4_address: "172.16.10.1"
-#        driver: mlx5_core
-#        link: link1
-#        model: Mellanox-CX7VEAT
-#      port2:
-#        # s53-t21-tg1-c10/p2 - 200GE port2 Mellanox ConnectX7-2p200GE.
-#        mac_address: "b8:3f:d2:b7:a0:71"
-#        pci_address: "0000:17:00.1"
-#        ip4_address: "172.16.20.1"
-#        driver: mlx5_core
-#        link: link2
-#        model: Mellanox-CX7VEAT
-      port3:
+      port1:
         # s53-t21-tg1-c4/p1 - 200GE port1 Mellanox ConnectX7-2p200GE.
         mac_address: "b8:3f:d2:b7:a0:e8"
         pci_address: "0000:2a:00.0"
-        ip4_address: "172.16.30.1"
+        ip4_address: "172.16.10.1"
         driver: mlx5_core
         link: link3
         model: Mellanox-CX7VEAT
-#      port4:
+#      port2:
 #        # s53-t21-tg1-c4/p2 - 200GE port2 Mellanox ConnectX7-2p200GE.
 #        mac_address: "b8:3f:d2:b7:a0:e9"
 #        pci_address: "0000:2a:00.1"
-#        ip4_address: "172.16.40.1"
+#        ip4_address: "172.16.20.1"
 #        driver: mlx5_core
-#        link: link4
+#        link: none
 #        model: Mellanox-CX7VEAT
-      port5:
+      port3:
         # s53-t21-tg1-c2/p1 - 200GE port1 Mellanox ConnectX7-2p200GE.
         mac_address: "b8:3f:d2:b7:a0:58"
         pci_address: "0000:3d:00.0"
-        ip4_address: "172.16.50.1"
+        ip4_address: "172.16.30.1"
         driver: mlx5_core
         link: link5
         model: Mellanox-CX7VEAT
-      port6:
+      port4:
         # s53-t21-tg1-c2/p2 - 200GE port2 Mellanox ConnectX7-2p200GE.
         mac_address: "b8:3f:d2:b7:a0:59"
         pci_address: "0000:3d:00.1"
-        ip4_address: "172.16.60.1"
+        ip4_address: "172.16.40.1"
         driver: mlx5_core
         link: link6
         model: Mellanox-CX7VEAT
-      port7:
+      port5:
         # s53-t21-tg1-c9/p1 - 200GE port1 Mellanox ConnectX7-2p200GE.
         mac_address: "b8:3f:d2:b7:a0:48"
         pci_address: "0000:ab:00.0"
-        ip4_address: "172.16.70.1"
+        ip4_address: "172.16.50.1"
         driver: mlx5_core
         link: link7
         model: Mellanox-CX7VEAT
-#      port8:
+#      port6:
 #        # s53-t21-tg1-c9/p2 - 200GE port2 Mellanox ConnectX7-2p200GE.
 #        mac_address: "b8:3f:d2:b7:a0:49"
 #        pci_address: "0000:ab:00.1"
-#        ip4_address: "172.16.80.1"
+#        ip4_address: "172.16.60.1"
 #        driver: mlx5_core
-#        link: link8
+#        link: none
 #        model: Mellanox-CX7VEAT
-      port9:
+      port7:
         # s53-t21-tg1-c7/p1 - 200GE port1 Mellanox ConnectX7-2p200GE.
         mac_address: "b8:3f:d2:b7:a0:f8"
         pci_address: "0000:bd:00.0"
-        ip4_address: "172.16.90.1"
+        ip4_address: "172.16.70.1"
         driver: mlx5_core
         link: link9
         model: Mellanox-CX7VEAT
-      port10:
+      port8:
         # s53-t21-tg1-c7/p2 - 200GE port2 Mellanox ConnectX7-2p200GE.
         mac_address: "b8:3f:d2:b7:a0:f9"
         pci_address: "0000:bd:00.1"
-        ip4_address: "172.16.100.1"
+        ip4_address: "172.16.80.1"
         driver: mlx5_core
         link: link10
         model: Mellanox-CX7VEAT
@@ -104,55 +98,65 @@ nodes:
     username: testuser
     password: Csit1234
     uio_driver: vfio-pci
+    bus:
+      device1:
+        pci_address: "0000:75:01.0"
+        driver: idxd
+        model: Intel-DSA
+      device2:
+        pci_address: "0000:f2:01.0"
+        driver: idxd
+        model: Intel-DSA
+    cryptodev: "0000:76:00.0"
     interfaces:
       port1:
-        # s52-t21-sut1-c10/p1 - 200GE port1 Mellanox ConnectX7-2p200GE.
-        mac_address: "b8:3f:d2:b7:a0:50"
-        pci_address: "0000:17:00.0"
-        ip4_address: "172.16.10.2"
-        driver: mlx5_core
-        link: link610
-        model: Mellanox-CX7VEAT
-      port2:
-        # s52-t21-sut1-c10/p2 - 200GE port2 Mellanox ConnectX7-2p200GE.
-        mac_address: "b8:3f:d2:b7:a0:51"
-        pci_address: "0000:17:00.1"
-        ip4_address: "172.16.20.2"
-        driver: mlx5_core
-        link: link37
-        model: Mellanox-CX7VEAT
-      port3:
         # s52-t21-sut1-c4/p1 - 200GE port1 Mellanox ConnectX7-2p200GE.
         mac_address: "b8:3f:d2:b7:a1:08"
         pci_address: "0000:2a:00.0"
-        ip4_address: "172.16.30.2"
+        ip4_address: "172.16.10.2"
         driver: mlx5_core
         link: link3
         model: Mellanox-CX7VEAT
-      port4:
+      port2:
         # s52-t21-sut1-c4/p2 - 200GE port2 Mellanox ConnectX7-2p200GE.
         mac_address: "b8:3f:d2:b7:a1:09"
         pci_address: "0000:2a:00.1"
-        ip4_address: "172.16.40.2"
+        ip4_address: "172.16.20.2"
         driver: mlx5_core
         link: link59
         model: Mellanox-CX7VEAT
-      port5:
+      port3:
         # s52-t21-sut1-c2/p1 - 200GE port1 Mellanox ConnectX7-2p200GE.
         mac_address: "b8:3f:d2:b7:a1:88"
         pci_address: "0000:3d:00.0"
-        ip4_address: "172.16.50.2"
+        ip4_address: "172.16.30.2"
         driver: mlx5_core
         link: link5
         model: Mellanox-CX7VEAT
-      port6:
+      port4:
         # s52-t21-sut1-c2/p2 - 200GE port2 Mellanox ConnectX7-2p200GE.
         mac_address: "b8:3f:d2:b7:a1:89"
         pci_address: "0000:3d:00.1"
-        ip4_address: "172.16.60.2"
+        ip4_address: "172.16.40.2"
         driver: mlx5_core
         link: link6
         model: Mellanox-CX7VEAT
+      port5:
+        # s52-t21-sut1-c10/p1 - 200GE port1 Mellanox ConnectX7-2p200GE.
+        mac_address: "b8:3f:d2:b7:a0:50"
+        pci_address: "0000:17:00.0"
+        ip4_address: "172.16.50.2"
+        driver: mlx5_core
+        link: link610
+        model: Mellanox-CX7VEAT
+      port6:
+        # s52-t21-sut1-c10/p2 - 200GE port2 Mellanox ConnectX7-2p200GE.
+        mac_address: "b8:3f:d2:b7:a0:51"
+        pci_address: "0000:17:00.1"
+        ip4_address: "172.16.60.2"
+        driver: mlx5_core
+        link: link37
+        model: Mellanox-CX7VEAT
   DUT2:
     type: DUT
     host: "10.30.51.52"
@@ -161,10 +165,20 @@ nodes:
     username: testuser
     password: Csit1234
     uio_driver: vfio-pci
+    bus:
+      device1:
+        pci_address: "0000:75:01.0"
+        driver: idxd
+        model: Intel-DSA
+      device2:
+        pci_address: "0000:f2:01.0"
+        driver: idxd
+        model: Intel-DSA
+    cryptodev: "0000:f3:00.0"
     interfaces:
       port1:
         # s52-t21-sut2-c9/p1 - 200GE port1 Mellanox ConnectX7-2p200GE.
-        mac_address: "b8:3f:d2:b7:a0:f0"
+        mac_address: "b8:3f:d2:b7:a1:20"
         pci_address: "0000:ab:00.0"
         ip4_address: "172.16.10.3"
         driver: mlx5_core
@@ -172,7 +186,7 @@ nodes:
         model: Mellanox-CX7VEAT
       port2:
         # s52-t21-sut2-c9/p2 - 200GE port2 Mellanox ConnectX7-2p200GE.
-        mac_address: "b8:3f:d2:b7:a0:f1"
+        mac_address: "b8:3f:d2:b7:a1:21"
         pci_address: "0000:ab:00.1"
         ip4_address: "172.16.20.3"
         driver: mlx5_core
@@ -180,7 +194,7 @@ nodes:
         model: Mellanox-CX7VEAT
       port3:
         # s52-t21-sut2-c7/p1 - 200GE port1 Mellanox ConnectX7-2p200GE.
-        mac_address: "b8:3f:d2:b7:a1:20"
+        mac_address: "b8:3f:d2:b7:a0:f0"
         pci_address: "0000:bd:00.0"
         ip4_address: "172.16.30.3"
         driver: mlx5_core
@@ -188,7 +202,7 @@ nodes:
         model: Mellanox-CX7VEAT
       port4:
         # s52-t21-sut2-c7/p2 - 200GE port2 Mellanox ConnectX7-2p200GE.
-        mac_address: "b8:3f:d2:b7:a1:21"
+        mac_address: "b8:3f:d2:b7:a0:f1"
         pci_address: "0000:bd:00.1"
         ip4_address: "172.16.40.3"
         driver: mlx5_core