From 70a802a13a784d9e917582f626b74380c64945d4 Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Tue, 19 Oct 2021 09:48:23 +0200 Subject: [PATCH] Revert "Updated SA02 test: CPU threshold read from VNF package" This reverts commit 26954a2cc0efac7227cb7e165f7142017153a16d. Change-Id: Ied38cdc86e5a65ab73a6e4c97dbcbdc37652828a Signed-off-by: garciadeblas --- .../sa_02-vnf_with_vim_metrics_and_autoscaling_data.py | 5 +++-- .../sa_02-vnf_with_vim_metrics_and_autoscaling.robot | 10 ---------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/robot-systest/resources/sa_02-vnf_with_vim_metrics_and_autoscaling_data.py b/robot-systest/resources/sa_02-vnf_with_vim_metrics_and_autoscaling_data.py index 1824990..15a4477 100644 --- a/robot-systest/resources/sa_02-vnf_with_vim_metrics_and_autoscaling_data.py +++ b/robot-systest/resources/sa_02-vnf_with_vim_metrics_and_autoscaling_data.py @@ -21,8 +21,9 @@ from common_helpers import get_prometheus_info # Prometheus polling interval and retries prometheus_poll_retries = '15 times' prometheus_poll_timeout = '1 minute' -# Prometheus metric +# Prometheus metric and threshold metric_name = 'osm_cpu_utilization' +metric_threshold = 40 # Get ${HOME} from local machine home = str(Path.home()) # NS and VNF descriptor package folder @@ -32,7 +33,7 @@ nsd_pkg = 'hackfest_basic_metrics_ns' vnfd_name = 'hackfest_basic_metrics-vnf' nsd_name = 'hackfest_basic-ns-metrics' # NS instance name -ns_name = 'sa_02' +ns_name = 'sa_02-vnf_with_vim_metrics_and_autoscaling_test' # SSH keys to be used publickey = home + '/.ssh/id_rsa.pub' privatekey = home + '/.ssh/id_rsa' 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 2b5e662..fb9621c 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 @@ -37,7 +37,6 @@ ${vnf_member_index} 1 ${vnf_ip_addr} ${EMPTY} ${vnf_id} ${EMPTY} ${ns_config} {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] } -${success_return_code} 0 *** Test Cases *** @@ -47,15 +46,6 @@ Create VNF Descriptor 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 -- 2.25.1