Fix bug 1536: incorrect check SDNC status in EPA03

[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 b5827df..fb9621c 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
@@ -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,13 +98,15 @@ 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
     [Tags]   vnf_vim_metrics_autoscaling   sanity   regression
 
-    Sleep  1 minute  Wait for auto-scale to take place
+    Sleep  2 minutes  Wait for auto-scale to take place
     @{vdur_list}=  Get Vnf Vdur Names  ${vnf_id}
     Log List  ${vdur_list}
     ${vdurs}=  Get Length  ${vdur_list}