From 3fc1394954fbb06488e81102cc4cd9965ab15a22 Mon Sep 17 00:00:00 2001 From: Peter Mikus Date: Tue, 14 May 2019 14:39:56 +0000 Subject: [PATCH] Make topology files read dynamically from directory Change-Id: Id43c7c299d2e112b6caf00a3d340e6051ab337b6 Signed-off-by: Peter Mikus --- resources/libraries/bash/function/common.sh | 30 +++++----------------- topologies/disabled/README | 1 + .../lf_2n_skx_testbed22.yaml | 0 3 files changed, 7 insertions(+), 24 deletions(-) create mode 100644 topologies/disabled/README rename topologies/{available => disabled}/lf_2n_skx_testbed22.yaml (100%) 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 similarity index 100% rename from topologies/available/lf_2n_skx_testbed22.yaml rename to topologies/disabled/lf_2n_skx_testbed22.yaml -- 2.16.6