5 files changed, 8 insertions, 64 deletions
diff --git a/plans/vfc-nfvo-catalog/sanity-check/setup.sh b/plans/vfc-nfvo-catalog/sanity-check/setup.sh
index e6221731..344214ff 100644
--- a/plans/vfc-nfvo-catalog/sanity-check/setup.sh
+++ b/plans/vfc-nfvo-catalog/sanity-check/setup.sh
@@ -64,8 +64,13 @@ for i in {1..10}; do
     sleep $i
 done
 
+# print catalog config
+docker cp vfc-catalog:/service/vfc/nfvo/catalog/catalog/pub/config/config.py ./
+cat config.py
+
+# print catalog log
 docker cp vfc-catalog:/service/vfc/nfvo/catalog/logs/runtime_catalog.log ./
 cat runtime_catalog.log
 
 # Pass any variables required by Robot test suites in ROBOT_VARIABLES
-ROBOT_VARIABLES="-v MSB_IP:${MSB_IP} -v CATALOG_IP:${CATALOG_IP} -v MSB_DISCOVERY_IP:${DISCOVERY_IP}"
+ROBOT_VARIABLES="-v MSB_IP:${MSB_IP} -v CATALOG_IP:${CATALOG_IP} -v MSB_DISCOVERY_IP:${DISCOVERY_IP} -v SCRIPTS:${SCRIPTS}"
diff --git a/plans/vid/GUITests/setup.sh b/plans/vid/GUITests/setup.sh
deleted file mode 100644
index f23fb61f..00000000
--- a/plans/vid/GUITests/setup.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2019 Nokia Intellectual Property. 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:
-
-/usr/bin/Xvfb :0 -screen 0 1024x768x24&
-export DISPLAY=:0
-
-source ${SCRIPTS}/common_functions.sh
-source ${WORKSPACE}/scripts/vid/clone_and_setup_vid_data.sh
-source ${WORKSPACE}/scripts/vid/start_vid_containers.sh
-
-echo "Obtaining ip of VID server..."
-VID_IP=`get-instance-ip.sh vid-server`
-SO_SIMULATOR_IP=`get-instance-ip.sh so-simulator`
-
-bypass_ip_address ${VID_IP}
-bypass_ip_address ${SO_SIMULATOR_IP}
-
-echo VID_IP=${VID_IP}
-echo SO_SIMULATOR_IP=${SO_SIMULATOR_IP}
-
-
-# Pass any variables required by Robot test suites in ROBOT_VARIABLES
-ROBOT_VARIABLES="-v VID_IP:${VID_IP} -v SO_SIMULATOR_IP:${SO_SIMULATOR_IP}"
-
-pip install assertpy
-pip install requests
-\ No newline at end of file
diff --git a/plans/vid/GUITests/teardown.sh b/plans/vid/GUITests/teardown.sh
deleted file mode 100644
index 0ade44f9..00000000
--- a/plans/vid/GUITests/teardown.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2019 Nokia Intellectual Property. 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.
-
-source ${WORKSPACE}/scripts/vid/kill_containers_and_remove_dataFolders.sh
-\ No newline at end of file
diff --git a/plans/vid/GUITests/testplan.txt b/plans/vid/GUITests/testplan.txt
deleted file mode 100644
index e54147c6..00000000
--- a/plans/vid/GUITests/testplan.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-# Test suites are relative paths under [integration/csit.git]/tests/.
-# Place the suites in run order.
-
-vid/newVNFChange
-\ No newline at end of file
diff --git a/plans/vid/healthCheck/testplan.txt b/plans/vid/healthCheck/testplan.txt
index 61c39083..85fdaa34 100644
--- a/plans/vid/healthCheck/testplan.txt
+++ b/plans/vid/healthCheck/testplan.txt
@@ -3,4 +3,5 @@
 vid/healthCheck
 vid/login
 vid/https-connection
-vid/scaleOut
-\ No newline at end of file
+vid/scaleOut
+vid/newVNFChange
+\ No newline at end of file