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/distribution | |
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/distribution')
-rwxr-xr-x | csit/distribution/plans/setup.sh | 8 | ||||
-rw-r--r-- | csit/distribution/tests/distribution-test.robot | 10 |
2 files changed, 11 insertions, 7 deletions
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}" diff --git a/csit/distribution/tests/distribution-test.robot b/csit/distribution/tests/distribution-test.robot index c283f668..8cfc3fac 100644 --- a/csit/distribution/tests/distribution-test.robot +++ b/csit/distribution/tests/distribution-test.robot @@ -10,19 +10,19 @@ Resource ${CURDIR}/../../common-library.robot Healthcheck [Documentation] Verify policy distribution health check ${hcauth}= HealthCheckAuth - ${resp}= PerformGetRequest ${POLICY_DISTRIBUTION_IP} /healthcheck 200 null ${hcauth} + ${resp}= PerformGetRequest ${POLICY_DISTRIBUTION_PORT} /healthcheck 200 null ${hcauth} Should Be Equal As Strings ${resp.json()['code']} 200 Statistics [Documentation] Verify policy distribution statistics ${hcauth}= HealthCheckAuth - ${resp}= PerformGetRequest ${POLICY_DISTRIBUTION_IP} /statistics 200 null ${hcauth} + ${resp}= PerformGetRequest ${POLICY_DISTRIBUTION_PORT} /statistics 200 null ${hcauth} Should Be Equal As Strings ${resp.json()['code']} 200 Metrics [Documentation] Verify policy-distribution is exporting prometheus metrics ${hcauth}= HealthCheckAuth - ${resp}= PerformGetRequest ${POLICY_DISTRIBUTION_IP} /metrics 200 null ${hcauth} + ${resp}= PerformGetRequest ${POLICY_DISTRIBUTION_PORT} /metrics 200 null ${hcauth} Should Contain ${resp.text} total_distribution_received_count_total 0.0 Should Contain ${resp.text} distribution_success_count_total 0.0 Should Contain ${resp.text} distribution_failure_count_total 0.0 @@ -36,7 +36,7 @@ InvokeDistributionAndRunEventOnEngine MetricsAfterExecution [Documentation] Verify policy-distribution is exporting prometheus metrics after execution ${hcauth}= HealthCheckAuth - ${resp}= PerformGetRequest ${POLICY_DISTRIBUTION_IP} /metrics 200 null ${hcauth} + ${resp}= PerformGetRequest ${POLICY_DISTRIBUTION_PORT} /metrics 200 null ${hcauth} Should Contain ${resp.text} total_distribution_received_count_total 1.0 Should Contain ${resp.text} distribution_success_count_total 1.0 Should Contain ${resp.text} distribution_failure_count_total 0.0 @@ -50,7 +50,7 @@ InvokeDistributionUsingFile And RunEventOnApexEngine Copy File ${SCRIPT_DIR}/csar/csar_temp.csar ${SCRIPT_DIR}/csar/temp.csar Move File ${SCRIPT_DIR}/csar/temp.csar ${SCRIPT_DIR}/temp/sample_csar_with_apex_policy.csar Sleep 20 seconds "Waiting for the Policy Distribution to call Policy API and PAP" - Create Session apexSession http://${APEX_IP}:23324 max_retries=1 + Create Session apexSession http://localhost:23324 max_retries=1 ${data}= Get Binary File ${CURDIR}${/}data${/}event.json &{headers}= Create Dictionary Content-Type=application/json Accept=application/json ${resp}= PUT On Session apexSession /apex/FirstConsumer/EventIn data=${data} headers=${headers} expected_status=200 |