diff options
| author |   Singh <soumya.e.singh@accenture.com> | 2024-04-09 17:38:07 +0530 |
|---|---|---|
| committer | Singh <soumya.e.singh@accenture.com> | 2024-04-10 15:36:25 +0530 |
| commit | dff80ed76c8e0e6416e0688541f3094db3ca260a (patch) | |
| tree | 72b5210b43ddc9d41c4aa7e4fcb8cfef040db067 /aai-els-onap-logging | |
| parent | dd7e9878066b0de0d8c0acddf58aec5702e83115 (diff) | |
Remove DMaaP dependency from AAI-Common
- Remove Dmaap dependency in AAI-Common and replace it with Kafka.
Issue-ID: AAI-3792
Change-Id: If3fd5c3bdc2448f7e260a26000b02a510c80d7fb
Signed-off-by: Singh <soumya.e.singh@accenture.com>
Diffstat (limited to 'aai-els-onap-logging')
3 files changed, 4 insertions, 9 deletions
diff --git a/aai-els-onap-logging/src/main/java/org/onap/aai/aailog/logs/AaiDmaapMetricLog.java b/aai-els-onap-logging/src/main/java/org/onap/aai/aailog/logs/AaiDmaapMetricLog.java index 0d3a573d..8190dd10 100644 --- a/aai-els-onap-logging/src/main/java/org/onap/aai/aailog/logs/AaiDmaapMetricLog.java +++ b/aai-els-onap-logging/src/main/java/org/onap/aai/aailog/logs/AaiDmaapMetricLog.java @@ -33,7 +33,7 @@ public class AaiDmaapMetricLog extends MDCSetup { protected static final Logger logger = LoggerFactory.getLogger(AaiDmaapMetricLog.class); private static final Marker INVOKE_RETURN = MarkerFactory.getMarker("INVOKE-RETURN"); - private static final String TARGET_ENTITY = "DMaaP"; + private static final String TARGET_ENTITY = "KAFKA"; public AaiDmaapMetricLog() { if (MDC.get(ONAPLogConstants.MDCs.SERVER_FQDN) == null) { diff --git a/aai-els-onap-logging/src/main/java/org/onap/logging/filter/base/ONAPComponents.java b/aai-els-onap-logging/src/main/java/org/onap/logging/filter/base/ONAPComponents.java index 5465b7ce..b9cdd0e9 100644 --- a/aai-els-onap-logging/src/main/java/org/onap/logging/filter/base/ONAPComponents.java +++ b/aai-els-onap-logging/src/main/java/org/onap/logging/filter/base/ONAPComponents.java @@ -24,15 +24,12 @@ import java.util.EnumSet; import java.util.Set; public enum ONAPComponents implements ONAPComponentsList { - OPENSTACK_ADAPTER, BPMN, GRM, AAI, DMAAP, POLICY, CATALOG_DB, REQUEST_DB, SNIRO, SDC, EXTERNAL, VNF_ADAPTER, SDNC_ADAPTER, MULTICLOUD, CLAMP, PORTAL, VID, APPC, DCAE, HOLMES, SDNC, SO, VFC, ESR, DBC, DR, MR, OPTF; + OPENSTACK_ADAPTER, BPMN, GRM, AAI, POLICY, CATALOG_DB, REQUEST_DB, SNIRO, SDC, EXTERNAL, VNF_ADAPTER, SDNC_ADAPTER, MULTICLOUD, CLAMP, PORTAL, VID, APPC, DCAE, HOLMES, SDNC, SO, VFC, ESR, DBC, DR, MR, OPTF; public static Set<ONAPComponents> getSOInternalComponents() { return EnumSet.of(OPENSTACK_ADAPTER, BPMN, CATALOG_DB, REQUEST_DB, VNF_ADAPTER, SDNC_ADAPTER); } - public static Set<ONAPComponents> getDMAAPInternalComponents() { - return EnumSet.of(DBC, DR, MR); - } public static Set<ONAPComponents> getAAIInternalComponents() { return EnumSet.of(ESR); @@ -42,8 +39,6 @@ public enum ONAPComponents implements ONAPComponentsList { public String toString() { if (getSOInternalComponents().contains(this)) return SO + "." + this.name(); - else if (getDMAAPInternalComponents().contains(this)) - return DMAAP + "." + this.name(); else if (getAAIInternalComponents().contains(this)) return AAI + "." + this.name(); else diff --git a/aai-els-onap-logging/src/test/resources/error.properties b/aai-els-onap-logging/src/test/resources/error.properties index c1470dae..1f68df3f 100644 --- a/aai-els-onap-logging/src/test/resources/error.properties +++ b/aai-els-onap-logging/src/test/resources/error.properties @@ -142,8 +142,8 @@ AAI_7117=5:4:ERROR:7117:500:3002:Error in get http client object:500 AAI_7118=5:4:ERROR:7118:500:3002:Script Error:900 AAI_7119=5:4:ERROR:7119:500:3002:Unknown host:900 -#--- DMaaP related errors -AAI_7304=4:5:ERROR:7304:500:3002:Error reaching DMaaP to send event:200 +#--- Kafka related errors +AAI_7304=4:5:ERROR:7304:500:3002:Error reaching Kafka to send event:200 AAI_7350=5:4:ERROR:7305:500:3002:Notification event creation failed:500 #--- aairestctlr: 7401-7499 |