CSIT-310 Use multi-NIC topology files

Change-Id: I749e05e994def43f3749e097b0a6444afa78783e
Signed-off-by: Miroslav Miklus <mmiklus@cisco.com>

diff --git a/bootstrap-verify-perf.sh b/bootstrap-verify-perf.sh
index e58548e..687f533 100755 (executable)
--- a/bootstrap-verify-perf.sh
+++ b/bootstrap-verify-perf.sh
@@ -15,9 +15,9 @@
 set -x
 
 # Space separated list of available testbeds, described by topology files
 set -x
 
 # Space separated list of available testbeds, described by topology files

-TOPOLOGIES="topologies/available/lf_testbed1-X710-X520.yaml \
-            topologies/available/lf_testbed2-X710-X520.yaml \
-            topologies/available/lf_testbed3-X710-X520.yaml"
+TOPOLOGIES="topologies/available/lf_testbed1.yaml \
+            topologies/available/lf_testbed2.yaml \
+            topologies/available/lf_testbed3.yaml"

 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 

diff --git a/bootstrap-vpp-verify-semiweekly.sh b/bootstrap-vpp-verify-semiweekly.sh
index a2da6d3..e7be38c 100644 (file)
--- a/bootstrap-vpp-verify-semiweekly.sh
+++ b/bootstrap-vpp-verify-semiweekly.sh
@@ -273,9 +273,9 @@ set -x
 echo Making a reservation for the HW system...
 
 # Space separated list of available testbeds, described by topology files
 echo Making a reservation for the HW system...
 
 # Space separated list of available testbeds, described by topology files

-TOPOLOGIES="topologies/available/lf_testbed1-X710-X520.yaml \
-            topologies/available/lf_testbed2-X710-X520.yaml \
-            topologies/available/lf_testbed3-X710-X520.yaml"
+TOPOLOGIES="topologies/available/lf_testbed1.yaml \
+            topologies/available/lf_testbed2.yaml \
+            topologies/available/lf_testbed3.yaml"

 
 # Reservation dir
 RESERVATION_DIR="/tmp/reservation_dir"
 
 # Reservation dir
 RESERVATION_DIR="/tmp/reservation_dir"