From a3482504ead21591265027629da810dac2290603 Mon Sep 17 00:00:00 2001 From: FrancescoFioraEst Date: Thu, 24 Jun 2021 16:30:23 +0100 Subject: Refactor participant event handling Issue-ID: POLICY-3268 Change-Id: I02b03fd9f9f4399e045e766baace203f42e678cf Signed-off-by: FrancescoFioraEst --- .../resources/parameters/CommissioningConfig.json | 4 ++ .../InstantiationConfigParametersStd.json | 7 +++- .../InstantiationConfigParameters_InvalidName.json | 22 ++++++---- .../InstantiationConfigParameters_sim.json | 48 ++++++++++++++-------- .../resources/parameters/MinimumParametersH2.json | 44 ++++++++++++-------- .../test/resources/parameters/TestParameters.json | 4 ++ .../parameters/TestParametersMariaDB.json | 4 ++ .../src/test/resources/parameters/Unreadable.json | 4 ++ 8 files changed, 93 insertions(+), 44 deletions(-) (limited to 'runtime-controlloop/src/test') diff --git a/runtime-controlloop/src/test/resources/parameters/CommissioningConfig.json b/runtime-controlloop/src/test/resources/parameters/CommissioningConfig.json index bda9da6a1..762e3f793 100644 --- a/runtime-controlloop/src/test/resources/parameters/CommissioningConfig.json +++ b/runtime-controlloop/src/test/resources/parameters/CommissioningConfig.json @@ -1,5 +1,9 @@ { "name": "CommissioningGroup", + "supervisionScannerIntervalSec" : 1000, + "participantStateChangeIntervalSec" : 1000, + "participantClUpdateIntervalSec" : 1000, + "participantClStateChangeIntervalSec" : 1000, "restServerParameters": { "host": "127.0.0.1", "port": 6969, diff --git a/runtime-controlloop/src/test/resources/parameters/InstantiationConfigParametersStd.json b/runtime-controlloop/src/test/resources/parameters/InstantiationConfigParametersStd.json index 410c35684..3d5a7dfca 100644 --- a/runtime-controlloop/src/test/resources/parameters/InstantiationConfigParametersStd.json +++ b/runtime-controlloop/src/test/resources/parameters/InstantiationConfigParametersStd.json @@ -1,8 +1,13 @@ { "name": "ControlLoopRuntimeGroup", + "supervisionScannerIntervalSec": 1000, + "participantStateChangeIntervalSec": 1000, + "participantClUpdateIntervalSec": 1000, + "participantClStateChangeIntervalSec": 1000, "restServerParameters": { "host": "0.0.0.0", - "port": ${port}, + "port": ${port + }, "userName": "healthcheck", "password": "zb!XztG34", "https": false, diff --git a/runtime-controlloop/src/test/resources/parameters/InstantiationConfigParameters_InvalidName.json b/runtime-controlloop/src/test/resources/parameters/InstantiationConfigParameters_InvalidName.json index b0c322cb9..944bc770d 100644 --- a/runtime-controlloop/src/test/resources/parameters/InstantiationConfigParameters_InvalidName.json +++ b/runtime-controlloop/src/test/resources/parameters/InstantiationConfigParameters_InvalidName.json @@ -1,13 +1,17 @@ { - "name":" ", - "restServerParameters": { - "host": "127.0.0.1", - "port": 6969, - "userName": "admin", - "password": "password", - "https": false, - "aaf": false - }, + "name": " ", + "supervisionScannerIntervalSec": 1000, + "participantStateChangeIntervalSec": 1000, + "participantClUpdateIntervalSec": 1000, + "participantClStateChangeIntervalSec": 1000, + "restServerParameters": { + "host": "127.0.0.1", + "port": 6969, + "userName": "admin", + "password": "password", + "https": false, + "aaf": false + }, "pdpParameters": { "heartBeatMs": 1, "updateParameters": { diff --git a/runtime-controlloop/src/test/resources/parameters/InstantiationConfigParameters_sim.json b/runtime-controlloop/src/test/resources/parameters/InstantiationConfigParameters_sim.json index 0977da9ad..47cb74838 100644 --- a/runtime-controlloop/src/test/resources/parameters/InstantiationConfigParameters_sim.json +++ b/runtime-controlloop/src/test/resources/parameters/InstantiationConfigParameters_sim.json @@ -1,13 +1,17 @@ { "name": "Instantiation", - "restServerParameters": { - "host": "127.0.0.1", - "port": 6969, - "userName": "admin", - "password": "password", - "https": false, - "aaf": false - }, + "supervisionScannerIntervalSec": 1000, + "participantStateChangeIntervalSec": 1000, + "participantClUpdateIntervalSec": 1000, + "participantClStateChangeIntervalSec": 1000, + "restServerParameters": { + "host": "127.0.0.1", + "port": 6969, + "userName": "admin", + "password": "password", + "https": false, + "aaf": false + }, "pdpParameters": { "heartBeatMs": 10, "updateParameters": { @@ -29,15 +33,23 @@ "persistenceUnit": "PolicyMariaDb" }, "topicParameterGroup": { - "topicSources" : [{ - "topic" : "INSTANTIATION", - "servers" : [ "localhost:6845" ], - "topicCommInfrastructure" : "dmaap" - }], - "topicSinks" : [{ - "topic" : "INSTANTIATION", - "servers" : [ "localhost:6845" ], - "topicCommInfrastructure" : "dmaap" - }] + "topicSources": [ + { + "topic": "INSTANTIATION", + "servers": [ + "localhost:6845" + ], + "topicCommInfrastructure": "dmaap" + } + ], + "topicSinks": [ + { + "topic": "INSTANTIATION", + "servers": [ + "localhost:6845" + ], + "topicCommInfrastructure": "dmaap" + } + ] } } diff --git a/runtime-controlloop/src/test/resources/parameters/MinimumParametersH2.json b/runtime-controlloop/src/test/resources/parameters/MinimumParametersH2.json index cce0ab5ee..2be642943 100644 --- a/runtime-controlloop/src/test/resources/parameters/MinimumParametersH2.json +++ b/runtime-controlloop/src/test/resources/parameters/MinimumParametersH2.json @@ -1,10 +1,14 @@ { - "name":"PapGroup", - "restServerParameters":{ - "host":"0.0.0.0", - "port":6969, - "userName":"healthcheck", - "password":"zb!XztG34" + "name": "PapGroup", + "supervisionScannerIntervalSec": 1000, + "participantStateChangeIntervalSec": 1000, + "participantClUpdateIntervalSec": 1000, + "participantClStateChangeIntervalSec": 1000, + "restServerParameters": { + "host": "0.0.0.0", + "port": 6969, + "userName": "healthcheck", + "password": "zb!XztG34" }, "pdpParameters": { "heartBeatMs": 1, @@ -27,15 +31,23 @@ "persistenceUnit": "PdpGroupTest" }, "topicParameterGroup": { - "topicSources" : [{ - "topic" : "POLICY-PDP-PAP", - "servers" : [ "message-router" ], - "topicCommInfrastructure" : "dmaap" - }], - "topicSinks" : [{ - "topic" : "POLICY-PDP-PAP", - "servers" : [ "message-router" ], - "topicCommInfrastructure" : "dmaap" - }] + "topicSources": [ + { + "topic": "POLICY-PDP-PAP", + "servers": [ + "message-router" + ], + "topicCommInfrastructure": "dmaap" + } + ], + "topicSinks": [ + { + "topic": "POLICY-PDP-PAP", + "servers": [ + "message-router" + ], + "topicCommInfrastructure": "dmaap" + } + ] } } diff --git a/runtime-controlloop/src/test/resources/parameters/TestParameters.json b/runtime-controlloop/src/test/resources/parameters/TestParameters.json index 9fbcfb28c..9bcd764cb 100644 --- a/runtime-controlloop/src/test/resources/parameters/TestParameters.json +++ b/runtime-controlloop/src/test/resources/parameters/TestParameters.json @@ -1,5 +1,9 @@ { "name": "ControlLoopRuntimeGroup", + "supervisionScannerIntervalSec": 1000, + "participantStateChangeIntervalSec": 1000, + "participantClUpdateIntervalSec": 1000, + "participantClStateChangeIntervalSec": 1000, "restServerParameters": { "host": "0.0.0.0", "port": 6969, diff --git a/runtime-controlloop/src/test/resources/parameters/TestParametersMariaDB.json b/runtime-controlloop/src/test/resources/parameters/TestParametersMariaDB.json index 529557eab..3a009f8dd 100644 --- a/runtime-controlloop/src/test/resources/parameters/TestParametersMariaDB.json +++ b/runtime-controlloop/src/test/resources/parameters/TestParametersMariaDB.json @@ -1,5 +1,9 @@ { "name": "ControlLoopRuntimeGroup", + "supervisionScannerIntervalSec": 1000, + "participantStateChangeIntervalSec": 1000, + "participantClUpdateIntervalSec": 1000, + "participantClStateChangeIntervalSec": 1000, "restServerParameters": { "host": "0.0.0.0", "port": 6969, diff --git a/runtime-controlloop/src/test/resources/parameters/Unreadable.json b/runtime-controlloop/src/test/resources/parameters/Unreadable.json index 1c1e93897..0ea56eb5d 100644 --- a/runtime-controlloop/src/test/resources/parameters/Unreadable.json +++ b/runtime-controlloop/src/test/resources/parameters/Unreadable.json @@ -1,5 +1,9 @@ { "name": "ControlLoopRuntimeGroup", + "supervisionScannerIntervalSec": 1000, + "participantStateChangeIntervalSec": 1000, + "participantClUpdateIntervalSec": 1000, + "participantClStateChangeIntervalSec": 1000, "restServerParameters": { "host": "0.0.0.0", "port": 6969, -- cgit 1.2.3-korg