Merge "update csit test for modeling/etsicatalog project"

3 files changed, 8 insertions, 7 deletions

diff --git a/plans/modeling-genericparser/sanity-check/setup.sh b/plans/modeling-etsicatalog/sanity-check/setup.sh
index 721885db..9157c41d 100644
--- a/plans/modeling-genericparser/sanity-check/setup.sh
+++ b/plans/modeling-etsicatalog/sanity-check/setup.sh
@@ -55,14 +55,15 @@ done
 echo sleep 60
 sleep 60
 
-# start modeling-genericparser
-docker run -d --name modeling-genericparser -v /var/lib/mysql -e MSB_ADDR=${DISCOVERY_IP}:10081 -e MYSQL_ADDR=${VFC_DB_IP}:3306 nexus3.onap.org:10001/onap/modeling/genericparser
-GenericParser_IP=`get-instance-ip.sh modeling-genericparser`
+# start modeling-etsicatalog
+docker run -d --name modeling-etsicatalog -v /var/lib/mysql -e MSB_ADDR=${DISCOVERY_IP}:10081 -e MYSQL_ADDR=${VFC_DB_IP}:3306 nexus3.onap.org:10001/onap/modeling/etsicatalog
+EtsiCatalog_IP=`get-instance-ip.sh modeling-etsicatalog`
 for i in {1..10}; do
-    curl -sS -m 1 ${GenericParser_IP}:8806 && break
+    curl -sS -m 1 ${EtsiCatalog_IP}:8806 && break
     echo sleep $i
     sleep $i
 done
+docker logs modeling-etsicatalog
 
 # Pass any variables required by Robot test suites in ROBOT_VARIABLES
-ROBOT_VARIABLES="-v MSB_IP:${MSB_IP} -v GenericParser_IP:${GenericParser_IP} -v MSB_DISCOVERY_IP:${DISCOVERY_IP}"
+ROBOT_VARIABLES="-v MSB_IP:${MSB_IP} -v EtsiCatalog_IP:${EtsiCatalog_IP} -v MSB_DISCOVERY_IP:${DISCOVERY_IP}"
diff --git a/plans/modeling-genericparser/sanity-check/teardown.sh b/plans/modeling-etsicatalog/sanity-check/teardown.sh
index 3982a1ef..1c483cbd 100644
--- a/plans/modeling-genericparser/sanity-check/teardown.sh
+++ b/plans/modeling-etsicatalog/sanity-check/teardown.sh
@@ -20,4 +20,4 @@ kill-instance.sh msb_internal_apigateway
 kill-instance.sh msb_discovery
 kill-instance.sh msb_consul
 kill-instance.sh vfc-db
-kill-instance.sh modeling-genericparser
+kill-instance.sh modeling-etsicatalog
diff --git a/plans/modeling-genericparser/sanity-check/testplan.txt b/plans/modeling-etsicatalog/sanity-check/testplan.txt
index 25d2c5d7..47dd50e3 100644
--- a/plans/modeling-genericparser/sanity-check/testplan.txt
+++ b/plans/modeling-etsicatalog/sanity-check/testplan.txt
@@ -1,3 +1,3 @@
 # Test suites are relative paths under [integration/csit.git]/tests/.
 # Place the suites in run order.
-modeling-genericparser/test.robot
+modeling-etsicatalog/test.robot