aboutsummaryrefslogtreecommitdiffstats
path: root/resources/libraries/bash/function
diff options
context:
space:
mode:
authorYulong Pei <yulong.pei@intel.com>2019-06-19 22:47:46 +0800
committerPeter Mikus <pmikus@cisco.com>2019-06-20 09:11:14 +0000
commitbf1ea240926ded45d6cc80fec224c7459d669115 (patch)
tree5c8ba76a802f49644e640a9af8be78c17317e0c8 /resources/libraries/bash/function
parent34b3be9de85e2c2fe5a70b0910e40750f799d64c (diff)
Add 2n-dnv and 3n-dnv configuration to bootstrap-verify-perf.sh
Change-Id: I90427de5b611e432e5e46ab8758a31e376215914 Signed-off-by: Yulong Pei <yulong.pei@intel.com>
Diffstat (limited to 'resources/libraries/bash/function')
-rw-r--r--resources/libraries/bash/function/common.sh33
1 files changed, 33 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"