From 58710335f2db1e82ec171784891b7cbee71fd360 Mon Sep 17 00:00:00 2001 From: Mark Beierl Date: Wed, 3 Aug 2022 14:14:14 -0400 Subject: [PATCH] Bug 2132: Remove tags Heal tests should not have prepare/verify tags as those are used for upgrade testing, and so cannot be 'prepared' on older versions of OSM. Fixes Bug 2132 Change-Id: I4e886ceea798507a0afed8bf23b3f48074fd0f51 Signed-off-by: Mark Beierl --- .../heal_01-volume_vdu_healing.robot | 11 +- .../testsuite/heal_02-scale_vdu_healing.robot | 10 +- .../testsuite/heal_03-multiple_healing.robot | 11 +- .../testsuite/k8s_04-openldap_helm.robot | 15 +- .../k8s_12-openldap_helm_day-2.robot | 131 ++++++++++++++++++ 5 files changed, 137 insertions(+), 41 deletions(-) create mode 100644 robot-systest/testsuite/k8s_12-openldap_helm_day-2.robot diff --git a/robot-systest/testsuite/heal_01-volume_vdu_healing.robot b/robot-systest/testsuite/heal_01-volume_vdu_healing.robot index 04fe06d..f0270c0 100644 --- a/robot-systest/testsuite/heal_01-volume_vdu_healing.robot +++ b/robot-systest/testsuite/heal_01-volume_vdu_healing.robot @@ -58,24 +58,21 @@ ${success_return_code} 0 *** Test Cases *** Create VNF Descriptors - [Tags] prepare Create VNFD '%{PACKAGES_FOLDER}/${vnfd_charm_pkg}' Create VNFD '%{PACKAGES_FOLDER}/${vnfd_volumes_pkg}' Create NS Descriptor - [Tags] prepare Create NSD '%{PACKAGES_FOLDER}/${nsd_pkg}' Network Service Instance Test - [Tags] prepare ${id}= Create Network Service ${nsd_name} %{VIM_TARGET} ${ns_name} ${ns_config} ${publickey} Set Suite Variable ${ns_id} ${id} Get NS Id - [Tags] verify cleanup + [Tags] cleanup ${variables} Get Variables IF not "\${ns_id}" in "${variables}" ${id}= Get Ns Id ${ns_name} @@ -84,7 +81,6 @@ Get NS Id Get Volume VNF Info - [Tags] verify Variable Should Exist ${ns_id} msg=NS is not available ${ip_addr}= Get Vnf Management Ip Address ${ns_id} ${vnf_several_index} log ${ip_addr} @@ -102,7 +98,6 @@ Get Volume VNF Info Get Volumes Info - [Tags] verify ${rc} ${stdout}= Run and Return RC and Output osm vnfpkg-show ${vnfd_volumes_name} --literal | yq '.vdu[0]."virtual-storage-desc" | length' Should Be Equal As Integers ${rc} ${success_return_code} msg=${stdout} values=False ${num_virtual_storage}= Convert To Integer ${stdout} @@ -114,7 +109,6 @@ Get Volumes Info Check VDU Disks - [Tags] verify Variable Should Exist ${vnf_volumes_ip_addr} msg=VNF is not available Sleep 30 seconds Wait for SSH daemon to be up ${stdout}= Execute Remote Command Check Rc Return Output ${vnf_volumes_ip_addr} ${username} ${password} ${privatekey} sudo lsblk -l @@ -125,20 +119,17 @@ Check VDU Disks Delete Persistent Volume VDU - [Tags] verify Variable Should Exist ${vdu_volumes_id} msg=VDU is not available Delete Server ${vdu_volumes_id} Sleep 20 Heal Persistent Volume VDU - [Tags] verify Variable Should Exist ${vnf_volumes_id} msg=VNF is not available Heal Network Service ${ns_id} --vnf ${vnf_volumes_id} --cause "Heal VM of volumes_vnf" --vdu ${vdu_volumes_name} Check VNF After Healing - [Tags] verify Variable Should Exist ${vnf_volumes_id} msg=VNF is not available @{ip_list}= Get Vnf Vdur IPs ${vnf_volumes_id} diff --git a/robot-systest/testsuite/heal_02-scale_vdu_healing.robot b/robot-systest/testsuite/heal_02-scale_vdu_healing.robot index 191b72e..e7d6966 100644 --- a/robot-systest/testsuite/heal_02-scale_vdu_healing.robot +++ b/robot-systest/testsuite/heal_02-scale_vdu_healing.robot @@ -64,24 +64,21 @@ ${success_return_code} 0 *** Test Cases *** Create VNF Descriptors - [Tags] prepare Create VNFD '%{PACKAGES_FOLDER}/${vnfd_charm_pkg}' Create VNFD '%{PACKAGES_FOLDER}/${vnfd_volumes_pkg}' Create NS Descriptor - [Tags] prepare Create NSD '%{PACKAGES_FOLDER}/${nsd_pkg}' Network Service Instance Test - [Tags] prepare ${id}= Create Network Service ${nsd_name} %{VIM_TARGET} ${ns_name} ${ns_config} ${publickey} Set Suite Variable ${ns_id} ${id} Get NS Id - [Tags] verify cleanup + [Tags] cleanup ${variables} Get Variables IF not "\${ns_id}" in "${variables}" ${id}= Get Ns Id ${ns_name} @@ -90,7 +87,6 @@ Get NS Id Scale Out Charm VNF - [Tags] prepare ${vnf_id}= Get Vnf Id ${ns_id} ${vnf_charm_index} Set Suite Variable ${vnf_charm_id} ${vnf_id} @{vdur_list}= Get Vnf Vdur Names ${vnf_charm_id} @@ -103,7 +99,6 @@ Scale Out Charm VNF Get Charm VNF Info - [Tags] verify Variable Should Exist ${ns_id} msg=NS is not available ${variables} Get Variables IF not "\${vnf_charm_id}" in "${variables}" @@ -119,20 +114,17 @@ Get Charm VNF Info Halt Charm VDU - [Tags] verify Variable Should Exist @{vdu_charm_ids} msg=VDU is not available Halt Server ${vdu_charm_ids}[1] Sleep 15 Heal Charm VDU - [Tags] verify Variable Should Exist ${vnf_charm_id} msg=VNF is not available Heal Network Service ${ns_id} --vnf ${vnf_charm_id} --cause "Heal VM of charm_vnf" --vdu ${vdu_charm_name} --count-index 1 --run-day1 Check VNF After Healing - [Tags] verify Variable Should Exist ${vnf_charm_id} msg=VNF is not available @{ip_list}= Get Vnf Vdur IPs ${vnf_charm_id} diff --git a/robot-systest/testsuite/heal_03-multiple_healing.robot b/robot-systest/testsuite/heal_03-multiple_healing.robot index da3d381..3b0baae 100644 --- a/robot-systest/testsuite/heal_03-multiple_healing.robot +++ b/robot-systest/testsuite/heal_03-multiple_healing.robot @@ -64,24 +64,21 @@ ${success_return_code} 0 *** Test Cases *** Create VNF Descriptors - [Tags] prepare Create VNFD '%{PACKAGES_FOLDER}/${vnfd_charm_pkg}' Create VNFD '%{PACKAGES_FOLDER}/${vnfd_volumes_pkg}' Create NS Descriptor - [Tags] prepare Create NSD '%{PACKAGES_FOLDER}/${nsd_pkg}' Network Service Instance Test - [Tags] prepare ${id}= Create Network Service ${nsd_name} %{VIM_TARGET} ${ns_name} ${ns_config} ${publickey} Set Suite Variable ${ns_id} ${id} Get NS Id - [Tags] verify cleanup + [Tags] cleanup ${variables} Get Variables IF not "\${ns_id}" in "${variables}" ${id}= Get Ns Id ${ns_name} @@ -90,7 +87,6 @@ Get NS Id Scale Out Charm VNF - [Tags] prepare ${vnf_id}= Get Vnf Id ${ns_id} ${vnf_charm_index} Set Suite Variable ${vnf_charm_id} ${vnf_id} @{vdur_list}= Get Vnf Vdur Names ${vnf_charm_id} @@ -103,7 +99,6 @@ Scale Out Charm VNF Get Charm VNF Info - [Tags] verify Variable Should Exist ${ns_id} msg=NS is not available ${variables} Get Variables IF not "\${vnf_charm_id}" in "${variables}" @@ -119,7 +114,6 @@ Get Charm VNF Info Get Volume VNF Info - [Tags] verify Variable Should Exist ${ns_id} msg=NS is not available ${ip_addr}= Get Vnf Management Ip Address ${ns_id} ${vnf_several_index} log ${ip_addr} @@ -137,7 +131,6 @@ Get Volume VNF Info Stop VDUs - [Tags] verify Variable Should Exist @{vdu_charm_ids} msg=Charm VDUs are not available Variable Should Exist ${vdu_volumes_id} msg=Volume VDU is not available Stop Server ${vdu_charm_ids}[1] @@ -147,14 +140,12 @@ Stop VDUs Heal VDUs - [Tags] verify Variable Should Exist ${vnf_charm_id} msg=Charm VNF is not available Variable Should Exist ${vnf_volumes_id} msg=Volume VNF is not available Heal Network Service ${ns_id} --vnf ${vnf_volumes_id} --cause "Heal myvdu1 of several_volumes_vnf" --vdu several_volumes-VM --vnf ${vnf_charm_id} --cause "Heal two VMs of native_manual_scale_charm_vnf" --vdu mgmtVM --count-index 1 --run-day1 --vdu mgmtVM --count-index 2 Check VNFs After Healing - [Tags] verify Variable Should Exist ${vnf_charm_id} msg=Charm VNF is not available Variable Should Exist ${vnf_volumes_id} msg=Volume VNF is not available ${id}= Get VNF VIM ID ${vnf_charm_id} diff --git a/robot-systest/testsuite/k8s_04-openldap_helm.robot b/robot-systest/testsuite/k8s_04-openldap_helm.robot index 96a1caa..4e27aa8 100644 --- a/robot-systest/testsuite/k8s_04-openldap_helm.robot +++ b/robot-systest/testsuite/k8s_04-openldap_helm.robot @@ -25,7 +25,7 @@ Resource %{ROBOT_DEVOPS_FOLDER}/lib/connectivity_lib.robot Resource %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot Resource %{ROBOT_DEVOPS_FOLDER}/lib/k8scluster_lib.robot -Force Tags k8s_04 cluster_k8s daily regression sanity +Force Tags k8s_04 cluster_k8s daily regression Suite Teardown Run Keyword And Ignore Error Suite Cleanup @@ -36,9 +36,9 @@ ${k8scluster_name} k8s04 ${k8scluster_version} v1 # NS and VNF descriptor package folder and ids -${vnfd_pkg} openldap_primitives_knf +${vnfd_pkg} openldap_knf ${vnfd_name} openldap_knf -${nsd_pkg} openldap_primitives_ns +${nsd_pkg} openldap_ns ${nsd_name} openldap_ns # NS instance name and configuration @@ -52,9 +52,6 @@ ${kdu_name} ldap ${upgrade_action} upgrade ${rollback_action} rollback ${replica_count} 3 -${action_name} get-user-info -${action_param_cn} admin -${action_param_dc} example.org *** Test Cases *** Create Package For OpenLDAP CNF @@ -85,12 +82,6 @@ Get Vnf Id Log List ${vnfr_list} Set Suite Variable ${vnf_id} ${vnfr_list}[0] -Execute Day 2 Operations - [Documentation] Performs one Day 2 operation. - - Variable Should Exist ${ns_id} msg=Network service instance is not available - ${ns_op_id}= Execute NS K8s Action ${ns_name} ${action_name} ${vnf_member_index} ${kdu_name} cn=${action_param_cn} dc=${action_param_dc} - Execute Upgrade Operation [Tags] verify Variable Should Exist ${ns_id} msg=Network service instance is not available diff --git a/robot-systest/testsuite/k8s_12-openldap_helm_day-2.robot b/robot-systest/testsuite/k8s_12-openldap_helm_day-2.robot new file mode 100644 index 0000000..82793ce --- /dev/null +++ b/robot-systest/testsuite/k8s_12-openldap_helm_day-2.robot @@ -0,0 +1,131 @@ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +*** Settings *** +Documentation [K8s-12] Openldap Helm chart. + +Library OperatingSystem +Library String +Library Collections +Library Process + +Resource %{ROBOT_DEVOPS_FOLDER}/lib/vnfd_lib.robot +Resource %{ROBOT_DEVOPS_FOLDER}/lib/nsd_lib.robot +Resource %{ROBOT_DEVOPS_FOLDER}/lib/ns_lib.robot +Resource %{ROBOT_DEVOPS_FOLDER}/lib/connectivity_lib.robot +Resource %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot +Resource %{ROBOT_DEVOPS_FOLDER}/lib/k8scluster_lib.robot + +Force Tags k8s_12 cluster_k8s daily regression sanity + +Suite Teardown Run Keyword And Ignore Error Suite Cleanup + + +*** Variables *** +# K8s cluster name and version +${k8scluster_name} k8s12 +${k8scluster_version} v1 + +# NS and VNF descriptor package folder and ids +${vnfd_pkg} openldap_primitives_knf +${vnfd_name} openldap_knf +${nsd_pkg} openldap_primitives_ns +${nsd_name} openldap_ns + +# NS instance name and configuration +${ns_name} ldap +${ns_config} {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}}], additionalParamsForVnf: [ {member-vnf-index: openldap, additionalParamsForKdu: [ {kdu_name: ldap, additionalParams: {service: {type: LoadBalancer }, adminPassword: admin}} ] } ] } + +${ns_id} ${EMPTY} +${publickey} ${EMPTY} +${vnf_member_index} openldap +${kdu_name} ldap +${upgrade_action} upgrade +${rollback_action} rollback +${replica_count} 3 +${action_name} get-user-info +${action_param_cn} admin +${action_param_dc} example.org + +*** Test Cases *** +Create Package For OpenLDAP CNF + Create VNFD '%{PACKAGES_FOLDER}/${vnfd_pkg}' + +Create Package For OpenLDAP NS + Create NSD '%{PACKAGES_FOLDER}/${nsd_pkg}' + +Add K8s Cluster To OSM + Create K8s Cluster %{K8S_CREDENTIALS} ${k8scluster_version} %{VIM_TARGET} %{VIM_MGMT_NET} ${k8scluster_name} + +Create Network Service Instance + ${id}= Create Network Service ${nsd_name} %{VIM_TARGET} ${ns_name} ${ns_config} ${publickey} + +Get Ns Id + ${id}= Get Ns Id ${ns_name} + Set Suite Variable ${ns_id} ${id} + +Get Vnf Id + Variable Should Exist ${ns_id} msg=Network service instance is not available + @{vnfr_list}= Get Ns Vnfr Ids ${ns_id} + Log List ${vnfr_list} + Set Suite Variable ${vnf_id} ${vnfr_list}[0] + +Execute Day 2 Operations + [Documentation] Performs one Day 2 operation. + + Variable Should Exist ${ns_id} msg=Network service instance is not available + ${ns_op_id}= Execute NS K8s Action ${ns_name} ${action_name} ${vnf_member_index} ${kdu_name} cn=${action_param_cn} dc=${action_param_dc} + +Execute Upgrade Operation + Variable Should Exist ${ns_id} msg=Network service instance is not available + ${ns_op_id}= Execute NS K8s Action ${ns_name} ${upgrade_action} ${vnf_member_index} ${kdu_name} replicaCount=${replica_count} + +Check Replicas After Upgrade Operation + Variable Should Exist ${ns_id} msg=Network service instance is not available + ${count}= Get Vnf Kdu Replica Count ${vnf_id} ${kdu_name} + log ${count} + Should Be Equal As Integers ${count} ${replica_count} + +Execute Rollback Operation + Variable Should Exist ${ns_id} msg=Network service instance is not available + ${ns_op_id}= Execute NS K8s Action ${ns_name} ${rollback_action} ${vnf_member_index} ${kdu_name} + +Check Replicas After Rollback Operation + Variable Should Exist ${ns_id} msg=Network service instance is not available + ${count}= Get Vnf Kdu Replica Count ${vnf_id} ${kdu_name} + log ${count} + Should Be Empty ${count} + +Delete Network Service Instance + [Tags] cleanup + Delete NS ${ns_name} + +Remove K8s Cluster from OSM + [Tags] cleanup + Delete K8s Cluster ${k8scluster_name} + +Delete NS Descriptor Test + [Tags] cleanup + Delete NSD ${nsd_name} + +Delete VNF Descriptor Test + [Tags] cleanup + Delete VNFD ${vnfd_name} + + +*** Keywords *** +Suite Cleanup + [Documentation] Test Suit Cleanup: Deleting Descriptor, instance and vim + 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 K8s Cluster ${k8scluster_name} -- 2.25.1