X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fsample%2Fcass_data%2Fscrub.sh;h=2bf12d14e12c177637434077f9e8a2ced4c6277f;hb=cdf53cfe6903670884e983463375077ea7e8d470;hp=df4d670fbee971665014d76f5536a93d1381cd71;hpb=94053613671f7456ea5114a8421d0e6868bdbba0;p=aaf%2Fauthz.git

diff --git a/auth/sample/cass_data/scrub.sh b/auth/sample/cass_data/scrub.sh
index df4d670f..2bf12d14 100644
--- a/auth/sample/cass_data/scrub.sh
+++ b/auth/sample/cass_data/scrub.sh
@@ -1,4 +1,23 @@
 #!/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====================================================
+#
 # 
 # Copies of Repo data need to be added to "dats" dir for loading by push.sh
 #
@@ -16,16 +35,16 @@ ID_FILE=../data/sample.identities.dat
 
 if [ -e $ID_FILE ]; then
   if [ "$(uname -s)" = "Darwin" ]; then 
-    DATE=$(date "+%Y-%m-%d %H:%M:%S.000+0000" -v "+6m")
+    DATE=$(date -v "+6m" "+%Y-%m-%d %H:%M:%S.000+0000")
   else 
     DATE=$(date "+%Y-%m-%d %H:%M:%S.000+0000" -d "+6 months")
   fi
   echo $DATE
 
-
   #### CRED
   # Enter for People
   CRED="cred.dat"
+  rm cred.dat
   echo "Create default Passwords for all Identities in $CRED"
   for ID in $(grep '|a|' $ID_FILE | sed -e "s/|.*//"); do
      if [ "$ID" = "aaf" ]; then
@@ -49,18 +68,26 @@ if [ -e $ID_FILE ]; then
      echo "$ID@people.osaaf.org|2|${DATE}|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.osaaf.people|53344|" >> $CRED
   done
 
-
   ##### USER_ROLE
   echo "Scrubbing user_roles not in $ID_FILE"
+
+  ## Covering for when scrubbing in cass_init versus a Backup
+  if [ -d "dats" ]; then
+    for D in ns ns_attrib perm role config artifact; do 
+      if [ -e "dats/$D.dat" ]; then
+         cp dats/$D.dat .
+      fi
+    done
+  else
+    mkdir -p dats
+    cp user_role.dat dats
+    REMOVE_DATS=true
+  fi  
   > user_role.dat
   for ID in $(grep -v "#" $ID_FILE | awk -F\| '{print $1}' | grep -v "^$"); do
       grep "$ID@" dats/user_role.dat >> user_role.dat
   done
 
-  for D in ns ns_attrib perm role config artifact; do 
-      cp dats/$D.dat .
-  done
-
   UR="$(mktemp)"
   DUR="$(mktemp)"
 
@@ -75,7 +102,9 @@ if [ -e $ID_FILE ]; then
   mv user_role.dat tmp
   sed "s/\(^.*|\)\(.*|\)\(.*|\)\(.*\)/\1${DATE}|\3\4/" tmp > user_role.dat 
   rm tmp
-
+  if [ -n "$REMOVE_DATS" ]; then
+     rm -Rf dats
+  fi
 else
     echo $0 requires access to $ID_FILE
 fi