X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-cass%2Fcass_init%2Fcmd.sh;h=98194e089f90bc1895a341fcc6cbfd850f4d3cdd;hb=7a1817bf3cf3c40c6c33f673ddc46c3f115cc3bc;hp=ec8cf6b7dbcbe0419d3b688eb731c12d88f1f900;hpb=a93911399b464aba33c072eb0a994e50a6691b7e;p=aaf%2Fauthz.git

diff --git a/auth/auth-cass/cass_init/cmd.sh b/auth/auth-cass/cass_init/cmd.sh
index ec8cf6b7..98194e08 100644
--- a/auth/auth-cass/cass_init/cmd.sh
+++ b/auth/auth-cass/cass_init/cmd.sh
@@ -1,8 +1,29 @@
 #!/bin/bash 
+#########
+#  ============LICENSE_START====================================================
+#  org.onap.aaf
+#  ===========================================================================
+#  Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
+#  ===========================================================================
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+#  ============LICENSE_END====================================================
+#
 #
 # Engage normal Cass Init, then check for data installation
 #
 DIR="/opt/app/aaf/status"
+INSTALLED_VERSION=/var/lib/cassandra/AAF_VERSION
+AAF_INIT_DATA=/var/lib/cassandra/AAF_INIT_DATA
 
 if [ ! -e /aaf_cmd ]; then
   ln -s /opt/app/aaf/cass_init/cmd.sh /aaf_cmd
@@ -61,10 +82,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,20 +102,28 @@ 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 "casablanca" > $INSTALLED_VERSION
+    else 
+      echo "Cassandra DB already includes 'authz' keyspace"
     fi
     status $1
 }
 
 function install_onap {
     echo " cd /opt/app/aaf/cass_init"
-    cd /opt/app/aaf/cass_init
     install_cql initialized
-    status prep data for bootstrapping
-    bash prep.sh
-    status push data to cassandra
-    bash push.sh
-    cd -
+    if [ -e "$AAF_INIT_DATA" ]; then 
+       echo "AAF Data already initialized on this Cassandra"
+    else 
+      status prep data for bootstrapping
+      cd /opt/app/aaf/cass_init
+      status prep data 
+      bash prep.sh
+      status push data to cassandra
+      bash push.sh
+      cd -
+      echo $(date) > $AAF_INIT_DATA
+    fi
     status ready
 }
 
@@ -111,6 +142,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 &