aboutsummaryrefslogtreecommitdiffstats
path: root/main/src/test
diff options
context:
space:
mode:
authorRam Krishna Verma <ram_krishna.verma@bell.ca>2020-08-06 18:06:17 -0400
committerRam Krishna Verma <ram_krishna.verma@bell.ca>2020-08-07 09:15:53 -0400
commitc0d20132b774b1fa43b4fb9b322e13b6d19d33ee (patch)
treed62987133ad74c1611d7fc86f8816c4182dabbd8 /main/src/test
parente32cb0265d6950c10a7512868846feeee95f9434 (diff)
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>
Diffstat (limited to 'main/src/test')
-rw-r--r--main/src/test/java/org/onap/policy/pap/main/rest/TestPdpGroupHealthCheckProvider.java3
-rw-r--r--main/src/test/java/org/onap/policy/pap/main/rest/TestPolicyComponentsHealthCheckProvider.java9
-rw-r--r--main/src/test/resources/rest/pdpGroup.json7
3 files changed, 18 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();
diff --git a/main/src/test/resources/rest/pdpGroup.json b/main/src/test/resources/rest/pdpGroup.json
index 2a7b4edc..279d8079 100644
--- a/main/src/test/resources/rest/pdpGroup.json
+++ b/main/src/test/resources/rest/pdpGroup.json
@@ -25,6 +25,11 @@
"instanceId": "pdpAA_2",
"pdpState": "PASSIVE",
"healthy": "HEALTHY"
+ },
+ {
+ "instanceId": "pdpAA_3",
+ "pdpState": "PASSIVE",
+ "healthy": "HEALTHY"
}
],
"supportedPolicyTypes": [
@@ -42,6 +47,7 @@
},
{
"pdpType": "pdpTypeB",
+ "currentInstanceCount": 1,
"desiredInstanceCount": 1,
"pdpInstances": [
{
@@ -66,6 +72,7 @@
"pdpSubgroups": [
{
"pdpType": "pdpTypeA",
+ "currentInstanceCount": 2,
"desiredInstanceCount": 2,
"pdpInstances": [
{