commit d923d6792617e677da934836843d780cf44e52dc
author a.sreekumar <ajith.sreekumar@bell.ca> Thu Mar 10 17:56:48 2022 +0000
committer a.sreekumar <ajith.sreekumar@bell.ca> Thu Mar 10 18:24:22 2022 +0000
tree e0e708a17970f99ea8ce276b44706f61535b73e4
parent d4cbdf4a7e89c21810225a435234419b4346ac13

Fix PAP healthcheck response during failures

The healthcheck response that is returned by PAP is not inline with the
actual healthreport. Even when the report has
healthy:false, code:503, message:not alive
the response code stays 200. This is fixed, this also makes the improved
readiness probe in OOM to work properly with the healthcheck calls

Change-Id: Ib208e0a84bce74157aacbcad61a11dcf900c7c94
Issue-ID: POLICY-4030
Signed-off-by: a.sreekumar <ajith.sreekumar@bell.ca>

main/src/main/java/org/onap/policy/pap/main/rest/HealthCheckRestControllerV1.java

diff --git a/main/src/main/java/org/onap/policy/pap/main/rest/HealthCheckRestControllerV1.java b/main/src/main/java/org/onap/policy/pap/main/rest/HealthCheckRestControllerV1.java
index 896f2aa..2687a30 100644
--- a/main/src/main/java/org/onap/policy/pap/main/rest/HealthCheckRestControllerV1.java
+++ b/main/src/main/java/org/onap/policy/pap/main/rest/HealthCheckRestControllerV1.java
@@ -53,7 +53,8 @@
         @ApiResponse(code = AUTHORIZATION_ERROR_CODE, message = AUTHORIZATION_ERROR_MESSAGE),
         @ApiResponse(code = SERVER_ERROR_CODE, message = SERVER_ERROR_MESSAGE)})
     public ResponseEntity<HealthCheckReport> healthcheck() {
-        return ResponseEntity.ok().body(provider.performHealthCheck(true));
+        var report = provider.performHealthCheck(true);
+        return ResponseEntity.status(report.getCode()).body(report);
     }
 
 }

main/src/test/java/org/onap/policy/pap/main/rest/TestHealthCheckRestControllerV1.java

diff --git a/main/src/test/java/org/onap/policy/pap/main/rest/TestHealthCheckRestControllerV1.java b/main/src/test/java/org/onap/policy/pap/main/rest/TestHealthCheckRestControllerV1.java
index bc97c63..359f9cb 100644
--- a/main/src/test/java/org/onap/policy/pap/main/rest/TestHealthCheckRestControllerV1.java
+++ b/main/src/test/java/org/onap/policy/pap/main/rest/TestHealthCheckRestControllerV1.java
@@ -22,6 +22,7 @@
 
 package org.onap.policy.pap.main.rest;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.when;
 
@@ -64,7 +65,9 @@
         markActivatorDead();
 
         final Invocation.Builder invocationBuilder = sendRequest(HEALTHCHECK_ENDPOINT);
-        final HealthCheckReport report = invocationBuilder.get(HealthCheckReport.class);
+        var response = invocationBuilder.get();
+        var report = response.readEntity(HealthCheckReport.class);
+        assertThat(response.getStatus()).isEqualTo(503);
         validateHealthCheckReport(NAME, SELF, false, 503, NOT_ALIVE, report);
     }
 
@@ -72,7 +75,9 @@
     public void testHealthCheckDbConnectionFailure() throws Exception {
         when(policyStatusProvider.getPolicyStatus()).thenThrow(PfModelRuntimeException.class);
         final Invocation.Builder invocationBuilder = sendRequest(HEALTHCHECK_ENDPOINT);
-        final HealthCheckReport report = invocationBuilder.get(HealthCheckReport.class);
+        var response = invocationBuilder.get();
+        var report = response.readEntity(HealthCheckReport.class);
+        assertThat(response.getStatus()).isEqualTo(503);
         validateHealthCheckReport(NAME, SELF, false, 503, NOT_ALIVE, report);
     }