X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fheal_03-multiple_healing.robot;h=89f67dd834a0957c363282e16efb7e0f6f6ba3c8;hb=245b04f08965d65f323de1197c082468829b6bf6;hp=f53415721b995da27a31e4612c17eff11a37b81f;hpb=b731aaccb1bc7041b55fe4801e26177f0e3c6cbe;p=osm%2Ftests.git

diff --git a/robot-systest/testsuite/heal_03-multiple_healing.robot b/robot-systest/testsuite/heal_03-multiple_healing.robot
index f534157..89f67dd 100644
--- a/robot-systest/testsuite/heal_03-multiple_healing.robot
+++ b/robot-systest/testsuite/heal_03-multiple_healing.robot
@@ -26,7 +26,7 @@ Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ns_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/openstack_lib.robot
 
-Force Tags   heal_03   cluster_heal   daily   regression
+Force Tags   heal_03   cluster_heal   daily
 
 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
@@ -61,6 +61,9 @@ ${password}   ${EMPTY}
 
 ${success_return_code}   0
 
+@{vim_vdus}   @{EMPTY}
+@{vim_volumes}   @{EMPTY}
+
 
 *** Test Cases ***
 Create VNF Descriptors
@@ -98,6 +101,29 @@ Scale Out Charm VNF
     Run Keyword If   ${vdurs} != ${initial_vdur_count} + 1   Fail   msg=There is no new VDU records in the VNF after Scale Out
 
 
+Get VIM Objects
+    Variable Should Exist   ${ns_id}   msg=NS is not available
+    @{vnf_id_list}=   Get Ns Vnf List   ${ns_id}
+    Log   ${vnf_id_list}
+    FOR   ${vnf_id}   IN   @{vnf_id_list}
+        Log   ${vnf_id}
+        ${id}=   Get VNF VIM ID   ${vnf_id}
+        @{vdu_ids}=   Split String   ${id}
+        Append To List   ${vim_vdus}   @{vdu_ids}
+    END
+    FOR   ${vdu_id}   IN   @{vim_vdus}
+        ${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}"
+                Append To List   ${vim_volumes}   ${match}[0]
+            END
+        END
+    END
+    Log Many   @{vim_vdus}
+    Log Many   @{vim_volumes}
+
+
 Get Charm VNF Info
     Variable Should Exist   ${ns_id}   msg=NS is not available
     ${variables}   Get Variables
@@ -108,7 +134,7 @@ Get Charm VNF Info
     ${id}=   Get VNF VIM ID   ${vnf_charm_id}
     @{vdu_charm_ids}=   Split String   ${id}
     Set Suite Variable   @{vdu_charm_ids}   @{vdu_charm_ids}
-    log   ${vdu_charm_ids}[1]
+    Log   ${vdu_charm_ids}[1]
     @{charm_ip_list}=   Get Vnf Vdur IPs   ${vnf_charm_id}
     Set Suite Variable   @{charm_ip_list}   @{charm_ip_list}
 
@@ -116,18 +142,18 @@ Get Charm VNF Info
 Get Volume VNF Info
     Variable Should Exist   ${ns_id}   msg=NS is not available
     ${ip_addr}=   Get Vnf Management Ip Address   ${ns_id}   ${vnf_several_index}
-    log   ${ip_addr}
+    Log   ${ip_addr}
     Set Suite Variable   ${vnf_volumes_ip_addr}   ${ip_addr}
 
     ${vnf_id}=   Get Vnf Id   ${ns_id}   ${vnf_several_index}
     Set Suite Variable   ${vnf_volumes_id}   ${vnf_id}
     ${id}=   Get VNF VIM ID   ${vnf_id}
     Set Suite Variable   ${vdu_volumes_id}   ${id}
-    log   ${vdu_volumes_id}
+    Log   ${vdu_volumes_id}
 
     @{volumes_ip_list}=   Get Vnf Vdur IPs   ${vnf_volumes_id}
     Set Suite Variable   @{volumes_ip_list}   @{volumes_ip_list}
-    log   @{volumes_ip_list}
+    Log   @{volumes_ip_list}
 
 
 Stop VDUs
@@ -159,10 +185,37 @@ Check VNFs After Healing
 
     ${ip}=   Get Vdu Attribute   ${vnf_charm_id}   ip-address   1
     ${stdout}=   Execute Remote Command Check Rc Return Output   ${ip}   ${username}   ${password}   ${privatekey}   sudo ls ${vnf_charm_cloudinit_file}
-    log   ${stdout}
+    Log   ${stdout}
     Check If remote File Exists   ${ip}   ${username}   ${password}   ${privatekey}   ${vnf_charm_day1_file}
 
 
+Update VIM Objects
+    Variable Should Exist   ${ns_id}   msg=NS is not available
+    @{vdu_updated}=   Create List
+    @{vnf_id_list}=   Get Ns Vnf List   ${ns_id}
+    FOR   ${vnf_id}   IN   @{vnf_id_list}
+        ${id}=   Get VNF VIM ID   ${vnf_id}
+        @{vdu_ids}=   Split String   ${id}
+        Append To List   ${vdu_updated}   @{vdu_ids}
+        FOR   ${id}   IN   @{vdu_ids}
+            IF   not "${id}" in "@{vim_vdus}"
+                Append To List   ${vim_vdus}   ${id}
+            END
+        END
+    END
+    FOR   ${vdu_id}   IN   @{vdu_updated}
+        ${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}"
+                Append To List   ${vim_volumes}   ${match}[0]
+            END
+        END
+    END
+    Log Many   @{vim_vdus}
+    Log Many   @{vim_volumes}
+
+
 Delete NS Instance
     [Tags]   cleanup
     Delete NS   ${ns_name}
@@ -179,6 +232,33 @@ Delete VNF Descriptors
     Delete VNFD   ${vnfd_charm_name}
 
 
+Delete Objects in VIM
+    [Tags]   cleanup
+    ${error}=   Set Variable   0
+    FOR   ${vol_id}   IN   @{vim_volumes}
+        Log   Checking if volume ${vol_id} is still in VIM
+        ${exists}=   Check If Volume Exists   ${vol_id}
+        IF   ${exists}!=0
+            ${error}=   Set Variable   1
+            Log   Deleting volume ${vol_id}
+            Run Keyword And Ignore Error   Delete Volume   ${vol_id}
+        END
+    END
+    FOR   ${vdu_id}   IN   @{vim_vdus}
+        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'
+            ${error}=   Set Variable   1
+            Log   Deleting server ${vdu_id}
+            Run Keyword And Ignore Error   Delete Server   ${vdu_id}
+        END
+    END
+    IF   ${error}==1
+        Fail   Some objects created by test were not deleted in VIM
+    END
+
+
 *** Keywords ***
 Suite Cleanup
     [Documentation]   Test Suit Cleanup: Deleting Descriptor, instance and vim