Bug 2327 fix to verify ipaddress in sol003_02 testsuite

[osm/tests.git] / robot-systest / testsuite / heal_01-volume_vdu_healing.robot

diff --git a/robot-systest/testsuite/heal_01-volume_vdu_healing.robot b/robot-systest/testsuite/heal_01-volume_vdu_healing.robot
index de2467a..3aa9a68 100644 (file)
--- a/robot-systest/testsuite/heal_01-volume_vdu_healing.robot
+++ b/robot-systest/testsuite/heal_01-volume_vdu_healing.robot
@@ -29,7 +29,7 @@ Resource   ../lib/ns_operation_lib.resource
 Resource   ../lib/ssh_lib.resource
 Resource   ../lib/openstack_lib.resource
 
-Test Tags   heal_01   cluster_heal   daily
+Test Tags   heal_01   cluster_heal   daily   regression
 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
@@ -40,10 +40,10 @@ ${VNFD_VOLUMES_PKG}   several_volumes_vnf
 ${VNFD_VOLUMES_NAME}   several_volumes-vnf
 ${VDU_VOLUMES_NAME}   several_volumes-VM
 ${VNF_SEVERAL_INDEX}   several_volumes_vnf
-${VNFD_CHARM_PKG}   charm-packages/native_manual_scale_charm_vnf
-${VNFD_CHARM_NAME}   native_manual_scale_charm-vnf
-${NSD_PKG}   volumes_nativecharm_ns
-${NSD_NAME}   volumes_nativecharm-ns
+${VNFD_MANUALSCALE_PKG}   manual_scale_vnf
+${VNFD_MANUALSCALE_NAME}   manual_scale-vnf
+${NSD_PKG}   volumes_healing_ns
+${NSD_NAME}   volumes_healing-ns
 
 # NS instance name and configuration
 ${NS_NAME}   heal_01
@@ -65,7 +65,7 @@ ${SUCCESS_RETURN_CODE}   0
 *** Test Cases ***
 Create VNF Descriptors
     [Documentation]   Upload VNF packages for the testsuite.
-    Create VNFD   '%{PACKAGES_FOLDER}/${VNFD_CHARM_PKG}'
+    Create VNFD   '%{PACKAGES_FOLDER}/${VNFD_MANUALSCALE_PKG}'
     Create VNFD   '%{PACKAGES_FOLDER}/${VNFD_VOLUMES_PKG}'
 
 Create NS Descriptor
@@ -81,7 +81,7 @@ Get NS Id
     [Documentation]   Get NS identifier.
     [Tags]   cleanup
     ${variables}=   Get Variables
-    IF   not "\${ns_id}" in ${variables}
+    IF   not "\${ns_id}" in "${variables}"
         ${id}=   Get Ns Id   ${NS_NAME}
         Set Suite Variable   ${NS_ID}   ${id}
     END
@@ -101,7 +101,7 @@ Get VIM Objects
         ${volumes_attached}=   Get Server Property   ${vdu_id}   volumes_attached
         ${match}=   Get Regexp Matches   ${volumes_attached}   '([0-9a-f\-]+)'   1
         IF   ${match} != @{EMPTY}
-            IF   not ${match}[0] in @{VIM_VOLUMES}
+            IF   not "${match}[0]" in "@{VIM_VOLUMES}"
                 Append To List   ${VIM_VOLUMES}   ${match}[0]
             END
         END
@@ -187,7 +187,7 @@ Update VIM Objects
         @{vdu_ids}=   Split String   ${id}
         Append To List   ${vdu_updated}   @{vdu_ids}
         FOR   ${id}   IN   @{vdu_ids}
-            IF   not ${id} in @{VIM_VDUS}
+            IF   not "${id}" in "@{VIM_VDUS}"
                 Append To List   ${VIM_VDUS}   ${id}
             END
         END
@@ -196,7 +196,7 @@ Update VIM Objects
         ${volumes_attached}=   Get Server Property   ${vdu_id}   volumes_attached
         ${match}=   Get Regexp Matches   ${volumes_attached}   '([0-9a-f\-]+)'   1
         IF   ${match} != @{EMPTY}
-            IF   not ${match}[0] in @{VIM_VOLUMES}
+            IF   not "${match}[0]" in "@{VIM_VOLUMES}"
                 Append To List   ${VIM_VOLUMES}   ${match}[0]
             END
         END
@@ -218,7 +218,7 @@ Delete VNF Descriptors
     [Documentation]   Delete VNF packages from OSM.
     [Tags]   cleanup
     Delete VNFD   ${VNFD_VOLUMES_NAME}
-    Delete VNFD   ${VNFD_CHARM_NAME}
+    Delete VNFD   ${VNFD_MANUALSCALE_NAME}
 
 Delete Remaining Objects in VIM
     [Documentation]   Delete any remaining objects (volumes, VMs, etc.) in the VIM.
@@ -232,7 +232,7 @@ Suite Cleanup
     Run Keyword If Any Tests Failed   Delete NS   ${NS_NAME}
     Run Keyword If Any Tests Failed   Delete NSD   ${NSD_NAME}
     Run Keyword If Any Tests Failed   Delete VNFD   ${VNFD_VOLUMES_NAME}
-    Run Keyword If Any Tests Failed   Delete VNFD   ${VNFD_CHARM_NAME}
+    Run Keyword If Any Tests Failed   Delete VNFD   ${VNFD_MANUALSCALE_NAME}
     Run Keyword If Any Tests Failed   Delete Objects In VIM
 
 Delete Objects In VIM
@@ -251,7 +251,7 @@ Delete Objects In VIM
         Log   Checking if server ${vdu_id} is still in VIM
         ${status}=   Run Keyword And Ignore Error   Get Server Property   ${vdu_id}   id
         Log   ${status}[0]
-        IF   ${status}[0] == 'PASS'
+        IF   '${status}[0]' == 'PASS'
             ${error}=   Set Variable   1
             Log   Deleting server ${vdu_id}
             Run Keyword And Ignore Error   Delete Server   ${vdu_id}