X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fsa_01-vnf_with_vim_metrics.robot;h=29e5e8e3a64adf00194ba85b650d3a4fb1aac058;hb=refs%2Fheads%2Fsol006;hp=b51c209519308a8f03612c9d63c73536eadc0d85;hpb=e237747c32dc984935fc54711ce68368a22640ac;p=osm%2Ftests.git

diff --git a/robot-systest/testsuite/sa_01-vnf_with_vim_metrics.robot b/robot-systest/testsuite/sa_01-vnf_with_vim_metrics.robot
index b51c209..29e5e8e 100644
--- a/robot-systest/testsuite/sa_01-vnf_with_vim_metrics.robot
+++ b/robot-systest/testsuite/sa_01-vnf_with_vim_metrics.robot
@@ -25,7 +25,7 @@ Resource   %{ROBOT_DEVOPS_FOLDER}/lib/prometheus_lib.robot
 
 Variables   %{ROBOT_DEVOPS_FOLDER}/resources/sa_01-vnf_with_vim_metrics_data.py
 
-Suite Teardown   Run Keyword And Ignore Error   Test Cleanup
+Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 *** Variables ***
@@ -55,13 +55,15 @@ Instantiate Network Service
 Get VNF VIM-based Metrics
     [Tags]   vnf_vim_metrics   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_1_name}  msg=Prometheus first metric name is not available
     Variable Should Exist  ${metric_2_name}  msg=Prometheus second metric name is not available
-    ${metric_1_value}=  Wait Until Keyword Succeeds  6 times  2 minutes  Get Metric  ${prometheus_host}  ${prometheus_port}  ${metric_1_name}
+    ${metric_1_value}=  Wait Until Keyword Succeeds  ${prometheus_poll_retries}  ${prometheus_poll_timeout}  Get Metric  ${prometheus_host}  ${prometheus_port}  ${metric_1_name}
     Run Keyword Unless  ${metric_1_value} > 0  Fail  msg=The metric '${metric_1_name}' value is '${metric_1_value}'
-    ${metric_2_value}=  Wait Until Keyword Succeeds  6 times  2 minutes  Get Metric  ${prometheus_host}  ${prometheus_port}  ${metric_2_name}
+    ${metric_2_value}=  Wait Until Keyword Succeeds  ${prometheus_poll_retries}  ${prometheus_poll_timeout}  Get Metric  ${prometheus_host}  ${prometheus_port}  ${metric_2_name}
     Run Keyword Unless  ${metric_2_value} > 0  Fail  msg=The metric '${metric_2_name}' value is '${metric_2_value}'
 
 
@@ -84,13 +86,13 @@ Delete 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 Any Tests Failed  Delete NS  ${ns_name}
 
-    Run Keyword If Test Failed  Delete NSD  ${nsd_name}
+    Run Keyword If Any Tests Failed  Delete NSD  ${nsd_name}
 
-    Run Keyword If Test Failed  Delete VNFD  ${vnfd_name}
+    Run Keyword If Any Tests Failed  Delete VNFD  ${vnfd_name}