Fixes for Taishan testbed

[csit.git] / resources / libraries / bash / function / common.sh

diff --git a/resources/libraries/bash/function/common.sh b/resources/libraries/bash/function/common.sh
index 7da8020..2445a5d 100644 (file)
--- a/resources/libraries/bash/function/common.sh
+++ b/resources/libraries/bash/function/common.sh
@@ -556,17 +556,23 @@ function select_tags () {
     # - TAGS - Array of processed tag boolean expressions.
 
     # NIC SELECTION
-    # All topologies NICs
-    available=$(grep -hoPR "model: \K.*" "${TOPOLOGIES_DIR}"/* | sort -u)
-    # Selected topology NICs
-    reserved=$(grep -hoPR "model: \K.*" "${WORKING_TOPOLOGY}" | sort -u)
-    # All topologies NICs - Selected topology NICs
+    start_pattern='^  TG:'
+    end_pattern='^ \? \?[A-Za-z0-9]\+:'
+    # Remove the TG section from topology file
+    sed_command="/${start_pattern}/,/${end_pattern}/d"
+    # All topologies DUT NICs
+    available=$(sed "${sed_command}" "${TOPOLOGIES_DIR}"/* \
+                | grep -hoP "model: \K.*" | sort -u)
+    # Selected topology DUT NICs
+    reserved=$(sed "${sed_command}" "${WORKING_TOPOLOGY}" \
+               | grep -hoP "model: \K.*" | sort -u)
+    # All topologies DUT NICs - Selected topology DUT NICs
     exclude_nics=($(comm -13 <(echo "${reserved}") <(echo "${available}")))
 
     # Select default NIC
     case "${TEST_CODE}" in
         *"3n-tsh"*)
-            DEFAULT_NIC='nic_intel-82599es'
+            DEFAULT_NIC='nic_intel-x520-da2'
             ;;
         *)
             DEFAULT_NIC='nic_intel-x710'
@@ -707,6 +713,10 @@ function select_tags () {
             ;;
         *"3n-tsh"*)
             test_tag_array+=("!ipsechw")
+            test_tag_array+=("!memif")
+            test_tag_array+=("!srv6_proxy")
+            test_tag_array+=("!vhost")
+            test_tag_array+=("!vts")
             ;;
         *)
             # Default to 3n-hsw due to compatibility.