commit 95097c2a4d7f3ecbc22b01f7aad69736d49beb02
author Bilal A <bilal@research.att.com> Fri Apr 12 22:38:32 2019 +0000
committer Bilal A <bilal@research.att.com> Mon Apr 15 15:39:20 2019 +0000
tree 48dde87fe3f914914d69fe7977de0f221001368b
parent 5ab8a07212f71a31da81b9a65f88eeb5c52d7b9b

DB Connection Setup for API and PAP for CSIT

1) Adds CSIT Test for API
2) Adds a mariadb container setup and configuration for API.
3) Adds a mariadb container setup and configuration for PAP.

Change-Id: I9beea4f2445215bc95962ebceb4ec626dd0d5521
Issue-ID: POLICY-1270
Signed-off-by: Bilal A <bilal@research.att.com>

plans/policy/pap/setup.sh

diff --git a/plans/policy/pap/setup.sh b/plans/policy/pap/setup.sh
index 44a205a..2d31b9c 100644
--- a/plans/policy/pap/setup.sh
+++ b/plans/policy/pap/setup.sh
@@ -17,15 +17,35 @@
 # SPDX-License-Identifier: Apache-2.0
 # ============LICENSE_END=========================================================
 
-docker run -d --name policy-pap -p 6969:6969 -it nexus3.onap.org:10001/onap/policy-pap:2.0.0-SNAPSHOT-latest
+echo "Uninstall docker-py and reinstall docker."
+pip uninstall -y docker-py
+pip uninstall -y docker
+pip install -U docker==2.7.0
+
+# Adding this waiting container due to race condition between pap and mariadb
+docker-compose -f ${WORKSPACE}/scripts/policy/docker-compose-pap.yml run --rm start_dependencies
+docker-compose -f ${WORKSPACE}/scripts/policy/docker-compose-pap.yml up -d
+sleep 3
 
 POLICY_PAP_IP=`get-instance-ip.sh policy-pap`
+MARIADB_IP=`get-instance-ip.sh mariadb`
+
 echo PAP IP IS ${POLICY_PAP_IP}
+echo MARIADB IP IS ${MARIADB_IP}
 # Wait for initialization
 for i in {1..10}; do
+   curl -sS ${MARIADB_IP}:3306 && break
+   echo sleep $i
+   sleep $i
+done
+for i in {1..10}; do
    curl -sS ${POLICY_PAP_IP}:6969 && break
    echo sleep $i
    sleep $i
 done
 
+#Configure the database
+docker exec -it mariadb  chmod +x /docker-entrypoint-initdb.d/db.sh
+docker exec -it mariadb  /docker-entrypoint-initdb.d/db.sh
+
 ROBOT_VARIABLES="-v POLICY_PAP_IP:${POLICY_PAP_IP}"

plans/policy/pap/teardown.sh

diff --git a/plans/policy/pap/teardown.sh b/plans/policy/pap/teardown.sh
index 877b164..8798697 100644
--- a/plans/policy/pap/teardown.sh
+++ b/plans/policy/pap/teardown.sh
@@ -18,3 +18,5 @@
 # ============LICENSE_END=========================================================
 
 kill-instance.sh policy-pap
+kill-instance.sh mariadb
+kill-instance.sh policy-wait