feat(infra): IPAM update ahead of SPR

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

5 files changed, 0 insertions, 889 deletions

diff --git a/topologies/disabled/lf_2n_skx_testbed21.yaml b/topologies/disabled/lf_2n_skx_testbed21.yaml
deleted file mode 100644
index 86a5f3fe24..0000000000
--- a/topologies/disabled/lf_2n_skx_testbed21.yaml
+++ /dev/null
@@ -1,155 +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.30.51.45"
-    arch: x86_64
-    port: 22
-    username: testuser
-    password: Csit1234
-    interfaces:
-      port1:
-        # s4-t21-tg1-c2/p1 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ab:70"
-        pci_address: "0000:18:00.0"
-        ip4_address: "172.16.10.2"
-        driver: i40e
-        link: link1
-        model: Intel-X710
-      port2:
-        # s4-t21-tg1-c2/p2 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ab:71"
-        pci_address: "0000:18:00.1"
-        ip4_address: "172.16.20.2"
-        driver: i40e
-        link: link2
-        model: Intel-X710
-      port3:
-        # s4-t21-tg1-c2/p3 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ab:72"
-        pci_address: "0000:18:00.2"
-        ip4_address: "172.16.30.2"
-        driver: i40e
-        link: link3
-        model: Intel-X710
-      port4:
-        # s4-t21-tg1-c2/p4 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ab:73"
-        pci_address: "0000:18:00.3"
-        ip4_address: "172.16.40.2"
-        driver: i40e
-        link: link4
-        model: Intel-X710
-      port5:
-        # s4-t21-tg1-c4/p1 - 25GE port1 on Intel NIC xxv710 2p25GE.
-        mac_address: "3c:fd:fe:bd:fa:38"
-        pci_address: "0000:3b:00.0"
-        ip4_address: "172.16.50.2"
-        driver: i40e
-        link: link5
-        model: Intel-XXV710
-      port6:
-        # s4-t21-tg1-c4/p2 - 25GE port2 on Intel NIC xxv710 2p25GE.
-        mac_address: "3c:fd:fe:bd:fa:39"
-        pci_address: "0000:3b:00.1"
-        ip4_address: "172.16.60.2"
-        driver: i40e
-        link: link6
-        model: Intel-XXV710
-      port7:
-        # s4-t21-tg1-c10/p1 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:b1:98"
-        pci_address: "0000:d8:00.0"
-        ip4_address: "172.16.70.2"
-        driver: i40e
-        link: link7
-        model: Intel-X710
-      port8:
-        # s4-t21-tg1-c10/p2 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:b1:99"
-        pci_address: "0000:d8:00.1"
-        ip4_address: "172.16.70.1"
-        driver: i40e
-        link: link7
-        model: Intel-X710
-      port9:
-        # s4-t21-tg1-c10/p3 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:b1:9a"
-        pci_address: "0000:d8:00.2"
-        ip4_address: "172.16.80.2"
-        driver: i40e
-        link: link8
-        model: Intel-X710
-      port10:
-        # s4-t21-tg1-c10/p4 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:b1:9b"
-        pci_address: "0000:d8:00.3"
-        ip4_address: "172.16.80.1"
-        driver: i40e
-        link: link8
-        model: Intel-X710
-  DUT1:
-    type: DUT
-    host: "10.30.51.44"
-    arch: x86_64
-    port: 22
-    username: testuser
-    password: Csit1234
-    uio_driver: vfio-pci
-    interfaces:
-      port1:
-        # s3-t21-sut1-c2/p1 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ad:88"
-        pci_address: "0000:18:00.0"
-        ip4_address: "172.16.10.1"
-        driver: i40e
-        link: link1
-        model: Intel-X710
-      port2:
-        # s3-t21-sut1-c2/p2 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ad:89"
-        pci_address: "0000:18:00.1"
-        ip4_address: "172.16.20.1"
-        driver: i40e
-        link: link2
-        model: Intel-X710
-      port3:
-        # s3-t21-sut1-c2/p3 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ad:8a"
-        pci_address: "0000:18:00.2"
-        ip4_address: "172.16.30.1"
-        driver: i40e
-        link: link3
-        model: Intel-X710
-      port4:
-        # s3-t21-sut1-c2/p4 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ad:8b"
-        pci_address: "0000:18:00.3"
-        ip4_address: "172.16.40.1"
-        driver: i40e
-        link: link4
-        model: Intel-X710
-      port5:
-        # s3-t21-sut1-c4/p1 - 25GE port1 on Intel NIC xxv710 2p25GE.
-        mac_address: "3c:fd:fe:bd:f9:60"
-        pci_address: "0000:3b:00.0"
-        ip4_address: "172.16.50.1"
-        driver: i40e
-        link: link5
-        model: Intel-XXV710
-      port6:
-        # s3-t21-sut1-c4/p2 - 25GE port2 on Intel NIC xxv710 2p25GE.
-        mac_address: "3c:fd:fe:bd:f9:61"
-        pci_address: "0000:3b:00.1"
-        ip4_address: "172.16.60.1"
-        driver: i40e
-        link: link6
-        model: Intel-XXV710
diff --git a/topologies/disabled/lf_2n_skx_testbed22.yaml b/topologies/disabled/lf_2n_skx_testbed22.yaml
deleted file mode 100644
index ee25175946..0000000000
--- a/topologies/disabled/lf_2n_skx_testbed22.yaml
+++ /dev/null
@@ -1,155 +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.30.51.53"
-    arch: x86_64
-    port: 22
-    username: testuser
-    password: Csit1234
-    interfaces:
-      port1:
-        # s6-t22-tg1-c2/p1 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ab:98"
-        pci_address: "0000:18:00.0"
-        ip4_address: "172.16.10.2"
-        driver: i40e
-        link: link1
-        model: Intel-X710
-      port2:
-        # s6-t22-tg1-c2/p2 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ab:99"
-        pci_address: "0000:18:00.1"
-        ip4_address: "172.16.20.2"
-        driver: i40e
-        link: link2
-        model: Intel-X710
-      port3:
-        # s6-t22-tg1-c2/p3 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ab:9a"
-        pci_address: "0000:18:00.2"
-        ip4_address: "172.16.30.2"
-        driver: i40e
-        link: link3
-        model: Intel-X710
-      port4:
-        # s6-t22-tg1-c2/p4 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ab:9b"
-        pci_address: "0000:18:00.3"
-        ip4_address: "172.16.40.2"
-        driver: i40e
-        link: link4
-        model: Intel-X710
-      port5:
-        # s6-t22-tg1-c4/p1 - 25GE port1 on Intel NIC xxv710 2p25GE.
-        mac_address: "3c:fd:fe:bd:f8:60"
-        pci_address: "0000:3b:00.0"
-        ip4_address: "172.16.50.2"
-        driver: i40e
-        link: link5
-        model: Intel-XXV710
-      port6:
-        # s6-t22-tg1-c4/p2 - 25GE port2 on Intel NIC xxv710 2p25GE.
-        mac_address: "3c:fd:fe:bd:f8:61"
-        pci_address: "0000:3b:00.1"
-        ip4_address: "172.16.60.2"
-        driver: i40e
-        link: link6
-        model: Intel-XXV710
-      port7:
-        # s6-t22-tg1-c10/p1 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ab:98"
-        pci_address: "0000:d8:00.0"
-        ip4_address: "172.16.70.2"
-        driver: i40e
-        link: link7
-        model: Intel-X710
-      port8:
-        # s6-t22-tg1-c10/p2 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ab:99"
-        pci_address: "0000:d8:00.1"
-        ip4_address: "172.16.70.1"
-        driver: i40e
-        link: link7
-        model: Intel-X710
-      port9:
-        # s6-t22-tg1-c10/p3 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ab:9a"
-        pci_address: "0000:d8:00.2"
-        ip4_address: "172.16.80.2"
-        driver: i40e
-        link: link8
-        model: Intel-X710
-      port10:
-        # s6-t22-tg1-c10/p4 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ab:9b"
-        pci_address: "0000:d8:00.3"
-        ip4_address: "172.16.80.1"
-        driver: i40e
-        link: link8
-        model: Intel-X710
-  DUT1:
-    type: DUT
-    host: "10.30.51.52"
-    arch: x86_64
-    port: 22
-    username: testuser
-    password: Csit1234
-    uio_driver: vfio-pci
-    interfaces:
-      port1:
-        # s5-t22-sut1-c2/p1 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:af:a8"
-        pci_address: "0000:18:00.0"
-        ip4_address: "172.16.10.1"
-        driver: i40e
-        link: link1
-        model: Intel-X710
-      port2:
-        # s5-t22-sut1-c2/p2 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:af:a9"
-        pci_address: "0000:18:00.1"
-        ip4_address: "172.16.20.1"
-        driver: i40e
-        link: link2
-        model: Intel-X710
-      port3:
-        # s5-t22-sut1-c2/p3 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:af:aa"
-        pci_address: "0000:18:00.2"
-        ip4_address: "172.16.30.1"
-        driver: i40e
-        link: link3
-        model: Intel-X710
-      port4:
-        # s5-t22-sut1-c2/p4 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:af:ab"
-        pci_address: "0000:18:00.3"
-        ip4_address: "172.16.40.1"
-        driver: i40e
-        link: link4
-        model: Intel-X710
-      port5:
-        # s5-t22-sut1-c4/p1 - 25GE port1 on Intel NIC xxv710 2p25GE.
-        mac_address: "3c:fd:fe:bd:f9:54"
-        pci_address: "0000:3b:00.0"
-        ip4_address: "172.16.50.1"
-        driver: i40e
-        link: link5
-        model: Intel-XXV710
-      port6:
-        # s5-t22-sut1-c4/p2 - 25GE port2 on Intel NIC xxv710 2p25GE.
-        mac_address: "3c:fd:fe:bd:f9:55"
-        pci_address: "0000:3b:00.1"
-        ip4_address: "172.16.60.1"
-        driver: i40e
-        link: link6
-        model: Intel-XXV710
diff --git a/topologies/disabled/lf_2n_skx_testbed23.yaml b/topologies/disabled/lf_2n_skx_testbed23.yaml
deleted file mode 100644
index cb08cddf7d..0000000000
--- a/topologies/disabled/lf_2n_skx_testbed23.yaml
+++ /dev/null
@@ -1,155 +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.30.51.55"
-    arch: x86_64
-    port: 22
-    username: testuser
-    password: Csit1234
-    interfaces:
-      port1:
-        # s8-t23-tg1-c2/p1 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:b1:38"
-        pci_address: "0000:18:00.0"
-        ip4_address: "172.16.10.2"
-        driver: i40e
-        link: link1
-        model: Intel-X710
-      port2:
-        # s8-t23-tg1-c2/p2 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:b1:39"
-        pci_address: "0000:18:00.1"
-        ip4_address: "172.16.20.2"
-        driver: i40e
-        link: link2
-        model: Intel-X710
-      port3:
-        # s8-t23-tg1-c2/p3 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:b1:3a"
-        pci_address: "0000:18:00.2"
-        ip4_address: "172.16.30.2"
-        driver: i40e
-        link: link3
-        model: Intel-X710
-      port4:
-        # s8-t23-tg1-c2/p4 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:b1:3b"
-        pci_address: "0000:18:00.3"
-        ip4_address: "172.16.40.2"
-        driver: i40e
-        link: link4
-        model: Intel-X710
-      port5:
-        # s8-t23-tg1-c4/p1 - 25GE port1 on Intel NIC xxv710 2p25GE.
-        mac_address: "3c:fd:fe:bd:f9:88"
-        pci_address: "0000:3b:00.0"
-        ip4_address: "172.16.50.2"
-        driver: i40e
-        link: link5
-        model: Intel-XXV710
-      port6:
-        # s8-t23-tg1-c4/p2 - 25GE port2 on Intel NIC xxv710 2p25GE.
-        mac_address: "3c:fd:fe:bd:f9:89"
-        pci_address: "0000:3b:00.1"
-        ip4_address: "172.16.60.2"
-        driver: i40e
-        link: link6
-        model: Intel-XXV710
-      port7:
-        # s8-t23-tg1-c10/p1 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ab:20"
-        pci_address: "0000:d8:00.0"
-        ip4_address: "172.16.70.2"
-        driver: i40e
-        link: link7
-        model: Intel-X710
-      port8:
-        # s8-t23-tg1-c10/p2 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ab:21"
-        pci_address: "0000:d8:00.1"
-        ip4_address: "172.16.70.1"
-        driver: i40e
-        link: link7
-        model: Intel-X710
-      port9:
-        # s8-t23-tg1-c10/p3 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ab:22"
-        pci_address: "0000:d8:00.2"
-        ip4_address: "172.16.80.2"
-        driver: i40e
-        link: link8
-        model: Intel-X710
-      port10:
-        # s8-t23-tg1-c10/p4 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ab:23"
-        pci_address: "0000:d8:00.3"
-        ip4_address: "172.16.80.1"
-        driver: i40e
-        link: link8
-        model: Intel-X710
-  DUT1:
-    type: DUT
-    host: "10.30.51.54"
-    arch: x86_64
-    port: 22
-    username: testuser
-    password: Csit1234
-    uio_driver: vfio-pci
-    interfaces:
-      port1:
-        # s7-t23-sut1-c2/p1 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ae:30"
-        pci_address: "0000:18:00.0"
-        ip4_address: "172.16.10.1"
-        driver: i40e
-        link: link1
-        model: Intel-X710
-      port2:
-        # s7-t23-sut1-c2/p2 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ae:31"
-        pci_address: "0000:18:00.1"
-        ip4_address: "172.16.20.1"
-        driver: i40e
-        link: link2
-        model: Intel-X710
-      port3:
-        # s7-t23-sut1-c2/p3 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ae:32"
-        pci_address: "0000:18:00.2"
-        ip4_address: "172.16.30.1"
-        driver: i40e
-        link: link3
-        model: Intel-X710
-      port4:
-        # s7-t23-sut1-c2/p4 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ae:33"
-        pci_address: "0000:18:00.3"
-        ip4_address: "172.16.40.1"
-        driver: i40e
-        link: link4
-        model: Intel-X710
-      port5:
-        # s7-t23-sut1-c4/p1 - 25GE port1 on Intel NIC xxv710 2p25GE.
-        mac_address: "3c:fd:fe:bd:f9:00"
-        pci_address: "0000:3b:00.0"
-        ip4_address: "172.16.50.1"
-        driver: i40e
-        link: link5
-        model: Intel-XXV710
-      port6:
-        # s7-t23-sut1-c4/p2 - 25GE port2 on Intel NIC xxv710 2p25GE.
-        mac_address: "3c:fd:fe:bd:f9:01"
-        pci_address: "0000:3b:00.1"
-        ip4_address: "172.16.60.1"
-        driver: i40e
-        link: link6
-        model: Intel-XXV710
diff --git a/topologies/disabled/lf_3n_skx_testbed31.yaml b/topologies/disabled/lf_3n_skx_testbed31.yaml
deleted file mode 100644
index 6cb33b6ce0..0000000000
--- a/topologies/disabled/lf_3n_skx_testbed31.yaml
+++ /dev/null
@@ -1,212 +0,0 @@
----
-metadata:
-  version: 0.1
-  schema:
-    - 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.48"
-    arch: x86_64
-    port: 22
-    username: testuser
-    password: Csit1234
-    interfaces:
-      port1:
-        # s13-t31-tg1-c2/p1 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:af:58"
-        pci_address: "0000:18:00.0"
-        ip4_address: "172.16.10.2"
-        driver: i40e
-        link: link1
-        model: Intel-X710
-      port2:
-        # s13-t31-tg1-c2/p2 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:af:59"
-        pci_address: "0000:18:00.1"
-        ip4_address: "172.16.20.2"
-        driver: i40e
-        link: link2
-        model: Intel-X710
-      port3:
-        # s13-t31-tg1-c2/p3 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:af:5a"
-        pci_address: "0000:18:00.2"
-        ip4_address: "172.16.30.2"
-        driver: i40e
-        link: link3
-        model: Intel-X710
-      port4:
-        # s13-t31-tg1-c2/p4 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:af:5b"
-        pci_address: "0000:18:00.3"
-        ip4_address: "172.16.40.2"
-        driver: i40e
-        link: link4
-        model: Intel-X710
-      port5:
-        # s13-t31-tg1-c4/p1 - 25GE port1 on Intel NIC xxv710 2p25GE.
-        mac_address: "3c:fd:fe:bd:f9:40"
-        pci_address: "0000:3b:00.0"
-        ip4_address: "172.16.50.2"
-        driver: i40e
-        link: link5
-        model: Intel-XXV710
-      port6:
-        # s13-t31-tg1-c4/p2 - 25GE port2 on Intel NIC xxv710 2p25GE.
-        mac_address: "3c:fd:fe:bd:f9:41"
-        pci_address: "0000:3b:00.1"
-        ip4_address: "172.16.60.2"
-        driver: i40e
-        link: link6
-        model: Intel-XXV710
-      port7:
-        # s13-t31-tg1-c10/p1 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ad:30"
-        pci_address: "0000:d8:00.0"
-        ip4_address: "172.16.70.2"
-        driver: i40e
-        link: link7
-        model: Intel-X710
-      port8:
-        # s13-t31-tg1-c10/p2 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ad:31"
-        pci_address: "0000:d8:00.1"
-        ip4_address: "172.16.70.1"
-        driver: i40e
-        link: link7
-        model: Intel-X710
-      port9:
-        # s13-t31-tg1-c10/p3 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ad:32"
-        pci_address: "0000:d8:00.2"
-        ip4_address: "172.16.80.2"
-        driver: i40e
-        link: link8
-        model: Intel-X710
-      port10:
-        # s13-t31-tg1-c10/p4 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ad:33"
-        pci_address: "0000:d8:00.3"
-        ip4_address: "172.16.80.1"
-        driver: i40e
-        link: link8
-        model: Intel-X710
-  DUT1:
-    type: DUT
-    host: "10.30.51.46"
-    arch: x86_64
-    port: 22
-    username: testuser
-    password: Csit1234
-    uio_driver: vfio-pci
-    interfaces:
-      port1:
-        # s11-t31-sut1-c2/p1 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:af:38"
-        pci_address: "0000:18:00.0"
-        ip4_address: "172.16.10.1"
-        driver: i40e
-        link: link1
-        model: Intel-X710
-      port2:
-        # s11-t31-sut1-c2/p2 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:af:39"
-        pci_address: "0000:18:00.1"
-        ip4_address: "172.16.120.1"
-        driver: i40e
-        link: link21
-        model: Intel-X710
-      port3:
-        # s11-t31-sut1-c2/p3 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:af:3a"
-        pci_address: "0000:18:00.2"
-        ip4_address: "172.16.30.1"
-        driver: i40e
-        link: link3
-        model: Intel-X710
-      port4:
-        # s11-t31-sut1-c2/p4 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:af:3b"
-        pci_address: "0000:18:00.3"
-        ip4_address: "172.16.140.1"
-        driver: i40e
-        link: link22
-        model: Intel-X710
-      port5:
-        # s11-t31-sut1-c4/p1 - 25GE port1 on Intel NIC xxv710 2p25GE.
-        mac_address: "3c:fd:fe:bd:f9:34"
-        pci_address: "0000:3b:00.0"
-        ip4_address: "172.16.50.1"
-        driver: i40e
-        link: link5
-        model: Intel-XXV710
-      port6:
-        # s11-t31-sut1-c4/p2 - 25GE port2 on Intel NIC xxv710 2p25GE.
-        mac_address: "3c:fd:fe:bd:f9:35"
-        pci_address: "0000:3b:00.1"
-        ip4_address: "172.16.160.1"
-        driver: i40e
-        link: link23
-        model: Intel-XXV710
-  DUT2:
-    type: DUT
-    host: "10.30.51.47"
-    arch: x86_64
-    port: 22
-    username: testuser
-    password: Csit1234
-    uio_driver: vfio-pci
-    interfaces:
-      port1:
-        # s12-t31-sut1-c2/p1 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:aa:a8"
-        pci_address: "0000:18:00.0"
-        ip4_address: "172.16.20.1"
-        driver: i40e
-        link: link2
-        model: Intel-X710
-      port2:
-        # s12-t31-sut1-c2/p2 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:aa:a9"
-        pci_address: "0000:18:00.1"
-        ip4_address: "172.16.120.2"
-        driver: i40e
-        link: link21
-        model: Intel-X710
-      port3:
-        # s12-t31-sut1-c2/p3 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:aa:aa"
-        pci_address: "0000:18:00.2"
-        ip4_address: "172.16.40.1"
-        driver: i40e
-        link: link4
-        model: Intel-X710
-      port4:
-        # s12-t31-sut1-c2/p4 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:aa:ab"
-        pci_address: "0000:18:00.3"
-        ip4_address: "172.16.140.2"
-        driver: i40e
-        link: link22
-        model: Intel-X710
-      port5:
-        # s12-t31-sut1-c4/p1 - 25GE port1 on Intel NIC xxv710 2p25GE.
-        mac_address: "3c:fd:fe:bd:f9:3c"
-        pci_address: "0000:3b:00.0"
-        ip4_address: "172.16.60.1"
-        driver: i40e
-        link: link6
-        model: Intel-XXV710
-      port6:
-        # s12-t31-sut1-c4/p2 - 25GE port2 on Intel NIC xxv710 2p25GE.
-        mac_address: "3c:fd:fe:bd:f9:3d"
-        pci_address: "0000:3b:00.1"
-        ip4_address: "172.16.160.2"
-        driver: i40e
-        link: link23
-        model: Intel-XXV710
diff --git a/topologies/disabled/lf_3n_skx_testbed32.yaml b/topologies/disabled/lf_3n_skx_testbed32.yaml
deleted file mode 100644
index 206b469b90..0000000000
--- a/topologies/disabled/lf_3n_skx_testbed32.yaml
+++ /dev/null
@@ -1,212 +0,0 @@
----
-metadata:
-  version: 0.1
-  schema:
-    - 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.60"
-    arch: x86_64
-    port: 22
-    username: testuser
-    password: Csit1234
-    interfaces:
-      port1:
-        # s13-t31-tg1-c2/p1 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:af:08"
-        pci_address: "0000:18:00.0"
-        ip4_address: "172.16.10.2"
-        driver: i40e
-        link: link1
-        model: Intel-X710
-      port2:
-        # s13-t31-tg1-c2/p2 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:af:09"
-        pci_address: "0000:18:00.1"
-        ip4_address: "172.16.20.2"
-        driver: i40e
-        link: link2
-        model: Intel-X710
-      port3:
-        # s13-t31-tg1-c2/p3 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:af:0a"
-        pci_address: "0000:18:00.2"
-        ip4_address: "172.16.30.2"
-        driver: i40e
-        link: link3
-        model: Intel-X710
-      port4:
-        # s13-t31-tg1-c2/p4 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:af:0b"
-        pci_address: "0000:18:00.3"
-        ip4_address: "172.16.40.2"
-        driver: i40e
-        link: link4
-        model: Intel-X710
-      port5:
-        # s13-t31-tg1-c4/p1 - 25GE port1 on Intel NIC xxv710 2p25GE.
-        mac_address: "3c:fd:fe:bd:fa:1c"
-        pci_address: "0000:3b:00.0"
-        ip4_address: "172.16.50.2"
-        driver: i40e
-        link: link5
-        model: Intel-XXV710
-      port6:
-        # s13-t31-tg1-c4/p2 - 25GE port2 on Intel NIC xxv710 2p25GE.
-        mac_address: "3c:fd:fe:bd:fa:1d"
-        pci_address: "0000:3b:00.1"
-        ip4_address: "172.16.60.2"
-        driver: i40e
-        link: link6
-        model: Intel-XXV710
-      port7:
-        # s13-t31-tg1-c10/p1 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ab:e0"
-        pci_address: "0000:d8:00.0"
-        ip4_address: "172.16.70.2"
-        driver: i40e
-        link: link7
-        model: Intel-X710
-      port8:
-        # s13-t31-tg1-c10/p2 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ab:e1"
-        pci_address: "0000:d8:00.1"
-        ip4_address: "172.16.70.1"
-        driver: i40e
-        link: link7
-        model: Intel-X710
-      port9:
-        # s13-t31-tg1-c10/p3 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ab:e2"
-        pci_address: "0000:d8:00.2"
-        ip4_address: "172.16.80.2"
-        driver: i40e
-        link: link8
-        model: Intel-X710
-      port10:
-        # s13-t31-tg1-c10/p4 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ab:e3"
-        pci_address: "0000:d8:00.3"
-        ip4_address: "172.16.80.1"
-        driver: i40e
-        link: link8
-        model: Intel-X710
-  DUT1:
-    type: DUT
-    host: "10.30.51.58"
-    arch: x86_64
-    port: 22
-    username: testuser
-    password: Csit1234
-    uio_driver: vfio-pci
-    interfaces:
-      port1:
-        # s14-t32-sut1-c2/p1 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ae:60"
-        pci_address: "0000:18:00.0"
-        ip4_address: "172.16.10.1"
-        driver: i40e
-        link: link1
-        model: Intel-X710
-      port2:
-        # s14-t32-sut1-c2/p2 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ae:61"
-        pci_address: "0000:18:00.1"
-        ip4_address: "172.16.120.1"
-        driver: i40e
-        link: link21
-        model: Intel-X710
-      port3:
-        # s14-t32-sut1-c2/p3 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ae:62"
-        pci_address: "0000:18:00.2"
-        ip4_address: "172.16.30.1"
-        driver: i40e
-        link: link3
-        model: Intel-X710
-      port4:
-        # s14-t32-sut1-c2/p4 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ae:63"
-        pci_address: "0000:18:00.3"
-        ip4_address: "172.16.140.1"
-        driver: i40e
-        link: link22
-        model: Intel-X710
-      port5:
-        # s14-t32-sut1-c4/p1 - 25GE port1 on Intel NIC xxv710 2p25GE.
-        mac_address: "3c:fd:fe:bd:f9:38"
-        pci_address: "0000:3b:00.0"
-        ip4_address: "172.16.50.1"
-        driver: i40e
-        link: link5
-        model: Intel-XXV710
-      port6:
-        # s14-t32-sut1-c4/p2 - 25GE port2 on Intel NIC xxv710 2p25GE.
-        mac_address: "3c:fd:fe:bd:f9:39"
-        pci_address: "0000:3b:00.1"
-        ip4_address: "172.16.160.1"
-        driver: i40e
-        link: link23
-        model: Intel-XXV710
-  DUT2:
-    type: DUT
-    host: "10.30.51.59"
-    arch: x86_64
-    port: 22
-    username: testuser
-    password: Csit1234
-    uio_driver: vfio-pci
-    interfaces:
-      port1:
-        # s15-t32-sut1-c2/p1 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ae:c0"
-        pci_address: "0000:18:00.0"
-        ip4_address: "172.16.20.1"
-        driver: i40e
-        link: link2
-        model: Intel-X710
-      port2:
-        # s15-t32-sut1-c2/p2 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ae:c1"
-        pci_address: "0000:18:00.1"
-        ip4_address: "172.16.120.2"
-        driver: i40e
-        link: link21
-        model: Intel-X710
-      port3:
-        # s15-t32-sut1-c2/p3 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ae:c2"
-        pci_address: "0000:18:00.2"
-        ip4_address: "172.16.40.1"
-        driver: i40e
-        link: link4
-        model: Intel-X710
-      port4:
-        # s15-t32-sut1-c2/p4 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ae:c3"
-        pci_address: "0000:18:00.3"
-        ip4_address: "172.16.140.2"
-        driver: i40e
-        link: link22
-        model: Intel-X710
-      port5:
-        # s15-t32-sut1-c4/p1 - 25GE port1 on Intel NIC xxv710 2p25GE.
-        mac_address: "3c:fd:fe:bd:f8:fc"
-        pci_address: "0000:3b:00.0"
-        ip4_address: "172.16.60.1"
-        driver: i40e
-        link: link6
-        model: Intel-XXV710
-      port6:
-        # s15-t32-sut1-c4/p2 - 25GE port2 on Intel NIC xxv710 2p25GE.
-        mac_address: "3c:fd:fe:bd:f8:fd"
-        pci_address: "0000:3b:00.1"
-        ip4_address: "172.16.160.2"
-        driver: i40e
-        link: link23
-        model: Intel-XXV710