xacml-pdp csit should wait for deployment

[integration/csit.git] / tests / policy / xacml-pdp / xacml-pdp-test.robot

diff --git a/tests/policy/xacml-pdp/xacml-pdp-test.robot b/tests/policy/xacml-pdp/xacml-pdp-test.robot
index 931c77b..6e2fa00 100644 (file)
--- a/tests/policy/xacml-pdp/xacml-pdp-test.robot
+++ b/tests/policy/xacml-pdp/xacml-pdp-test.robot
@@ -2,6 +2,7 @@
 Library     Collections
 Library     RequestsLibrary
 Library     OperatingSystem
+Library     Process
 Library     json
 
 *** Test Cases ***
@@ -27,6 +28,11 @@ Statistics
      Should Be Equal As Strings    ${resp.status_code}     200
      Should Be Equal As Strings    ${resp.json()['code']}  200
 
+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    0 min   15 sec  CreateMonitorPolicy
      Wait Until Keyword Succeeds    0 min   15 sec  CreateOptimizationPolicy
@@ -78,6 +84,8 @@ DeployPolicies
      Log    Received response from policy5 ${resp.text}
      ${postjsonobject}   To Json    ${postjson}
      Should Be Equal As Strings    ${resp.status_code}     200
+     ${result}=     Run Process    ${SCR_DMAAP}/wait_topic.sh    POLICY-PDP-PAP
+     ...            responseTo    xacml    ACTIVE    onap.restart.tca
 
 GetStatisticsAfterDeployed
      [Documentation]    Runs Policy Xacml PDP Statistics after policy is deployed
@@ -151,7 +159,7 @@ GetNamingDecision
      ${headers}=  Create Dictionary     Accept=application/json    Content-Type=application/json
      ${resp}=   Post Request     policy  /policy/pdpx/v1/decision  data=${postjson}   headers=${headers}
      Log    Received response from policy ${resp.text}
-     ${policy}=    Get From Dictionary    ${resp.json()['policies']}   SDNC_Policy.ONAP_VNF_NAMING_TIMESTAMP
+     ${policy}=    Get From Dictionary    ${resp.json()['policies']}   SDNC_Policy.ONAP_NF_NAMING_TIMESTAMP
      Should Be Equal As Strings    ${resp.status_code}     200
      Dictionary Should Contain Key    ${policy}    type
      Dictionary Should Contain Key    ${policy}    type_version