aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--resources/libraries/bash/function/common.sh33
-rw-r--r--topologies/available/lf_2n_dnv_testbed26.yaml52
-rw-r--r--topologies/available/lf_3n_dnv_testbed35.yaml74
3 files changed, 159 insertions, 0 deletions
diff --git a/resources/libraries/bash/function/common.sh b/resources/libraries/bash/function/common.sh
index e89bae9b38..08e916f65f 100644
--- a/resources/libraries/bash/function/common.sh
+++ b/resources/libraries/bash/function/common.sh
@@ -445,6 +445,14 @@ function get_test_code () {
NODENESS="3n"
FLAVOR="skx"
;;
+ *"2n-dnv"*)
+ NODENESS="2n"
+ FLAVOR="dnv"
+ ;;
+ *"3n-dnv"*)
+ NODENESS="3n"
+ FLAVOR="dnv"
+ ;;
*"3n-tsh"*)
NODENESS="3n"
FLAVOR="tsh"
@@ -491,6 +499,7 @@ function get_test_tag_string () {
comment="${comment/perftest-3n/perftest}"
comment="${comment/perftest-hsw/perftest}"
comment="${comment/perftest-skx/perftest}"
+ comment="${comment/perftest-dnv/perftest}"
comment="${comment/perftest-tsh/perftest}"
tag_string="$(echo "${comment}" \
| grep -oE '(perftest$|perftest[[:space:]].+$)' || true)"
@@ -652,6 +661,9 @@ function select_tags () {
# Select default NIC
case "${TEST_CODE}" in
+ *"3n-dnv"* | *"2n-dnv"*)
+ DEFAULT_NIC='nic_intel-x553'
+ ;;
*"3n-tsh"*)
DEFAULT_NIC='nic_intel-x520-da2'
;;
@@ -697,6 +709,19 @@ function select_tags () {
# Not enough nic_intel-xxv710 to support double link tests.
test_tag_array+=("!3_node_double_link_topoANDnic_intel-xxv710")
;;
+ *"2n-dnv"*)
+ test_tag_array+=("!ipsechw")
+ test_tag_array+=("!memif")
+ test_tag_array+=("!srv6_proxy")
+ test_tag_array+=("!vhost")
+ test_tag_array+=("!vts")
+ ;;
+ *"3n-dnv"*)
+ test_tag_array+=("!memif")
+ test_tag_array+=("!srv6_proxy")
+ test_tag_array+=("!vhost")
+ test_tag_array+=("!vts")
+ ;;
*"3n-tsh"*)
test_tag_array+=("!ipsechw")
test_tag_array+=("!memif")
@@ -864,6 +889,14 @@ function select_topology () {
TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3n_skx*.yaml )
TOPOLOGIES_TAGS="3_node_*_link_topo"
;;
+ "2n_dnv")
+ TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n_dnv*.yaml )
+ TOPOLOGIES_TAGS="2_node_single_link_topo"
+ ;;
+ "3n_dnv")
+ TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3n_dnv*.yaml )
+ TOPOLOGIES_TAGS="3_node_single_link_topo"
+ ;;
"3n_hsw")
TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3n_hsw*.yaml )
TOPOLOGIES_TAGS="3_node_single_link_topo"
diff --git a/topologies/available/lf_2n_dnv_testbed26.yaml b/topologies/available/lf_2n_dnv_testbed26.yaml
new file mode 100644
index 0000000000..9b0d1328f3
--- /dev/null
+++ b/topologies/available/lf_2n_dnv_testbed26.yaml
@@ -0,0 +1,52 @@
+---
+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.10"
+ arch: x86_64
+ port: 22
+ username: testuser
+ password: Csit1234
+ interfaces:
+ port1:
+ mac_address: "b4:96:91:46:b3:d4"
+ pci_address: "0000:3b:00.0"
+ driver: ixgbe
+ link: link1
+ model: Intel-X553
+ port2:
+ mac_address: "b4:96:91:46:b3:9c"
+ pci_address: "0000:5e:00.0"
+ driver: ixgbe
+ link: link2
+ model: Intel-X553
+ DUT1:
+ type: DUT
+ host: "10.32.8.11"
+ arch: x86_64
+ port: 22
+ username: testuser
+ password: Csit1234
+ uio_driver: vfio-pci
+ interfaces:
+ port1:
+ mac_address: "ac:1f:6b:57:58:3a"
+ pci_address: "0000:08:00.0"
+ driver: ixgbe
+ link: link1
+ model: Intel-X553
+ port2:
+ mac_address: "ac:1f:6b:57:58:3b"
+ pci_address: "0000:08:00.1"
+ driver: ixgbe
+ link: link2
+ model: Intel-X553
+
diff --git a/topologies/available/lf_3n_dnv_testbed35.yaml b/topologies/available/lf_3n_dnv_testbed35.yaml
new file mode 100644
index 0000000000..da2892fc35
--- /dev/null
+++ b/topologies/available/lf_3n_dnv_testbed35.yaml
@@ -0,0 +1,74 @@
+---
+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.32.8.10"
+ arch: x86_64
+ port: 22
+ username: testuser
+ password: Csit1234
+ interfaces:
+ port1:
+ mac_address: "b4:96:91:46:b2:28"
+ pci_address: "0000:af:00.0"
+ driver: ixgbe
+ link: link1
+ model: Intel-X553
+ port2:
+ mac_address: "b4:96:91:46:ae:3c"
+ pci_address: "0000:d8:00.0"
+ driver: ixgbe
+ link: link2
+ model: Intel-X553
+ DUT1:
+ type: DUT
+ host: "10.32.8.12"
+ arch: x86_64
+ port: 22
+ username: testuser
+ password: Csit1234
+ cryptodev: "0000:01:00.0"
+ uio_driver: vfio-pci
+ interfaces:
+ port1:
+ mac_address: "ac:1f:6b:57:56:c6"
+ pci_address: "0000:08:00.0"
+ driver: ixgbe
+ link: link3
+ model: Intel-X553
+ port2:
+ mac_address: "ac:1f:6b:57:56:c7"
+ pci_address: "0000:08:00.1"
+ driver: ixgbe
+ link: link1
+ model: Intel-X553
+ DUT2:
+ type: DUT
+ host: "10.32.8.13"
+ arch: x86_64
+ port: 22
+ username: testuser
+ password: Csit1234
+ cryptodev: "0000:01:00.0"
+ uio_driver: vfio-pci
+ interfaces:
+ port1:
+ mac_address: "ac:1f:6b:57:57:fe"
+ pci_address: "0000:08:00.0"
+ driver: ixgbe
+ link: link3
+ model: Intel-X553
+ port2:
+ mac_address: "ac:1f:6b:57:57:ff"
+ pci_address: "0000:08:00.1"
+ driver: ixgbe
+ link: link2
+ model: Intel-X553