Test tools update (#69)

1) Set multi-db configuration file path for REST gotests
2) Enable verbose logs in test REST server
3) Fix clish lookup path for test cli

tools/test/cli.sh

@@ -60,7 +60,16 @@ export SHOW_CONFIG_TOOLS=${CLIBUILD}/render-templates
 export CLISH_PATH=${CLIBUILD}/command-tree
 
 # KLISH_BIN can be set to use klish exe and libs from other directory.
-[[ ! -d "${KLISH_BIN}" ]] && KLISH_BIN=${CLIBUILD}
+if [[ -z ${KLISH_BIN} ]]; then
+    if [[ -f ${CLIBUILD}/clish ]]; then
+        KLISH_BIN=${CLIBUILD}
+    elif [[ -f ${BUILDDIR}/target/clish ]]; then
+        KLISH_BIN=${BUILDDIR}/target
+    else
+        echo "Error: could not locate clish."
+        exit 1
+    fi
+fi
 
 PYTHONPATH+=:${CLISOURCE}/actioner
 PYTHONPATH+=:${CLISOURCE}/renderer

tools/test/rest-gotest.sh

@@ -59,6 +59,8 @@ MGMT_COMMON_DIR=$(realpath ${TOPDIR}/../sonic-mgmt-common)
 
 export CVL_SCHEMA_PATH=${MGMT_COMMON_DIR}/build/cvl/schema
 
+export DB_CONFIG_PATH=${MGMT_COMMON_DIR}/tools/test/database_config.json
+
 PKG="github.com/Azure/sonic-mgmt-framework/rest/server"
 DIR="${PWD}"
 

tools/test/rest-server.sh

@@ -79,9 +79,15 @@ for V in $@; do
     case $V in
     -cert|--cert|-cert=*|--cert=*) HAS_CRTFILE=1;;
     -key|--key|-key=*|--key=*) HAS_KEYFILE=1;;
+    -v|--v|-v=*|--v=*) HAS_V=1;;
+    -client_auth|--client_auth) HAS_AUTH=1;;
+    -client_auth=*|--client_auth=*) HAS_AUTH=1;;
     esac
 done
 
+[[ -z ${HAS_V} ]] && EXTRA_ARGS+=" -v 1"
+[[ -z ${HAS_AUTH} ]] && EXTRA_ARGS+=" -client_auth none"
+
 cd $SERVER_DIR
 
 ##