Merge "Remove dummy plans"

diff --git a/plans/vfc-gvnfm-vnfmgr/sanity-check/setup.sh b/plans/vfc-gvnfm-vnfmgr/sanity-check/setup.sh
deleted file mode 100755 (executable)
index 3c985aa..0000000
--- a/plans/vfc-gvnfm-vnfmgr/sanity-check/setup.sh
+++ /dev/null
@@ -1,67 +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 --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}
-
-docker run -d -p 3306:3306 --name vfc-db nexus3.onap.org:10001/onap/vfc/db
-VFC_DB_IP=`get-instance-ip.sh vfc-db`
-echo VFC_DB_IP=${VFC_DB_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 initialization(3306 DB)
-for i in {1..3}; do
-    curl -sS -m 1 ${VFC_DB_IP}:3306 && break
-    echo sleep $i
-    sleep $i
-done
-
-# wait for container initalization
-echo sleep 30
-sleep 30
-
-# start vfc-vnfmgr
-docker run -d --name vfc-vnfmgr -e MSB_ADDR=${MSB_IAG_IP}:80 -e MYSQL_ADDR=${VFC_DB_IP}:3306 nexus3.onap.org:10001/onap/vfc/vnfmgr
-VNFMGR_IP=`get-instance-ip.sh vfc-vnfmgr`
-for i in {1..10}; do
-    curl -sS -m 1 ${VNFMGR_IP}:8803 && 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 VNFMGR_IP:${VNFMGR_IP} -v SCRIPTS:${SCRIPTS}"

diff --git a/plans/vfc-gvnfm-vnfmgr/sanity-check/teardown.sh b/plans/vfc-gvnfm-vnfmgr/sanity-check/teardown.sh
deleted file mode 100755 (executable)
index cfabe42..0000000
--- a/plans/vfc-gvnfm-vnfmgr/sanity-check/teardown.sh
+++ /dev/null
@@ -1,23 +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-db
-kill-instance.sh vfc-vnfmgr

diff --git a/plans/vfc-gvnfm-vnfmgr/sanity-check/testplan.txt b/plans/vfc-gvnfm-vnfmgr/sanity-check/testplan.txt
deleted file mode 100644 (file)
index c90cc93..0000000
--- a/plans/vfc-gvnfm-vnfmgr/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/gvnfm-vnfmgr/test.robot

diff --git a/plans/vfc-nfvo-driver-vnfm-gvnfm/sanity-check/setup.sh b/plans/vfc-nfvo-driver-vnfm-gvnfm/sanity-check/setup.sh
index bdc66d0..e7ac1f3 100644 (file)
--- a/plans/vfc-nfvo-driver-vnfm-gvnfm/sanity-check/setup.sh
+++ b/plans/vfc-nfvo-driver-vnfm-gvnfm/sanity-check/setup.sh
@@ -52,16 +52,5 @@ for i in {1..10}; do
     sleep $i
 done
 
-# start vfc-jujudriver
-docker run -d --name vfc-jujudriver -e MSB_ADDR=${MSB_IAG_IP}:80 nexus3.onap.org:10001/onap/vfc/jujudriver
-JUJUDRIVER_IP=`get-instance-ip.sh vfc-jujudriver`
-
-# Wait for initialization
-for i in {1..10}; do
-    curl -sS ${JUJUDRIVER_IP}:8483 && 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 GVNFMDRIVER_IP:${GVNFMDRIVER_IP} -v JUJUDRIVER_IP:${JUJUDRIVER_IP}"
+ROBOT_VARIABLES="-v MSB_IAG_IP:${MSB_IAG_IP} -v GVNFMDRIVER_IP:${GVNFMDRIVER_IP}"

diff --git a/plans/vfc-nfvo-driver-vnfm-gvnfm/sanity-check/teardown.sh b/plans/vfc-nfvo-driver-vnfm-gvnfm/sanity-check/teardown.sh
index 78d7c5a..d90aad2 100644 (file)
--- a/plans/vfc-nfvo-driver-vnfm-gvnfm/sanity-check/teardown.sh
+++ b/plans/vfc-nfvo-driver-vnfm-gvnfm/sanity-check/teardown.sh
@@ -19,6 +19,4 @@
 kill-instance.sh msb_internal_apigateway
 kill-instance.sh msb_discovery
 kill-instance.sh msb_consul
-kill-instance.sh  vfc-gvnfmdriver
-
-kill-instance.sh vfc-jujudriver
+kill-instance.sh vfc-gvnfmdriver

diff --git a/plans/vfc-nfvo-driver-vnfm-gvnfm/sanity-check/testplan.txt b/plans/vfc-nfvo-driver-vnfm-gvnfm/sanity-check/testplan.txt
index a54f095..1295b2f 100644 (file)
--- a/plans/vfc-nfvo-driver-vnfm-gvnfm/sanity-check/testplan.txt
+++ b/plans/vfc-nfvo-driver-vnfm-gvnfm/sanity-check/testplan.txt
@@ -2,5 +2,3 @@
 # Place the suites in run order.
 
 vfc/nfvo-driver-gvnfm/gvnfmdriver.robot
-
-vfc/nfvo-driver-gvnfm/jujudriver.robot