X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fheal_04-autohealing.robot;h=225d3e5e211ffde6d24da200511a67f9ea560c77;hb=ae2a900634933c269cba67d563643db91042338e;hp=5518b11801f5baab997f517223664d61e332f7a8;hpb=f4ebaa88025189ede4f073ab8a1f27c95efff867;p=osm%2Ftests.git

diff --git a/robot-systest/testsuite/heal_04-autohealing.robot b/robot-systest/testsuite/heal_04-autohealing.robot
index 5518b11..225d3e5 100644
--- a/robot-systest/testsuite/heal_04-autohealing.robot
+++ b/robot-systest/testsuite/heal_04-autohealing.robot
@@ -12,13 +12,13 @@
 
 *** Settings ***
 Documentation   [HEAL-04] Autohealing of NS
-Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
-Force Tags   heal_04   cluster_main   daily   regression
+
 Library   OperatingSystem
 Library   String
 Library   Collections
 Library   Process
 Library   SSHLibrary
+
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/vnfd_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/vnf_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/nsd_lib.robot
@@ -26,6 +26,11 @@ 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_04   cluster_heal   daily
+
+Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
+
+
 *** Variables ***
 # NS and VNF descriptor package folder and ids
 ${vnfd_pkg}   autoheal_vnf
@@ -50,6 +55,9 @@ ${success_return_code}   0
 ${healing_pol_time}   15sec
 ${healing_max_wait_time}   10m
 
+@{vim_vdus}   @{EMPTY}
+
+
 *** Test Cases ***
 Create VNF Descriptors
     Create VNFD   '%{PACKAGES_FOLDER}/${vnfd_pkg}'
@@ -73,6 +81,19 @@ Get NS Id
     END
 
 
+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
+    log Many   @{vim_vdus}
+
+
 Get VNF Info
     Variable Should Exist   ${ns_id}   msg=NS is not available
     ${ip_addr}=   Get Vnf Management Ip Address   ${ns_id}   ${vnf_index}
@@ -117,6 +138,21 @@ Check VNF After Healing
     Should Not Be Equal   ${id}   ${vdu_autoheal_id}   VDU id has not changed after healing
 
 
+Update VIM Objects
+    Variable Should Exist   ${ns_id}   msg=NS is not available
+    @{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}
+        FOR   ${id}   IN   @{vdu_ids}
+            IF   not "${id}" in "@{vim_vdus}"
+                Append To List   ${vim_vdus}   ${id}
+            END
+        END
+    END
+    log Many   @{vim_vdus}
+
+
 Delete NS Instance
     [Tags]   cleanup
     Delete NS   ${ns_name}
@@ -131,6 +167,25 @@ Delete VNF Descriptors
     [Tags]   cleanup
     Delete VNFD   ${vnfd_name}
 
+
+Delete Objects in VIM
+    [Tags]   cleanup
+    ${error}=   Set Variable   0
+    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