From 4a6ece4ba912ccf3401739843e3dfe3478a0e4d5 Mon Sep 17 00:00:00 2001
From: Mariusz Wagner <mariusz.wagner@nokia.com>
Date: Tue, 5 Jun 2018 15:54:27 +0200
Subject: Added 4 new TC

Issue-ID: INT-510

Change-Id: Iabc9b4d563fd981d60536e45b62a2286f17cd904
Signed-off-by: Mariusz Wagner <mariusz.wagner@nokia.com>
---
 test/csit/plans/dcaegen2/prh_testsuites/setup.sh    | 17 +++++++++++------
 test/csit/plans/dcaegen2/prh_testsuites/teardown.sh |  3 ++-
 2 files changed, 13 insertions(+), 7 deletions(-)

(limited to 'test/csit/plans/dcaegen2')

diff --git a/test/csit/plans/dcaegen2/prh_testsuites/setup.sh b/test/csit/plans/dcaegen2/prh_testsuites/setup.sh
index 012d4c5d9..279696597 100644
--- a/test/csit/plans/dcaegen2/prh_testsuites/setup.sh
+++ b/test/csit/plans/dcaegen2/prh_testsuites/setup.sh
@@ -4,18 +4,20 @@ source ${SCRIPTS}/common_functions.sh
 
 export PRH_SERVICE="prh"
 export DMAAP_SIMULATOR="dmaap_simulator"
+export AAI_SIMULATOR="aai_simulator"
 
 cd ${WORKSPACE}/test/csit/tests/dcaegen2/prh_testcases/resources/
 
 docker login -u docker -p docker nexus3.onap.org:10003
-docker-compose up -d
+docker-compose up -d --build
 
 # Wait for initialization of Docker containers
 for i in {1..50}; do
 	if [ $(docker inspect --format '{{ .State.Running }}' ${PRH_SERVICE}) ] && \
-	  [ $(docker inspect --format '{{ .State.Running }}' ${DMAAP_SIMULATOR}) ]
+	  [ $(docker inspect --format '{{ .State.Running }}' ${DMAAP_SIMULATOR}) ] && \
+	  [ $(docker inspect --format '{{ .State.Running }}' ${AAI_SIMULATOR}) ]
 	then
-		echo "dmaap_simulator and prh services are running"
+		echo "dmaap_simulator, aai_simulator and prh services are running"
 		break    		
 	else 
 		echo sleep ${i}
@@ -25,26 +27,29 @@ done
 
 PRH_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' ${PRH_SERVICE})
 DMAAP_SIMULATOR_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' ${DMAAP_SIMULATOR})
+AAI_SIMULATOR_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' ${AAI_SIMULATOR})
 
 bypass_ip_adress ${PRH_IP}
 bypass_ip_adress ${DMAAP_SIMULATOR_IP}
+bypass_ip_adress ${AAI_SIMULATOR_IP}
 
 echo PRH_IP=${PRH_IP}
 echo DMAAP_SIMULATOR_IP=${DMAAP_SIMULATOR_IP}
+echo AAI_SIMULATOR_IP=${AAI_SIMULATOR_IP}
 
 # Wait for initialization of docker services
 for i in {1..50}; do
     curl -sS -m 1 localhost:2222 && \
+    curl -sS -m 1 localhost:3333 && \
     curl -sS -m 1 localhost:8100/heartbeat && break
     echo sleep ${i}
     sleep ${i}
 done
 
-#
 docker cp prh:/config/prh_endpoints.json ${WORKDIR}
 sed -i -e 's/"dmaapHostName":.*/"dmaapHostName": "'${DMAAP_SIMULATOR_IP}'",/g' ${WORKDIR}/prh_endpoints.json
-sed -i -e 's/"aaiHost":.*/"aaiHost": "'${DMAAP_SIMULATOR_IP}'",/g' ${WORKDIR}/prh_endpoints.json
+sed -i -e 's/"aaiHost":.*/"aaiHost": "'${AAI_SIMULATOR_IP}'",/g' ${WORKDIR}/prh_endpoints.json
 docker cp ${WORKDIR}/prh_endpoints.json prh:/config/
 
 #Pass any variables required by Robot test suites in ROBOT_VARIABLES
-ROBOT_VARIABLES="-v DMAAP_SIMULATOR:localhost:2222 -v PRH:localhost:8100"
+ROBOT_VARIABLES="-v DMAAP_SIMULATOR:localhost:2222 -v AAI_SIMULATOR:localhost:3333 -v PRH:localhost:8100"
diff --git a/test/csit/plans/dcaegen2/prh_testsuites/teardown.sh b/test/csit/plans/dcaegen2/prh_testsuites/teardown.sh
index 5ff3c6689..bd1e5ba06 100644
--- a/test/csit/plans/dcaegen2/prh_testsuites/teardown.sh
+++ b/test/csit/plans/dcaegen2/prh_testsuites/teardown.sh
@@ -16,4 +16,5 @@
 #
 
 kill-instance.sh prh
-kill-instance.sh dmaap_simulator
\ No newline at end of file
+kill-instance.sh dmaap_simulator
+kill-instance.sh aai_simulator
-- 
cgit 1.2.3-korg