commit 09148c800bf7ca61ac2f96e005511753d4237aa0
author Jim Hahn <jrh3@att.com> Wed Sep 02 11:16:16 2020 -0400
committer Jim Hahn <jrh3@att.com> Wed Sep 02 13:08:26 2020 -0400
tree e8ea22d08abcf97bf23396489e007415539854aa
parent 17bd0431d70dcf80d0de81f64bc1fec387effa31

Use models-examples in CSITs

Replaced tosca policies found in the test "data" directory with policies
from models-examples.
Also added the dmaap simulator to the pap CSIT to prevent the error log
from filling with dmaap errors while trying to debug the CSIT.

Issue-ID: POLICY-2813
Change-Id: I6bccffa41acd0fda0b945fe8e3cd6badde1ac4c1
Signed-off-by: Jim Hahn <jrh3@att.com>

tests/policy/api/api-test.robot

diff --git a/tests/policy/api/api-test.robot b/tests/policy/api/api-test.robot
index c229bcf..2f5c697 100644
--- a/tests/policy/api/api-test.robot
+++ b/tests/policy/api/api-test.robot
@@ -78,7 +78,7 @@
 CreateNewMonitoringPolicyV1
      [Documentation]    Create a new Monitoring TCA policy version 1
      ${auth}=    Create List    healthcheck    zb!XztG34
-     ${postjson}=  Get file  ${CURDIR}/data/vCPE.policy.monitoring.input.tosca.v1.json
+     ${postjson}=  Get file  ${DATA}/vCPE.policy.monitoring.input.tosca.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
@@ -92,7 +92,7 @@
 SimpleCreateNewMonitoringPolicyV1
      [Documentation]    Create a new Monitoring TCA policiy version 1 using simple endpoint. Trying to create an existing policy with any change and same version should cause error.
      ${auth}=    Create List    healthcheck    zb!XztG34
-     ${postjson}=  Get file  ${CURDIR}/data/vCPE.policy.monitoring.input.tosca.v1_2.json
+     ${postjson}=  Get file  ${DATA}/vCPE.policy.monitoring.input.tosca.v1_2.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
@@ -103,7 +103,7 @@
 SimpleCreateNewMonitoringPolicyV2
      [Documentation]    Create a new Monitoring TCA policiy version 2 using simple endpoint
      ${auth}=    Create List    healthcheck    zb!XztG34
-     ${postjson}=  Get file  ${CURDIR}/data/vCPE.policy.monitoring.input.tosca.v2.json
+     ${postjson}=  Get file  ${DATA}/vCPE.policy.monitoring.input.tosca.v2.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
@@ -117,7 +117,7 @@
 RetrievePoliciesOfType
      [Documentation]    Retrieve all Policies Created for a specific Policy Type
      ${auth}=    Create List    healthcheck    zb!XztG34
-     ${expjson}=  Get file  ${CURDIR}/data/vCPE.policy.monitoring.input.tosca.v1.json
+     ${expjson}=  Get file  ${DATA}/vCPE.policy.monitoring.input.tosca.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
@@ -131,7 +131,7 @@
 RetrieveAllPolicies
      [Documentation]    Retrieve all Policies
      ${auth}=    Create List    healthcheck    zb!XztG34
-     ${expjson}=  Get file  ${CURDIR}/data/vCPE.policy.monitoring.input.tosca.v1.json
+     ${expjson}=  Get file  ${DATA}/vCPE.policy.monitoring.input.tosca.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
@@ -144,7 +144,7 @@
 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
+     ${expjson}=  Get file  ${DATA}/vCPE.policy.monitoring.input.tosca.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