From bcb522a96d60e6b50383645f870100a72ee11db7 Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Wed, 23 Jun 2021 10:11:14 -0400 Subject: 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 --- .../resources/parameters/MinimumParameters.json | 4 +-- .../resources/parameters/PapConfigParameters.json | 2 +- .../PapConfigParameters_InvalidName.json | 2 +- .../parameters/PapConfigParameters_sim.json | 42 ---------------------- 4 files changed, 4 insertions(+), 46 deletions(-) delete mode 100644 main/src/test/resources/parameters/PapConfigParameters_sim.json (limited to 'main/src/test/resources') 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" - }] - } -} -- cgit 1.2.3-korg