From d168a9a27da456fe025b6e6438cecac3047ee97e Mon Sep 17 00:00:00 2001 From: mrichomme Date: Wed, 16 Dec 2020 10:24:33 +0100 Subject: [BUGFIX] Rename the renamed Undeploy Policy Keyword The keyward has been renamed last week [] Unfortunately this Keyword is not used only for the vFWCL it is also used for a healthcheck (Enhanced Policy) Since it has been merged and cherry-picked, the Healthcheck is failing on master (12/12) and in Guilin (15/12) This patch revert the Name to keep generic and reference the generic name in the vFW CL test Issue-ID: INT-1811 Signed-off-by: mrichomme Change-Id: I3cf0836e8b79f88be1dfb3d655a8e925c934def8 --- robot/resources/policy_interface.robot | 4 ++-- robot/testsuites/closed-loop.robot | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/robot/resources/policy_interface.robot b/robot/resources/policy_interface.robot index 9ff95f07..82b5cda4 100644 --- a/robot/resources/policy_interface.robot +++ b/robot/resources/policy_interface.robot @@ -135,7 +135,7 @@ Update vFWCL Operational and Monitoring Policies [Documentation] Undeploy, Delete and Create Operational and Monitoring policies for vFWCL [Arguments] ${model_invariant_id} Run Keyword And Ignore Error Run Undeploy vFW Monitoring Policy - Run Keyword And Ignore Error Run Undeploy vFW Operational Policy + Run Keyword And Ignore Error Run Undeploy Policy # Need to wait a little for undeploy Validate the vFWCL Policy Run Keyword and Ignore Error Run Delete vFW Monitoring Policy @@ -188,7 +188,7 @@ Run Deploy Policy Pap Post Request [Return] ${resp} Should Be Equal As Strings ${resp.status_code} 200 -Run Undeploy vFW Operational Policy +Run Undeploy Policy [Documentation] Runs Policy PAP Undeploy a Policy from PDP Groups #[Arguments] ${policy_name} ${auth}= Create List ${POLICY_HEALTHCHECK_USERNAME} ${POLICY_HEALTHCHECK_PASSWORD} diff --git a/robot/testsuites/closed-loop.robot b/robot/testsuites/closed-loop.robot index 6f1a9db3..73273e17 100644 --- a/robot/testsuites/closed-loop.robot +++ b/robot/testsuites/closed-loop.robot @@ -28,7 +28,7 @@ VFWCL Repush Monitoring And Operational Policies Validate the vFWCL Policy Run Keyword And Ignore Error Run Undeploy vFW Monitoring Policy Validate the vFWCL Policy - Run Keyword And Ignore Error Run Undeploy vFW Operational Policy + Run Keyword And Ignore Error Run Undeploy Policy Validate the vFWCL Policy Run Keyword and Ignore Error Run Delete vFW Monitoring Policy Validate the vFWCL Policy -- cgit 1.2.3-korg