Revert "Feature 11001: Robot framework linting for E2E tests"

[osm/tests.git] / robot-systest / testsuite / sa_01-vnf_with_vim_metrics.robot

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..2a98e13 100644 (file)
--- a/robot-systest/testsuite/sa_01-vnf_with_vim_metrics.robot
+++ b/robot-systest/testsuite/sa_01-vnf_with_vim_metrics.robot
@@ -23,16 +23,37 @@ Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ns_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/prometheus_lib.robot
 
-Variables   %{ROBOT_DEVOPS_FOLDER}/resources/sa_01-vnf_with_vim_metrics_data.py
-
 Force Tags   sa_01   cluster_sa   daily   regression
 
+Suite Setup   Run Keyword And Ignore Error   Suite Preparation
 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
@@ -59,10 +80,11 @@ Get VNF VIM-based Metrics
     Variable Should Exist   ${prometheus_port}   msg=Prometheus port is not available
     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}'
-    ${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}'
+    ${metric_filter}=   Set Variable   ns_id=${ns_id}
+    ${metric_1_value}=   Wait Until Keyword Succeeds   ${prometheus_poll_retries}   ${prometheus_poll_timeout}   Get Metric   ${prometheus_host}   ${prometheus_port}   ${prometheus_user}   ${prometheus_password}   ${metric_1_name}   ${metric_filter}
+    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}   ${prometheus_user}   ${prometheus_password}   ${metric_2_name}   ${metric_filter}
+    Run Keyword If   ${metric_2_value} <= 0   Fail   msg=The metric '${metric_2_name}' value is '${metric_2_value}'
 
 
 Delete NS Instance
@@ -84,6 +106,12 @@ Delete VNF Descriptor
 
 
 *** Keywords ***
+Suite Preparation
+    [Documentation]   Test Suite Preparation: Setting Prometheus Testsuite Variables
+
+    Set Testsuite Prometheus Variables
+
+
 Suite Cleanup
     [Documentation]   Test Suite Cleanup: Deleting descriptors and NS instance
 
@@ -92,5 +120,3 @@ Suite Cleanup
     Run Keyword If Any Tests Failed   Delete NSD   ${nsd_name}
 
     Run Keyword If Any Tests Failed   Delete VNFD   ${vnfd_name}
-
-