aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--plans/modeling-etsicatalog/sanity-check/setup.sh (renamed from plans/modeling-genericparser/sanity-check/setup.sh)11
-rw-r--r--plans/modeling-etsicatalog/sanity-check/teardown.sh (renamed from plans/modeling-genericparser/sanity-check/teardown.sh)2
-rw-r--r--plans/modeling-etsicatalog/sanity-check/testplan.txt (renamed from plans/modeling-genericparser/sanity-check/testplan.txt)2
-rw-r--r--tests/modeling-etsicatalog/test.robot (renamed from tests/modeling-genericparser/test.robot)12
4 files changed, 14 insertions, 13 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
diff --git a/tests/modeling-genericparser/test.robot b/tests/modeling-etsicatalog/test.robot
index b3da1c0d..26277404 100644
--- a/tests/modeling-genericparser/test.robot
+++ b/tests/modeling-etsicatalog/test.robot
@@ -6,15 +6,15 @@ Library json
*** Variables ***
@{return_ok_list}= 200 201 202
-${queryswagger_url} /api/parser/v1/swagger.json
-${queryVNFPackage_url} /api/parser/v1/vnfpackages
-${queryNSPackages_url} /api/parser/v1/nspackages
-${healthcheck_url} /api/parser/v1/health_check
+${queryswagger_url} /api/catalog/v1/swagger.json
+${queryVNFPackage_url} /api/catalog/v1/vnfpackages
+${queryNSPackages_url} /api/catalog/v1/nspackages
+${healthcheck_url} /api/catalog/v1/health_check
*** Test Cases ***
GetVNFPackages
${headers} Create Dictionary Content-Type=application/json Accept=application/json
- Create Session web_session http://${GenericParser_IP}:8806 headers=${headers}
+ Create Session web_session http://${EtsiCatalog_IP}:8806 headers=${headers}
${resp}= Get Request web_session ${queryVNFPackage_url}
${responese_code}= Convert To String ${resp.status_code}
List Should Contain Value ${return_ok_list} ${responese_code}
@@ -22,7 +22,7 @@ GetVNFPackages
HealthCheckTest
[Documentation] check health for catalog by MSB
${headers} Create Dictionary Content-Type=application/json Accept=application/json
- Create Session web_session http://${GenericParser_IP}:8806 headers=${headers}
+ Create Session web_session http://${EtsiCatalog_IP}:8806 headers=${headers}
${resp}= Get Request web_session ${healthcheck_url}
${responese_code}= Convert To String ${resp.status_code}
List Should Contain Value ${return_ok_list} ${responese_code}