diff options
| author |   liamfallon <liam.fallon@est.tech> | 2023-02-10 22:01:43 +0000 |
|---|---|---|
| committer | liamfallon <liam.fallon@est.tech> | 2023-02-13 16:45:02 +0000 |
| commit | f5a11b0b346df610ffa8d9857956abf113ce6765 (patch) | |
| tree | cb27bb6b9e29c2d23ac313d86b4bbdfe5883a855 /csit/drools-pdp | |
| parent | 600a3002192da1ba2174c63d248a46dc27414397 (diff) | |
Refactor CSITs to use exposed ports
The CSITs were using the ports in the Docker environment directly. This
commit changes the CSITs to use published ports.
Issue-ID: POLICY-4533
Change-Id: I17d60c8bceae71f1bf2175dcb6addf032f14a899
Signed-off-by: liamfallon <liam.fallon@est.tech>
Diffstat (limited to 'csit/drools-pdp')
| -rwxr-xr-x | csit/drools-pdp/plans/setup.sh | 10 | ||||
| -rw-r--r-- | csit/drools-pdp/tests/drools-pdp-test.robot | 8 |
2 files changed, 10 insertions, 8 deletions
diff --git a/csit/drools-pdp/plans/setup.sh b/csit/drools-pdp/plans/setup.sh index 987c453c..f08126ec 100755 --- a/csit/drools-pdp/plans/setup.sh +++ b/csit/drools-pdp/plans/setup.sh @@ -1,7 +1,7 @@ #!/bin/bash # ============LICENSE_START======================================================= # Copyright 2017-2021 AT&T Intellectual Property. All rights reserved. -# Modifications Copyright 2021-2022 Nordix Foundation. +# Modifications Copyright 2021-2023 Nordix Foundation. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -30,16 +30,18 @@ source "${SCRIPTS}"/get-versions.sh docker-compose -f "${SCRIPTS}"/docker-compose-all.yml up -d drools POLICY_DROOLS_IP=$(get-instance-ip.sh drools) +POLICY_DROOLS_PORT=30217 MARIADB_IP=$(get-instance-ip.sh mariadb) echo DROOLS IP IS "${POLICY_DROOLS_IP}" echo MARIADB IP IS "${MARIADB_IP}" -# wait for the app to start up - looking for telemetry service on port 9696 -"${SCRIPTS}"/wait_for_port.sh "${POLICY_DROOLS_IP}" 9696 +# wait for the app to start up - looking for telemetry service on port 30216 forwarded from 9696 +"${SCRIPTS}"/wait_for_rest.sh localhost 30216 # give enough time for the controllers to come up sleep 15 ROBOT_VARIABLES="" -ROBOT_VARIABLES="${ROBOT_VARIABLES}-v POLICY_DROOLS_IP:${POLICY_DROOLS_IP}" +ROBOT_VARIABLES="${ROBOT_VARIABLES} -v POLICY_DROOLS_IP:${POLICY_DROOLS_IP}" +ROBOT_VARIABLES="${ROBOT_VARIABLES} -v POLICY_DROOLS_PORT:${POLICY_DROOLS_PORT}" diff --git a/csit/drools-pdp/tests/drools-pdp-test.robot b/csit/drools-pdp/tests/drools-pdp-test.robot index 3d95b6a1..b895857f 100644 --- a/csit/drools-pdp/tests/drools-pdp-test.robot +++ b/csit/drools-pdp/tests/drools-pdp-test.robot @@ -8,8 +8,8 @@ Library json Alive [Documentation] Runs Policy PDP Alive Check ${auth}= Create List demo@people.osaaf.org demo123456! - Log Creating session http://${POLICY_DROOLS_IP}:9696 - ${session}= Create Session policy http://${POLICY_DROOLS_IP}:9696 auth=${auth} + Log Creating session http://localhost:30216 + ${session}= Create Session policy http://localhost:30216 auth=${auth} ${headers}= Create Dictionary Accept=application/json Content-Type=application/json ${resp}= GET On Session policy /policy/pdp/engine headers=${headers} expected_status=200 Log Received response from policy ${resp.text} @@ -18,8 +18,8 @@ Alive Metrics [Documentation] Verify drools-pdp is exporting metrics ${auth}= Create List demo@people.osaaf.org demo123456! - Log Creating session http://${POLICY_DROOLS_IP}:9696 - ${session}= Create Session policy http://${POLICY_DROOLS_IP}:9696 auth=${auth} + Log Creating session http://localhost:30216 + ${session}= Create Session policy http://localhost:30216 auth=${auth} ${headers}= Create Dictionary Accept=application/json Content-Type=application/json ${resp}= GET On Session policy /metrics headers=${headers} expected_status=200 Log Received response from policy ${resp.text} |