xacml-pdp csit should wait for deployment
Added code to the xacml-pdp CSIT so that, after deploying policies,
it waits until the xacml-pdp indicates that the policies have been
deployed before performing any guard or decision requests.
Issue-ID: POLICY-2554
Signed-off-by: Jim Hahn <jrh3@att.com>
Change-Id: Icd016b699afbbfe3b60e866c88b45951499fa228
diff --git a/plans/policy/xacml-pdp/setup.sh b/plans/policy/xacml-pdp/setup.sh
index faf256f..d6726c7 100644
--- a/plans/policy/xacml-pdp/setup.sh
+++ b/plans/policy/xacml-pdp/setup.sh
@@ -44,6 +44,8 @@
exit 1
fi
+SCR_DMAAP=${SCRIPTS}/policy/drools-apps
+
sudo apt-get -y install libxml2-utils
bash ${SCRIPTS}/policy/policy-models-dmaap-sim.sh
@@ -81,6 +83,7 @@
DATA2=${WORKSPACE}/dmaap-sim/models/models-examples/src/main/resources/policies
ROBOT_VARIABLES=""
+ROBOT_VARIABLES="${ROBOT_VARIABLES} -v SCR_DMAAP:${SCR_DMAAP}"
ROBOT_VARIABLES="${ROBOT_VARIABLES} -v DATA2:${DATA2}"
ROBOT_VARIABLES="${ROBOT_VARIABLES} -v POLICY_PDPX_IP:${POLICY_PDPX_IP}"
ROBOT_VARIABLES="${ROBOT_VARIABLES} -v POLICY_API_IP:${POLICY_API_IP}"
diff --git a/tests/policy/xacml-pdp/xacml-pdp-test.robot b/tests/policy/xacml-pdp/xacml-pdp-test.robot
index 250e01f..6e2fa00 100644
--- 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 @@
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 @@
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