From 04c1c7302c28b0c2201e8fdfb2b1140091df344f Mon Sep 17 00:00:00 2001 From: dyh Date: Tue, 10 Sep 2019 15:42:45 +0800 Subject: update csit test for modeling/etsicatalog project Change-Id: If69c17fb0e7664ae6f24af284833daa46ed32b82 Issue-ID: MODELING-220 Signed-off-by: dyh --- plans/modeling-etsicatalog/sanity-check/setup.sh | 69 ++++++++++++++++++++++ .../modeling-etsicatalog/sanity-check/teardown.sh | 23 ++++++++ .../modeling-etsicatalog/sanity-check/testplan.txt | 3 + plans/modeling-genericparser/sanity-check/setup.sh | 68 --------------------- .../sanity-check/teardown.sh | 23 -------- .../sanity-check/testplan.txt | 3 - 6 files changed, 95 insertions(+), 94 deletions(-) create mode 100644 plans/modeling-etsicatalog/sanity-check/setup.sh create mode 100644 plans/modeling-etsicatalog/sanity-check/teardown.sh create mode 100644 plans/modeling-etsicatalog/sanity-check/testplan.txt delete mode 100644 plans/modeling-genericparser/sanity-check/setup.sh delete mode 100644 plans/modeling-genericparser/sanity-check/teardown.sh delete mode 100644 plans/modeling-genericparser/sanity-check/testplan.txt (limited to 'plans') diff --git a/plans/modeling-etsicatalog/sanity-check/setup.sh b/plans/modeling-etsicatalog/sanity-check/setup.sh new file mode 100644 index 00000000..9157c41d --- /dev/null +++ b/plans/modeling-etsicatalog/sanity-check/setup.sh @@ -0,0 +1,69 @@ +#!/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-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 ${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 EtsiCatalog_IP:${EtsiCatalog_IP} -v MSB_DISCOVERY_IP:${DISCOVERY_IP}" diff --git a/plans/modeling-etsicatalog/sanity-check/teardown.sh b/plans/modeling-etsicatalog/sanity-check/teardown.sh new file mode 100644 index 00000000..1c483cbd --- /dev/null +++ b/plans/modeling-etsicatalog/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-etsicatalog diff --git a/plans/modeling-etsicatalog/sanity-check/testplan.txt b/plans/modeling-etsicatalog/sanity-check/testplan.txt new file mode 100644 index 00000000..47dd50e3 --- /dev/null +++ b/plans/modeling-etsicatalog/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-etsicatalog/test.robot diff --git a/plans/modeling-genericparser/sanity-check/setup.sh b/plans/modeling-genericparser/sanity-check/setup.sh deleted file mode 100644 index 721885db..00000000 --- a/plans/modeling-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/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 deleted file mode 100644 index 3982a1ef..00000000 --- a/plans/modeling-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-genericparser/sanity-check/testplan.txt b/plans/modeling-genericparser/sanity-check/testplan.txt deleted file mode 100644 index 25d2c5d7..00000000 --- a/plans/modeling-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-genericparser/test.robot -- cgit 1.2.3-korg