X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Fbash%2Ffunction%2Fcommon.sh;h=b0eaf6cd252cb073abc10e39b9045839bb1b0d42;hp=2f15762da556fda341f772cd6fe537e2449a2fc3;hb=3c3930b9f6f9a40d6b30f6e56e8c40279e34f650;hpb=e62ade12b7c9918cda2d363387ed0f517aa9840d diff --git a/resources/libraries/bash/function/common.sh b/resources/libraries/bash/function/common.sh index 2f15762da5..b0eaf6cd25 100644 --- a/resources/libraries/bash/function/common.sh +++ b/resources/libraries/bash/function/common.sh @@ -465,6 +465,10 @@ function get_test_code () { NODENESS="3n" FLAVOR="dnv" ;; + *"2n-tx2"*) + NODENESS="2n" + FLAVOR="tx2" + ;; *"3n-tsh"*) NODENESS="3n" FLAVOR="tsh" @@ -796,7 +800,7 @@ function select_tags () { *"3n-skx"* | *"2n-skx"* | *"2n-clx"* | *"2n-zn2"*) default_nic="nic_intel-xxv710" ;; - *"3n-hsw"* | *"mrr-daily-master") + *"3n-hsw"* | *"2n-tx2"* | *"mrr-daily-master") default_nic="nic_intel-xl710" ;; *) @@ -809,7 +813,7 @@ function select_tags () { awk_nics_sub_cmd+='gsub("xxv710","25ge2p1xxv710");' awk_nics_sub_cmd+='gsub("x710","10ge2p1x710");' awk_nics_sub_cmd+='gsub("xl710","40ge2p1xl710");' - awk_nics_sub_cmd+='gsub("x520","10ge2p1x520");' + awk_nics_sub_cmd+='gsub("x520-da2","10ge2p1x520");' awk_nics_sub_cmd+='gsub("x553","10ge2p1x553");' awk_nics_sub_cmd+='gsub("cx556a","10ge2p1cx556a");' awk_nics_sub_cmd+='gsub("vic1227","10ge2p1vic1227");' @@ -904,6 +908,9 @@ function select_tags () { test_tag_array+=("!vts") test_tag_array+=("!drv_avf") ;; + *"2n-tx2"*) + test_tag_array+=("!ipsechw") + ;; *"3n-dnv"*) test_tag_array+=("!memif") test_tag_array+=("!srv6_proxy") @@ -1032,6 +1039,10 @@ function select_topology () { TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3n_tsh*.yaml ) TOPOLOGIES_TAGS="3_node_single_link_topo" ;; + "2n_tx2") + TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n_tx2*.yaml ) + TOPOLOGIES_TAGS="2_node_single_link_topo" + ;; *) # No falling back to 3n_hsw default, that should have been done # by the function which has set NODENESS and FLAVOR.