From 4f2dde707f9baed3641b7aec48b7d08f13b025e4 Mon Sep 17 00:00:00 2001 From: dyh Date: Tue, 21 Jul 2020 11:13:13 +0800 Subject: Remove csit related to components which are not in Guilin Release Issue-ID: VFC-1711 Change-Id: I470ace63ed193dc5806368405e5e72c8479fc0d8 Signed-off-by: dyh --- plans/vfc-nfvo-driver-ems/sanity-check/setup.sh | 62 --------------- plans/vfc-nfvo-driver-ems/sanity-check/teardown.sh | 22 ------ .../vfc-nfvo-driver-ems/sanity-check/testplan.txt | 3 - plans/vfc-nfvo-driver-sfc/sanity-check/setup.sh | 62 --------------- plans/vfc-nfvo-driver-sfc/sanity-check/teardown.sh | 22 ------ .../vfc-nfvo-driver-sfc/sanity-check/testplan.txt | 3 - plans/vfc-nfvo-multivimproxy/sanity-check/setup.sh | 44 ----------- .../sanity-check/teardown.sh | 22 ------ .../sanity-check/testplan.txt | 3 - plans/vfc-nfvo-resmanagement/sanity-check/setup.sh | 44 ----------- .../sanity-check/teardown.sh | 22 ------ .../sanity-check/testplan.txt | 3 - plans/vfc-nfvo-wfengine/sanity-check/setup.sh | 91 ---------------------- plans/vfc-nfvo-wfengine/sanity-check/teardown.sh | 29 ------- plans/vfc-nfvo-wfengine/sanity-check/testplan.txt | 4 - 15 files changed, 436 deletions(-) delete mode 100755 plans/vfc-nfvo-driver-ems/sanity-check/setup.sh delete mode 100755 plans/vfc-nfvo-driver-ems/sanity-check/teardown.sh delete mode 100644 plans/vfc-nfvo-driver-ems/sanity-check/testplan.txt delete mode 100755 plans/vfc-nfvo-driver-sfc/sanity-check/setup.sh delete mode 100755 plans/vfc-nfvo-driver-sfc/sanity-check/teardown.sh delete mode 100644 plans/vfc-nfvo-driver-sfc/sanity-check/testplan.txt delete mode 100644 plans/vfc-nfvo-multivimproxy/sanity-check/setup.sh delete mode 100644 plans/vfc-nfvo-multivimproxy/sanity-check/teardown.sh delete mode 100644 plans/vfc-nfvo-multivimproxy/sanity-check/testplan.txt delete mode 100644 plans/vfc-nfvo-resmanagement/sanity-check/setup.sh delete mode 100644 plans/vfc-nfvo-resmanagement/sanity-check/teardown.sh delete mode 100644 plans/vfc-nfvo-resmanagement/sanity-check/testplan.txt delete mode 100644 plans/vfc-nfvo-wfengine/sanity-check/setup.sh delete mode 100644 plans/vfc-nfvo-wfengine/sanity-check/teardown.sh delete mode 100644 plans/vfc-nfvo-wfengine/sanity-check/testplan.txt (limited to 'plans') diff --git a/plans/vfc-nfvo-driver-ems/sanity-check/setup.sh b/plans/vfc-nfvo-driver-ems/sanity-check/setup.sh deleted file mode 100755 index d381f8f3..00000000 --- a/plans/vfc-nfvo-driver-ems/sanity-check/setup.sh +++ /dev/null @@ -1,62 +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 - -source ${SCRIPTS}/common_functions.sh - -#start msb -docker run -d -p 8500:8500 --name msb_consul consul:0.9.3 -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 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 - -# Need some time so service info can be synced from discovery to api gateway -echo sleep 60 -sleep 60 - -# start vfc-emsdriver -docker run -d --name vfc-emsdriver -e MSB_ADDR=${MSB_IAG_IP}:80 nexus3.onap.org:10001/onap/vfc/emsdriver -EMS_DRV_IP=`get-instance-ip.sh vfc-emsdriver` -docker logs -f vfc-emsdriver > emsdriver.log & - -# Wait for initialization -for i in {1..10}; do - curl -sS -m 1 ${EMS_DRV_IP}:8206 && break - echo sleep $i - sleep $i -done - -echo "===============" -cat emsdriver.log - -# Pass any variables required by Robot test suites in ROBOT_VARIABLES -ROBOT_VARIABLES="-v MSB_IAG_IP:${MSB_IAG_IP} -v EMS_DRV_IP:${EMS_DRV_IP}" diff --git a/plans/vfc-nfvo-driver-ems/sanity-check/teardown.sh b/plans/vfc-nfvo-driver-ems/sanity-check/teardown.sh deleted file mode 100755 index aa676b2f..00000000 --- a/plans/vfc-nfvo-driver-ems/sanity-check/teardown.sh +++ /dev/null @@ -1,22 +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-emsdriver diff --git a/plans/vfc-nfvo-driver-ems/sanity-check/testplan.txt b/plans/vfc-nfvo-driver-ems/sanity-check/testplan.txt deleted file mode 100644 index cb2a8026..00000000 --- a/plans/vfc-nfvo-driver-ems/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. -vfc/nfvo-driver-ems/test.robot diff --git a/plans/vfc-nfvo-driver-sfc/sanity-check/setup.sh b/plans/vfc-nfvo-driver-sfc/sanity-check/setup.sh deleted file mode 100755 index 85a3e69f..00000000 --- a/plans/vfc-nfvo-driver-sfc/sanity-check/setup.sh +++ /dev/null @@ -1,62 +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 - -source ${SCRIPTS}/common_functions.sh - -#start msb -docker run -d -p 8500:8500 --name msb_consul consul:0.9.3 -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 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 - -# Need some time so service info can be synced from discovery to api gateway -echo sleep 60 -sleep 60 - -# start vfc-ztesdncdriver -docker run -d --name vfc-ztesdncdriver -e MSB_ADDR=${MSB_IAG_IP}:80 nexus3.onap.org:10001/onap/vfc/ztesdncdriver -SFC_DRV_IP=`get-instance-ip.sh vfc-ztesdncdriver` -docker logs -f vfc-ztesdncdriver > ztesdncdriver.log & - -# Wait for initialization -for i in {1..10}; do - curl -sS -m 1 ${SFC_DRV_IP}:8411 && break - echo sleep $i - sleep $i -done - -echo "===============================" -cat ztesdncdriver.log - -# Pass any variables required by Robot test suites in ROBOT_VARIABLES -ROBOT_VARIABLES="-v MSB_IAG_IP:${MSB_IAG_IP} -v SFC_DRV_IP:${SFC_DRV_IP}" diff --git a/plans/vfc-nfvo-driver-sfc/sanity-check/teardown.sh b/plans/vfc-nfvo-driver-sfc/sanity-check/teardown.sh deleted file mode 100755 index ce5402ef..00000000 --- a/plans/vfc-nfvo-driver-sfc/sanity-check/teardown.sh +++ /dev/null @@ -1,22 +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-ztesdncdriver diff --git a/plans/vfc-nfvo-driver-sfc/sanity-check/testplan.txt b/plans/vfc-nfvo-driver-sfc/sanity-check/testplan.txt deleted file mode 100644 index 3fa996f6..00000000 --- a/plans/vfc-nfvo-driver-sfc/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. -vfc/nfvo-driver-sfc/test.robot diff --git a/plans/vfc-nfvo-multivimproxy/sanity-check/setup.sh b/plans/vfc-nfvo-multivimproxy/sanity-check/setup.sh deleted file mode 100644 index 4d97f33e..00000000 --- a/plans/vfc-nfvo-multivimproxy/sanity-check/setup.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/bash -# -# Copyright 2018 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 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 --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 resmgr -docker run -d --name vfc-multivimproxy -e MSB_ADDR=${MSB_IP}:80 nexus3.onap.org:10001/onap/vfc/multivimproxy -RESMGR_IP=`get-instance-ip.sh vfc-multivimproxy` -for i in {1..20}; do - curl -sS ${RESMGR_IP}:8486 && 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 RESMGR_IP:${RESMGR_IP}" diff --git a/plans/vfc-nfvo-multivimproxy/sanity-check/teardown.sh b/plans/vfc-nfvo-multivimproxy/sanity-check/teardown.sh deleted file mode 100644 index c158d199..00000000 --- a/plans/vfc-nfvo-multivimproxy/sanity-check/teardown.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash -# -# Copyright 2018 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-multivimproxy diff --git a/plans/vfc-nfvo-multivimproxy/sanity-check/testplan.txt b/plans/vfc-nfvo-multivimproxy/sanity-check/testplan.txt deleted file mode 100644 index 5d1c6e9d..00000000 --- a/plans/vfc-nfvo-multivimproxy/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. -vfc/nfvo-multivimproxy/test.robot \ No newline at end of file diff --git a/plans/vfc-nfvo-resmanagement/sanity-check/setup.sh b/plans/vfc-nfvo-resmanagement/sanity-check/setup.sh deleted file mode 100644 index 68b78431..00000000 --- a/plans/vfc-nfvo-resmanagement/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 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 --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 resmgr -docker run -d --name vfc-resmanagement -e MSB_ADDR=${MSB_IP}:80 nexus3.onap.org:10001/onap/vfc/resmanagement -RESMGR_IP=`get-instance-ip.sh vfc-resmanagement` -for i in {1..20}; do - curl -sS ${RESMGR_IP}:8480 && 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 RESMGR_IP:${RESMGR_IP}" diff --git a/plans/vfc-nfvo-resmanagement/sanity-check/teardown.sh b/plans/vfc-nfvo-resmanagement/sanity-check/teardown.sh deleted file mode 100644 index 2ad95c6b..00000000 --- a/plans/vfc-nfvo-resmanagement/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-resmanagement diff --git a/plans/vfc-nfvo-resmanagement/sanity-check/testplan.txt b/plans/vfc-nfvo-resmanagement/sanity-check/testplan.txt deleted file mode 100644 index ae6d3a56..00000000 --- a/plans/vfc-nfvo-resmanagement/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. -vfc/nfvo-resmanagement/test.robot \ No newline at end of file diff --git a/plans/vfc-nfvo-wfengine/sanity-check/setup.sh b/plans/vfc-nfvo-wfengine/sanity-check/setup.sh deleted file mode 100644 index 387ccf87..00000000 --- a/plans/vfc-nfvo-wfengine/sanity-check/setup.sh +++ /dev/null @@ -1,91 +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 - -source ${SCRIPTS}/common_functions.sh - - -#start msb -docker run -d -p 8500:8500 --name msb_consul consul:0.9.3 -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:1.1.0 -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 --name msb_internal_apigateway nexus3.onap.org:10001/onap/msb/msb_apigateway:1.1.0 -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 30 -sleep 30 - -ORG="onap" -PROJECT="vfc" -DOCKER_REPOSITORY="nexus3.onap.org:10001" -IMAGE="wfengine-activiti" -IMAGE_ACTIVITI_NAME="${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/${IMAGE}" - -#get current host IP addres -SERVICE_IP=$(ip route get 8.8.8.8 | awk '/8.8.8.8/ {print $7}') - -# start wfengine-activiti -# docker run -d --name vfc_wfengine_activiti -p 8804:8080 -e SERVICE_IP=$SERVICE_IP -e SERVICE_PORT=8804 -e OPENPALETTE_MSB_IP=${MSB_IAG_IP} -e OPENPALETTE_MSB_PORT=80 ${IMAGE_ACTIVITI_NAME} -docker run -d --name vfc_wfengine_activiti -p 8804:8080 -e SERVICE_PORT=8080 -e OPENPALETTE_MSB_IP=${MSB_IAG_IP} -e OPENPALETTE_MSB_PORT=80 ${IMAGE_ACTIVITI_NAME} -WFENGINE_ACTIVITI_IP=`get-instance-ip.sh vfc_wfengine_activiti` - -# Wait for initialization -for i in {1..10}; do - curl -sS ${WFENGINE_ACTIVITI_IP}:8080 && break - echo sleep $i - sleep $i -done -for i in {1..10}; do - curl -sS ${SERVICE_IP}:8804 && break - echo sleep $i - sleep $i -done -docker logs vfc_wfengine_activiti - -IMAGE="wfengine-mgrservice" -IMAGE_MGRSERVICE_NAME="${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/${IMAGE}" - -# Start wfengine-mgrservice -#docker run -d --name vfc_wfengine_mgrservice -p 8805:10550 -e SERVICE_IP=$SERVICE_IP -e SERVICE_PORT=8805 -e OPENPALETTE_MSB_IP=${MSB_IAG_IP} -e OPENPALETTE_MSB_PORT=80 ${IMAGE_MGRSERVICE_NAME} -#docker run -d --name vfc_wfengine_mgrservice -p 8805:10550 -e SERVICE_PORT=10550 -e OPENPALETTE_MSB_IP=${MSB_IAG_IP} -e OPENPALETTE_MSB_PORT=80 ${IMAGE_MGRSERVICE_NAME} -docker run -d --name vfc_wfengine_mgrservice -p 8805:10550 -e SERVICE_PORT=10550 -e OPENPALETTE_MSB_IP=${WFENGINE_ACTIVITI_IP} -e OPENPALETTE_MSB_PORT=8080 ${IMAGE_MGRSERVICE_NAME} - -##docker run -d --name ${IMAGE} -e OPENPALETTE_MSB_IP=${WFENGINEACTIVITIR_IP} -e OPENPALETTE_MSB_PORT=8080 ${IMAGE_MGRSERVICE_NAME} -WFENGINE_MGRSERVICE_IP=`get-instance-ip.sh vfc_wfengine_mgrservice` -for i in {1..10}; do - curl -sS ${WFENGINE_MGRSERVICE_IP}:10550 && break - echo sleep $i - sleep $i -done -docker logs vfc_wfengine_mgrservice - -# Pass any variables required by Robot test suites in ROBOT_VARIABLES -ROBOT_VARIABLES="-v MSB_IAG_IP:${MSB_IAG_IP} -v MSB_IP:${MSB_IAG_IP} -v MSB_PORT:80 -v MSB_DISCOVERY_IP:${MSB_DISCOVERY_IP} -v ACTIVITI_IP:${WFENGINE_ACTIVITI_IP} -v ACTIVITI_PORT:8080 -v MGRSERVICE_IP:${WFENGINE_MGRSERVICE_IP} -v MGRSERVICE_PORT:10550 -v SCRIPTS:${SCRIPTS}" -##ROBOT_VARIABLES="-v MSB_IAG_IP:${WFENGINEACTIVITIR_IP} -v MSB_IP:${WFENGINEMGRSERVICE_IP} -v MSB_PORT:10550 -v MSB_DISCOVERY_IP:${WFENGINEACTIVITIR_IP} -v MSB_DISCOVERY_PORT:8080 -v WFENGINEACTIVITIR_IP:${WFENGINEACTIVITIR_IP} -v WFENGINEACTIVITIR_PORT:8080 -v WFENGINEMGRSERVICE_IP:${WFENGINEMGRSERVICE_IP} -v WFENGINEMGRSERVICE_PORT:10550 -v SCRIPTS:${SCRIPTS}" \ No newline at end of file diff --git a/plans/vfc-nfvo-wfengine/sanity-check/teardown.sh b/plans/vfc-nfvo-wfengine/sanity-check/teardown.sh deleted file mode 100644 index bca33569..00000000 --- a/plans/vfc-nfvo-wfengine/sanity-check/teardown.sh +++ /dev/null @@ -1,29 +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. -echo === logs vfc_wfengine_activiti === -docker logs vfc_wfengine_activiti - -echo === logs vfc_wfengine_mgrservice === -docker logs vfc_wfengine_mgrservice - -kill-instance.sh msb_internal_apigateway -kill-instance.sh msb_discovery -kill-instance.sh msb_consul -kill-instance.sh vfc_wfengine_mgrservice -kill-instance.sh vfc_wfengine_activiti diff --git a/plans/vfc-nfvo-wfengine/sanity-check/testplan.txt b/plans/vfc-nfvo-wfengine/sanity-check/testplan.txt deleted file mode 100644 index 2d03683d..00000000 --- a/plans/vfc-nfvo-wfengine/sanity-check/testplan.txt +++ /dev/null @@ -1,4 +0,0 @@ -# Test suites are relative paths under [integration/csit.git]/tests/. -# Place the suites in run order. - -vfc/nfvo-wfengine/workflow.robot \ No newline at end of file -- cgit 1.2.3-korg