aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2019-03-14 14:24:53 +0000
committerGerrit Code Review <gerrit@onap.org>2019-03-14 14:24:53 +0000
commit918a0f524bc9727f3bc8d9abe041bb3087a3c766 (patch)
tree9bb1ff5ea217446e69d2db2cc2a388b16ab6ec05
parent80f8f4636074a60294ec943229edcc5748526921 (diff)
parent0f725eb01c36af01ce81c8c6f4b7933a6a4c65b2 (diff)
Merge "Remove dummy plan and test"
-rw-r--r--plans/usecase-ui-server/testsuite/setup.sh58
-rw-r--r--plans/usecase-ui-server/testsuite/teardown.sh22
-rw-r--r--plans/usecase-ui-server/testsuite/testplan.txt3
-rw-r--r--tests/usecase-ui/server/test.robot14
4 files changed, 0 insertions, 97 deletions
diff --git a/plans/usecase-ui-server/testsuite/setup.sh b/plans/usecase-ui-server/testsuite/setup.sh
deleted file mode 100644
index b2641bec..00000000
--- a/plans/usecase-ui-server/testsuite/setup.sh
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2017 CMCC, Inc. and others. All rights reserved.
-#
-# 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 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 for the initialization of MSB services
-echo sleep 60
-sleep 60
-
-# start usecase-ui-server
-docker run -d --name usecase-ui-server -v /var/lib/mysql -e MSB_ADDR=${MSB_IAG_IP}:80 nexus3.onap.org:10001/onap/usecase-ui/usecase-ui-server
-USECASEUI_IP=`get-instance-ip.sh usecase-ui-server`
-
-# Wait for initialization
-for i in {1..10}; do
- curl -sS -m 1 ${USECASEUI_IP}:8901 && break
- echo sleep $i
- sleep $i
-done
-
-# Pass any variables required by Robot test suites in ROBOT_VARIABLES
-ROBOT_VARIABLES="-v MSB_IAG_IP:${MSB_IAG_IP} -v USECASEUI_IP:${USECASEUI_IP} -v SCRIPTS:${SCRIPTS}"
diff --git a/plans/usecase-ui-server/testsuite/teardown.sh b/plans/usecase-ui-server/testsuite/teardown.sh
deleted file mode 100644
index 46f5879b..00000000
--- a/plans/usecase-ui-server/testsuite/teardown.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2017 CMCC, Inc. and others. All rights reserved.
-#
-# 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 usecase-ui-server
diff --git a/plans/usecase-ui-server/testsuite/testplan.txt b/plans/usecase-ui-server/testsuite/testplan.txt
deleted file mode 100644
index af74191f..00000000
--- a/plans/usecase-ui-server/testsuite/testplan.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-# Test suites are relative paths under [integration/csit.git]/tests/.
-# Place the suites in run order.
-usecase-ui/server/test.robot
diff --git a/tests/usecase-ui/server/test.robot b/tests/usecase-ui/server/test.robot
deleted file mode 100644
index cae75c4f..00000000
--- a/tests/usecase-ui/server/test.robot
+++ /dev/null
@@ -1,14 +0,0 @@
-*** settings ***
-Library Collections
-Library RequestsLibrary
-Library OperatingSystem
-Library json
-Library HttpLibrary.HTTP
-
-*** Variables ***
-@{return_ok_list}= 200 201 202 204
-
-*** Test Cases ***
-MonitorSwaggerTest
- [Documentation] query Monitor swagger info rest test
- Should Be Equal 2.0 2.0