X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=robot-systest%2Ftestsuite%2Fsa_08-vnf_with_vnf_indicators_snmp.robot;h=ea8873c0d113864d1ad3647a4f0c3d9d1fcdeb9f;hb=bbae1a7e282f0dbaf808bf0eba27cf4aa5023523;hp=959e2ee794451e5405a2c14289d62801d1e79508;hpb=f4ebaa88025189ede4f073ab8a1f27c95efff867;p=osm%2Ftests.git

diff --git a/robot-systest/testsuite/sa_08-vnf_with_vnf_indicators_snmp.robot b/robot-systest/testsuite/sa_08-vnf_with_vnf_indicators_snmp.robot
index 959e2ee..ea8873c 100644
--- a/robot-systest/testsuite/sa_08-vnf_with_vnf_indicators_snmp.robot
+++ b/robot-systest/testsuite/sa_08-vnf_with_vnf_indicators_snmp.robot
@@ -23,16 +23,35 @@ 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_08-vnf_with_vnf_indicators_snmp_data.py
-
 Force Tags   sa_08   cluster_k8s   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}   snmp_ee_vnf
+${vnfd_name}   snmp_ee-vnf
+${nsd_pkg}   snmp_ee_ns
+${nsd_name}   snmp_ee-ns
+
+# NS instance name
+${ns_name}   sa_08-vnf_with_vnf_indicators_snmp_test
+
+# Prometheus polling interval and retries
+${prometheus_poll_retries}   10 times
+${prometheus_poll_timeout}   1 minute
+
+# Prometheus metrics to retrieve
+${metric_1_name}   ifInOctets
+${metric_1_filter}   ifIndex=1
+${metric_2_name}   ifMtu
+${metric_2_filter}   ifIndex=2
+
 
 *** Test Cases ***
 Create VNF Descriptor
@@ -57,10 +76,10 @@ Get VNF SNMP 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   6 times   1 minutes   Get Metric   ${prometheus_host}   ${prometheus_port}   ${metric_1_name}   ${metric_1_filter}
-    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   6 times   1 minutes   Get Metric   ${prometheus_host}   ${prometheus_port}   ${metric_2_name}   ${metric_2_filter}
-    Run Keyword Unless   ${metric_2_value} > 0   Fail   msg=The metric '${metric_2_name}' value is '${metric_2_value}'
+    ${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_1_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_2_filter}
+    Run Keyword If   ${metric_2_value} <= 0   Fail   msg=The metric '${metric_2_name}' value is '${metric_2_value}'
 
 
 Delete NS Instance
@@ -82,6 +101,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