diff options
Diffstat (limited to 'csit')
-rwxr-xr-x | csit/plans/cps/setup.sh | 8 | ||||
-rw-r--r-- | csit/plans/cps/test.properties | 2 | ||||
-rw-r--r-- | csit/tests/actuator/actuator.robot | 2 |
3 files changed, 5 insertions, 7 deletions
diff --git a/csit/plans/cps/setup.sh b/csit/plans/cps/setup.sh index f997d28ac..bba48794f 100755 --- a/csit/plans/cps/setup.sh +++ b/csit/plans/cps/setup.sh @@ -32,7 +32,7 @@ check_health() while [ "$TICKER" -le "$TIME_OUT" ]; do - RESPONSE=$(curl --location --request GET 'http://'$1'/manage/health/readiness') + RESPONSE=$(curl --location --request GET 'http://'$1'/actuator/health/readiness') if [[ "$RESPONSE" == *"UP"* ]]; then echo "$2 started in $TICKER" @@ -121,12 +121,12 @@ done ###################### verify ncmp-cps health ########################## -check_health $CPS_CORE_HOST:$CPS_CORE_MANAGEMENT_PORT 'cps-ncmp' +check_health $CPS_CORE_HOST:$CPS_CORE_PORT 'cps-ncmp' ###################### verify dmi health ########################## -check_health $DMI_HOST:$DMI_MANAGEMENT_PORT 'dmi-plugin' +check_health $DMI_HOST:$DMI_PORT 'dmi-plugin' ###################### ROBOT Configurations ########################## # Pass variables required for Robot test suites in ROBOT_VARIABLES -ROBOT_VARIABLES="-v CPS_CORE_HOST:$CPS_CORE_HOST -v CPS_CORE_PORT:$CPS_CORE_PORT -v DMI_HOST:$LOCAL_IP -v DMI_PORT:$DMI_PORT -v DMI_CSIT_STUB_HOST:$LOCAL_IP -v DMI_CSIT_STUB_PORT:$DMI_DEMO_STUB_PORT -v DMI_AUTH_ENABLED:$DMI_AUTH_ENABLED -v CPS_CORE_MANAGEMENT_PORT:$CPS_CORE_MANAGEMENT_PORT -v DATADIR:$WORKSPACE/data -v DATADIR_SUBS_NOTIFICATION:$WORKSPACE/data/subscription-notification --exitonfailure"
\ No newline at end of file +ROBOT_VARIABLES="-v CPS_CORE_HOST:$CPS_CORE_HOST -v CPS_CORE_PORT:$CPS_CORE_PORT -v DMI_HOST:$LOCAL_IP -v DMI_PORT:$DMI_PORT -v DMI_CSIT_STUB_HOST:$LOCAL_IP -v DMI_CSIT_STUB_PORT:$DMI_DEMO_STUB_PORT -v DMI_AUTH_ENABLED:$DMI_AUTH_ENABLED -v DATADIR:$WORKSPACE/data -v DATADIR_SUBS_NOTIFICATION:$WORKSPACE/data/subscription-notification --exitonfailure"
\ No newline at end of file diff --git a/csit/plans/cps/test.properties b/csit/plans/cps/test.properties index b3dcf05fa..f97ac1c40 100644 --- a/csit/plans/cps/test.properties +++ b/csit/plans/cps/test.properties @@ -9,7 +9,6 @@ SDNC_PASSWORD=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U CPS_CORE_HOST=$LOCAL_IP CPS_CORE_PORT=8883 -CPS_CORE_MANAGEMENT_PORT=8887 CPS_CORE_USERNAME=cpsuser CPS_CORE_PASSWORD=cpsr0cks! @@ -17,7 +16,6 @@ DMI_HOST=$LOCAL_IP DMI_PORT=8783 DMI_USERNAME=cpsuser DMI_PASSWORD=cpsr0cks! -DMI_MANAGEMENT_PORT=8787 DMI_SERVICE_URL=http://$LOCAL_IP:$DMI_PORT DOCKER_REPO=nexus3.onap.org:10003 diff --git a/csit/tests/actuator/actuator.robot b/csit/tests/actuator/actuator.robot index 80617a3f8..9a9e59bf7 100644 --- a/csit/tests/actuator/actuator.robot +++ b/csit/tests/actuator/actuator.robot @@ -23,7 +23,7 @@ Documentation CPS - Actuator endpoints Library Collections Library RequestsLibrary -Suite Setup Create Session MANAGEMENT_URL http://${CPS_CORE_HOST}:${CPS_CORE_MANAGEMENT_PORT}/manage +Suite Setup Create Session MANAGEMENT_URL http://${CPS_CORE_HOST}:${CPS_CORE_PORT}/actuator *** Variables *** |