heal_01 and heal_02: changed VDU status prior to healing

Change-Id: I4dd6d1778488cd764c8cc7030e838998c5b54bde
Signed-off-by: aguilard <e.dah.tid@telefonica.com>

diff --git a/robot-systest/lib/openstack_lib.robot b/robot-systest/lib/openstack_lib.robot
index ff02b29..172e105 100644 (file)
--- a/robot-systest/lib/openstack_lib.robot
+++ b/robot-systest/lib/openstack_lib.robot
@@ -115,6 +115,7 @@ Stop Server
     Should Be Equal As Integers   ${rc}   ${success_return_code}
     [Return]   ${stdout}
 
+
 Halt Server
     [Documentation]   Reset a server
     [Arguments]   ${server_id}
@@ -124,3 +125,16 @@ Halt Server
     log   ${stdout}
     Should Be Equal As Integers   ${rc}   ${success_return_code}
     [Return]   ${stdout}
+
+
+Delete Server
+    [Documentation]   Delete a server
+    [Arguments]   ${server_id}
+
+    Should Not Be Empty   ${server_id}
+    ${rc}   ${stdout}=   Run and Return RC and Output   openstack server delete ${server_id}
+    log   ${stdout}
+    Should Be Equal As Integers   ${rc}   ${success_return_code}
+    [Return]   ${stdout}
+
+

diff --git a/robot-systest/testsuite/heal_01-volume_vdu_healing.robot b/robot-systest/testsuite/heal_01-volume_vdu_healing.robot
index 13e662b..04fe06d 100644 (file)
--- a/robot-systest/testsuite/heal_01-volume_vdu_healing.robot
+++ b/robot-systest/testsuite/heal_01-volume_vdu_healing.robot
@@ -124,10 +124,10 @@ Check VDU Disks
     Run Keyword If   ${num_lines} < ${vnf_num_volumes}   Fail   msg=Number of disks (${num_lines}) is less than specified in VDU (${vnf_num_volumes})
 
 
-Stop Persistent Volume VDU
+Delete Persistent Volume VDU
     [Tags]   verify
     Variable Should Exist   ${vdu_volumes_id}   msg=VDU is not available
-    Stop Server   ${vdu_volumes_id}
+    Delete Server   ${vdu_volumes_id}
     Sleep   20
 
 

diff --git a/robot-systest/testsuite/heal_02-scale_vdu_healing.robot b/robot-systest/testsuite/heal_02-scale_vdu_healing.robot
index c7bd157..191b72e 100644 (file)
--- a/robot-systest/testsuite/heal_02-scale_vdu_healing.robot
+++ b/robot-systest/testsuite/heal_02-scale_vdu_healing.robot
@@ -118,10 +118,10 @@ Get Charm VNF Info
     Set Suite Variable   @{charm_ip_list}   @{charm_ip_list}
 
 
-Stop Charm VDU
+Halt Charm VDU
     [Tags]   verify
     Variable Should Exist   @{vdu_charm_ids}   msg=VDU is not available
-    Stop Server   ${vdu_charm_ids}[1]
+    Halt Server   ${vdu_charm_ids}[1]
     Sleep   15