X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fsa_02-vnf_with_vim_metrics_and_autoscaling.robot;h=d5508103a1b059387a4ab827d8034cfed952a392;hb=84feb01d10d9dd59174c20f374192899236d784d;hp=ec2a6a3c77705f6284d376701ff5f11f5f4508cd;hpb=f4ebaa88025189ede4f073ab8a1f27c95efff867;p=osm%2Ftests.git

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 ec2a6a3..d550810 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
@@ -32,13 +32,37 @@ Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 *** Variables ***
+# NS instantiation parameters
+${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
+
+# NS and VNF descriptor package folder and ids
+${vnfd_pkg}   hackfest_basic_metrics_vnf
+${vnfd_name}   hackfest_basic_metrics-vnf
+${nsd_pkg}   hackfest_basic_metrics_ns
+${nsd_name}   hackfest_basic-ns-metrics
+
+# NS instance name and id
 ${ns_id}   ${EMPTY}
+${ns_name}   sa_02
+
+# SSH keys and username to be used
+${publickey}   %{HOME}/.ssh/id_rsa.pub
+${privatekey}   %{HOME}/.ssh/id_rsa
 ${username}   ubuntu
 ${password}   osm4u
+
+# Prometheus polling interval and retries
+${prometheus_poll_retries}   15 times
+${prometheus_poll_timeout}   1 minute
+
+# Prometheus metrics to retrieve
+${metric_name}   osm_cpu_utilization
+
+# VNF Variables
 ${vnf_member_index}   vnf
 ${vnf_ip_addr}   ${EMPTY}
 ${vnf_id}   ${EMPTY}
-${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
+
 ${success_return_code}   0
 
 
@@ -54,7 +78,7 @@ Get Scale-Out Threshold From VNF
     Should Be Equal As Integers   ${rc}   ${success_return_code}   msg=${stdout}   values=False
     ${scaleout_threshold}=   Convert To Number   ${stdout}
     Set Suite Variable   ${metric_threshold}   ${scaleout_threshold}
-    log   ${metric_threshold}
+    Log   ${metric_threshold}
 
 
 Create NS Descriptor
@@ -78,7 +102,7 @@ Get VNF Id
 Get VNF IP Address
 
     ${ip_addr}=   Get Vnf Management Ip Address   ${ns_id}   ${vnf_member_index}
-    log   ${ip_addr}
+    Log   ${ip_addr}
     Set Suite Variable   ${vnf_ip_addr}   ${ip_addr}
 
 
@@ -89,9 +113,9 @@ Get VNF VIM-based Metric Before Auto-scaling
     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   ${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
+    ${metric_value}=   Wait Until Keyword Succeeds   ${prometheus_poll_retries}   ${prometheus_poll_timeout}   Get Metric   ${prometheus_host}   ${prometheus_port}   ${prometheus_user}   ${prometheus_password}   ${metric_name}
+    Run Keyword If   ${metric_value} <= 0   Fail   msg=The metric '${metric_name}' value is '${metric_value}'
+    Run Keyword If   ${metric_value} >= ${metric_threshold}   Fail   msg=The metric '${metric_name}' value is higher than '${metric_threshold}' before scaling
 
 
 Increase VIM-based Metric To Force Auto-scaling
@@ -113,7 +137,7 @@ Get VDUs After Auto-scaling
     @{vdur_list}=   Get Vnf Vdur Names   ${vnf_id}
     Log List   ${vdur_list}
     ${vdurs}=   Get Length   ${vdur_list}
-    Run Keyword Unless   ${vdurs} > 1   Fail   msg=There is no new VDU after auto-scaling
+    Run Keyword If   ${vdurs} <= 1   Fail   msg=There is no new VDU after auto-scaling
 
 
 Delete NS Instance
@@ -149,7 +173,7 @@ Check VIM-based Metric Exceeds Threshold
     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}=   Get Metric   ${prometheus_host}   ${prometheus_port}   ${metric_name}
-    Run Keyword Unless   ${metric_value} > ${metric_threshold}   Fail   msg=The metric '${metric_name}' value is '${metric_value}' which is lower than '${metric_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}'