listener bundle change for multiple ansible

Changes to event listener and dependent
bundles

Issue-ID: APPC-1376
Change-Id: I26e9f6f39caa2a0b0ad46a3a61d21db9f0c05d47
Signed-off-by: Balaji, Ramya (rb111y) <rb111y@att.com>

8 files changed, 120 insertions, 117 deletions

diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/JunitTopicOne_junit-consumer-one_consumer.properties b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/JunitTopicOne_junit-consumer-one_consumer.properties
index c92e987c2..d607137d6 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/JunitTopicOne_junit-consumer-one_consumer.properties
+++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/JunitTopicOne_junit-consumer-one_consumer.properties
@@ -1,34 +1,34 @@
-#consumer.properties file created on the fly for topic:JunitTopicOne on:1542997120536

-#Fri Nov 23 13:18:40 EST 2018

-AFT_DME2_EP_CONN_TIMEOUT=15000

-MethodType=GET

-password=admin

-routeOffer=MR1

-DME2preferredRouterFilePath=JunitTopicOnepreferredRoute.properties

-Longitude=-100.000000

-username=admin

-Version=1.0

-group=junit-client

-timeout=15000

-SubContextPath=/

-authDate=2016-02-18T13\:57\:37-0800

-filter=none

-authKey=01234567890abcde\:01234567890abcdefghijklmn

-Environment=TEST

-host=192.168.10.10

-Protocol=http

-Partner=BOT_R

-contenttype=application/json

-id=junit-consumer-one

-Latitude=50.000000

-ServiceName=dmaap-v1.dev.dmaap.dt.saat.acsi.openecomp.org/events

-AFT_DME2_EXCHANGE_REPLY_HANDLERS=com.att.nsa.test.PreferredRouteReplyHandler

-AFT_DME2_EXCHANGE_REQUEST_HANDLERS=com.att.nsa.test.PreferredRouteRequestHandler

-topic=JunitTopicOne

-TransportType=HTTPNOAUTH

-AFT_ENVIRONMENT=AFTUAT

-limit=1000

-AFT_DME2_EP_READ_TIMEOUT_MS=50000

-sessionstickinessrequired=NO

-AFT_DME2_REQ_TRACE_ON=true

-AFT_DME2_ROUNDTRIP_TIMEOUT_MS=240000

+#consumer.properties - This file is generated automatically for topic:JunitTopicOne on:1549243025739
+#Sun Feb 03 20:17:05 EST 2019
+AFT_DME2_EP_CONN_TIMEOUT=15000
+MethodType=GET
+password=admin
+routeOffer=MR1
+DME2preferredRouterFilePath=JunitTopicOnepreferredRoute.properties
+Longitude=-100.000000
+username=admin
+Version=1.0
+group=junit-client
+timeout=15000
+SubContextPath=/
+authDate=2016-02-18T13\:57\:37-0800
+filter=none
+authKey=01234567890abcde\:01234567890abcdefghijklmn
+Environment=TEST
+host=192.168.10.10
+Protocol=http
+Partner=BOT_R
+contenttype=application/json
+id=junit-consumer-one
+Latitude=50.000000
+ServiceName=dmaap-v1.dev.dmaap.dt.saat.acsi.openecomp.org/events
+AFT_DME2_EXCHANGE_REPLY_HANDLERS=com.att.nsa.test.PreferredRouteReplyHandler
+AFT_DME2_EXCHANGE_REQUEST_HANDLERS=com.att.nsa.test.PreferredRouteRequestHandler
+topic=JunitTopicOne
+TransportType=HTTPNOAUTH
+AFT_ENVIRONMENT=AFTUAT
+limit=1000
+AFT_DME2_EP_READ_TIMEOUT_MS=50000
+sessionstickinessrequired=NO
+AFT_DME2_REQ_TRACE_ON=true
+AFT_DME2_ROUNDTRIP_TIMEOUT_MS=240000
diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/JunitTopicOne_junit-consumer-two_consumer.properties b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/JunitTopicOne_junit-consumer-two_consumer.properties
index d36ad03f3..0cc25b3e1 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/JunitTopicOne_junit-consumer-two_consumer.properties
+++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/JunitTopicOne_junit-consumer-two_consumer.properties
@@ -1,30 +1,30 @@
-#consumer.properties file created on the fly for topic:JunitTopicOne on:1542997120526

-#Fri Nov 23 13:18:40 EST 2018

-AFT_DME2_EP_CONN_TIMEOUT=15000

-MethodType=GET

-routeOffer=MR1

-DME2preferredRouterFilePath=JunitTopicOnepreferredRoute.properties

-Longitude=-100.000000

-Version=1.0

-group=junit-client

-timeout=15000

-SubContextPath=/

-filter=none

-Environment=TEST

-host=192.168.10.10

-Protocol=http

-Partner=BOT_R

-contenttype=application/json

-Latitude=50.000000

-id=junit-consumer-two

-ServiceName=dmaap-v1.dev.dmaap.dt.saat.acsi.openecomp.org/events

-AFT_DME2_EXCHANGE_REPLY_HANDLERS=com.att.nsa.test.PreferredRouteReplyHandler

-AFT_DME2_EXCHANGE_REQUEST_HANDLERS=com.att.nsa.test.PreferredRouteRequestHandler

-topic=JunitTopicOne

-TransportType=HTTPAAF

-AFT_ENVIRONMENT=AFTUAT

-limit=1000

-AFT_DME2_EP_READ_TIMEOUT_MS=50000

-sessionstickinessrequired=NO

-AFT_DME2_REQ_TRACE_ON=true

-AFT_DME2_ROUNDTRIP_TIMEOUT_MS=240000

+#consumer.properties - This file is generated automatically for topic:JunitTopicOne on:1549243025689
+#Sun Feb 03 20:17:05 EST 2019
+AFT_DME2_EP_CONN_TIMEOUT=15000
+MethodType=GET
+routeOffer=MR1
+DME2preferredRouterFilePath=JunitTopicOnepreferredRoute.properties
+Longitude=-100.000000
+Version=1.0
+group=junit-client
+timeout=15000
+SubContextPath=/
+filter=none
+Environment=TEST
+host=192.168.10.10
+Protocol=http
+Partner=BOT_R
+contenttype=application/json
+Latitude=50.000000
+id=junit-consumer-two
+ServiceName=dmaap-v1.dev.dmaap.dt.saat.acsi.openecomp.org/events
+AFT_DME2_EXCHANGE_REPLY_HANDLERS=com.att.nsa.test.PreferredRouteReplyHandler
+AFT_DME2_EXCHANGE_REQUEST_HANDLERS=com.att.nsa.test.PreferredRouteRequestHandler
+topic=JunitTopicOne
+TransportType=HTTPAAF
+AFT_ENVIRONMENT=AFTUAT
+limit=1000
+AFT_DME2_EP_READ_TIMEOUT_MS=50000
+sessionstickinessrequired=NO
+AFT_DME2_REQ_TRACE_ON=true
+AFT_DME2_ROUNDTRIP_TIMEOUT_MS=240000
diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/JunitTopicOne_junit-producer-one_producer.properties b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/JunitTopicOne_junit-producer-one_producer.properties
index 055e8ccd6..ca04b2820 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/JunitTopicOne_junit-producer-one_producer.properties
+++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/JunitTopicOne_junit-producer-one_producer.properties
@@ -1,35 +1,35 @@
-#producer.properties file created on the fly for topic:JunitTopicOne on:1542997120515

-#Fri Nov 23 13:18:40 EST 2018

-AFT_DME2_EP_CONN_TIMEOUT=15000

-MethodType=POST

-password=admin

-DME2preferredRouterFilePath=JunitTopicOnepreferredRoute.properties

-Longitude=-100.000000

-username=admin

-partition=2

-Version=1.0

-maxBatchSize=100

-group=junit-client

-SubContextPath=/

-authDate=2016-07-20T11\:30\:56-0700

-filter=none

-authKey=01234567890abcde\:01234567890abcdefghijklmn

-Environment=TEST

-host=192.168.10.10

-Protocol=http

-Partner=BOT_R

-contenttype=application/json

-id=junit-producer-one

-Latitude=50.000000

-ServiceName=dmaap-v1.dev.dmaap.dt.saat.acsi.openecomp.org/events

-AFT_DME2_EXCHANGE_REPLY_HANDLERS=com.att.nsa.test.PreferredRouteReplyHandler

-AFT_DME2_EXCHANGE_REQUEST_HANDLERS=com.att.nsa.test.PreferredRouteRequestHandler

-topic=JunitTopicOne

-TransportType=HTTPNOAUTH

-AFT_ENVIRONMENT=AFTUAT

-AFT_DME2_EP_READ_TIMEOUT_MS=50000

-sessionstickinessrequired=NO

-AFT_DME2_REQ_TRACE_ON=true

-AFT_DME2_ROUNDTRIP_TIMEOUT_MS=240000

-MessageSentThreadOccurance=50

-maxAgeMs=250

+#producer.properties - This file is generated automatically for topic:JunitTopicOne on:1549243025647
+#Sun Feb 03 20:17:05 EST 2019
+AFT_DME2_EP_CONN_TIMEOUT=15000
+MethodType=POST
+password=admin
+DME2preferredRouterFilePath=JunitTopicOnepreferredRoute.properties
+Longitude=-100.000000
+username=admin
+partition=2
+Version=1.0
+maxBatchSize=100
+group=junit-client
+SubContextPath=/
+authDate=2016-07-20T11\:30\:56-0700
+filter=none
+authKey=01234567890abcde\:01234567890abcdefghijklmn
+Environment=TEST
+host=192.168.10.10
+Protocol=http
+Partner=BOT_R
+contenttype=application/json
+id=junit-producer-one
+Latitude=50.000000
+ServiceName=dmaap-v1.dev.dmaap.dt.saat.acsi.openecomp.org/events
+AFT_DME2_EXCHANGE_REPLY_HANDLERS=com.att.nsa.test.PreferredRouteReplyHandler
+AFT_DME2_EXCHANGE_REQUEST_HANDLERS=com.att.nsa.test.PreferredRouteRequestHandler
+topic=JunitTopicOne
+TransportType=HTTPNOAUTH
+AFT_ENVIRONMENT=AFTUAT
+AFT_DME2_EP_READ_TIMEOUT_MS=50000
+sessionstickinessrequired=NO
+AFT_DME2_REQ_TRACE_ON=true
+AFT_DME2_ROUNDTRIP_TIMEOUT_MS=240000
+MessageSentThreadOccurance=50
+maxAgeMs=250
diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/onap/appc/adapter/messaging/dmaap/http/HttpDmaapConsumerImpl.java b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/onap/appc/adapter/messaging/dmaap/http/HttpDmaapConsumerImpl.java
index 94b06b52e..e2a20ee45 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/onap/appc/adapter/messaging/dmaap/http/HttpDmaapConsumerImpl.java
+++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/onap/appc/adapter/messaging/dmaap/http/HttpDmaapConsumerImpl.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP : APPC
  * ================================================================================
- * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Copyright (C) 2017 Amdocs
  * =============================================================================
diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/onap/appc/adapter/messaging/dmaap/http/HttpDmaapProducerImpl.java b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/onap/appc/adapter/messaging/dmaap/http/HttpDmaapProducerImpl.java
index 3a986c31e..a9af8c702 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/onap/appc/adapter/messaging/dmaap/http/HttpDmaapProducerImpl.java
+++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/onap/appc/adapter/messaging/dmaap/http/HttpDmaapProducerImpl.java
@@ -2,22 +2,22 @@
  * ============LICENSE_START=======================================================
  * ONAP : APPC
  * ================================================================================
- * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Copyright (C) 2017 Amdocs
  * =============================================================================
  * 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=========================================================
  */
 
@@ -68,7 +68,7 @@ public class HttpDmaapProducerImpl extends CommonHttpClient implements Producer
 
     @Override
     public boolean post(String partition, String data) {
-    	LOG.debug("Entering HttpDmaapProducerImpl::: post ");
+        LOG.debug("Entering HttpDmaapProducerImpl::: post ");
         long sent = 0;
         try {
             HttpPost request = postReq(null);
@@ -102,7 +102,7 @@ public class HttpDmaapProducerImpl extends CommonHttpClient implements Producer
                 successful = true;
             }
             else {
-            	LOG.debug("HttpDmaapProducerImpl::: did not receive 200 for sendRequest");
+                LOG.debug("HttpDmaapProducerImpl::: did not receive 200 for sendRequest");
             }
             response.close();
         } catch (Exception sendEx) {
@@ -131,4 +131,5 @@ public class HttpDmaapProducerImpl extends CommonHttpClient implements Producer
         return String.format("%d.%d.%s%s", prt.length(), msg.length(), prt, msg);
     }
 
+
 }
diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/onap/appc/adapter/messaging/dmaap/impl/DmaapConsumerImpl.java b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/onap/appc/adapter/messaging/dmaap/impl/DmaapConsumerImpl.java
index ca551c6af..686bb071f 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/onap/appc/adapter/messaging/dmaap/impl/DmaapConsumerImpl.java
+++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/onap/appc/adapter/messaging/dmaap/impl/DmaapConsumerImpl.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP : APPC
  * ================================================================================
- * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Copyright (C) 2017 Amdocs
  * ================================================================================
@@ -11,15 +11,15 @@
  * 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=========================================================
  */
 
@@ -235,4 +235,5 @@ public class DmaapConsumerImpl implements Consumer {
     public boolean isHttps() {
         return useHttps;
     }
+
 }
diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/onap/appc/adapter/messaging/dmaap/impl/DmaapProducerImpl.java b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/onap/appc/adapter/messaging/dmaap/impl/DmaapProducerImpl.java
index 445f91960..ee4061c94 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/onap/appc/adapter/messaging/dmaap/impl/DmaapProducerImpl.java
+++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/onap/appc/adapter/messaging/dmaap/impl/DmaapProducerImpl.java
@@ -2,16 +2,16 @@
  * ============LICENSE_START=======================================================
  * ONAP : APPC
  * ================================================================================
- * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Copyright (C) 2017 Amdocs
  * =============================================================================
  * 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.
@@ -140,7 +140,7 @@ public class DmaapProducerImpl implements Producer {
 
     @Override
     public boolean post(String partition, String data) {
-    	LOG.debug("In DmaapProducerImpl.post()");
+        LOG.debug("In DmaapProducerImpl.post()");
         boolean success = true;
         Properties properties = configuration.getProperties();
         if (properties != null && properties.getProperty("metric.enabled") != null) {
@@ -219,4 +219,5 @@ public class DmaapProducerImpl implements Producer {
     public boolean isHttps() {
         return useHttps;
     }
+
 }
diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/onap/appc/adapter/messaging/dmaap/utils/DmaapUtil.java b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/onap/appc/adapter/messaging/dmaap/utils/DmaapUtil.java
index 7e5f15898..af20ac7c6 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/onap/appc/adapter/messaging/dmaap/utils/DmaapUtil.java
+++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/onap/appc/adapter/messaging/dmaap/utils/DmaapUtil.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP : APPC
  * ================================================================================
- * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Copyright (C) 2017 Amdocs
  * =============================================================================
@@ -59,7 +59,7 @@ public class DmaapUtil {
             props.setProperty("preferredRouteKey", fileName);
             topicPreferredRouteFileName = topic + "preferredRoute.properties";
             props.store(new FileOutputStream(topicPreferredRouteFileName),
-                    "preferredRoute.properties file created on the fly for topic:" + topic + " on:"
+                    "preferredRoute.properties -This file is generated automatically for topic:" + topic + " on:"
                             + System.currentTimeMillis());
         }
         return topicPreferredRouteFileName;
@@ -99,7 +99,7 @@ public class DmaapUtil {
                 : DELIMITER + topicConsumerPropFileName;
 
         defaultProps.store(new FileOutputStream(topicConsumerPropFileName), defaultProfFileName
-                + " file created on the fly for topic:" + topic + " on:" + System.currentTimeMillis());
+                + " - This file is generated automatically for topic:" + topic + " on:" + System.currentTimeMillis());
         return topicConsumerPropFileName;
     }