From c616ee76ee72202bdf485de86b53a92837620c38 Mon Sep 17 00:00:00 2001 From: rameshiyer27 Date: Mon, 10 Jun 2024 17:08:04 +0100 Subject: Add Synchronization topic in acm runtime New sync topic for acm-ppnt synchronization Added publisher for the sync topic Refactor MessageDispatcherActivator for processing more than one topic parameter. Issue-ID: POLICY-5030 Change-Id: Id765b433beaf3f51fad9a9c66403a93d21c33797 Signed-off-by: zrrmmua --- .../test/resources/application-prometheus-noauth.yaml | 12 ++++++++++-- runtime-acm/src/test/resources/application-test.yaml | 12 ++++++++++-- .../src/test/resources/parameters/TestParameters.json | 16 ++++++++++++++-- 3 files changed, 34 insertions(+), 6 deletions(-) (limited to 'runtime-acm/src/test/resources') diff --git a/runtime-acm/src/test/resources/application-prometheus-noauth.yaml b/runtime-acm/src/test/resources/application-prometheus-noauth.yaml index 1c71252f3..620e7534d 100644 --- a/runtime-acm/src/test/resources/application-prometheus-noauth.yaml +++ b/runtime-acm/src/test/resources/application-prometheus-noauth.yaml @@ -19,13 +19,16 @@ server: context-path: /onap/policy/clamp/acm runtime: + topics: + operationTopic: policy-acruntime-participant + syncTopic: acm-ppnt-sync participantParameters: updateParameters: maxRetryCount: 3 topicParameterGroup: topicSources: - - topic: POLICY-ACRUNTIME-PARTICIPANT + topic: ${runtime.topics.operationTopic} servers: - localhost topicCommInfrastructure: noop @@ -35,7 +38,12 @@ runtime: topicCommInfrastructure: noop servers: - localhost - topic: POLICY-ACRUNTIME-PARTICIPANT + topic: ${runtime.topics.operationTopic} + + - topic: ${runtime.topics.syncTopic} + servers: + - ${topicServer:kafka:9092} + topicCommInfrastructure: noop tracing: enabled: true diff --git a/runtime-acm/src/test/resources/application-test.yaml b/runtime-acm/src/test/resources/application-test.yaml index 13b1f788a..5d616d529 100644 --- a/runtime-acm/src/test/resources/application-test.yaml +++ b/runtime-acm/src/test/resources/application-test.yaml @@ -19,13 +19,16 @@ server: context-path: /onap/policy/clamp/acm runtime: + topics: + operationTopic: policy-acruntime-participant + syncTopic: acm-ppnt-sync participantParameters: updateParameters: maxRetryCount: 3 topicParameterGroup: topicSources: - - topic: policy-acruntime-participant + topic: ${runtime.topics.operationTopic} servers: - kafka:9092 topicCommInfrastructure: NOOP @@ -35,7 +38,12 @@ runtime: topicCommInfrastructure: NOOP servers: - kafka:9092 - topic: policy-acruntime-participant + topic: ${runtime.topics.operationTopic} + - + topic: ${runtime.topics.syncTopic} + servers: + - ${topicServer:kafka:9092} + topicCommInfrastructure: NOOP acmParameters: acElementName: org.onap.policy.clamp.acm.AutomationCompositionElement acNodeType: org.onap.policy.clamp.acm.AutomationComposition diff --git a/runtime-acm/src/test/resources/parameters/TestParameters.json b/runtime-acm/src/test/resources/parameters/TestParameters.json index 8192b7214..1558abc2e 100644 --- a/runtime-acm/src/test/resources/parameters/TestParameters.json +++ b/runtime-acm/src/test/resources/parameters/TestParameters.json @@ -20,10 +20,15 @@ "databasePassword": "P01icY", "persistenceUnit": "InstantiationTests" }, + "topics":{ + "operationTopic": "policy-acruntime-participant", + "syncTopic": "acm-ppnt-sync" + }, "topicParameterGroup": { + "topicSources": [ { - "topic": "POLICY-ACRUNTIME-PARTICIPANT", + "topic": "${topics.operationTopic}", "servers": [ "localhost" ], @@ -33,7 +38,14 @@ ], "topicSinks": [ { - "topic": "POLICY-ACRUNTIME-PARTICIPANT", + "topic": "${topics.operationTopic}", + "servers": [ + "localhost" + ], + "topicCommInfrastructure": "NOOP" + }, + { + "topic": "${topics.syncTopic}", "servers": [ "localhost" ], -- cgit