Removed unused 'privatekey' variable in EPA04 and EPA05 tests

[osm/tests.git] / robot-systest / run_test.sh

diff --git a/robot-systest/run_test.sh b/robot-systest/run_test.sh
index 1bd4488..dd77f8e 100755 (executable)
--- a/robot-systest/run_test.sh
+++ b/robot-systest/run_test.sh
@@ -70,6 +70,49 @@ create_vim(){
         echo "VIM failed to enter ENABLED state"
         exit 1
     fi
+    if [ -n "${SDNC_URL}" ]; then
+        osm sdnc-create --name sdnc-osm --type ${SDNC_TYPE} --user ${SDNC_USER} --password ${SDNC_PASSWORD} --url ${SDNC_URL}
+        COUNTER=0
+        STATUS=""
+        while [ ${COUNTER} -lt 5 ] ; do
+            echo "Checking status of SDNC sdnc-osm to see if it is enabled"
+            STATUS=$(osm sdnc-show sdnc-osm |grep -io ENABLED)
+            if [ "${STATUS}" == "ENABLED" ]; then
+                break
+            fi
+            ((COUNTER++))
+            sleep 10
+        done
+        if [ "${STATUS}" == "ENABLED" ]; then
+            echo "SDNC enabled"
+        else
+            echo "SDNC failed to enter ENABLED state"
+            osm sdnc-show sdnc-osm
+            exit 1
+        fi
+        if [ -f /root/port-mapping.yaml ]; then
+            osm vim-update ${VIM_TARGET} --sdn_controller sdnc-osm --sdn_port_mapping /root/port-mapping.yaml
+            COUNTER2=0
+            RESULT=""
+            while [ ${COUNTER2} -lt 5 ] ; do
+                echo "Checking status of VIM $VIM_TARGET to see if there is port-mapping"
+                osm vim-show $VIM_TARGET |grep sdn-port-mapping
+                if [ $? -eq 0 ]; then
+                    RESULT="OK"
+                    break
+                fi
+                ((COUNTER2++))
+                sleep 10
+            done
+            if [ "${RESULT}" == "OK" ]; then
+                echo "Port-mapping correctly added"
+            else
+                echo "Port-mapping failed to be added"
+                osm vim-show ${VIM_TARGET}
+                exit 1
+            fi
+        fi
+    fi
 }
 
 
@@ -115,7 +158,7 @@ Options:
         --env-file: It is the environmental file where is described the OSM target and VIM
         -o <osmclient_version> [OPTIONAL]: It is used to specify a particular osmclient version. Default: latest
         -p <package_branch> [OPTIONAL]: OSM packages repository branch. Default: master
-        -t <testing_tags> [OPTIONAL]: Robot tests tags. [sanity, regression, particular_test]. Default: sanity
+        -t <testing_tags> [OPTIONAL]: Robot tests tags. [sanity, daily, regression, particular_test]. Default: sanity
         -T <testing_branch> [OPTIONAL]: Run SOL005 Robot conformance tests
         -c To create a VIM for the tests