Remove deprecated DMAAP dependency

Issue-ID: POLICY-4402
Change-Id: Id3bf1f5833b7d6086345b3747505e2f57036d4ea
Signed-off-by: adheli.tavares <adheli.tavares@est.tech>

10 files changed, 34 insertions, 116 deletions

diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/A1-P-RSP-topic.properties b/controlloop/common/feature-controlloop-management/src/main/feature/config/A1-P-RSP-topic.properties
index 8e9d2dcab..60e54276d 100644
--- a/controlloop/common/feature-controlloop-management/src/main/feature/config/A1-P-RSP-topic.properties
+++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/A1-P-RSP-topic.properties
@@ -2,6 +2,7 @@
 # ONAP
 # ================================================================================
 # Copyright (C) 2022 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright (C) 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.
@@ -16,12 +17,5 @@
 # limitations under the License.
 # ============LICENSE_END=========================================================
 
-
-dmaap.source.topics=A1-P-RSP
-dmaap.source.topics.A1-P-RSP.servers=${envd:DMAAP_SERVERS}
-dmaap.source.topics.A1-P-RSP.https=${envd:DMAAP_HTTPS:true}
-
-#Replace the properties with the following to use kafka message broker
-#kafka.source.topics=a1-p-rsp
-#kafka.source.topics.a1-p-rsp.servers=${envd:DMAAP_SERVERS}
-#kafka.source.topics.a1-p-rsp.https=${envd:DMAAP_HTTPS:true}
+kafka.source.topics=a1-p-rsp
+kafka.source.topics.a1-p-rsp.servers=${envd:KAFKA_SERVERS}
diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/A1-P-topic.properties b/controlloop/common/feature-controlloop-management/src/main/feature/config/A1-P-topic.properties
index 26591baf0..d15f966e0 100644
--- a/controlloop/common/feature-controlloop-management/src/main/feature/config/A1-P-topic.properties
+++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/A1-P-topic.properties
@@ -2,6 +2,7 @@
 # ONAP
 # ================================================================================
 # Copyright (C) 2022 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright (C) 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.
@@ -16,14 +17,6 @@
 # limitations under the License.
 # ============LICENSE_END=========================================================
 
-dmaap.sink.topics=A1-P
-
-dmaap.sink.topics.A1-P.servers=${envd:DMAAP_SERVERS}
-dmaap.sink.topics.A1-P.https=${envd:DMAAP_HTTPS:true}
-
-#Replace the properties with the following to use kafka message broker
-#kafka.sink.topics=a1-p
-
-#kafka.sink.topics.A1-P.servers=${envd:DMAAP_SERVERS}
-#kafka.sink.topics.A1-P.https=${envd:DMAAP_HTTPS:true}
+kafka.sink.topics=a1-p
+kafka.sink.topics.A1-P.servers=${envd:KAFKA_SERVERS}
 
diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/APPC-CL-topic.properties b/controlloop/common/feature-controlloop-management/src/main/feature/config/APPC-CL-topic.properties
index f5b7c158c..a2c3c628a 100644
--- a/controlloop/common/feature-controlloop-management/src/main/feature/config/APPC-CL-topic.properties
+++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/APPC-CL-topic.properties
@@ -2,6 +2,7 @@
 # ONAP
 # ================================================================================
 # Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright (C) 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.
@@ -16,22 +17,7 @@
 # limitations under the License.
 # ============LICENSE_END=========================================================
 
-
-dmaap.source.topics=APPC-CL
-dmaap.sink.topics=APPC-CL
-
-dmaap.source.topics.APPC-CL.servers=${envd:DMAAP_SERVERS}
-dmaap.source.topics.APPC-CL.https=${envd:DMAAP_HTTPS:true}
-
-dmaap.sink.topics.APPC-CL.servers=${envd:DMAAP_SERVERS}
-dmaap.sink.topics.APPC-CL.https=${envd:DMAAP_HTTPS:true}
-
-#Replace the properties with the following to use kafka message broker
-#kafka.source.topics=appc-cl
-#kafka.sink.topics=appc-cl
-
-#kafka.source.topics.appc-cl.servers=${envd:DMAAP_SERVERS}
-#kafka.source.topics.appc-cl.https=${envd:DMAAP_HTTPS:true}
-
-#kafka.sink.topics.appc-cl.servers=${envd:DMAAP_SERVERS}
-#kafka.sink.topics.appc-cl.https=${envd:DMAAP_HTTPS:true}
+kafka.source.topics=appc-cl
+kafka.sink.topics=appc-cl
+kafka.source.topics.appc-cl.servers=${envd:KAFKA_SERVERS}
+kafka.sink.topics.appc-cl.servers=${envd:KAFKA_SERVERS}
diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/APPC-LCM-READ-topic.properties b/controlloop/common/feature-controlloop-management/src/main/feature/config/APPC-LCM-READ-topic.properties
index f50958f0e..dde79f830 100644
--- a/controlloop/common/feature-controlloop-management/src/main/feature/config/APPC-LCM-READ-topic.properties
+++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/APPC-LCM-READ-topic.properties
@@ -2,6 +2,7 @@
 # ONAP
 # ================================================================================
 # Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright (C) 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.
@@ -16,15 +17,5 @@
 # limitations under the License.
 # ============LICENSE_END=========================================================
 
-
-dmaap.sink.topics=APPC-LCM-READ
-
-dmaap.sink.topics.APPC-LCM-READ.servers=${envd:DMAAP_SERVERS}
-dmaap.sink.topics.APPC-LCM-READ.https=${envd:DMAAP_HTTPS:true}
-
-#Replace the properties with the following to use kafka message broker
-#kafka.sink.topics=appc-lcm-read
-
-#kafka.sink.topics.appc-lcm-read.servers=${envd:DMAAP_SERVERS}
-#kafka.sink.topics.appc-lcm-read.https=${envd:DMAAP_HTTPS:true}
-
+kafka.sink.topics=appc-lcm-read
+kafka.sink.topics.appc-lcm-read.servers=${envd:KAFKA_SERVERS}
diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/APPC-LCM-WRITE-topic.properties b/controlloop/common/feature-controlloop-management/src/main/feature/config/APPC-LCM-WRITE-topic.properties
index 414c3a2e8..261d74557 100644
--- a/controlloop/common/feature-controlloop-management/src/main/feature/config/APPC-LCM-WRITE-topic.properties
+++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/APPC-LCM-WRITE-topic.properties
@@ -2,6 +2,7 @@
 # ONAP
 # ================================================================================
 # Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright (C) 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.
@@ -16,14 +17,5 @@
 # limitations under the License.
 # ============LICENSE_END=========================================================
 
-
-dmaap.source.topics=APPC-LCM-WRITE
-
-dmaap.source.topics.APPC-LCM-WRITE.servers=${envd:DMAAP_SERVERS}
-dmaap.source.topics.APPC-LCM-WRITE.https=${envd:DMAAP_HTTPS:true}
-
-#Replace the properties with the following to use kafka message broker
-#kafka.source.topics=appc-lcm-write
-
-#kafka.source.topics.appc-lcm-write.servers=${envd:DMAAP_SERVERS}
-#kafka.source.topics.appc-lcm-write.https=${envd:DMAAP_HTTPS:true}
+kafka.source.topics=appc-lcm-write
+kafka.source.topics.appc-lcm-write.servers=${envd:KAFKA_SERVERS}
diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/DCAE_CL_RSP-topic.properties b/controlloop/common/feature-controlloop-management/src/main/feature/config/DCAE_CL_RSP-topic.properties
index 54ce1aaa7..2c860f1a6 100644
--- a/controlloop/common/feature-controlloop-management/src/main/feature/config/DCAE_CL_RSP-topic.properties
+++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/DCAE_CL_RSP-topic.properties
@@ -2,7 +2,7 @@
 # ONAP
 # ================================================================================
 # Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
-# Modifications Copyright (C) 2022 Nordix Foundation.
+# Modifications Copyright (C) 2022, 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.
@@ -17,13 +17,5 @@
 # limitations under the License.
 # ============LICENSE_END=========================================================
 
-dmaap.sink.topics=DCAE_CL_RSP
-
-dmaap.sink.topics.DCAE_CL_RSP.servers=${env:DMAAP_SERVERS}
-dmaap.sink.topics.DCAE_CL_RSP.https=${envd:DMAAP_HTTPS:true}
-
-#Replace the properties with the following to use kafka message broker
-#kafka.sink.topics=dcae-cl-rsp
-
-#kafka.sink.topics.dcae-cl-rsp.servers=${env:DMAAP_SERVERS}
-#kafka.sink.topics.dcae-cl-rsp.https=${envd:DMAAP_HTTPS:true}
+kafka.sink.topics=dcae-cl-rsp
+kafka.sink.topics.dcae-cl-rsp.servers=${env:KAFKA_SERVERS}
diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/DCAE_TOPIC-topic.properties b/controlloop/common/feature-controlloop-management/src/main/feature/config/DCAE_TOPIC-topic.properties
index d444df859..c7ff538df 100644
--- a/controlloop/common/feature-controlloop-management/src/main/feature/config/DCAE_TOPIC-topic.properties
+++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/DCAE_TOPIC-topic.properties
@@ -2,6 +2,7 @@
 # ONAP
 # ================================================================================
 # Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright (C) 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.
@@ -16,17 +17,7 @@
 # limitations under the License.
 # ============LICENSE_END=========================================================
 
-dmaap.source.topics=DCAE_TOPIC
-
-dmaap.source.topics.DCAE_TOPIC.effectiveTopic=${envd:DCAE_TOPIC}
-dmaap.source.topics.DCAE_TOPIC.servers=${envd:DMAAP_SERVERS}
-dmaap.source.topics.DCAE_TOPIC.consumerGroup=${envd:DCAE_CONSUMER_GROUP}
-dmaap.source.topics.DCAE_TOPIC.https=${envd:DMAAP_HTTPS:true}
-
-#Replace the properties with the following to use kafka message broker
-#kafka.source.topics=dcae_topic
-
-#kafka.source.topics.dcae_topic.effectiveTopic=${envd:DCAE_TOPIC}
-#kafka.source.topics.dcae_topic.servers=${envd:DMAAP_SERVERS}
-#kafka.source.topics.dcae_topic.consumerGroup=${envd:DCAE_CONSUMER_GROUP}
-#kafka.source.topics.dcae_topic.https=${envd:DMAAP_HTTPS:true}
+kafka.source.topics=dcae_topic
+kafka.source.topics.dcae_topic.effectiveTopic=${envd:DCAE_TOPIC}
+kafka.source.topics.dcae_topic.servers=${envd:KAFKA_SERVERS}
+kafka.source.topics.dcae_topic.consumerGroup=${envd:DCAE_CONSUMER_GROUP}
diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/POLICY-CL-MGT-topic.properties b/controlloop/common/feature-controlloop-management/src/main/feature/config/POLICY-CL-MGT-topic.properties
index 74cf296dc..22fe4b2a6 100644
--- a/controlloop/common/feature-controlloop-management/src/main/feature/config/POLICY-CL-MGT-topic.properties
+++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/POLICY-CL-MGT-topic.properties
@@ -2,6 +2,7 @@
 # ONAP
 # ================================================================================
 # Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright (C) 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.
@@ -16,11 +17,5 @@
 # limitations under the License.
 # ============LICENSE_END=========================================================
 
-dmaap.sink.topics=POLICY-CL-MGT
-dmaap.sink.topics.POLICY-CL-MGT.servers=${envd:DMAAP_SERVERS}
-dmaap.sink.topics.POLICY-CL-MGT.https=${envd:DMAAP_HTTPS:true}
-
-#Replace the properties with the following to use kafka message broker
-#kafka.sink.topics=policy-cl-mgt
-#kafka.sink.topics.policy-cl-mgt.servers=${envd:DMAAP_SERVERS}
-#kafka.sink.topics.policy-cl-mgt.https=${envd:DMAAP_HTTPS:true}
+kafka.sink.topics=policy-cl-mgt
+kafka.sink.topics.policy-cl-mgt.servers=${envd:KAFKA_SERVERS}
diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/SDNR-CL-RSP-topic.properties b/controlloop/common/feature-controlloop-management/src/main/feature/config/SDNR-CL-RSP-topic.properties
index b3b8ee297..a76ca2c45 100644
--- a/controlloop/common/feature-controlloop-management/src/main/feature/config/SDNR-CL-RSP-topic.properties
+++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/SDNR-CL-RSP-topic.properties
@@ -2,6 +2,7 @@
 # ONAP
 # ================================================================================
 # Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright (C) 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.
@@ -16,12 +17,5 @@
 # limitations under the License.
 # ============LICENSE_END=========================================================
 
-
-dmaap.source.topics=SDNR-CL-RSP
-dmaap.source.topics.SDNR-CL-RSP.servers=${envd:DMAAP_SERVERS}
-dmaap.source.topics.SDNR-CL-RSP.https=${envd:DMAAP_HTTPS:true}
-
-#Replace the properties with the following to use kafka message broker
-#kafka.source.topics=sdnr-cl-rsp
-#kafka.source.topics.sdnr-cl-rsp.servers=${envd:DMAAP_SERVERS}
-#kafka.source.topics.sdnr-cl-rsp.https=${envd:DMAAP_HTTPS:true}
+kafka.source.topics=sdnr-cl-rsp
+kafka.source.topics.sdnr-cl-rsp.servers=${envd:KAFKA_SERVERS}
diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/SDNR-CL-topic.properties b/controlloop/common/feature-controlloop-management/src/main/feature/config/SDNR-CL-topic.properties
index 145943543..4ddd00758 100644
--- a/controlloop/common/feature-controlloop-management/src/main/feature/config/SDNR-CL-topic.properties
+++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/SDNR-CL-topic.properties
@@ -2,6 +2,7 @@
 # ONAP
 # ================================================================================
 # Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright (C) 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.
@@ -16,16 +17,5 @@
 # limitations under the License.
 # ============LICENSE_END=========================================================
 
-
-
-dmaap.sink.topics=SDNR-CL
-
-dmaap.sink.topics.SDNR-CL.servers=${envd:DMAAP_SERVERS}
-dmaap.sink.topics.SDNR-CL.https=${envd:DMAAP_HTTPS:true}
-
-#Replace the properties with the following to use kafka message broker
-#kafka.sink.topics=sdnr-cl
-
-#kafka.sink.topics.sdnr-cl.servers=${envd:DMAAP_SERVERS}
-#kafka.sink.topics.sdnr-cl.https=${envd:DMAAP_HTTPS:true}
-
+kafka.sink.topics=sdnr-cl
+kafka.sink.topics.sdnr-cl.servers=${envd:KAFKA_SERVERS}