diff options
Diffstat (limited to 'compose/config')
| -rw-r--r-- | compose/config/apex-pdp/OnapPfConfig.json | 17 | ||||
| -rw-r--r-- | compose/config/drools-applications/custom/feature-lifecycle.properties | 27 | ||||
| -rw-r--r-- | compose/config/drools-applications/env/base.conf | 11 | ||||
| -rw-r--r-- | compose/config/drools-applications/env/feature-pooling-dmaap.conf | 3 | ||||
| -rwxr-xr-x | compose/config/drools-pdp/custom/noop.pre.sh | 3 | ||||
| -rw-r--r-- | compose/config/drools-pdp/env/base.conf | 9 | ||||
| -rw-r--r-- | compose/config/pap/papParameters.yaml | 22 | ||||
| -rw-r--r-- | compose/config/pap/papParametersPostgres.yaml | 22 | ||||
| -rw-r--r-- | compose/config/sim-all/simParameters.json | 18 | ||||
| -rw-r--r-- | compose/config/xacml-pdp/defaultConfig.json | 15 |
10 files changed, 78 insertions, 69 deletions
diff --git a/compose/config/apex-pdp/OnapPfConfig.json b/compose/config/apex-pdp/OnapPfConfig.json index e943dd37..6242b906 100644 --- a/compose/config/apex-pdp/OnapPfConfig.json +++ b/compose/config/apex-pdp/OnapPfConfig.json @@ -10,7 +10,7 @@ }, "pdpStatusParameters": { "pdpGroup": "defaultGroup", - "timeIntervalMs": 120000, + "timeIntervalMs": 20000, "pdpType": "apex", "description": "Pdp Heartbeat", "supportedPolicyTypes": [ @@ -27,21 +27,22 @@ "topicParameterGroup": { "topicSources": [ { - "topic": "POLICY-PDP-PAP", + "topic": "policy-pdp-pap", "servers": [ - "message-router" + "kafka:9092" ], - "topicCommInfrastructure": "dmaap", - "useHttps": false + "topicCommInfrastructure": "kafka", + "useHttps": false, + "fetchTimeout": 15000 } ], "topicSinks": [ { - "topic": "POLICY-PDP-PAP", + "topic": "policy-pdp-pap", "servers": [ - "message-router" + "kafka:9092" ], - "topicCommInfrastructure": "dmaap", + "topicCommInfrastructure": "kafka", "useHttps": false } ] diff --git a/compose/config/drools-applications/custom/feature-lifecycle.properties b/compose/config/drools-applications/custom/feature-lifecycle.properties index 3e862970..ec23bee6 100644 --- a/compose/config/drools-applications/custom/feature-lifecycle.properties +++ b/compose/config/drools-applications/custom/feature-lifecycle.properties @@ -2,6 +2,7 @@ # ONAP # ================================================================================ # Copyright (C) 2021 AT&T Intellectual Property. All rights reserved. +# Modification Copyright 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. @@ -22,17 +23,19 @@ lifecycle.pdp.type=${envd:POLICY_PDP_PAP_TYPE:drools} # Mandatory policy types that this PDP-D must support at a minimum lifecycle.pdp.policytypes=${envd:POLICY_PDP_PAP_POLICYTYPES} -dmaap.source.topics=POLICY-PDP-PAP -dmaap.sink.topics=POLICY-PDP-PAP +kafka.source.topics=policy-pdp-pap +kafka.sink.topics=policy-pdp-pap +kafka.source.topics.fetchTimeout=15000 +kafka.source.topics.policy-pdp-pap.fetchTimeout=15000 -dmaap.source.topics.POLICY-PDP-PAP.servers=${envd:DMAAP_SERVERS} -dmaap.source.topics.POLICY-PDP-PAP.effectiveTopic=${envd:POLICY_PDP_PAP_TOPIC} -dmaap.source.topics.POLICY-PDP-PAP.apiKey=${envd:POLICY_PDP_PAP_API_KEY} -dmaap.source.topics.POLICY-PDP-PAP.apiSecret=${envd:POLICY_PDP_PAP_API_SECRET} -dmaap.source.topics.POLICY-PDP-PAP.https=${envd:DMAAP_HTTPS:false} +kafka.source.topics.policy-pdp-pap.servers=kafka:9092 +kafka.source.topics.policy-pdp-pap.effectiveTopic=${envd:POLICY_PDP_PAP_TOPIC} +kafka.source.topics.policy-pdp-pap.apiKey=${envd:POLICY_PDP_PAP_API_KEY} +kafka.source.topics.policy-pdp-pap.apiSecret=${envd:POLICY_PDP_PAP_API_SECRET} +kafka.source.topics.policy-pdp-pap.https=${envd:DMAAP_HTTPS:false} -dmaap.sink.topics.POLICY-PDP-PAP.servers=${envd:DMAAP_SERVERS} -dmaap.sink.topics.POLICY-PDP-PAP.effectiveTopic=${envd:POLICY_PDP_PAP_TOPIC} -dmaap.sink.topics.POLICY-PDP-PAP.apiKey=${envd:POLICY_PDP_PAP_API_KEY} -dmaap.sink.topics.POLICY-PDP-PAP.apiSecret=${envd:POLICY_PDP_PAP_API_SECRET} -dmaap.sink.topics.POLICY-PDP-PAP.https=${envd:DMAAP_HTTPS:false} +kafka.sink.topics.policy-pdp-pap.servers=kafka:9092 +kafka.sink.topics.policy-pdp-pap.effectiveTopic=${envd:POLICY_PDP_PAP_TOPIC} +kafka.sink.topics.policy-pdp-pap.apiKey=${envd:POLICY_PDP_PAP_API_KEY} +kafka.sink.topics.policy-pdp-pap.apiSecret=${envd:POLICY_PDP_PAP_API_SECRET} +kafka.sink.topics.policy-pdp-pap.https=${envd:DMAAP_HTTPS:false} diff --git a/compose/config/drools-applications/env/base.conf b/compose/config/drools-applications/env/base.conf index ca944dbb..0b92602f 100644 --- a/compose/config/drools-applications/env/base.conf +++ b/compose/config/drools-applications/env/base.conf @@ -1,6 +1,7 @@ # ============LICENSE_START================================================== # Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved. # Modifications Copyright (C) 2021 Bell Canada. All rights reserved. +# Modification Copyright 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. @@ -71,7 +72,7 @@ LIVENESS_CONTROLLERS=* # PDP-D DMaaP configuration channel -PDPD_CONFIGURATION_TOPIC=PDPD-CONFIGURATION +PDPD_CONFIGURATION_TOPIC=pdpd-configuration PDPD_CONFIGURATION_API_KEY= PDPD_CONFIGURATION_API_SECRET= PDPD_CONFIGURATION_CONSUMER_GROUP= @@ -80,7 +81,7 @@ PDPD_CONFIGURATION_PARTITION_KEY= # PAP-PDP configuration channel -POLICY_PDP_PAP_TOPIC=POLICY-PDP-PAP +POLICY_PDP_PAP_TOPIC=policy-pdp-pap POLICY_PDP_PAP_API_KEY= POLICY_PDP_PAP_API_SECRET= @@ -102,13 +103,13 @@ PDP_HTTPS=false # DCAE DMaaP -DCAE_TOPIC=unauthenticated.DCAE_CL_OUTPUT -DCAE_SERVERS=message-router +DCAE_TOPIC=unauthenticated.dcae_cl_output +DCAE_SERVERS=kafka:9092 DCAE_CONSUMER_GROUP=dcae.policy.shared # Open DMaaP -DMAAP_SERVERS=message-router +DMAAP_SERVERS=kafka:9092 DMAAP_HTTPS=false # AAI diff --git a/compose/config/drools-applications/env/feature-pooling-dmaap.conf b/compose/config/drools-applications/env/feature-pooling-dmaap.conf index 3808e3d9..f90a9f04 100644 --- a/compose/config/drools-applications/env/feature-pooling-dmaap.conf +++ b/compose/config/drools-applications/env/feature-pooling-dmaap.conf @@ -1,5 +1,6 @@ # ============LICENSE_START======================================================= # Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. +# Modification Copyright 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. @@ -14,4 +15,4 @@ # limitations under the License. # ============LICENSE_END========================================================= -POOLING_TOPIC=POOLING +POOLING_TOPIC=pooling diff --git a/compose/config/drools-pdp/custom/noop.pre.sh b/compose/config/drools-pdp/custom/noop.pre.sh index 63bdc4cf..2be33980 100755 --- a/compose/config/drools-pdp/custom/noop.pre.sh +++ b/compose/config/drools-pdp/custom/noop.pre.sh @@ -1,6 +1,7 @@ #!/bin/bash -x # ============LICENSE_START======================================================= # Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. +# Modification Copyright 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. @@ -15,7 +16,7 @@ # limitations under the License. # ============LICENSE_END========================================================= -sed -i "s/^dmaap/noop/g" \ +sed -i "s/^dmaap/kafka/g" \ ${POLICY_HOME}/config/engine.properties \ ${POLICY_HOME}/config/feature-lifecycle.properties diff --git a/compose/config/drools-pdp/env/base.conf b/compose/config/drools-pdp/env/base.conf index 98cc10f8..d301d830 100644 --- a/compose/config/drools-pdp/env/base.conf +++ b/compose/config/drools-pdp/env/base.conf @@ -1,6 +1,7 @@ # ============LICENSE_START======================================================= # Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved. # Modifications Copyright (C) 2021 Bell Canada. All rights reserved. +# Modification Copyright 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. @@ -68,7 +69,7 @@ PROMETHEUS=true # PDP-D DMaaP configuration channel -PDPD_CONFIGURATION_TOPIC=PDPD-CONFIGURATION +PDPD_CONFIGURATION_TOPIC=pdpd-configuration PDPD_CONFIGURATION_API_KEY= PDPD_CONFIGURATION_API_SECRET= PDPD_CONFIGURATION_CONSUMER_GROUP= @@ -77,7 +78,7 @@ PDPD_CONFIGURATION_PARTITION_KEY= # PAP-PDP configuration channel -POLICY_PDP_PAP_TOPIC=POLICY-PDP-PAP +POLICY_PDP_PAP_TOPIC=policy-pdp-pap POLICY_PDP_PAP_API_KEY= POLICY_PDP_PAP_API_SECRET= @@ -101,13 +102,13 @@ GUARD_DISABLED=false # DCAE DMaaP -DCAE_TOPIC=unauthenticated.DCAE_CL_OUTPUT +DCAE_TOPIC=unauthenticated.dcae_cl_output DCAE_SERVERS= DCAE_CONSUMER_GROUP=dcae.policy.shared # Open DMaaP -DMAAP_SERVERS=mr.api.simpledemo.onap.org +DMAAP_SERVERS=kafka:9092 DMAAP_HTTPS=false # AAI diff --git a/compose/config/pap/papParameters.yaml b/compose/config/pap/papParameters.yaml index 9e8077a7..1f42a575 100644 --- a/compose/config/pap/papParameters.yaml +++ b/compose/config/pap/papParameters.yaml @@ -32,9 +32,9 @@ pap: name: PapGroup aaf: false topic: - pdp-pap.name: POLICY-PDP-PAP - notification.name: POLICY-NOTIFICATION - heartbeat.name: POLICY-HEARTBEAT + pdp-pap.name: policy-pdp-pap + notification.name: policy-notification + heartbeat.name: policy-heartbeat pdpParameters: heartBeatMs: 120000 updateParameters: @@ -48,28 +48,28 @@ pap: topicSources: - topic: ${pap.topic.pdp-pap.name} servers: - - message-router - topicCommInfrastructure: dmaap + - kafka:9092 + topicCommInfrastructure: kafka useHttps: false fetchTimeout: 15000 - topic: ${pap.topic.heartbeat.name} effectiveTopic: ${pap.topic.pdp-pap.name} consumerGroup: policy-pap servers: - - message-router - topicCommInfrastructure: dmaap + - kafka:9092 + topicCommInfrastructure: kafka useHttps: false fetchTimeout: 15000 topicSinks: - topic: ${pap.topic.pdp-pap.name} servers: - - message-router - topicCommInfrastructure: dmaap + - kafka:9092 + topicCommInfrastructure: kafka useHttps: false - topic: ${pap.topic.notification.name} servers: - - message-router - topicCommInfrastructure: dmaap + - kafka:9092 + topicCommInfrastructure: kafka useHttps: false healthCheckRestClientParameters: - clientName: api diff --git a/compose/config/pap/papParametersPostgres.yaml b/compose/config/pap/papParametersPostgres.yaml index 1959e877..15e77f14 100644 --- a/compose/config/pap/papParametersPostgres.yaml +++ b/compose/config/pap/papParametersPostgres.yaml @@ -32,9 +32,9 @@ pap: name: PapGroup aaf: false topic: - pdp-pap.name: POLICY-PDP-PAP - notification.name: POLICY-NOTIFICATION - heartbeat.name: POLICY-HEARTBEAT + pdp-pap.name: policy-pdp-pap + notification.name: policy-notification + heartbeat.name: policy-heartbeat pdpParameters: heartBeatMs: 120000 updateParameters: @@ -48,28 +48,28 @@ pap: topicSources: - topic: ${pap.topic.pdp-pap.name} servers: - - message-router - topicCommInfrastructure: dmaap + - kafka:9092 + topicCommInfrastructure: kafka useHttps: false fetchTimeout: 15000 - topic: ${pap.topic.heartbeat.name} effectiveTopic: ${pap.topic.pdp-pap.name} consumerGroup: policy-pap servers: - - message-router - topicCommInfrastructure: dmaap + - kafka:9092 + topicCommInfrastructure: kafka useHttps: false fetchTimeout: 15000 topicSinks: - topic: ${pap.topic.pdp-pap.name} servers: - - message-router - topicCommInfrastructure: dmaap + - kafka:9092 + topicCommInfrastructure: kafka useHttps: false - topic: ${pap.topic.notification.name} servers: - - message-router - topicCommInfrastructure: dmaap + - kafka:9092 + topicCommInfrastructure: kafka useHttps: false healthCheckRestClientParameters: - clientName: api diff --git a/compose/config/sim-all/simParameters.json b/compose/config/sim-all/simParameters.json index 41fc9057..2bc5812f 100644 --- a/compose/config/sim-all/simParameters.json +++ b/compose/config/sim-all/simParameters.json @@ -47,7 +47,7 @@ ], "topicSinks": [ { - "topic": "APPC-CL", + "topic": "appc-cl", "servers": ["${HOST_NAME}"], "topicCommInfrastructure": "DMAAP", "useHttps": false, @@ -55,7 +55,7 @@ "apiSecret": "some-secret" }, { - "topic": "APPC-LCM-WRITE", + "topic": "appc-lcm-write", "servers": ["${HOST_NAME}"], "topicCommInfrastructure": "DMAAP", "useHttps": false, @@ -65,7 +65,7 @@ ], "topicSources": [ { - "topic": "APPC-CL", + "topic": "appc-cl", "servers": ["${HOST_NAME}"], "topicCommInfrastructure": "DMAAP", "useHttps": false, @@ -73,7 +73,7 @@ "apiSecret": "some-secret" }, { - "topic": "APPC-LCM-READ", + "topic": "appc-lcm-read", "servers": ["${HOST_NAME}"], "topicCommInfrastructure": "DMAAP", "useHttps": false, @@ -85,14 +85,14 @@ { "name": "APPC Legacy simulator", "providerClass": "org.onap.policy.simulators.AppcLegacyTopicServer", - "sink": "APPC-CL", - "source": "APPC-CL" + "sink": "appc-cl", + "source": "appc-cl" }, { - "name": "APPC-LCM simulator", + "name": "appc-lcm-simulator", "providerClass": "org.onap.policy.simulators.AppcLcmTopicServer", - "sink": "APPC-LCM-WRITE", - "source": "APPC-LCM-READ" + "sink": "appc-lcm-write", + "source": "appc-lcm-read" } ], "grpcServer": { diff --git a/compose/config/xacml-pdp/defaultConfig.json b/compose/config/xacml-pdp/defaultConfig.json index d6f3bd99..ba587f1a 100644 --- a/compose/config/xacml-pdp/defaultConfig.json +++ b/compose/config/xacml-pdp/defaultConfig.json @@ -24,15 +24,16 @@ }, "topicParameterGroup": { "topicSources" : [{ - "topic" : "POLICY-PDP-PAP", - "servers" : [ "message-router" ], - "topicCommInfrastructure" : "dmaap", - "useHttps" : false + "topic" : "policy-pdp-pap", + "servers" : [ "kafka:9092" ], + "topicCommInfrastructure" : "kafka", + "useHttps" : false, + "fetchTimeout": 15000 }], "topicSinks" : [{ - "topic" : "POLICY-PDP-PAP", - "servers" : [ "message-router" ], - "topicCommInfrastructure" : "dmaap", + "topic" : "policy-pdp-pap", + "servers" : [ "kafka:9092" ], + "topicCommInfrastructure" : "kafka", "useHttps" : false }] } |