X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-cass%2Fcass_init%2Frestore.sh;h=0bf0ea65bf1c4145c6e347d5590c463852949906;hb=HEAD;hp=768cf4c7e38edee8fa5f3333318fa1969e48760d;hpb=4c93571c67abd90c6da8b4ed0d5b93e1fe25887d;p=aaf%2Fauthz.git

diff --git a/auth/auth-cass/cass_init/restore.sh b/auth/auth-cass/cass_init/restore.sh
index 768cf4c7..0bf0ea65 100644
--- a/auth/auth-cass/cass_init/restore.sh
+++ b/auth/auth-cass/cass_init/restore.sh
@@ -4,7 +4,7 @@
 echo `date`
 ENV=DOCKER
 
-CQLSH="/usr/bin/cqlsh -k authz"
+CQLSH="${CQLSH:=/usr/bin/cqlsh} -k authz"
 
 cd dats
 if [ "$*" = "" ]; then
@@ -35,9 +35,13 @@ for T in $DATA; do
     echo $T
     case "$T" in
       # 2.1.14 still has NULL problems for COPY.  Fixed in 2.1.15+
-      "approval"|"artifact"|"cred"|"ns"|"x509"|"role")
+      "approval"|"artifact"|"cred"|"ns"|"x509"|"role"|"notified")
         $CQLSH -e  "truncate $T"
-        UPLOAD="$UPLOAD dats/"$T
+        UPLOAD="$UPLOAD "$T
+        ;;
+      "history")
+        $CQLSH -e "truncate $T"
+        DO_HISTORY=true
         ;;
       *)
         $CQLSH -e  "truncate $T; COPY authz.${T} FROM 'dats/${T}.dat' WITH DELIMITER='|'"
@@ -47,6 +51,12 @@ for T in $DATA; do
 done
 
 if [ ! "$UPLOAD" = "" ]; then
-  java -DCASS_ENV=$ENV -jar aaf-auth-batch-*-full.jar Upload $UPLOAD
+  cd dats
+  java -Dcadi_prop_files=../authBatch.props -DCASS_ENV=$ENV -jar ../aaf-auth-batch-*-full.jar Upload $UPLOAD 2>&1 logs/stdout
+  cd -
+fi
+
+if [ "$DO_HISTORY" = "true" ]; then
+  $CQLSH -e  "COPY authz.history FROM 'dats/history.dat' WITH DELIMITER='|'"
 fi
 echo `date`