From e46a20c7d53690df1a0c9f5b3f052c12e3949fb2 Mon Sep 17 00:00:00 2001
From: Dasar <avinash.ganesh.dasar@accenture.com>
Date: Fri, 12 Apr 2024 18:27:46 +0530
Subject: Remove DMaaP dependency from AAI-Resources

- Remove DMaaP related references from AAI-resources and added kafka
  related configuration
- Updated AAI-Common version from 1.13.3 to 1.13.6

Issue-ID: AAI-3793
Change-Id: If1e141a3ae71b0c053f68ec13387426d3687f9c0
Signed-off-by: Dasar <avinash.ganesh.dasar@accenture.com>
---
 .../src/test/resources/application-test.properties     |  3 ++-
 aai-resources/src/test/resources/logback.xml           | 18 +++++++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)

(limited to 'aai-resources/src/test')

diff --git a/aai-resources/src/test/resources/application-test.properties b/aai-resources/src/test/resources/application-test.properties
index 596bd23..daddc18 100644
--- a/aai-resources/src/test/resources/application-test.properties
+++ b/aai-resources/src/test/resources/application-test.properties
@@ -44,7 +44,8 @@ server.ssl.enabled=false
 # JMS bind address host port
 jms.bind.address=tcp://localhost:61647
 
-dmaap.ribbon.listOfServers=localhost:3904
+# Removed deprecated DMaaP reference
+# dmaap.ribbon.listOfServers=localhost:3904
 # Schema related attributes for the oxm and edges
 # Any additional schema related attributes should start with prefix schema
 schema.configuration.location=N/A
diff --git a/aai-resources/src/test/resources/logback.xml b/aai-resources/src/test/resources/logback.xml
index 8bb9e7c..7d35439 100644
--- a/aai-resources/src/test/resources/logback.xml
+++ b/aai-resources/src/test/resources/logback.xml
@@ -149,7 +149,7 @@
 		<appender-ref ref="translog" />
 	</appender>
 
-	<appender name="dmaapAAIEventConsumer"
+	<appender name="kafkaAAIEventConsumer"
 		class="ch.qos.logback.core.ConsoleAppender">
 		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
 			<level>WARN</level>
@@ -160,7 +160,7 @@
 
 	</appender>
 
-	<appender name="dmaapAAIEventConsumerDebug"
+	<appender name="kafkaAAIEventConsumerDebug"
 		class="ch.qos.logback.core.ConsoleAppender">
 		<filter class="ch.qos.logback.classic.filter.LevelFilter">
 			<level>DEBUG</level>
@@ -171,7 +171,7 @@
 			<pattern>${debugPattern}</pattern>
 		</encoder>
 	</appender>
-	<appender name="dmaapAAIEventConsumerInfo"
+	<appender name="kafkaAAIEventConsumerInfo"
 			  class="ch.qos.logback.core.ConsoleAppender">
 		<filter class="ch.qos.logback.classic.filter.LevelFilter">
 			<level>INFO</level>
@@ -182,7 +182,7 @@
 			<pattern>${auditPattern}</pattern>
 		</encoder>
 	</appender>
-	<appender name="dmaapAAIEventConsumerMetric"
+	<appender name="kafkaAAIEventConsumerMetric"
 		class="ch.qos.logback.core.ConsoleAppender">
 		<filter class="ch.qos.logback.classic.filter.LevelFilter">
 			<level>INFO</level>
@@ -247,14 +247,14 @@
 		<appender-ref ref="asynctranslog" />
 	</logger>
 
-	<logger name="org.onap.aai.dmaap" level="DEBUG" additivity="false">
-		<appender-ref ref="dmaapAAIEventConsumer" />
-		<appender-ref ref="dmaapAAIEventConsumerDebug" />
-		<appender-ref ref="dmaapAAIEventConsumerMetric" />
+	<logger name="org.onap.aai.kafka" level="DEBUG" additivity="false">
+		<appender-ref ref="kafkaAAIEventConsumer" />
+		<appender-ref ref="kafkaAAIEventConsumerDebug" />
+		<appender-ref ref="kafkaAAIEventConsumerMetric" />
 	</logger>
 
 	<logger name="com.att.nsa.mr" level="INFO" >
-		<appender-ref ref="dmaapAAIEventConsumerInfo" />
+		<appender-ref ref="kafkaAAIEventConsumerInfo" />
 	</logger>
 
 	<!-- ============================================================================ -->
-- 
cgit 1.2.3-korg