From f5a11b0b346df610ffa8d9857956abf113ce6765 Mon Sep 17 00:00:00 2001
From: liamfallon <liam.fallon@est.tech>
Date: Fri, 10 Feb 2023 22:01:43 +0000
Subject: 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>
---
 csit/distribution/plans/setup.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'csit/distribution/plans')

diff --git a/csit/distribution/plans/setup.sh b/csit/distribution/plans/setup.sh
index b7495007..8efb935d 100755
--- a/csit/distribution/plans/setup.sh
+++ b/csit/distribution/plans/setup.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # ============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.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -45,8 +45,10 @@ POLICY_API_IP=$(get-instance-ip.sh policy-api)
 POLICY_PAP_IP=$(get-instance-ip.sh policy-pap)
 MARIADB_IP=$(get-instance-ip.sh mariadb)
 APEX_IP=$(get-instance-ip.sh policy-apex-pdp)
+APEX_PORT=30237
 DMAAP_IP=$(get-instance-ip.sh simulator)
 POLICY_DISTRIBUTION_IP=$(get-instance-ip.sh policy-distribution)
+POLICY_DISTRIBUTION_PORT=30238
 
 echo PAP IP IS "${POLICY_PAP_IP}"
 echo MARIADB IP IS "${MARIADB_IP}"
@@ -56,9 +58,11 @@ echo DMAAP_IP IS "${DMAAP_IP}"
 echo POLICY_DISTRIBUTION_IP IS "${POLICY_DISTRIBUTION_IP}"
 
 # wait for the app to start up
-"${SCRIPTS}"/wait_for_port.sh "${POLICY_DISTRIBUTION_IP}" 6969
+"${SCRIPTS}"/wait_for_rest.sh localhost "${POLICY_DISTRIBUTION_PORT}"
 
 ROBOT_VARIABLES=""
 ROBOT_VARIABLES="${ROBOT_VARIABLES} -v APEX_IP:${APEX_IP}"
+ROBOT_VARIABLES="${ROBOT_VARIABLES} -v APEX_PORT:${APEX_PORT}"
 ROBOT_VARIABLES="${ROBOT_VARIABLES} -v SCRIPT_DIR:${SCRIPT_DIR}"
 ROBOT_VARIABLES="${ROBOT_VARIABLES} -v POLICY_DISTRIBUTION_IP:${POLICY_DISTRIBUTION_IP}"
+ROBOT_VARIABLES="${ROBOT_VARIABLES} -v POLICY_DISTRIBUTION_PORT:${POLICY_DISTRIBUTION_PORT}"
-- 
cgit 1.2.3-korg