diff options
| -rwxr-xr-x | csit/plans/dmi/setup.sh | 2 | ||||
| -rw-r--r-- | csit/plans/dmi/test.properties | 1 | ||||
| -rw-r--r-- | csit/tests/actuator/actuator.robot | 2 | ||||
| -rwxr-xr-x | docker-compose/docker-compose.yml | 1 | ||||
| -rw-r--r-- | docs/design.rst | 2 | ||||
| -rw-r--r-- | src/main/resources/application.yml | 7 | ||||
| -rw-r--r-- | src/test/resources/application.yml | 2 |
7 files changed, 6 insertions, 11 deletions
diff --git a/csit/plans/dmi/setup.sh b/csit/plans/dmi/setup.sh index 7008e29b..8117c1f2 100755 --- a/csit/plans/dmi/setup.sh +++ b/csit/plans/dmi/setup.sh @@ -26,7 +26,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" diff --git a/csit/plans/dmi/test.properties b/csit/plans/dmi/test.properties index 39e577ae..2929eb68 100644 --- a/csit/plans/dmi/test.properties +++ b/csit/plans/dmi/test.properties @@ -17,7 +17,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 dcb4f3ef..e278f5f9 100644 --- a/csit/tests/actuator/actuator.robot +++ b/csit/tests/actuator/actuator.robot @@ -22,7 +22,7 @@ Documentation DMI - Actuator endpoints Library Collections Library RequestsLibrary -Suite Setup Create Session MANAGEMENT_URL http://${DMI_HOST}:${DMI_MANAGEMENT_PORT}/manage +Suite Setup Create Session MANAGEMENT_URL http://${DMI_HOST}:${DMI_PORT}/actuator *** Test Cases *** Test DMI Enhanced Healthcheck diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index ce415e14..859ddb56 100755 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -23,7 +23,6 @@ services: image: ${DOCKER_REPO:-nexus3.onap.org:10003}/onap/ncmp-dmi-plugin:${DMI_VERSION:-latest} ports: - ${DMI_PORT:-8783}:8080 - - ${DMI_MANAGEMENT_PORT:-8787}:8081 environment: CPS_USERNAME: ${CPS_CORE_USERNAME:-cpsuser} CPS_PASSWORD: ${CPS_CORE_PASSWORD:-cpsr0cks!} diff --git a/docs/design.rst b/docs/design.rst index 27bfdf95..2efcc585 100644 --- a/docs/design.rst +++ b/docs/design.rst @@ -45,7 +45,7 @@ The healthcheck URL can be accessed using following URI: .. code-block:: bash - http://<hostname>:<port>/manage/health + http://<hostname>:<port>/actuator/health The Health check endpoint is essential for monitoring the status of DMI-Plugins. CPS is using a Spring Boot pattern here which can easily be configured for any spring boot application. diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index d964748f..d2b53071 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -30,7 +30,7 @@ rest: dmi-base-path: /dmi security: - permit-uri: /manage/**,/swagger-ui/**,/swagger-resources/**,/v3/api-docs + permit-uri: /actuator/**,/swagger-ui/**,/swagger-resources/**,/v3/api-docs auth: username: ${DMI_USERNAME} password: ${DMI_PASSWORD} @@ -82,11 +82,8 @@ notification: # Actuator management: - server: - port: 8081 endpoints: web: - base-path: /manage exposure: include: info,health,loggers,prometheus endpoint: @@ -128,4 +125,4 @@ springdoc: urlsPrimaryName: query urls: - name: query - url: /api-docs/openapi.yaml + url: /api-docs/openapi.yaml
\ No newline at end of file diff --git a/src/test/resources/application.yml b/src/test/resources/application.yml index 43eb0fc5..ddc2b45f 100644 --- a/src/test/resources/application.yml +++ b/src/test/resources/application.yml @@ -21,7 +21,7 @@ rest: dmi-base-path: /dmi security: - permit-uri: /manage/**,/swagger-ui/**,/swagger-resources/**,/v3/api-docs + permit-uri: /actuator/**,/swagger-ui/**,/swagger-resources/**,/v3/api-docs auth: username: cpsuser password: cpsr0cks! |