Fail component health check if PDP is down

Changing the policy component health check to fail if the required
PDP instances are down or not registered with PAP.
The check is performed by comparing the "currentInstanceCount"
& "desiredInstanceCount" fields of PdpSubGroup.

Issue-ID: POLICY-2718
Change-Id: Iad1075d0812f4ef166dfed4f110eff4d9e5f995e
Signed-off-by: Ram Krishna Verma <ram_krishna.verma@bell.ca>

2 files changed, 11 insertions, 1 deletions

diff --git a/main/src/test/java/org/onap/policy/pap/main/rest/TestPdpGroupHealthCheckProvider.java b/main/src/test/java/org/onap/policy/pap/main/rest/TestPdpGroupHealthCheckProvider.java
index c910a986..0babb71d 100644
--- a/main/src/test/java/org/onap/policy/pap/main/rest/TestPdpGroupHealthCheckProvider.java
+++ b/main/src/test/java/org/onap/policy/pap/main/rest/TestPdpGroupHealthCheckProvider.java
@@ -1,6 +1,7 @@
 /*-
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2019 Nordix Foundation.
+ *  Modifications Copyright (C) 2020 Bell Canada. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -88,7 +89,7 @@ public class TestPdpGroupHealthCheckProvider {
     }
 
     private void verifyPdps(final List<Pdp> pdpList, final List<PdpGroup> groups) {
-        assertEquals(5, pdpList.size());
+        assertEquals(6, pdpList.size());
         for (final PdpGroup group : groups) {
             for (final PdpSubGroup subGroup : group.getPdpSubgroups()) {
                 pdpList.containsAll(subGroup.getPdpInstances());
diff --git a/main/src/test/java/org/onap/policy/pap/main/rest/TestPolicyComponentsHealthCheckProvider.java b/main/src/test/java/org/onap/policy/pap/main/rest/TestPolicyComponentsHealthCheckProvider.java
index bdf4700c..ff2159d2 100644
--- a/main/src/test/java/org/onap/policy/pap/main/rest/TestPolicyComponentsHealthCheckProvider.java
+++ b/main/src/test/java/org/onap/policy/pap/main/rest/TestPolicyComponentsHealthCheckProvider.java
@@ -2,6 +2,7 @@
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2020 Nordix Foundation.
  *  Modifications Copyright (C) 2020 AT&T Corp.
+ *  Modifications Copyright (C) 2020 Bell Canada. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -193,6 +194,14 @@ public class TestPolicyComponentsHealthCheckProvider {
     }
 
     @Test
+    public void testFetchPolicyComponentsHealthStatus_PdpDown() {
+        // Set currentInstanceCount as 0 to simulate PDP down
+        groups.get(0).getPdpSubgroups().get(0).setCurrentInstanceCount(0);
+        Map<String, Object> result = callFetchPolicyComponentsHealthStatus();
+        assertFalse((Boolean) result.get(HEALTHY));
+    }
+
+    @Test
     public void testFetchPolicyComponentsHealthStatus_unhealthyPap() {
         when(papActivator.isAlive()).thenReturn(false);
         Map<String, Object> result = callFetchPolicyComponentsHealthStatus();