feat(core): Unify topology files

Signed-off-by: Peter Mikus <peter.mikus@icloud.com>
Change-Id: I2acd9ecbe0f62e1909ff0984670bfdd0fd90173f

1 files changed, 34 insertions, 33 deletions

diff --git a/topologies/available/lf_2n_spr_testbed23.yaml b/topologies/available/lf_2n_spr_testbed23.yaml
index 3ff6fccbea..c6e42253bb 100644
--- a/topologies/available/lf_2n_spr_testbed23.yaml
+++ b/topologies/available/lf_2n_spr_testbed23.yaml
@@ -4,13 +4,13 @@ metadata:
   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"
+    model: Intel-Sapphirerapids
+    host: 10.30.51.57
     arch: x86_64
     port: 6001
     username: testuser
@@ -27,22 +27,22 @@ nodes:
     cryptodev:
       device1:
         pci_address: "0000:76:00.0"
-        driver: "4xxx"
-        model: "HW_4xxx"
-        module: "qat_4xxx"
+        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"
+      #  driver: 4xxx
+      #  model: HW_4xxx
+      #  module: qat_4xxx
       #  numvfs: 8
     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"
+        ip4_address: 172.16.10.2
         driver: mlx5_core
         link: link1
         model: Mellanox-CX7VEAT
@@ -50,7 +50,7 @@ nodes:
         # s57-t23-tg1-c2/p2 - 200GE port2 Mellanox ConnectX7-2p200GE.
         mac_address: "b8:3f:d2:b7:a0:29"
         pci_address: "0000:3d:00.1"
-        ip4_address: "172.16.20.2"
+        ip4_address: 172.16.20.2
         driver: mlx5_core
         link: link2
         model: Mellanox-CX7VEAT
@@ -58,7 +58,7 @@ nodes:
         # 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"
+        ip4_address: 172.16.30.2
         driver: ice
         link: link3
         model: Intel-E810CQ
@@ -66,7 +66,7 @@ nodes:
         # 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"
+        ip4_address: 172.16.40.2
         driver: ice
         link: link4
         model: Intel-E810CQ
@@ -74,7 +74,7 @@ nodes:
         # 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"
+        ip4_address: 172.16.50.2
         driver: ice
         link: link5
         model: Intel-E810XXV
@@ -82,7 +82,7 @@ nodes:
         # 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"
+        ip4_address: 172.16.60.2
         driver: ice
         link: link6
         model: Intel-E810XXV
@@ -90,7 +90,7 @@ nodes:
         # 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"
+        ip4_address: 172.16.70.2
         driver: ice
         link: link7
         model: Intel-E810XXV
@@ -98,7 +98,7 @@ nodes:
         # 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"
+        ip4_address: 172.16.80.2
         driver: ice
         link: link8
         model: Intel-E810XXV
@@ -106,7 +106,7 @@ nodes:
         # 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"
+        ip4_address: 172.16.90.2
         driver: mlx5_core
         link: link9
         model: Mellanox-CX7VEAT
@@ -114,7 +114,7 @@ nodes:
         # 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"
+        ip4_address: 172.16.100.2
         driver: mlx5_core
         link: link9
         model: Mellanox-CX7VEAT
@@ -122,7 +122,7 @@ nodes:
         # 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"
+        ip4_address: "172.16.110.2
         driver: ice
         link: link10
         model: Intel-E810CQ
@@ -130,13 +130,14 @@ nodes:
         # 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"
+        ip4_address: 172.16.120.2
         driver: ice
         link: link10
         model: Intel-E810CQ
   DUT1:
     type: DUT
-    host: "10.30.51.56"
+    model: Intel-Sapphirerapids
+    host: 10.30.51.56
     arch: x86_64
     port: 22
     username: testuser
@@ -160,16 +161,16 @@ nodes:
         numvfs: 8
       #device2:
       #  pci_address: "0000:7a:00.0"
-      #  driver: "4xxx"
-      #  model: "HW_4xxx"
-      #  module: "qat_4xxx"
+      #  driver: 4xxx
+      #  model: HW_4xxx
+      #  module: qat_4xxx
       #  numvfs: 8
     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"
+        ip4_address: 172.16.10.1
         driver: mlx5_core
         link: link1
         model: Mellanox-CX7VEAT
@@ -177,7 +178,7 @@ nodes:
         # s56-t23-sut1-c2/p2 - 200GE port2 Mellanox ConnectX7-2p200GE.
         mac_address: "b8:3f:d2:b7:a0:31"
         pci_address: "0000:3d:00.1"
-        ip4_address: "172.16.20.1"
+        ip4_address: 172.16.20.1
         driver: mlx5_core
         link: link2
         model: Mellanox-CX7VEAT
@@ -185,7 +186,7 @@ nodes:
         # 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"
+        ip4_address: 172.16.30.1
         driver: ice
         link: link3
         model: Intel-E810CQ
@@ -193,7 +194,7 @@ nodes:
         # 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"
+        ip4_address: 172.16.40.1
         driver: ice
         link: link4
         model: Intel-E810CQ
@@ -201,7 +202,7 @@ nodes:
         # 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"
+        ip4_address: 172.16.50.1
         driver: ice
         link: link5
         model: Intel-E810XXV
@@ -209,7 +210,7 @@ nodes:
         # 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"
+        ip4_address: 172.16.60.1
         driver: ice
         link: link6
         model: Intel-E810XXV
@@ -217,7 +218,7 @@ nodes:
         # 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"
+        ip4_address: 172.16.70.1
         driver: ice
         link: link7
         model: Intel-E810XXV
@@ -225,7 +226,7 @@ nodes:
         # 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"
+        ip4_address: 172.16.80.1
         driver: ice
         link: link8
-        model: Intel-E810XXV
+        model: Intel-E810XXV
\ No newline at end of file