From 5f6b56855f325efb70212b3949d844f3a5c2856b Mon Sep 17 00:00:00 2001 From: yangyan Date: Fri, 26 Apr 2019 09:21:58 +0800 Subject: update parser robot test Issue-ID: MODELING-156 Change-Id: I414fd1e5dad62b21af500c018cac272911ce9018 Signed-off-by: yangyan --- plans/modeling-genericparser/sanity-check/setup.sh | 68 ++++++++++++++++++++++ .../sanity-check/teardown.sh | 23 ++++++++ .../sanity-check/testplan.txt | 3 + .../sanity-check/setup.sh | 68 ---------------------- .../sanity-check/teardown.sh | 23 -------- .../sanity-check/testplan.txt | 3 - tests/modeling-genericparser/test.robot | 31 ++++++++++ .../modeling-toscaparsers-genericparser/test.robot | 31 ---------- 8 files changed, 125 insertions(+), 125 deletions(-) create mode 100644 plans/modeling-genericparser/sanity-check/setup.sh create mode 100644 plans/modeling-genericparser/sanity-check/teardown.sh create mode 100644 plans/modeling-genericparser/sanity-check/testplan.txt delete mode 100644 plans/modeling-toscaparsers-genericparser/sanity-check/setup.sh delete mode 100644 plans/modeling-toscaparsers-genericparser/sanity-check/teardown.sh delete mode 100644 plans/modeling-toscaparsers-genericparser/sanity-check/testplan.txt create mode 100644 tests/modeling-genericparser/test.robot delete mode 100644 tests/modeling-toscaparsers-genericparser/test.robot diff --git a/plans/modeling-genericparser/sanity-check/setup.sh b/plans/modeling-genericparser/sanity-check/setup.sh new file mode 100644 index 00000000..721885db --- /dev/null +++ b/plans/modeling-genericparser/sanity-check/setup.sh @@ -0,0 +1,68 @@ +#!/bin/bash +# +# Copyright 2017 ZTE Corporation. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# Place the scripts in run order: +# Start all process required for executing test case + +#login to the onap nexus docker repo +docker login -u docker -p docker nexus3.onap.org:10001 + +# start msb +docker run -d -p 8500:8500 --name msb_consul consul:0.9.3 +CONSUL_IP=`get-instance-ip.sh msb_consul` +echo CONSUL_IP=${CONSUL_IP} + +docker run -d -p 10081:10081 -e CONSUL_IP=$CONSUL_IP --name msb_discovery nexus3.onap.org:10001/onap/msb/msb_discovery +DISCOVERY_IP=`get-instance-ip.sh msb_discovery` +echo DISCOVERY_IP=${DISCOVERY_IP} + +docker run -d -p 80:80 -e CONSUL_IP=$CONSUL_IP -e SDCLIENT_IP=$DISCOVERY_IP -e "ROUTE_LABELS=visualRange:1" --name msb_internal_apigateway nexus3.onap.org:10001/onap/msb/msb_apigateway +MSB_IP==`get-instance-ip.sh msb_internal_apigateway` +echo MSB_IP=${MSB_IP} + +docker run -d -p 3306:3306 --name vfc-db -v /var/lib/mysql nexus3.onap.org:10001/onap/vfc/db +VFC_DB_IP=`get-instance-ip.sh vfc-db` +echo VFC_DB_IP=${VFC_DB_IP} + +# Wait for initialization(8500 Consul, 10081 Service Registration & Discovery, 80 api gateway) +for i in {1..10}; do + curl -sS -m 1 ${CONSUL_IP}:8500 && curl -sS -m 1 ${DISCOVERY_IP}:10081 && curl -sS -m 1 ${MSB_IP}:80 && break + echo sleep $i + sleep $i +done + +# Wait for initialization(3306 DB) +for i in {1..3}; do + curl -sS -m 1 ${VFC_DB_IP}:3306 && break + echo sleep $i + sleep $i +done + +# Need some time so service info can be synced from discovery to api gateway +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` +for i in {1..10}; do + curl -sS -m 1 ${GenericParser_IP}:8806 && break + echo sleep $i + sleep $i +done + +# 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}" diff --git a/plans/modeling-genericparser/sanity-check/teardown.sh b/plans/modeling-genericparser/sanity-check/teardown.sh new file mode 100644 index 00000000..3982a1ef --- /dev/null +++ b/plans/modeling-genericparser/sanity-check/teardown.sh @@ -0,0 +1,23 @@ +#!/bin/bash +# +# Copyright 2017 ZTE Corporation. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# This script is sourced by run-csit.sh after Robot test completion. +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 diff --git a/plans/modeling-genericparser/sanity-check/testplan.txt b/plans/modeling-genericparser/sanity-check/testplan.txt new file mode 100644 index 00000000..25d2c5d7 --- /dev/null +++ b/plans/modeling-genericparser/sanity-check/testplan.txt @@ -0,0 +1,3 @@ +# Test suites are relative paths under [integration/csit.git]/tests/. +# Place the suites in run order. +modeling-genericparser/test.robot diff --git a/plans/modeling-toscaparsers-genericparser/sanity-check/setup.sh b/plans/modeling-toscaparsers-genericparser/sanity-check/setup.sh deleted file mode 100644 index 1ca35bef..00000000 --- a/plans/modeling-toscaparsers-genericparser/sanity-check/setup.sh +++ /dev/null @@ -1,68 +0,0 @@ -#!/bin/bash -# -# Copyright 2017 ZTE Corporation. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# Place the scripts in run order: -# Start all process required for executing test case - -#login to the onap nexus docker repo -docker login -u docker -p docker nexus3.onap.org:10001 - -# start msb -docker run -d -p 8500:8500 --name msb_consul consul:0.9.3 -CONSUL_IP=`get-instance-ip.sh msb_consul` -echo CONSUL_IP=${CONSUL_IP} - -docker run -d -p 10081:10081 -e CONSUL_IP=$CONSUL_IP --name msb_discovery nexus3.onap.org:10001/onap/msb/msb_discovery -DISCOVERY_IP=`get-instance-ip.sh msb_discovery` -echo DISCOVERY_IP=${DISCOVERY_IP} - -docker run -d -p 80:80 -e CONSUL_IP=$CONSUL_IP -e SDCLIENT_IP=$DISCOVERY_IP -e "ROUTE_LABELS=visualRange:1" --name msb_internal_apigateway nexus3.onap.org:10001/onap/msb/msb_apigateway -MSB_IP==`get-instance-ip.sh msb_internal_apigateway` -echo MSB_IP=${MSB_IP} - -docker run -d -p 3306:3306 --name vfc-db -v /var/lib/mysql nexus3.onap.org:10001/onap/vfc/db -VFC_DB_IP=`get-instance-ip.sh vfc-db` -echo VFC_DB_IP=${VFC_DB_IP} - -# Wait for initialization(8500 Consul, 10081 Service Registration & Discovery, 80 api gateway) -for i in {1..10}; do - curl -sS -m 1 ${CONSUL_IP}:8500 && curl -sS -m 1 ${DISCOVERY_IP}:10081 && curl -sS -m 1 ${MSB_IP}:80 && break - echo sleep $i - sleep $i -done - -# Wait for initialization(3306 DB) -for i in {1..3}; do - curl -sS -m 1 ${VFC_DB_IP}:3306 && break - echo sleep $i - sleep $i -done - -# Need some time so service info can be synced from discovery to api gateway -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 -GenericParser_IP=`get-instance-ip.sh modeling-genericparser` -for i in {1..10}; do - curl -sS -m 1 ${GenericParser_IP}:8806 && break - echo sleep $i - sleep $i -done - -# 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}" diff --git a/plans/modeling-toscaparsers-genericparser/sanity-check/teardown.sh b/plans/modeling-toscaparsers-genericparser/sanity-check/teardown.sh deleted file mode 100644 index 3982a1ef..00000000 --- a/plans/modeling-toscaparsers-genericparser/sanity-check/teardown.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash -# -# Copyright 2017 ZTE Corporation. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# This script is sourced by run-csit.sh after Robot test completion. -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 diff --git a/plans/modeling-toscaparsers-genericparser/sanity-check/testplan.txt b/plans/modeling-toscaparsers-genericparser/sanity-check/testplan.txt deleted file mode 100644 index 13456aed..00000000 --- a/plans/modeling-toscaparsers-genericparser/sanity-check/testplan.txt +++ /dev/null @@ -1,3 +0,0 @@ -# Test suites are relative paths under [integration/csit.git]/tests/. -# Place the suites in run order. -modeling-toscaparsers-genericparser/test.robot diff --git a/tests/modeling-genericparser/test.robot b/tests/modeling-genericparser/test.robot new file mode 100644 index 00000000..fb4601a3 --- /dev/null +++ b/tests/modeling-genericparser/test.robot @@ -0,0 +1,31 @@ +*** settings *** +Library Collections +Library RequestsLibrary +Library OperatingSystem +Library json + +*** Variables *** +@{return_ok_list}= 200 201 202 +${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://${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} + +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} + ${resp}= Get Request web_session ${healthcheck_url} + ${responese_code}= Convert To String ${resp.status_code} + List Should Contain Value ${return_ok_list} ${responese_code} + ${response_json} json.loads ${resp.content} + ${health_status}= Convert To String ${response_json['status']} + Should Be Equal ${health_status} active diff --git a/tests/modeling-toscaparsers-genericparser/test.robot b/tests/modeling-toscaparsers-genericparser/test.robot deleted file mode 100644 index b83bee47..00000000 --- a/tests/modeling-toscaparsers-genericparser/test.robot +++ /dev/null @@ -1,31 +0,0 @@ -*** settings *** -Library Collections -Library RequestsLibrary -Library OperatingSystem -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 - -*** Test Cases *** -GetVNFPackages - ${headers} Create Dictionary Content-Type=application/json Accept=application/json - Create Session web_session http://${CATALOG_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 - [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} - ${resp}= Get Request web_session ${healthcheck_url} - ${responese_code}= Convert To String ${resp.status_code} - List Should Contain Value ${return_ok_list} ${responese_code} - ${response_json} json.loads ${resp.content} - ${health_status}= Convert To String ${response_json['status']} - Should Be Equal ${health_status} active -- cgit 1.2.3-korg