Modify MultiCloud CSIT case

Change-Id: I173ddb6f7d9462a51f98fc3d028151fe83239918
issue-id: MULTICLOUD-67
Signed-off-by: Ethan Lynn <ethanlynnl@vmware.com>

diff --git a/test/csit/plans/multivim/functionality1/setup.sh b/test/csit/plans/multivim/functionality1/setup.sh
index df8113f..b43f4b8 100755 (executable)
--- a/test/csit/plans/multivim/functionality1/setup.sh
+++ b/test/csit/plans/multivim/functionality1/setup.sh
@@ -17,18 +17,24 @@
 # Place the scripts in run order:
 # Start all process required for executing test case
 
-source ${SCRIPTS}/common_functions.sh
+# 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
-run-instance.sh openoint/multivim-broker multivim-broker  " -i -t -e MSB_ADDR=${MSB_IP}:80"
-extsys_ip=`get-instance-ip.sh multivim-broker`
-sleep_msg="Waiting_for_multivim-broker"
-curl_path='http://'${MSB_IP}':80/openoapi/multivim/v1/swagger.json'
-wait_curl_driver CURL_COMMAND=$curl_path WAIT_MESSAGE='"$sleep_msg"' REPEAT_NUMBER=25 GREP_STRING="swagger"
+# 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}  -v SCRIPTS:${SCRIPTS}"
-
-
-
+ROBOT_VARIABLES="-v MSB_IP:${MSB_IP}"

diff --git a/test/csit/tests/multivim/provision/sanity_test_multivim.robot b/test/csit/tests/multivim/provision/sanity_test_multivim.robot
index 4d9cabf..6dc57cc 100644 (file)
--- a/test/csit/tests/multivim/provision/sanity_test_multivim.robot
+++ b/test/csit/tests/multivim/provision/sanity_test_multivim.robot
@@ -1,16 +1,12 @@
 *** settings ***
-Resource    ../../common.robot
 Library     Collections
 Library     RequestsLibrary
 Library     OperatingSystem
 Library     json
-Library     HttpLibrary.HTTP
 
 *** Variables ***
 @{return_ok_list}=   200  201  202
 ${queryswagger_broker_url}    /openoapi/multivim/v1/swagger.json
-${queryswagger_kilo_url}    /openoapi/multivim-kilo/v1/swagger.json
-${queryswagger_newton_url}    /openoapi/multivim-newton/v1/swagger.json
 
 
 *** Test Cases ***