X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=plans%2Faaf%2Fcertservice%2Fsetup.sh;h=93d65f7808a9316d9e46ac584dcbc11329461a4d;hb=0f8f41ceb38ffc8cecaadc3b98fb91d7304710e4;hp=17a278d8fb0857c07744b6ad5856feb5f2db9b8e;hpb=93f9ea4da22e9f33285154c774d9b5af6c0818e3;p=integration%2Fcsit.git

diff --git a/plans/aaf/certservice/setup.sh b/plans/aaf/certservice/setup.sh
index 17a278d8..93d65f78 100644
--- a/plans/aaf/certservice/setup.sh
+++ b/plans/aaf/certservice/setup.sh
@@ -27,6 +27,26 @@ SCRIPTS_DIRECTORY="scripts"
 JENKINS_SCRIPTS_PATH="$CURRENT_WORKDIR_PATH/$PROJECT_DIRECTORY/$SCRIPTS_DIRECTORY"
 LOCAL_SCRIPTS_PATH="$CURRENT_WORKDIR_PATH/$SCRIPTS_DIRECTORY"
 
+# ------------------------------------
+#Prepare enviroment for client
+#install docker sdk
+echo "Uninstall docker-py and reinstall docker."
+pip uninstall -y docker-py
+pip uninstall -y docker
+pip install -U docker==2.7.0
+
+#reinstall pyopenssl library
+echo "Reinstall pyopenssl library."
+pip uninstall pyopenssl -y
+pip install pyopenssl==17.5.0
+
+#Disable proxy - for local run
+unset http_proxy https_proxy
+
+#export container name
+export ClientContainerName=CertServiceClient
+# ------------------------------------
+
 if test -d "$JENKINS_SCRIPTS_PATH"; then
     SCRIPTS_PATH=$JENKINS_SCRIPTS_PATH
 else test -f "$LOCAL_SCRIPTS_PATH";
@@ -53,9 +73,23 @@ export SCRIPTS_PATH=${SCRIPTS_PATH}
 
 docker-compose up -d
 
-AAFCERT_IP=`get-instance-ip.sh aafcert`
-export AAFCERT_IP=${AAFCERT_IP}
-
+AAFCERT_IP='none'
 # Wait container ready
-sleep 10
+for i in {1..9}
+do
+   AAFCERT_IP=`get-instance-ip.sh aafcert`
+   RESP_CODE=$(curl -I -s -o /dev/null -w "%{http_code}"  http://${AAFCERT_IP}:8080/actuator/health)
+   if [[ "$RESP_CODE" == '200' ]]; then
+       echo 'AAF Cert Service is ready'
+       export AAFCERT_IP=${AAFCERT_IP}
+       docker exec aafcert-ejbca /opt/primekey/scripts/ejbca-configuration.sh
+       break
+   fi
+   echo 'Waiting for AAF Cert Service to start up...'
+   sleep 30s
+done
 
+if [ "$AAFCERT_IP" == 'none' -o "$AAFCERT_IP" == '' ]; then
+    echo "AAF Cert Service is not ready!"
+    exit 1 # Return error code
+fi