From 93c6bc7f6af01fc33cd0a7e8c65f8abfdba84c0a Mon Sep 17 00:00:00 2001
From: fujinhua <fu.jinhua@zte.com.cn>
Date: Tue, 5 Sep 2017 09:12:25 +0800
Subject: Fix vfc-nfvo-lcm csit scripts

Fix the path of testplan.txt according to jjb template
Change retry num of waiting service start to 10
Change MSB_IP to NSLCM_IP
comment test case

Change-Id: I979310260454605a664683cbb11221f370b56e71
Issue-Id: INT-134
Signed-off-by: fujinhua <fu.jinhua@zte.com.cn>
---
 test/csit/plans/vfc/nfvo-lcm/setup.sh     | 44 -------------------------------
 test/csit/plans/vfc/nfvo-lcm/teardown.sh  | 22 ----------------
 test/csit/plans/vfc/nfvo-lcm/testplan.txt |  3 ---
 3 files changed, 69 deletions(-)
 delete mode 100755 test/csit/plans/vfc/nfvo-lcm/setup.sh
 delete mode 100755 test/csit/plans/vfc/nfvo-lcm/teardown.sh
 delete mode 100644 test/csit/plans/vfc/nfvo-lcm/testplan.txt

(limited to 'test/csit/plans/vfc')

diff --git a/test/csit/plans/vfc/nfvo-lcm/setup.sh b/test/csit/plans/vfc/nfvo-lcm/setup.sh
deleted file mode 100755
index 92d500c7a..000000000
--- a/test/csit/plans/vfc/nfvo-lcm/setup.sh
+++ /dev/null
@@ -1,44 +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
-
-#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 nexus3.onap.org:10001/onap/msb/msb_base
-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 vfc-nslcm
-docker run -d --name vfc-nslcm -e MSB_ADDR=${MSB_IP}:80 nexus3.onap.org:10001/onap/vfc/nslcm
-NSLCM_IP=`get-instance-ip.sh vfc-nslcm`
-for i in {1..50}; do
-    curl -sS ${NSLCM_IP}:8403 && 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 NSLCM_IP:${NSLCM_IP}"
diff --git a/test/csit/plans/vfc/nfvo-lcm/teardown.sh b/test/csit/plans/vfc/nfvo-lcm/teardown.sh
deleted file mode 100755
index c74850d36..000000000
--- a/test/csit/plans/vfc/nfvo-lcm/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-nslcm
diff --git a/test/csit/plans/vfc/nfvo-lcm/testplan.txt b/test/csit/plans/vfc/nfvo-lcm/testplan.txt
deleted file mode 100644
index fc261e13c..000000000
--- a/test/csit/plans/vfc/nfvo-lcm/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.
-vfc/nfvo-lcm/test.robot
-- 
cgit 1.2.3-korg