From 003f99c36220f6008d51df4a66cd59c33320ef53 Mon Sep 17 00:00:00 2001 From: Ethan Lynn Date: Tue, 29 Aug 2017 14:48:29 +0800 Subject: Rename multivim to multicloud Change-Id: I395bf2a583194fbfadade29210934b50189cdb92 issue-id: MULTICLOUD-67 Signed-off-by: Ethan Lynn --- test/csit/plans/multicloud/functionality1/setup.sh | 40 ++++++++++++++++++++++ .../plans/multicloud/functionality1/teardown.sh | 20 +++++++++++ .../plans/multicloud/functionality1/testplan.txt | 3 ++ test/csit/plans/multivim/functionality1/setup.sh | 40 ---------------------- .../csit/plans/multivim/functionality1/teardown.sh | 20 ----------- .../plans/multivim/functionality1/testplan.txt | 3 -- 6 files changed, 63 insertions(+), 63 deletions(-) create mode 100755 test/csit/plans/multicloud/functionality1/setup.sh create mode 100755 test/csit/plans/multicloud/functionality1/teardown.sh create mode 100644 test/csit/plans/multicloud/functionality1/testplan.txt delete mode 100755 test/csit/plans/multivim/functionality1/setup.sh delete mode 100755 test/csit/plans/multivim/functionality1/teardown.sh delete mode 100644 test/csit/plans/multivim/functionality1/testplan.txt (limited to 'test/csit/plans') diff --git a/test/csit/plans/multicloud/functionality1/setup.sh b/test/csit/plans/multicloud/functionality1/setup.sh new file mode 100755 index 000000000..b43f4b856 --- /dev/null +++ b/test/csit/plans/multicloud/functionality1/setup.sh @@ -0,0 +1,40 @@ +#!/bin/bash +# +# Copyright 2016-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 + +# start msb +# Replace this when msb is ready for onap +docker run -d --name i-msb -p 80:80 openoint/common-services-msb +MSB_IP=`get-instance-ip.sh i-msb` + +# start esr +# docker run -d --name i-esr -e MSB_ADDR=${MSB_IP}:80 openoint/common-services-extsys + +# start multivim-broker +# Replace this when multivim-broker container is ready +docker run -d --name multivim-broker -e MSB_ADDR=${MSB_IP}:80 openoint/multivim-broker +BROKER_IP=`get-instance-ip.sh multivim-broker` +for i in {1..50}; do + curl -sS ${BROKER_IP}:9001 && break + echo sleep $i + sleep $i +done + +echo SCRIPTS +# Pass any variables required by Robot test suites in ROBOT_VARIABLES +ROBOT_VARIABLES="-v MSB_IP:${MSB_IP}" diff --git a/test/csit/plans/multicloud/functionality1/teardown.sh b/test/csit/plans/multicloud/functionality1/teardown.sh new file mode 100755 index 000000000..4ca6dbc99 --- /dev/null +++ b/test/csit/plans/multicloud/functionality1/teardown.sh @@ -0,0 +1,20 @@ +#!/bin/bash +# +# Copyright 2016-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 i-msb +kill-instance.sh multivim-broker diff --git a/test/csit/plans/multicloud/functionality1/testplan.txt b/test/csit/plans/multicloud/functionality1/testplan.txt new file mode 100644 index 000000000..f515c64dd --- /dev/null +++ b/test/csit/plans/multicloud/functionality1/testplan.txt @@ -0,0 +1,3 @@ +# Test suites are relative paths under [integration.git]/test/csit/tests/. +# Place the suites in run order. +multicloud/provision/sanity_test_multivim.robot diff --git a/test/csit/plans/multivim/functionality1/setup.sh b/test/csit/plans/multivim/functionality1/setup.sh deleted file mode 100755 index b43f4b856..000000000 --- a/test/csit/plans/multivim/functionality1/setup.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash -# -# Copyright 2016-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 - -# start msb -# Replace this when msb is ready for onap -docker run -d --name i-msb -p 80:80 openoint/common-services-msb -MSB_IP=`get-instance-ip.sh i-msb` - -# start esr -# docker run -d --name i-esr -e MSB_ADDR=${MSB_IP}:80 openoint/common-services-extsys - -# start multivim-broker -# Replace this when multivim-broker container is ready -docker run -d --name multivim-broker -e MSB_ADDR=${MSB_IP}:80 openoint/multivim-broker -BROKER_IP=`get-instance-ip.sh multivim-broker` -for i in {1..50}; do - curl -sS ${BROKER_IP}:9001 && break - echo sleep $i - sleep $i -done - -echo SCRIPTS -# Pass any variables required by Robot test suites in ROBOT_VARIABLES -ROBOT_VARIABLES="-v MSB_IP:${MSB_IP}" diff --git a/test/csit/plans/multivim/functionality1/teardown.sh b/test/csit/plans/multivim/functionality1/teardown.sh deleted file mode 100755 index 4ca6dbc99..000000000 --- a/test/csit/plans/multivim/functionality1/teardown.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash -# -# Copyright 2016-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 i-msb -kill-instance.sh multivim-broker diff --git a/test/csit/plans/multivim/functionality1/testplan.txt b/test/csit/plans/multivim/functionality1/testplan.txt deleted file mode 100644 index 5319166de..000000000 --- a/test/csit/plans/multivim/functionality1/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. -multivim/provision/sanity_test_multivim.robot -- cgit 1.2.3-korg