aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Mikus <pmikus@cisco.com>2019-05-14 14:39:56 +0000
committerPeter Mikus <pmikus@cisco.com>2019-05-16 09:10:21 +0000
commit3fc1394954fbb06488e81102cc4cd9965ab15a22 (patch)
treecfc6bf3e9a047794ba1d04210a5cc7031c193c60
parent9a6b6ed77705147032abee3fc98a2f7d370427c0 (diff)
Make topology files read dynamically from directory
Change-Id: Id43c7c299d2e112b6caf00a3d340e6051ab337b6 Signed-off-by: Peter Mikus <pmikus@cisco.com>
-rw-r--r--resources/libraries/bash/function/common.sh30
-rw-r--r--topologies/disabled/README1
-rw-r--r--topologies/disabled/lf_2n_skx_testbed22.yaml (renamed from topologies/available/lf_2n_skx_testbed22.yaml)0
3 files changed, 7 insertions, 24 deletions
diff --git a/resources/libraries/bash/function/common.sh b/resources/libraries/bash/function/common.sh
index bf6adb89f6..921b588cc7 100644
--- a/resources/libraries/bash/function/common.sh
+++ b/resources/libraries/bash/function/common.sh
@@ -772,45 +772,27 @@ function select_topology () {
case_text="${NODENESS}_${FLAVOR}"
case "${case_text}" in
"1n_vbox")
- TOPOLOGIES=(
- "${TOPOLOGIES_DIR}/vpp_device.template"
- )
+ TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*vpp_device*.template )
TOPOLOGIES_TAGS="2_node_single_link_topo"
;;
"1n_skx")
- TOPOLOGIES=(
- "${TOPOLOGIES_DIR}/vpp_device.template"
- )
+ TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*vpp_device*.template )
TOPOLOGIES_TAGS="2_node_single_link_topo"
;;
"2n_skx")
- TOPOLOGIES=(
- "${TOPOLOGIES_DIR}/lf_2n_skx_testbed21.yaml"
- #"${TOPOLOGIES_DIR}/lf_2n_skx_testbed22.yaml"
- "${TOPOLOGIES_DIR}/lf_2n_skx_testbed23.yaml"
- "${TOPOLOGIES_DIR}/lf_2n_skx_testbed24.yaml"
- )
+ TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n_skx*.yaml )
TOPOLOGIES_TAGS="2_node_*_link_topo"
;;
"3n_skx")
- TOPOLOGIES=(
- "${TOPOLOGIES_DIR}/lf_3n_skx_testbed31.yaml"
- "${TOPOLOGIES_DIR}/lf_3n_skx_testbed32.yaml"
- )
+ TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3n_skx*.yaml )
TOPOLOGIES_TAGS="3_node_*_link_topo"
;;
"3n_hsw")
- TOPOLOGIES=(
- "${TOPOLOGIES_DIR}/lf_3n_hsw_testbed1.yaml"
- "${TOPOLOGIES_DIR}/lf_3n_hsw_testbed2.yaml"
- "${TOPOLOGIES_DIR}/lf_3n_hsw_testbed3.yaml"
- )
+ TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3n_hsw*.yaml )
TOPOLOGIES_TAGS="3_node_single_link_topo"
;;
"3n_tsh")
- TOPOLOGIES=(
- "${TOPOLOGIES_DIR}/lf_3n_tsh_testbed33.yaml"
- )
+ TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3n_tsh*.yaml )
TOPOLOGIES_TAGS="3_node_*_link_topo"
;;
*)
diff --git a/topologies/disabled/README b/topologies/disabled/README
new file mode 100644
index 0000000000..4063c771d1
--- /dev/null
+++ b/topologies/disabled/README
@@ -0,0 +1 @@
+Define disabled topologies.
diff --git a/topologies/available/lf_2n_skx_testbed22.yaml b/topologies/disabled/lf_2n_skx_testbed22.yaml
index f048e52486..f048e52486 100644
--- a/topologies/available/lf_2n_skx_testbed22.yaml
+++ b/topologies/disabled/lf_2n_skx_testbed22.yaml