X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fsa_07-alarms_from_sa-related_vnfs.robot;h=1f92e0d6641cd24b779fbfb7b23687d404e6871d;hb=refs%2Fchanges%2F14%2F10114%2F2;hp=ff4e73e5c58a27810fa67a480e6797fb0db6b10b;hpb=9ee77ea1d888c7b361b6d72efe70e739ff1ad5cc;p=osm%2Ftests.git

diff --git a/robot-systest/testsuite/sa_07-alarms_from_sa-related_vnfs.robot b/robot-systest/testsuite/sa_07-alarms_from_sa-related_vnfs.robot
index ff4e73e..1f92e0d 100644
--- a/robot-systest/testsuite/sa_07-alarms_from_sa-related_vnfs.robot
+++ b/robot-systest/testsuite/sa_07-alarms_from_sa-related_vnfs.robot
@@ -26,7 +26,7 @@ Resource   %{ROBOT_DEVOPS_FOLDER}/lib/prometheus_lib.robot
 
 Variables   %{ROBOT_DEVOPS_FOLDER}/resources/sa_07-alarms_from_sa-related_vnfs_data.py
 
-Suite Teardown   Run Keyword And Ignore Error   Test Cleanup
+Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 *** Variables ***
@@ -75,7 +75,7 @@ Start Webhook Service
 
     Variable Should Exist  ${privatekey}  msg=SSH private key not available
     Sleep   40 seconds   Wait for SSH daemon to be up
-    ${stdout}=   Execute Remote Command Check Rc Return Output   ${ws_vnf_ip_addr}   ${username}   ${password}   ${privatekey}   nc -lkv '${ws_port}' > '${ws_log_file}' 2>&1 &
+    ${stdout}=   Execute Remote Command Check Rc Return Output   ${ws_vnf_ip_addr}   ${username}   ${password}   ${privatekey}   while true; do { echo -e 'HTTP/1.1 200 OK\r\n'; test; } | nc -l '${ws_port}'; done > '${ws_log_file}' 2>&1 &
 
 
 Create VNF Descriptor
@@ -103,10 +103,12 @@ Instantiate Network Service
 Get Alarm Metric
     [Tags]   alarms_sa_related_vnfs   sanity   regression
 
+    Variable Should Exist  ${prometheus_poll_retries}  msg=Metric polling retries is not available
+    Variable Should Exist  ${prometheus_poll_timeout}  msg=Metric polling timeout is not available
     Variable Should Exist  ${prometheus_host}  msg=Prometheus address is not available
     Variable Should Exist  ${prometheus_port}  msg=Prometheus port is not available
     Variable Should Exist  ${metric_name}  msg=Prometheus metric name is not available
-    ${metric_value}=  Wait Until Keyword Succeeds  6 times  2 minutes  Get Metric  ${prometheus_host}  ${prometheus_port}  ${metric_name}
+    ${metric_value}=  Wait Until Keyword Succeeds  ${prometheus_poll_retries}  ${prometheus_poll_timeout}  Get Metric  ${prometheus_host}  ${prometheus_port}  ${metric_name}
     Run Keyword Unless  ${metric_value} > 0  Fail  msg=The metric '${metric_name}' value is '${metric_value}'
 
 
@@ -153,12 +155,22 @@ Delete Webhook Service VNF Descriptor
 
 
 *** Keywords ***
-Test Cleanup
+Suite Cleanup
     [Documentation]  Test Suite Cleanup: Deleting descriptors and NS instance
 
-    Run Keyword If Test Failed  Delete NS  ${ns_name}
-    Run Keyword If Test Failed  Delete NSD  ${nsd_name}
-    Run Keyword If Test Failed  Delete VNFD  ${vnfd_name}
-    Run Keyword If Test Failed  Delete NS  ${ws_ns_name}
-    Run Keyword If Test Failed  Delete NSD  ${ws_nsd_name}
-    Run Keyword If Test Failed  Delete VNFD  ${ws_vnfd_name}
+    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_name}
+    Run Keyword If Any Tests Failed  Delete NS  ${ws_ns_name}
+    Run Keyword If Any Tests Failed  Delete NSD  ${ws_nsd_name}
+    Run Keyword If Any Tests Failed  Delete VNFD  ${ws_vnfd_name}
+    Delete Temporary Descriptor Folder  '%{PACKAGES_FOLDER}/${new_vnfd_pkg}'
+
+
+Delete Temporary Descriptor Folder
+    [Documentation]  Removes the temporary package folder created for the test
+    [Arguments]   ${folder_name}
+    ${rc}   ${stdout}=   Run and Return RC and Output   rm -rf '${folder_name}'
+    log   ${stdout}
+
+