From 6435e9dd667d0bd27b0fad7a25b18f3fc92839d5 Mon Sep 17 00:00:00 2001 From: Ram Krishna Verma Date: Fri, 7 May 2021 15:14:13 -0400 Subject: Refactor policy/distribution csit tests * Removed the deprecated methods. * Removed duplicated code. Issue-ID: POLICY-3257 Change-Id: I1252a625096bb2cfcea4cdd58197c3bf84358aba Signed-off-by: Ram Krishna Verma --- csit/tests/distribution-test.robot | 53 ++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 28 deletions(-) diff --git a/csit/tests/distribution-test.robot b/csit/tests/distribution-test.robot index 1a8c1471..7b1fd7a5 100644 --- a/csit/tests/distribution-test.robot +++ b/csit/tests/distribution-test.robot @@ -7,39 +7,36 @@ Library json *** Test Cases *** Healthcheck - [Documentation] Runs Policy Distribution Health check - ${auth}= Create List healthcheck zb!XztG34 - Log Creating session https://${POLICY_DISTRIBUTION_IP}:6969 - ${session}= Create Session policy https://${POLICY_DISTRIBUTION_IP}:6969 auth=${auth} - ${headers}= Create Dictionary Accept=application/json Content-Type=application/json - ${resp}= Get Request policy /healthcheck headers=${headers} - Log Received response from policy ${resp.text} - Should Be Equal As Strings ${resp.status_code} 200 - Should Be Equal As Strings ${resp.json()['code']} 200 + [Documentation] Verify policy distribution health check + ${resp}= PeformGetRequest /healthcheck 200 + Should Be Equal As Strings ${resp.json()['code']} 200 Statistics - [Documentation] Runs Policy Distribution Statistics - ${auth}= Create List healthcheck zb!XztG34 - Log Creating session https://${POLICY_DISTRIBUTION_IP}:6969 - ${session}= Create Session policy https://${POLICY_DISTRIBUTION_IP}:6969 auth=${auth} - ${headers}= Create Dictionary Accept=application/json Content-Type=application/json - ${resp}= Get Request policy /statistics headers=${headers} - Log Received response from policy ${resp.text} - Should Be Equal As Strings ${resp.status_code} 200 - Should Be Equal As Strings ${resp.json()['code']} 200 + [Documentation] Verify policy distribution statistics + ${resp}= PeformGetRequest /statistics 200 + Should Be Equal As Strings ${resp.json()['code']} 200 InvokeDistributionAndRunEventOnEngine - Wait Until Keyword Succeeds 5 min 30 sec InvokeDistributionUsingFile And RunEventOnApexEngine + Wait Until Keyword Succeeds 5 min 30 sec InvokeDistributionUsingFile And RunEventOnApexEngine *** Keywords *** InvokeDistributionUsingFile And RunEventOnApexEngine - Copy File ${SCRIPT_DIR}/csar/csar_temp.csar ${SCRIPT_DIR}/csar/temp.csar - Move File ${SCRIPT_DIR}/csar/temp.csar ${SCRIPT_DIR}/temp/sample_csar_with_apex_policy.csar - Sleep 20 seconds "Waiting for the Policy Distribution to call Policy API and PAP" - Create Session apexSession http://${APEX_IP}:23324 max_retries=1 - ${data}= Get Binary File ${CURDIR}${/}data${/}event.json - &{headers}= Create Dictionary Content-Type=application/json Accept=application/json - ${resp}= Put Request apexSession /apex/FirstConsumer/EventIn data=${data} headers=${headers} - Should Be Equal As Strings ${resp.status_code} 200 - Remove Files ${SCRIPT_DIR}/temp/sample_csar_with_apex_policy.csar + Copy File ${SCRIPT_DIR}/csar/csar_temp.csar ${SCRIPT_DIR}/csar/temp.csar + Move File ${SCRIPT_DIR}/csar/temp.csar ${SCRIPT_DIR}/temp/sample_csar_with_apex_policy.csar + Sleep 20 seconds "Waiting for the Policy Distribution to call Policy API and PAP" + Create Session apexSession http://${APEX_IP}:23324 max_retries=1 + ${data}= Get Binary File ${CURDIR}${/}data${/}event.json + &{headers}= Create Dictionary Content-Type=application/json Accept=application/json + ${resp}= PUT On Session apexSession /apex/FirstConsumer/EventIn data=${data} headers=${headers} expected_status=200 + Remove Files ${SCRIPT_DIR}/temp/sample_csar_with_apex_policy.csar + +PeformGetRequest + [Arguments] ${url} ${expectedstatus} + ${auth}= Create List healthcheck zb!XztG34 + Log Creating session https://${POLICY_DISTRIBUTION_IP}:6969 + ${session}= Create Session policy https://${POLICY_DISTRIBUTION_IP}:6969 auth=${auth} + ${headers}= Create Dictionary Accept=application/json Content-Type=application/json + ${resp}= GET On Session policy ${url} headers=${headers} expected_status=${expectedstatus} + Log Received response from policy ${resp.text} + [return] ${resp} -- cgit 1.2.3-korg