diff options
Diffstat (limited to 'resources/libraries/bash/function')
| -rw-r--r-- | resources/libraries/bash/function/common.sh | 35 |
1 files changed, 31 insertions, 4 deletions
diff --git a/resources/libraries/bash/function/common.sh b/resources/libraries/bash/function/common.sh index 8e8a663679..39b2be4608 100644 --- a/resources/libraries/bash/function/common.sh +++ b/resources/libraries/bash/function/common.sh @@ -455,18 +455,26 @@ function get_test_code () { NODENESS="2n" FLAVOR="skx" ;; - *"2n-zn2"*) - NODENESS="2n" - FLAVOR="zn2" - ;; *"3n-skx"*) NODENESS="3n" FLAVOR="skx" ;; + *"2n-zn2"*) + NODENESS="2n" + FLAVOR="zn2" + ;; *"2n-clx"*) NODENESS="2n" FLAVOR="clx" ;; + *"2n-icx"*) + NODENESS="2n" + FLAVOR="icx" + ;; + *"3n-icx"*) + NODENESS="3n" + FLAVOR="icx" + ;; *"2n-dnv"*) NODENESS="2n" FLAVOR="dnv" @@ -864,6 +872,9 @@ function select_tags () { *"3n-tsh"*) default_nic="nic_intel-x520-da2" ;; + *"3n-icx"* | *"2n-icx"*) + default_nic="nic_intel-xxv710" + ;; *"3n-skx"* | *"2n-skx"* | *"2n-clx"* | *"2n-zn2"*) default_nic="nic_intel-xxv710" ;; @@ -985,6 +996,14 @@ function select_tags () { *"2n-clx"*) test_tag_array+=("!ipsechw") ;; + *"2n-icx"*) + test_tag_array+=("!ipsechw") + ;; + *"3n-icx"*) + test_tag_array+=("!ipsechw") + # Not enough nic_intel-xxv710 to support double link tests. + test_tag_array+=("!3_node_double_link_topoANDnic_intel-xxv710") + ;; *"2n-zn2"*) test_tag_array+=("!ipsechw") ;; @@ -1097,10 +1116,18 @@ function select_topology () { TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3n_skx*.yaml ) TOPOLOGIES_TAGS="3_node_*_link_topo" ;; + "3n_icx") + TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3n_icx*.yaml ) + TOPOLOGIES_TAGS="3_node_*_link_topo" + ;; "2n_clx") TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n_clx*.yaml ) TOPOLOGIES_TAGS="2_node_*_link_topo" ;; + "2n_icx") + TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n_icx*.yaml ) + TOPOLOGIES_TAGS="2_node_*_link_topo" + ;; "2n_dnv") TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n_dnv*.yaml ) TOPOLOGIES_TAGS="2_node_single_link_topo" |