Merge "Update CSITs for metrics + refactoring"

1 files changed, 37 insertions, 60 deletions

diff --git a/csit/xacml-pdp/tests/xacml-pdp-test.robot b/csit/xacml-pdp/tests/xacml-pdp-test.robot
index c88959d0..c1bba0af 100644
--- a/csit/xacml-pdp/tests/xacml-pdp-test.robot
+++ b/csit/xacml-pdp/tests/xacml-pdp-test.robot
@@ -4,69 +4,80 @@ Library     RequestsLibrary
 Library     OperatingSystem
 Library     Process
 Library     json
+Resource    ${CURDIR}/../../common-library.robot
 
 *** Test Cases ***
 Healthcheck
      [Documentation]  Verify policy xacml-pdp health check
-     ${resp}=  PeformGetRequest  /policy/pdpx/v1/healthcheck  200
+     ${resp}=  PerformGetRequest  ${POLICY_PDPX_IP}  /policy/pdpx/v1/healthcheck  200  null
      Should Be Equal As Strings    ${resp.json()['code']}  200
 
 Statistics
      [Documentation]  Verify policy xacml-pdp statistics
-     ${resp}=  PeformGetRequest  /policy/pdpx/v1/statistics  200
+     ${resp}=  PerformGetRequest  ${POLICY_PDPX_IP}  /policy/pdpx/v1/statistics  200  null
      Should Be Equal As Strings    ${resp.json()['code']}  200
 
+Metrics
+    [Documentation]  Verify policy-xacml-pdp is exporting prometheus metrics
+    ${resp}=  PerformGetRequest  ${POLICY_PDPX_IP}  /metrics  200  null
+    Should Contain  ${resp.text}  jvm_threads_current
+
 MakeTopics
      [Documentation]    Creates the Policy topics
      ${result}=     Run Process     ${SCR_DMAAP}/make_topic.sh   POLICY-PDP-PAP
      Should Be Equal As Integers        ${result.rc}    0
 
 ExecuteXacmlPolicy
-     Wait Until Keyword Succeeds    1 min   15 sec  CreateMonitorPolicy
-     Wait Until Keyword Succeeds    1 min   15 sec  CreateOptimizationPolicy
+     CreateMonitorPolicy
+     CreateOptimizationPolicy
      Wait Until Keyword Succeeds    1 min   15 sec  GetDefaultDecision
-     Wait Until Keyword Succeeds    1 min   15 sec  DeployPolicies
+     DeployPolicies
      Wait Until Keyword Succeeds    1 min   15 sec  GetStatisticsAfterDeployed
      Wait Until Keyword Succeeds    1 min   15 sec  GetAbbreviatedDecisionResult
      Wait Until Keyword Succeeds    1 min   15 sec  GetMonitoringDecision
      Wait Until Keyword Succeeds    1 min   15 sec  GetNamingDecision
      Wait Until Keyword Succeeds    1 min   15 sec  GetOptimizationDecision
      Wait Until Keyword Succeeds    1 min   15 sec  GetStatisticsAfterDecision
-     Wait Until Keyword Succeeds    1 min   15 sec  UndeployMonitorPolicy
+     UndeployMonitorPolicy
      Wait Until Keyword Succeeds    1 min   15 sec  GetStatisticsAfterUndeploy
 
 *** Keywords ***
 
 CreateMonitorPolicy
      [Documentation]  Create a Monitoring policy
-     CreatePolicy  /policy/api/v1/policytypes/onap.policies.monitoring.tcagen2/versions/1.0.0/policies  200  vCPE.policy.monitoring.input.tosca.json  onap.restart.tca  1.0.0
+     ${postjson}=  Get file  ${DATA2}/vCPE.policy.monitoring.input.tosca.json
+     CreatePolicy  /policy/api/v1/policytypes/onap.policies.monitoring.tcagen2/versions/1.0.0/policies  200  ${postjson}  onap.restart.tca  1.0.0
 
 CreateOptimizationPolicy
      [Documentation]  Create an Optimization policy
-     CreatePolicy  /policy/api/v1/policytypes/onap.policies.optimization.resource.AffinityPolicy/versions/1.0.0/policies  200  vCPE.policies.optimization.input.tosca.json  OSDF_CASABLANCA.Affinity_Default  1.0.0
+     ${postjson}=  Get file  ${DATA2}/vCPE.policies.optimization.input.tosca.json
+     CreatePolicy  /policy/api/v1/policytypes/onap.policies.optimization.resource.AffinityPolicy/versions/1.0.0/policies  200  ${postjson}  OSDF_CASABLANCA.Affinity_Default  1.0.0
 
 GetDefaultDecision
-    [Documentation]  Get Default Decision with no policies in Xacml PDP
-     ${resp}=  PerformPostRequest  /policy/pdpx/v1/decision  abbrev=true  ${POLICY_PDPX_IP}  200  onap.policy.guard.decision.request.json  ${CURDIR}/data
+     [Documentation]  Get Default Decision with no policies in Xacml PDP
+     ${postjson}=  Get file  ${CURDIR}/data/onap.policy.guard.decision.request.json
+     ${resp}=  PerformPostRequest  ${POLICY_PDPX_IP}  /policy/pdpx/v1/decision  200  ${postjson}  abbrev=true
      ${status}=  Get From Dictionary  ${resp.json()}  status
      Should Be Equal As Strings  ${status}  Permit
 
 DeployPolicies
      [Documentation]   Runs Policy PAP to deploy a policy
-     ${resp}=  PerformPostRequest  /policy/pap/v1/pdps/policies  null  ${POLICY_PAP_IP}  202  vCPE.policy.input.tosca.deploy.json  ${CURDIR}/data
+     ${postjson}=  Get file  ${CURDIR}/data/vCPE.policy.input.tosca.deploy.json
+     PerformPostRequest  ${POLICY_PAP_IP}  /policy/pap/v1/pdps/policies  202  ${postjson}  null
      ${result}=     Run Process    ${SCR_DMAAP}/wait_topic.sh    POLICY-PDP-PAP
      ...            responseTo    xacml    ACTIVE    onap.restart.tca
      Should Be Equal As Integers        ${result.rc}    0
 
 GetStatisticsAfterDeployed
      [Documentation]  Verify policy xacml-pdp statistics after policy is deployed
-     ${resp}=  PeformGetRequest  /policy/pdpx/v1/statistics  200
+     ${resp}=  PerformGetRequest  ${POLICY_PDPX_IP}  /policy/pdpx/v1/statistics  200  null
      Should Be Equal As Strings  ${resp.json()['code']}  200
      Should Be Equal As Strings  ${resp.json()['totalPoliciesCount']}  3
 
 GetAbbreviatedDecisionResult
-    [Documentation]    Get Decision with abbreviated results from Policy Xacml PDP
-     ${resp}=  PerformPostRequest  /policy/pdpx/v1/decision  abbrev=true  ${POLICY_PDPX_IP}  200  onap.policy.monitoring.decision.request.json  ${CURDIR}/data
+     [Documentation]    Get Decision with abbreviated results from Policy Xacml PDP
+     ${postjson}=  Get file  ${CURDIR}/data/onap.policy.monitoring.decision.request.json
+     ${resp}=  PerformPostRequest  ${POLICY_PDPX_IP}  /policy/pdpx/v1/decision  200  ${postjson}  abbrev=true
      ${policy}=    Get From Dictionary    ${resp.json()['policies']}   onap.restart.tca
      Dictionary Should Contain Key    ${policy}    type
      Dictionary Should Contain Key    ${policy}    metadata
@@ -76,8 +87,9 @@ GetAbbreviatedDecisionResult
      Dictionary Should Not Contain Key    ${policy}    version
 
 GetMonitoringDecision
-    [Documentation]    Get Decision from Monitoring Policy Xacml PDP
-     ${resp}=  PerformPostRequest  /policy/pdpx/v1/decision  null  ${POLICY_PDPX_IP}  200  onap.policy.monitoring.decision.request.json  ${CURDIR}/data
+     [Documentation]    Get Decision from Monitoring Policy Xacml PDP
+     ${postjson}=  Get file  ${CURDIR}/data/onap.policy.monitoring.decision.request.json
+     ${resp}=  PerformPostRequest  ${POLICY_PDPX_IP}  /policy/pdpx/v1/decision  200  ${postjson}  null
      ${policy}=    Get From Dictionary    ${resp.json()['policies']}   onap.restart.tca
      Dictionary Should Contain Key    ${policy}    type
      Dictionary Should Contain Key    ${policy}    metadata
@@ -87,8 +99,9 @@ GetMonitoringDecision
      Dictionary Should Contain Key    ${policy}    version
 
 GetNamingDecision
-    [Documentation]    Get Decision from Naming Policy Xacml PDP
-     ${resp}=  PerformPostRequest  /policy/pdpx/v1/decision  null  ${POLICY_PDPX_IP}  200  onap.policy.naming.decision.request.json  ${CURDIR}/data
+     [Documentation]    Get Decision from Naming Policy Xacml PDP
+     ${postjson}=  Get file  ${CURDIR}/data/onap.policy.naming.decision.request.json
+     ${resp}=  PerformPostRequest  ${POLICY_PDPX_IP}  /policy/pdpx/v1/decision  200  ${postjson}  null
      ${policy}=    Get From Dictionary    ${resp.json()['policies']}   SDNC_Policy.ONAP_NF_NAMING_TIMESTAMP
      Dictionary Should Contain Key    ${policy}    type
      Dictionary Should Contain Key    ${policy}    type_version
@@ -96,8 +109,9 @@ GetNamingDecision
      Dictionary Should Contain Key    ${policy}    name
 
 GetOptimizationDecision
-    [Documentation]    Get Decision from Optimization Policy Xacml PDP
-     ${resp}=  PerformPostRequest  /policy/pdpx/v1/decision  null  ${POLICY_PDPX_IP}  200  onap.policy.optimization.decision.request.json  ${CURDIR}/data
+     [Documentation]    Get Decision from Optimization Policy Xacml PDP
+     ${postjson}=  Get file  ${CURDIR}/data/onap.policy.optimization.decision.request.json
+     ${resp}=  PerformPostRequest  ${POLICY_PDPX_IP}  /policy/pdpx/v1/decision  200  ${postjson}  null
      ${policy}=    Get From Dictionary    ${resp.json()['policies']}   OSDF_CASABLANCA.Affinity_Default
      Dictionary Should Contain Key    ${policy}    type
      Dictionary Should Contain Key    ${policy}    type_version
@@ -106,54 +120,17 @@ GetOptimizationDecision
 
 GetStatisticsAfterDecision
      [Documentation]    Runs Policy Xacml PDP Statistics after Decision request
-     ${resp}=  PeformGetRequest  /policy/pdpx/v1/statistics  200
+     ${resp}=  PerformGetRequest  ${POLICY_PDPX_IP}  /policy/pdpx/v1/statistics  200  null
      Should Be Equal As Strings    ${resp.json()['code']}  200
      Should Be Equal As Strings    ${resp.json()['permitDecisionsCount']}     4
      Should Be Equal As Strings    ${resp.json()['notApplicableDecisionsCount']}     1
 
 UndeployMonitorPolicy
      [Documentation]    Runs Policy PAP to undeploy a policy
-     PeformDeleteRequest  /policy/pap/v1/pdps/policies/onap.restart.tca  202
+     PerformDeleteRequest  ${POLICY_PAP_IP}  /policy/pap/v1/pdps/policies/onap.restart.tca  202
 
 GetStatisticsAfterUndeploy
      [Documentation]    Runs Policy Xacml PDP Statistics after policy is undeployed
-     ${resp}=  PeformGetRequest  /policy/pdpx/v1/statistics  200
+     ${resp}=  PerformGetRequest  ${POLICY_PDPX_IP}  /policy/pdpx/v1/statistics  200  null
      Should Be Equal As Strings    ${resp.json()['code']}  200
      Should Be Equal As Strings    ${resp.json()['totalPoliciesCount']}     2
-
-CreatePolicy
-     [Arguments]  ${url}  ${expectedstatus}  ${jsonfile}  ${policyname}  ${policyversion}
-     [Documentation]  Create the specific policy
-     ${resp}=  PerformPostRequest  ${url}  null  ${POLICY_API_IP}  ${expectedstatus}  ${jsonfile}  ${DATA2}
-     Run Keyword If  ${expectedstatus}==200  Dictionary Should Contain Key  ${resp.json()['topology_template']['policies'][0]}  ${policyname}
-     Run Keyword If  ${expectedstatus}==200  Should Be Equal As Strings  ${resp.json()['topology_template']['policies'][0]['${policyname}']['version']}  ${policyversion}
-
-PerformPostRequest
-     [Arguments]  ${url}  ${params}  ${hostname}  ${expectedstatus}  ${jsonfile}  ${filepath}
-     ${auth}=  Create List  healthcheck  zb!XztG34
-     ${postjson}=  Get file  ${filepath}/${jsonfile}
-     Log  Creating session https://${hostname}:6969
-     ${session}=  Create Session  policy  https://${hostname}:6969  auth=${auth}
-     ${headers}=  Create Dictionary  Accept=application/json  Content-Type=application/json
-     ${resp}=  POST On Session  policy  ${url}  params=${params}  data=${postjson}  headers=${headers}  expected_status=${expectedstatus}
-     Log  Received response from policy ${resp.text}
-     [return]  ${resp}
-
-PeformGetRequest
-     [Arguments]  ${url}  ${expectedstatus}
-     ${auth}=  Create List  healthcheck  zb!XztG34
-     Log  Creating session https://${POLICY_PDPX_IP}:6969
-     ${session}=  Create Session  policy  https://${POLICY_PDPX_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}
-
-PeformDeleteRequest
-     [Arguments]  ${url}  ${expectedstatus}
-     ${auth}=  Create List  healthcheck  zb!XztG34
-     Log  Creating session https://${POLICY_PAP_IP}:6969
-     ${session}=  Create Session  policy  https://${POLICY_PAP_IP}:6969  auth=${auth}
-     ${headers}=  Create Dictionary  Accept=application/json  Content-Type=application/json
-     ${resp}=  DELETE On Session  policy  ${url}  headers=${headers}  expected_status=${expectedstatus}
-     Log  Received response from policy ${resp.text}