Fix undeploye/delete operational policy
do both policy undeploys before deletes so that undeploy has more time to process
remove heatbridge.robot include references to get rid of error message at startup
remove commented out referecnes to heatbridge (cleanup)
Issue-ID: INT-1803
Change-Id: I0cb071f487faf6ecababdc6d8a5c0e3aa79720b7
Signed-off-by: Brian Freeman <bf1936@att.com>
diff --git a/robot/resources/policy_interface.robot b/robot/resources/policy_interface.robot
index b8ecf45..9ff95f0 100644
--- a/robot/resources/policy_interface.robot
+++ b/robot/resources/policy_interface.robot
@@ -188,7 +188,7 @@
[Return] ${resp}
Should Be Equal As Strings ${resp.status_code} 200
-Run Undeploy Policy
+Run Undeploy vFW Operational Policy
[Documentation] Runs Policy PAP Undeploy a Policy from PDP Groups
#[Arguments] ${policy_name}
${auth}= Create List ${POLICY_HEALTHCHECK_USERNAME} ${POLICY_HEALTHCHECK_PASSWORD}
@@ -222,6 +222,16 @@
Log Received response from policy ${resp.text}
Should Be Equal As Strings ${resp.status_code} 200
+Run Delete vFW Operational Policy
+ [Documentation] Runs Policy API Delete Operational Policy
+ #[Arguments] ${policy_name}
+ ${auth}= Create List ${POLICY_HEALTHCHECK_USERNAME} ${POLICY_HEALTHCHECK_PASSWORD}
+ ${session}= Create Session policy ${GLOBAL_POLICY_SERVER_PROTOCOL}://${POLICY_API_IP}:${GLOBAL_POLICY_HEALTHCHECK_PORT} auth=${auth}
+ Log Creating session ${GLOBAL_POLICY_SERVER_PROTOCOL}://${POLICY_API_IP}:${GLOBAL_POLICY_HEALTHCHECK_PORT}
+ ${headers}= Create Dictionary Accept=application/json Content-Type=application/json
+ ${resp}= Delete Request policy /policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Drools/versions/1.0.0/policies/operational.modifyconfig/versions/1.0.0 headers=${headers}
+ Log Received response from policy ${resp.text}
+ Should Be Equal As Strings ${resp.status_code} 200
Run Delete Policy Request
[Documentation] Runs Policy Delete request