Fixes tests QUOTAS-01, BASIC-08 and hackfest_cloudinit for SOL006

[osm/tests.git] / robot-systest / testsuite / sa_02-vnf_with_vim_metrics_and_autoscaling.robot

diff --git a/robot-systest/testsuite/sa_02-vnf_with_vim_metrics_and_autoscaling.robot b/robot-systest/testsuite/sa_02-vnf_with_vim_metrics_and_autoscaling.robot
index 57cb8e6..449722b 100644 (file)
--- a/robot-systest/testsuite/sa_02-vnf_with_vim_metrics_and_autoscaling.robot
+++ b/robot-systest/testsuite/sa_02-vnf_with_vim_metrics_and_autoscaling.robot
@@ -26,7 +26,7 @@ Resource   %{ROBOT_DEVOPS_FOLDER}/lib/prometheus_lib.robot
 
 Variables   %{ROBOT_DEVOPS_FOLDER}/resources/sa_02-vnf_with_vim_metrics_and_autoscaling_data.py
 
-Suite Teardown   Run Keyword And Ignore Error   Test Cleanup
+Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 *** Variables ***
@@ -78,10 +78,12 @@ Get VNF IP Address
 Get VNF VIM-based Metric Before Auto-scaling
     [Tags]   vnf_vim_metrics_autoscaling   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}'
     Run Keyword Unless  ${metric_value} < ${metric_threshold}  Fail  msg=The metric '${metric_name}' value is higher than '${metric_threshold}' before scaling
 
@@ -96,7 +98,9 @@ Increase VIM-based Metric To Force Auto-scaling
 Wait VIM-based Metric To Exceed Threshold
     [Tags]   vnf_vim_metrics_autoscaling   sanity   regression
 
-    Wait Until Keyword Succeeds  6 times  2 minutes  Check VIM-based Metric Exceeds Threshold
+    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
+    Wait Until Keyword Succeeds  ${prometheus_poll_retries}  ${prometheus_poll_timeout}  Check VIM-based Metric Exceeds Threshold
 
 
 Get VDUs After Auto-scaling
@@ -128,12 +132,12 @@ 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 Test Failed  Delete NSD  ${nsd_name}
-    Run Keyword If Test Failed  Delete VNFD  ${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}
 
 
 Check VIM-based Metric Exceeds Threshold