summaryrefslogtreecommitdiffstats
path: root/main/src/test/resources
diff options
context:
space:
mode:
authorjrh3 <jrh3@att.com>2019-06-11 10:56:25 -0400
committerjrh3 <jrh3@att.com>2019-06-11 17:23:35 -0400
commita240d7a4020d0346040fe4d86682a6ab8fcd757a (patch)
tree31b2fa3a76c38f00a0ab5a45fca5a4d17508e45f /main/src/test/resources
parentfde702471743115e7492951873dd48ba3dbc66bb (diff)
Add PDP heart beat expiration timer
Added heart beat interval to the PDP-UPDATE message sent in response to a heart beat message received from a PDP. Added timers to detect missing heart beats and remove the PDP from the DB - PdpTracker. Modified current heart beat listener to update PdpTracker when a heart beat is received. Allow 3 missed heart beats instead of 2. Change-Id: I81621fefbe494e0c4d6f0b9767b00b2a9dd398d8 Issue-ID: POLICY-1795 Signed-off-by: jrh3 <jrh3@att.com>
Diffstat (limited to 'main/src/test/resources')
-rw-r--r--main/src/test/resources/comm/PdpTracker.json41
-rw-r--r--main/src/test/resources/e2e/PapConfigParameters.json1
-rw-r--r--main/src/test/resources/parameters/MinimumParameters.json1
-rw-r--r--main/src/test/resources/parameters/PapConfigParameters.json1
-rw-r--r--main/src/test/resources/parameters/PapConfigParametersStd.json3
-rw-r--r--main/src/test/resources/parameters/PapConfigParameters_InvalidName.json1
-rw-r--r--main/src/test/resources/parameters/PapConfigParameters_sim.json1
7 files changed, 48 insertions, 1 deletions
diff --git a/main/src/test/resources/comm/PdpTracker.json b/main/src/test/resources/comm/PdpTracker.json
new file mode 100644
index 00000000..5c8942d5
--- /dev/null
+++ b/main/src/test/resources/comm/PdpTracker.json
@@ -0,0 +1,41 @@
+{
+ "groups": [
+ {
+ "name": "group-X",
+ "pdpSubgroups": [
+ {
+ "pdpType": "apex",
+ "pdpInstances": [
+ {
+ "instanceId": "pdp-A"
+ },
+ {
+ "instanceId": "pdp-B"
+ }
+ ]
+ },
+ {
+ "pdpType": "drools",
+ "pdpInstances": [
+ {
+ "instanceId": "pdp-C"
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "name": "group-Y",
+ "pdpSubgroups": [
+ {
+ "pdpType": "apex",
+ "pdpInstances": [
+ {
+ "instanceId": "pdp-D"
+ }
+ ]
+ }
+ ]
+ }
+ ]
+}
diff --git a/main/src/test/resources/e2e/PapConfigParameters.json b/main/src/test/resources/e2e/PapConfigParameters.json
index 4e085f76..871077c5 100644
--- a/main/src/test/resources/e2e/PapConfigParameters.json
+++ b/main/src/test/resources/e2e/PapConfigParameters.json
@@ -8,6 +8,7 @@
"https": true
},
"pdpParameters": {
+ "heartBeatMs": 5000,
"updateParameters": {
"maxRetryCount": 0,
"maxWaitMs": 5000
diff --git a/main/src/test/resources/parameters/MinimumParameters.json b/main/src/test/resources/parameters/MinimumParameters.json
index e611dc90..99c8a3a3 100644
--- a/main/src/test/resources/parameters/MinimumParameters.json
+++ b/main/src/test/resources/parameters/MinimumParameters.json
@@ -7,6 +7,7 @@
"password":"zb!XztG34"
},
"pdpParameters": {
+ "heartBeatMs": 1,
"updateParameters": {
"maxRetryCount": 1,
"maxWaitMs": 1
diff --git a/main/src/test/resources/parameters/PapConfigParameters.json b/main/src/test/resources/parameters/PapConfigParameters.json
index 2c24e4fe..16b22ae5 100644
--- a/main/src/test/resources/parameters/PapConfigParameters.json
+++ b/main/src/test/resources/parameters/PapConfigParameters.json
@@ -8,6 +8,7 @@
"https": true
},
"pdpParameters": {
+ "heartBeatMs": 10,
"updateParameters": {
"maxRetryCount": 1,
"maxWaitMs": 1
diff --git a/main/src/test/resources/parameters/PapConfigParametersStd.json b/main/src/test/resources/parameters/PapConfigParametersStd.json
index 6089c0b7..853249e0 100644
--- a/main/src/test/resources/parameters/PapConfigParametersStd.json
+++ b/main/src/test/resources/parameters/PapConfigParametersStd.json
@@ -15,7 +15,8 @@
"stateChangeParameters": {
"maxRetryCount": 1,
"maxWaitMs": 5
- }
+ },
+ "heartBeatMs": 6
},
"databaseProviderParameters": {
"name": "PolicyModelsProviderParameters",
diff --git a/main/src/test/resources/parameters/PapConfigParameters_InvalidName.json b/main/src/test/resources/parameters/PapConfigParameters_InvalidName.json
index d06ecfc8..15e608ba 100644
--- a/main/src/test/resources/parameters/PapConfigParameters_InvalidName.json
+++ b/main/src/test/resources/parameters/PapConfigParameters_InvalidName.json
@@ -7,6 +7,7 @@
"password":"zb!XztG34"
},
"pdpParameters": {
+ "heartBeatMs": 1,
"updateParameters": {
"maxRetryCount": 1,
"maxWaitMs": 1
diff --git a/main/src/test/resources/parameters/PapConfigParameters_sim.json b/main/src/test/resources/parameters/PapConfigParameters_sim.json
index a9a68f90..96bbedd0 100644
--- a/main/src/test/resources/parameters/PapConfigParameters_sim.json
+++ b/main/src/test/resources/parameters/PapConfigParameters_sim.json
@@ -8,6 +8,7 @@
"https": true
},
"pdpParameters": {
+ "heartBeatMs": 10,
"updateParameters": {
"maxRetryCount": 1,
"maxWaitMs": 30000