Push variuos changes

- Spring Boot
- Cadi
- Cassandra Locking

Change-Id: Ie9882f81f0ca141bdb7862cdabf978481fcd7c4a
Issue-ID: MUSIC-296,MUSIC-272
Signed-off-by: Nelson,Thomas(tn1381)(arthurdent3) <tn1381@att.com>

7 files changed, 89 insertions, 64 deletions

diff --git a/distribution/cassandra/docker-entrypoint.sh b/distribution/cassandra/docker-entrypoint.sh
index 20bf272f..a42d498e 100644
--- a/distribution/cassandra/docker-entrypoint.sh
+++ b/distribution/cassandra/docker-entrypoint.sh
@@ -1,13 +1,6 @@
 #!/bin/bash
 set -e
 
-# Removal for issues with Kubernetes - Need to make sure any injected files 
-# Are chown 664 or ID is smae ID as Cassandra in Container. 
-#for f in /docker-entrypoint-initdb.d/*.cql; do
-#    chown cassandra.root "$f"
-#done
-
-
 # first arg is `-f` or `--some-option`
 # or there are no args
 if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then
@@ -20,18 +13,30 @@ if [ "$1" = 'cassandra' -a "$(id -u)" = '0' ]; then
     exec gosu cassandra "$BASH_SOURCE" "$@"
 fi
 
+_ip_address() {
+    # scrape the first non-localhost IP address of the container
+    # in Swarm Mode, we often get two IPs -- the container IP, and the (shared) VIP, and the container IP should always be first
+    ip address | awk '
+        $1 == "inet" && $NF != "lo" {
+            gsub(/\/.+$/, "", $2)
+            print $2
+            exit
+        }
+    '
+}
+
 if [ "$1" = 'cassandra' ]; then
     : ${CASSANDRA_RPC_ADDRESS='0.0.0.0'}
 
     : ${CASSANDRA_LISTEN_ADDRESS='auto'}
     if [ "$CASSANDRA_LISTEN_ADDRESS" = 'auto' ]; then
-        CASSANDRA_LISTEN_ADDRESS="$(hostname --ip-address)"
+        CASSANDRA_LISTEN_ADDRESS="$(_ip_address)"
     fi
 
     : ${CASSANDRA_BROADCAST_ADDRESS="$CASSANDRA_LISTEN_ADDRESS"}
 
     if [ "$CASSANDRA_BROADCAST_ADDRESS" = 'auto' ]; then
-        CASSANDRA_BROADCAST_ADDRESS="$(hostname --ip-address)"
+        CASSANDRA_BROADCAST_ADDRESS="$(_ip_address)"
     fi
     : ${CASSANDRA_BROADCAST_RPC_ADDRESS:=$CASSANDRA_BROADCAST_ADDRESS}
 
@@ -68,8 +73,23 @@ if [ "$1" = 'cassandra' ]; then
     done
 fi
 
-echo "Updating username and password"
-for f in /docker-entrypoint-initdb.d/music*.cql; do
+echo "#############################################"
+echo "############## Update music.cql #############"
+echo "#############################################"
+
+for f in /docker-entrypoint-initdb.d/a_music.cql; do
+    if [ "${MUSIC_REPLICATION_CLASS}" ]; then
+        sed -ri 's/REPLICATION_CLASS/'${MUSIC_REPLICATION_CLASS}'/' "$f"
+    fi
+    if [ "${MUSIC_REPLICATION_FACTOR}" ]; then
+        sed -ri 's/REPLICATION_FACTOR/'${MUSIC_REPLICATION_FACTOR}'/' "$f"
+    fi
+done
+
+echo "#############################################"
+echo "######Updating username and password  #######"
+echo "#############################################"
+for f in /docker-entrypoint-initdb.d/b_pw.cql; do
     if [ "${CASSUSER}" ]; then
         sed -ri 's/CASSUSER/'${CASSUSER}'/' "$f"
     fi
@@ -77,20 +97,39 @@ for f in /docker-entrypoint-initdb.d/music*.cql; do
         sed -ri 's/CASSPASS/'${CASSPASS}'/' "$f"
     fi
 done
-echo "Updating username and password - Complete"
-
 
-
-
-echo "################################ Let run cql's ##############################"
+echo "#############################################"
+echo "############## Let run cql's ################"
+echo "#############################################"
 for f in /docker-entrypoint-initdb.d/*; do
-    
     case "$f" in
-        *.cql)
-            echo "$0: running $f" && until cqlsh -u cassandra -p cassandra -f "$f"; do >&2 echo "Cassandra is unavailable - sleeping"; sleep 2; done & ;;
+        *zzz*.cql)
+            echo "$0: running $f" && until $AM && cqlsh -u ${CASSUSER} -p ${CASSPASS} -f "$f"; 
+            do >&2 echo "Cassandra is unavailable - sleeping [${f}] $C";let C=C+1; sleep 5; done & ;;
+        *a_music.cql)
+            echo "$0: running $f" && until $PW && cqlsh -u ${CASSUSER} -p ${CASSPASS} -f "$f" && AM=true; 
+            do >&2 echo "Cassandra is unavailable - sleeping [${f}] $D";let D=D+1; sleep 5; done & ;;
+        *b_pw.cql)
+            echo "$0: running $f" && until cqlsh -u cassandra -p cassandra -f "$f" && PW=true;
+            do >&2 echo "Cassandra is unavailable - sleeping [${f}] $E";let E=E+1; sleep 5; done & ;;
         *)        echo "$0: ignoring $f" ;;
     esac
+
     echo
 done
 
-exec "$@"
+
+echo "#############################################"
+echo "########### Running Password CQL ############"
+echo "#############################################"
+
+#echo "$0: running $f" && 
+#until cqlsh -u cassandra -p cassandra -f /pw.cql; 
+#do >&2 echo "Cassandra is unavailable - sleeping"; sleep 10; done
+
+echo "#############################################"
+echo "########### Cassandra Running ###############"
+echo "#############################################"
+
+
+exec "$@"
\ No newline at end of file
diff --git a/distribution/cassandra/music.cql b/distribution/cassandra/music.cql
deleted file mode 100644
index d991a514..00000000
--- a/distribution/cassandra/music.cql
+++ /dev/null
@@ -1,20 +0,0 @@
-CREATE KEYSPACE admin
-    WITH REPLICATION = {
-        'class' : 'SimpleStrategy',
-        'replication_factor': 1
-    }
-    AND DURABLE_WRITES = true;
- 
-CREATE TABLE admin.keyspace_master (
-    uuid uuid,
-    keyspace_name text,
-    application_name text,
-    is_api boolean,
-    password text,
-    username text,
-    is_aaf boolean,
-    PRIMARY KEY (uuid)
-);
-
-CREATE USER nelson24 WITH PASSWORD ‘winman123’ SUPERUSER;
-ALTER USER cassandra WITH PASSWORD ‘SomeLongRandomStringNoonewillthinkof’;
diff --git a/distribution/cassandra/music_single.cql b/distribution/cassandra/music_single.cql
deleted file mode 100644
index b8a60cd1..00000000
--- a/distribution/cassandra/music_single.cql
+++ /dev/null
@@ -1,20 +0,0 @@
-CREATE KEYSPACE IF NOT EXISTS admin
-    WITH REPLICATION = {
-        'class' : 'SimpleStrategy',
-        'replication_factor': 1
-    }
-    AND DURABLE_WRITES = true;
- 
-CREATE TABLE IF NOT EXISTS admin.keyspace_master (
-    uuid uuid,
-    keyspace_name text,
-    application_name text,
-    is_api boolean,
-    password text,
-    username text,
-    is_aaf boolean,
-    PRIMARY KEY (uuid)
-);
-
-CREATE ROLE IF NOT EXISTS CASSUSER WITH PASSWORD = 'CASSPASS' AND SUPERUSER = True AND LOGIN = True;
-ALTER ROLE cassandra WITH PASSWORD = 'SomeLongRandomStringNoonewillthinkof';
diff --git a/distribution/dockermusic/music.sh b/distribution/dockermusic/music.sh
index b7a66f1e..e4c2af8c 100755
--- a/distribution/dockermusic/music.sh
+++ b/distribution/dockermusic/music.sh
@@ -24,9 +24,9 @@
 SS=0
 if [ -e /opt/config/nexus_docker_repo.txt ]
 then
-	NEXUS_DOCKER_REPO=$(cat /opt/config/nexus_docker_repo.txt)
+    NEXUS_DOCKER_REPO=$(cat /opt/config/nexus_docker_repo.txt)
 else
-	NEXUS_DOCKER_REPO=nexus3.onap.org:10001
+    NEXUS_DOCKER_REPO=nexus3.onap.org:10001
 fi
 echo "Using ${NEXUS_DOCKER_REPO} for docker Repo"
 
@@ -92,7 +92,7 @@ SS=1
 fi
 
 if [ $SS = 0 ]; then
-	echo "Please type ${0} start or ${0} stop"
+    echo "Please type ${0} start or ${0} stop"
 fi
 
 
diff --git a/distribution/dockermusic/properties/music.properties b/distribution/dockermusic/properties/music.properties
index 65378d8c..d0c50400 100644
--- a/distribution/dockermusic/properties/music.properties
+++ b/distribution/dockermusic/properties/music.properties
@@ -14,6 +14,11 @@ cassandra.host=music-db
 cassandra.user=cassandra1
 cassandra.password=cassandra1
 # AAF Endpoint if using AAF
-aaf.endpoint.url=https://aaf.api.simpledemo.onap.org
+aaf.endpoint.url=https://aafist.test.att.com:8095/proxy/authz/nss/
+#aaf.endpoint.url=https://aaf.api.simpledemo.onap.org
+# Admin API
+aaf.admin.url=https://aafist.test.att.com:8095/proxy/authz/users/
+admin.aaf.role=com.att.music.api.admin_api
+music.namespace=com.att.music.api
 
 
diff --git a/distribution/music/Dockerfile b/distribution/music/Dockerfile
new file mode 100644
index 00000000..b82b72a4
--- /dev/null
+++ b/distribution/music/Dockerfile
@@ -0,0 +1,11 @@
+FROM openjdk:8
+LABEL purpose="Springboot for MUSIC"
+RUN apt update && apt install -y netcat telnet vim vim-common
+RUN groupadd --gid 1000 music && useradd --gid 1000 --uid 1000 music
+RUN mkdir -p /opt/app/music 
+COPY MUSIC.jar /opt/app/music
+RUN mkdir -p /opt/app/music/logs && \
+    chown -R music:music /opt/app/music/
+USER music:music
+WORKDIR /opt/app/music
+CMD ["/bin/bash","-c","java -jar MUSIC.jar >> /opt/app/music/logs/music-sb.log 2>&1"]
diff --git a/distribution/music/build.sh b/distribution/music/build.sh
new file mode 100644
index 00000000..21e45268
--- /dev/null
+++ b/distribution/music/build.sh
@@ -0,0 +1,10 @@
+if [ "${1}" ]; then
+
+docker build -t dockercentral.it.att.com:5100/com.att.music/music-sb:${1} .
+docker tag dockercentral.it.att.com:5100/com.att.music/music-sb:${1} dockercentral.it.att.com:5100/com.att.music/music-sb:latest
+docker push dockercentral.it.att.com:5100/com.att.music/music-sb:latest
+docker push dockercentral.it.att.com:5100/com.att.music/music-sb:${1}
+else
+echo "Missing version"
+
+fi