X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fsa_07-alarms_from_sa-related_vnfs.robot;h=632381758c139ff855f0551aee7640ecb10d461d;hb=f25782945b1e3db0a2442c572a5f8607bb42460e;hp=94ed0f103734564a23fabadafbff06ad92be6dd8;hpb=c469829f7446cf9f4383b2224369e26b1a376673;p=osm%2Ftests.git

diff --git a/robot-systest/testsuite/sa_07-alarms_from_sa-related_vnfs.robot b/robot-systest/testsuite/sa_07-alarms_from_sa-related_vnfs.robot
index 94ed0f1..6323817 100644
--- a/robot-systest/testsuite/sa_07-alarms_from_sa-related_vnfs.robot
+++ b/robot-systest/testsuite/sa_07-alarms_from_sa-related_vnfs.robot
@@ -26,6 +26,8 @@ Resource   %{ROBOT_DEVOPS_FOLDER}/lib/prometheus_lib.robot
 
 Variables   %{ROBOT_DEVOPS_FOLDER}/resources/sa_07-alarms_from_sa-related_vnfs_data.py
 
+Force Tags   sa_07   cluster_sa   daily   regression
+
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
@@ -34,7 +36,7 @@ ${ns_id}   ${EMPTY}
 ${ws_ns_id}   ${EMPTY}
 ${username}   ubuntu
 ${password}   ${EMPTY}
-${vnf_member_index}   1
+${vnf_member_index}   vnf
 ${ws_vnf_ip_addr}   ${EMPTY}
 ${success_return_code}   0
 ${alarm_msg}   notify_alarm
@@ -44,26 +46,22 @@ ${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
 
 *** Test Cases ***
 Create Webhook Service VNF Descriptor
-    [Tags]   alarms_sa_related_vnfs   sanity   regression
 
     Create VNFD  '%{PACKAGES_FOLDER}/${ws_vnfd_pkg}'
 
 
 Create Webhook Service NS Descriptor
-    [Tags]   alarms_sa_related_vnfs   sanity   regression
 
     Create NSD  '%{PACKAGES_FOLDER}/${ws_nsd_pkg}'
 
 
 Instantiate Webhook Service Network Service
-    [Tags]   alarms_sa_related_vnfs   sanity   regression
 
     ${id}=  Create Network Service  ${ws_nsd_name}  %{VIM_TARGET}  ${ws_ns_name}  ${ns_config}  ${publickey}
     Set Suite Variable  ${ws_ns_id}  ${id}
 
 
 Get Webhook Service VNF IP Address
-    [Tags]   alarms_sa_related_vnfs   sanity   regression
 
     ${ip_addr}=  Get Vnf Management Ip Address   ${ws_ns_id}   ${vnf_member_index}
     log   ${ip_addr}
@@ -71,15 +69,13 @@ Get Webhook Service VNF IP Address
 
 
 Start Webhook Service
-    [Tags]   alarms_sa_related_vnfs   sanity   regression
 
     Variable Should Exist  ${privatekey}  msg=SSH private key not available
     Sleep   40 seconds   Wait for SSH daemon to be up
-    ${stdout}=   Execute Remote Command Check Rc Return Output   ${ws_vnf_ip_addr}   ${username}   ${password}   ${privatekey}   nc -lkv '${ws_port}' > '${ws_log_file}' 2>&1 &
+    ${stdout}=   Execute Remote Command Check Rc Return Output   ${ws_vnf_ip_addr}   ${username}   ${password}   ${privatekey}   while true; do { echo -e 'HTTP/1.1 200 OK\r\n'; test; } | nc -l '${ws_port}'; done > '${ws_log_file}' 2>&1 &
 
 
 Create VNF Descriptor
-    [Tags]   alarms_sa_related_vnfs   sanity   regression
 
     ${rc}   ${stdout}=   Run and Return RC and Output   mkdir '%{PACKAGES_FOLDER}/${new_vnfd_pkg}' && WEBHOOK_URL="http://${ws_vnf_ip_addr}:${ws_port}" envsubst < '%{PACKAGES_FOLDER}/${vnfd_pkg}'/'${vnfd_file}' > '%{PACKAGES_FOLDER}/${new_vnfd_pkg}'/'${vnfd_file}'
     log   ${stdout}
@@ -88,66 +84,64 @@ Create VNF Descriptor
 
 
 Create NS Descriptor
-    [Tags]   alarms_sa_related_vnfs   sanity   regression
 
     Create NSD  '%{PACKAGES_FOLDER}/${nsd_pkg}'
 
 
 Instantiate Network Service
-    [Tags]   alarms_sa_related_vnfs   sanity   regression
 
     ${id}=  Create Network Service  ${nsd_name}  %{VIM_TARGET}  ${ns_name}  ${ns_config}  ${publickey}
     Set Suite Variable  ${ns_id}  ${id}
 
 
 Get Alarm Metric
-    [Tags]   alarms_sa_related_vnfs   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_name}  msg=Prometheus metric name is not available
-    ${metric_value}=  Wait Until Keyword Succeeds  6 times  2 minutes  Get Metric  ${prometheus_host}  ${prometheus_port}  ${metric_name}
+    ${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}'
 
 
 Check Alarms Were Received
-    [Tags]   alarms_sa_related_vnfs   sanity   regression
 
     Wait Until Keyword Succeeds  6 times  40 seconds  Execute Remote Command Check Rc Return Output   ${ws_vnf_ip_addr}   ${username}   ${password}   ${privatekey}   cat '${ws_log_file}' | grep '${alarm_msg}' | grep '${ns_name}'
 
 
 Delete NS Instance
-    [Tags]   alarms_sa_related_vnfs   sanity   regression  cleanup
+    [Tags]   cleanup
 
     Delete NS  ${ns_name}
 
 
 Delete NS Descriptor
-    [Tags]   alarms_sa_related_vnfs   sanity   regression  cleanup
+    [Tags]   cleanup
 
     Delete NSD  ${nsd_name}
 
 
 Delete VNF Descriptor
-    [Tags]   alarms_sa_related_vnfs   sanity   regression  cleanup
+    [Tags]   cleanup
 
     Delete VNFD  ${vnfd_name}
 
 
 Delete Webhook Service NS Instance
-    [Tags]   alarms_sa_related_vnfs   sanity   regression  cleanup
+    [Tags]   cleanup
 
     Delete NS  ${ws_ns_name}
 
 
 Delete Webhook Service NS Descriptor
-    [Tags]   alarms_sa_related_vnfs   sanity   regression  cleanup
+    [Tags]   cleanup
 
     Delete NSD  ${ws_nsd_name}
 
 
 Delete Webhook Service VNF Descriptor
-    [Tags]   alarms_sa_related_vnfs   sanity   regression  cleanup
+    [Tags]   cleanup
 
     Delete VNFD  ${ws_vnfd_name}