X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fsa_07-alarms_from_sa-related_vnfs.robot;h=b6679e03bd4d2621aec77b9d1ca94e50934dd877;hb=7656da9dea8a9255a4d95aecd810a0570f72edd8;hp=bc09c1ccd2103d81e25c1004b5e8f8499d8045ad;hpb=f4ebaa88025189ede4f073ab8a1f27c95efff867;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 bc09c1c..b6679e0 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
@@ -32,16 +32,52 @@ 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}   cirros_alarm_vnf
+${vnfd_name}   cirros_alarm-vnf
+${vnfd_file}   cirros_alarm_vnfd.yaml
+${new_vnfd_pkg}   new_cirros_alarm_vnf
+${nsd_pkg}   cirros_alarm_ns
+${nsd_name}   cirros_alarm-ns
+
+# NS instance name and id
 ${ns_id}   ${EMPTY}
+${ns_name}   sa_07-alarm_test
+
+# Webhook NS and VNF descriptor package folder and ids
+${ws_vnfd_pkg}   hackfest_basic_vnf
+${ws_nsd_pkg}   hackfest_basic_ns
+${ws_vnfd_name}   hackfest_basic-vnf
+${ws_nsd_name}   hackfest_basic-ns
+
+# Webhook NS instance name and id
 ${ws_ns_id}   ${EMPTY}
+${ws_ns_name}   sa_07-webhook_service_test
+
+# Webhook NS Variables
+${ws_vnf_member_index}   vnf
+${ws_vnf_ip_addr}   ${EMPTY}
+${ws_log_file}   webhook.log
+${ws_port}   5212
+${ws_alarm_msg}   notify_alarm
+
+# SSH keys and username to be used
+${publickey}   %{HOME}/.ssh/id_rsa.pub
+${privatekey}   %{HOME}/.ssh/id_rsa
 ${username}   ubuntu
 ${password}   ${EMPTY}
-${vnf_member_index}   vnf
-${ws_vnf_ip_addr}   ${EMPTY}
+
+# Prometheus polling interval and retries
+${prometheus_poll_retries}   15 times
+${prometheus_poll_timeout}   1 minute
+
+# Prometheus metrics to retrieve
+${metric_name}   osm_cpu_utilization
+
 ${success_return_code}   0
-${alarm_msg}   notify_alarm
-${ws_log_file}   webhook.log
-${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
 
 
 *** Test Cases ***
@@ -63,8 +99,8 @@ Instantiate Webhook Service Network Service
 
 Get Webhook Service VNF IP Address
 
-    ${ip_addr}=   Get Vnf Management Ip Address   ${ws_ns_id}   ${vnf_member_index}
-    log   ${ip_addr}
+    ${ip_addr}=   Get Vnf Management Ip Address   ${ws_ns_id}   ${ws_vnf_member_index}
+    Log   ${ip_addr}
     Set Suite Variable   ${ws_vnf_ip_addr}   ${ip_addr}
 
 
@@ -72,13 +108,13 @@ Start Webhook Service
 
     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}   while true; do { echo -e 'HTTP/1.1 200 OK\r\n'; test; } | nc -l '${ws_port}'; done > '${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.0 200 OK\r\nContent-Length: 0\r\n\r\n'; test; } | nc -l '${ws_port}'; done > '${ws_log_file}' 2>&1 &
 
 
 Create VNF Descriptor
 
     ${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}
+    Log   ${stdout}
     Should Be Equal As Integers   ${rc}   ${success_return_code}
     Create VNFD   '%{PACKAGES_FOLDER}/${new_vnfd_pkg}'
 
@@ -101,13 +137,14 @@ Get Alarm Metric
     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   ${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}'
+    ${metric_filter}=   Set Variable   ns_id=${ns_id}
+    ${metric_value}=   Wait Until Keyword Succeeds   ${prometheus_poll_retries}   ${prometheus_poll_timeout}   Get Metric   ${prometheus_host}   ${prometheus_port}   ${prometheus_user}   ${prometheus_password}   ${metric_name}   ${metric_filter}
+    Run Keyword If   ${metric_value} <= 0   Fail   msg=The metric '${metric_name}' value is '${metric_value}'
 
 
 Check Alarms Were Received
 
-    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}'
+    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 '${ws_alarm_msg}' | grep '${ns_name}'
 
 
 Delete NS Instance
@@ -163,6 +200,6 @@ Delete Temporary Descriptor Folder
     [Documentation]   Removes the temporary package folder created for the test
     [Arguments]   ${folder_name}
     ${rc}   ${stdout}=   Run and Return RC and Output   rm -rf '${folder_name}'
-    log   ${stdout}
+    Log   ${stdout}