diff options
author | 2023-02-10 22:01:43 +0000 | |
---|---|---|
committer | 2023-02-13 16:45:02 +0000 | |
commit | f5a11b0b346df610ffa8d9857956abf113ce6765 (patch) | |
tree | cb27bb6b9e29c2d23ac313d86b4bbdfe5883a855 /csit/xacml-pdp/plans | |
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/xacml-pdp/plans')
-rwxr-xr-x | csit/xacml-pdp/plans/setup.sh | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/csit/xacml-pdp/plans/setup.sh b/csit/xacml-pdp/plans/setup.sh index 705c8202..646605ff 100755 --- a/csit/xacml-pdp/plans/setup.sh +++ b/csit/xacml-pdp/plans/setup.sh @@ -1,7 +1,7 @@ #!/bin/bash # ============LICENSE_START======================================================= # Copyright (C) 2020-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. @@ -33,10 +33,13 @@ docker-compose -f "${SCRIPTS}"/docker-compose-all.yml up -d xacml-pdp unset http_proxy https_proxy POLICY_API_IP=$(get-instance-ip.sh policy-api) +POLICY_API_PORT=30440 MARIADB_IP=$(get-instance-ip.sh mariadb) POLICY_PDPX_IP=$(get-instance-ip.sh policy-xacml-pdp) +POLICY_PDPX_PORT=30441 SIM_IP=$(get-instance-ip.sh simulator) POLICY_PAP_IP=$(get-instance-ip.sh policy-pap) +POLICY_PAP_PORT=30442 export SIM_IP @@ -47,7 +50,7 @@ echo MARIADB IP IS "${MARIADB_IP}" echo SIM_IP IS "${SIM_IP}" # wait for the app to start up -"${SCRIPTS}"/wait_for_port.sh "${POLICY_PDPX_IP}" 6969 +"${SCRIPTS}"/wait_for_rest.sh localhost "${POLICY_PDPX_PORT}" DATA2=${WORKSPACE}/models/models-examples/src/main/resources/policies @@ -55,5 +58,8 @@ ROBOT_VARIABLES="" ROBOT_VARIABLES="${ROBOT_VARIABLES} -v SCR_DMAAP:${SCRIPTS}" ROBOT_VARIABLES="${ROBOT_VARIABLES} -v DATA2:${DATA2}" ROBOT_VARIABLES="${ROBOT_VARIABLES} -v POLICY_PDPX_IP:${POLICY_PDPX_IP}" +ROBOT_VARIABLES="${ROBOT_VARIABLES} -v POLICY_PDPX_PORT:${POLICY_PDPX_PORT}" ROBOT_VARIABLES="${ROBOT_VARIABLES} -v POLICY_API_IP:${POLICY_API_IP}" +ROBOT_VARIABLES="${ROBOT_VARIABLES} -v POLICY_API_PORT:${POLICY_API_PORT}" ROBOT_VARIABLES="${ROBOT_VARIABLES} -v POLICY_PAP_IP:${POLICY_PAP_IP}" +ROBOT_VARIABLES="${ROBOT_VARIABLES} -v POLICY_PAP_PORT:${POLICY_PAP_PORT}" |