Update message returned for Status check

Issue-ID: CCSDK-3932
Change-Id: I9db85ecf697cf5b908ea69f5476820a49a384697
Signed-off-by: JohnKeeney <john.keeney@est.tech>

diff --git a/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v2/StatusController.java b/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v2/StatusController.java
index 64d587d..5773179 100644 (file)
--- a/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v2/StatusController.java
+++ b/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v2/StatusController.java
@@ -64,7 +64,7 @@ public class StatusController {
     })
 
     public Mono<ResponseEntity<Object>> getStatus() {
-        StatusInfo info = new StatusInfo("hunky dory");
+        StatusInfo info = new StatusInfo("success");
         return Mono.just(new ResponseEntity<>(info, HttpStatus.OK));
     }
 
@@ -76,7 +76,7 @@ public class StatusController {
     })
 
     public Mono<ResponseEntity<String>> getStatusV1() {
-        return Mono.just(new ResponseEntity<>("hunky dory", HttpStatus.OK));
+        return Mono.just(new ResponseEntity<>("success", HttpStatus.OK));
     }
 
 }

diff --git a/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v2/ApplicationTest.java b/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v2/ApplicationTest.java
index 066adc4..a42bd65 100644 (file)
--- a/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v2/ApplicationTest.java
+++ b/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v2/ApplicationTest.java
@@ -1026,10 +1026,10 @@ class ApplicationTest {
     void testGetServiceStatus() throws Exception {
         String url = "/status";
         String rsp = restClient().get(url).block();
-        assertThat(rsp).contains("hunky dory");
+        assertThat(rsp).contains("success");
 
         rsp = restClient(baseUrl(), false).get(url).block(); // V1 status is used by a readinessProbe
-        assertThat(rsp).isEqualTo("hunky dory");
+        assertThat(rsp).isEqualTo("success");
     }
 
     @Test

diff --git a/csit/scripts/healthcheck/data/preparePmsData.sh b/csit/scripts/healthcheck/data/preparePmsData.sh
index 69dc92d..fc4fa39 100755 (executable)
--- a/csit/scripts/healthcheck/data/preparePmsData.sh
+++ b/csit/scripts/healthcheck/data/preparePmsData.sh
@@ -69,7 +69,7 @@ echo "A1 policy management service status:"
 curlString="curl -skw %{http_code} $httpx://localhost:$policy_agent_port/status"
 res=$($curlString)
 echo "$res"
-expect="hunky dory200"
+expect="success200"
 checkRes
 echo -e "\n"
 

diff --git a/csit/scripts/healthcheck/test/health_check.sh b/csit/scripts/healthcheck/test/health_check.sh
index e08cc3e..05bfeae 100755 (executable)
--- a/csit/scripts/healthcheck/test/health_check.sh
+++ b/csit/scripts/healthcheck/test/health_check.sh
@@ -63,6 +63,6 @@ checkStatus "curl -skw %{http_code} http://localhost:30005/" "OK200" "SIM3"
 
 # check PMS status
 echo "check PMS status:"
-checkStatus "curl -skw %{http_code} http://localhost:8081/status" "hunky dory200" "PMS"
+checkStatus "curl -skw %{http_code} http://localhost:8081/status" "success200" "PMS"
 
 echo "NONRTRIC health check passed."

diff --git a/csit/scripts/healthcheck/test/pms_a1sim.sh b/csit/scripts/healthcheck/test/pms_a1sim.sh
index b28cc02..8ba4ef4 100755 (executable)
--- a/csit/scripts/healthcheck/test/pms_a1sim.sh
+++ b/csit/scripts/healthcheck/test/pms_a1sim.sh
@@ -58,7 +58,7 @@ checkStatus "curl -skw %{http_code} http://localhost:30005/" "OK200" "SIM3"
 
 # check PMS status
 echo "check PMS status:"
-checkStatus "curl -skw %{http_code} http://localhost:8081/status" "hunky dory200" "PMS"
+checkStatus "curl -skw %{http_code} http://localhost:8081/status" "success200" "PMS"
 
 cd ${SHELL_FOLDER}/../data
 ./preparePmsData.sh

diff --git a/csit/scripts/healthcheck/test/pms_a1sim_sdnc.sh b/csit/scripts/healthcheck/test/pms_a1sim_sdnc.sh
index 29feb88..a71e3b1 100755 (executable)
--- a/csit/scripts/healthcheck/test/pms_a1sim_sdnc.sh
+++ b/csit/scripts/healthcheck/test/pms_a1sim_sdnc.sh
@@ -60,7 +60,7 @@ checkStatus 60 "curl -skw %{http_code} http://localhost:30005/" "OK200" "SIM3"
 
 # check PMS status
 echo "check PMS status:"
-checkStatus 60 "curl -skw %{http_code} http://localhost:8081/status" "hunky dory200" "PMS"
+checkStatus 60 "curl -skw %{http_code} http://localhost:8081/status" "success200" "PMS"
 
 curl -skw %{http_code}   http://localhost:8081/actuator/loggers/org.onap.ccsdk.oran.a1policymanagementservice -X POST  -H Content-Type:application/json -d '{"configuredLevel":"debug"}'
 curl -skw %{http_code}   http://localhost:8081/actuator/loggers/org.onap.ccsdk.oran.a1policymanagementservice.tasks -X POST  -H Content-Type:application/json -d '{"configuredLevel":"trace"}'