summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xcompose/config/clamp/A1pmsParticipantParameters.yaml16
-rw-r--r--compose/config/clamp/AcRuntimeParameters.yaml15
-rw-r--r--compose/config/clamp/HttpParticipantParameters.yaml13
-rwxr-xr-xcompose/config/clamp/KserveParticipantParameters.yaml11
-rw-r--r--compose/config/clamp/KubernetesParticipantParameters.yaml14
-rw-r--r--compose/config/clamp/PolicyParticipantParameters.yaml14
-rw-r--r--compose/config/clamp/SimulatorParticipantParameters.yaml13
-rwxr-xr-xhelm/policy/components/policy-clamp-ac-a1pms-ppnt/resources/config/A1pmsParticipantParameters.yaml12
-rw-r--r--helm/policy/components/policy-clamp-ac-http-ppnt/resources/config/HttpParticipantParameters.yaml13
-rw-r--r--helm/policy/components/policy-clamp-ac-k8s-ppnt/resources/config/KubernetesParticipantParameters.yaml14
-rwxr-xr-xhelm/policy/components/policy-clamp-ac-kserve-ppnt/resources/config/KserveParticipantParameters.yaml12
-rw-r--r--helm/policy/components/policy-clamp-ac-pf-ppnt/resources/config/PolicyParticipantParameters.yaml14
-rw-r--r--helm/policy/components/policy-clamp-ac-sim-ppnt/resources/config/SimulatorParticipantParameters.yaml13
-rwxr-xr-xhelm/policy/components/policy-clamp-runtime-acm/resources/config/acRuntimeParameters.yaml11
-rw-r--r--helm/robot/templates/test-job.yaml6
15 files changed, 159 insertions, 32 deletions
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
diff --git a/helm/policy/components/policy-clamp-ac-a1pms-ppnt/resources/config/A1pmsParticipantParameters.yaml b/helm/policy/components/policy-clamp-ac-a1pms-ppnt/resources/config/A1pmsParticipantParameters.yaml
index 77082fd6..1bcb3875 100755
--- a/helm/policy/components/policy-clamp-ac-a1pms-ppnt/resources/config/A1pmsParticipantParameters.yaml
+++ b/helm/policy/components/policy-clamp-ac-a1pms-ppnt/resources/config/A1pmsParticipantParameters.yaml
@@ -40,18 +40,26 @@ a1pms:
participant:
intermediaryParameters:
+ topics:
+ operationTopic: policy-acruntime-participant
+ syncTopic: acm-ppnt-sync
reportingTimeIntervalMs: 120000
description: Participant Description
participantId: 101c62b3-8918-41b9-a747-d21eb79c6c00
clampAutomationCompositionTopics:
topicSources:
- - topic: policy-acruntime-participant
+ - topic: ${participant.intermediaryParameters.topics.operationTopic}
+ servers:
+ - "{{ .Values.global.kafkaServer }}:9092"
+ topicCommInfrastructure: kafka
+ fetchTimeout: 15000
+ - topic: ${participant.intermediaryParameters.topics.syncTopic}
servers:
- "{{ .Values.global.kafkaServer }}:9092"
topicCommInfrastructure: kafka
fetchTimeout: 15000
topicSinks:
- - topic: policy-acruntime-participant
+ - topic: ${participant.intermediaryParameters.topics.operationTopic}
servers:
- "{{ .Values.global.kafkaServer }}:9092"
topicCommInfrastructure: kafka
diff --git a/helm/policy/components/policy-clamp-ac-http-ppnt/resources/config/HttpParticipantParameters.yaml b/helm/policy/components/policy-clamp-ac-http-ppnt/resources/config/HttpParticipantParameters.yaml
index 17e10334..d500fffa 100644
--- a/helm/policy/components/policy-clamp-ac-http-ppnt/resources/config/HttpParticipantParameters.yaml
+++ b/helm/policy/components/policy-clamp-ac-http-ppnt/resources/config/HttpParticipantParameters.yaml
@@ -32,19 +32,28 @@ security:
participant:
intermediaryParameters:
+ topics:
+ operationTopic: policy-acruntime-participant
+ syncTopic: acm-ppnt-sync
reportingTimeIntervalMs: 120000
description: Participant Description
participantId: 101c62b3-8918-41b9-a747-d21eb79c6c01
clampAutomationCompositionTopics:
topicSources:
- - topic: policy-acruntime-participant
+ - topic: ${participant.intermediaryParameters.topics.operationTopic}
+ servers:
+ - "{{ .Values.global.kafkaServer }}:9092"
+ topicCommInfrastructure: kafka
+ fetchTimeout: 15000
+ useHttps: false
+ - topic: ${participant.intermediaryParameters.topics.syncTopic}
servers:
- "{{ .Values.global.kafkaServer }}:9092"
topicCommInfrastructure: kafka
fetchTimeout: 15000
useHttps: false
topicSinks:
- - topic: policy-acruntime-participant
+ - topic: ${participant.intermediaryParameters.topics.operationTopic}
servers:
- "{{ .Values.global.kafkaServer }}:9092"
topicCommInfrastructure: kafka
diff --git a/helm/policy/components/policy-clamp-ac-k8s-ppnt/resources/config/KubernetesParticipantParameters.yaml b/helm/policy/components/policy-clamp-ac-k8s-ppnt/resources/config/KubernetesParticipantParameters.yaml
index 08ed5940..1fe27377 100644
--- a/helm/policy/components/policy-clamp-ac-k8s-ppnt/resources/config/KubernetesParticipantParameters.yaml
+++ b/helm/policy/components/policy-clamp-ac-k8s-ppnt/resources/config/KubernetesParticipantParameters.yaml
@@ -34,13 +34,23 @@ participant:
localChartDirectory: /home/policy/local-charts
infoFileName: CHART_INFO.json
intermediaryParameters:
+ topics:
+ operationTopic: policy-acruntime-participant
+ syncTopic: acm-ppnt-sync
reportingTimeIntervalMs: 120000
description: Participant Description
participantId: 101c62b3-8918-41b9-a747-d21eb79c6c02
clampAutomationCompositionTopics:
topicSources:
-
- topic: policy-acruntime-participant
+ topic: ${participant.intermediaryParameters.topics.operationTopic}
+ servers:
+ - "{{ .Values.global.kafkaServer }}:9092"
+ topicCommInfrastructure: kafka
+ fetchTimeout: 15000
+ useHttps: false
+ -
+ topic: ${participant.intermediaryParameters.topics.syncTopic}
servers:
- "{{ .Values.global.kafkaServer }}:9092"
topicCommInfrastructure: kafka
@@ -48,7 +58,7 @@ participant:
useHttps: false
topicSinks:
-
- topic: policy-acruntime-participant
+ topic: ${participant.intermediaryParameters.topics.operationTopic}
servers:
- "{{ .Values.global.kafkaServer }}:9092"
topicCommInfrastructure: kafka
diff --git a/helm/policy/components/policy-clamp-ac-kserve-ppnt/resources/config/KserveParticipantParameters.yaml b/helm/policy/components/policy-clamp-ac-kserve-ppnt/resources/config/KserveParticipantParameters.yaml
index 249212b0..50bb10ac 100755
--- a/helm/policy/components/policy-clamp-ac-kserve-ppnt/resources/config/KserveParticipantParameters.yaml
+++ b/helm/policy/components/policy-clamp-ac-kserve-ppnt/resources/config/KserveParticipantParameters.yaml
@@ -39,18 +39,26 @@ security:
participant:
intermediaryParameters:
+ topics:
+ operationTopic: policy-acruntime-participant
+ syncTopic: acm-ppnt-sync
reportingTimeIntervalMs: 120000
description: Participant Description
participantId: 101c62b3-8918-41b9-a747-d21eb79c6c04
clampAutomationCompositionTopics:
topicSources:
- - topic: policy-acruntime-participant
+ - topic: ${participant.intermediaryParameters.topics.operationTopic}
+ servers:
+ - "{{ .Values.global.kafkaServer }}:9092"
+ topicCommInfrastructure: kafka
+ fetchTimeout: 15000
+ - topic: ${participant.intermediaryParameters.topics.syncTopic}
servers:
- "{{ .Values.global.kafkaServer }}:9092"
topicCommInfrastructure: kafka
fetchTimeout: 15000
topicSinks:
- - topic: policy-acruntime-participant
+ - topic: ${participant.intermediaryParameters.topics.operationTopic}
servers:
- "{{ .Values.global.kafkaServer }}:9092"
topicCommInfrastructure: kafka
diff --git a/helm/policy/components/policy-clamp-ac-pf-ppnt/resources/config/PolicyParticipantParameters.yaml b/helm/policy/components/policy-clamp-ac-pf-ppnt/resources/config/PolicyParticipantParameters.yaml
index 4c29b547..10f7df80 100644
--- a/helm/policy/components/policy-clamp-ac-pf-ppnt/resources/config/PolicyParticipantParameters.yaml
+++ b/helm/policy/components/policy-clamp-ac-pf-ppnt/resources/config/PolicyParticipantParameters.yaml
@@ -50,13 +50,23 @@ participant:
useHttps: false
allowSelfSignedCerts: true
intermediaryParameters:
+ topics:
+ operationTopic: policy-acruntime-participant
+ syncTopic: acm-ppnt-sync
reportingTimeIntervalMs: 120000
description: Participant Description
participantId: 101c62b3-8918-41b9-a747-d21eb79c6c03
clampAutomationCompositionTopics:
topicSources:
-
- topic: policy-acruntime-participant
+ topic: ${participant.intermediaryParameters.topics.operationTopic}
+ servers:
+ - "{{ .Values.global.kafkaServer }}:9092"
+ topicCommInfrastructure: kafka
+ fetchTimeout: 15000
+ useHttps: false
+ -
+ topic: ${participant.intermediaryParameters.topics.syncTopic}
servers:
- "{{ .Values.global.kafkaServer }}:9092"
topicCommInfrastructure: kafka
@@ -64,7 +74,7 @@ participant:
useHttps: false
topicSinks:
-
- topic: policy-acruntime-participant
+ topic: ${participant.intermediaryParameters.topics.operationTopic}
servers:
- "{{ .Values.global.kafkaServer }}:9092"
topicCommInfrastructure: kafka
diff --git a/helm/policy/components/policy-clamp-ac-sim-ppnt/resources/config/SimulatorParticipantParameters.yaml b/helm/policy/components/policy-clamp-ac-sim-ppnt/resources/config/SimulatorParticipantParameters.yaml
index 0b874d99..d13dccee 100644
--- a/helm/policy/components/policy-clamp-ac-sim-ppnt/resources/config/SimulatorParticipantParameters.yaml
+++ b/helm/policy/components/policy-clamp-ac-sim-ppnt/resources/config/SimulatorParticipantParameters.yaml
@@ -33,19 +33,28 @@ security:
participant:
intermediaryParameters:
+ topics:
+ operationTopic: policy-acruntime-participant
+ syncTopic: acm-ppnt-sync
reportingTimeIntervalMs: 120000
description: Participant Description
participantId: 101c62b3-8918-41b9-a747-d21eb79c6c90
clampAutomationCompositionTopics:
topicSources:
- - topic: policy-acruntime-participant
+ - topic: ${participant.intermediaryParameters.topics.operationTopic}
+ servers:
+ - "{{ .Values.global.kafkaServer }}:9092"
+ topicCommInfrastructure: kafka
+ fetchTimeout: 15000
+ useHttps: false
+ - topic: ${participant.intermediaryParameters.topics.syncTopic}
servers:
- "{{ .Values.global.kafkaServer }}:9092"
topicCommInfrastructure: kafka
fetchTimeout: 15000
useHttps: false
topicSinks:
- - topic: policy-acruntime-participant
+ - topic: ${participant.intermediaryParameters.topics.operationTopic}
servers:
- "{{ .Values.global.kafkaServer }}:9092"
topicCommInfrastructure: kafka
diff --git a/helm/policy/components/policy-clamp-runtime-acm/resources/config/acRuntimeParameters.yaml b/helm/policy/components/policy-clamp-runtime-acm/resources/config/acRuntimeParameters.yaml
index 138b114c..84f1bc17 100755
--- a/helm/policy/components/policy-clamp-runtime-acm/resources/config/acRuntimeParameters.yaml
+++ b/helm/policy/components/policy-clamp-runtime-acm/resources/config/acRuntimeParameters.yaml
@@ -62,6 +62,9 @@ server:
enabled: false
runtime:
+ topics:
+ operationTopic: policy-acruntime-participant
+ syncTopic: acm-ppnt-sync
participantParameters:
heartBeatMs: 120000
maxStatusWaitMs: 200000
@@ -76,7 +79,13 @@ runtime:
fetchTimeout: 15000
topicSinks:
-
- topic: policy-acruntime-participant
+ topic: ${runtime.topics.operationTopic}
+ servers:
+ - {{ .Values.global.kafkaServer }}:9092
+ topicCommInfrastructure: kafka
+ useHttps: false
+ -
+ topic: ${runtime.topics.syncTopic}
servers:
- {{ .Values.global.kafkaServer }}:9092
topicCommInfrastructure: kafka
diff --git a/helm/robot/templates/test-job.yaml b/helm/robot/templates/test-job.yaml
index a573b510..f9df6f65 100644
--- a/helm/robot/templates/test-job.yaml
+++ b/helm/robot/templates/test-job.yaml
@@ -1,5 +1,5 @@
{{/*
-# Copyright (C) 2023 Nordix Foundation.
+# Copyright (C) 2023-2024 Nordix Foundation.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -49,7 +49,7 @@ spec:
imagePullPolicy: Never
env:
- name: ROBOT_FILE
- value: "$(ROBOT_FILE)"
+ value: {{ .Values.robot }}
command: [ "./run-test.sh" ]
volumeMounts:
- name: robot-csit-pv
@@ -58,4 +58,4 @@ spec:
volumes:
- name: robot-csit-pv
hostPath:
- path: {{ .Values.robotLogDir }} \ No newline at end of file
+ path: {{ .Values.robotLogDir }}