TRex ASTF onboarding Part I

- Preparing initialization of TRex in L7 mode
- Updating Topology files
- Adding sample ASTF profiles

Change-Id: If71f7f8f3db66425a1b543f1d29069a7543f4090
Signed-off-by: Peter Mikus <pmikus@cisco.com>

7 files changed, 96 insertions, 258 deletions

diff --git a/topologies/available/lf_testbed1-X710-X520.yaml b/topologies/available/lf_testbed1-X710-X520.yaml
deleted file mode 100644
index 31c74e8ad9..0000000000
--- a/topologies/available/lf_testbed1-X710-X520.yaml
+++ /dev/null
@@ -1,63 +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.16"
-    port: 22
-    username: testuser
-    password: Cisco1234
-    interfaces:
-      port3:
-        mac_address: "3c:fd:fe:9c:ed:a0"
-        pci_address: "0000:05:00.0"
-        link: link1
-        driver: i40e
-        model: Intel-X710
-      port5:
-        mac_address: "3c:fd:fe:9c:ed:a1"
-        pci_address: "0000:05:00.1"
-        link: link2
-        driver: i40e
-        model: Intel-X710
-  DUT1:
-    type: DUT
-    host: "10.30.51.17"
-    port: 22
-    username: testuser
-    password: Cisco1234
-    interfaces:
-      port1:
-        mac_address: "90:e2:ba:b5:0a:2d"
-        pci_address: "0000:0a:00.1"
-        link: link1
-        model: Intel-X520-DA2
-      port3:
-        mac_address: "90:e2:ba:b5:0a:2c"
-        pci_address: "0000:0a:00.0"
-        link: link3
-        model: Intel-X520-DA2
-  DUT2:
-    type: DUT
-    host: "10.30.51.18"
-    port: 22
-    username: testuser
-    password: Cisco1234
-    interfaces:
-      port1:
-        mac_address: "90:e2:ba:b5:12:30"
-        pci_address: "0000:0a:00.0"
-        link: link2
-        model: Intel-X520-DA2
-      port3:
-        mac_address: "90:e2:ba:b5:12:31"
-        pci_address: "0000:0a:00.1"
-        link: link3
-        model: Intel-X520-DA2
diff --git a/topologies/available/lf_testbed1.yaml b/topologies/available/lf_testbed1.yaml
index 673940c063..571a76481b 100644
--- a/topologies/available/lf_testbed1.yaml
+++ b/topologies/available/lf_testbed1.yaml
@@ -19,6 +19,7 @@ nodes:
         # t1-tg1-c1/p1 - 40GE port1 on Intel NIC xl710 2p40GE.
         mac_address: "68:05:ca:37:1f:48"
         pci_address: "0000:02:00.0"
+        ip4_address: "172.16.10.2"
         driver: i40e
         link: link1
         model: Intel-XL710
@@ -26,6 +27,7 @@ nodes:
         # t1-tg1-c1/p2 - 40GE port2 on Intel NIC xl710 2p40GE.
         mac_address: "68:05:ca:37:1f:4d"
         pci_address: "0000:02:00.1"
+        ip4_address: "172.16.20.2"
         driver: i40e
         link: link2
         model: Intel-XL710
@@ -33,6 +35,7 @@ nodes:
         # t1-tg1-c3/p1 - 10GE port1 on Intel NIC x710 2p10GE.
         mac_address: "3c:fd:fe:9c:ee:a0"
         pci_address: "0000:05:00.0"
+        ip4_address: "172.16.30.2"
         driver: i40e
         link: link3
         model: Intel-X710
@@ -40,6 +43,7 @@ nodes:
         # t1-tg1-c3/p2 - 10GE port2 on Intel NIC x710 2p10GE.
         mac_address: "3c:fd:fe:9c:ee:a1"
         pci_address: "0000:05:00.1"
+        ip4_address: "172.16.40.2"
         driver: i40e
         link: link4
         model: Intel-X710
@@ -47,6 +51,7 @@ nodes:
         # t1-tg1-c2/p1 - 10GE port1 on Intel NIC x710 2p10GE.
         mac_address: "3c:fd:fe:9c:ed:50"
         pci_address: "0000:07:00.0"
+        ip4_address: "172.16.50.2"
         driver: i40e
         link: link5
         model: Intel-X710
@@ -54,6 +59,7 @@ nodes:
         # t1-tg1-c2/p2 - 10GE port2 on Intel NIC x710 2p10GE.
         mac_address: "3c:fd:fe:9c:ed:51"
         pci_address: "0000:07:00.1"
+        ip4_address: "172.16.60.2"
         driver: i40e
         link: link6
         model: Intel-X710
@@ -61,6 +67,7 @@ nodes:
         # t1-tg1-c4/p1 - 40GE port1 on Intel NIC xl710 2p40GE.
         mac_address: "68:05:ca:3a:af:40"
         pci_address: "0000:86:00.0"
+        ip4_address: "172.16.70.2"
         driver: i40e
         link: link7
         model: Intel-XL710
@@ -68,6 +75,7 @@ nodes:
         # t1-tg1-c4/p2 - 40GE port2 on Intel NIC xl710 2p40GE.
         mac_address: "68:05:ca:3a:af:41"
         pci_address: "0000:86:00.1"
+        ip4_address: "172.16.80.2"
         driver: i40e
         link: link8
         model: Intel-XL710
@@ -75,6 +83,7 @@ nodes:
         # t1-tg1-c5/p1 - 10GE port1 on Intel NIC x710 2p10GE.
         mac_address: "3c:fd:fe:9c:ee:2c"
         pci_address: "0000:88:00.0"
+        ip4_address: "172.16.90.2"
         driver: i40e
         link: link9
         model: Intel-X710
@@ -82,6 +91,7 @@ nodes:
         # t1-tg1-c5/p2 - 10GE port2 on Intel NIC x710 2p10GE.
         mac_address: "3c:fd:fe:9c:ee:2d"
         pci_address: "0000:88:00.1"
+        ip4_address: "172.16.100.2"
         driver: i40e
         link: link10
         model: Intel-X710
@@ -89,6 +99,7 @@ nodes:
         # t1-tg1-c6/p1 - 10GE port1 on Intel NIC x710 2p10GE.
         mac_address: "3c:fd:fe:9c:ed:a4"
         pci_address: "0000:84:00.0"
+        ip4_address: "172.16.110.1"
         driver: i40e
         link: link11
         model: Intel-X710
@@ -96,6 +107,7 @@ nodes:
         # t1-tg1-c6/p2 - 10GE port2 on Intel NIC x710 2p10GE.
         mac_address: "3c:fd:fe:9c:ed:a5"
         pci_address: "0000:84:00.1"
+        ip4_address: "172.16.110.2"
         driver: i40e
         link: link11
         model: Intel-X710
@@ -117,60 +129,70 @@ nodes:
         # t1-sut1-c1/p1 - 10GE port1 on Intel NIC x520 2p10GE.
         mac_address: "90:e2:ba:b5:0a:18"
         pci_address: "0000:0a:00.0"
+        ip4_address: "172.17.21.1"
         link: link21
         model: Intel-X520-DA2
       port2:
         # t1-sut1-c1/p2 - 10GE port2 on Intel NIC x520 2p10GE.
         mac_address: "90:e2:ba:b5:0a:19"
         pci_address: "0000:0a:00.1"
+        ip4_address: "172.16.30.1"
         link: link3
         model: Intel-X520-DA2
       port3:
         # t1-sut1-c2/p1 - 40GE port1 on Cisco VIC 1385 2p40GE.
         mac_address: "04:62:73:8c:c3:0f"
         pci_address: "0000:13:00.0"
+        ip4_address: "172.17.22.1"
         link: link22
         model: Cisco-VIC-1385
       port4:
         # t1-sut1-c2/p2 - 40GE port2 on Cisco VIC 1385 2p40GE.
         mac_address: "04:62:73:8c:c3:10"
         pci_address: "0000:14:00.0"
+        ip4_address: "172.16.10.1"
         link: link1
         model: Cisco-VIC-1385
       port5:
         # t1-sut1-c4/p1 - 40GE port1 on Intel NIC xl710 2p40GE.
         mac_address: "68:05:ca:37:20:48"
         pci_address: "0000:88:00.0"
+        ip4_address: "172.17.23.1"
         link: link23
         model: Intel-XL710
       port6:
         # t1-sut1-c4/p2 - 40GE port2 on Intel NIC xl710 2p40GE.
         mac_address: "68:05:ca:37:20:49"
         pci_address: "0000:88:00.1"
+        ip4_address: "172.16.70.1"
         link: link7
         model: Intel-XL710
       port7:
         # t1-sut1-c5/p1 - 10GE port1 on Intel NIC x710 2p10GE.
         mac_address: "3c:fd:fe:9c:ee:c4"
         pci_address: "0000:8a:00.0"
+        ip4_address: "172.17.24.1"
         link: link24
         model: Intel-X710
       port8:
         # t1-sut1-c5/p2 - 10GE port2 on Intel NIC x710 2p10GE.
         mac_address: "3c:fd:fe:9c:ee:c5"
         pci_address: "0000:8a:00.1"
+        ip4_address: "172.16.90.1"
         link: link9
         model: Intel-X710
       port9:
         # t1-sut1-cm/p1 - 10GE port1 on Cisco VIC 1227 2p10GE.
         mac_address: "00:fe:c8:e4:d0:1b"
         pci_address: "0000:06:00.0"
+        ip4_address: "172.17.25.1"
         link: link25
         model: Cisco-VIC-1227
       port10:
         # t1-sut1-cm/p2 - 10GE port2 on Cisco VIC 1227 2p10GE.
         mac_address: "00:fe:c8:e4:d0:1c"
         pci_address: "0000:07:00.0"
+        ip4_address: "172.16.50.1"
         link: link5
         model: Cisco-VIC-1227
   DUT2:
@@ -191,60 +213,70 @@ nodes:
         # t1-sut2-c1/p1 - 10GE port1 on Intel NIC x520 2p10GE.
         mac_address: "90:e2:ba:b5:05:e4"
         pci_address: "0000:0a:00.0"
+        ip4_address: "172.16.40.1"
         link: link4
         model: Intel-X520-DA2
       port2:
         # t1-sut2-c1/p2 - 10GE port2 on Intel NIC x520 2p10GE.
         mac_address: "90:e2:ba:b5:05:e5"
         pci_address: "0000:0a:00.1"
+        ip4_address: "172.17.21.2"
         link: link21
         model: Intel-X520-DA2
       port3:
         # t1-sut2-c2/p1 - 40GE port1 on Cisco VIC 1385 2p40GE.
         mac_address: "d8:b1:90:19:41:69"
         pci_address: "0000:13:00.0"
+        ip4_address: "172.16.20.1"
         link: link2
         model: Cisco-VIC-1385
       port4:
         # t1-sut2-c2/p2 - 40GE port2 on Cisco VIC 1385 2p40GE.
         mac_address: "d8:b1:90:19:41:6a"
         pci_address: "0000:15:00.0"
+        ip4_address: "172.17.22.2"
         link: link22
         model: Cisco-VIC-1385
       port5:
         # t1-sut2-c4/p1 - 40GE port1 on Intel NIC xl710 2p40GE.
         mac_address: "68:05:ca:35:78:e8"
         pci_address: "0000:88:00.0"
+        ip4_address: "172.16.80.1"
         link: link8
         model: Intel-XL710
       port6:
         # t1-sut2-c4/p2 - 40GE port2 on Intel NIC xl710 2p40GE.
         mac_address: "68:05:ca:35:78:e9"
         pci_address: "0000:88:00.1"
+        ip4_address: "172.17.23.2"
         link: link23
         model: Intel-XL710
       port7:
         # t1-sut2-c5/p1 - 10GE port1 on Intel NIC x710 2p10GE.
         mac_address: "3c:fd:fe:9c:ef:94"
         pci_address: "0000:8a:00.0"
+        ip4_address: "172.16.100.1"
         link: link10
         model: Intel-X710
       port8:
         # t1-sut2-c5/p2 - 10GE port2 on Intel NIC x710 2p10GE.
         mac_address: "3c:fd:fe:9c:ef:95"
         pci_address: "0000:8a:00.1"
+        ip4_address: "172.17.24.2"
         link: link24
         model: Intel-X710
       port9:
         # t1-sut2-cm/p1 - 10GE port1 on Cisco VIC 1227 2p10GE.
         mac_address: "00:fe:c8:e5:44:4c"
         pci_address: "0000:06:00.0"
+        ip4_address: "172.16.60.1"
         link: link6
         model: Cisco-VIC-1227
       port10:
         # t1-sut2-cm/p2 - 10GE port2 on Cisco VIC 1227 2p10GE.
         mac_address: "00:fe:c8:e5:44:4d"
         pci_address: "0000:07:00.0"
+        ip4_address: "172.17.25.2"
         link: link25
         model: Cisco-VIC-1227
 
diff --git a/topologies/available/lf_testbed2-X710-X520.yaml b/topologies/available/lf_testbed2-X710-X520.yaml
deleted file mode 100644
index 8af6d4ee29..0000000000
--- a/topologies/available/lf_testbed2-X710-X520.yaml
+++ /dev/null
@@ -1,63 +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.20"
-    port: 22
-    username: testuser
-    password: Cisco1234
-    interfaces:
-      port3:
-        mac_address: "3c:fd:fe:9c:ed:5c"
-        pci_address: "0000:05:00.0"
-        link: link1
-        driver: i40e
-        model: Intel-X710
-      port5:
-        mac_address: "3c:fd:fe:9c:ed:5d"
-        pci_address: "0000:05:00.1"
-        link: link2
-        driver: i40e
-        model: Intel-X710
-  DUT1:
-    type: DUT
-    host: "10.30.51.21"
-    port: 22
-    username: testuser
-    password: Cisco1234
-    interfaces:
-      port1:
-        mac_address: "90:e2:ba:b5:02:b9"
-        pci_address: "0000:0a:00.1"
-        link: link1
-        model: Intel-X520-DA2
-      port3:
-        mac_address: "90:e2:ba:b5:02:b8"
-        pci_address: "0000:0a:00.0"
-        link: link3
-        model: Intel-X520-DA2
-  DUT2:
-    type: DUT
-    host: "10.30.51.22"
-    port: 22
-    username: testuser
-    password: Cisco1234
-    interfaces:
-      port1:
-        mac_address: "90:e2:ba:b5:01:d8"
-        pci_address: "0000:0a:00.0"
-        link: link2
-        model: Intel-X520-DA2
-      port3:
-        mac_address: "90:e2:ba:b5:01:d9"
-        pci_address: "0000:0a:00.1"
-        link: link3
-        model: Intel-X520-DA2
diff --git a/topologies/available/lf_testbed2-XL710-XL710.yaml b/topologies/available/lf_testbed2-XL710-XL710.yaml
deleted file mode 100644
index 7bb3f501ca..0000000000
--- a/topologies/available/lf_testbed2-XL710-XL710.yaml
+++ /dev/null
@@ -1,69 +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.20"
-    port: 22
-    username: testuser
-    password: Cisco1234
-    interfaces:
-      port3:
-        # t2-tg1-c4/p1 - 40GE port1 on Intel NIC xl710 2p40GE.
-        mac_address: "68:05:ca:37:1f:1c"
-        pci_address: "0000:86:00.0"
-        driver: i40e
-        link: link1
-        model: Intel-XL710
-      port5:
-        # t2-tg1-c4/p2 - 40GE port2 on Intel NIC xl710 2p40GE.
-        mac_address: "68:05:ca:37:1f:19"
-        pci_address: "0000:86:00.1"
-        driver: i40e
-        link: link2
-        model: Intel-XL710
-  DUT1:
-    type: DUT
-    host: "10.30.51.21"
-    port: 22
-    username: testuser
-    password: Cisco1234
-    interfaces:
-      port5:
-        # t2-sut1-c4/p1 - 40GE port1 on Intel NIC xl710 2p40GE.
-        mac_address: "68:05:ca:35:77:08"
-        pci_address: "0000:85:00.0"
-        link: link3
-        model: Intel-XL710
-      port6:
-        # t2-sut1-c4/p2 - 40GE port2 on Intel NIC xl710 2p40GE.
-        mac_address: "68:05:ca:35:77:09"
-        pci_address: "0000:85:00.1"
-        link: link1
-        model: Intel-XL710
-  DUT2:
-    type: DUT
-    host: "10.30.51.22"
-    port: 22
-    username: testuser
-    password: Cisco1234
-    interfaces:
-      port5:
-        # t2-sut2-c4/p1 - 40GE port1 on Intel NIC xl710 2p40GE.
-        mac_address: "68:05:ca:35:76:98"
-        pci_address: "0000:85:00.0"
-        link: link2
-        model: Intel-XL710
-      port6:
-        # t2-sut2-c4/p2 - 40GE port2 on Intel NIC xl710 2p40GE.
-        mac_address: "68:05:ca:35:76:99"
-        pci_address: "0000:85:00.1"
-        link: link3
-        model: Intel-XL710
diff --git a/topologies/available/lf_testbed2.yaml b/topologies/available/lf_testbed2.yaml
index e046fa5670..c86cc8b477 100644
--- a/topologies/available/lf_testbed2.yaml
+++ b/topologies/available/lf_testbed2.yaml
@@ -19,6 +19,7 @@ nodes:
         # t2-tg1-c1/p1 - 40GE port1 on Intel NIC xl710 2p40GE.
         mac_address: "68:05:ca:35:76:a8"
         pci_address: "0000:02:00.0"
+        ip4_address: "172.16.10.2"
         driver: i40e
         link: link1
         model: Intel-XL710
@@ -26,6 +27,7 @@ nodes:
         # t2-tg1-c1/p2 - 40GE port2 on Intel NIC xl710 2p40GE.
         mac_address: "68:05:ca:35:76:a9"
         pci_address: "0000:02:00.1"
+        ip4_address: "172.16.20.2"
         driver: i40e
         link: link2
         model: Intel-XL710
@@ -33,6 +35,7 @@ nodes:
         # t2-tg1-c2/p1 - 10GE port1 on Intel NIC x710 2p10GE.
         mac_address: "3c:fd:fe:9c:ed:5c"
         pci_address: "0000:05:00.0"
+        ip4_address: "172.16.30.2"
         driver: i40e
         link: link3
         model: Intel-X710
@@ -40,6 +43,7 @@ nodes:
         # t2-tg1-c2/p2 - 10GE port2 on Intel NIC x710 2p10GE.
         mac_address: "3c:fd:fe:9c:ed:5d"
         pci_address: "0000:05:00.1"
+        ip4_address: "172.16.40.2"
         driver: i40e
         link: link4
         model: Intel-X710
@@ -47,6 +51,7 @@ nodes:
         # t2-tg1-c3/p1 - 10GE port1 on Intel NIC x710 2p10GE.
         mac_address: "3c:fd:fe:9c:ee:5c"
         pci_address: "0000:07:00.0"
+        ip4_address: "172.16.50.2"
         driver: i40e
         link: link5
         model: Intel-X710
@@ -54,6 +59,7 @@ nodes:
         # t2-tg1-c3/p2 - 10GE port2 on Intel NIC x710 2p10GE.
         mac_address: "3c:fd:fe:9c:ee:5d"
         pci_address: "0000:07:00.1"
+        ip4_address: "172.16.60.2"
         driver: i40e
         link: link6
         model: Intel-X710
@@ -61,6 +67,7 @@ nodes:
         # t2-tg1-c4/p1 - 40GE port1 on Intel NIC xl710 2p40GE.
         mac_address: "68:05:ca:37:1f:1c"
         pci_address: "0000:86:00.0"
+        ip4_address: "172.16.70.2"
         driver: i40e
         link: link7
         model: Intel-XL710
@@ -68,6 +75,7 @@ nodes:
         # t2-tg1-c4/p2 - 40GE port2 on Intel NIC xl710 2p40GE.
         mac_address: "68:05:ca:37:1f:19"
         pci_address: "0000:86:00.1"
+        ip4_address: "172.16.80.2"
         driver: i40e
         link: link8
         model: Intel-XL710
@@ -75,6 +83,7 @@ nodes:
         # t2-tg1-c5/p1 - 10GE port1 on Intel NIC x710 2p10GE.
         mac_address: "3c:fd:fe:9c:ed:7c"
         pci_address: "0000:88:00.0"
+        ip4_address: "172.16.90.2"
         driver: i40e
         link: link9
         model: Intel-X710
@@ -82,6 +91,7 @@ nodes:
         # t2-tg1-c5/p2 - 10GE port2 on Intel NIC x710 2p10GE.
         mac_address: "3c:fd:fe:9c:ed:7d"
         pci_address: "0000:88:00.1"
+        ip4_address: "172.16.100.2"
         driver: i40e
         link: link10
         model: Intel-X710
@@ -89,6 +99,7 @@ nodes:
         # t2-tg1-c6/p1 - 10GE port1 on Intel NIC x710 2p10GE.
         mac_address: "3c:fd:fe:9c:ee:58"
         pci_address: "0000:84:00.0"
+        ip4_address: "172.16.110.1"
         driver: i40e
         link: link11
         model: Intel-X710
@@ -96,6 +107,7 @@ nodes:
         # t2-tg1-c6/p2 - 10GE port2 on Intel NIC x710 2p10GE.
         mac_address: "3c:fd:fe:9c:ee:59"
         pci_address: "0000:84:00.1"
+        ip4_address: "172.16.110.2"
         driver: i40e
         link: link11
         model: Intel-X710
@@ -117,60 +129,70 @@ nodes:
         # t2-sut1-c1/p1 - 10GE port1 on Intel NIC x520 2p10GE.
         mac_address: "90:e2:ba:b5:02:b8"
         pci_address: "0000:0a:00.0"
+        ip4_address: "172.17.21.1"
         link: link21
         model: Intel-X520-DA2
       port2:
         # t2-sut1-c1/p2 - 10GE port2 on Intel NIC x520 2p10GE.
         mac_address: "90:e2:ba:b5:02:b9"
         pci_address: "0000:0a:00.1"
+        ip4_address: "172.17.30.1"
         link: link3
         model: Intel-X520-DA2
       port3:
         # t2-sut1-c2/p1 - 40GE port1 on Cisco VIC 1385 2p40GE.
         mac_address: "04:62:73:8c:ca:cd"
         pci_address: "0000:13:00.0"
+        ip4_address: "172.17.22.1"
         link: link22
         model: Cisco-VIC-1385
       port4:
         # t2-sut1-c2/p2 - 40GE port2 on Cisco VIC 1385 2p40GE.
         mac_address: "04:62:73:8c:ca:ce"
         pci_address: "0000:15:00.0"
+        ip4_address: "172.16.10.1"
         link: link1
         model: Cisco-VIC-1385
       port5:
         # t2-sut1-c4/p1 - 40GE port1 on Intel NIC xl710 2p40GE.
         mac_address: "68:05:ca:35:77:08"
         pci_address: "0000:88:00.0"
+        ip4_address: "172.17.23.1"
         link: link23
         model: Intel-XL710
       port6:
         # t2-sut1-c4/p2 - 40GE port2 on Intel NIC xl710 2p40GE.
         mac_address: "68:05:ca:35:77:09"
         pci_address: "0000:88:00.1"
+        ip4_address: "172.16.70.1"
         link: link7
         model: Intel-XL710
       port7:
         # t2-sut1-c5/p1 - 10GE port1 on Intel NIC x710 2p10GE.
         mac_address: "3c:fd:fe:9c:ee:ec"
         pci_address: "0000:8a:00.0"
+        ip4_address: "172.17.24.1"
         link: link24
         model: Intel-X710
       port8:
         # t2-sut1-c5/p2 - 10GE port2 on Intel NIC x710 2p10GE.
         mac_address: "3c:fd:fe:9c:ee:ed"
         pci_address: "0000:8a:00.1"
+        ip4_address: "172.16.90.1"
         link: link9
         model: Intel-X710
       port9:
         # t2-sut1-cm/p1 - 10GE port1 on Cisco VIC 1227 2p10GE.
         mac_address: "00:fe:c8:e4:d0:9b"
         pci_address: "0000:06:00.0"
+        ip4_address: "172.17.25.1"
         link: link25
         model: Cisco-VIC-1227
       port10:
         # t2-sut1-cm/p2 - 10GE port2 on Cisco VIC 1227 2p10GE.
         mac_address: "00:fe:c8:e4:d0:9c"
         pci_address: "0000:07:00.0"
+        ip4_address: "172.16.50.1"
         link: link5
         model: Cisco-VIC-1227
   DUT2:
@@ -191,59 +213,69 @@ nodes:
         # t2-sut2-c1/p1 - 10GE port1 on Intel NIC x520 2p10GE.
         mac_address: "90:e2:ba:b5:01:d8"
         pci_address: "0000:0a:00.0"
+        ip4_address: "172.16.40.1"
         link: link4
         model: Intel-X520-DA2
       port2:
         # t2-sut2-c1/p2 - 10GE port2 on Intel NIC x520 2p10GE.
         mac_address: "90:e2:ba:b5:01:d9"
         pci_address: "0000:0a:00.1"
+        ip4_address: "172.17.21.2"
         link: link21
         model: Intel-X520-DA2
       port3:
         # t2-sut2-c2/p1 - 40GE port1 on Cisco VIC 1385 2p40GE.
         mac_address: "ec:bd:1d:08:8f:88"
         pci_address: "0000:13:00.0"
+        ip4_address: "172.16.20.1"
         link: link2
         model: Cisco-VIC-1385
       port4:
         # t2-sut2-c2/p2 - 40GE port2 on Cisco VIC 1385 2p40GE.
         mac_address: "ec:bd:1d:08:8f:89"
         pci_address: "0000:15:00.0"
+        ip4_address: "172.17.22.2"
         link: link22
         model: Cisco-VIC-1385
       port5:
         # t2-sut2-c4/p1 - 40GE port1 on Intel NIC xl710 2p40GE.
         mac_address: "68:05:ca:35:76:98"
         pci_address: "0000:88:00.0"
+        ip4_address: "172.16.80.1"
         link: link8
         model: Intel-XL710
       port6:
         # t2-sut2-c4/p2 - 40GE port2 on Intel NIC xl710 2p40GE.
         mac_address: "68:05:ca:35:76:99"
         pci_address: "0000:88:00.1"
+        ip4_address: "172.17.23.2"
         link: link23
         model: Intel-XL710
       port7:
         # t2-sut2-c5/p1 - 10GE port1 on Intel NIC x710 2p10GE.
         mac_address: "3c:fd:fe:9c:ee:e4"
         pci_address: "0000:8a:00.0"
+        ip4_address: "172.16.100.1"
         link: link10
         model: Intel-X710
       port8:
         # t2-sut2-c5/p2 - 10GE port2 on Intel NIC x710 2p10GE.
         mac_address: "3c:fd:fe:9c:ee:e5"
         pci_address: "0000:8a:00.1"
+        ip4_address: "172.17.24.2"
         link: link24
         model: Intel-X710
       port9:
         # t2-sut2-cm/p1 - 10GE port1 on Cisco VIC 1227 2p10GE.
         mac_address: "00:fe:c8:e4:eb:4b"
         pci_address: "0000:06:00.0"
+        ip4_address: "172.16.60.1"
         link: link6
         model: Cisco-VIC-1227
       port10:
         # t2-sut2-cm/p2 - 10GE port2 on Cisco VIC 1227 2p10GE.
         mac_address: "00:fe:c8:e4:eb:4c"
         pci_address: "0000:07:00.0"
+        ip4_address: "172.17.25.2"
         link: link25
         model: Cisco-VIC-1227
diff --git a/topologies/available/lf_testbed3-X710-X520.yaml b/topologies/available/lf_testbed3-X710-X520.yaml
deleted file mode 100644
index a098fa8699..0000000000
--- a/topologies/available/lf_testbed3-X710-X520.yaml
+++ /dev/null
@@ -1,63 +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.24"
-    port: 22
-    username: testuser
-    password: Cisco1234
-    interfaces:
-      port3:
-        mac_address: "3c:fd:fe:9c:ef:98"
-        pci_address: "0000:05:00.0"
-        link: link1
-        driver: i40e
-        model: Intel-X710
-      port5:
-        mac_address: "3c:fd:fe:9c:ef:99"
-        pci_address: "0000:05:00.1"
-        link: link2
-        driver: i40e
-        model: Intel-X710
-  DUT1:
-    type: DUT
-    host: "10.30.51.25"
-    port: 22
-    username: testuser
-    password: Cisco1234
-    interfaces:
-      port1:
-        mac_address: "90:e2:ba:b5:01:dd"
-        pci_address: "0000:0a:00.1"
-        link: link1
-        model: Intel-X520-DA2
-      port3:
-        mac_address: "90:e2:ba:b5:01:dc"
-        pci_address: "0000:0a:00.0"
-        link: link3
-        model: Intel-X520-DA2
-  DUT2:
-    type: DUT
-    host: "10.30.51.26"
-    port: 22
-    username: testuser
-    password: Cisco1234
-    interfaces:
-      port1:
-        mac_address: "90:e2:ba:b5:0f:38"
-        pci_address: "0000:0a:00.0"
-        link: link2
-        model: Intel-X520-DA2
-      port3:
-        mac_address: "90:e2:ba:b5:0f:39"
-        pci_address: "0000:0a:00.1"
-        link: link3
-        model: Intel-X520-DA2
diff --git a/topologies/available/lf_testbed3.yaml b/topologies/available/lf_testbed3.yaml
index 85cc8fe3c6..8de90ff53b 100644
--- a/topologies/available/lf_testbed3.yaml
+++ b/topologies/available/lf_testbed3.yaml
@@ -19,6 +19,7 @@ nodes:
         # t3-tg1-c1/p1 - 40GE port1 on Intel NIC xl710 2p40GE.
         mac_address: "68:05:ca:35:79:40"
         pci_address: "0000:02:00.0"
+        ip4_address: "172.16.10.2"
         driver: i40e
         link: link1
         model: Intel-XL710
@@ -26,6 +27,7 @@ nodes:
         # t3-tg1-c1/p2 - 40GE port2 on Intel NIC xl710 2p40GE.
         mac_address: "68:05:ca:35:79:41"
         pci_address: "0000:02:00.1"
+        ip4_address: "172.16.20.2"
         driver: i40e
         link: link2
         model: Intel-XL710
@@ -33,6 +35,7 @@ nodes:
         # t3-tg1-c2/p1 - 10GE port1 on Intel NIC x710 2p10GE.
         mac_address: "3c:fd:fe:9c:ef:98"
         pci_address: "0000:05:00.0"
+        ip4_address: "172.16.30.2"
         driver: i40e
         link: link3
         model: Intel-X710
@@ -40,6 +43,7 @@ nodes:
         # t3-tg1-c2/p2 - 10GE port2 on Intel NIC x710 2p10GE.
         mac_address: "3c:fd:fe:9c:ef:99"
         pci_address: "0000:05:00.1"
+        ip4_address: "172.16.40.2"
         driver: i40e
         link: link4
         model: Intel-X710
@@ -47,6 +51,7 @@ nodes:
         # t3-tg1-c3/p1 - 10GE port1 on Intel NIC x710 2p10GE.
         mac_address: "3c:fd:fe:9c:ee:28"
         pci_address: "0000:07:00.0"
+        ip4_address: "172.16.50.2"
         driver: i40e
         link: link5
         model: Intel-X710
@@ -54,6 +59,7 @@ nodes:
         # t3-tg1-c3/p2 - 10GE port2 on Intel NIC x710 2p10GE.
         mac_address: "3c:fd:fe:9c:ee:29"
         pci_address: "0000:07:00.1"
+        ip4_address: "172.16.60.2"
         driver: i40e
         link: link6
         model: Intel-X710
@@ -61,6 +67,7 @@ nodes:
         # t3-tg1-c4/p1 - 40GE port1 on Intel NIC xl710 2p40GE.
         mac_address: "68:05:ca:35:79:1c"
         pci_address: "0000:86:00.0"
+        ip4_address: "172.16.70.2"
         driver: i40e
         link: link7
         model: Intel-XL710
@@ -68,6 +75,7 @@ nodes:
         # t3-tg1-c4/p2 - 40GE port2 on Intel NIC xl710 2p40GE.
         mac_address: "68:05:ca:35:79:19"
         pci_address: "0000:86:00.1"
+        ip4_address: "172.16.80.2"
         driver: i40e
         link: link8
         model: Intel-XL710
@@ -75,6 +83,7 @@ nodes:
         # t3-tg1-c5/p1 - 10GE port1 on Intel NIC x710 2p10GE.
         mac_address: "3c:fd:fe:9c:ee:74"
         pci_address: "0000:88:00.0"
+        ip4_address: "172.16.90.2"
         driver: i40e
         link: link9
         model: Intel-X710
@@ -82,6 +91,7 @@ nodes:
         # t3-tg1-c5/p2 - 10GE port2 on Intel NIC x710 2p10GE.
         mac_address: "3c:fd:fe:9c:ee:75"
         pci_address: "0000:88:00.1"
+        ip4_address: "172.16.100.2"
         driver: i40e
         link: link10
         model: Intel-X710
@@ -89,6 +99,7 @@ nodes:
         # t3-tg1-c6/p1 - 10GE port1 on Intel NIC x710 2p10GE.
         mac_address: "3c:fd:fe:9c:ef:38"
         pci_address: "0000:84:00.0"
+        ip4_address: "172.16.110.1"
         driver: i40e
         link: link11
         model: Intel-X710
@@ -96,6 +107,7 @@ nodes:
         # t3-tg1-c6/p2 - 10GE port2 on Intel NIC x710 2p10GE.
         mac_address: "3c:fd:fe:9c:ef:39"
         pci_address: "0000:84:00.1"
+        ip4_address: "172.16.110.2"
         driver: i40e
         link: link11
         model: Intel-X710
@@ -117,60 +129,70 @@ nodes:
         # t3-sut1-c1/p1 - 10GE port1 on Intel NIC x520 2p10GE.
         mac_address: "90:e2:ba:b5:01:dc"
         pci_address: "0000:0a:00.0"
+        ip4_address: "172.17.21.1"
         link: link21
         model: Intel-X520-DA2
       port2:
         # t3-sut1-c1/p2 - 10GE port2 on Intel NIC x520 2p10GE.
         mac_address: "90:e2:ba:b5:01:dd"
         pci_address: "0000:0a:00.1"
+        ip4_address: "172.16.30.1"
         link: link3
         model: Intel-X520-DA2
       port3:
         # t3-sut1-c2/p1 - 40GE port1 on Cisco VIC 1385 2p40GE.
         mac_address: "04:62:73:f8:80:c1"
         pci_address: "0000:13:00.0"
+        ip4_address: "172.17.22.1"
         link: link22
         model: Cisco-VIC-1385
       port4:
         # t3-sut1-c2/p2 - 40GE port2 on Cisco VIC 1385 2p40GE.
         mac_address: "04:62:73:f8:80:c2"
         pci_address: "0000:15:00.0"
+        ip4_address: "172.16.10.1"
         link: link1
         model: Cisco-VIC-1385
       port5:
         # t3-sut1-c4/p1 - 40GE port1 on Intel NIC xl710 2p40GE.
         mac_address: "68:05:ca:37:25:18"
         pci_address: "0000:88:00.0"
+        ip4_address: "172.17.23.1"
         link: link23
         model: Intel-XL710
       port6:
         # t3-sut1-c4/p2 - 40GE port2 on Intel NIC xl710 2p40GE.
         mac_address: "68:05:ca:37:25:19"
         pci_address: "0000:88:00.1"
+        ip4_address: "172.16.70.1"
         link: link7
         model: Intel-XL710
       port7:
         # t3-sut1-c5/p1 - 10GE port1 on Intel NIC x710 2p10GE.
         mac_address: "3c:fd:fe:9c:ef:34"
         pci_address: "0000:8a:00.0"
+        ip4_address: "172.17.24.1"
         link: link24
         model: Intel-X710
       port8:
         # t3-sut1-c5/p2 - 10GE port2 on Intel NIC x710 2p10GE.
         mac_address: "3c:fd:fe:9c:ef:35"
         pci_address: "0000:8a:00.1"
+        ip4_address: "172.16.90.1"
         link: link9
         model: Intel-X710
       port9:
         # t3-sut1-cm/p1 - 10GE port1 on Cisco VIC 1227 2p10GE.
         mac_address: "00:fe:c8:e5:46:d0"
         pci_address: "0000:06:00.0"
+        ip4_address: "172.17.25.1"
         link: link25
         model: Cisco-VIC-1227
       port10:
         # t3-sut1-cm/p2 - 10GE port2 on Cisco VIC 1227 2p10GE.
         mac_address: "00:fe:c8:e5:46:d1"
         pci_address: "0000:07:00.0"
+        ip4_address: "172.16.50.1"
         link: link5
         model: Cisco-VIC-1227
   DUT2:
@@ -191,59 +213,69 @@ nodes:
         # t3-sut3-c1/p1 - 10GE port1 on Intel NIC x520 2p10GE.
         mac_address: "90:e2:ba:b5:0f:38"
         pci_address: "0000:0a:00.0"
+        ip4_address: "172.16.40.1"
         link: link4
         model: Intel-X520-DA2
       port2:
         # t3-sut3-c1/p2 - 10GE port2 on Intel NIC x520 2p10GE.
         mac_address: "90:e2:ba:b5:0f:39"
         pci_address: "0000:0a:00.1"
+        ip4_address: "172.17.21.2"
         link: link21
         model: Intel-X520-DA2
       port3:
         # t3-sut3-c2/p1 - 40GE port1 on Cisco VIC 1385 2p40GE.
         mac_address: "04:62:73:8c:78:2f"
         pci_address: "0000:13:00.0"
+        ip4_address: "172.16.20.1"
         link: link2
         model: Cisco-VIC-1385
       port4:
         # t3-sut3-c2/p2 - 40GE port2 on Cisco VIC 1385 2p40GE.
         mac_address: "04:62:73:8c:78:30"
         pci_address: "0000:15:00.0"
+        ip4_address: "172.17.22.2"
         link: link22
         model: Cisco-VIC-1385
       port5:
         # t3-sut3-c4/p1 - 40GE port1 on Intel NIC xl710 2p40GE.
         mac_address: "68:05:ca:35:76:b0"
         pci_address: "0000:88:00.0"
+        ip4_address: "172.16.80.1"
         link: link8
         model: Intel-XL710
       port6:
         # t3-sut3-c4/p2 - 40GE port2 on Intel NIC xl710 2p40GE.
         mac_address: "68:05:ca:35:76:b1"
         pci_address: "0000:88:00.1"
+        ip4_address: "172.17.23.2"
         link: link23
         model: Intel-XL710
       port7:
         # t3-sut3-c5/p1 - 10GE port1 on Intel NIC x710 2p10GE.
         mac_address: "3c:fd:fe:9c:ee:e0"
         pci_address: "0000:8a:00.0"
+        ip4_address: "172.16.100.1"
         link: link10
         model: Intel-X710
       port8:
         # t3-sut3-c5/p2 - 10GE port2 on Intel NIC x710 2p10GE.
         mac_address: "3c:fd:fe:9c:ee:e1"
         pci_address: "0000:8a:00.1"
+        ip4_address: "172.17.24.2"
         link: link24
         model: Intel-X710
       port9:
         # t3-sut3-cm/p1 - 10GE port1 on Cisco VIC 1227 2p10GE.
         mac_address: "00:fe:c8:e5:44:19"
         pci_address: "0000:06:00.0"
+        ip4_address: "172.16.60.1"
         link: link6
         model: Cisco-VIC-1227
       port10:
         # t3-sut3-cm/p2 - 10GE port2 on Cisco VIC 1227 2p10GE.
         mac_address: "00:fe:c8:e5:44:1a"
         pci_address: "0000:07:00.0"
+        ip4_address: "172.17.25.2"
         link: link25
         model: Cisco-VIC-1227