diff options
| -rw-r--r-- | aai-resources/pom.xml | 15 | ||||
| -rw-r--r-- | aai-resources/src/main/resources/application.properties | 12 | ||||
| -rw-r--r-- | aai-resources/src/main/resources/etc/appprops/aaiconfig.properties | 3 | ||||
| -rw-r--r-- | aai-resources/src/main/resources/etc/appprops/error.properties | 4 | ||||
| -rw-r--r-- | aai-resources/src/main/resources/logback.xml | 18 | ||||
| -rw-r--r-- | aai-resources/src/test/resources/application-test.properties | 3 | ||||
| -rw-r--r-- | aai-resources/src/test/resources/logback.xml | 18 | ||||
| -rw-r--r-- | pom.xml | 2 |
8 files changed, 39 insertions, 36 deletions
diff --git a/aai-resources/pom.xml b/aai-resources/pom.xml index ced10c2..79a1d75 100644 --- a/aai-resources/pom.xml +++ b/aai-resources/pom.xml @@ -528,18 +528,9 @@ <artifactId>gson</artifactId> </dependency> <dependency> - <groupId>org.onap.dmaap.messagerouter.dmaapclient</groupId> - <artifactId>dmaapClient</artifactId> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - <exclusion> - <groupId>com.att.aft</groupId> - <artifactId>dme2</artifactId> - </exclusion> - </exclusions> + <groupId>org.springframework.kafka</groupId> + <artifactId>spring-kafka</artifactId> + <version>2.7.14</version> </dependency> <dependency> <groupId>com.jayway.jsonpath</groupId> diff --git a/aai-resources/src/main/resources/application.properties b/aai-resources/src/main/resources/application.properties index 3f0e625..3355695 100644 --- a/aai-resources/src/main/resources/application.properties +++ b/aai-resources/src/main/resources/application.properties @@ -26,7 +26,7 @@ spring.autoconfigure.exclude=\ spring.jersey.application-path=${schema.uri.base.path} -spring.profiles.active=production,one-way-ssl,dmaap +spring.profiles.active=production,one-way-ssl,kafka #The max number of active threads in this pool server.jetty.threads.max=200 #The minimum number of threads always kept alive @@ -56,7 +56,15 @@ null.db.serialization.enabled=true # JMS bind address host port jms.bind.address=tcp://localhost:61647 -dmaap.ribbon.listOfServers=localhost:3904 +# dmaap is deprecated and now replaced with kafka +# dmaap.ribbon.listOfServers=localhost:3904 +spring.kafka.producer.bootstrap-servers=${BOOTSTRAP_SERVERS} +spring.kafka.producer.properties.security.protocol=SASL_PLAINTEXT +spring.kafka.producer.properties.sasl.mechanism=SCRAM-SHA-512 +spring.kafka.producer.key-serializer=org.apache.kafka.common.serialization.StringSerializer +spring.kafka.producer.value-serializer=org.apache.kafka.common.serialization.StringSerializer +spring.kafka.producer.properties.sasl.jaas.config = ${JAAS_CONFIG} +spring.kafka.producer.retries=3 # Schema related attributes for the oxm and edges # Any additional schema related attributes should start with prefix schema diff --git a/aai-resources/src/main/resources/etc/appprops/aaiconfig.properties b/aai-resources/src/main/resources/etc/appprops/aaiconfig.properties index 4bcb2f3..025726c 100644 --- a/aai-resources/src/main/resources/etc/appprops/aaiconfig.properties +++ b/aai-resources/src/main/resources/etc/appprops/aaiconfig.properties @@ -87,7 +87,8 @@ aai.forceDel.protected.nt.list=cloud-region aai.forceDel.protected.edge.count=10 aai.forceDel.protected.descendant.count=10 -aai.dmaap.workload.enableEventProcessing=true +# dmaap is deprecated now kafka is used +# aai.dmaap.workload.enableEventProcessing=true aai.realtime.clients=RO,SDNC,MSO,SO aai.jms.enable=false diff --git a/aai-resources/src/main/resources/etc/appprops/error.properties b/aai-resources/src/main/resources/etc/appprops/error.properties index 86d5337..f600a95 100644 --- a/aai-resources/src/main/resources/etc/appprops/error.properties +++ b/aai-resources/src/main/resources/etc/appprops/error.properties @@ -154,7 +154,9 @@ AAI_7202=5:4:ERROR:7202:500:3002:Error getting connection to odl:200 #AAI_7206=5:4:ERROR:7206:500:3002:Invalid data returned from ODL:300 #--- DMaaP related errors -AAI_7304=4:5:ERROR:7304:500:3002:Error reaching DMaaP to send event:200 +# DMaaP is deprecated now +# Replaced with Kafka +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 diff --git a/aai-resources/src/main/resources/logback.xml b/aai-resources/src/main/resources/logback.xml index 848c675..2b8791a 100644 --- a/aai-resources/src/main/resources/logback.xml +++ b/aai-resources/src/main/resources/logback.xml @@ -141,7 +141,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> @@ -152,7 +152,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> @@ -163,7 +163,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> @@ -174,7 +174,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> @@ -282,7 +282,7 @@ <appender-ref ref="asyncMETRIC"/> </logger> <logger name="org.onap.aai.aailog.logs.AaiDmaapMetricLog" level="INFO"> - <appender-ref ref="dmaapAAIEventConsumerMetric"/> + <appender-ref ref="kafkaAAIEventConsumerMetric"/> </logger> <logger name="org.onap.aai.logging.ErrorLogHelper" level="WARN"> <appender-ref ref="asyncERROR"/> @@ -291,13 +291,13 @@ <appender-ref ref="asynctranslog" /> </logger> - <logger name="org.onap.aai.dmaap" level="DEBUG" additivity="false"> - <appender-ref ref="dmaapAAIEventConsumer" /> - <appender-ref ref="dmaapAAIEventConsumerDebug" /> + <logger name="org.onap.aai.kafka" level="DEBUG" additivity="false"> + <appender-ref ref="kafkaAAIEventConsumer" /> + <appender-ref ref="kafkaAAIEventConsumerDebug" /> </logger> <logger name="com.att.nsa.mr" level="INFO" > - <appender-ref ref="dmaapAAIEventConsumerInfo" /> + <appender-ref ref="kafkaAAIEventConsumerInfo" /> </logger> <root level="DEBUG"> 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> <!-- ============================================================================ --> @@ -48,7 +48,7 @@ <staging.path>/content/repositories/staging/</staging.path> <!-- GMaven plugin uses this property to figure out the name of the docker tag --> <aai.project.version>${project.version}</aai.project.version> - <aai.common.version>1.13.3</aai.common.version> + <aai.common.version>1.13.6</aai.common.version> <aai.schema.service.version>1.12.3</aai.schema.service.version> </properties> <build> |