summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Forsyth <jf2512@att.com>2019-03-18 19:58:29 +0000
committerGerrit Code Review <gerrit@onap.org>2019-03-18 19:58:29 +0000
commite18c94a19d3a356050bd0d0cd1a3de61483a971e (patch)
tree28c74900c84e3cd6447e82c3e4de0f1697652527
parent137b8cd260f0a3a66d1b9b0b05777672f7f4b599 (diff)
parent4f13df142990d339811066de744957cd6c75f0e8 (diff)
Merge "Modify updateQueryData to support debugging mode"
-rw-r--r--aai-traversal/src/main/scripts/install/updateQueryData.sh28
1 files changed, 24 insertions, 4 deletions
diff --git a/aai-traversal/src/main/scripts/install/updateQueryData.sh b/aai-traversal/src/main/scripts/install/updateQueryData.sh
index a5723d0..7b5d1b3 100644
--- a/aai-traversal/src/main/scripts/install/updateQueryData.sh
+++ b/aai-traversal/src/main/scripts/install/updateQueryData.sh
@@ -25,6 +25,10 @@ PROGNAME=$(basename $0)
PROJECT_HOME=/opt/app/aai-traversal
OUTFILE=$PROJECT_HOME/logs/misc/${PROGNAME}.log.$(date +\%Y-\%m-\%d)
+if [ "$1" = "--debug" ]; then
+ set -x;
+fi;
+
TS=$(date "+%Y-%m-%d %H:%M:%S")
CHECK_USER="aaiadmin"
@@ -49,7 +53,11 @@ echo "Begin putTool for widget $filename" | tee -a $OUTFILE
vers=`grep model-invariant-id $filepath|cut -d':' -f2|cut -d'"' -f2`
# last parameter will skip put if it exists
resource=service-design-and-creation/models/model/$vers
-$PROJECT_HOME/scripts/putTool.sh $resource $filepath 412 >> $OUTFILE 2>&1 || error_exit "$resource $filepath" $j
+if [ "$1" = "--debug" ]; then
+ bash -x $PROJECT_HOME/scripts/putTool.sh $resource $filepath 412 >> $OUTFILE 2>&1 || error_exit "$resource $filepath" $j
+else
+ $PROJECT_HOME/scripts/putTool.sh $resource $filepath 412 >> $OUTFILE 2>&1 || error_exit "$resource $filepath" $j
+fi;
echo "End putTool for widget $filename" | tee -a $OUTFILE
done
@@ -62,7 +70,11 @@ echo "Begin putTool for named-query $filename" | tee -a $OUTFILE
vers=`grep named-query-uuid $filepath|cut -d':' -f2|cut -d'"' -f2`
# last parameter will skip put if it exists
resource=service-design-and-creation/named-queries/named-query/$vers
-$PROJECT_HOME/scripts/putTool.sh $resource $filepath 412 >> $OUTFILE 2>&1 || error_exit "$resource $filepath" $j
+if [ "$1" = "--debug" ]; then
+ bash -x $PROJECT_HOME/scripts/putTool.sh $resource $filepath 412 >> $OUTFILE 2>&1 || error_exit "$resource $filepath" $j
+else
+ $PROJECT_HOME/scripts/putTool.sh $resource $filepath 412 >> $OUTFILE 2>&1 || error_exit "$resource $filepath" $j
+fi;
echo "End putTool for named-query $filename" | tee -a $OUTFILE
done
@@ -75,7 +87,11 @@ echo "Begin putTool for resource model $filename" | tee -a $OUTFILE
vers=`grep model-invariant-id $filepath|cut -d':' -f2|cut -d'"' -f2`
# last parameter will skip put if it exists
resource=service-design-and-creation/models/model/$vers
-$PROJECT_HOME/scripts/putTool.sh $resource $filepath 412 >> $OUTFILE 2>&1 || error_exit "$resource $filepath" $j
+if [ "$1" = "--debug" ]; then
+ bash -x $PROJECT_HOME/scripts/putTool.sh $resource $filepath 412 >> $OUTFILE 2>&1 || error_exit "$resource $filepath" $j
+else
+ $PROJECT_HOME/scripts/putTool.sh $resource $filepath 412 >> $OUTFILE 2>&1 || error_exit "$resource $filepath" $j
+fi;
echo "End putTool for resource model $filename" | tee -a $OUTFILE
done
@@ -88,7 +104,11 @@ echo "Begin putTool for service model $filename" | tee -a $OUTFILE
vers=`grep model-invariant-id $filepath|cut -d':' -f2|cut -d'"' -f2`
# last parameter will skip put if it exists
resource=service-design-and-creation/models/model/$vers
-$PROJECT_HOME/scripts/putTool.sh $resource $filepath 412 >> $OUTFILE 2>&1 || error_exit "$resource $filepath" $j
+if [ "$1" = "--debug" ]; then
+ bash -x $PROJECT_HOME/scripts/putTool.sh $resource $filepath 412 >> $OUTFILE 2>&1 || error_exit "$resource $filepath" $j
+else
+ $PROJECT_HOME/scripts/putTool.sh $resource $filepath 412 >> $OUTFILE 2>&1 || error_exit "$resource $filepath" $j
+fi;
echo "End putTool for service model $filename" | tee -a $OUTFILE
done