From 3aa529f05fe21d33ae5787dc3e887f3a466d1fed Mon Sep 17 00:00:00 2001 From: Alexis Romero Date: Thu, 7 Apr 2022 14:49:27 +0200 Subject: [PATCH] Tests Basic 24: Fix for format error using yq Change-Id: I8b28a85ef10923f7e98f0053694b6520e46f440b Signed-off-by: Alexis Romero --- robot-systest/lib/ns_lib.robot | 4 ++-- robot-systest/lib/vnf_lib.robot | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/robot-systest/lib/ns_lib.robot b/robot-systest/lib/ns_lib.robot index 49ac445..4d6b16f 100644 --- a/robot-systest/lib/ns_lib.robot +++ b/robot-systest/lib/ns_lib.robot @@ -294,10 +294,10 @@ Get VDU Affinity Group Name [Arguments] ${ns_name} ${vnf_id} ${vdur_id} - ${rc} ${affinity_group_id}= Run and Return RC and Output osm vnf-show ${vnf_id} --literal | yq eval '.vdur[] | select(.id == "${vdur_id}") | .affinity-or-anti-affinity-group-id[0]' 2>&1 + ${rc} ${affinity_group_id}= Run and Return RC and Output osm vnf-show ${vnf_id} --literal | yq '.vdur[] | select(.id == "'${vdur_id}'")' | yq '."affinity-or-anti-affinity-group-id"[0]' | tr -d \\" 2>&1 log ${affinity_group_id} Should Be Equal As Integers ${rc} ${success_return_code} msg=${affinity_group_id} values=False - ${rc} ${affinity_group_name}= Run and Return RC and Output osm ns-show ${ns_name} --literal | yq eval '.affinity-or-anti-affinity-group[] | select(.id == ${affinity_group_id}) | .name' 2>&1 + ${rc} ${affinity_group_name}= Run and Return RC and Output osm ns-show ${ns_name} --literal | yq '."affinity-or-anti-affinity-group"[] | select(.id == "'${affinity_group_id}'")' | yq '.name' | tr -d \\" 2>&1 log ${affinity_group_name} Should Be Equal As Integers ${rc} ${success_return_code} msg=${affinity_group_name} values=False [Return] ${affinity_group_name} diff --git a/robot-systest/lib/vnf_lib.robot b/robot-systest/lib/vnf_lib.robot index f58cd61..05e9050 100644 --- a/robot-systest/lib/vnf_lib.robot +++ b/robot-systest/lib/vnf_lib.robot @@ -44,7 +44,7 @@ Get VDU VIM Id [Arguments] ${vnf_id} ${vdur_id} Should Not Be Empty ${vnf_id} - ${rc} ${vm_vim_id}= Run and Return RC and Output osm vnf-show ${vnf_id} --literal | yq eval '.vdur[] | select(.id == "${vdur_id}") | .vim-id' + ${rc} ${vm_vim_id}= Run and Return RC and Output osm vnf-show ${vnf_id} --literal | yq '.vdur[] | select(.id == "'${vdur_id}'")' | yq '."vim-id"' | tr -d \\" log ${vm_vim_id} Should Be Equal As Integers ${rc} ${success_return_code} msg=${vm_vim_id} values=False [Return] ${vm_vim_id} -- 2.17.1