feat(infra): Remove CLX,TX2,TSH

Signed-off-by: Peter Mikus <peter.mikus@protonmail.ch>
Change-Id: I6b62a20259674ddf5550cce480ccbba3dbd0f259

6 files changed, 4 insertions, 758 deletions

diff --git a/topologies/available/2n_hw_testbed1.yaml.example b/topologies/available/2n_hw_testbed1.yaml.example
index 4155f6eb0a..eb3acae3ec 100644
--- a/topologies/available/2n_hw_testbed1.yaml.example
+++ b/topologies/available/2n_hw_testbed1.yaml.example
@@ -34,12 +34,12 @@ nodes:
         mac_address: "08:00:27:35:59:04"
         pci_address: "0000:00:08.0"
         link: link1
-        model: Intel-X553
+        model: Intel-X710
       port5:
         mac_address: "08:00:27:46:2b:4c"
         pci_address: "0000:00:09.0"
         link: link2
-        model: Intel-X553
+        model: Intel-X710
   DUT1:
     type: DUT
     host: 10.0.0.1
@@ -53,9 +53,9 @@ nodes:
         mac_address: "08:00:27:ae:29:2b"
         pci_address: "0000:00:08.0"
         link: link1
-        model: Intel-X553
+        model: Intel-X710
       port3:
         mac_address: "08:00:27:f3:be:f0"
         pci_address: "0000:00:09.0"
         link: link2
-        model: Intel-X553
\ No newline at end of file
+        model: Intel-X710
\ No newline at end of file
diff --git a/topologies/available/lf_2n_clx_testbed27.yaml b/topologies/available/lf_2n_clx_testbed27.yaml
deleted file mode 100644
index 63e16d90e2..0000000000
--- a/topologies/available/lf_2n_clx_testbed27.yaml
+++ /dev/null
@@ -1,203 +0,0 @@
----
-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.32.8.19"
-    arch: x86_64
-    port: 22
-    username: testuser
-    password: Csit1234
-    interfaces:
-      port1:
-        # s34-t27-tg1-c2/p1 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:ca:e9:88"
-        pci_address: "0000:18:00.0"
-        ip4_address: "172.16.10.2"
-        driver: i40e
-        link: disabled1
-        model: Intel-X710
-      port2:
-        # s34-t27-tg1-c2/p2 - 10GE port2 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:ca:e9:89"
-        pci_address: "0000:18:00.1"
-        ip4_address: "172.16.20.2"
-        driver: i40e
-        link: disabled2
-        model: Intel-X710
-      port3:
-        # s34-t27-tg1-c2/p3 - 10GE port3 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:ca:e9:8a"
-        pci_address: "0000:18:00.2"
-        ip4_address: "172.16.30.2"
-        driver: i40e
-        link: link3
-        model: Intel-X710
-      port4:
-        # s34-t27-tg1-c2/p4 - 10GE port4 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:ca:e9:8b"
-        pci_address: "0000:18:00.3"
-        ip4_address: "172.16.40.2"
-        driver: i40e
-        link: link4
-        model: Intel-X710
-      port5:
-        # s34-t27-tg1-c4/p1 - 25GE port1 on Intel NIC xxv710 2p25GE.
-        mac_address: "3c:fd:fe:dd:d4:28"
-        pci_address: "0000:3b:00.0"
-        ip4_address: "172.16.50.2"
-        driver: i40e
-        link: link5
-        model: Intel-XXV710
-      port6:
-        # s34-t27-tg1-c4/p2 - 25GE port2 on Intel NIC xxv710 2p25GE.
-        mac_address: "3c:fd:fe:dd:d4:29"
-        pci_address: "0000:3b:00.1"
-        ip4_address: "172.16.60.2"
-        driver: i40e
-        link: link6
-        model: Intel-XXV710
-      port7:
-        # s34-t27-tg1-c9/p1 - 100GE-port1 ConnectX5-2p100GE.
-        mac_address: "ec:0d:9a:8c:c6:a6"
-        pci_address: "0000:5e:00.0"
-        ip4_address: "172.16.70.2"
-        driver: mlx5_core
-        link: link7
-        model: Mellanox-CX556A
-      port8:
-        # s34-t27-tg1-c9/p2 - 100GE-port2 ConnectX5-2p100GE.
-        mac_address: "ec:0d:9a:8c:c6:a7"
-        pci_address: "0000:5e:00.1"
-        ip4_address: "172.16.80.2"
-        driver: mlx5_core
-        link: link8
-        model: Mellanox-CX556A
-      port9:
-        # s34-t27-tg1-c6/p1 - 100GE-port1 ConnectX5-2p100GE.
-        mac_address: "10:70:fd:15:60:54"
-        pci_address: "0000:86:00.0"
-        ip4_address: "172.16.90.2"
-        driver: mlx5_core
-        link: link9
-        model: Mellanox-CX556A
-      port10:
-        # s34-t27-tg1-c6/p2 - 100GE-port2 ConnectX5-2p100GE.
-        mac_address: "10:70:fd:15:60:55"
-        pci_address: "0000:86:00.1"
-        ip4_address: "172.16.100.2"
-        driver: mlx5_core
-        link: link10
-        model: Mellanox-CX556A
-      port11:
-        # s34-t27-tg1-c8/p1 - 100GE-port1 ConnectX5-2p100GE.
-        mac_address: "0c:42:a1:0b:92:1a"
-        pci_address: "0000:af:00.0"
-        ip4_address: "172.16.110.2"
-        driver: mlx5_core
-        link: link11
-        model: Mellanox-CX556A
-      port12:
-        # s34-t27-tg1-c8/p2 - 100GE-port2 ConnectX5-2p100GE.
-        mac_address: "0c:42:a1:0b:92:1b"
-        pci_address: "0000:af:00.1"
-        ip4_address: "172.16.120.2"
-        driver: mlx5_core
-        link: link11
-        model: Mellanox-CX556A
-  DUT1:
-    type: DUT
-    host: "10.32.8.18"
-    arch: x86_64
-    port: 22
-    username: testuser
-    password: Csit1234
-    uio_driver: vfio-pci
-    interfaces:
-      port1:
-        # s33-t27-sut1-c2/p1 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:ca:e9:98"
-        pci_address: "0000:18:00.0"
-        ip4_address: "172.16.10.1"
-        driver: i40e
-        link: disabled3
-        model: Intel-X710
-      port2:
-        # s33-t27-sut1-c2/p2 - 10GE port2 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:ca:e9:99"
-        pci_address: "0000:18:00.1"
-        ip4_address: "172.16.20.1"
-        driver: i40e
-        link: disabled4
-        model: Intel-X710
-      port3:
-        # s33-t27-sut1-c2/p3 - 10GE port3 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:ca:e9:9a"
-        pci_address: "0000:18:00.2"
-        ip4_address: "172.16.30.1"
-        driver: i40e
-        link: link3
-        model: Intel-X710
-      port4:
-        # s33-t27-sut1-c2/p4 - 10GE port4 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:ca:e9:9b"
-        pci_address: "0000:18:00.3"
-        ip4_address: "172.16.40.1"
-        driver: i40e
-        link: link4
-        model: Intel-X710
-      port5:
-        # s33-t27-sut1-c2/p1 - 25GE port1 on Intel NIC xxv710 2p25GE.
-        mac_address: "3c:fd:fe:cf:69:e8"
-        pci_address: "0000:3b:00.0"
-        ip4_address: "172.16.50.1"
-        driver: i40e
-        link: link5
-        model: Intel-XXV710
-      port6:
-        # s33-t27-sut1-c2/p2 - 25GE port2 on Intel NIC xxv710 2p25GE.
-        mac_address: "3c:fd:fe:cf:69:e9"
-        pci_address: "0000:3b:00.1"
-        ip4_address: "172.16.60.1"
-        driver: i40e
-        link: link6
-        model: Intel-XXV710
-      port7:
-        # s33-t27-sut1-c9/p1 - 100GE-port1 ConnectX5-2p100GE.
-        mac_address: "ec:0d:9a:8c:c6:96"
-        pci_address: "0000:5e:00.0"
-        ip4_address: "172.16.70.1"
-        driver: mlx5_core
-        link: link7
-        model: Mellanox-CX556A
-      port8:
-        # s33-t27-sut1-c9/p2 - 100GE-port2 ConnectX5-2p100GE.
-        mac_address: "ec:0d:9a:8c:c6:97"
-        pci_address: "0000:5e:00.1"
-        ip4_address: "172.16.80.1"
-        driver: mlx5_core
-        link: link8
-        model: Mellanox-CX556A
-      port9:
-        # s33-t27-sut1-c6/p1 - 100GE-port1 Intel E810-CQDA2 2p100GE.
-        mac_address: "b4:96:91:a2:fb:d0"
-        pci_address: "0000:86:00.0"
-        ip4_address: "172.16.90.1"
-        driver: ice
-        link: link9
-        model: Intel-E810CQ
-      port10:
-        # s33-t27-sut1-c6/p2 - 100GE-port1 Intel E810-CQDA2 2p100GE.
-        mac_address: "b4:96:91:a2:fb:d1"
-        pci_address: "0000:86:00.1"
-        ip4_address: "172.16.100.1"
-        driver: ice
-        link: link10
-        model: Intel-E810CQ
\ No newline at end of file
diff --git a/topologies/available/lf_2n_clx_testbed28.yaml b/topologies/available/lf_2n_clx_testbed28.yaml
deleted file mode 100644
index 771cb20c52..0000000000
--- a/topologies/available/lf_2n_clx_testbed28.yaml
+++ /dev/null
@@ -1,203 +0,0 @@
----
-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.32.8.21"
-    arch: x86_64
-    port: 22
-    username: testuser
-    password: Csit1234
-    interfaces:
-      port1:
-        # s36-t28-tg1-c2/p1 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:ca:e8:28"
-        pci_address: "0000:18:00.0"
-        ip4_address: "172.16.10.2"
-        driver: i40e
-        link: disabled1
-        model: Intel-X710
-      port2:
-        # s36-t28-tg1-c2/p2 - 10GE port2 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:ca:e8:29"
-        pci_address: "0000:18:00.1"
-        ip4_address: "172.16.20.2"
-        driver: i40e
-        link: disabled2
-        model: Intel-X710
-      port3:
-        # s36-t28-tg1-c2/p3 - 10GE port3 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:ca:e8:2a"
-        pci_address: "0000:18:00.2"
-        ip4_address: "172.16.30.2"
-        driver: i40e
-        link: link3
-        model: Intel-X710
-      port4:
-        # s36-t28-tg1-c2/p4 - 10GE port4 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:ca:e8:2b"
-        pci_address: "0000:18:00.3"
-        ip4_address: "172.16.40.2"
-        driver: i40e
-        link: link4
-        model: Intel-X710
-      port5:
-        # s36-t28-tg1-c4/p1 - 25GE port1 on Intel NIC xxv710 2p25GE.
-        mac_address: "3c:fd:fe:cf:69:ec"
-        pci_address: "0000:3b:00.0"
-        ip4_address: "172.16.50.2"
-        driver: i40e
-        link: link5
-        model: Intel-XXV710
-      port6:
-        # s36-t28-tg1-c4/p2 - 25GE port2 on Intel NIC xxv710 2p25GE.
-        mac_address: "3c:fd:fe:cf:69:ed"
-        pci_address: "0000:3b:00.1"
-        ip4_address: "172.16.60.2"
-        driver: i40e
-        link: link6
-        model: Intel-XXV710
-      port7:
-        # s36-t28-tg1-c9/p1 - 100GE-port1 ConnectX5-2p100GE.
-        mac_address: "ec:0d:9a:8c:c7:f6"
-        pci_address: "0000:5e:00.0"
-        ip4_address: "172.16.70.2"
-        driver: mlx5_core
-        link: link7
-        model: Mellanox-CX556A
-      port8:
-        # s36-t28-tg1-c9/p2 - 100GE-port2 ConnectX5-2p100GE.
-        mac_address: "ec:0d:9a:8c:c7:f7"
-        pci_address: "0000:5e:00.1"
-        ip4_address: "172.16.80.2"
-        driver: mlx5_core
-        link: link8
-        model: Mellanox-CX556A
-      port9:
-        # s36-t28-tg1-c6/p1 - 100GE-port1 ConnectX5-2p100GE.
-        mac_address: "10:70:fd:15:5f:b4"
-        pci_address: "0000:86:00.0"
-        ip4_address: "172.16.90.2"
-        driver: mlx5_core
-        link: link9
-        model: Mellanox-CX556A
-      port10:
-        # s36-t28-tg1-c6/p2 - 100GE-port2 ConnectX5-2p100GE.
-        mac_address: "10:70:fd:15:5f:b5"
-        pci_address: "0000:86:00.1"
-        ip4_address: "172.16.100.2"
-        driver: mlx5_core
-        link: link10
-        model: Mellanox-CX556A
-      port11:
-        # s36-t28-tg1-c8/p1 - 100GE-port1 ConnectX5-2p100GE.
-        mac_address: "0c:42:a1:0b:99:8a"
-        pci_address: "0000:af:00.0"
-        ip4_address: "172.16.110.2"
-        driver: mlx5_core
-        link: link11
-        model: Mellanox-CX556A
-      port12:
-        # s36-t28-tg1-c8/p2 - 100GE-port2 ConnectX5-2p100GE.
-        mac_address: "0c:42:a1:0b:99:8b"
-        pci_address: "0000:af:00.1"
-        ip4_address: "172.16.120.2"
-        driver: mlx5_core
-        link: link11
-        model: Mellanox-CX556A
-  DUT1:
-    type: DUT
-    host: "10.32.8.20"
-    arch: x86_64
-    port: 22
-    username: testuser
-    password: Csit1234
-    uio_driver: vfio-pci
-    interfaces:
-      port1:
-        # s35-t28-sut1-c2/p1 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:ca:e3:b0"
-        pci_address: "0000:18:00.0"
-        ip4_address: "172.16.10.1"
-        driver: i40e
-        link: disabled3
-        model: Intel-X710
-      port2:
-        # s35-t28-sut1-c2/p2 - 10GE port2 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:ca:e3:b1"
-        pci_address: "0000:18:00.1"
-        ip4_address: "172.16.20.1"
-        driver: i40e
-        link: disabled4
-        model: Intel-X710
-      port3:
-        # s35-t28-sut1-c2/p3 - 10GE port3 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:ca:e3:b2"
-        pci_address: "0000:18:00.2"
-        ip4_address: "172.16.30.1"
-        driver: i40e
-        link: link4
-        model: Intel-X710
-      port4:
-        # s35-t28-sut1-c2/p4 - 10GE port4 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:ca:e3:b3"
-        pci_address: "0000:18:00.3"
-        ip4_address: "172.16.40.1"
-        driver: i40e
-        link: link3
-        model: Intel-X710
-      port5:
-        # s35-t28-sut1-c2/p1 - 25GE port1 on Intel NIC xxv710 2p25GE.
-        mac_address: "3c:fd:fe:dd:d1:90"
-        pci_address: "0000:3b:00.0"
-        ip4_address: "172.16.50.1"
-        driver: i40e
-        link: link5
-        model: Intel-XXV710
-      port6:
-        # s35-t28-sut1-c2/p2 - 25GE port2 on Intel NIC xxv710 2p25GE.
-        mac_address: "3c:fd:fe:dd:d1:91"
-        pci_address: "0000:3b:00.1"
-        ip4_address: "172.16.60.1"
-        driver: i40e
-        link: link6
-        model: Intel-XXV710
-      port7:
-        # s35-t28-sut1-c9/p1 - 100GE-port1 ConnectX5-2p100GE.
-        mac_address: "ec:0d:9a:8c:c7:b6"
-        pci_address: "0000:5e:00.0"
-        ip4_address: "172.16.70.1"
-        driver: mlx5_core
-        link: link7
-        model: Mellanox-CX556A
-      port8:
-        # s35-t28-sut1-c9/p2 - 100GE-port2 ConnectX5-2p100GE.
-        mac_address: "ec:0d:9a:8c:c7:b7"
-        pci_address: "0000:5e:00.1"
-        ip4_address: "172.16.80.1"
-        driver: mlx5_core
-        link: link8
-        model: Mellanox-CX556A
-      port9:
-        # s35-t28-sut1-c6/p1 - 100GE-port1 Intel E810-CQDA2 2p100GE.
-        mac_address: "b4:96:91:a4:26:08"
-        pci_address: "0000:86:00.0"
-        ip4_address: "172.16.90.1"
-        driver: ice
-        link: link9
-        model: Intel-E810CQ
-      port10:
-        # s35-t28-sut1-c6/p2 - 100GE-port1 Intel E810-CQDA2 2p100GE.
-        mac_address: "b4:96:91:a4:26:09"
-        pci_address: "0000:86:00.1"
-        ip4_address: "172.16.100.1"
-        driver: ice
-        link: link10
-        model: Intel-E810CQ
\ No newline at end of file
diff --git a/topologies/available/lf_2n_clx_testbed29.yaml b/topologies/available/lf_2n_clx_testbed29.yaml
deleted file mode 100644
index 24cba15af9..0000000000
--- a/topologies/available/lf_2n_clx_testbed29.yaml
+++ /dev/null
@@ -1,187 +0,0 @@
----
-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.32.8.23"
-    arch: x86_64
-    port: 22
-    username: testuser
-    password: Csit1234
-    interfaces:
-      port1:
-        # s38-t29-tg1-c2/p1 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:b1:90"
-        pci_address: "0000:18:00.0"
-        ip4_address: "172.16.10.2"
-        driver: i40e
-        link: disabled1
-        model: Intel-X710
-      port2:
-        # s38-t29-tg1-c2/p2 - 10GE port2 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:b1:91"
-        pci_address: "0000:18:00.1"
-        ip4_address: "172.16.20.2"
-        driver: i40e
-        link: disabled2
-        model: Intel-X710
-      port3:
-        # s38-t29-tg1-c2/p3 - 10GE port3 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:b1:92"
-        pci_address: "0000:18:00.2"
-        ip4_address: "172.16.30.2"
-        driver: i40e
-        link: link3
-        model: Intel-X710
-      port4:
-        # s38-t29-tg1-c2/p4 - 10GE port4 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:b1:93"
-        pci_address: "0000:18:00.3"
-        ip4_address: "172.16.40.2"
-        driver: i40e
-        link: link4
-        model: Intel-X710
-      port5:
-        # s38-t29-tg1-c4/p1 - 25GE port1 on Intel NIC xxv710 2p25GE.
-        mac_address: "3c:fd:fe:cf:6c:bc"
-        pci_address: "0000:3b:00.0"
-        ip4_address: "172.16.50.2"
-        driver: i40e
-        link: link5
-        model: Intel-XXV710
-      port6:
-        # s38-t29-tg1-c4/p2 - 25GE port2 on Intel NIC xxv710 2p25GE.
-        mac_address: "3c:fd:fe:cf:6c:bd"
-        pci_address: "0000:3b:00.1"
-        ip4_address: "172.16.60.2"
-        driver: i40e
-        link: link6
-        model: Intel-XXV710
-      port7:
-        # s38-t29-tg1-c9/p1 - 100GE-port1 ConnectX5-2p100GE.
-        mac_address: "b8:59:9f:fe:4a:a8"
-        pci_address: "0000:5e:00.0"
-        ip4_address: "172.16.70.2"
-        driver: mlx5_core
-        link: link7
-        model: Mellanox-CX556A
-      port8:
-        # s38-t29-tg1-c9/p2 - 100GE-port2 ConnectX5-2p100GE.
-        mac_address: "b8:59:9f:fe:4a:a9"
-        pci_address: "0000:5e:00.1"
-        ip4_address: "172.16.80.2"
-        driver: mlx5_core
-        link: link8
-        model: Mellanox-CX556A
-      port9:
-        # s38-t29-tg1-c6/p1 - 100GE-port1 ConnectX5-2p100GE.
-        mac_address: "10:70:fd:18:44:ec"
-        pci_address: "0000:86:00.0"
-        ip4_address: "172.16.90.2"
-        driver: mlx5_core
-        link: link9
-        model: Mellanox-CX556A
-      port10:
-        # s38-t29-tg1-c6/p2 - 100GE-port2 ConnectX5-2p100GE.
-        mac_address: "10:70:fd:18:44:ed"
-        pci_address: "0000:86:00.1"
-        ip4_address: "172.16.100.2"
-        driver: mlx5_core
-        link: link10
-        model: Mellanox-CX556A
-  DUT1:
-    type: DUT
-    host: "10.32.8.22"
-    arch: x86_64
-    port: 22
-    username: testuser
-    password: Csit1234
-    uio_driver: vfio-pci
-    interfaces:
-      port1:
-        # s37-t29-sut1-c2/p1 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:ca:eb:10"
-        pci_address: "0000:18:00.0"
-        ip4_address: "172.16.10.1"
-        driver: i40e
-        link: disabled3
-        model: Intel-X710
-      port2:
-        # s37-t29-sut1-c2/p2 - 10GE port2 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:ca:eb:11"
-        pci_address: "0000:18:00.1"
-        ip4_address: "172.16.20.1"
-        driver: i40e
-        link: disabled4
-        model: Intel-X710
-      port3:
-        # s37-t29-sut1-c2/p3 - 10GE port3 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:ca:eb:12"
-        pci_address: "0000:18:00.2"
-        ip4_address: "172.16.30.1"
-        driver: i40e
-        link: link3
-        model: Intel-X710
-      port4:
-        # s37-t29-sut1-c2/p4 - 10GE port4 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:ca:eb:13"
-        pci_address: "0000:18:00.3"
-        ip4_address: "172.16.40.1"
-        driver: i40e
-        link: link4
-        model: Intel-X710
-      port5:
-        # s37-t29-sut1-c2/p1 - 25GE port1 on Intel NIC xxv710 2p25GE.
-        mac_address: "3c:fd:fe:dd:d3:48"
-        pci_address: "0000:3b:00.0"
-        ip4_address: "172.16.50.1"
-        driver: i40e
-        link: link5
-        model: Intel-XXV710
-      port6:
-        # s37-t29-sut1-c2/p2 - 25GE port2 on Intel NIC xxv710 2p25GE.
-        mac_address: "3c:fd:fe:dd:d3:49"
-        pci_address: "0000:3b:00.1"
-        ip4_address: "172.16.60.1"
-        driver: i40e
-        link: link6
-        model: Intel-XXV710
-      port7:
-        # s37-t29-sut1-c9/p1 - 100GE-port1 ConnectX5-2p100GE.
-        mac_address: "b8:59:9f:fe:4a:c8"
-        pci_address: "0000:5e:00.0"
-        ip4_address: "172.16.70.1"
-        driver: mlx5_core
-        link: link7
-        model: Mellanox-CX556A
-      port8:
-        # s37-t29-sut1-c9/p2 - 100GE-port2 ConnectX5-2p100GE.
-        mac_address: "b8:59:9f:fe:4a:c9"
-        pci_address: "0000:5e:00.1"
-        ip4_address: "172.16.80.1"
-        driver: mlx5_core
-        link: link8
-        model: Mellanox-CX556A
-      port9:
-        # s37-t29-sut1-c6/p1 - 100GE-port1 Intel E810-CQDA2 2p100GE.
-        mac_address: "b4:96:91:a4:23:50"
-        pci_address: "0000:86:00.0"
-        ip4_address: "172.16.90.1"
-        driver: ice
-        link: link9
-        model: Intel-E810CQ
-      port10:
-        # s37-t29-sut1-c6/p2 - 100GE-port1 Intel E810-CQDA2 2p100GE.
-        mac_address: "b4:96:91:a4:23:51"
-        pci_address: "0000:86:00.1"
-        ip4_address: "172.16.100.1"
-        driver: ice
-        link: link10
-        model: Intel-E810CQ
\ No newline at end of file
diff --git a/topologies/available/lf_2n_tx2_testbed34.yaml b/topologies/available/lf_2n_tx2_testbed34.yaml
deleted file mode 100644
index cbaefc387a..0000000000
--- a/topologies/available/lf_2n_tx2_testbed34.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright (c) 2020-2023 PANTHEON.tech and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
----
-metadata:
-  version: 0.1
-  schema: # list of schema files against which to validate
-    - 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.49
-    arch: x86_64
-    port: 6002
-    username: root
-    password: Csit1234
-    interfaces:
-      port0:
-        mac_address: "3c:fd:fe:c3:e9:70"
-        pci_address: "0000:af:00.0"
-        link: link1
-        driver: i40e
-        model: Intel-XL710
-      port1:
-        mac_address: "3c:fd:fe:c3:e9:71"
-        pci_address: "0000:af:00.1"
-        link: link2
-        driver: i40e
-        model: Intel-XL710
-  DUT1:
-    type: DUT
-    host: 10.30.51.69
-    arch: aarch64
-    port: 22
-    uio_driver: vfio-pci
-    username: testuser
-    password: Csit1234
-    interfaces:
-      port0:
-        mac_address: "3c:fd:fe:c3:e0:90"
-        pci_address: "0000:91:00.0"
-        link: link1
-        driver: i40e
-        model: Intel-XL710
-      port1:
-        mac_address: "3c:fd:fe:c3:e0:91"
-        pci_address: "0000:91:00.1"
-        link: link2
-        driver: i40e
-        model: Intel-XL710
diff --git a/topologies/available/lf_3n_tsh_testbed33.yaml b/topologies/available/lf_3n_tsh_testbed33.yaml
deleted file mode 100644
index 8d6397379a..0000000000
--- a/topologies/available/lf_3n_tsh_testbed33.yaml
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright (c) 2020 PANTHEON.tech and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
----
-metadata:
-  version: 0.1
-  schema: # list of schema files against which to validate
-    - resources/topology_schemas/3_node_topology.sch.yaml
-    - resources/topology_schemas/topology.sch.yaml
-  tags: [hw, 3-node]
-
-nodes:
-  TG:
-    type: TG
-    subtype: TREX
-    host: 10.30.51.49
-    arch: x86_64
-    port: 6001
-    username: root
-    password: Csit1234
-    interfaces:
-      port0:
-        mac_address: "3c:fd:fe:a8:aa:c0"
-        pci_address: "0000:18:00.0"
-        link: link2
-        driver: i40e
-        model: Intel-X710
-      port1:
-        mac_address: "3c:fd:fe:a8:aa:c1"
-        pci_address: "0000:18:00.1"
-        link: link1
-        driver: i40e
-        model: Intel-X710
-      port2:
-        mac_address: "3c:fd:fe:a8:aa:c2"
-        pci_address: "0000:18:00.2"
-        link: link10
-        driver: i40e
-        model: Intel-X710
-      port3:
-        mac_address: "3c:fd:fe:a8:aa:c3"
-        pci_address: "0000:18:00.3"
-        link: link11
-        driver: i40e
-        model: Intel-X710
-  DUT1:
-    type: DUT
-    host: 10.30.51.36
-    arch: aarch64
-    port: 22
-    uio_driver: vfio-pci
-    username: testuser
-    password: Csit1234
-    interfaces:
-      port0:
-        mac_address: "80:41:26:6f:19:81"
-        pci_address: "0000:11:00.0"
-        link: link3
-        driver: ixgbe
-        model: Intel-X520-DA2
-      port1:
-        mac_address: "80:41:26:6f:19:82"
-        pci_address: "0000:11:00.1"
-        link: link1
-        driver: ixgbe
-        model: Intel-X520-DA2
-  DUT2:
-    type: DUT
-    host: 10.30.51.37
-    arch: aarch64
-    port: 22
-    username: testuser
-    uio_driver: vfio-pci
-    password: Csit1234
-    interfaces:
-      port0:
-        mac_address: "80:41:26:6f:19:7d"
-        pci_address: "0000:11:00.0"
-        link: link2
-        driver: ixgbe
-        model: Intel-X520-DA2
-      port1:
-        mac_address: "80:41:26:6f:19:7e"
-        pci_address: "0000:11:00.1"
-        link: link3
-        driver: ixgbe
-        model: Intel-X520-DA2