From a86e6938d53e345b08a7ca9cc9615115f14a002a Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Fri, 19 May 2023 12:47:09 +0200 Subject: [PATCH] Update SA02 to take into account the VNF threshold-time Change-Id: Idde7fa330e8e9b141053c15edb266817c4e699c6 Signed-off-by: garciadeblas --- ...vnf_with_vim_metrics_and_autoscaling.robot | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) 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 d550810..3d1a3b3 100644 --- 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 @@ -72,7 +72,7 @@ Create VNF Descriptor Create VNFD '%{PACKAGES_FOLDER}/${vnfd_pkg}' -Get Scale-Out Threshold From VNF +Get Thresholds From VNF ${rc} ${stdout}= Run and Return RC and Output osm vnfpkg-show ${vnfd_name} --literal | yq '.df[0]."scaling-aspect"[0]."scaling-policy"[0]."scaling-criteria"[0]."scale-out-threshold"' | tr -d \\" Should Be Equal As Integers ${rc} ${success_return_code} msg=${stdout} values=False @@ -80,6 +80,12 @@ Get Scale-Out Threshold From VNF Set Suite Variable ${metric_threshold} ${scaleout_threshold} Log ${metric_threshold} + ${rc} ${stdout}= Run and Return RC and Output osm vnfpkg-show ${vnfd_name} --literal | yq '.df[0]."scaling-aspect"[0]."scaling-policy"[0]."threshold-time"' | tr -d \\" + Should Be Equal As Integers ${rc} ${success_return_code} msg=${stdout} values=False + ${threshold_time_value}= Convert To Number ${stdout} + Set Suite Variable ${threshold_time} ${threshold_time_value} + Log ${threshold_time} + Create NS Descriptor @@ -131,6 +137,17 @@ Wait VIM-based Metric To Exceed Threshold Wait Until Keyword Succeeds ${prometheus_poll_retries} ${prometheus_poll_timeout} Check VIM-based Metric Exceeds Threshold +Wait Threshold Time + + ${threshold_time_sleep}= Evaluate ${threshold_time} + 1 + Sleep ${threshold_time_sleep} minutes Wait scale-out threshold time plus 1 minute + + +Check VIM-based Metric Exceeds Threshold After Threshold-time + + Check VIM-based Metric Exceeds Threshold + + Get VDUs After Auto-scaling Sleep 2 minutes Wait for auto-scale to take place @@ -176,4 +193,3 @@ Check VIM-based Metric Exceeds Threshold ${metric_value}= Get Metric ${prometheus_host} ${prometheus_port} ${prometheus_user} ${prometheus_password} ${metric_name} Run Keyword If ${metric_value} <= ${metric_threshold} Fail msg=The metric '${metric_name}' value is '${metric_value}' which is lower than '${metric_threshold}' - -- 2.17.1