From d225e550e79fdbb9f667975102b17232eca893c1 Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Fri, 2 Oct 2020 16:10:14 +0000 Subject: [PATCH] Renamed Test Cleanup to Suite Cleanup; fix teardown to work properly in test suites Change-Id: I4f8369b7f99d4d34a61f2b6ca58fa8a02feba01b Signed-off-by: garciadeblas --- ...stantiation_parameters_in_cloud_init.robot | 10 ++++----- .../testsuite/basic_06-vnf_with_charm.robot | 10 ++++----- .../basic_07-secure_key_management.robot | 10 ++++----- ...-disable_port_security_network_level.robot | 12 +++++----- .../basic_09-manual_vdu_scaling.robot | 10 ++++----- .../testsuite/basic_11-native_charms.robot | 10 ++++----- .../testsuite/basic_12-ns_primitives.robot | 12 +++++----- .../testsuite/basic_13-ns_relations.robot | 10 ++++----- .../testsuite/basic_14-vnf_relations.robot | 10 ++++----- .../basic_15-rbac_configurations.robot | 12 +++++----- .../testsuite/epa_01-epa_sriov.robot | 10 ++++----- .../epa_02-additional_capabilities.robot | 10 ++++----- robot-systest/testsuite/hackfest_basic.robot | 10 ++++----- .../testsuite/hackfest_cloudinit.robot | 10 ++++----- .../testsuite/hackfest_multivdu.robot | 10 ++++----- .../testsuite/k8s_01-create_k8s_cluster.robot | 10 ++++----- .../k8s_02-k8scluster_creation.robot | 6 ++--- .../testsuite/k8s_03-simple_k8s.robot | 12 +++++----- .../testsuite/k8s_04-openldap_helm.robot | 12 +++++----- .../testsuite/k8s_05-k8s_proxy_charms.robot | 10 ++++----- .../quotas_01-quota_enforcement.robot | 22 +++++++++---------- .../sa_01-vnf_with_vim_metrics.robot | 10 ++++----- ...vnf_with_vim_metrics_and_autoscaling.robot | 10 ++++----- .../sa_07-alarms_from_sa-related_vnfs.robot | 16 +++++++------- .../sa_08-vnf_with_vnf_indicators_snmp.robot | 10 ++++----- .../testsuite/slice_01-network_slicing.robot | 14 ++++++------ .../slice_02-shared_network_slicing.robot | 16 +++++++------- 27 files changed, 152 insertions(+), 152 deletions(-) diff --git a/robot-systest/testsuite/basic_05-instantiation_parameters_in_cloud_init.robot b/robot-systest/testsuite/basic_05-instantiation_parameters_in_cloud_init.robot index 22cee7cf..62a4ca83 100644 --- a/robot-systest/testsuite/basic_05-instantiation_parameters_in_cloud_init.robot +++ b/robot-systest/testsuite/basic_05-instantiation_parameters_in_cloud_init.robot @@ -23,7 +23,7 @@ Resource %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot Variables %{ROBOT_DEVOPS_FOLDER}/resources/basic_05-instantiation_parameters_in_cloud_init_data.py -Suite Teardown Run Keyword And Ignore Error Test Cleanup +Suite Teardown Run Keyword And Ignore Error Suite Cleanup *** Variables *** @@ -90,12 +90,12 @@ Delete VNF Descriptor *** Keywords *** -Test Cleanup +Suite Cleanup [Documentation] Test Suite Cleanup: Deleting descriptors and NS instance - Run Keyword If Test Failed Delete NS ${ns_name} + Run Keyword If Any Tests Failed Delete NS ${ns_name} - Run Keyword If Test Failed Delete NSD ${nsd_name} + Run Keyword If Any Tests Failed Delete NSD ${nsd_name} - Run Keyword If Test Failed Delete VNFD ${vnfd_name} + Run Keyword If Any Tests Failed Delete VNFD ${vnfd_name} diff --git a/robot-systest/testsuite/basic_06-vnf_with_charm.robot b/robot-systest/testsuite/basic_06-vnf_with_charm.robot index b0929600..ae957916 100644 --- a/robot-systest/testsuite/basic_06-vnf_with_charm.robot +++ b/robot-systest/testsuite/basic_06-vnf_with_charm.robot @@ -23,7 +23,7 @@ Resource %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot Variables %{ROBOT_DEVOPS_FOLDER}/resources/basic_06-vnf_with_charm_data.py -Suite Teardown Run Keyword And Ignore Error Test Cleanup +Suite Teardown Run Keyword And Ignore Error Suite Cleanup *** Variables *** @@ -125,12 +125,12 @@ Delete VNF Descriptor *** Keywords *** -Test Cleanup +Suite Cleanup [Documentation] Test Suite Cleanup: Deleting descriptors and NS instance - Run Keyword If Test Failed Delete NS ${ns_name} + Run Keyword If Any Tests Failed Delete NS ${ns_name} - Run Keyword If Test Failed Delete NSD ${nsd_name} + Run Keyword If Any Tests Failed Delete NSD ${nsd_name} - Run Keyword If Test Failed Delete VNFD ${vnfd_name} + Run Keyword If Any Tests Failed Delete VNFD ${vnfd_name} diff --git a/robot-systest/testsuite/basic_07-secure_key_management.robot b/robot-systest/testsuite/basic_07-secure_key_management.robot index 1cf5bb0f..7a80462c 100644 --- a/robot-systest/testsuite/basic_07-secure_key_management.robot +++ b/robot-systest/testsuite/basic_07-secure_key_management.robot @@ -23,7 +23,7 @@ Resource %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot Variables %{ROBOT_DEVOPS_FOLDER}/resources/basic_07-secure_key_management_data.py -Suite Teardown Run Keyword And Ignore Error Test Cleanup +Suite Teardown Run Keyword And Ignore Error Suite Cleanup *** Variables *** @@ -115,12 +115,12 @@ Delete VNF Descriptor *** Keywords *** -Test Cleanup +Suite Cleanup [Documentation] Test Suite Cleanup: Deleting descriptors and NS instance - Run Keyword If Test Failed Delete NS ${ns_name} + Run Keyword If Any Tests Failed Delete NS ${ns_name} - Run Keyword If Test Failed Delete NSD ${nsd_name} + Run Keyword If Any Tests Failed Delete NSD ${nsd_name} - Run Keyword If Test Failed Delete VNFD ${vnfd_name} + Run Keyword If Any Tests Failed Delete VNFD ${vnfd_name} diff --git a/robot-systest/testsuite/basic_08-disable_port_security_network_level.robot b/robot-systest/testsuite/basic_08-disable_port_security_network_level.robot index 644f1c9a..85350148 100644 --- a/robot-systest/testsuite/basic_08-disable_port_security_network_level.robot +++ b/robot-systest/testsuite/basic_08-disable_port_security_network_level.robot @@ -25,7 +25,7 @@ Resource %{ROBOT_DEVOPS_FOLDER}/lib/prometheus_lib.robot Variables %{ROBOT_DEVOPS_FOLDER}/resources/basic_08-disable_port_security_network_level_data.py -Suite Teardown Run Keyword And Ignore Error Test Cleanup +Suite Teardown Run Keyword And Ignore Error Suite Cleanup *** Variables *** @@ -90,10 +90,10 @@ Delete VIM *** Keywords *** -Test Cleanup +Suite Cleanup [Documentation] Test Suite Cleanup: Deleting descriptors and NS instance - Run Keyword If Test Failed Delete NS ${ns_name} - Run Keyword If Test Failed Delete NSD ${nsd_name} - Run Keyword If Test Failed Delete VNFD ${vnfd_name} - Run Keyword If Test Failed Delete VIM Target ${vim_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} + Run Keyword If Any Tests Failed Delete VIM Target ${vim_name} diff --git a/robot-systest/testsuite/basic_09-manual_vdu_scaling.robot b/robot-systest/testsuite/basic_09-manual_vdu_scaling.robot index b81e70f3..e695768a 100644 --- a/robot-systest/testsuite/basic_09-manual_vdu_scaling.robot +++ b/robot-systest/testsuite/basic_09-manual_vdu_scaling.robot @@ -24,7 +24,7 @@ Resource %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot Variables %{ROBOT_DEVOPS_FOLDER}/resources/basic_09-manual_vdu_scaling_data.py -Suite Teardown Run Keyword And Ignore Error Test Cleanup +Suite Teardown Run Keyword And Ignore Error Suite Cleanup *** Variables *** @@ -127,12 +127,12 @@ Delete VNF Descriptor *** Keywords *** -Test Cleanup +Suite Cleanup [Documentation] Test Suite Cleanup: Deleting descriptors and NS instance - Run Keyword If Test Failed Delete NS ${ns_name} + Run Keyword If Any Tests Failed Delete NS ${ns_name} - Run Keyword If Test Failed Delete NSD ${nsd_name} + Run Keyword If Any Tests Failed Delete NSD ${nsd_name} - Run Keyword If Test Failed Delete VNFD ${vnfd_name} + Run Keyword If Any Tests Failed Delete VNFD ${vnfd_name} diff --git a/robot-systest/testsuite/basic_11-native_charms.robot b/robot-systest/testsuite/basic_11-native_charms.robot index 36e4f9af..87fb8fbb 100644 --- a/robot-systest/testsuite/basic_11-native_charms.robot +++ b/robot-systest/testsuite/basic_11-native_charms.robot @@ -23,7 +23,7 @@ Resource %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot Variables %{ROBOT_DEVOPS_FOLDER}/resources/basic_11-native_charms.py -Suite Teardown Run Keyword And Ignore Error Test Cleanup +Suite Teardown Run Keyword And Ignore Error Suite Cleanup *** Variables *** @@ -108,12 +108,12 @@ Delete VNF Descriptor *** Keywords *** -Test Cleanup +Suite Cleanup [Documentation] Test Suite Cleanup: Deleting descriptors and NS instance - Run Keyword If Test Failed Delete NS ${ns_name} + Run Keyword If Any Tests Failed Delete NS ${ns_name} - Run Keyword If Test Failed Delete NSD ${nsd_name} + Run Keyword If Any Tests Failed Delete NSD ${nsd_name} - Run Keyword If Test Failed Delete VNFD ${vnfd_name} + Run Keyword If Any Tests Failed Delete VNFD ${vnfd_name} diff --git a/robot-systest/testsuite/basic_12-ns_primitives.robot b/robot-systest/testsuite/basic_12-ns_primitives.robot index 7dcc7190..07854675 100644 --- a/robot-systest/testsuite/basic_12-ns_primitives.robot +++ b/robot-systest/testsuite/basic_12-ns_primitives.robot @@ -24,7 +24,7 @@ Resource %{ROBOT_DEVOPS_FOLDER}/lib/packages_lib.robot Variables %{ROBOT_DEVOPS_FOLDER}/resources/basic_12-ns_primitives_data.py -Suite Teardown Run Keyword And Ignore Error Test Cleanup +Suite Teardown Run Keyword And Ignore Error Suite Cleanup *** Variables *** @@ -94,10 +94,10 @@ Delete VNF Descriptors *** Keywords *** -Test Cleanup +Suite Cleanup [Documentation] Test Suit Cleanup: Deleting Descriptor and instance - Run Keyword If Test Failed Delete NS ${ns_name} - Run Keyword If Test Failed Delete NSD ${nsd_name} - Run Keyword If Test Failed Delete VNFD ${vnfd_name1} - Run Keyword If Test Failed Delete VNFD ${vnfd_name2} + 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_name1} + Run Keyword If Any Tests Failed Delete VNFD ${vnfd_name2} diff --git a/robot-systest/testsuite/basic_13-ns_relations.robot b/robot-systest/testsuite/basic_13-ns_relations.robot index 04c0cff3..cdc61d65 100644 --- a/robot-systest/testsuite/basic_13-ns_relations.robot +++ b/robot-systest/testsuite/basic_13-ns_relations.robot @@ -24,7 +24,7 @@ Resource %{ROBOT_DEVOPS_FOLDER}/lib/juju_lib.robot Variables %{ROBOT_DEVOPS_FOLDER}/resources/basic_13-ns_relations.py -Suite Teardown Run Keyword And Ignore Error Test Cleanup +Suite Teardown Run Keyword And Ignore Error Suite Cleanup *** Variables *** @@ -94,12 +94,12 @@ Delete VNF Descriptor Requires *** Keywords *** -Test Cleanup +Suite Cleanup [Documentation] Test Suite Cleanup: Deleting descriptors and NS instance - Run Keyword If Test Failed Delete NS ${ns_name} + Run Keyword If Any Tests Failed Delete NS ${ns_name} - Run Keyword If Test Failed Delete NSD ${nsd_name} + Run Keyword If Any Tests Failed Delete NSD ${nsd_name} - Run Keyword If Test Failed Delete VNFD ${vnfd_name} + Run Keyword If Any Tests Failed Delete VNFD ${vnfd_name} diff --git a/robot-systest/testsuite/basic_14-vnf_relations.robot b/robot-systest/testsuite/basic_14-vnf_relations.robot index adc308d3..8c5be390 100644 --- a/robot-systest/testsuite/basic_14-vnf_relations.robot +++ b/robot-systest/testsuite/basic_14-vnf_relations.robot @@ -24,7 +24,7 @@ Resource %{ROBOT_DEVOPS_FOLDER}/lib/juju_lib.robot Variables %{ROBOT_DEVOPS_FOLDER}/resources/basic_14-vnf_relations.py -Suite Teardown Run Keyword And Ignore Error Test Cleanup +Suite Teardown Run Keyword And Ignore Error Suite Cleanup *** Variables *** @@ -82,12 +82,12 @@ Delete VNF Descriptor Provides *** Keywords *** -Test Cleanup +Suite Cleanup [Documentation] Test Suite Cleanup: Deleting descriptors and NS instance - Run Keyword If Test Failed Delete NS ${ns_name} + Run Keyword If Any Tests Failed Delete NS ${ns_name} - Run Keyword If Test Failed Delete NSD ${nsd_name} + Run Keyword If Any Tests Failed Delete NSD ${nsd_name} - Run Keyword If Test Failed Delete VNFD ${vnfd_name} + Run Keyword If Any Tests Failed Delete VNFD ${vnfd_name} diff --git a/robot-systest/testsuite/basic_15-rbac_configurations.robot b/robot-systest/testsuite/basic_15-rbac_configurations.robot index 56cddc0a..e47871e3 100644 --- a/robot-systest/testsuite/basic_15-rbac_configurations.robot +++ b/robot-systest/testsuite/basic_15-rbac_configurations.robot @@ -23,7 +23,7 @@ Resource %{ROBOT_DEVOPS_FOLDER}/lib/role_lib.robot Variables %{ROBOT_DEVOPS_FOLDER}/resources/basic_15-rbac_configurations_data.py -Suite Teardown Run Keyword And Ignore Error Test Cleanup +Suite Teardown Run Keyword And Ignore Error Suite Cleanup *** Variables *** @@ -82,8 +82,8 @@ Delete Allocated Resources *** Keywords *** -Test Cleanup - Run Keyword If Test Failed Run Keyword And Ignore Error Delete User ${user_name} - Run Keyword If Test Failed Run Keyword And Ignore Error Delete Role ${role_name} - Run Keyword If Test Failed Run Keyword And Ignore Error Delete Project ${project_name} - Run Keyword If Test Failed Run Keyword And Ignore Error Delete Project ${new_project_name} +Suite Cleanup + Run Keyword If Any Tests Failed Run Keyword And Ignore Error Delete User ${user_name} + Run Keyword If Any Tests Failed Run Keyword And Ignore Error Delete Role ${role_name} + Run Keyword If Any Tests Failed Run Keyword And Ignore Error Delete Project ${project_name} + Run Keyword If Any Tests Failed Run Keyword And Ignore Error Delete Project ${new_project_name} diff --git a/robot-systest/testsuite/epa_01-epa_sriov.robot b/robot-systest/testsuite/epa_01-epa_sriov.robot index b4e11ca2..d38be135 100644 --- a/robot-systest/testsuite/epa_01-epa_sriov.robot +++ b/robot-systest/testsuite/epa_01-epa_sriov.robot @@ -25,7 +25,7 @@ Resource %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot Variables %{ROBOT_DEVOPS_FOLDER}/resources/epa_01-epa_sriov_data.py -Suite Teardown Run Keyword And Ignore Error Test Cleanup +Suite Teardown Run Keyword And Ignore Error Suite Cleanup *** Variables *** @@ -90,12 +90,12 @@ Delete VNF Descriptor *** Keywords *** -Test Cleanup +Suite Cleanup [Documentation] Test Suite Cleanup: Deleting descriptors and NS instance - Run Keyword If Test Failed Delete NS ${ns_name} + Run Keyword If Any Tests Failed Delete NS ${ns_name} - Run Keyword If Test Failed Delete NSD ${nsd_name} + Run Keyword If Any Tests Failed Delete NSD ${nsd_name} - Run Keyword If Test Failed Delete VNFD ${vnfd_name} + Run Keyword If Any Tests Failed Delete VNFD ${vnfd_name} diff --git a/robot-systest/testsuite/epa_02-additional_capabilities.robot b/robot-systest/testsuite/epa_02-additional_capabilities.robot index fd15e5f1..98d686cc 100644 --- a/robot-systest/testsuite/epa_02-additional_capabilities.robot +++ b/robot-systest/testsuite/epa_02-additional_capabilities.robot @@ -26,7 +26,7 @@ Resource %{ROBOT_DEVOPS_FOLDER}/lib/openstack_lib.robot Variables %{ROBOT_DEVOPS_FOLDER}/resources/epa_02-additional_capabilities_data.py -Suite Teardown Run Keyword And Ignore Error Test Cleanup +Suite Teardown Run Keyword And Ignore Error Suite Cleanup *** Variables *** @@ -105,12 +105,12 @@ Delete VNF Descriptor *** Keywords *** -Test Cleanup +Suite Cleanup [Documentation] Test Suite Cleanup: Deleting descriptors and NS instance - Run Keyword If Test Failed Delete NS ${ns_name} + Run Keyword If Any Tests Failed Delete NS ${ns_name} - Run Keyword If Test Failed Delete NSD ${nsd_name} + Run Keyword If Any Tests Failed Delete NSD ${nsd_name} - Run Keyword If Test Failed Delete VNFD ${vnfd_name} + Run Keyword If Any Tests Failed Delete VNFD ${vnfd_name} diff --git a/robot-systest/testsuite/hackfest_basic.robot b/robot-systest/testsuite/hackfest_basic.robot index c3f90685..95d18273 100644 --- a/robot-systest/testsuite/hackfest_basic.robot +++ b/robot-systest/testsuite/hackfest_basic.robot @@ -25,7 +25,7 @@ Resource %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot Variables %{ROBOT_DEVOPS_FOLDER}/resources/hackfest_basic_ns_data.py -Suite Teardown Run Keyword And Ignore Error Test Cleanup +Suite Teardown Run Keyword And Ignore Error Suite Cleanup *** Variables *** @@ -91,13 +91,13 @@ Delete VNF Descriptor Test *** Keywords *** -Test Cleanup +Suite Cleanup [Documentation] Test Suit Cleanup: Deleting Descriptor, instance and vim - Run Keyword If Test Failed Delete NS ${ns_name} + Run Keyword If Any Tests Failed Delete NS ${ns_name} - Run Keyword If Test Failed Delete NSD ${nsd_name} + Run Keyword If Any Tests Failed Delete NSD ${nsd_name} - Run Keyword If Test Failed Delete VNFD ${vnfd_name} + Run Keyword If Any Tests Failed Delete VNFD ${vnfd_name} diff --git a/robot-systest/testsuite/hackfest_cloudinit.robot b/robot-systest/testsuite/hackfest_cloudinit.robot index 693348ef..2fb79fae 100644 --- a/robot-systest/testsuite/hackfest_cloudinit.robot +++ b/robot-systest/testsuite/hackfest_cloudinit.robot @@ -25,7 +25,7 @@ Resource %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot Variables %{ROBOT_DEVOPS_FOLDER}/resources/hackfest_cloudinit_ns_data.py -Suite Teardown Run Keyword And Ignore Error Test Cleanup +Suite Teardown Run Keyword And Ignore Error Suite Cleanup *** Variables *** @@ -98,13 +98,13 @@ Delete VNF Descriptor Test *** Keywords *** -Test Cleanup +Suite Cleanup [Documentation] Test Suit Cleanup: Deleting Descriptor, instance and vim - Run Keyword If Test Failed Delete NS ${ns_name} + Run Keyword If Any Tests Failed Delete NS ${ns_name} - Run Keyword If Test Failed Delete NSD ${nsd_name} + Run Keyword If Any Tests Failed Delete NSD ${nsd_name} - Run Keyword If Test Failed Delete VNFD ${vnfd_name} + Run Keyword If Any Tests Failed Delete VNFD ${vnfd_name} diff --git a/robot-systest/testsuite/hackfest_multivdu.robot b/robot-systest/testsuite/hackfest_multivdu.robot index 5bbdd100..67cb9104 100644 --- a/robot-systest/testsuite/hackfest_multivdu.robot +++ b/robot-systest/testsuite/hackfest_multivdu.robot @@ -25,7 +25,7 @@ Resource %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot Variables %{ROBOT_DEVOPS_FOLDER}/resources/hackfest_multivdu_ns_data.py -Suite Teardown Run Keyword And Ignore Error Test Cleanup +Suite Teardown Run Keyword And Ignore Error Suite Cleanup *** Variables *** @@ -95,11 +95,11 @@ Delete VNF Descriptor Test *** Keywords *** -Test Cleanup +Suite Cleanup [Documentation] Test Suit Cleanup: Deleting Descriptor, instance and vim - Run Keyword If Test Failed Delete NS ${ns_name} + Run Keyword If Any Tests Failed Delete NS ${ns_name} - Run Keyword If Test Failed Delete NSD ${nsd_name} + Run Keyword If Any Tests Failed Delete NSD ${nsd_name} - Run Keyword If Test Failed Delete VNFD ${vnfd_name} + Run Keyword If Any Tests Failed Delete VNFD ${vnfd_name} diff --git a/robot-systest/testsuite/k8s_01-create_k8s_cluster.robot b/robot-systest/testsuite/k8s_01-create_k8s_cluster.robot index 5be48001..06530be4 100644 --- a/robot-systest/testsuite/k8s_01-create_k8s_cluster.robot +++ b/robot-systest/testsuite/k8s_01-create_k8s_cluster.robot @@ -27,7 +27,7 @@ Resource %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot Variables %{ROBOT_DEVOPS_FOLDER}/resources/k8s_01-create_k8s_cluster_data.py -Suite Teardown Run Keyword And Ignore Error Test Cleanup +Suite Teardown Run Keyword And Ignore Error Suite Cleanup *** Variables *** @@ -126,9 +126,9 @@ Delete Machines VNF Descriptor *** Keywords *** -Test Cleanup +Suite Cleanup [Documentation] Test Suite Cleanup: Deleting descriptors and NS instance - Run Keyword If Test Failed Delete NS ${ns_name} - Run Keyword If Test Failed Delete NSD ${nsd_name} - Run Keyword If Test 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} diff --git a/robot-systest/testsuite/k8s_02-k8scluster_creation.robot b/robot-systest/testsuite/k8s_02-k8scluster_creation.robot index 386b8ada..0c19959c 100644 --- a/robot-systest/testsuite/k8s_02-k8scluster_creation.robot +++ b/robot-systest/testsuite/k8s_02-k8scluster_creation.robot @@ -22,7 +22,7 @@ Resource %{ROBOT_DEVOPS_FOLDER}/lib/k8scluster_lib.robot Variables %{ROBOT_DEVOPS_FOLDER}/resources/k8s_02-k8scluster_creation_data.py -Suite Teardown Run Keyword And Ignore Error Test Cleanup +Suite Teardown Run Keyword And Ignore Error Suite Cleanup *** Test Cases *** Add K8s Cluster To OSM @@ -34,6 +34,6 @@ Remove K8s Cluster from OSM Delete K8s Cluster ${k8scluster_name} *** Keywords *** -Test Cleanup +Suite Cleanup [Documentation] Test Suit Cleanup: Deleting K8s Cluster - Run Keyword If Test Failed Delete K8s Cluster ${k8scluster_name} + Run Keyword If Any Tests Failed Delete K8s Cluster ${k8scluster_name} diff --git a/robot-systest/testsuite/k8s_03-simple_k8s.robot b/robot-systest/testsuite/k8s_03-simple_k8s.robot index 081219d9..c905266c 100644 --- a/robot-systest/testsuite/k8s_03-simple_k8s.robot +++ b/robot-systest/testsuite/k8s_03-simple_k8s.robot @@ -28,7 +28,7 @@ Resource %{ROBOT_DEVOPS_FOLDER}/lib/k8scluster_lib.robot Variables %{ROBOT_DEVOPS_FOLDER}/resources/k8s_03-simple_k8s_data.py -Suite Teardown Run Keyword And Ignore Error Test Cleanup +Suite Teardown Run Keyword And Ignore Error Suite Cleanup *** Variables *** @@ -90,9 +90,9 @@ Delete VNF NS Packages *** Keywords *** -Test Cleanup +Suite Cleanup [Documentation] Test Suit Cleanup: Deleting Descriptor, instance and vim - Run Keyword If Test Failed Delete NS ${ns_name} - Run Keyword If Test Failed Delete NSD ${nsd_name} - Run Keyword If Test Failed Delete VNFD ${vnfd_name} - Run Keyword If Test Failed Delete K8s Cluster ${k8scluster_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} + Run Keyword If Any Tests Failed Delete K8s Cluster ${k8scluster_name} diff --git a/robot-systest/testsuite/k8s_04-openldap_helm.robot b/robot-systest/testsuite/k8s_04-openldap_helm.robot index d7aa177e..3f1a247f 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/k8scluster_lib.robot Variables %{ROBOT_DEVOPS_FOLDER}/resources/k8s_04-openldap_helm_data.py -Suite Teardown Run Keyword And Ignore Error Test Cleanup +Suite Teardown Run Keyword And Ignore Error Suite Cleanup *** Variables *** @@ -69,9 +69,9 @@ Delete VNF Descriptor Test *** Keywords *** -Test Cleanup +Suite Cleanup [Documentation] Test Suit Cleanup: Deleting Descriptor, instance and vim - Run Keyword If Test Failed Delete NS ${ns_name} - Run Keyword If Test Failed Delete NSD ${nsd_name} - Run Keyword If Test Failed Delete VNFD ${vnfd_name} - Run Keyword If Test Failed Delete K8s Cluster ${k8scluster_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} + Run Keyword If Any Tests Failed Delete K8s Cluster ${k8scluster_name} diff --git a/robot-systest/testsuite/k8s_05-k8s_proxy_charms.robot b/robot-systest/testsuite/k8s_05-k8s_proxy_charms.robot index 0dccea66..8a7c3508 100644 --- a/robot-systest/testsuite/k8s_05-k8s_proxy_charms.robot +++ b/robot-systest/testsuite/k8s_05-k8s_proxy_charms.robot @@ -23,7 +23,7 @@ Resource %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot Variables %{ROBOT_DEVOPS_FOLDER}/resources/k8s_05-k8s_proxy_charms.py -Suite Teardown Run Keyword And Ignore Error Test Cleanup +Suite Teardown Run Keyword And Ignore Error Suite Cleanup *** Variables *** @@ -125,12 +125,12 @@ Delete VNF Descriptor *** Keywords *** -Test Cleanup +Suite Cleanup [Documentation] Test Suite Cleanup: Deleting descriptors and NS instance - Run Keyword If Test Failed Delete NS ${ns_name} + Run Keyword If Any Tests Failed Delete NS ${ns_name} - Run Keyword If Test Failed Delete NSD ${nsd_name} + Run Keyword If Any Tests Failed Delete NSD ${nsd_name} - Run Keyword If Test Failed Delete VNFD ${vnfd_name} + Run Keyword If Any Tests Failed Delete VNFD ${vnfd_name} diff --git a/robot-systest/testsuite/quotas_01-quota_enforcement.robot b/robot-systest/testsuite/quotas_01-quota_enforcement.robot index a3ad7f5e..e0cb576c 100644 --- a/robot-systest/testsuite/quotas_01-quota_enforcement.robot +++ b/robot-systest/testsuite/quotas_01-quota_enforcement.robot @@ -21,7 +21,7 @@ Resource %{ROBOT_DEVOPS_FOLDER}/lib/project_lib.robot Variables %{ROBOT_DEVOPS_FOLDER}/resources/quotas_01-quota_enforcement_data.py -Suite Teardown Run Keyword And Ignore Error Test Cleanup +Suite Teardown Run Keyword And Ignore Error Suite Cleanup *** Variables *** @@ -157,14 +157,14 @@ Delete Third Project *** Keywords *** -Test Cleanup - Run Keyword If Test Failed Run Keyword And Ignore Error Delete VNFD In Project ${project_2_name} vp2_1 ${user_name} ${user_password} - Run Keyword If Test Failed Run Keyword And Ignore Error Delete VNFD In Project ${project_3_name} v1 ${user_name} ${user_password} - Run Keyword If Test Failed Run Keyword And Ignore Error Delete VNFD In Project ${project_3_name} v2 ${user_name} ${user_password} - Run Keyword If Test Failed Run Keyword And Ignore Error Delete VNFD In Project ${project_3_name} v3 ${user_name} ${user_password} - Run Keyword If Test Failed Run Keyword And Ignore Error Delete VNFD In Project ${project_3_name} v4 ${user_name} ${user_password} - Run Keyword If Test Failed Run Keyword And Ignore Error Delete VNFD In Project ${project_3_name} v5 ${user_name} ${user_password} - Run Keyword If Test Failed Run Keyword And Ignore Error Delete Project ${project_1_name} - Run Keyword If Test Failed Delete Project ${project_2_name} - Run Keyword If Test Failed Run Keyword And Ignore Error Delete Project ${project_3_name} +Suite Cleanup + Run Keyword If Any Tests Failed Run Keyword And Ignore Error Delete VNFD In Project ${project_2_name} vp2_1 ${user_name} ${user_password} + Run Keyword If Any Tests Failed Run Keyword And Ignore Error Delete VNFD In Project ${project_3_name} v1 ${user_name} ${user_password} + Run Keyword If Any Tests Failed Run Keyword And Ignore Error Delete VNFD In Project ${project_3_name} v2 ${user_name} ${user_password} + Run Keyword If Any Tests Failed Run Keyword And Ignore Error Delete VNFD In Project ${project_3_name} v3 ${user_name} ${user_password} + Run Keyword If Any Tests Failed Run Keyword And Ignore Error Delete VNFD In Project ${project_3_name} v4 ${user_name} ${user_password} + Run Keyword If Any Tests Failed Run Keyword And Ignore Error Delete VNFD In Project ${project_3_name} v5 ${user_name} ${user_password} + Run Keyword If Any Tests Failed Run Keyword And Ignore Error Delete Project ${project_1_name} + Run Keyword If Any Tests Failed Delete Project ${project_2_name} + Run Keyword If Any Tests Failed Run Keyword And Ignore Error Delete Project ${project_3_name} Run And Return RC osm user-delete ${user_name} diff --git a/robot-systest/testsuite/sa_01-vnf_with_vim_metrics.robot b/robot-systest/testsuite/sa_01-vnf_with_vim_metrics.robot index b51c2095..d3404bda 100644 --- a/robot-systest/testsuite/sa_01-vnf_with_vim_metrics.robot +++ b/robot-systest/testsuite/sa_01-vnf_with_vim_metrics.robot @@ -25,7 +25,7 @@ Resource %{ROBOT_DEVOPS_FOLDER}/lib/prometheus_lib.robot Variables %{ROBOT_DEVOPS_FOLDER}/resources/sa_01-vnf_with_vim_metrics_data.py -Suite Teardown Run Keyword And Ignore Error Test Cleanup +Suite Teardown Run Keyword And Ignore Error Suite Cleanup *** Variables *** @@ -84,13 +84,13 @@ Delete VNF Descriptor *** Keywords *** -Test Cleanup +Suite Cleanup [Documentation] Test Suite Cleanup: Deleting descriptors and NS instance - Run Keyword If Test Failed Delete NS ${ns_name} + Run Keyword If Any Tests Failed Delete NS ${ns_name} - Run Keyword If Test Failed Delete NSD ${nsd_name} + Run Keyword If Any Tests Failed Delete NSD ${nsd_name} - Run Keyword If Test Failed Delete VNFD ${vnfd_name} + Run Keyword If Any Tests Failed Delete VNFD ${vnfd_name} 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 57cb8e6c..b5827df8 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 @@ -26,7 +26,7 @@ Resource %{ROBOT_DEVOPS_FOLDER}/lib/prometheus_lib.robot Variables %{ROBOT_DEVOPS_FOLDER}/resources/sa_02-vnf_with_vim_metrics_and_autoscaling_data.py -Suite Teardown Run Keyword And Ignore Error Test Cleanup +Suite Teardown Run Keyword And Ignore Error Suite Cleanup *** Variables *** @@ -128,12 +128,12 @@ Delete VNF Descriptor *** Keywords *** -Test Cleanup +Suite Cleanup [Documentation] Test Suite Cleanup: Deleting descriptors and NS instance - Run Keyword If Test Failed Delete NS ${ns_name} - Run Keyword If Test Failed Delete NSD ${nsd_name} - Run Keyword If Test 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 diff --git a/robot-systest/testsuite/sa_07-alarms_from_sa-related_vnfs.robot b/robot-systest/testsuite/sa_07-alarms_from_sa-related_vnfs.robot index ff4e73e5..9c62a407 100644 --- a/robot-systest/testsuite/sa_07-alarms_from_sa-related_vnfs.robot +++ b/robot-systest/testsuite/sa_07-alarms_from_sa-related_vnfs.robot @@ -26,7 +26,7 @@ Resource %{ROBOT_DEVOPS_FOLDER}/lib/prometheus_lib.robot Variables %{ROBOT_DEVOPS_FOLDER}/resources/sa_07-alarms_from_sa-related_vnfs_data.py -Suite Teardown Run Keyword And Ignore Error Test Cleanup +Suite Teardown Run Keyword And Ignore Error Suite Cleanup *** Variables *** @@ -153,12 +153,12 @@ Delete Webhook Service VNF Descriptor *** Keywords *** -Test Cleanup +Suite Cleanup [Documentation] Test Suite Cleanup: Deleting descriptors and NS instance - Run Keyword If Test Failed Delete NS ${ns_name} - Run Keyword If Test Failed Delete NSD ${nsd_name} - Run Keyword If Test Failed Delete VNFD ${vnfd_name} - Run Keyword If Test Failed Delete NS ${ws_ns_name} - Run Keyword If Test Failed Delete NSD ${ws_nsd_name} - Run Keyword If Test Failed Delete VNFD ${ws_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} + Run Keyword If Any Tests Failed Delete NS ${ws_ns_name} + Run Keyword If Any Tests Failed Delete NSD ${ws_nsd_name} + Run Keyword If Any Tests Failed Delete VNFD ${ws_vnfd_name} diff --git a/robot-systest/testsuite/sa_08-vnf_with_vnf_indicators_snmp.robot b/robot-systest/testsuite/sa_08-vnf_with_vnf_indicators_snmp.robot index 9409a9aa..33859ef1 100644 --- a/robot-systest/testsuite/sa_08-vnf_with_vnf_indicators_snmp.robot +++ b/robot-systest/testsuite/sa_08-vnf_with_vnf_indicators_snmp.robot @@ -25,7 +25,7 @@ Resource %{ROBOT_DEVOPS_FOLDER}/lib/prometheus_lib.robot Variables %{ROBOT_DEVOPS_FOLDER}/resources/sa_08-vnf_with_vnf_indicators_snmp_data.py -Suite Teardown Run Keyword And Ignore Error Test Cleanup +Suite Teardown Run Keyword And Ignore Error Suite Cleanup *** Variables *** @@ -84,9 +84,9 @@ Delete VNF Descriptor *** Keywords *** -Test Cleanup +Suite Cleanup [Documentation] Test Suite Cleanup: Deleting descriptors and NS instance - Run Keyword If Test Failed Delete NS ${ns_name} - Run Keyword If Test Failed Delete NSD ${nsd_name} - Run Keyword If Test 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} diff --git a/robot-systest/testsuite/slice_01-network_slicing.robot b/robot-systest/testsuite/slice_01-network_slicing.robot index 2f531cb3..5dac8324 100644 --- a/robot-systest/testsuite/slice_01-network_slicing.robot +++ b/robot-systest/testsuite/slice_01-network_slicing.robot @@ -30,7 +30,7 @@ Resource %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot Variables %{ROBOT_DEVOPS_FOLDER}/resources/slice_01-network_slicing_data.py -Suite Teardown Run Keyword And Ignore Error Test Cleanup +Suite Teardown Run Keyword And Ignore Error Suite Cleanup *** Variables *** @@ -172,16 +172,16 @@ Delete VNF Descriptors *** Keywords *** -Test Cleanup +Suite Cleanup [Documentation] Test Suit Cleanup: Deleting Descriptors, instance and template - Run Keyword If Test Failed Delete NST ${nst_name} + Run Keyword If Any Tests Failed Delete NST ${nst_name} - Run Keyword If Test Failed Delete NSD ${nsd1_name} - Run Keyword If Test Failed Delete NSD ${nsd2_name} + Run Keyword If Any Tests Failed Delete NSD ${nsd1_name} + Run Keyword If Any Tests Failed Delete NSD ${nsd2_name} - Run Keyword If Test Failed Delete VNFD ${vnfd1_name} - Run Keyword If Test Failed Delete VNFD ${vnfd2_name} + Run Keyword If Any Tests Failed Delete VNFD ${vnfd1_name} + Run Keyword If Any Tests Failed Delete VNFD ${vnfd2_name} diff --git a/robot-systest/testsuite/slice_02-shared_network_slicing.robot b/robot-systest/testsuite/slice_02-shared_network_slicing.robot index 14572c7a..bd350a21 100644 --- a/robot-systest/testsuite/slice_02-shared_network_slicing.robot +++ b/robot-systest/testsuite/slice_02-shared_network_slicing.robot @@ -29,7 +29,7 @@ Resource %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot Variables %{ROBOT_DEVOPS_FOLDER}/resources/slice_02-shared_network_slicing_data.py -Suite Teardown Run Keyword And Ignore Error Test Cleanup +Suite Teardown Run Keyword And Ignore Error Suite Cleanup *** Variables *** @@ -231,17 +231,17 @@ Delete VNF Descriptors *** Keywords *** -Test Cleanup +Suite Cleanup [Documentation] Test Suit Cleanup: Deleting Descriptors, instance and templates - Run Keyword If Test Failed Delete NST ${nst_name} - Run Keyword If Test Failed Delete NST ${nst2_name} + Run Keyword If Any Tests Failed Delete NST ${nst_name} + Run Keyword If Any Tests Failed Delete NST ${nst2_name} - Run Keyword If Test Failed Delete NSD ${nsd1_name} - Run Keyword If Test Failed Delete NSD ${nsd2_name} + Run Keyword If Any Tests Failed Delete NSD ${nsd1_name} + Run Keyword If Any Tests Failed Delete NSD ${nsd2_name} - Run Keyword If Test Failed Delete VNFD ${vnfd1_name} - Run Keyword If Test Failed Delete VNFD ${vnfd2_name} + Run Keyword If Any Tests Failed Delete VNFD ${vnfd1_name} + Run Keyword If Any Tests Failed Delete VNFD ${vnfd2_name} -- 2.25.1