From 7bfa0fdd418317bbe90b569c7daa787f17e656bc Mon Sep 17 00:00:00 2001 From: rameshiyer27 Date: Tue, 11 Jun 2024 16:51:57 +0000 Subject: Add sync topic support in docker/K8s deployment Issue-ID: POLICY-5031 Change-Id: I5ae1fe07d90744f992a3bce2853ab26e39218cd7 Signed-off-by: zrrmmua --- compose/config/clamp/A1pmsParticipantParameters.yaml | 16 +++++++++++++--- compose/config/clamp/AcRuntimeParameters.yaml | 15 ++++++++++++--- compose/config/clamp/HttpParticipantParameters.yaml | 13 +++++++++++-- compose/config/clamp/KserveParticipantParameters.yaml | 11 +++++++++-- .../config/clamp/KubernetesParticipantParameters.yaml | 14 ++++++++++++-- compose/config/clamp/PolicyParticipantParameters.yaml | 14 ++++++++++++-- compose/config/clamp/SimulatorParticipantParameters.yaml | 13 +++++++++++-- 7 files changed, 80 insertions(+), 16 deletions(-) (limited to 'compose/config') diff --git a/compose/config/clamp/A1pmsParticipantParameters.yaml b/compose/config/clamp/A1pmsParticipantParameters.yaml index 44902d89..a3035eb6 100755 --- a/compose/config/clamp/A1pmsParticipantParameters.yaml +++ b/compose/config/clamp/A1pmsParticipantParameters.yaml @@ -26,15 +26,25 @@ participant: reportingTimeIntervalMs: 120000 description: Participant Description participantId: 101c62b3-8918-41b9-a747-d21eb79c6c00 + topics: + operationTopic: policy-acruntime-participant + syncTopic: acm-ppnt-sync clampAutomationCompositionTopics: topicSources: - - topic: policy-acruntime-participant + - topic: ${participant.intermediaryParameters.topics.operationTopic} servers: - ${topicServer:kafka:9092} topicCommInfrastructure: kafka fetchTimeout: 15000 + + - topic: ${participant.intermediaryParameters.topics.syncTopic} + servers: + - ${topicServer:kafka:9092} + topicCommInfrastructure: kafka + fetchTimeout: 15000 + useHttps: false topicSinks: - - topic: policy-acruntime-participant + - topic: ${participant.intermediaryParameters.topics.operationTopic} servers: - ${topicServer:kafka:9092} topicCommInfrastructure: kafka @@ -51,4 +61,4 @@ server: ssl: enabled: false servlet: - context-path: /onap/policy/clamp/acm/a1pmsparticipant \ No newline at end of file + context-path: /onap/policy/clamp/acm/a1pmsparticipant diff --git a/compose/config/clamp/AcRuntimeParameters.yaml b/compose/config/clamp/AcRuntimeParameters.yaml index c61428da..8a5fb3fd 100644 --- a/compose/config/clamp/AcRuntimeParameters.yaml +++ b/compose/config/clamp/AcRuntimeParameters.yaml @@ -39,13 +39,16 @@ server: path: /error runtime: + topics: + operationTopic: policy-acruntime-participant + syncTopic: acm-ppnt-sync participantParameters: heartBeatMs: 20000 maxStatusWaitMs: 200000 topicParameterGroup: topicSources: - - topic: policy-acruntime-participant + topic: ${runtime.topics.operationTopic} servers: - ${topicServer:kafka:9092} topicCommInfrastructure: kafka @@ -53,7 +56,13 @@ runtime: useHttps: false topicSinks: - - topic: policy-acruntime-participant + topic: ${runtime.topics.operationTopic} + servers: + - ${topicServer:kafka:9092} + topicCommInfrastructure: kafka + useHttps: false + - + topic: ${runtime.topics.syncTopic} servers: - ${topicServer:kafka:9092} topicCommInfrastructure: kafka @@ -71,4 +80,4 @@ management: metrics: security: - disabled: false \ No newline at end of file + disabled: false diff --git a/compose/config/clamp/HttpParticipantParameters.yaml b/compose/config/clamp/HttpParticipantParameters.yaml index a26a81d0..59644e5c 100644 --- a/compose/config/clamp/HttpParticipantParameters.yaml +++ b/compose/config/clamp/HttpParticipantParameters.yaml @@ -15,16 +15,25 @@ participant: reportingTimeIntervalMs: 120000 description: Participant Description participantId: 101c62b3-8918-41b9-a747-d21eb79c6c01 + topics: + operationTopic: policy-acruntime-participant + syncTopic: acm-ppnt-sync clampAutomationCompositionTopics: topicSources: - - topic: policy-acruntime-participant + - topic: ${participant.intermediaryParameters.topics.operationTopic} + servers: + - ${topicServer:kafka:9092} + topicCommInfrastructure: kafka + fetchTimeout: 15000 + useHttps: false + - topic: ${participant.intermediaryParameters.topics.syncTopic} servers: - ${topicServer:kafka:9092} topicCommInfrastructure: kafka fetchTimeout: 15000 useHttps: false topicSinks: - - topic: policy-acruntime-participant + - topic: ${participant.intermediaryParameters.topics.operationTopic} servers: - ${topicServer:kafka:9092} topicCommInfrastructure: kafka diff --git a/compose/config/clamp/KserveParticipantParameters.yaml b/compose/config/clamp/KserveParticipantParameters.yaml index fe55f543..26266dc2 100755 --- a/compose/config/clamp/KserveParticipantParameters.yaml +++ b/compose/config/clamp/KserveParticipantParameters.yaml @@ -27,13 +27,20 @@ participant: participantId: 101c62b3-8918-41b9-a747-d21eb79c6c04 clampAutomationCompositionTopics: topicSources: - - topic: policy-acruntime-participant + - topic: ${participant.intermediaryParameters.topics.operationTopic} servers: - ${topicServer:kafka:9092} topicCommInfrastructure: kafka fetchTimeout: 15000 + + - topic: ${participant.intermediaryParameters.topics.syncTopic} + servers: + - ${topicServer:kafka:9092} + topicCommInfrastructure: kafka + fetchTimeout: 15000 + useHttps: false topicSinks: - - topic: policy-acruntime-participant + - topic: ${participant.intermediaryParameters.topics.operationTopic} servers: - ${topicServer:kafka:9092} topicCommInfrastructure: kafka diff --git a/compose/config/clamp/KubernetesParticipantParameters.yaml b/compose/config/clamp/KubernetesParticipantParameters.yaml index 449e9617..1597220f 100644 --- a/compose/config/clamp/KubernetesParticipantParameters.yaml +++ b/compose/config/clamp/KubernetesParticipantParameters.yaml @@ -18,10 +18,20 @@ participant: reportingTimeIntervalMs: 120000 description: Participant Description participantId: 101c62b3-8918-41b9-a747-d21eb79c6c02 + topics: + operationTopic: policy-acruntime-participant + syncTopic: acm-ppnt-sync clampAutomationCompositionTopics: topicSources: - - topic: policy-acruntime-participant + topic: ${participant.intermediaryParameters.topics.operationTopic} + servers: + - ${topicServer:kafka:9092} + topicCommInfrastructure: kafka + fetchTimeout: 15000 + useHttps: false + - + topic: ${participant.intermediaryParameters.topics.syncTopic} servers: - ${topicServer:kafka:9092} topicCommInfrastructure: kafka @@ -29,7 +39,7 @@ participant: useHttps: false topicSinks: - - topic: policy-acruntime-participant + topic: ${participant.intermediaryParameters.topics.operationTopic} servers: - ${topicServer:kafka:9092} topicCommInfrastructure: kafka diff --git a/compose/config/clamp/PolicyParticipantParameters.yaml b/compose/config/clamp/PolicyParticipantParameters.yaml index 307e0b60..16b258f9 100644 --- a/compose/config/clamp/PolicyParticipantParameters.yaml +++ b/compose/config/clamp/PolicyParticipantParameters.yaml @@ -31,10 +31,20 @@ participant: reportingTimeIntervalMs: 120000 description: Participant Description participantId: 101c62b3-8918-41b9-a747-d21eb79c6c03 + topics: + operationTopic: policy-acruntime-participant + syncTopic: acm-ppnt-sync clampAutomationCompositionTopics: topicSources: - - topic: policy-acruntime-participant + topic: ${participant.intermediaryParameters.topics.operationTopic} + servers: + - ${topicServer:kafka:9092} + topicCommInfrastructure: kafka + fetchTimeout: 15000 + useHttps: false + - + topic: ${participant.intermediaryParameters.topics.syncTopic} servers: - ${topicServer:kafka:9092} topicCommInfrastructure: kafka @@ -42,7 +52,7 @@ participant: useHttps: false topicSinks: - - topic: policy-acruntime-participant + topic: ${participant.intermediaryParameters.topics.operationTopic} servers: - ${topicServer:kafka:9092} topicCommInfrastructure: kafka diff --git a/compose/config/clamp/SimulatorParticipantParameters.yaml b/compose/config/clamp/SimulatorParticipantParameters.yaml index acc1db66..41c30e32 100644 --- a/compose/config/clamp/SimulatorParticipantParameters.yaml +++ b/compose/config/clamp/SimulatorParticipantParameters.yaml @@ -17,16 +17,25 @@ participant: reportingTimeIntervalMs: 120000 description: Participant Description participantId: ${participantId:101c62b3-8918-41b9-a747-d21eb79c6c90} + topics: + operationTopic: policy-acruntime-participant + syncTopic: acm-ppnt-sync clampAutomationCompositionTopics: topicSources: - - topic: policy-acruntime-participant + - topic: ${participant.intermediaryParameters.topics.operationTopic} + servers: + - ${topicServer:kafka:9092} + topicCommInfrastructure: kafka + fetchTimeout: 15000 + useHttps: false + - topic: ${participant.intermediaryParameters.topics.syncTopic} servers: - ${topicServer:kafka:9092} topicCommInfrastructure: kafka fetchTimeout: 15000 useHttps: false topicSinks: - - topic: policy-acruntime-participant + - topic: ${participant.intermediaryParameters.topics.operationTopic} servers: - ${topicServer:kafka:9092} topicCommInfrastructure: kafka -- cgit