[PMS] Removal of usage of DMaaP

Usage of DMaap is removed from PMS. This commit removes DMaaP
from configuration files.

Issue-ID: CCSDK-3852
Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
Change-Id: I836f5275ba174d757b940b6442d9d5143d6a3cb1

diff --git a/kubernetes/a1policymanagement/resources/config/application.yaml b/kubernetes/a1policymanagement/resources/config/application.yaml
index 05fddb2..29b0b9a 100644 (file)
--- a/kubernetes/a1policymanagement/resources/config/application.yaml
+++ b/kubernetes/a1policymanagement/resources/config/application.yaml
@@ -39,11 +39,11 @@ management:
 logging:
   # Configuration of logging
   level:
-    ROOT: DEBUG
-    org.springframework: DEBUG
-    org.springframework.data: DEBUG
-    org.springframework.web.reactive.function.client.ExchangeFunctions: DEBUG
-    org.onap.ccsdk.oran.a1policymanagementservice: DEBUG
+    ROOT: ERROR
+    org.springframework: ERROR
+    org.springframework.data: ERROR
+    org.springframework.web.reactive.function.client.ExchangeFunctions: ERROR
+    org.onap.ccsdk.oran.a1policymanagementservice: INFO
   file:
     name: /var/log/policy-agent/application.log
 server:

diff --git a/kubernetes/a1policymanagement/resources/config/application_configuration.json b/kubernetes/a1policymanagement/resources/config/application_configuration.json
index 757ee04..5ee3f7d 100644 (file)
--- a/kubernetes/a1policymanagement/resources/config/application_configuration.json
+++ b/kubernetes/a1policymanagement/resources/config/application_configuration.json
@@ -8,22 +8,6 @@
         "password": "${A1CONTROLLER_PASSWORD}"
       }
     ],
-    "ric": {{ include "a1p.generateRics" . | indent 6 | trim }},
-    "streams_publishes": {
-      "dmaap_publisher": {
-        "type": "message_router",
-        "dmaap_info": {
-          "topic_url": "{{ .Values.streamPublish }}"
-        }
-      }
-    },
-    "streams_subscribes": {
-      "dmaap_subscriber": {
-        "type": "message_router",
-        "dmaap_info": {
-          "topic_url": "{{ .Values.streamSubscribe }}"
-        }
-      }
-    }
+    "ric": {{ include "a1p.generateRics" . | indent 6 | trim}}
   }
 }

diff --git a/kubernetes/a1policymanagement/values.yaml b/kubernetes/a1policymanagement/values.yaml
index 71d8852..bf49313 100644 (file)
--- a/kubernetes/a1policymanagement/values.yaml
+++ b/kubernetes/a1policymanagement/values.yaml
@@ -105,8 +105,6 @@ sdncLinkHttp: http://sdnc.onap:8282
 #      - kista3
 #      - kista4
 rics:
-streamPublish: http://message-router:3904/events/A1-POLICY-AGENT-WRITE
-streamSubscribe: http://message-router:3904/events/A1-POLICY-AGENT-READ/users/policy-agent?timeout=15000&limit=100
 
 liveness:
   port: api