From 3c0ea89e2bd77d2f4f86f0729643455e1b29c5ac Mon Sep 17 00:00:00 2001 From: lukegleeson Date: Thu, 6 Apr 2023 15:28:56 +0100 Subject: Timeout for Subscription Create Partial Response - Implemented default 30s timeout for DMI Responses - Placeholders have been TODO'd for Outcome Response generation and Persisted Subscription Updating - Refactored common HazelcastCacheConfig methods - Some tests required a blocking variable due to seperate thread usage Issue-ID: CPS-1599 Signed-off-by: lukegleeson Change-Id: I2b1a35e93939daa0524d379ac4736d714ef61a6f --- cps-application/src/main/resources/application.yml | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'cps-application/src/main/resources') diff --git a/cps-application/src/main/resources/application.yml b/cps-application/src/main/resources/application.yml index b95d9eb43..1eb1c11f2 100644 --- a/cps-application/src/main/resources/application.yml +++ b/cps-application/src/main/resources/application.yml @@ -99,6 +99,9 @@ app: topic: ${NCMP_ASYNC_M2M_TOPIC:ncmp-async-m2m} avc: subscription-topic: ${NCMP_CM_AVC_SUBSCRIPTION:cm-avc-subscription} + subscription-forward-topic: ${NCMP_FORWARD_CM_AVC_SUBSCRIPTION:ncmp-dmi-cm-avc-subscription} + subscription-response-topic: ${NCMP_RESPONSE_CM_AVC_SUBSCRIPTION:dmi-ncmp-cm-avc-subscription} + subscription-outcome-topic: ${NCMP_OUTCOME_CM_AVC_SUBSCRIPTION:cm-avc-subscription-response} cm-events-topic: ${NCMP_CM_EVENTS_TOPIC:cm-events} lcm: events: @@ -181,6 +184,10 @@ ncmp: sleep-time-ms: 300000 cm-handle-data-sync: sleep-time-ms: 30000 + subscription-forwarding: + dmi-response-timeout-ms: 30000 + model-loader: + retry-time-ms: 1000 modules-sync-watchdog: async-executor: @@ -188,12 +195,11 @@ ncmp: model-loader: subscription: false - maximumAttemptCount: 20 - retryTimeMs: 1000 + maximum-attempt-count: 20 # Custom Hazelcast Config. hazelcast: - mode: - kubernetes: - enabled: ${HAZELCAST_MODE_KUBERNETES_ENABLED:false} - service-name: ${CPS_NCMP_SERVICE_NAME:"cps-and-ncmp-service"} \ No newline at end of file + mode: + kubernetes: + enabled: ${HAZELCAST_MODE_KUBERNETES_ENABLED:false} + service-name: ${CPS_NCMP_SERVICE_NAME:"cps-and-ncmp-service"} \ No newline at end of file -- cgit 1.2.3-korg