From d6e7b63cc580e7b3822be61fe92a493ad5e222a3 Mon Sep 17 00:00:00 2001 From: "Nelson, Thomas (arthurdent3)" Date: Thu, 9 May 2019 14:16:37 +0000 Subject: Changes Listed below: - Added build version API - Updated Keyspace active to use Properties setting - Update Libraries Netty,jbcrypt,Jackson Databind and log4j - Removed some irrelivant files - Updated some usint tests to ignore some tests(This will be updated soon) - Bugfixes - Missing Values, inform user. - Respond with proper error - Fix Locking Contention issue. - Add locking retry for atomic calls. Change-Id: Ie218dd92edb0c20e4a0efe33eeaaec84e5293c44 Issue-ID: MUSIC-393 Signed-off-by: Nelson, Thomas (arthurdent3) --- distribution/dockermusic/README.md | 48 ---------- distribution/dockermusic/logs/README.md | 1 - distribution/dockermusic/music.sh | 101 --------------------- .../dockermusic/properties/music.properties | 24 ----- 4 files changed, 174 deletions(-) delete mode 100644 distribution/dockermusic/README.md delete mode 100644 distribution/dockermusic/logs/README.md delete mode 100755 distribution/dockermusic/music.sh delete mode 100644 distribution/dockermusic/properties/music.properties (limited to 'distribution/dockermusic') diff --git a/distribution/dockermusic/README.md b/distribution/dockermusic/README.md deleted file mode 100644 index a645ce70..00000000 --- a/distribution/dockermusic/README.md +++ /dev/null @@ -1,48 +0,0 @@ -### Docker Setup for Single instance of MUSIC - -

Please update the properties/music.properties file to fit your env.
-Update the music.sh file.
-The beginning of the music.sh file contains various variables.

-NEXUS_DOCKER_REPO - default REPO - Will read /opt/config/nexus_docker_repo.txt if other is needed.
-CASS_IMG - Cassandra Image
-TOMCAT_IMG - Tomcat Image
-ZK_IMG - Zookeeper Image
-MUSIC_IMG - Music Image containing the MUSIC war file.
-WORK_DIR - Default to PWD.
-CASS_USERNAME - Username for Cassandra - should match cassandra.user in music.properties -file
-CASS_PASSWORD - Password for Cassandra - should match cassandra.password in music.properties.
- -MUSIC Logs will be saved in logs/MUSIC after start of tomcat.
- -```bash -# Start containers -./music.sh start -# Stop containers -./music.sh stop -``` - -If you want to check out Cassandra db with cqlsh. -```bash -docker exec –it music-db bash -#at the prompt youcan run cqlsh as: -cqlsh –u -p -``` - -Zookeeper: - -```bash -docker exec –it music-zk bash -#and then run: -zkCli.sh -``` - -For other logs do
-```bash -docker logs music-tomcat (tomcat)
-``` -to have rolling logs use –f as docker logs –f music-tomcat
-```bash -docker logs music-zk (zookeeper)
-docker logs music-db (Cassandra )
-``` \ No newline at end of file diff --git a/distribution/dockermusic/logs/README.md b/distribution/dockermusic/logs/README.md deleted file mode 100644 index 88c252a7..00000000 --- a/distribution/dockermusic/logs/README.md +++ /dev/null @@ -1 +0,0 @@ -This folder is where the logs will be stored for MUSIC. \ No newline at end of file diff --git a/distribution/dockermusic/music.sh b/distribution/dockermusic/music.sh deleted file mode 100755 index e4c2af8c..00000000 --- a/distribution/dockermusic/music.sh +++ /dev/null @@ -1,101 +0,0 @@ -# -# ------------------------------------------------------------------------- -# Copyright (c) 2017 AT&T Intellectual Property -# -# 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. -# -# ------------------------------------------------------------------------- -# In this example we are building a docker bridge network(music-net) for all -# the containers -# Then we connect the host bridge network(bridge) to the internal network(music-net) -# -# -# -SS=0 -if [ -e /opt/config/nexus_docker_repo.txt ] -then - NEXUS_DOCKER_REPO=$(cat /opt/config/nexus_docker_repo.txt) -else - NEXUS_DOCKER_REPO=nexus3.onap.org:10001 -fi -echo "Using ${NEXUS_DOCKER_REPO} for docker Repo" - -CASS_IMG=${NEXUS_DOCKER_REPO}/onap/music/cassandra_music:latest -MUSIC_IMG=${NEXUS_DOCKER_REPO}/onap/music/music:latest -TOMCAT_IMG=library/tomcat:8.5 -ZK_IMG=library/zookeeper:3.4 -WORK_DIR=${PWD} -CASS_USERNAME=cassandra1 -CASS_PASSWORD=cassandra1 - -if [ "$1" = "start" ]; then - -# Create Volume for mapping war file and tomcat -docker volume create music-vol; - -# Create a network for all the containers to run in. -docker network create music-net; - -# Start Cassandra -docker run -d --rm --name music-db --network music-net \ --p "7000:7000" -p "7001:7001" -p "7199:7199" -p "9042:9042" -p "9160:9160" \ --e CASSUSER=${CASS_USERNAME} \ --e CASSPASS=${CASS_PASSWORD} \ -${CASS_IMG}; - -# Start Music war -docker run -d --rm --name music-war \ --v music-vol:/app \ -${MUSIC_IMG}; - -# Start Zookeeper -docker run -d --rm --name music-zk --network music-net \ --p "2181:2181" -p "2888:2888" -p "3888:3888" \ -${ZK_IMG}; - -# Delay for Cassandra -sleep 20; - -# Start Up tomcat - Needs to have properties,logs dir and war file volume mapped. -docker run -d --rm --name music-tomcat --network music-net -p "8080:8080" \ --v music-vol:/usr/local/tomcat/webapps \ --v ${WORK_DIR}/properties:/opt/app/music/etc:ro \ --v ${WORK_DIR}/logs:/opt/app/music/logs \ -${TOMCAT_IMG}; - -# Connect tomcat to host bridge network so that its port can be seen. -docker network connect bridge music-tomcat; -SS=1; -fi - - -# Shutdown and clean up. -if [ "$1" = "stop" ]; then -docker stop music-war; -docker stop music-db; -docker stop music-zk; -docker stop music-tomcat; -docker network rm music-net; -sleep 5; -docker volume rm music-vol; -SS=1 -fi - -if [ $SS = 0 ]; then - echo "Please type ${0} start or ${0} stop" -fi - - - - - diff --git a/distribution/dockermusic/properties/music.properties b/distribution/dockermusic/properties/music.properties deleted file mode 100644 index d0c50400..00000000 --- a/distribution/dockermusic/properties/music.properties +++ /dev/null @@ -1,24 +0,0 @@ -my.public.ip=localhost -all.public.ips=localhost -my.id=0 -all.ids=0 -####################################### -# Optional current values are defaults -####################################### -zookeeper.host=music-zk -cassandra.host=music-db -#music.ip=localhost -#debug=true -#music.rest.ip=localhost -#lock.lease.period=6000 -cassandra.user=cassandra1 -cassandra.password=cassandra1 -# AAF Endpoint if using AAF -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 - - -- cgit 1.2.3-korg