Old but Existing NFS

[aaf/authz.git] / auth / auth-cass / cass_init / cmd.sh

diff --git a/auth/auth-cass/cass_init/cmd.sh b/auth/auth-cass/cass_init/cmd.sh
index d1e7051..891c891 100644 (file)
--- a/auth/auth-cass/cass_init/cmd.sh
+++ b/auth/auth-cass/cass_init/cmd.sh
@@ -3,6 +3,7 @@
 # Engage normal Cass Init, then check for data installation
 #
 DIR="/opt/app/aaf/status"
+INSTALLED_VERSION=/opt/app/aaf/cass_init/INSTALLED_VERSION
 
 if [ ! -e /aaf_cmd ]; then
   ln -s /opt/app/aaf/cass_init/cmd.sh /aaf_cmd
@@ -61,10 +62,12 @@ function wait_ready {
 function install_cql {
     wait_start started   
     # Now, make sure data exists
-    if [ "$(/usr/bin/cqlsh -e 'describe keyspaces' | grep authz)" = "" ]; then
-      status install 
-      echo "Initializing Cassandra DB" 
-      if [ "`/usr/bin/cqlsh -e 'describe keyspaces' | grep authz`" == "" ]; then
+    if [ ! -e $INSTALLED_VERSION ] && [ -n "$(/usr/bin/cqlsh -e 'describe keyspaces' | grep authz)" ]; then
+      /usr/bin/cqlsh -e 'DROP KEYSPACE authz' 
+    fi
+    if [ -z "`/usr/bin/cqlsh -e 'describe keyspaces' | grep authz`" ]; then
+        status install 
+        echo "Initializing Cassandra DB" 
         echo "Docker Installed Basic Cassandra on aaf_cass.  Executing the following "
         echo "NOTE: This creator provided is only a Single Instance. For more complex Cassandra, create independently"
         echo ""
@@ -79,56 +82,22 @@ function install_cql {
         echo ""
         echo "The following will give you a temporary identity with which to start working, or emergency"
         echo " cqlsh -f temp_identity.cql"
-      fi
+        echo "2.1.15"> $INSTALLED_VERSION
+    else 
+      echo "Cassandra DB already includes 'authz' keyspace"
     fi
     status $1
 }
 
 function install_onap {
-       install_cql initialized
-
-       # Change date expiring dat files to more recent
-       status Creating ONAP Identities
-       ID_FILE=/opt/app/aaf/cass_init/sample.identities.dat    
-       if [ -e $ID_FILE ]; then
-           DATE=$(date "+%Y-%m-%d %H:%M:%S.000+0000" -d "+6 months")
-           echo $DATE
-            CRED="/opt/app/aaf/cass_init/dats/cred.dat"
-            # Enter for People
-            echo "Default Passwords for Apps"
-            for ID in $(grep '|a|' $ID_FILE | sed -e "s/|.*//"); do
-               if [ "$ID" = "aaf" ]; then
-                  DOMAIN="aaf.osaaf.org";
-               else
-                  DOMAIN="$ID.onap.org";
-               fi
-               unset FIRST
-               for D in ${DOMAIN//./ }; do
-                  if [ -z "$FIRST" ]; then
-                    NS="$D"
-                    FIRST="N"
-                  else
-                    NS="$D.$NS"
-                  fi
-               done
-               echo "$ID@$DOMAIN|2|${DATE}|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|$NS|53344|" >> $CRED
-            done
-           
-           # Enter for People
-            for ID in $(grep '|e|' $ID_FILE | sed -e "s/|.*//"); do
-               echo "$ID@people.osaaf.org|2|${DATE}|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.osaaf.people|53344|" >> $CRED
-            done
-
-           # Change UserRole
-           status Setting up User Roles
-            mv dats/user_role.dat tmp
-            sed "s/\(^.*|\)\(.*|\)\(.*|\)\(.*\)/\1${DATE}|\3\4/" tmp > dats/user_role.dat
-
-           # Remove ID File, which is marker for initializing Creds
-            rm $ID_FILE
-        fi
-      status Pushing data to cassandra
-      bash push.sh
+    echo " cd /opt/app/aaf/cass_init"
+    install_cql initialized
+    status prep data for bootstrapping
+    cd /opt/app/aaf/cass_init
+    bash prep.sh
+    status push data to cassandra
+    bash push.sh
+    cd -
     status ready
 }
 
@@ -147,6 +116,7 @@ case "$1" in
 
   ;;
   onap)
+    cd /opt/app/aaf/cass_init
     # start install_onap (which calls install_cql first) in background, waiting for process to start
     install_onap &