summaryrefslogtreecommitdiffstats
path: root/csit/apex-pdp/plans/setup.sh
diff options
context:
space:
mode:
authorliamfallon <liam.fallon@est.tech>2023-02-10 22:01:43 +0000
committerliamfallon <liam.fallon@est.tech>2023-02-13 16:45:02 +0000
commitf5a11b0b346df610ffa8d9857956abf113ce6765 (patch)
treecb27bb6b9e29c2d23ac313d86b4bbdfe5883a855 /csit/apex-pdp/plans/setup.sh
parent600a3002192da1ba2174c63d248a46dc27414397 (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/apex-pdp/plans/setup.sh')
-rwxr-xr-xcsit/apex-pdp/plans/setup.sh10
1 files changed, 8 insertions, 2 deletions
diff --git a/csit/apex-pdp/plans/setup.sh b/csit/apex-pdp/plans/setup.sh
index f38b9e45..9241041a 100755
--- a/csit/apex-pdp/plans/setup.sh
+++ b/csit/apex-pdp/plans/setup.sh
@@ -2,7 +2,7 @@
# ============LICENSE_START=======================================================
# Copyright (C) 2018 Ericsson. All rights reserved.
#
-# Modifications Copyright (c) 2019-2022 Nordix Foundation.
+# Modifications Copyright (c) 2019-2023 Nordix Foundation.
# Modifications Copyright (C) 2020-2021 AT&T Intellectual Property.
# Modifications Copyright (C) 2021 Bell Canada. All rights reserved.
# ================================================================================
@@ -35,9 +35,12 @@ docker-compose -f "${SCRIPTS}"/docker-compose-all.yml up -d apex-pdp grafana
unset http_proxy https_proxy
POLICY_API_IP=$(get-instance-ip.sh policy-api)
+POLICY_API_PORT=30440
POLICY_PAP_IP=$(get-instance-ip.sh policy-pap)
+POLICY_PAP_PORT=30442
MARIADB_IP=$(get-instance-ip.sh mariadb)
APEX_IP=$(get-instance-ip.sh policy-apex-pdp)
+APEX_PORT=30237
SIM_IP=$(get-instance-ip.sh simulator)
export SIM_IP
@@ -48,11 +51,14 @@ echo APEX IP IS "${APEX_IP}"
echo DMAAP_IP IS "${SIM_IP}"
# wait for the app to start up
-"${SCRIPTS}"/wait_for_port.sh "${APEX_IP}" 6969
+"${SCRIPTS}"/wait_for_rest.sh localhost "${APEX_PORT}"
ROBOT_VARIABLES=""
ROBOT_VARIABLES="${ROBOT_VARIABLES} -v SCRIPTS:${SCRIPTS}"
ROBOT_VARIABLES="${ROBOT_VARIABLES} -v APEX_IP:${APEX_IP}"
+ROBOT_VARIABLES="${ROBOT_VARIABLES} -v APEX_PORT:${APEX_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}"
ROBOT_VARIABLES="${ROBOT_VARIABLES} -v DMAAP_IP:${SIM_IP}"