From 34e7fb4754ea0e1f3e279ec78e127ed4646983da Mon Sep 17 00:00:00 2001
From: Ken Moore <moorekou@gmail.com>
Date: Mon, 9 May 2016 09:34:05 -0400
Subject: [PATCH] Fix up the api-test script so that it runs REST requests
 properly (WS disabled for the moment - while REST is enabled)

---
 tests/api-test.sh | 41 +++++++++++++++++++++--------------------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/tests/api-test.sh b/tests/api-test.sh
index 066c21f..4d76aec 100755
--- a/tests/api-test.sh
+++ b/tests/api-test.sh
@@ -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