X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Fbash%2Ffunction%2Fcommon.sh;h=d768e9b66c86d97a52d6215b75826e17fd15eea1;hb=74aa13757057a4c93d62704ad0de7a71c5cf1357;hp=de290ebfff9f0e118b30cfaa64f6f8b17446a8d7;hpb=bf399789b561c84fbfb3012e991eebffa2e44d30;p=csit.git

diff --git a/resources/libraries/bash/function/common.sh b/resources/libraries/bash/function/common.sh
index de290ebfff..d768e9b66c 100644
--- a/resources/libraries/bash/function/common.sh
+++ b/resources/libraries/bash/function/common.sh
@@ -236,9 +236,6 @@ function common_dirs () {
     TOOLS_DIR=$(readlink -e "${RESOURCES_DIR}/tools") || {
         die "Readlink failed."
     }
-    DOC_GEN_DIR=$(readlink -e "${TOOLS_DIR}/doc_gen") || {
-        die "Readlink failed."
-    }
     PYTHON_SCRIPTS_DIR=$(readlink -e "${TOOLS_DIR}/scripts") || {
         die "Readlink failed."
     }
@@ -475,8 +472,12 @@ function get_test_code () {
             NODENESS="3n"
             FLAVOR="icx"
             ;;
-        *"3n-spr"*)
-            NODENESS="3n"
+        *"3na-spr"*)
+            NODENESS="3na"
+            FLAVOR="spr"
+            ;;
+        *"3nb-spr"*)
+            NODENESS="3nb"
             FLAVOR="spr"
             ;;
         *"3n-snr"*)
@@ -868,7 +869,13 @@ function select_tags () {
         *"3n-icx"* | *"2n-icx"*)
             default_nic="nic_intel-xxv710"
             ;;
-        *"3n-spr"* | *"2n-spr"*)
+        *"3na-spr"*)
+            default_nic="nic_mellanox-cx7veat"
+            ;;
+        *"3nb-spr"*)
+            default_nic="nic_intel-e810cq"
+            ;;
+        *"2n-spr"*)
             default_nic="nic_intel-e810cq"
             ;;
         *"2n-clx"* | *"2n-zn2"*)
@@ -1012,7 +1019,10 @@ function select_tags () {
             ;;
         *"3n-snr"*)
             ;;
-        *"3n-spr"*)
+        *"3na-spr"*)
+            test_tag_array+=("!ipsechw")
+            ;;
+        *"3nb-spr"*)
             test_tag_array+=("!ipsechw")
             ;;
         *"3n-tsh"*)
@@ -1110,6 +1120,14 @@ function select_topology () {
             TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3n_icx*.yaml )
             TOPOLOGIES_TAGS="3_node_*_link_topo"
             ;;
+        "3na_spr")
+            TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3na_spr*.yaml )
+            TOPOLOGIES_TAGS="3_node_*_link_topo"
+            ;;
+        "3nb_spr")
+            TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3nb_spr*.yaml )
+            TOPOLOGIES_TAGS="3_node_*_link_topo"
+            ;;
         "2n_clx")
             TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n_clx*.yaml )
             TOPOLOGIES_TAGS="2_node_*_link_topo"