From 93f9ea4da22e9f33285154c774d9b5af6c0818e3 Mon Sep 17 00:00:00 2001
From: Aleksandra Maciaga <aleksandra.maciaga@nokia.com>
Date: Tue, 3 Mar 2020 13:38:58 +0100
Subject: Clean up code

Signed-off-by: Aleksandra Maciaga <aleksandra.maciaga@nokia.com>
Issue-ID: AAF-997
Change-Id: Iaeebbe2e3dbae3d1f6d9374a8d54d28bfd39ff3e
---
 plans/aaf/certservice/docker-compose.yml | 15 ++++++++++++---
 plans/aaf/certservice/setup.sh           | 27 ++++++++++++++++++---------
 2 files changed, 30 insertions(+), 12 deletions(-)

(limited to 'plans')

diff --git a/plans/aaf/certservice/docker-compose.yml b/plans/aaf/certservice/docker-compose.yml
index 84da7353..83aff56b 100644
--- a/plans/aaf/certservice/docker-compose.yml
+++ b/plans/aaf/certservice/docker-compose.yml
@@ -6,10 +6,10 @@ services:
     hostname: cahostname
     container_name: aafcert-ejbca
     ports:
-        - "80:8080"
-        - "443:8443"
+      - "80:8080"
+      - "443:8443"
     volumes:
-        - $SCRIPTS_PATH:/opt/primekey/scripts
+      - $SCRIPTS_PATH:/opt/primekey/scripts
     command: bash -c "
       ./scripts/ejbca-configuration.sh &
       /opt/primekey/bin/start.sh
@@ -19,6 +19,8 @@ services:
       interval: 10s
       timeout: 3s
       retries: 9
+    networks:
+      - certservice
 
   certservice:
     image: nexus3.onap.org:10001/onap/org.onap.aaf.certservice.aaf-certservice-api:latest
@@ -30,4 +32,11 @@ services:
     depends_on:
       ejbca:
         condition: service_healthy
+    networks:
+      - certservice
+
+
+networks:
+  certservice:
+    driver: bridge
 
diff --git a/plans/aaf/certservice/setup.sh b/plans/aaf/certservice/setup.sh
index 4911e475..17a278d8 100644
--- a/plans/aaf/certservice/setup.sh
+++ b/plans/aaf/certservice/setup.sh
@@ -16,24 +16,33 @@
 #
 
 # ------------------------------------
-# Resolve path to script's folder and cmp servers configuration
+# Resolve path to script's directory and cmp servers configuration
 
 SCRIPT=`realpath $0`
 CURRENT_WORKDIR_PATH=`dirname $SCRIPT`
+PROJECT_DIRECTORY="plans/aaf/certservice"
 
 SCRIPTS_DIRECTORY="scripts"
-if test -d "$CURRENT_WORKDIR_PATH/plans/aaf/certservice/$SCRIPTS_DIRECTORY"; then
-    SCRIPTS_PATH="$CURRENT_WORKDIR_PATH/plans/aaf/certservice/$SCRIPTS_DIRECTORY"
-else test -f "$CURRENT_WORKDIR_PATH/$SCRIPTS_DIRECTORY";
-    SCRIPTS_PATH=$CURRENT_WORKDIR_PATH/$SCRIPTS_DIRECTORY
+
+JENKINS_SCRIPTS_PATH="$CURRENT_WORKDIR_PATH/$PROJECT_DIRECTORY/$SCRIPTS_DIRECTORY"
+LOCAL_SCRIPTS_PATH="$CURRENT_WORKDIR_PATH/$SCRIPTS_DIRECTORY"
+
+if test -d "$JENKINS_SCRIPTS_PATH"; then
+    SCRIPTS_PATH=$JENKINS_SCRIPTS_PATH
+else test -f "$LOCAL_SCRIPTS_PATH";
+    SCRIPTS_PATH=$LOCAL_SCRIPTS_PATH
 fi
 echo "Use scripts from: $SCRIPTS_PATH"
 
 CONFIGURATION_FILE="cmpServers.json"
-if test -f "$CURRENT_WORKDIR_PATH/plans/aaf/certservice/$CONFIGURATION_FILE"; then
-    CONFIGURATION_PATH="$CURRENT_WORKDIR_PATH/plans/aaf/certservice/$CONFIGURATION_FILE"
-else test -f "$CURRENT_WORKDIR_PATH/$CONFIGURATION_FILE";
-    CONFIGURATION_PATH=$CURRENT_WORKDIR_PATH/$CONFIGURATION_FILE
+
+JENKINS_CONFIGURATION_PATH="$CURRENT_WORKDIR_PATH/$PROJECT_DIRECTORY/$CONFIGURATION_FILE"
+LOCAL_CONFIGURATION_PATH="$CURRENT_WORKDIR_PATH/$CONFIGURATION_FILE"
+
+if test -f "$JENKINS_CONFIGURATION_PATH"; then
+    CONFIGURATION_PATH="$JENKINS_CONFIGURATION_PATH"
+else test -f "$LOCAL_CONFIGURATION_PATH";
+    CONFIGURATION_PATH=$LOCAL_CONFIGURATION_PATH
 fi
 echo "Use configuration from: $CONFIGURATION_PATH"
 
-- 
cgit 1.2.3-korg