aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xbootstrap-verify-perf-DPDK.sh6
-rw-r--r--bootstrap-verify-perf-ligato.sh6
-rwxr-xr-xbootstrap-verify-perf.sh6
-rw-r--r--resources/topology_schemas/2_node_topology.sch.yaml37
-rw-r--r--topologies/available/3n_hw_testbed1.yaml.example (renamed from topologies/available/3_node_hw_topo1.yaml.example)0
-rw-r--r--topologies/available/lf_2n_skx_testbed21.yaml160
-rw-r--r--topologies/available/lf_2n_skx_testbed22.yaml160
-rw-r--r--topologies/available/lf_2n_skx_testbed23.yaml160
-rw-r--r--topologies/available/lf_2n_skx_testbed24.yaml160
-rw-r--r--topologies/available/lf_3n_hsw_testbed1.yaml (renamed from topologies/available/lf_testbed1.yaml)0
-rw-r--r--topologies/available/lf_3n_hsw_testbed2.yaml (renamed from topologies/available/lf_testbed2.yaml)0
-rw-r--r--topologies/available/lf_3n_hsw_testbed3.yaml (renamed from topologies/available/lf_testbed3.yaml)0
-rw-r--r--topologies/available/lf_3n_skx_testbed31.yaml222
13 files changed, 908 insertions, 9 deletions
diff --git a/bootstrap-verify-perf-DPDK.sh b/bootstrap-verify-perf-DPDK.sh
index f15a38c2f4..defca90797 100755
--- a/bootstrap-verify-perf-DPDK.sh
+++ b/bootstrap-verify-perf-DPDK.sh
@@ -15,9 +15,9 @@
set -xo pipefail
# Space separated list of available testbeds, described by topology files
-TOPOLOGIES="topologies/available/lf_testbed1.yaml \
- topologies/available/lf_testbed2.yaml \
- topologies/available/lf_testbed3.yaml"
+TOPOLOGIES="topologies/available/lf_3n_hsw_testbed1.yaml \
+ topologies/available/lf_3n_hsw_testbed2.yaml \
+ topologies/available/lf_3n_hsw_testbed3.yaml"
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
export PYTHONPATH=${SCRIPT_DIR}
diff --git a/bootstrap-verify-perf-ligato.sh b/bootstrap-verify-perf-ligato.sh
index 0ede5901da..8cbe8ca3a5 100644
--- a/bootstrap-verify-perf-ligato.sh
+++ b/bootstrap-verify-perf-ligato.sh
@@ -15,9 +15,9 @@
set -xo pipefail
# Space separated list of available testbeds, described by topology files
-TOPOLOGIES="topologies/available/lf_testbed1.yaml \
- topologies/available/lf_testbed2.yaml \
- topologies/available/lf_testbed3.yaml"
+TOPOLOGIES="topologies/available/lf_3n_hsw_testbed1.yaml \
+ topologies/available/lf_3n_hsw_testbed2.yaml \
+ topologies/available/lf_3n_hsw_testbed3.yaml"
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
export PYTHONPATH=${SCRIPT_DIR}
diff --git a/bootstrap-verify-perf.sh b/bootstrap-verify-perf.sh
index 5aca852e8f..56e6037090 100755
--- a/bootstrap-verify-perf.sh
+++ b/bootstrap-verify-perf.sh
@@ -15,9 +15,9 @@
set -xo pipefail
# Space separated list of available testbeds, described by topology files
-TOPOLOGIES="topologies/available/lf_testbed1.yaml \
- topologies/available/lf_testbed2.yaml \
- topologies/available/lf_testbed3.yaml"
+TOPOLOGIES="topologies/available/lf_3n_hsw_testbed1.yaml \
+ topologies/available/lf_3n_hsw_testbed2.yaml \
+ topologies/available/lf_3n_hsw_testbed3.yaml"
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
export PYTHONPATH=${SCRIPT_DIR}
diff --git a/resources/topology_schemas/2_node_topology.sch.yaml b/resources/topology_schemas/2_node_topology.sch.yaml
new file mode 100644
index 0000000000..8de397106a
--- /dev/null
+++ b/resources/topology_schemas/2_node_topology.sch.yaml
@@ -0,0 +1,37 @@
+# Copyright (c) 2018 Cisco 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.
+
+# This file defines required nodes for 2-node topology.
+
+name: 2_node_topology
+
+# +------+ +-----+
+# | | port1 port3 | +
+# | DUT1 +-----------------+ TG |
+# | +-----------------+ +
+# | | port2 port4 | |
+# +-+-+--+ +-+-+-+
+
+type: map
+mapping:
+ metadata:
+ include: topology_metadata_map
+
+ nodes:
+ type: map
+ required: yes
+ mapping:
+ TG:
+ include: type_tg
+ DUT1:
+ include: type_dut
diff --git a/topologies/available/3_node_hw_topo1.yaml.example b/topologies/available/3n_hw_testbed1.yaml.example
index ed817ffb4f..ed817ffb4f 100644
--- a/topologies/available/3_node_hw_topo1.yaml.example
+++ b/topologies/available/3n_hw_testbed1.yaml.example
diff --git a/topologies/available/lf_2n_skx_testbed21.yaml b/topologies/available/lf_2n_skx_testbed21.yaml
new file mode 100644
index 0000000000..d5dc1f50ab
--- /dev/null
+++ b/topologies/available/lf_2n_skx_testbed21.yaml
@@ -0,0 +1,160 @@
+---
+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-XL710
+ 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-XL710
+ 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-XL710
+ 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-XL710
+ 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: igb_uio
+ honeycomb:
+ user: admin
+ passwd: admin
+ port: 8183
+ netconf_port: 2831
+ 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-XL710
+ 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-XL710
+ 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/available/lf_2n_skx_testbed22.yaml b/topologies/available/lf_2n_skx_testbed22.yaml
new file mode 100644
index 0000000000..588284c93a
--- /dev/null
+++ b/topologies/available/lf_2n_skx_testbed22.yaml
@@ -0,0 +1,160 @@
+---
+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-XL710
+ 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-XL710
+ 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-XL710
+ 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-XL710
+ 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: igb_uio
+ honeycomb:
+ user: admin
+ passwd: admin
+ port: 8183
+ netconf_port: 2831
+ 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-XL710
+ 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-XL710
+ 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/available/lf_2n_skx_testbed23.yaml b/topologies/available/lf_2n_skx_testbed23.yaml
new file mode 100644
index 0000000000..d3606e1dde
--- /dev/null
+++ b/topologies/available/lf_2n_skx_testbed23.yaml
@@ -0,0 +1,160 @@
+---
+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-XL710
+ 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-XL710
+ 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-XL710
+ 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-XL710
+ 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: igb_uio
+ honeycomb:
+ user: admin
+ passwd: admin
+ port: 8183
+ netconf_port: 2831
+ 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-XL710
+ 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-XL710
+ 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/available/lf_2n_skx_testbed24.yaml b/topologies/available/lf_2n_skx_testbed24.yaml
new file mode 100644
index 0000000000..092104f24f
--- /dev/null
+++ b/topologies/available/lf_2n_skx_testbed24.yaml
@@ -0,0 +1,160 @@
+---
+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.57"
+ arch: x86_64
+ port: 22
+ username: testuser
+ password: Csit1234
+ interfaces:
+ port1:
+ # s10-t24-tg1-c2/p1 - 10GE port1 on Intel NIC x710 4p10GE.
+ mac_address: "3c:fd:fe:a8:b1:88"
+ pci_address: "0000:18:00.0"
+ ip4_address: "172.16.10.2"
+ driver: i40e
+ link: link1
+ model: Intel-XL710
+ port2:
+ # s10-t24-tg1-c2/p2 - 10GE port1 on Intel NIC x710 4p10GE.
+ mac_address: "3c:fd:fe:a8:b1:89"
+ pci_address: "0000:18:00.1"
+ ip4_address: "172.16.20.2"
+ driver: i40e
+ link: link2
+ model: Intel-XL710
+ port3:
+ # s10-t24-tg1-c2/p3 - 10GE port1 on Intel NIC x710 4p10GE.
+ mac_address: "3c:fd:fe:a8:b1:8a"
+ pci_address: "0000:18:00.2"
+ ip4_address: "172.16.30.2"
+ driver: i40e
+ link: link3
+ model: Intel-X710
+ port4:
+ # s10-t24-tg1-c2/p4 - 10GE port1 on Intel NIC x710 4p10GE.
+ mac_address: "3c:fd:fe:a8:b1:8b"
+ pci_address: "0000:18:00.3"
+ ip4_address: "172.16.40.2"
+ driver: i40e
+ link: link4
+ model: Intel-X710
+ port5:
+ # s10-t24-tg1-c4/p1 - 25GE port1 on Intel NIC xxv710 2p25GE.
+ mac_address: "3c:fd:fe:bd:f9:70"
+ pci_address: "0000:3b:00.0"
+ ip4_address: "172.16.50.2"
+ driver: i40e
+ link: link5
+ model: Intel-XXV710
+ port6:
+ # s10-t24-tg1-c4/p2 - 25GE port2 on Intel NIC xxv710 2p25GE.
+ mac_address: "3c:fd:fe:bd:f9:71"
+ pci_address: "0000:3b:00.1"
+ ip4_address: "172.16.60.2"
+ driver: i40e
+ link: link6
+ model: Intel-XXV710
+ port7:
+ # s10-t24-tg1-c10/p1 - 10GE port1 on Intel NIC x710 4p10GE.
+ mac_address: "3c:fd:fe:a8:ae:40"
+ pci_address: "0000:d8:00.0"
+ ip4_address: "172.16.70.2"
+ driver: i40e
+ link: link7
+ model: Intel-XL710
+ port8:
+ # s10-t24-tg1-c10/p2 - 10GE port1 on Intel NIC x710 4p10GE.
+ mac_address: "3c:fd:fe:a8:ae:41"
+ pci_address: "0000:d8:00.1"
+ ip4_address: "172.16.70.1"
+ driver: i40e
+ link: link7
+ model: Intel-XL710
+ port9:
+ # s10-t24-tg1-c10/p3 - 10GE port1 on Intel NIC x710 4p10GE.
+ mac_address: "3c:fd:fe:a8:ae:42"
+ pci_address: "0000:d8:00.2"
+ ip4_address: "172.16.80.2"
+ driver: i40e
+ link: link8
+ model: Intel-X710
+ port10:
+ # s10-t24-tg1-c10/p4 - 10GE port1 on Intel NIC x710 4p10GE.
+ mac_address: "3c:fd:fe:a8:ae:43"
+ 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.56"
+ arch: x86_64
+ port: 22
+ username: testuser
+ password: Csit1234
+ uio_driver: igb_uio
+ honeycomb:
+ user: admin
+ passwd: admin
+ port: 8183
+ netconf_port: 2831
+ interfaces:
+ port1:
+ # s9-t24-sut1-c2/p1 - 10GE port1 on Intel NIC x710 4p10GE.
+ mac_address: "3c:fd:fe:a8:ad:80"
+ pci_address: "0000:18:00.0"
+ ip4_address: "172.16.10.1"
+ driver: i40e
+ link: link1
+ model: Intel-XL710
+ port2:
+ # s9-t24-sut1-c2/p2 - 10GE port1 on Intel NIC x710 4p10GE.
+ mac_address: "3c:fd:fe:a8:ad:81"
+ pci_address: "0000:18:00.1"
+ ip4_address: "172.16.20.1"
+ driver: i40e
+ link: link2
+ model: Intel-XL710
+ port3:
+ # s9-t24-sut1-c2/p3 - 10GE port1 on Intel NIC x710 4p10GE.
+ mac_address: "3c:fd:fe:a8:ad:82"
+ pci_address: "0000:18:00.2"
+ ip4_address: "172.16.30.1"
+ driver: i40e
+ link: link3
+ model: Intel-X710
+ port4:
+ # s9-t24-sut1-c2/p4 - 10GE port1 on Intel NIC x710 4p10GE.
+ mac_address: "3c:fd:fe:a8:ad:83"
+ pci_address: "0000:18:00.3"
+ ip4_address: "172.16.40.1"
+ driver: i40e
+ link: link4
+ model: Intel-X710
+ port5:
+ # s9-t24-sut1-c4/p1 - 25GE port1 on Intel NIC xxv710 2p25GE.
+ mac_address: "3c:fd:fe:bd:f9:5c"
+ pci_address: "0000:3b:00.0"
+ ip4_address: "172.16.50.1"
+ driver: i40e
+ link: link5
+ model: Intel-XXV710
+ port6:
+ # s9-t24-sut1-c4/p2 - 25GE port2 on Intel NIC xxv710 2p25GE.
+ mac_address: "3c:fd:fe:bd:f9:5d"
+ pci_address: "0000:3b:00.1"
+ ip4_address: "172.16.60.1"
+ driver: i40e
+ link: link6
+ model: Intel-XXV710
diff --git a/topologies/available/lf_testbed1.yaml b/topologies/available/lf_3n_hsw_testbed1.yaml
index fcd9208a38..fcd9208a38 100644
--- a/topologies/available/lf_testbed1.yaml
+++ b/topologies/available/lf_3n_hsw_testbed1.yaml
diff --git a/topologies/available/lf_testbed2.yaml b/topologies/available/lf_3n_hsw_testbed2.yaml
index d69f861969..d69f861969 100644
--- a/topologies/available/lf_testbed2.yaml
+++ b/topologies/available/lf_3n_hsw_testbed2.yaml
diff --git a/topologies/available/lf_testbed3.yaml b/topologies/available/lf_3n_hsw_testbed3.yaml
index e678c87d64..e678c87d64 100644
--- a/topologies/available/lf_testbed3.yaml
+++ b/topologies/available/lf_3n_hsw_testbed3.yaml
diff --git a/topologies/available/lf_3n_skx_testbed31.yaml b/topologies/available/lf_3n_skx_testbed31.yaml
new file mode 100644
index 0000000000..ab40e81f70
--- /dev/null
+++ b/topologies/available/lf_3n_skx_testbed31.yaml
@@ -0,0 +1,222 @@
+---
+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-XL710
+ 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-XL710
+ 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-XL710
+ 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-XL710
+ 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: igb_uio
+ honeycomb:
+ user: admin
+ passwd: admin
+ port: 8183
+ netconf_port: 2831
+ 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-XL710
+ 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-XL710
+ 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: igb_uio
+ honeycomb:
+ user: admin
+ passwd: admin
+ port: 8183
+ netconf_port: 2831
+ 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-XL710
+ 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-XL710
+ 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