github-personal/sysadm
1
0
Fork 0
mirror of https://github.com/outbackdingo/sysadm.git synced 2026-01-27 10:20:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix up the api-test script so that it runs REST requests properly (WS disabled for the moment - while REST is enabled)

Browse Source
This commit is contained in:
Ken Moore
2016-05-09 09:34:05 -04:00
parent aa9e7583a7
commit 34e7fb4754
1 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
tests/api-test.sh
View File

@@ -12,8 +12,8 @@
# Default values
DEFUSER="root"
DEFNAMESPACE="sysadm"
DEFCLASS="logs"
DEFACTION="{\"action\":\"read_logs\",\"time_format\":\"relative_second\",\"start_time\":\"-3600\"}"
DEFCLASS="systemmanager"
DEFACTION="{\"action\":\"procinfo\"}"
# Set variable to call jsawk utility
JSAWK="./utils/jsawk -j js24"
@@ -106,29 +106,30 @@ if [ -z "$APITESTPAYLOAD" ] ; then
fi
# Source our resty functions
#. ./utils/resty -W "https://127.0.0.1:12151" -H "Accept: application/json" -H "Content-Type: application/json" -u ${fuser}:${fpass}
. ./utils/resty -W "https://127.0.0.1:12151" -H "Accept: application/json" -H "Content-Type: application/json" -u ${fuser}:${fpass}
# Save output to a file in addition to stdout
#ofile="/tmp/api-response"
#echo "" > /tmp/api-response
ofile="/tmp/api-response"
echo "" > /tmp/api-response
# Check the reply of this REST query
#echo "" | tee -a $ofile
#echo "REST Request:" | tee -a $ofile
#echo "-------------------------------" | tee -a $ofile
#echo "PUT /${namesp}/${name}" | tee -a $ofile
#echo "${payload}" | perl -0007 -MJSON -ne'print to_json(from_json($_, {allow_nonref=>1}),{pretty=>1})."\n"' | tee -a $ofile
echo "" | tee -a $ofile
echo "REST Request:" | tee -a $ofile
echo "-------------------------------" | tee -a $ofile
echo "PUT /${APITESTNAMESPACE}/${APITESTCLASS}" | tee -a $ofile
echo "${APITESTPAYLOAD}" | perl -0007 -MJSON -ne'print to_json(from_json($_, {allow_nonref=>1}),{pretty=>1})."\n"' | tee -a $ofile
#echo "" | tee -a $ofile
#echo "REST Response:" | tee -a $ofile
#echo "-------------------------------" | tee -a $ofile
#PUT /${namesp}/${name} "${payload}" -v -k 2>/tmp/.rstErr | tee -a $ofile
#if [ $? -ne 0 ] ; then
# echo "Failed.. Error output:"
# cat /tmp/.rstErr
#fi
#rm $ofile
#rm /tmp/.rstErr
echo "" | tee -a $ofile
echo "REST Response:" | tee -a $ofile
echo "-------------------------------" | tee -a $ofile
PUT /${APITESTNAMESPACE}/${APITESTCLASS} "${APITESTPAYLOAD}" -v -k #2>/tmp/.rstErr | tee -a $ofile
if [ $? -ne 0 ] ; then
echo "Failed.. Error output:"
cat /tmp/.rstErr
fi
rm $ofile
rm /tmp/.rstErr
exit 0;
# Now check the response via WebSockets
export NODE_TLS_REJECT_UNAUTHORIZED=0