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=b5910f5fa4636e4f57da2f7f83423b1272aa47df;hb=23ff8f980f66ef57fb4d254336a018e3a697a187;hp=688eb027c83fd8268e3903cd63a3e03496e087d9;hpb=9553b6fa14f5e73d8dbf46d31ebcd8a796bfa005;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 688eb02..b5910f5 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 @@ -24,10 +24,9 @@ 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_02-vnf_with_vim_metrics_and_autoscaling_data.py - -Force Tags sa_02 cluster_sa daily regression sanity +Force Tags sa_02 cluster_sa daily regression sanity azure +Suite Setup Run Keyword And Ignore Error Suite Preparation Suite Teardown Run Keyword And Ignore Error Suite Cleanup @@ -128,7 +127,7 @@ Get VNF VIM-based Metric Before Auto-scaling Increase VIM-based Metric To Force Auto-scaling 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 + 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 @@ -177,6 +176,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 @@ -194,4 +199,3 @@ Check VIM-based Metric Exceeds Threshold ${metric_filter}= Set Variable ns_id=${ns_id} ${metric_value}= Get Metric ${prometheus_host} ${prometheus_port} ${prometheus_user} ${prometheus_password} ${metric_name} ${metric_filter} Run Keyword If ${metric_value} <= ${metric_threshold} Fail msg=The metric '${metric_name}' value is '${metric_value}' which is lower than '${metric_threshold}' -