diff options
| -rw-r--r-- | plans/modeling-genericparser/sanity-check/setup.sh (renamed from plans/modeling-toscaparsers-genericparser/sanity-check/setup.sh) | 2 | ||||
| -rw-r--r-- | plans/modeling-genericparser/sanity-check/teardown.sh (renamed from plans/modeling-toscaparsers-genericparser/sanity-check/teardown.sh) | 0 | ||||
| -rw-r--r-- | plans/modeling-genericparser/sanity-check/testplan.txt (renamed from plans/modeling-toscaparsers-genericparser/sanity-check/testplan.txt) | 2 | ||||
| -rw-r--r-- | tests/modeling-genericparser/test.robot (renamed from tests/modeling-toscaparsers-genericparser/test.robot) | 14 |
4 files changed, 9 insertions, 9 deletions
diff --git a/plans/modeling-toscaparsers-genericparser/sanity-check/setup.sh b/plans/modeling-genericparser/sanity-check/setup.sh index 1ca35bef..721885db 100644 --- a/plans/modeling-toscaparsers-genericparser/sanity-check/setup.sh +++ b/plans/modeling-genericparser/sanity-check/setup.sh @@ -56,7 +56,7 @@ 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/vfc/catalog +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` for i in {1..10}; do curl -sS -m 1 ${GenericParser_IP}:8806 && break diff --git a/plans/modeling-toscaparsers-genericparser/sanity-check/teardown.sh b/plans/modeling-genericparser/sanity-check/teardown.sh index 3982a1ef..3982a1ef 100644 --- a/plans/modeling-toscaparsers-genericparser/sanity-check/teardown.sh +++ b/plans/modeling-genericparser/sanity-check/teardown.sh diff --git a/plans/modeling-toscaparsers-genericparser/sanity-check/testplan.txt b/plans/modeling-genericparser/sanity-check/testplan.txt index 13456aed..25d2c5d7 100644 --- a/plans/modeling-toscaparsers-genericparser/sanity-check/testplan.txt +++ b/plans/modeling-genericparser/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-toscaparsers-genericparser/test.robot +modeling-genericparser/test.robot diff --git a/tests/modeling-toscaparsers-genericparser/test.robot b/tests/modeling-genericparser/test.robot index b83bee47..fb4601a3 100644 --- a/tests/modeling-toscaparsers-genericparser/test.robot +++ b/tests/modeling-genericparser/test.robot @@ -6,23 +6,23 @@ Library json *** Variables *** @{return_ok_list}= 200 201 202 -${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 +${queryswagger_url} /api/genericparser/v1/swagger.json +${queryVNFPackage_url} /api/parser/v1/vnfpackages +${queryNSPackages_url} /api/parser/v1/nspackages +${healthcheck_url} /api/parser/v1/health_check *** Test Cases *** GetVNFPackages ${headers} Create Dictionary Content-Type=application/json Accept=application/json - Create Session web_session http://${CATALOG_IP}:8806 headers=${headers} + Create Session web_session http://${GenericParser_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} -CatalogHealthCheckTest +HealthCheckTest [Documentation] check health for catalog by MSB ${headers} Create Dictionary Content-Type=application/json Accept=application/json - Create Session web_session http://${CATALOG_IP}:8806 headers=${headers} + Create Session web_session http://${GenericParser_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} |