X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fsa_01-vnf_with_vim_metrics.robot;h=49b9273731be25ac71d209f4c632a51d45a181d4;hb=686ed53c7a0309b96adf3f15ea81b8ddbb5c2171;hp=d3404bdaa48ef75372fa337ef4752558de5b9005;hpb=d225e550e79fdbb9f667975102b17232eca893c1;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 d3404bd..49b9273 100644
--- a/robot-systest/testsuite/sa_01-vnf_with_vim_metrics.robot
+++ b/robot-systest/testsuite/sa_01-vnf_with_vim_metrics.robot
@@ -25,6 +25,8 @@ 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 Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
@@ -34,51 +36,49 @@ ${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
 
 *** Test Cases ***
 Create VNF Descriptor
-    [Tags]   vnf_vim_metrics   sanity   regression
 
     Create VNFD  '%{PACKAGES_FOLDER}/${vnfd_pkg}'
 
 
 Create NS Descriptor
-    [Tags]   vnf_vim_metrics   sanity   regression
 
     Create NSD  '%{PACKAGES_FOLDER}/${nsd_pkg}'
 
 
 Instantiate Network Service
-    [Tags]   vnf_vim_metrics   sanity   regression
 
     ${id}=  Create Network Service  ${nsd_name}  %{VIM_TARGET}  ${ns_name}  ${ns_config}  ${publickey}
     Set Suite Variable  ${ns_id}  ${id}
 
 
 Get VNF VIM-based Metrics
-    [Tags]   vnf_vim_metrics   sanity   regression
 
+    Variable Should Exist  ${prometheus_poll_retries}  msg=Metric polling retries is not available
+    Variable Should Exist  ${prometheus_poll_timeout}  msg=Metric polling timeout is not available
     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_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  2 minutes  Get Metric  ${prometheus_host}  ${prometheus_port}  ${metric_1_name}
+    ${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  6 times  2 minutes  Get Metric  ${prometheus_host}  ${prometheus_port}  ${metric_2_name}
+    ${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}'
 
 
 Delete NS Instance
-    [Tags]   vnf_vim_metrics   sanity   regression  cleanup
+    [Tags]   cleanup
 
     Delete NS  ${ns_name}
 
 
 Delete NS Descriptor
-    [Tags]   vnf_vim_metrics   sanity   regression  cleanup
+    [Tags]   cleanup
 
     Delete NSD  ${nsd_name}
 
 
 Delete VNF Descriptor
-    [Tags]   vnf_vim_metrics   sanity   regression  cleanup
+    [Tags]   cleanup
 
     Delete VNFD  ${vnfd_name}