From: dhanasekaran <ragavi.d@tataelxsi.co.in>
Date: Sat, 18 Jun 2022 10:21:49 +0000 (+0000)
Subject: Robot fix for Autohealing tests
X-Git-Tag: v12.0.0rc1~9
X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Ftests.git;a=commitdiff_plain;h=b356eec6c46ac58228321f1ab6c307720e306a8c

Robot fix for Autohealing tests

This reverts commit d1d030c9a30bd1b274c3d17af2da2d79c5668e10.

Change-Id: I04be9df1cfd2c0d66118cbdd217caba59994d5f7
Signed-off-by: dhanasekaran <ragavi.d@tataelxsi.co.in>
---

diff --git a/robot-systest/lib/ns_lib.robot b/robot-systest/lib/ns_lib.robot
index c864218..98d514d 100644
--- a/robot-systest/lib/ns_lib.robot
+++ b/robot-systest/lib/ns_lib.robot
@@ -374,7 +374,6 @@ Get VDU Affinity Group Name
     Should Be Equal As Integers   ${rc}   ${success_return_code}   msg=${affinity_group_name}   values=False
     [Return]   ${affinity_group_name}
 
-
 Get Operations By Type
     [Documentation]   Keyword to get the operation by type
 
diff --git a/robot-systest/testsuite/heal_04-autohealing.robot b/robot-systest/testsuite/heal_04-autohealing.robot
index 024cd3d..73b8990 100644
--- a/robot-systest/testsuite/heal_04-autohealing.robot
+++ b/robot-systest/testsuite/heal_04-autohealing.robot
@@ -93,20 +93,16 @@ Get VNF Info
 Stop Autoheal VDU
     Variable Should Exist  ${vdu_autoheal_id}  msg=VDU is not available
     Halt Server   ${vdu_autoheal_id}
-    Sleep   20
+    Sleep   30
 
 
 Wait For Autohealing To Be Completed
-    FOR    ${Index}    IN RANGE    0    15
-        ${status}=    Run Keyword And Return Status    Get Operations By Type    ${ns_id}    heal
-        Run Keyword If  ${status}    Exit For Loop
-    ...  ELSE  Sleep    10
-    END
-    ${stdout}=    Get Operations By Type    ${ns_id}    heal
     ${healing_max_wait_time}=   Convert Time   ${healing_max_wait_time}   result_format=number
     ${healing_max_wait_time}=   Evaluate   ${healing_max_wait_time} * ${vim_timeout_multiplier}
-    Wait Until Keyword Succeeds  ${healing_max_wait_time}  ${healing_pol_time}  Check For NS Operation Ended  ${stdout}
-    Check For NS Operation Completed  ${stdout}
+    Wait Until Keyword Succeeds   ${healing_max_wait_time}   ${healing_pol_time}   Get Operations By Type   ${ns_id}   heal
+    ${stdout}=  Get Operations By Type   ${ns_id}   heal
+    Wait Until Keyword Succeeds   ${healing_max_wait_time}   ${healing_pol_time}   Check For NS Operation Ended   ${stdout}
+    Check For NS Operation Completed   ${stdout}
 
 
 Check VNF After Healing