6 files changed, 0 insertions, 133 deletions
diff --git a/plans/multicloud-ocata/functionality1/setup.sh b/plans/multicloud-ocata/functionality1/setup.sh
deleted file mode 100644
index 3cba6813..00000000
--- a/plans/multicloud-ocata/functionality1/setup.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) 2017 Wind River Systems, Inc.
-#
-# 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.
-
-pushd ${SCRIPTS}
-
-# start multicloud-ocata
-./run-instance.sh nexus3.onap.org:10001/onap/multicloud/openstack/openstack-ocata:latest multicloud-ocata
-SERVICE_IP=$(./get-instance-ip.sh multicloud-ocata)
-SERVICE_PORT=9006
-popd
-
-if [[ $no_proxy && $no_proxy != *$SERVICE_IP* ]]; then
-	export no_proxy+=$no_proxy,$SERVICE_IP
-fi
-
-for i in {1..50}; do
-    curl -sS ${SERVICE_IP}:${SERVICE_PORT} && break
-    echo sleep $i
-    sleep $i
-done
-
-# Pass any variables required by Robot test suites in ROBOT_VARIABLES
-ROBOT_VARIABLES+="-v SERVICE_IP:${SERVICE_IP} "
-ROBOT_VARIABLES+="-v SERVICE_PORT:${SERVICE_PORT} "
diff --git a/plans/multicloud-ocata/functionality1/teardown.sh b/plans/multicloud-ocata/functionality1/teardown.sh
deleted file mode 100644
index 6ecb74eb..00000000
--- a/plans/multicloud-ocata/functionality1/teardown.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) 2017 Wind River Systems, Inc.
-#
-# 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.
-
-# This script is sourced by run-csit.sh after Robot test completion.
-kill-instance.sh multicloud-ocata
diff --git a/plans/multicloud-ocata/functionality1/testplan.txt b/plans/multicloud-ocata/functionality1/testplan.txt
deleted file mode 100644
index a8bd6c46..00000000
--- a/plans/multicloud-ocata/functionality1/testplan.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-# Test suites are relative paths under [integration/csit.git]/tests/.
-# Place the suites in run order.
-multicloud-ocata/provision/sanity_test_multicloud.robot
diff --git a/plans/multicloud-ocata/hpa-discovery/setup.sh b/plans/multicloud-ocata/hpa-discovery/setup.sh
deleted file mode 100644
index cc494e86..00000000
--- a/plans/multicloud-ocata/hpa-discovery/setup.sh
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/bash
-#
-# Copyright 2018 Intel Corporation, Inc
-# 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.
-
-cd ${SCRIPTS}
-
-source common_functions.sh
-
-generic_sim_path=${WORKSPACE}/scripts/multicloud-ocata/generic_sim
-multicloud_provision_path=${WORKSPACE}/tests/multicloud-ocata/provision
-# start generic simulator for openstack mock and AAI mock
-if [[ -z $(docker images -q generic_sim) ]]; then
-    pushd $generic_sim_path
-    docker build -t generic_sim .
-    popd
-fi
-
-function start_simulator ()
-{
-    local service_name=$1
-    local service_port=$2
-
-    ./run-instance.sh generic_sim $service_name "-v ${multicloud_provision_path}/${service_name}/:/tmp/generic_sim/ -v ${generic_sim_path}/${service_name}/:/etc/generic_sim/ -p $service_port:8080"
-    wait_for_service_init localhost:$service_port
-    bypass_ip_adress $service_name
-}
-
-start_simulator nova 8774
-start_simulator glance 9292
-start_simulator cinder 8776
-start_simulator keystone 5000
-start_simulator aai 8443
-
-# start multicloud-ocata
-./run-instance.sh nexus3.onap.org:10001/onap/multicloud/openstack/openstack-ocata multicloud-ocata "-t -e AAI_SERVICE_URL=http://aai:8080/aai -e no_proxy=$no_proxy -p 9006:9006"
-SERVICE_IP=$(./get-instance-ip.sh multicloud-ocata)
-SERVICE_PORT=9006
-
-docker network create hpa-net
-for container in aai keystone glance cinder nova multicloud-ocata; do
-    docker network connect hpa-net $container
-done
-
-bypass_ip_adress $SERVICE_IP
-wait_for_service_init ${SERVICE_IP}:${SERVICE_PORT}
-
-# Pass any variables required by Robot test suites in ROBOT_VARIABLES
-ROBOT_VARIABLES+="-v SERVICE_IP:${SERVICE_IP} "
-ROBOT_VARIABLES+="-v SERVICE_PORT:${SERVICE_PORT} "
diff --git a/plans/multicloud-ocata/hpa-discovery/teardown.sh b/plans/multicloud-ocata/hpa-discovery/teardown.sh
deleted file mode 100644
index b80f2e45..00000000
--- a/plans/multicloud-ocata/hpa-discovery/teardown.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-#
-# Copyright 2018 Intel Corporation, Inc
-# 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.
-
-for container in aai keystone cinder glance nova multicloud-ocata; do
-    kill-instance.sh $container
-done
-docker network rm hpa-net
diff --git a/plans/multicloud-ocata/hpa-discovery/testplan.txt b/plans/multicloud-ocata/hpa-discovery/testplan.txt
deleted file mode 100644
index d03e80bc..00000000
--- a/plans/multicloud-ocata/hpa-discovery/testplan.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-# Test suites are relative paths under [integration/csit.git]/tests/.
-# Place the suites in run order.
-multicloud-ocata/provision/hpa_multicloud.robot