X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=topologies%2Favailable%2Flf_3na_spr_testbed21.yaml;h=76613924cf33a7023b0256906b2cd5bb284e30a3;hb=refs%2Fheads%2Fmaster;hp=377101360b197f2be0adfb0c101cda385ff75706;hpb=5d49c0776e49696c38abefbe11543c4c900feccc;p=csit.git

diff --git a/topologies/available/lf_3na_spr_testbed21.yaml b/topologies/available/lf_3na_spr_testbed21.yaml
index 377101360b..76613924cf 100644
--- a/topologies/available/lf_3na_spr_testbed21.yaml
+++ b/topologies/available/lf_3na_spr_testbed21.yaml
@@ -15,28 +15,50 @@ 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:
+      device1:
+        pci_address: "0000:76:00.0"
+        driver: "4xxx"
+        model: "HW_4xxx"
+        module: "qat_4xxx"
+        numvfs: 8
+      #device2:
+      #  pci_address: "0000:7a:00.0"
+      #  driver: "4xxx"
+      #  model: "HW_4xxx"
+      #  module: "qat_4xxx"
+      #  numvfs: 8
     interfaces:
       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
-#      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"
-#        driver: mlx5_core
-#        link: none
-#        model: Mellanox-CX7VEAT
+      #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.20.1"
+      #  driver: mlx5_core
+      #  link: none
+      #  model: Mellanox-CX7VEAT
       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
@@ -44,7 +66,7 @@ nodes:
         # 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
@@ -52,23 +74,23 @@ nodes:
         # 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
-#      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"
-#        driver: mlx5_core
-#        link: none
-#        model: Mellanox-CX7VEAT
+      #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.60.1"
+      #  driver: mlx5_core
+      #  link: none
+      #  model: Mellanox-CX7VEAT
       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
@@ -76,7 +98,7 @@ nodes:
         # 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
@@ -88,12 +110,34 @@ 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:
+      device1:
+        pci_address: "0000:76:00.0"
+        driver: "4xxx"
+        model: "HW_4xxx"
+        module: "qat_4xxx"
+        numvfs: 8
+      #device2:
+      #  pci_address: "0000:7a:00.0"
+      #  driver: "4xxx"
+      #  model: "HW_4xxx"
+      #  module: "qat_4xxx"
+      #  numvfs: 8
     interfaces:
       port1:
         # 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
@@ -101,39 +145,39 @@ nodes:
         # 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
       port3:
         # s52-t21-sut1-c2/p1 - 200GE port1 Mellanox ConnectX7-2p200GE.
-        mac_address: "b8:3f:d2:b7:a1:88"
+        mac_address: "b8:3f:d2:b7:a0:50"
         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
       port4:
         # s52-t21-sut1-c2/p2 - 200GE port2 Mellanox ConnectX7-2p200GE.
-        mac_address: "b8:3f:d2:b7:a1:89"
+        mac_address: "b8:3f:d2:b7:a0:51"
         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"
+        mac_address: "b8:3f:d2:b7:a1:88"
         pci_address: "0000:17:00.0"
-        ip4_address: "172.16.10.2"
+        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"
+        mac_address: "b8:3f:d2:b7:a1:89"
         pci_address: "0000:17:00.1"
-        ip4_address: "172.16.20.2"
+        ip4_address: "172.16.60.2"
         driver: mlx5_core
         link: link37
         model: Mellanox-CX7VEAT
@@ -145,6 +189,28 @@ 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:
+      device1:
+        pci_address: "0000:f3:00.0"
+        driver: "4xxx"
+        model: "HW_4xxx"
+        module: "qat_4xxx"
+        numvfs: 8
+      #device2:
+      #  pci_address: "0000:f7:00.0"
+      #  driver: "4xxx"
+      #  model: "HW_4xxx"
+      #  module: "qat_4xxx"
+      #  numvfs: 8
     interfaces:
       port1:
         # s52-t21-sut2-c9/p1 - 200GE port1 Mellanox ConnectX7-2p200GE.