X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fsa_02-vnf_with_vim_metrics_and_autoscaling.robot;h=74b56ddf109a4fef6c737793be40aaba3a3b7e30;hb=fccb028b493afafb8a602953ed5125303423d3ff;hp=b5827df8abb24f25a4fa9b09688699548cfb76d2;hpb=d225e550e79fdbb9f667975102b17232eca893c1;p=osm%2Ftests.git

diff --git a/robot-systest/testsuite/sa_02-vnf_with_vim_metrics_and_autoscaling.robot b/robot-systest/testsuite/sa_02-vnf_with_vim_metrics_and_autoscaling.robot
index b5827df..74b56dd 100644
--- a/robot-systest/testsuite/sa_02-vnf_with_vim_metrics_and_autoscaling.robot
+++ b/robot-systest/testsuite/sa_02-vnf_with_vim_metrics_and_autoscaling.robot
@@ -11,7 +11,7 @@
 #   limitations under the License.
 
 *** Settings ***
-Documentation     [SA-02] VNF with VIM-based metrics and auto-scaling.
+Documentation   [SA-02] VNF with VIM-based metrics and auto-scaling.
 
 Library   OperatingSystem
 Library   String
@@ -26,123 +26,154 @@ Resource   %{ROBOT_DEVOPS_FOLDER}/lib/prometheus_lib.robot
 
 Variables   %{ROBOT_DEVOPS_FOLDER}/resources/sa_02-vnf_with_vim_metrics_and_autoscaling_data.py
 
+Force Tags   sa_02   cluster_sa   daily   regression   sanity
+
 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 and id
 ${ns_id}   ${EMPTY}
+${ns_name}   sa_02
+
+# SSH keys and username to be used
+${publickey}   %{HOME}/.ssh/id_rsa.pub
+${privatekey}   %{HOME}/.ssh/id_rsa
 ${username}   ubuntu
 ${password}   osm4u
-${vnf_member_index}   1
+
+# Prometheus polling interval and retries
+${prometheus_poll_retries}   15 times
+${prometheus_poll_timeout}   1 minute
+
+# Prometheus metrics to retrieve
+${metric_name}   osm_cpu_utilization
+
+# VNF Variables
+${vnf_member_index}   vnf
 ${vnf_ip_addr}   ${EMPTY}
 ${vnf_id}   ${EMPTY}
-${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
+
+${success_return_code}   0
 
 
 *** Test Cases ***
 Create VNF Descriptor
-    [Tags]   vnf_vim_metrics_autoscaling   sanity   regression
 
-    Create VNFD  '%{PACKAGES_FOLDER}/${vnfd_pkg}'
+    Create VNFD   '%{PACKAGES_FOLDER}/${vnfd_pkg}'
+
+
+Get Scale-Out Threshold From VNF
+
+    ${rc}   ${stdout}=   Run and Return RC and Output   osm vnfpkg-show ${vnfd_name} --literal | yq '.df[0]."scaling-aspect"[0]."scaling-policy"[0]."scaling-criteria"[0]."scale-out-threshold"' | tr -d \\"
+    Should Be Equal As Integers   ${rc}   ${success_return_code}   msg=${stdout}   values=False
+    ${scaleout_threshold}=   Convert To Number   ${stdout}
+    Set Suite Variable   ${metric_threshold}   ${scaleout_threshold}
+    log   ${metric_threshold}
 
 
 Create NS Descriptor
-    [Tags]   vnf_vim_metrics_autoscaling   sanity   regression
 
-    Create NSD  '%{PACKAGES_FOLDER}/${nsd_pkg}'
+    Create NSD   '%{PACKAGES_FOLDER}/${nsd_pkg}'
 
 
 Instantiate Network Service
-    [Tags]   vnf_vim_metrics_autoscaling   sanity   regression
 
-    ${id}=  Create Network Service  ${nsd_name}  %{VIM_TARGET}  ${ns_name}  ${ns_config}  ${publickey}
-    Set Suite Variable  ${ns_id}  ${id}
+    ${id}=   Create Network Service   ${nsd_name}   %{VIM_TARGET}   ${ns_name}   ${ns_config}   ${publickey}
+    Set Suite Variable   ${ns_id}   ${id}
 
 
 Get VNF Id
-    [Tags]   vnf_vim_metrics_autoscaling   sanity   regression
 
-    @{vnfr_list}=  Get Ns Vnfr Ids  ${ns_id}
-    Log List  ${vnfr_list}
+    @{vnfr_list}=   Get Ns Vnfr Ids   ${ns_id}
+    Log List   ${vnfr_list}
     Set Suite Variable   ${vnf_id}   ${vnfr_list}[0]
 
 
 Get VNF IP Address
-    [Tags]   vnf_vim_metrics_autoscaling   sanity   regression
 
-    ${ip_addr}=  Get Vnf Management Ip Address   ${ns_id}   ${vnf_member_index}
+    ${ip_addr}=   Get Vnf Management Ip Address   ${ns_id}   ${vnf_member_index}
     log   ${ip_addr}
     Set Suite Variable   ${vnf_ip_addr}   ${ip_addr}
 
 
 Get VNF VIM-based Metric Before Auto-scaling
-    [Tags]   vnf_vim_metrics_autoscaling   sanity   regression
 
-    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}
-    Run Keyword Unless  ${metric_value} > 0  Fail  msg=The metric '${metric_name}' value is '${metric_value}'
-    Run Keyword Unless  ${metric_value} < ${metric_threshold}  Fail  msg=The metric '${metric_name}' value is higher than '${metric_threshold}' before scaling
+    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   ${prometheus_poll_retries}   ${prometheus_poll_timeout}   Get Metric   ${prometheus_host}   ${prometheus_port}   ${metric_name}
+    Run Keyword If   ${metric_value} <= 0   Fail   msg=The metric '${metric_name}' value is '${metric_value}'
+    Run Keyword If   ${metric_value} >= ${metric_threshold}   Fail   msg=The metric '${metric_name}' value is higher than '${metric_threshold}' before scaling
 
 
 Increase VIM-based Metric To Force Auto-scaling
-    [Tags]   vnf_vim_metrics_autoscaling   sanity   regression
 
-    Variable Should Exist  ${privatekey}  msg=SSH private key not available
+    Variable Should Exist   ${privatekey}   msg=SSH private key not available
     Execute Remote Command Check Rc Return Output   ${vnf_ip_addr}   ${username}   ${password}   ${privatekey}   for i in {1..9}; do yes > /dev/null & done
 
 
 Wait VIM-based Metric To Exceed Threshold
-    [Tags]   vnf_vim_metrics_autoscaling   sanity   regression
 
-    Wait Until Keyword Succeeds  6 times  2 minutes  Check VIM-based Metric Exceeds Threshold
+    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
+    Wait Until Keyword Succeeds   ${prometheus_poll_retries}   ${prometheus_poll_timeout}   Check VIM-based Metric Exceeds Threshold
 
 
 Get VDUs After Auto-scaling
-    [Tags]   vnf_vim_metrics_autoscaling   sanity   regression
 
-    Sleep  1 minute  Wait for auto-scale to take place
-    @{vdur_list}=  Get Vnf Vdur Names  ${vnf_id}
-    Log List  ${vdur_list}
-    ${vdurs}=  Get Length  ${vdur_list}
-    Run Keyword Unless  ${vdurs} > 1  Fail  msg=There is no new VDU after auto-scaling
+    Sleep   2 minutes   Wait for auto-scale to take place
+    @{vdur_list}=   Get Vnf Vdur Names   ${vnf_id}
+    Log List   ${vdur_list}
+    ${vdurs}=   Get Length   ${vdur_list}
+    Run Keyword If   ${vdurs} <= 1   Fail   msg=There is no new VDU after auto-scaling
 
 
 Delete NS Instance
-    [Tags]   vnf_vim_metrics_autoscaling   sanity   regression  cleanup
+    [Tags]   cleanup
 
-    Delete NS  ${ns_name}
+    Delete NS   ${ns_name}
 
 
 Delete NS Descriptor
-    [Tags]   vnf_vim_metrics_autoscaling   sanity   regression  cleanup
+    [Tags]   cleanup
 
-    Delete NSD  ${nsd_name}
+    Delete NSD   ${nsd_name}
 
 
 Delete VNF Descriptor
-    [Tags]   vnf_vim_metrics_autoscaling   sanity   regression  cleanup
+    [Tags]   cleanup
 
-    Delete VNFD  ${vnfd_name}
+    Delete VNFD   ${vnfd_name}
 
 
 *** Keywords ***
 Suite Cleanup
-    [Documentation]  Test Suite Cleanup: Deleting descriptors and NS instance
+    [Documentation]   Test Suite Cleanup: Deleting descriptors and NS instance
 
-    Run Keyword If Any Tests Failed  Delete NS  ${ns_name}
-    Run Keyword If Any Tests Failed  Delete NSD  ${nsd_name}
-    Run Keyword If Any Tests Failed  Delete VNFD  ${vnfd_name}
+    Run Keyword If Any Tests Failed   Delete NS   ${ns_name}
+    Run Keyword If Any Tests Failed   Delete NSD   ${nsd_name}
+    Run Keyword If Any Tests Failed   Delete VNFD   ${vnfd_name}
 
 
 Check VIM-based Metric Exceeds Threshold
-    [Documentation]  Auxiliar keyword to check if metric exceeds threshold
+    [Documentation]   Auxiliar keyword to check if metric exceeds threshold
 
-    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}=  Get Metric  ${prometheus_host}  ${prometheus_port}  ${metric_name}
-    Run Keyword Unless  ${metric_value} > ${metric_threshold}  Fail  msg=The metric '${metric_name}' value is '${metric_value}' which is lower than '${metric_threshold}'
+    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}=   Get Metric   ${prometheus_host}   ${prometheus_port}   ${metric_name}
+    Run Keyword If   ${metric_value} <= ${metric_threshold}   Fail   msg=The metric '${metric_name}' value is '${metric_value}' which is lower than '${metric_threshold}'