From c9fc043571b7a4f3d5a1751d2056d36a480df4e5 Mon Sep 17 00:00:00 2001 From: "ying.yunlong" Date: Tue, 12 Sep 2017 11:13:01 +0800 Subject: Add svnfm zte-vmanager-driver csit Change-Id: I6933d13dd9a1794715150562c1e6f0ba393041c4 Issue-ID: VFC-333 Signed-off-by: ying.yunlong --- .../sanity-check/setup.sh | 74 ++++++++++++++++++++++ .../sanity-check/teardown.sh | 24 +++++++ .../sanity-check/testplan.txt | 6 ++ .../plans/vfc-svnfm-huawei/sanity-check/setup.sh | 44 ------------- .../vfc-svnfm-huawei/sanity-check/teardown.sh | 22 ------- .../vfc-svnfm-huawei/sanity-check/testplan.txt | 3 - test/csit/tests/vfc/nfvo-driver-svnfm/huawei.robot | 16 +++++ .../tests/vfc/nfvo-driver-svnfm/ztevmanager.robot | 21 ++++++ test/csit/tests/vfc/svnfm-huawei/test.robot | 16 ----- 9 files changed, 141 insertions(+), 85 deletions(-) create mode 100644 test/csit/plans/vfc-nfvo-driver-vnfm-svnfm/sanity-check/setup.sh create mode 100644 test/csit/plans/vfc-nfvo-driver-vnfm-svnfm/sanity-check/teardown.sh create mode 100644 test/csit/plans/vfc-nfvo-driver-vnfm-svnfm/sanity-check/testplan.txt delete mode 100644 test/csit/plans/vfc-svnfm-huawei/sanity-check/setup.sh delete mode 100644 test/csit/plans/vfc-svnfm-huawei/sanity-check/teardown.sh delete mode 100644 test/csit/plans/vfc-svnfm-huawei/sanity-check/testplan.txt create mode 100644 test/csit/tests/vfc/nfvo-driver-svnfm/huawei.robot create mode 100644 test/csit/tests/vfc/nfvo-driver-svnfm/ztevmanager.robot delete mode 100644 test/csit/tests/vfc/svnfm-huawei/test.robot (limited to 'test') diff --git a/test/csit/plans/vfc-nfvo-driver-vnfm-svnfm/sanity-check/setup.sh b/test/csit/plans/vfc-nfvo-driver-vnfm-svnfm/sanity-check/setup.sh new file mode 100644 index 000000000..de4fbd266 --- /dev/null +++ b/test/csit/plans/vfc-nfvo-driver-vnfm-svnfm/sanity-check/setup.sh @@ -0,0 +1,74 @@ +#!/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 + +source ${SCRIPTS}/common_functions.sh + + +#start msb +docker run -d -p 8500:8500 --name msb_consul consul +MSB_CONSUL_IP=`get-instance-ip.sh msb_consul` +echo MSB_CONSUL_IP=${MSB_CONSUL_IP} +docker run -d -p 10081:10081 -e CONSUL_IP=$MSB_CONSUL_IP --name msb_discovery nexus3.onap.org:10001/onap/msb/msb_discovery +MSB_DISCOVERY_IP=`get-instance-ip.sh msb_discovery` +echo MSB_DISCOVERY_IP=${MSB_DISCOVERY_IP} +docker run -d -p 80:80 -e CONSUL_IP=$MSB_CONSUL_IP -e SDCLIENT_IP=$MSB_DISCOVERY_IP -e "ROUTE_LABELS=visualRange:1" --name msb_internal_apigateway nexus3.onap.org:10001/onap/msb/msb_apigateway +MSB_IAG_IP=`get-instance-ip.sh msb_internal_apigateway` +echo MSB_IAG_IP=${MSB_IAG_IP} + +# Wait for initialization(8500 Consul, 10081 Service Registration & Discovery, 80 api gateway) +for i in {1..10}; do + curl -sS -m 1 ${MSB_CONSUL_IP}:8500 && curl -sS -m 1 ${MSB_DISCOVERY_IP}:10081 && curl -sS -m 1 ${MSB_IAG_IP}:80 && break + echo sleep $i + sleep $i +done + +# wait for container initalization +echo sleep 60 +sleep 60 +# start vfc-ztevmanagerdriver +docker run -d --name vfc-ztevmanagerdriver -e MSB_ADDR=${MSB_DISCOVERY_IP}:10081 nexus3.onap.org:10001/onap/vfc/ztevmanagerdriver +ZTEVMANAGERDRIVER_IP=`get-instance-ip.sh vfc-ztevmanagerdriver` + +docker logs -f vfc-ztevmanagerdriver > vfc-ztevmanagerdriver & +# Wait for initialization +for i in {1..10}; do + curl -sS ${ZTEVMANAGERDRIVER_IP}:8410 && break + echo sleep $i + sleep $i +done +cat vfc-ztevmanagerdriver.log + +echo "================================================" +docker cp vfc-ztevmanagerdriver:/service/vfc/nfvo/driver/vnfm/svnfm/zte/vmanager/docker/docker-entrypoint.sh ./ +cat docker-entrypoint.sh + +echo "================================================" +docker cp vfc-ztevmanagerdriver:/service/vfc/nfvo/driver/vnfm/svnfm/zte/vmanager/docker/instance_config.sh ./ +cat instance_config.sh + +echo "================================================" +docker cp vfc-ztevmanagerdriver:/service/vfc/nfvo/driver/vnfm/svnfm/zte/vmanager/docker/instance_init.sh ./ +cat instance_init.sh + +echo "================================================" +docker cp vfc-ztevmanagerdriver:/service/vfc/nfvo/driver/vnfm/svnfm/zte/vmanager/docker/instance_run.sh ./ +cat instance_run.sh + +# Pass any variables required by Robot test suites in ROBOT_VARIABLES +ROBOT_VARIABLES="-v MSB_IAG_IP:${MSB_IAG_IP} -v MSB_DISCOVERY_IP:${MSB_DISCOVERY_IP} -v ZTEVMANAGERDRIVER_IP:${ZTEVMANAGERDRIVER_IP}" diff --git a/test/csit/plans/vfc-nfvo-driver-vnfm-svnfm/sanity-check/teardown.sh b/test/csit/plans/vfc-nfvo-driver-vnfm-svnfm/sanity-check/teardown.sh new file mode 100644 index 000000000..1020cf1af --- /dev/null +++ b/test/csit/plans/vfc-nfvo-driver-vnfm-svnfm/sanity-check/teardown.sh @@ -0,0 +1,24 @@ +#!/bin/bash +# +# Copyright 2017 Huawei Technologies Co., Ltd. +# +# 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-ztevmanagerdriver + +# kill-instance.sh vfc-svnfm-huawei diff --git a/test/csit/plans/vfc-nfvo-driver-vnfm-svnfm/sanity-check/testplan.txt b/test/csit/plans/vfc-nfvo-driver-vnfm-svnfm/sanity-check/testplan.txt new file mode 100644 index 000000000..e5691f4b8 --- /dev/null +++ b/test/csit/plans/vfc-nfvo-driver-vnfm-svnfm/sanity-check/testplan.txt @@ -0,0 +1,6 @@ +# Test suites are relative paths under [integration.git]/test/csit/tests/. +# Place the suites in run order. + +vfc/nfvo-driver-svnfm/ztevmanager.robot + +# vfc/nfvo-driver-svnfm/huawei.robot diff --git a/test/csit/plans/vfc-svnfm-huawei/sanity-check/setup.sh b/test/csit/plans/vfc-svnfm-huawei/sanity-check/setup.sh deleted file mode 100644 index 18e641a7d..000000000 --- a/test/csit/plans/vfc-svnfm-huawei/sanity-check/setup.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/bash -# -# Copyright 2017 Huawei Technologies Co., Ltd. -# -# 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 nexus3.onap.org:10001/onap/msb/msb_base -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 --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} - -# Start svnfm-huawei -docker run -d --name vfc-svnfm-huawei -e MSB_ADDR=${MSB_IP}:80 nexus3.onap.org:10001/onap/vfc/nfvo/svnfm/huawei -SERVICE_IP=`get-instance-ip.sh vfc-svnfm-huawei` -for i in {1..10}; do - curl -sS ${SERVICE_IP}:8482 && 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 SERVICE_IP:${SERVICE_IP}" diff --git a/test/csit/plans/vfc-svnfm-huawei/sanity-check/teardown.sh b/test/csit/plans/vfc-svnfm-huawei/sanity-check/teardown.sh deleted file mode 100644 index 1679b9b4d..000000000 --- a/test/csit/plans/vfc-svnfm-huawei/sanity-check/teardown.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash -# -# Copyright 2017 Huawei Technologies Co., Ltd. -# -# 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-svnfm-huawei diff --git a/test/csit/plans/vfc-svnfm-huawei/sanity-check/testplan.txt b/test/csit/plans/vfc-svnfm-huawei/sanity-check/testplan.txt deleted file mode 100644 index a6b62b1cb..000000000 --- a/test/csit/plans/vfc-svnfm-huawei/sanity-check/testplan.txt +++ /dev/null @@ -1,3 +0,0 @@ -# Test suites are relative paths under [integration.git]/test/csit/tests/. -# Place the suites in run order. -vfc/svnfm-huawei/test.robot \ No newline at end of file diff --git a/test/csit/tests/vfc/nfvo-driver-svnfm/huawei.robot b/test/csit/tests/vfc/nfvo-driver-svnfm/huawei.robot new file mode 100644 index 000000000..3277e7782 --- /dev/null +++ b/test/csit/tests/vfc/nfvo-driver-svnfm/huawei.robot @@ -0,0 +1,16 @@ +*** settings *** +Library Collections +Library RequestsLibrary +Library simplejson +Library OperatingSystem +Library json +Library HttpLibrary.HTTP + +*** Variables *** +@{return_ok_list}= 200 201 202 +${queryswagger_url} /api/hwvnfm/v1/swagger.json + +*** Test Cases *** +SwaggerFuncTest + [Documentation] query swagger info rest test + Should Be Equal 2.0 2.0 diff --git a/test/csit/tests/vfc/nfvo-driver-svnfm/ztevmanager.robot b/test/csit/tests/vfc/nfvo-driver-svnfm/ztevmanager.robot new file mode 100644 index 000000000..7d7d305b1 --- /dev/null +++ b/test/csit/tests/vfc/nfvo-driver-svnfm/ztevmanager.robot @@ -0,0 +1,21 @@ +*** settings *** +Library Collections +Library RequestsLibrary +Library OperatingSystem +Library json + +*** Variables *** +@{return_ok_list}= 200 201 202 +${queryswagger_url} /api/ztevmanagerdriver/v1/swagger.json + +*** Test Cases *** +VnfresSwaggerTest + [Documentation] query ztevmanagerdriver swagger info rest test + ${headers} Create Dictionary Content-Type=application/json Accept=application/json + Create Session web_session http://${ZTEVMANAGERDRIVER_IP}:8410 headers=${headers} + ${resp}= Get Request web_session ${queryswagger_url} + ${responese_code}= Convert To String ${resp.status_code} + List Should Contain Value ${return_ok_list} ${responese_code} + ${response_json} json.loads ${resp.content} + ${swagger_version}= Convert To String ${response_json['swagger']} + Should Be Equal ${swagger_version} 2.0 diff --git a/test/csit/tests/vfc/svnfm-huawei/test.robot b/test/csit/tests/vfc/svnfm-huawei/test.robot deleted file mode 100644 index 3277e7782..000000000 --- a/test/csit/tests/vfc/svnfm-huawei/test.robot +++ /dev/null @@ -1,16 +0,0 @@ -*** settings *** -Library Collections -Library RequestsLibrary -Library simplejson -Library OperatingSystem -Library json -Library HttpLibrary.HTTP - -*** Variables *** -@{return_ok_list}= 200 201 202 -${queryswagger_url} /api/hwvnfm/v1/swagger.json - -*** Test Cases *** -SwaggerFuncTest - [Documentation] query swagger info rest test - Should Be Equal 2.0 2.0 -- cgit 1.2.3-korg