X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=deploy_vm1.sh;h=2670d6e1afef0f601b043ab3b83890bb0b7f8349;hb=799470ca439ad6cd16230dbc27b88e9d71627b49;hp=9cd1cf8ec523553b1765a53df1c57ee70117123b;hpb=2a4ac18fe8bd188c153944d8cc0e2c3ebe8558ce;p=aai%2Ftest-config.git

diff --git a/deploy_vm1.sh b/deploy_vm1.sh
index 9cd1cf8..2670d6e 100755
--- a/deploy_vm1.sh
+++ b/deploy_vm1.sh
@@ -9,6 +9,7 @@ fi
 
 export RESOURCES_LOGS="/opt/aai/logroot/AAI-RESOURCES";
 export TRAVERSAL_LOGS="/opt/aai/logroot/AAI-TRAVERSAL";
+export GRAPHADMIN_LOGS="/opt/aai/logroot/AAI-GRAPHADMIN";
 export SEARCH_LOGS="/opt/aai/logroot/AAI-SEARCH";
 export DATA_ROUTER_LOGS="/opt/aai/logroot/AAI-DATA-ROUTER";
 export MODEL_LOADER_LOGS="/opt/aai/logroot/AAI-MODEL-LOADER";
@@ -18,6 +19,12 @@ export CRUD_LOGS="/opt/aai/logroot/AAI-CRUD-SERVICE";
 export SPIKE_LOGS="/opt/aai/logroot/AAI-SPIKE-SERVICE";
 export BABEL_LOGS="/opt/aai/logroot/AAI-BAS";
 
+if [ ! -d "$GRAPHADMIN_LOGS" ];
+then
+    echo "Warning: Unable to find the volume directory $GRAPHADMIN_LOGS so creating it as regular directory";
+    mkdir -p $GRAPHADMIN_LOGS;
+fi;
+
 if [ ! -d "$RESOURCES_LOGS" ];
 then
     echo "Warning: Unable to find the volume directory $RESOURCES_LOGS so creating it as regular directory";
@@ -90,16 +97,17 @@ DMAAP_TOPIC=$(cat /opt/config/dmaap_topic.txt)
 DOCKER_IMAGE_VERSION=$(cat /opt/config/docker_version.txt)
 DOCKER_REGISTRY=${NEXUS_DOCKER_REPO}
 
-RESOURCES_DOCKER_IMAGE_VERSION=1.2.2
-TRAVERSAL_DOCKER_IMAGE_VERSION=1.2.2
-SEARCH_DATA_SERVICE_DOCKER_IMAGE_VERSION=1.2.1
-DATA_ROUTER_DOCKER_IMAGE_VERSION=1.2.2
-MODEL_LOADER_DOCKER_IMAGE_VERSION=1.2.1
-SPARKY_BE_DOCKER_IMAGE_VERSION=1.2.1
-CHAMP_DOCKER_IMAGE_VERSION=1.2.3
-GIZMO_DOCKER_IMAGE_VERSION=1.2.0
-SPIKE_DOCKER_IMAGE_VERSION=1.2.0
-BABEL_DOCKER_IMAGE_VERSION=1.2.0
+RESOURCES_DOCKER_IMAGE_VERSION=1.3-STAGING-latest
+TRAVERSAL_DOCKER_IMAGE_VERSION=1.3-STAGING-latest
+GRAPHADMIN_DOCKER_IMAGE_VERSION=1.0-STAGING-latest
+SEARCH_DATA_SERVICE_DOCKER_IMAGE_VERSION=1.3-STAGING-latest
+DATA_ROUTER_DOCKER_IMAGE_VERSION=1.3-STAGING-latest
+MODEL_LOADER_DOCKER_IMAGE_VERSION=1.3-STAGING-latest
+SPARKY_BE_DOCKER_IMAGE_VERSION=1.3-STAGING-latest
+CHAMP_DOCKER_IMAGE_VERSION=1.3-STAGING-latest
+GIZMO_DOCKER_IMAGE_VERSION=1.3-STAGING-latest
+SPIKE_DOCKER_IMAGE_VERSION=1.0-STAGING-latest
+BABEL_DOCKER_IMAGE_VERSION=1.3-STAGING-latest
 
 docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
 
@@ -142,6 +150,9 @@ function check_if_user_exists(){
         }
 }
 
+docker pull ${DOCKER_REGISTRY}/onap/aai-graphadmin:${GRAPHADMIN_DOCKER_IMAGE_VERSION};
+docker tag $DOCKER_REGISTRY/onap/aai-graphadmin:${GRAPHADMIN_DOCKER_IMAGE_VERSION} $DOCKER_REGISTRY/onap/aai-graphadmin:latest;
+
 docker pull ${DOCKER_REGISTRY}/onap/aai-resources:${RESOURCES_DOCKER_IMAGE_VERSION};
 docker tag $DOCKER_REGISTRY/onap/aai-resources:$RESOURCES_DOCKER_IMAGE_VERSION $DOCKER_REGISTRY/onap/aai-resources:latest;
 
@@ -190,12 +201,16 @@ fi;
 chown -R $USER_ID:$USER_ID $RESOURCE_LOGS $TRAVERSAL_LOGS;
 chown -R 341790:492381 $BABEL_LOGS;
 
-$DOCKER_COMPOSE_CMD run --rm aai-resources.api.simpledemo.onap.org createDBSchema.sh
+$DOCKER_COMPOSE_CMD run --rm aai-graphadmin.api.simpledemo.onap.org createDBSchema.sh
+
+GRAPHADMIN_CONTAINER_NAME=$($DOCKER_COMPOSE_CMD up -d aai-graphadmin.api.simpledemo.onap.org 2>&1 | grep 'Creating' | grep -v 'volume' | grep -v 'network' | awk '{ print $2; }' | head -1);
+wait_for_container $GRAPHADMIN_CONTAINER_NAME 'GraphAdmin Microservice Started';
+
+# Deploy haproxy and traversal at the same time for traversal to make updateQuery against resources using haproxy
 
 RESOURCES_CONTAINER_NAME=$($DOCKER_COMPOSE_CMD up -d aai-resources.api.simpledemo.onap.org 2>&1 | grep 'Creating' | grep -v 'volume' | grep -v 'network' | awk '{ print $2; }' | head -1);
 wait_for_container $RESOURCES_CONTAINER_NAME 'Resources Microservice Started';
 
-# Deploy haproxy and traversal at the same time for traversal to make updateQuery against resources using haproxy
 $DOCKER_COMPOSE_CMD up -d aai-traversal.api.simpledemo.onap.org aai.api.simpledemo.onap.org
 
 sleep 3;
@@ -215,5 +230,3 @@ $DOCKER_COMPOSE_CMD up -d spike-service
 $DOCKER_COMPOSE_CMD up -d babel
 
 echo "A&AI Microservices are successfully started";
-
-crontab < /opt/test-config/aaicrontab