Merge "Update CSIT test for 'Fetch and Delete policy API with PolicyName and PolicyVe...

diff --git a/tests/policy/api/api-test.robot b/tests/policy/api/api-test.robot
index 76c1bdc..d3df9cc 100644 (file)
--- a/tests/policy/api/api-test.robot
+++ b/tests/policy/api/api-test.robot
@@ -128,16 +128,43 @@ RetrievePoliciesOfType
      Dictionary Should Contain Key    ${resp.json()['topology_template']['policies'][0]}  onap.restart.tca
      Dictionary Should Contain Key     ${expjsonobject['topology_template']['policies'][0]}  onap.restart.tca
 
-DeleteSpecificPolicyV1
-     [Documentation]    Delete the Monitoring Policy Version 1 of the TCA Policy Type
+RetrieveAllPolicies
+     [Documentation]    Retrieve all Policies
+     ${auth}=    Create List    healthcheck    zb!XztG34
+     ${expjson}=  Get file  ${CURDIR}/data/vCPE.policy.monitoring.input.tosca.v1.json
+     Log    Creating session https://${POLICY_API_IP}:6969
+     ${session}=    Create Session      policy  https://${POLICY_API_IP}:6969   auth=${auth}
+     ${headers}=  Create Dictionary     Accept=application/json    Content-Type=application/json
+     ${resp}=   Get Request   policy  /policy/api/v1/policies     headers=${headers}
+     Log    Received response from policy ${resp.text}
+     ${expjsonobject}   To Json    ${expjson}
+     Should Be Equal As Strings    ${resp.status_code}     200
+     Should Contain      ${expjsonobject['topology_template']['policies'][0]}  onap.restart.tca
+
+RetrieveSpecificPolicy
+     [Documentation]    Retrieve a specific Policy named 'onap.restart.tca' and version '1.0.0'
+     ${auth}=    Create List    healthcheck    zb!XztG34
+     ${expjson}=  Get file  ${CURDIR}/data/vCPE.policy.monitoring.input.tosca.v1.json
+     Log    Creating session https://${POLICY_API_IP}:6969
+     ${session}=    Create Session      policy  https://${POLICY_API_IP}:6969   auth=${auth}
+     ${headers}=  Create Dictionary     Accept=application/json    Content-Type=application/json
+     ${resp}=   Get Request   policy  /policy/api/v1/policies/onap.restart.tca/versions/1.0.0/     headers=${headers}
+     Log    Received response from policy ${resp.text}
+     ${expjsonobject}   To Json    ${expjson}
+     Should Be Equal As Strings    ${resp.status_code}     200
+     Dictionary Should Contain Key    ${resp.json()['topology_template']['policies'][0]}  onap.restart.tca
+     Dictionary Should Contain Key      ${expjsonobject['topology_template']['policies'][0]}  onap.restart.tca
+
+DeleteSpecificPolicy
+     [Documentation]    Delete a specific Policy named 'onap.restart.tca' and version '1.0.0'
      ${auth}=    Create List    healthcheck    zb!XztG34
      Log    Creating session https://${POLICY_API_IP}:6969
      ${session}=    Create Session      policy  https://${POLICY_API_IP}:6969   auth=${auth}
      ${headers}=  Create Dictionary     Accept=application/json    Content-Type=application/json
-     ${resp}=   Delete Request   policy  /policy/api/v1/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0/policies/onap.restart.tca/versions/1.0.0     headers=${headers}
+     ${resp}=   Delete Request   policy  /policy/api/v1/policies/onap.restart.tca/versions/1.0.0     headers=${headers}
      Log    Received response from policy ${resp.text}
      Should Be Equal As Strings    ${resp.status_code}     200
-     ${resp}=   Delete Request   policy  /policy/api/v1/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0/policies/onap.restart.tca/versions/1.0.0     headers=${headers}
+     ${resp}=   Delete Request   policy  /policy/api/v1/policies/onap.restart.tca/versions/1.0.0     headers=${headers}
      Should Be Equal As Strings    ${resp.status_code}     404
 
 DeleteSpecificPolicyV2