diff options
27 files changed, 51 insertions, 762 deletions
diff --git a/src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/DMaaPCambriaClientFactory.java b/src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/DMaaPCambriaClientFactory.java index ff46ce3..fedb14f 100644 --- a/src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/DMaaPCambriaClientFactory.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/DMaaPCambriaClientFactory.java @@ -54,7 +54,6 @@ public class DMaaPCambriaClientFactory { * @param hostList * A comma separated list of hosts to use to connect to Cambria. * You can include port numbers (3904 is the default). For - * example, "ueb01hydc.it.att.com:8080,ueb02hydc.it.att.com" * * @param topic * The topic to consume @@ -171,7 +170,6 @@ public class DMaaPCambriaClientFactory { * @param hostList * A comma separated list of hosts to use to connect to Cambria. * You can include port numbers (3904 is the default). For - * example, "ueb01hydc.it.att.com:8080,ueb02hydc.it.att.com" * @param topic * The topic to consume * @param consumerGroup diff --git a/src/main/java/org/onap/dmaap/dmf/mr/service/MMService.java b/src/main/java/org/onap/dmaap/dmf/mr/service/MMService.java index 1bd28e7..fdee82b 100644 --- a/src/main/java/org/onap/dmaap/dmf/mr/service/MMService.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/service/MMService.java @@ -35,7 +35,6 @@ import com.att.nsa.security.ReadWriteSecuredResource.AccessDeniedException; /** * Contains the logic for executing calls to the Mirror Maker agent tool. * - * @author <a href="mailto:kawsar.jahan@att.com">Kawsar Jahan</a> * * @since May 25, 2016 */ diff --git a/src/main/java/org/onap/dmaap/dmf/mr/service/impl/ApiKeysServiceImpl.java b/src/main/java/org/onap/dmaap/dmf/mr/service/impl/ApiKeysServiceImpl.java index 47da903..d9559bb 100644 --- a/src/main/java/org/onap/dmaap/dmf/mr/service/impl/ApiKeysServiceImpl.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/service/impl/ApiKeysServiceImpl.java @@ -171,7 +171,7 @@ public class ApiKeysServiceImpl implements ApiKeysService { { String body = "\n" + "Your email address was provided as the creator of new API key \"" + apiKey + "\".\n" + "\n" + "If you did not make this request, please let us know." - + " See http://sa2020.it.att.com:8888 for contact information, " + "but don't worry -" + + "but don't worry -" + " the API key is useless without the information below, which has been provided " + "only to you.\n" + "\n\n" + "For API key \"" + apiKey + "\", use API key secret:\n\n\t" + sharedSecret + "\n\n" + "Note that it's normal to share the API key" diff --git a/src/main/java/org/onap/dmaap/dmf/mr/utils/Emailer.java b/src/main/java/org/onap/dmaap/dmf/mr/utils/Emailer.java index cb4fcdc..51de9e2 100644 --- a/src/main/java/org/onap/dmaap/dmf/mr/utils/Emailer.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/utils/Emailer.java @@ -156,7 +156,7 @@ public class Emailer makeSetting ( prop, "mail.smtp.port", kSetting_SmtpServerPort, 587 ); prop.put ( "mail.smtp.socketFactory.fallback", "false" ); prop.put ( "mail.smtp.quitwait", "false" ); - makeSetting ( prop, "mail.smtp.host", kSetting_SmtpServer, "smtp.it.att.com" ); + makeSetting ( prop, "mail.smtp.host", kSetting_SmtpServer, "smtp.it.onap.com" ); makeSetting ( prop, "mail.smtp.auth", kSetting_SmtpServerUseAuth, true ); makeSetting ( prop, "mail.smtp.starttls.enable", kSetting_SmtpServerSsl, true ); @@ -176,7 +176,7 @@ public class Emailer final Message msg = new MimeMessage ( session ); final InternetAddress from = new InternetAddress ( - getSetting ( kSetting_MailFromEmail, "team@sa2020.it.att.com" ), + getSetting ( kSetting_MailFromEmail, "team@dmaap.mr.onap.com" ), getSetting ( kSetting_MailFromName, "The GFP/SA2020 Team" ) ); msg.setFrom ( from ); msg.setReplyTo ( new InternetAddress[] { from } ); diff --git a/src/main/resources/DMaaPUrl.properties b/src/main/resources/DMaaPUrl.properties index a0cf9ab..2f4dee2 100644 --- a/src/main/resources/DMaaPUrl.properties +++ b/src/main/resources/DMaaPUrl.properties @@ -36,4 +36,4 @@ url=http://hltd436.hydc.sbc.com:8080/DMaaP/dmaaprest/ date=2015-11-23T8:56:19-0700 # topic -topicName=com.att.app.dmaap.mr.sharjeel
\ No newline at end of file +topicName=org.onap.dmaap.mr.testtopic
\ No newline at end of file diff --git a/src/main/resources/dme2testcase.properties b/src/main/resources/dme2testcase.properties index ad38c43..a1b09f6 100644 --- a/src/main/resources/dme2testcase.properties +++ b/src/main/resources/dme2testcase.properties @@ -23,33 +23,33 @@ Version =1.0 Environment =TEST Latitude =37.66 Longitude =-122.096839 -ServiceName =dmaap-v1.dev.dmaap.dt.saat.acsi.att.com/apiKeys +ServiceName =org.onap.dmaap.mr/apiKeys Partner =MR1 #producerConsumer SubContextPathproducer =/events/ SubContextPathConsumer=/events/ group=group -id=rk229m@csp.att.com +id=user@me.dmaap.onap.com #filter SubContextPathConsumerFilter=/events/ -filterType=filter={"class":"Equals", "field":"email", "value":"ai039a@att.com"} +filterType=filter={"class":"Equals", "field":"email", "value":"test@onap.com"} #topics subContextPathGetAllTopic=/topics subContextPathGetOneTopic=/topics/ -SubContextPathGetPublisher=/topics/com.att.app.dmaap.mr.sharjeel/producers -SubContextPathGetPermitPublisher=/topics/com.att.app.dmaap.mr.sharjeel/producers/rk229m@csp.att.com -SubContextPathGetConsumer=/topics/com.att.app.dmaap.mr.sharjeel/consumers +SubContextPathGetPublisher=/topics/test/producers +SubContextPathGetPermitPublisher=/topics/test/producers/test@onap.com +SubContextPathGetConsumer=/topics/test/consumers SubContextPathCreateTopic=/topics/create -SubContextPathGetPermitConsumer=/topics/com.att.app.dmaap.mr.sharjeel/consumers/rk229m@att.com -newTopic=com.att.dmaap.mr.junittestingtopic +SubContextPathGetPermitConsumer=/topics/test/consumers/test@onap.com +newTopic=org.onap.dmaap.mr.junittestingtopic topicDescription=new topic creation partition=1 replication=1 txenabled=true -deleteTopic=com.att.dmaap.mr.deleteTopic +deleteTopic=org.onap.dmaap.mr.deleteTopic #Admin @@ -75,7 +75,7 @@ MethodTypePost =POST MethodTypeGet=GET MethodTypePut=PUT MethodTypeDelete=DELETE -message ={"id": "example@att.com"} +message ={"id": "test@onap.com"} user=<user_id> password=<password> diff --git a/src/main/resources/endpoint.properties b/src/main/resources/endpoint.properties index 34e222f..63742ef 100644 --- a/src/main/resources/endpoint.properties +++ b/src/main/resources/endpoint.properties @@ -22,7 +22,7 @@ Latitude =37.66 Longitude =-122.096839 Version =1.0.0 -ServiceName =com.att.acsi.saat.dt.dmaap.dev.demo1 +ServiceName =org.onap.dmaap.dmaap.demo1 Environment =DEV RouteOffer =LA HostName =hltd436.hydc.sbc.com diff --git a/src/main/resources/routes.conf b/src/main/resources/routes.conf deleted file mode 100644 index ccaa94d..0000000 --- a/src/main/resources/routes.conf +++ /dev/null @@ -1,106 +0,0 @@ -package com.att.nsa.cambria.endpoints - -# -# We need to deprecate the original non-versioned paths and use /v1/ for them. -# Non-versioned paths will be supported "permanently." -# - -# -# metrics -# -GET /metrics CambriaMetrics.get -GET /metrics/{metricName} CambriaMetrics.getMetricByName - -GET /v1/metrics CambriaMetrics.get -GET /v1/metrics/{metricName} CambriaMetrics.getMetricByName - -# -# get and post events -# -GET /events/{topic}/{consumerGroup}/{clientId} CambriaEvents.getEvents -POST /events/{topic} CambriaEvents.pushEvents -POST /events/{topic}/{partition} CambriaEvents.pushEvents - -GET /v1/events/{topic}/{consumerGroup}/{clientId} CambriaEvents.getEvents -POST /v1/events/{topic} CambriaEvents.pushEvents -POST /v1/events/{topic}/{partition} CambriaEvents.pushEvents - - -# -# api keys -# -GET /apiKeys CambriaApiKeys.getAllApiKeys -POST /apiKeys/create CambriaApiKeys.createApiKey -GET /apiKeys/{apiKey} CambriaApiKeys.getApiKey -PATCH /apiKeys/{apiKey} CambriaApiKeys.updateApiKey -DELETE /apiKeys/{apiKey} CambriaApiKeys.deleteApiKey - -GET /v1/apiKeys CambriaApiKeys.getAllApiKeys -POST /v1/apiKeys/create CambriaApiKeys.createApiKey -GET /v1/apiKeys/{apiKey} CambriaApiKeys.getApiKey -PATCH /v1/apiKeys/{apiKey} CambriaApiKeys.updateApiKey -DELETE /v1/apiKeys/{apiKey} CambriaApiKeys.deleteApiKey - -# -# topics -# -POST /topics/create CambriaTopics.createTopic -GET /topics CambriaTopics.getTopics -GET /topics/{topicName} CambriaTopics.getTopic -DELETE /topics/{topicName} CambriaTopics.deleteTopic - -POST /v1/topics/create CambriaTopics.createTopic -GET /v1/topics CambriaTopics.getTopics -GET /v1/topics/{topicName} CambriaTopics.getTopic -DELETE /v1/topics/{topicName} CambriaTopics.deleteTopic - -# -# topic permissions -# -GET /topics/{topicName}/producers CambriaTopics.getPublishersByTopicName -PUT /topics/{topicName}/producers/{producerId} CambriaTopics.permitPublisherForTopic -DELETE /topics/{topicName}/producers/{producerId} CambriaTopics.denyPublisherForTopic - -GET /topics/{topicName}/consumers CambriaTopics.getConsumersByTopicName -PUT /topics/{topicName}/consumers/{consumerId} CambriaTopics.permitConsumerForTopic -DELETE /topics/{topicName}/consumers/{consumerId} CambriaTopics.denyConsumerForTopic - -GET /v1/topics/{topicName}/producers CambriaTopics.getPublishersByTopicName -PUT /v1/topics/{topicName}/producers/{producerId} CambriaTopics.permitPublisherForTopic -DELETE /v1/topics/{topicName}/producers/{producerId} CambriaTopics.denyPublisherForTopic - -GET /v1/topics/{topicName}/consumers CambriaTopics.getConsumersByTopicName -PUT /v1/topics/{topicName}/consumers/{consumerId} CambriaTopics.permitConsumerForTopic -DELETE /v1/topics/{topicName}/consumers/{consumerId} CambriaTopics.denyConsumerForTopic - -# -# Admin -# -GET /admin/consumerCache CambriaAdmin.showConsumerCache -POST /admin/dropConsumerCache CambriaAdmin.dropConsumerCache - -GET /v1/admin/consumerCache CambriaAdmin.showConsumerCache -POST /v1/admin/dropConsumerCache CambriaAdmin.dropConsumerCache - -############################################################################### -# -# UI routes don't need to be versioned -# - -# -# UI -# -GET / CambriaUi.hello -GET /ui/apikeys CambriaUi.getApiKeysTable -GET /ui/apikeys/{apiKey} CambriaUi.getApiKey -GET /ui/topics CambriaUi.getTopicsTable -GET /ui/topics/{topic} CambriaUi.getTopic - - -# typical static file paths -GET /css/ staticDir:css -GET /js/ staticDir:js -GET /images/ staticDir:images -GET /font/ staticDir:font -GET /favicon.ico staticFile:images/attLogo.gif -GET /font-awesome/ staticDir:font-awesome diff --git a/src/main/scripts/cambria.sh b/src/main/scripts/cambria.sh deleted file mode 100644 index f74aa7b..0000000 --- a/src/main/scripts/cambria.sh +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/sh -#******************************************************************************* -# ============LICENSE_START======================================================= -# org.onap.dmaap -# ================================================================================ -# Copyright © 2017 AT&T Intellectual Property. All rights reserved. -# ================================================================================ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# ============LICENSE_END========================================================= -# -# ECOMP is a trademark and service mark of AT&T Intellectual Property. -# -#******************************************************************************* - -# switched this from CAMBRIA_API_HOME, which should be declared in the env. -# harmless to overwrite it here, but it's confusing to do so. -BASE_DIR=`dirname "$0"`/.. - -# use JAVA_HOME if provided -if [ -n "${CAMBRIA_JAVA_HOME}" ]; then - JAVA=${CAMBRIA_JAVA_HOME}/bin/java -elif [ -n "${JAVA_HOME}" ]; then - JAVA=${JAVA_HOME}/bin/java -else - JAVA=java -fi - -# use the logs dir set in environment, or the installation's logs dir if not set -if [ -z "$CAMBRIA_LOGS_HOME" ]; then - CAMBRIA_LOGS_HOME=$BASE_DIR/logs -fi - -mkdir -p ${CAMBRIA_LOGS_HOME} -# run java. The classpath is the etc dir for config files, and the lib dir -# for all the jars. -# -# don't pipe stdout/stderr to /dev/null here - some diagnostic info is available only there. -# also don't assume the run is in the background. the caller should take care of that. -# -$JAVA -cp ${BASE_DIR}/etc:${BASE_DIR}/lib/* com.att.nsa.cambria.CambriaApiServer $* >${CAMBRIA_LOGS_HOME}/console.log 2>&1 diff --git a/src/main/scripts/cambriaJsonPublisher.sh b/src/main/scripts/cambriaJsonPublisher.sh deleted file mode 100644 index 9dbc4c7..0000000 --- a/src/main/scripts/cambriaJsonPublisher.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash -#******************************************************************************* -# ============LICENSE_START======================================================= -# org.onap.dmaap -# ================================================================================ -# Copyright © 2017 AT&T Intellectual Property. All rights reserved. -# ================================================================================ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# ============LICENSE_END========================================================= -# -# ECOMP is a trademark and service mark of AT&T Intellectual Property. -# -#******************************************************************************* - -# -# act as a simple cambria publisher, requires wget -# -# usage: -# cambriaPublisher <broker> <topic> -# - -KEY=$3 -if [ "$3" == "" ] -then - KEY=`hostname -f` -fi - -while read LINE -do - wget -q --header "Content-Type: application/json" --post-data="{ \"cambria.partition\":\"$KEY\", \"msg\":\"$LINE\" }" -O - $1/events/$2 >/dev/null -done - diff --git a/src/main/scripts/cambriaMonitor.sh b/src/main/scripts/cambriaMonitor.sh deleted file mode 100644 index 0a8727c..0000000 --- a/src/main/scripts/cambriaMonitor.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash -#******************************************************************************* -# ============LICENSE_START======================================================= -# org.onap.dmaap -# ================================================================================ -# Copyright © 2017 AT&T Intellectual Property. All rights reserved. -# ================================================================================ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# ============LICENSE_END========================================================= -# -# ECOMP is a trademark and service mark of AT&T Intellectual Property. -# -#******************************************************************************* - -# -# act as a simple cambria consumer, requires wget -# -# usage: -# cambriaMonitor <broker> <topic> <group> <id> <timeout> -# - -while : -do - wget -q -O - $1/events/$2/$3/$4?timeout=$5\&pretty=1 - if [ $? -ne 0 ] - then - sleep 10 - fi - echo -done - diff --git a/src/main/scripts/cambriaMonitorWithAuth.sh b/src/main/scripts/cambriaMonitorWithAuth.sh deleted file mode 100644 index 4ee2908..0000000 --- a/src/main/scripts/cambriaMonitorWithAuth.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/bash -#******************************************************************************* -# ============LICENSE_START======================================================= -# org.onap.dmaap -# ================================================================================ -# Copyright © 2017 AT&T Intellectual Property. All rights reserved. -# ================================================================================ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# ============LICENSE_END========================================================= -# -# ECOMP is a trademark and service mark of AT&T Intellectual Property. -# -#******************************************************************************* - -# -# act as a simple cambria consumer, requires wget -# -# usage: -# cambriaMonitor <broker> <topic> <group> <id> <timeout> -# - -while : -do - DATE=`date` - SIGNATURE=`echo -n "$DATE" | openssl sha1 -hmac $CAMBRIA_APISECRET -binary | openssl base64` - - wget -q --header "X-CambriaAuth: $CAMBRIA_APIKEY:$SIGNATURE" --header "X-CambriaDate: $DATE" -O - $1/events/$2/$3/$4?timeout=$5\&pretty=1 - if [ $? -ne 0 ] - then - sleep 10 - fi - echo -done - diff --git a/src/main/scripts/cambriaSimpleTextPubWithAuth.sh b/src/main/scripts/cambriaSimpleTextPubWithAuth.sh deleted file mode 100644 index 1623726..0000000 --- a/src/main/scripts/cambriaSimpleTextPubWithAuth.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash -#******************************************************************************* -# ============LICENSE_START======================================================= -# org.onap.dmaap -# ================================================================================ -# Copyright © 2017 AT&T Intellectual Property. All rights reserved. -# ================================================================================ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# ============LICENSE_END========================================================= -# -# ECOMP is a trademark and service mark of AT&T Intellectual Property. -# -#******************************************************************************* - -# -# act as a simple cambria publisher, requires wget -# -# usage: -# cambriaPublisher <broker> <topic> -# - -DATE=`date` -SIGNATURE=`echo -n "$DATE" | openssl sha1 -hmac $CAMBRIA_APISECRET -binary | openssl base64` - -while read LINE -do - wget -q --header "Content-Type: text/plain" --header "X-CambriaAuth: $CAMBRIA_APIKEY:$SIGNATURE" --header "X-CambriaDate: $DATE" --post-data="$LINE" -O - $1/events/$2 >/dev/null -done - diff --git a/src/main/scripts/cambriaSimpleTextPublisher.sh b/src/main/scripts/cambriaSimpleTextPublisher.sh deleted file mode 100644 index 4aacd8a..0000000 --- a/src/main/scripts/cambriaSimpleTextPublisher.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash -#******************************************************************************* -# ============LICENSE_START======================================================= -# org.onap.dmaap -# ================================================================================ -# Copyright © 2017 AT&T Intellectual Property. All rights reserved. -# ================================================================================ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# ============LICENSE_END========================================================= -# -# ECOMP is a trademark and service mark of AT&T Intellectual Property. -# -#******************************************************************************* - -# -# act as a simple cambria publisher, requires wget -# -# usage: -# cambriaPublisher <broker> <topic> -# - -while read LINE -do - wget -q --header "Content-Type: text/plain" --post-data="$LINE" -O - $1/events/$2 >/dev/null -done - diff --git a/src/main/scripts/cambriaTool.sh b/src/main/scripts/cambriaTool.sh deleted file mode 100644 index a9d6e15..0000000 --- a/src/main/scripts/cambriaTool.sh +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/sh -#******************************************************************************* -# ============LICENSE_START======================================================= -# org.onap.dmaap -# ================================================================================ -# Copyright © 2017 AT&T Intellectual Property. All rights reserved. -# ================================================================================ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# ============LICENSE_END========================================================= -# -# ECOMP is a trademark and service mark of AT&T Intellectual Property. -# -#******************************************************************************* - -# switched this from CAMBRIA_API_HOME, which should be declared in the env. -# harmless to overwrite it here, but it's confusing to do so. -BASE_DIR=`dirname "$0"`/.. - -# determin a path separator that works for this platform -PATHSEP=":" -case "$(uname -s)" in - - Darwin) - ;; - - Linux) - ;; - - CYGWIN*|MINGW32*|MSYS*) - PATHSEP=";" - ;; - - *) - ;; -esac - -# use JAVA_HOME if provided -if [ -n "${CAMBRIA_JAVA_HOME}" ]; then - JAVA=${CAMBRIA_JAVA_HOME}/bin/java -elif [ -n "${JAVA_HOME}" ]; then - JAVA=${JAVA_HOME}/bin/java -else - JAVA=java -fi - -$JAVA -cp ${BASE_DIR}/etc${PATHSEP}${BASE_DIR}/lib/* com.att.nsa.cambria.tools.ConfigTool $* diff --git a/src/main/scripts/swmpkgclean.sh b/src/main/scripts/swmpkgclean.sh deleted file mode 100644 index 7e6bc51..0000000 --- a/src/main/scripts/swmpkgclean.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash -#******************************************************************************* -# ============LICENSE_START======================================================= -# org.onap.dmaap -# ================================================================================ -# Copyright © 2017 AT&T Intellectual Property. All rights reserved. -# ================================================================================ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# ============LICENSE_END========================================================= -# -# ECOMP is a trademark and service mark of AT&T Intellectual Property. -# -#******************************************************************************* - -# SWM can only store a finite amount of packages in its repository, so this script deletes the oldest package. -# This script is run by Jenkins after the build is finished (post SWM upload). - -SWM_COMPONENT="com.att.nsa:msgrtr" - -SWM_PKGS=`/opt/app/swm/aftswmcli/bin/swmcli "component pkglist -c $SWM_COMPONENT -df -dh -dj -sui"` -SWM_PKGS_COUNT=`echo "$SWM_PKGS" | wc -l` -SWM_PKGS_OLDEST=`echo "$SWM_PKGS" | head -1` -SWM_PKGS_MAX_COUNT=2 - -if [ $SWM_PKGS_COUNT > $SWM_PKGS_MAX_COUNT ] -then - SWM_PKG_OLDEST_VERSION=`echo $SWM_PKGS_OLDEST | awk '{print $2}'` - - # Delete the oldest package for this component from the SWM repository - /opt/app/swm/aftswmcli/bin/swmcli "component pkgdelete -c $SWM_COMPONENT:$SWM_PKG_OLDEST_VERSION" -else - echo "No need to clean up SWM, package count ($SWM_PKGS_COUNT) is below threshold ($SWM_PKGS_MAX_COUNT)" -fi diff --git a/src/test/java/org/onap/dmaap/mr/cambria/beans/ApiKeyBeanTest.java b/src/test/java/org/onap/dmaap/mr/cambria/beans/ApiKeyBeanTest.java index beec641..6fbff02 100644 --- a/src/test/java/org/onap/dmaap/mr/cambria/beans/ApiKeyBeanTest.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/beans/ApiKeyBeanTest.java @@ -44,7 +44,7 @@ public class ApiKeyBeanTest { @Test public void testGetEmail() { - ApiKeyBean bean = new ApiKeyBean("hs647a@att.com", "testing bean"); + ApiKeyBean bean = new ApiKeyBean("user@onap.com", "testing bean"); bean.getEmail(); diff --git a/src/test/java/org/onap/dmaap/mr/cambria/beans/ApiKeyBeanTest2.java b/src/test/java/org/onap/dmaap/mr/cambria/beans/ApiKeyBeanTest2.java index 8f77807..46ebad0 100644 --- a/src/test/java/org/onap/dmaap/mr/cambria/beans/ApiKeyBeanTest2.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/beans/ApiKeyBeanTest2.java @@ -44,9 +44,9 @@ public class ApiKeyBeanTest2 { @Test public void testSetEmail() { - ApiKeyBean bean = new ApiKeyBean("hs647a@att.com", "testing bean"); + ApiKeyBean bean = new ApiKeyBean("user@onap.com", "testing bean"); - bean.setEmail("rs857c@att.com"); + bean.setEmail("user@onap.com"); String trueValue = "True"; assertTrue(trueValue.equalsIgnoreCase("True")); diff --git a/src/test/java/org/onap/dmaap/mr/cambria/beans/ApiKeyBeanTest3.java b/src/test/java/org/onap/dmaap/mr/cambria/beans/ApiKeyBeanTest3.java index 108b5fb..0d62ee4 100644 --- a/src/test/java/org/onap/dmaap/mr/cambria/beans/ApiKeyBeanTest3.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/beans/ApiKeyBeanTest3.java @@ -44,7 +44,7 @@ public class ApiKeyBeanTest3 { @Test public void testGetDescription() { - ApiKeyBean bean = new ApiKeyBean("hs647a@att.com", "testing bean"); + ApiKeyBean bean = new ApiKeyBean("user@onap.com", "testing bean"); bean.getDescription(); diff --git a/src/test/java/org/onap/dmaap/mr/cambria/beans/ApiKeyBeanTest4.java b/src/test/java/org/onap/dmaap/mr/cambria/beans/ApiKeyBeanTest4.java index cae2c94..2ea35bd 100644 --- a/src/test/java/org/onap/dmaap/mr/cambria/beans/ApiKeyBeanTest4.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/beans/ApiKeyBeanTest4.java @@ -44,7 +44,7 @@ public class ApiKeyBeanTest4 { @Test public void testSetDescription() { - ApiKeyBean bean = new ApiKeyBean("hs647a@att.com", "testing bean"); + ApiKeyBean bean = new ApiKeyBean("user@onap.com", "testing bean"); bean.setDescription("new testing description"); diff --git a/src/test/java/org/onap/dmaap/mr/cambria/beans/ApiKeyBeanTest5.java b/src/test/java/org/onap/dmaap/mr/cambria/beans/ApiKeyBeanTest5.java index 3e095c0..d13a703 100644 --- a/src/test/java/org/onap/dmaap/mr/cambria/beans/ApiKeyBeanTest5.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/beans/ApiKeyBeanTest5.java @@ -44,7 +44,7 @@ public class ApiKeyBeanTest5 { @Test public void testGetSharedSecret() { - ApiKeyBean bean = new ApiKeyBean("hs647a@att.com", "testing bean"); + ApiKeyBean bean = new ApiKeyBean("user@onap.com", "testing bean"); bean.getSharedSecret(); diff --git a/src/test/java/org/onap/dmaap/mr/cambria/beans/ApiKeyBeanTest6.java b/src/test/java/org/onap/dmaap/mr/cambria/beans/ApiKeyBeanTest6.java index 871e2e7..21cfc43 100644 --- a/src/test/java/org/onap/dmaap/mr/cambria/beans/ApiKeyBeanTest6.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/beans/ApiKeyBeanTest6.java @@ -44,7 +44,7 @@ public class ApiKeyBeanTest6 { @Test public void testGetKey() { - ApiKeyBean bean = new ApiKeyBean("hs647a@att.com", "testing bean"); + ApiKeyBean bean = new ApiKeyBean("user@onap.com", "testing bean"); bean.getKey(); diff --git a/src/test/java/org/onap/dmaap/mr/test/dmaap/DMaapTopicTest.java b/src/test/java/org/onap/dmaap/mr/test/dmaap/DMaapTopicTest.java index ec1a63a..98c5ab3 100644 --- a/src/test/java/org/onap/dmaap/mr/test/dmaap/DMaapTopicTest.java +++ b/src/test/java/org/onap/dmaap/mr/test/dmaap/DMaapTopicTest.java @@ -51,26 +51,6 @@ public class DMaapTopicTest { DmaapApiKeyTest keyInstance = new DmaapApiKeyTest(); - public void createTopic(String name) { - if (!topicExist(name)) { - TopicBean topicbean = new TopicBean(); - topicbean.setDescription("creating topic"); - topicbean.setPartitionCount(1); - topicbean.setReplicationCount(1); - topicbean.setTopicName(name); - topicbean.setTransactionEnabled(true); - target = client.target(url); - target = target.path("/topics/create"); - JSONObject jsonObj = keyInstance.returnKey(new ApiKeyBean("nm254w@att.com", "topic creation")); - topicapikey = (String) jsonObj.get("key"); - topicsecretKey = (String) jsonObj.get("secret"); - serverCalculatedSignature = sha1HmacSigner.sign(date, topicsecretKey); - Response response = target.request().header("X-CambriaAuth", topicapikey + ":" + serverCalculatedSignature) - .header("X-CambriaDate", date).post(Entity.json(topicbean)); - keyInstance.assertStatus(response); - } - - } public boolean topicExist(String topicName) { target = target.path("/topics/" + topicName); @@ -165,47 +145,6 @@ public class DMaapTopicTest { LOGGER.info("Successfully returned after getting all the publishers" + topicName); } - public void testPermitPublisherForTopic() { - LOGGER.info("test case permit user for topic " + topicName); - JSONObject jsonObj = keyInstance.returnKey(new ApiKeyBean("ai039a@att.com", "adding user to ")); - String userapikey = (String) jsonObj.get("key"); - createTopic(topicName); - // adding user to a topic// - target = client.target(url); - target = target.path("/topics/"); - target = target.path(topicName); - target = target.path("/producers/"); - target = target.path(userapikey); - Response response = target.request().header("X-CambriaAuth", topicapikey + ":" + serverCalculatedSignature) - .header("X-CambriaDate", date).put(Entity.json("")); - keyInstance.assertStatus(response); - LOGGER.info("successfully returned after permiting the user for topic " + topicName); - } - - public void testDenyPublisherForTopic() { - LOGGER.info("test case denying user for topic " + topicName); - JSONObject jsonObj = keyInstance.returnKey(new ApiKeyBean("ai039a@att.com", "adding user to ")); - String userapikey = (String) jsonObj.get("key"); - createTopic(topicName); - // adding user to a topic// - target = client.target(url); - target = target.path("/topics/"); - target = target.path(topicName); - target = target.path("/producers/"); - target = target.path(userapikey); - target.request().header("X-CambriaAuth", topicapikey + ":" + serverCalculatedSignature) - .header("X-CambriaDate", date).put(Entity.json("")); - // deleting user who is just added// - target = client.target(url); - target = target.path("/topics/"); - target = target.path(topicName); - target = target.path("/producers/"); - target = target.path(userapikey); - Response response2 = target.request().header("X-CambriaAuth", topicapikey + ":" + serverCalculatedSignature) - .header("X-CambriaDate", date).delete(); - keyInstance.assertStatus(response2); - LOGGER.info("successfully returned after denying the user for topic " + topicName); - } public void testConsumerForTopic() { LOGGER.info("test case get all consumers for topic: " + topicName); @@ -221,47 +160,6 @@ public class DMaapTopicTest { LOGGER.info("Successfully returned after getting all the consumers" + topicName); } - public void testPermitConsumerForTopic() { - LOGGER.info("test case get all consumer for topic: " + topicName); - // creating user for adding to topic// - JSONObject jsonObj = keyInstance.returnKey(new ApiKeyBean("ai039a@att.com", "adding user to ")); - String userapikey = (String) jsonObj.get("key"); - createTopic(topicName); - // adding user to a topic// - target = client.target(url); - target = target.path("/topics/"); - target = target.path(topicName); - target = target.path("/consumers/"); - target = target.path(userapikey); - Response response = target.request().header("X-CambriaAuth", topicapikey + ":" + serverCalculatedSignature) - .header("X-CambriaDate", date).put(Entity.json("")); - keyInstance.assertStatus(response); - LOGGER.info("Successfully returned after getting all the consumers" + topicName); - } - public void testDenyConsumerForTopic() { - LOGGER.info("test case denying consumer for topic " + topicName); - // creating user for adding and deleting from topic// - JSONObject jsonObj = keyInstance.returnKey(new ApiKeyBean("ai039a@att.com", "adding user to ")); - String userapikey = (String) jsonObj.get("key"); - createTopic(topicName); - // adding user to a topic// - target = client.target(url); - target = target.path("/topics/"); - target = target.path(topicName); - target = target.path("/consumers/"); - target = target.path(userapikey); - target.request().header("X-CambriaAuth", topicapikey + ":" + serverCalculatedSignature) - .header("X-CambriaDate", date).put(Entity.json("")); - // deleting user who is just added// - target = client.target(url); - target = target.path("/topics/"); - target = target.path(topicName); - target = target.path("/consumers/"); - target = target.path(userapikey); - Response response2 = target.request().header("X-CambriaAuth", topicapikey + ":" + serverCalculatedSignature) - .header("X-CambriaDate", date).delete(); - keyInstance.assertStatus(response2); - LOGGER.info("successfully returned after denying the consumer for topic " + topicName); - }*/ +*/ } diff --git a/src/test/java/org/onap/dmaap/mr/test/dmaap/DmaapApiKeyTest.java b/src/test/java/org/onap/dmaap/mr/test/dmaap/DmaapApiKeyTest.java index f40025a..2c97a0b 100644 --- a/src/test/java/org/onap/dmaap/mr/test/dmaap/DmaapApiKeyTest.java +++ b/src/test/java/org/onap/dmaap/mr/test/dmaap/DmaapApiKeyTest.java @@ -65,13 +65,6 @@ public class DmaapApiKeyTest { return dataObj; } - // 1. create key - public void testCreateKey() { - LOGGER.info("test case create key"); - ApiKeyBean apiKeyBean = new ApiKeyBean("nm254w@att.com", "Creating Api Key."); - returnKey(apiKeyBean); - LOGGER.info("Successfully returned after creating key"); - } public void assertStatus(Response response) { assertTrue(response.getStatus() == HttpStatus.SC_OK); @@ -92,71 +85,7 @@ public class DmaapApiKeyTest { } - // 3. get specific key - public void testSpecificKey() { - LOGGER.info("test case get specific key"); - String apiKey = ""; - ApiKeyBean apiKeyBean = new ApiKeyBean("ai039@att.com", "Creating Api Key."); - - apiKey = (String) returnKey(apiKeyBean).get("key"); - target = client.target(url); - target = target.path("/apiKeys/"); - target = target.path(apiKey); - Response response = target.request().get(); - assertStatus(response); - LOGGER.info("successfully returned after fetching specific key"); - } - - // 4. update key - public void testUpdateKey() { - LOGGER.info("test case update key"); - String apiKey = ""; - String secretKey = ""; - final String serverCalculatedSignature; - final String X_CambriaAuth; - final String X_CambriaDate; - JSONObject jsonObj; - ApiKeyBean apiKeyBean = new ApiKeyBean("ai039@att.com", "Creating Api Key for update"); - ApiKeyBean apiKeyBean1 = new ApiKeyBean("ai03911@att.com", "updating Api Key."); - jsonObj = returnKey(apiKeyBean); - apiKey = (String) jsonObj.get("key"); - secretKey = (String) jsonObj.get("secret"); - - serverCalculatedSignature = sha1HmacSigner.sign(date, secretKey); - X_CambriaAuth = apiKey + ":" + serverCalculatedSignature; - X_CambriaDate = date; - target = client.target(url); - target = target.path("/apiKeys/" + apiKey); - Response response1 = target.request().header("X-CambriaAuth", X_CambriaAuth) - .header("X-CambriaDate", X_CambriaDate).put(Entity.json(apiKeyBean1)); - assertStatus(response1); - LOGGER.info("successfully returned after updating key"); - } - - // 5. delete key - public void testDeleteKey() { - LOGGER.info("test case delete key"); - String apiKey = ""; - String secretKey = ""; - final String serverCalculatedSignature; - final String X_CambriaAuth; - final String X_CambriaDate; - JSONObject jsonObj; - ApiKeyBean apiKeyBean = new ApiKeyBean("ai039@att.com", "Creating Api Key."); - jsonObj = returnKey(apiKeyBean); - apiKey = (String) jsonObj.get("key"); - secretKey = (String) jsonObj.get("secret"); - serverCalculatedSignature = sha1HmacSigner.sign(date, secretKey); - X_CambriaAuth = apiKey + ":" + serverCalculatedSignature; - X_CambriaDate = date; - target = client.target(url); - target = target.path("/apiKeys/" + apiKey); - Response response2 = target.request().header("X-CambriaAuth", X_CambriaAuth) - .header("X-CambriaDate", X_CambriaDate).delete(); - assertStatus(response2); - LOGGER.info("successfully returned after deleting key"); - } */ }
\ No newline at end of file diff --git a/src/test/java/org/onap/dmaap/mr/test/dme2/DME2AdminTest.java b/src/test/java/org/onap/dmaap/mr/test/dme2/DME2AdminTest.java index 3222046..da786ad 100644 --- a/src/test/java/org/onap/dmaap/mr/test/dme2/DME2AdminTest.java +++ b/src/test/java/org/onap/dmaap/mr/test/dme2/DME2AdminTest.java @@ -62,7 +62,7 @@ public class DME2AdminTest extends TestCase { String longitude = props.getProperty("Longitude"); String version = props.getProperty("Version"); String serviceName = props.getProperty("ServiceName"); - serviceName = "dmaap-v1.dev.dmaap.dt.saat.acsi.att.com/admin"; + serviceName = "mr/admin"; String env = props.getProperty("Environment"); String partner = props.getProperty("Partner"); String protocol = props.getProperty("Protocol"); diff --git a/src/test/java/org/onap/dmaap/mr/test/dme2/DME2ApiKeyTest.java b/src/test/java/org/onap/dmaap/mr/test/dme2/DME2ApiKeyTest.java index 54148b2..ad45706 100644 --- a/src/test/java/org/onap/dmaap/mr/test/dme2/DME2ApiKeyTest.java +++ b/src/test/java/org/onap/dmaap/mr/test/dme2/DME2ApiKeyTest.java @@ -63,7 +63,7 @@ public class DME2ApiKeyTest extends TestCase { public void testCreateKey() { LOGGER.info("Create Key test case initiated"); - ApiKeyBean apiKeyBean = new ApiKeyBean("user1@us.att.com", "Creating Api Key.m"); + ApiKeyBean apiKeyBean = new ApiKeyBean("user1@onap.com", "Creating Api Key.m"); System.out.println(url); @@ -125,105 +125,6 @@ public class DME2ApiKeyTest extends TestCase { } } - public void testGetOneKey() {/* - LOGGER.info("Test case get one key initiated"); - ApiKeyBean apiKeyBean = new ApiKeyBean("user1@att.com", "Creating Api Key.m"); - JSONObject jsonObj = new JSONObject(returnKey(apiKeyBean, url, props)); - String apiKey = (String) jsonObj.get("key"); - try { - DME2Client sender = new DME2Client(new URI(url), 5000L); - sender.setAllowAllHttpReturnCodes(true); - sender.setMethod(props.getProperty("MethodTypeGet")); - sender.setSubContext(props.getProperty("SubContextPathGetOneKey") + apiKey); - sender.setPayload(""); - sender.addHeader("content-type", props.getProperty("contenttype")); - sender.setCredentials(props.getProperty("user"), props.getProperty("password")); - - LOGGER.info("Fetching details of api key: " + apiKey); - String reply = sender.sendAndWait(5000L); - System.out.println(reply); - assertTrue(LoadPropertyFile.isValidJsonString(reply)); - LOGGER.info("response =" + reply); - - } catch (DME2Exception e) { - e.printStackTrace(); - } catch (URISyntaxException e) { - e.printStackTrace(); - } catch (Exception e) { - e.printStackTrace(); - } - */} - - // ............. test case update key is not applicable in - // DME2.................// - public void testUpdateKey() {/* - ApiKeyBean apiKeyBean = new ApiKeyBean("user1@att.com", "Creating Api Key.m"); - - JSONObject jsonObj = new JSONObject(returnKey(apiKeyBean, url, props)); - String apiKey = (String) jsonObj.get("key"); - try { - DME2Client sender = new DME2Client(new URI(url), 5000L); - sender.setAllowAllHttpReturnCodes(true); - String p = props.getProperty("MethodTypePut"); - sender.setMethod(p); - String s = props.getProperty("SubContextPathUpdateKeys") + apiKey; - sender.setSubContext(s); - - String jsonStringApiBean = new ObjectMapper() - .writeValueAsString(new ApiKeyBean("user1@att.com", "updating key")); - sender.setPayload(jsonStringApiBean); - System.out.println(jsonStringApiBean); - String c = props.getProperty("contenttype"); - sender.addHeader("content-type", c); - sender.setCredentials(props.getProperty("keyUser"), props.getProperty("keyPass")); - System.out.println("creating ApiKey"); - String reply = sender.sendAndWait(5000L); - assertNotNull(reply); - System.out.println("response =" + reply); - - } catch (DME2Exception e) { - e.printStackTrace(); - } catch (URISyntaxException e) { - e.printStackTrace(); - } catch (Exception e) { - e.printStackTrace(); - } - */} - - // ............. test case delete key is not applicable in - // DME2.................// - - public void testDeleteKey() {/* - ApiKeyBean apiKeyBean = new ApiKeyBean("user1@att.com", "Creating Api Key.m"); - - JSONObject jsonObj = new JSONObject(returnKey(apiKeyBean, url, props)); - String apiKey = (String) jsonObj.get("key"); - try { - DME2Client sender = new DME2Client(new URI(url), 5000L); - sender.setAllowAllHttpReturnCodes(true); - String p = props.getProperty("MethodTypeDelete"); - sender.setMethod(p); - String s = props.getProperty("SubContextPathDeleteteKeys") + apiKey; - sender.setSubContext(s); - - sender.setPayload(""); // System.out.println(jsonStringApiBean); - String c = props.getProperty("contenttype"); - sender.addHeader("content-type", c); - sender.setCredentials(props.getProperty("keyUser"), props.getProperty("keyPass")); - - System.out.println("creating ApiKey"); - String reply = sender.sendAndWait(5000L); - assertNotNull(reply); - System.out.println("response =" + reply); - - } catch (DME2Exception e) { - e.printStackTrace(); - } catch (URISyntaxException e) { - e.printStackTrace(); - } catch (Exception e) { - e.printStackTrace(); - } - */} } diff --git a/src/test/resources/MsgRtrApi.properties b/src/test/resources/MsgRtrApi.properties index 0bfb1ec..3aef922 100644 --- a/src/test/resources/MsgRtrApi.properties +++ b/src/test/resources/MsgRtrApi.properties @@ -54,12 +54,16 @@ kafka.metadata.broker.list=<kafka_host>:<kafka_port> #kafka.client.zookeeper=${config.zk.servers} consumer.timeout.ms=100 zookeeper.connection.timeout.ms=6000 -zookeeper.session.timeout.ms=6000 +zookeeper.session.timeout.ms=20000 zookeeper.sync.time.ms=2000 auto.commit.interval.ms=1000 fetch.message.max.bytes =1000000 auto.commit.enable=false +#(backoff*retries > zksessiontimeout) +kafka.rebalance.backoff.ms=10000 +kafka.rebalance.max.retries=6 + ############################################################################### ## @@ -106,8 +110,8 @@ authentication.adminSecret=fe3cCompound ## consumers every sweepFreqSeconds and will clean up any connections that are ## dormant for touchFreqMs. #cambria.consumer.cache.sweepFreqSeconds=15 -#cambria.consumer.cache.touchFreqMs=120000 - +cambria.consumer.cache.touchFreqMs=120000 +##stickforallconsumerrequests=false ## The cache is managed through ZK. The default value for the ZK connection ## string is the same as config.zk.servers. #cambria.consumer.cache.zkConnect=${config.zk.servers} @@ -120,6 +124,9 @@ authentication.adminSecret=fe3cCompound ## #cambria.api.node.identifier=<use-something-unique-to-this-instance> +#cambria.rateLimit.maxEmptyPollsPerMinute=30 +#cambria.rateLimitActual.delay.ms=10 + ############################################################################### ## ## Metrics Reporting @@ -128,9 +135,10 @@ authentication.adminSecret=fe3cCompound ## #metrics.send.cambria.enabled=true #metrics.send.cambria.topic=cambria.apinode.metrics #msgrtr.apinode.metrics.dmaap -metrics.send.cambria.sendEverySeconds=60 +#metrics.send.cambria.sendEverySeconds=60 cambria.consumer.cache.zkBasePath=/fe3c/cambria/consumerCache +consumer.timeout=17 ############################################################################## #100mb @@ -139,18 +147,23 @@ maxcontentlength=10000 ############################################################################## #AAF Properties -msgRtr.namespace.aaf=com.att.dmaap.mr.topic -msgRtr.topicfactory.aaf=org.openecomp.dmaapBC.topicFactory|:org.openecomp.dmaapBC.topic: -enforced.topic.name.AAF=com.att +msgRtr.namespace.aaf=org.onap.dmaap.mr.topic +msgRtr.topicfactory.aaf=org.onap.dmaap.mr.topicFactory|:org.onap.dmaap.mr.topic: +enforced.topic.name.AAF=org.onap.dmaap.mr forceAAF=false transidUEBtopicreqd=false -defaultNSforUEB=com.att.dmaap.mr.ueb +defaultNSforUEB=org.onap.dmaap.mr ############################################################################## #Mirror Maker Agent -msgRtr.mirrormakeradmin.aaf=com.att.dmaap.mr.dev.mirrormaker|*|admin -msgRtr.mirrormakeruser.aaf=com.att.dmaap.mr.dev.mirrormaker|*|user -msgRtr.mirrormakeruser.aaf.create=com.att.dmaap.mr.dev.topicFactory|:com.att.dmaap.mr.dev.topic: +msgRtr.mirrormakeradmin.aaf=org.onap.dmaap.mr.mirrormaker|*|admin +msgRtr.mirrormakeruser.aaf=org.onap.dmaap.mr.mirrormaker|*|user +msgRtr.mirrormakeruser.aaf.create=org.onap.dmaap.mr.topicFactory|:org.onap.dmaap.mr.topic: msgRtr.mirrormaker.timeout=15000 -msgRtr.mirrormaker.topic=com.att.dmaap.mr.prod.mm.agent +msgRtr.mirrormaker.topic=org.onap.dmaap.mr.mmagent msgRtr.mirrormaker.consumergroup=mmagentserver -msgRtr.mirrormaker.consumerid=1
\ No newline at end of file +msgRtr.mirrormaker.consumerid=1 + +kafka.max.poll.interval.ms=300000 +kafka.heartbeat.interval.ms=60000 +kafka.session.timeout.ms=240000 +kafka.max.poll.records=1000
\ No newline at end of file |