aboutsummaryrefslogtreecommitdiffstats
path: root/main/src/test/resources
diff options
context:
space:
mode:
authorJim Hahn <jrh3@att.com>2021-06-23 10:11:14 -0400
committerJim Hahn <jrh3@att.com>2021-06-23 18:01:24 -0400
commitbcb522a96d60e6b50383645f870100a72ee11db7 (patch)
treecdf2ee03fb5f784d9640f9fb1b2bcf5213906ac4 /main/src/test/resources
parent00e9e19f5ac50cb5ce4cd09a9c403797a6e8f2b3 (diff)
Remove expired PDPs
Added code to remove PDPs for which no message has been received for a while. Added a max-age field to the request-map parameters, changing the parameters class to use a Builder, in the process. Deleted the PdpTracker class, as its functionality was replaced by the expiration checker. Changed port numbers in some tests, due to collisions in junit tests. Issue-ID: POLICY-3407 Change-Id: Ifbfbc03b833a4f11ee5e910e256ee42e21a0afab Signed-off-by: Jim Hahn <jrh3@att.com>
Diffstat (limited to 'main/src/test/resources')
-rw-r--r--main/src/test/resources/parameters/MinimumParameters.json4
-rw-r--r--main/src/test/resources/parameters/PapConfigParameters.json2
-rw-r--r--main/src/test/resources/parameters/PapConfigParameters_InvalidName.json2
-rw-r--r--main/src/test/resources/parameters/PapConfigParameters_sim.json42
4 files changed, 4 insertions, 46 deletions
diff --git a/main/src/test/resources/parameters/MinimumParameters.json b/main/src/test/resources/parameters/MinimumParameters.json
index 69492e9b..0c23006c 100644
--- a/main/src/test/resources/parameters/MinimumParameters.json
+++ b/main/src/test/resources/parameters/MinimumParameters.json
@@ -1,8 +1,8 @@
-{
+{
"name":"PapGroup",
"restServerParameters":{
"host":"0.0.0.0",
- "port":6969,
+ "port":6901,
"userName":"healthcheck",
"password":"zb!XztG34"
},
diff --git a/main/src/test/resources/parameters/PapConfigParameters.json b/main/src/test/resources/parameters/PapConfigParameters.json
index 111a6352..c9eb3a3a 100644
--- a/main/src/test/resources/parameters/PapConfigParameters.json
+++ b/main/src/test/resources/parameters/PapConfigParameters.json
@@ -2,7 +2,7 @@
"name": "PapGroup",
"restServerParameters": {
"host": "0.0.0.0",
- "port": 6969,
+ "port": 6903,
"userName": "healthcheck",
"password": "zb!XztG34",
"https": true
diff --git a/main/src/test/resources/parameters/PapConfigParameters_InvalidName.json b/main/src/test/resources/parameters/PapConfigParameters_InvalidName.json
index 15e608ba..3e812459 100644
--- a/main/src/test/resources/parameters/PapConfigParameters_InvalidName.json
+++ b/main/src/test/resources/parameters/PapConfigParameters_InvalidName.json
@@ -2,7 +2,7 @@
"name":" ",
"restServerParameters":{
"host":"0.0.0.0",
- "port":6969,
+ "port":6902,
"userName":"healthcheck",
"password":"zb!XztG34"
},
diff --git a/main/src/test/resources/parameters/PapConfigParameters_sim.json b/main/src/test/resources/parameters/PapConfigParameters_sim.json
deleted file mode 100644
index 84b88e31..00000000
--- a/main/src/test/resources/parameters/PapConfigParameters_sim.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
- "name": "PapGroup",
- "restServerParameters": {
- "host": "0.0.0.0",
- "port": 6969,
- "userName": "healthcheck",
- "password": "zb!XztG34",
- "https": true
- },
- "pdpParameters": {
- "heartBeatMs": 10,
- "updateParameters": {
- "maxRetryCount": 1,
- "maxWaitMs": 30000
- },
- "stateChangeParameters": {
- "maxRetryCount": 1,
- "maxWaitMs": 30000
- }
- },
- "databaseProviderParameters": {
- "name": "PolicyProviderParameterGroup",
- "implementation": "org.onap.policy.models.provider.impl.DatabasePolicyModelsProviderImpl",
- "databaseDriver": "org.mariadb.jdbc.Driver",
- "databaseUrl": "jdbc:mariadb://localhost:3306/policyadmin",
- "databaseUser": "policy",
- "databasePassword": "UDAxaWNZ",
- "persistenceUnit": "PolicyMariaDb"
- },
- "topicParameterGroup": {
- "topicSources" : [{
- "topic" : "POLICY-PDP-PAP",
- "servers" : [ "localhost:6845" ],
- "topicCommInfrastructure" : "dmaap"
- }],
- "topicSinks" : [{
- "topic" : "POLICY-PDP-PAP",
- "servers" : [ "localhost:6845" ],
- "topicCommInfrastructure" : "dmaap"
- }]
- }
-}