X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fsa_01-vnf_with_vim_metrics.robot;h=df04d4e5a0014aa54709e37373b76c064dac8c54;hb=61bbf92c1b2a4563f1636f053a4846b669161714;hp=0eb546b12aa0e664474b1278868f1393f11aed73;hpb=f4ebaa88025189ede4f073ab8a1f27c95efff867;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 0eb546b..df04d4e 100644
--- a/robot-systest/testsuite/sa_01-vnf_with_vim_metrics.robot
+++ b/robot-systest/testsuite/sa_01-vnf_with_vim_metrics.robot
@@ -31,8 +31,30 @@ 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
+${ns_name}   sa_01-vnf_with_vim_metrics_test
+
+# SSH keys and username to be used
+${publickey}   %{HOME}/.ssh/id_rsa.pub
+${privatekey}   %{HOME}/.ssh/id_rsa
+
+# Prometheus polling interval and retries
+${prometheus_poll_retries}   15 times
+${prometheus_poll_timeout}   1 minute
+
+# Prometheus metrics to retrieve
+${metric_1_name}   osm_cpu_utilization
+${metric_2_name}   osm_average_memory_utilization
+
 
 *** Test Cases ***
 Create VNF Descriptor
@@ -60,9 +82,9 @@ Get VNF VIM-based Metrics
     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   ${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}'
+    Run Keyword If   ${metric_1_value} <= 0   Fail   msg=The metric '${metric_1_name}' value is '${metric_1_value}'
     ${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}'
+    Run Keyword If   ${metric_2_value} <= 0   Fail   msg=The metric '${metric_2_name}' value is '${metric_2_value}'
 
 
 Delete NS Instance