X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=tests%2Fpolicy%2Fpap%2Fpap-test.robot;h=3e8bc2115527cbd746f5f6930171e009b16ab63e;hb=09148c800bf7ca61ac2f96e005511753d4237aa0;hp=0a6251de39f67751a1040076cf4b9c13a02bce41;hpb=0a594cf5cb96a31bf7e5abb0d00844db25fa7408;p=integration%2Fcsit.git

diff --git a/tests/policy/pap/pap-test.robot b/tests/policy/pap/pap-test.robot
index 0a6251de..3e8bc211 100644
--- a/tests/policy/pap/pap-test.robot
+++ b/tests/policy/pap/pap-test.robot
@@ -5,6 +5,17 @@ Library     OperatingSystem
 Library     json
 
 *** Test Cases ***
+LoadPolicy
+     [Documentation]    Loads prerequisite Policy via API
+     ${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
+     ${postjson}=  Get file  ${DATA}/vCPE.policy.monitoring.input.tosca.json
+     ${resp}=   Post Request     policy  /policy/api/v1/policytypes/onap.policies.monitoring.tcagen2/versions/1.0.0/policies    data=${postjson}     headers=${headers}
+     Log    Received response from API ${resp.text}
+     Should Be Equal As Strings    ${resp.status_code}     200
+
 Healthcheck
      [Documentation]    Runs Policy PAP Health check
      ${auth}=    Create List    healthcheck    zb!XztG34
@@ -34,7 +45,7 @@ CreatePdpGroups
      ${postjson}=  Get file  ${CURDIR}/data/create.group.request.json
      ${session}=    Create Session      policy  https://${POLICY_PAP_IP}:6969   auth=${auth}
      ${headers}=  Create Dictionary     Accept=application/json    Content-Type=application/json
-     ${resp}=   Post Request     policy  /policy/pap/v1/pdps    data=${postjson}     headers=${headers}
+     ${resp}=   Post Request     policy  /policy/pap/v1/pdps/groups/batch    data=${postjson}     headers=${headers}
      Log    Received response from policy ${resp.text}
      Should Be Equal As Strings    ${resp.status_code}     200
 
@@ -57,10 +68,20 @@ QueryPdpGroups
      ${resp}=   Get Request     policy  /policy/pap/v1/pdps     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()['groups'][0]['name']}  controlloop
-     Should Be Equal As Strings    ${resp.json()['groups'][1]['name']}  create.group.request
-     Should Be Equal As Strings    ${resp.json()['groups'][1]['pdpGroupState']}  ACTIVE
-     Should Be Equal As Strings    ${resp.json()['groups'][2]['name']}  monitoring
+     Should Be Equal As Strings    ${resp.json()['groups'][0]['name']}  create.group.request
+     Should Be Equal As Strings    ${resp.json()['groups'][0]['pdpGroupState']}  ACTIVE
+     Should Be Equal As Strings    ${resp.json()['groups'][1]['name']}  defaultGroup
+
+DeployPdpGroups
+     [Documentation]    Runs Policy PAP Deploy Policies to PDP Groups
+     ${auth}=    Create List    healthcheck    zb!XztG34
+     Log    Creating session https://${POLICY_PAP_IP}:6969
+     ${postjson}=  Get file  ${CURDIR}/data/deploy.group.request.json
+     ${session}=    Create Session      policy  https://${POLICY_PAP_IP}:6969   auth=${auth}
+     ${headers}=  Create Dictionary     Accept=application/json    Content-Type=application/json
+     ${resp}=   Post Request     policy  /policy/pap/v1/pdps/deployments/batch    data=${postjson}     headers=${headers}
+     Log    Received response from policy ${resp.text}
+     Should Be Equal As Strings    ${resp.status_code}     200
 
 UndeployPolicy
      [Documentation]    Runs Policy PAP Undeploy a Policy from PDP Groups
@@ -81,8 +102,8 @@ QueryPdpGroupsAfterUndeploy
      ${resp}=   Get Request     policy  /policy/pap/v1/pdps     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()['groups'][1]['name']}  create.group.request
-     Should Be Equal As Strings    ${resp.json()['groups'][1]['pdpSubgroups'][0]['policies']}  []
+     Should Be Equal As Strings    ${resp.json()['groups'][0]['name']}  create.group.request
+     Should Be Equal As Strings    ${resp.json()['groups'][0]['pdpSubgroups'][0]['policies']}  []
 
 DeactivatePdpGroup
      [Documentation]    Runs Policy PAP Change PDP Group State to PASSIVE
@@ -113,5 +134,4 @@ QueryPdpGroupsAfterDelete
      ${resp}=   Get Request     policy  /policy/pap/v1/pdps     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()['groups'][0]['name']}  controlloop
-     Should Be Equal As Strings    ${resp.json()['groups'][1]['name']}  monitoring
+     Should Be Equal As Strings    ${resp.json()['groups'][0]['name']}  defaultGroup