push another branch

Change-Id: Ibe8c9a38801d10f6c95fd7da4750ee64392a8b1b
Signed-off-by: Ubuntu <lji@research.att.com>

152 files changed, 698 insertions, 146 deletions

diff --git a/LICENSE.txt b/LICENSE.txt
deleted file mode 100644
index 30471b5..0000000
--- a/LICENSE.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-
-/*-
- * ============LICENSE_START==========================================
- * OPENECOMP - DCAE
- * ===================================================================
- * Copyright (c) 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 and OpenECOMP are trademarks and service marks of AT&T Intellectual Property.
diff --git a/README.md b/README.md
index e5f22e2..b4df71f 100644
--- a/README.md
+++ b/README.md
@@ -5,6 +5,21 @@ To deploy an Open eCOMP Message Router to a host:
 0. prepare the docker host:
    a. install the following software:  git, docker, docker-compose
 1. login to the docker host
-2. git clone this project
-3. edit the deploy.sh file with docker registry info and local configurations such as docker-compose 
+2. git clone this project:
+     git clone -b pocorange https://23.253.149.175/lj1412/dcae-startup-vm-message-router.git
+3. change dir to dcae-startup-vm-message-router
+   edit the deploy.sh file with local configurations such as docker-compose 
 4. run the deploy.sh as root
+
+
+
+
+To use the Message Router:
+Reference docker_files/tests/test.sh for curl exmples for publishing/subscribing and API key creation.
+
+These examples are for running MR client (curl) on the same VM as the MR.  If running from a 
+different location, change the host portion of the HOSTPORT variable to teh IP address/hostname 
+of the VM running the MR.  For example from
+HOSTPORT="127.0.0.1:3904"
+to 
+HOSTPORT="10.0.11.1.com:3904"
diff --git a/deploy.sh b/deploy.sh
index d92a270..8a6edba 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -2,9 +2,6 @@
 
 set -e
 
-# docker registry configurations
-# all docker container dependencies are now from docker hub, no need for our own any more 
-
 # do not change this, it is already matched with the git repo file structure
 DOCKER_FILE_DIR="./docker_files"
 
diff --git a/docker_files/MsgRtrApi.properties b/docker_files/MsgRtrApi.properties
new file mode 100644
index 0000000..b54b483
--- /dev/null
+++ b/docker_files/MsgRtrApi.properties
@@ -0,0 +1,140 @@
+###############################################################################
+##
+## Cambria API Server config
+##
+##	- Default values are shown as commented settings.
+##
+
+###############################################################################
+##
+## HTTP service
+##
+##		- 3904 is standard as of 7/29/14.
+#
+## Zookeeper Connection
+##
+##	Both Cambria and Kafka make use of Zookeeper.
+##
+config.zk.servers=zookeeper:2181
+#config.zk.servers=172.17.0.1:2181
+#10.0.11.1:2181
+#10.208.128.229:2181
+#config.zk.root=/fe3c/cambria/config
+
+
+###############################################################################
+##
+## Kafka Connection
+##
+##	Items below are passed through to Kafka's producer and consumer
+##	configurations (after removing "kafka.")
+##	if you want to change request.required.acks it can take this one value
+#kafka.metadata.broker.list=localhost:9092,localhost:9093
+kafka.metadata.broker.list=kafka:9092
+#kafka.metadata.broker.list=172.17.0.1:9092
+#10.0.11.1:9092
+#10.208.128.229:9092
+##kafka.request.required.acks=-1
+#kafka.client.zookeeper=${config.zk.servers}
+consumer.timeout.ms=100
+zookeeper.connection.timeout.ms=6000
+zookeeper.session.timeout.ms=6000
+zookeeper.sync.time.ms=2000
+auto.commit.interval.ms=1000
+fetch.message.max.bytes =1000000
+auto.commit.enable=false
+
+
+###############################################################################
+##
+##	Secured Config
+##
+##	Some data stored in the config system is sensitive -- API keys and secrets,
+##	for example. to protect it, we use an encryption layer for this section
+##	of the config.
+##
+## The key is a base64 encode AES key. This must be created/configured for
+## each installation.
+#cambria.secureConfig.key=
+##
+## The initialization vector is a 16 byte value specific to the secured store.
+## This must be created/configured for each installation.
+#cambria.secureConfig.iv=
+
+## Southfield Sandbox
+cambria.secureConfig.key=b/7ouTn9FfEw2PQwL0ov/Q==
+cambria.secureConfig.iv=wR9xP5k5vbz/xD0LmtqQLw==
+authentication.adminSecret=fe3cCompound
+#cambria.secureConfig.key[pc569h]=YT3XPyxEmKCTLI2NK+Sjbw==
+#cambria.secureConfig.iv[pc569h]=rMm2jhR3yVnU+u2V9Ugu3Q==
+
+
+###############################################################################
+##
+## Consumer Caching
+##
+##	Kafka expects live connections from the consumer to the broker, which
+##	obviously doesn't work over connectionless HTTP requests. The Cambria
+##	server proxies HTTP requests into Kafka consumer sessions that are kept
+##	around for later re-use. Not doing so is costly for setup per request,
+##	which would substantially impact a high volume consumer's performance.
+##
+##	This complicates Cambria server failover, because we often need server
+##	A to close its connection before server B brings up the replacement.    
+##
+
+## The consumer cache is normally enabled.
+#cambria.consumer.cache.enabled=true
+
+## Cached consumers are cleaned up after a period of disuse. The server inspects
+## consumers every sweepFreqSeconds and will clean up any connections that are
+## dormant for touchFreqMs.
+#cambria.consumer.cache.sweepFreqSeconds=15
+#cambria.consumer.cache.touchFreqMs=120000
+
+## 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}
+
+##
+## Shared cache information is associated with this node's name. The default
+## name is the hostname plus the HTTP service port this host runs on. (The
+## hostname is determined via InetAddress.getLocalHost ().getCanonicalHostName(),
+## which is not always adequate.) You can set this value explicitly here.
+##
+#cambria.api.node.identifier=<use-something-unique-to-this-instance>
+
+###############################################################################
+##
+## Metrics Reporting
+##
+##	This server can report its metrics periodically on a topic.
+##
+#metrics.send.cambria.enabled=true
+#metrics.send.cambria.topic=cambria.apinode.metrics                                  #msgrtr.apinode.metrics.dmaap 
+#metrics.send.cambria.sendEverySeconds=60
+
+cambria.consumer.cache.zkBasePath=/fe3c/cambria/consumerCache
+
+##############################################################################
+#100mb
+maxcontentlength=10000
+
+
+##############################################################################
+#AAF Properties
+msgRtr.namespace.aaf=com.att.dcae.dmaap.mtnje2.mr.topic
+msgRtr.topicfactory.aaf=com.att.dcae.dmaap.topicFactory|:com.att.dcae.dmaap.mtnje2.mr.topic:
+enforced.topic.name.AAF=com.att
+forceAAF=false
+transidUEBtopicreqd=false
+defaultNSforUEB=com.att.dmaap.mr.ueb
+##############################################################################
+#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.mirrormaker.timeout=15000
+msgRtr.mirrormaker.topic=com.att.dmaap.mr.prod.mm.agent
+msgRtr.mirrormaker.consumergroup=mmagentserver
+msgRtr.mirrormaker.consumerid=1
diff --git a/docker_files/__MsgRtrApi.properties b/docker_files/__MsgRtrApi.properties
index e972675..5c89ea9 100755
--- a/docker_files/__MsgRtrApi.properties
+++ b/docker_files/__MsgRtrApi.properties
@@ -15,7 +15,8 @@
 ##
 ##	Both Cambria and Kafka make use of Zookeeper.
 ##
-config.zk.servers={{ ip.docker0 }}:2181
+config.zk.servers=zookeeper:2181
+#config.zk.servers={{ ip.docker0 }}:2181
 #10.0.11.1:2181
 #10.208.128.229:2181
 #config.zk.root=/fe3c/cambria/config
@@ -29,7 +30,8 @@ config.zk.servers={{ ip.docker0 }}:2181
 ##	configurations (after removing "kafka.")
 ##	if you want to change request.required.acks it can take this one value
 #kafka.metadata.broker.list=localhost:9092,localhost:9093
-kafka.metadata.broker.list={{ ip.docker0 }}:9092
+kafka.metadata.broker.list=kafka:9092
+#kafka.metadata.broker.list={{ ip.docker0 }}:9092
 #10.0.11.1:9092
 #10.208.128.229:9092
 ##kafka.request.required.acks=-1
@@ -121,18 +123,18 @@ maxcontentlength=10000
 
 ##############################################################################
 #AAF Properties
-msgRtr.namespace.aaf=org.openecomp.dcae.dmaap.mtnje2.mr.topic
-msgRtr.topicfactory.aaf=org.openecomp.dcae.dmaap.topicFactory|:org.openecomp.dcae.dmaap.mtnje2.mr.topic:
-enforced.topic.name.AAF=org.openecomp
+msgRtr.namespace.aaf=com.att.dcae.dmaap.mtnje2.mr.topic
+msgRtr.topicfactory.aaf=com.att.dcae.dmaap.topicFactory|:com.att.dcae.dmaap.mtnje2.mr.topic:
+enforced.topic.name.AAF=com.att
 forceAAF=false
 transidUEBtopicreqd=false
-defaultNSforUEB=org.openecomp.dmaap.mr.ueb
+defaultNSforUEB=com.att.dmaap.mr.ueb
 ##############################################################################
 #Mirror Maker Agent
-msgRtr.mirrormakeradmin.aaf=org.openecomp.dmaap.mr.dev.mirrormaker|*|admin
-msgRtr.mirrormakeruser.aaf=org.openecomp.dmaap.mr.dev.mirrormaker|*|user
-msgRtr.mirrormakeruser.aaf.create=org.openecomp.dmaap.mr.dev.topicFactory|:org.openecomp.dmaap.mr.dev.topic:
+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.mirrormaker.timeout=15000
-msgRtr.mirrormaker.topic=org.openecomp.dmaap.mr.prod.mm.agent
+msgRtr.mirrormaker.topic=com.att.dmaap.mr.prod.mm.agent
 msgRtr.mirrormaker.consumergroup=mmagentserver
 msgRtr.mirrormaker.consumerid=1
diff --git a/docker_files/__docker-compose.yml b/docker_files/__docker-compose.yml
index d9bbcd2..b59d395 100644
--- a/docker_files/__docker-compose.yml
+++ b/docker_files/__docker-compose.yml
@@ -17,7 +17,8 @@ services:
     ports:
       - "9092:9092"
     environment:
-      KAFKA_ADVERTISED_HOST_NAME: {{ ip.docker0 }}
+      #KAFKA_ADVERTISED_HOST_NAME: {{ ip.docker0 }}
+      KAFKA_ADVERTISED_HOST_NAME: kafka
       KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
       KAFKA_BROKER_ID: 1
     volumes:
@@ -32,7 +33,6 @@ services:
       
   dmaap:
     image: attos/dmaap
-    #image: ecomp-nexus:51212/dmaapnew1
     ports:
       - "3904:3904"
       - "3905:3905"
diff --git a/docker_files/apikey-APPC1.key b/docker_files/apikey-APPC1.key
new file mode 100644
index 0000000..2f77745
--- /dev/null
+++ b/docker_files/apikey-APPC1.key
@@ -0,0 +1,8 @@
+{
+    "aux": {
+        "description": "API key for apikey-APPC1",
+        "email": "no email"
+    },
+    "secret": "64AG2hF4pYeG2pq7CT6XwUOT",
+    "key": "VIlbtVl6YLhNUrtU"
+}
\ No newline at end of file
diff --git a/docker_files/apikey-PORTAL1.key b/docker_files/apikey-PORTAL1.key
new file mode 100644
index 0000000..068bed7
--- /dev/null
+++ b/docker_files/apikey-PORTAL1.key
@@ -0,0 +1,8 @@
+{
+    "aux": {
+        "description": "API key for apikey-PORTAL1",
+        "email": "no email"
+    },
+    "secret": "uCYgKjWKK5IxPGNNZzYSSWo9",
+    "key": "7GkVcrO6sIDb3ngW"
+}
\ No newline at end of file
diff --git a/docker_files/apikey-PORTALAPP1.key b/docker_files/apikey-PORTALAPP1.key
new file mode 100644
index 0000000..a27422f
--- /dev/null
+++ b/docker_files/apikey-PORTALAPP1.key
@@ -0,0 +1,8 @@
+{
+    "aux": {
+        "description": "API key for apikey-PORTALAPP1",
+        "email": "no email"
+    },
+    "secret": "P0HpqEBhKJvxjRYdw2sCTUll",
+    "key": "jQd4a9zVNi4ePyBp"
+}
\ No newline at end of file
diff --git a/docker_files/apikey-PORTALDBC1.key b/docker_files/apikey-PORTALDBC1.key
new file mode 100644
index 0000000..f29d959
--- /dev/null
+++ b/docker_files/apikey-PORTALDBC1.key
@@ -0,0 +1,8 @@
+{
+    "aux": {
+        "description": "API key for apikey-PORTALDBC1",
+        "email": "no email"
+    },
+    "secret": "WB7AJICClKg9oZLsxhQnykXA",
+    "key": "MtRwsF16RdpHZ7eM"
+}
\ No newline at end of file
diff --git a/docker_files/apikey-PORTALPOL1.key b/docker_files/apikey-PORTALPOL1.key
new file mode 100644
index 0000000..97b39a4
--- /dev/null
+++ b/docker_files/apikey-PORTALPOL1.key
@@ -0,0 +1,8 @@
+{
+    "aux": {
+        "description": "API key for apikey-PORTALPOL1",
+        "email": "no email"
+    },
+    "secret": "P7ejzF4nS3LAsMmKKTvYYFpA",
+    "key": "Gsd3C3hLYaUcor6l"
+}
\ No newline at end of file
diff --git a/docker_files/apikey-PORTALSDC1.key b/docker_files/apikey-PORTALSDC1.key
new file mode 100644
index 0000000..28bfb89
--- /dev/null
+++ b/docker_files/apikey-PORTALSDC1.key
@@ -0,0 +1,8 @@
+{
+    "aux": {
+        "description": "API key for apikey-PORTALSDC1",
+        "email": "no email"
+    },
+    "secret": "XftIATw9Jr3VzAcPqt3NnJOu",
+    "key": "x9UfO7JsDn8BESVX"
+}
\ No newline at end of file
diff --git a/docker_files/apikey-PORTALVID1.key b/docker_files/apikey-PORTALVID1.key
new file mode 100644
index 0000000..3373566
--- /dev/null
+++ b/docker_files/apikey-PORTALVID1.key
@@ -0,0 +1,8 @@
+{
+    "aux": {
+        "description": "API key for apikey-PORTALVID1",
+        "email": "no email"
+    },
+    "secret": "S31PrbOzGgL4hg4owgtx47Da",
+    "key": "2Re7Pvdkgw5aeAUD"
+}
\ No newline at end of file
diff --git a/docker_files/apikey-SDC1.key b/docker_files/apikey-SDC1.key
new file mode 100644
index 0000000..207431d
--- /dev/null
+++ b/docker_files/apikey-SDC1.key
@@ -0,0 +1,8 @@
+{
+    "aux": {
+        "description": "API key for apikey-SDC1",
+        "email": "no email"
+    },
+    "secret": "Ehq3WyT4bkif4zwgEbvshGal",
+    "key": "iPIxkpAMI8qTcQj8"
+}
\ No newline at end of file
diff --git a/docker_files/cadi.properties b/docker_files/cadi.properties
index 17aaabe..9c95e9c 100644
--- a/docker_files/cadi.properties
+++ b/docker_files/cadi.properties
@@ -4,11 +4,21 @@
 #For more information on utilizing the AAF framework, please goto wiki link:
 #AAF wiki link: http://wiki.web.att.com/display/aaf/AAF+Documentation
 
+#In order to test functionality of cadi-ajsc-plugin locally (pertaining to GLO (AT&T Global Login)), you will need an AT&T cross
+#domain cookie. Cadi "should" find your hostname for you. However, we have seen some situations where this fails. A Local testing
+#modification can include modifying your hosts file so that you can use "mywebserver.att.com" for your localhost in order
+#to test/verify GLO functionality locally. If you are on a Windows machine, you will already have a machine name associated with 
+#it that will utilize an AT&T domain such as "sbc.com". You may need to add your AT&T domain to this as a comma separated list depending
+#upon your particular machine domain. This property is commented out as cadi SHOULD find your machine name. With version 1.2.1 of cadi, 
+#it appears to resolve Mac machine names as well, now. But, this can be somewhat inconsistent depending on your specific working envrironment.
+#hostname=mywebserver.att.com
+
 #Setting csp_domain to PROD will allow for testing using your attuid and password through GLO.
 #csp_domain=PROD
 #csp_devl_localhost=true
 
-basic_realm=opencomp.org
+basic_realm=csp.att.com
+#basic_realm=aaf.att.com
 basic_warn=TRUE
 
 cadi_loglevel=DEBUG
@@ -17,6 +27,11 @@ cadi_keyfile=/appl/dmaapMR1/etc/keyfile
 # Configure AAF
 aaf_url=https://DME2RESOLVE/service=com.att.authz.AuthorizationService/version=2.0/envContext=DEV/routeOffer=BAU_SE
 
+# lji: according to this web page:  https://wiki.web.att.com/display/soacloud/DME2+-+URI+Patterns, DME2 supports a direct URL mode:
+# Format 3: DIRECT: http://host:port/service=?/version=?/envContext=?/routeOffer=?
+# Point to a specific host:port and call the service there.No lookup/resolution by DME2 client.
+#aaf_url=http://10.0.17.1:8101/service=com.att.authz.AuthorizationService/version=2.0/envContext=TEST/routeOffer=BAU_SE
+
 #AJSC - MECHID
 aaf_id=dgl@openecomp.org
 aaf_password=enc:f2u5br1mh29M02-
@@ -29,6 +44,7 @@ aaf_user_expires=60000
 aaf_high_count=1000000
 
 
+# Some Libs need System Property Sets (i.e. AT&T Discovery)
 # The following properties are being set by the AJSC Container and should NOT need to be set here.
 AFT_LATITUDE=33.823589
 AFT_LONGITUDE=-84.366982
diff --git a/docker_files/data-kafka/kafka-logs/APPC-CL-0/00000000000000000000.index b/docker_files/data-kafka/kafka-logs/APPC-CL-0/00000000000000000000.index
index e69de29..6c5d403 100644
--- a/docker_files/data-kafka/kafka-logs/APPC-CL-0/00000000000000000000.index
+++ b/docker_files/data-kafka/kafka-logs/APPC-CL-0/00000000000000000000.index
diff --git a/docker_files/data-kafka/kafka-logs/APPC-CL-0/00000000000000000000.log b/docker_files/data-kafka/kafka-logs/APPC-CL-0/00000000000000000000.log
index e69de29..85ee8bf 100644
--- a/docker_files/data-kafka/kafka-logs/APPC-CL-0/00000000000000000000.log
+++ b/docker_files/data-kafka/kafka-logs/APPC-CL-0/00000000000000000000.log
diff --git a/docker_files/data-kafka/kafka-logs/APPC-CL-1/00000000000000000000.index b/docker_files/data-kafka/kafka-logs/APPC-CL-1/00000000000000000000.index
index e69de29..6c5d403 100644
--- a/docker_files/data-kafka/kafka-logs/APPC-CL-1/00000000000000000000.index
+++ b/docker_files/data-kafka/kafka-logs/APPC-CL-1/00000000000000000000.index
diff --git a/docker_files/data-kafka/kafka-logs/APPC-CL-1/00000000000000000000.log b/docker_files/data-kafka/kafka-logs/APPC-CL-1/00000000000000000000.log
index 607c576..e69de29 100644
--- a/docker_files/data-kafka/kafka-logs/APPC-CL-1/00000000000000000000.log
+++ b/docker_files/data-kafka/kafka-logs/APPC-CL-1/00000000000000000000.log
diff --git a/docker_files/data-kafka/kafka-logs/APPC-TEST1-0/00000000000000000000.index b/docker_files/data-kafka/kafka-logs/APPC-TEST1-0/00000000000000000000.index
new file mode 100644
index 0000000..6c5d403
--- /dev/null
+++ b/docker_files/data-kafka/kafka-logs/APPC-TEST1-0/00000000000000000000.index
diff --git a/docker_files/data-kafka/kafka-logs/.kafka_cleanshutdown b/docker_files/data-kafka/kafka-logs/APPC-TEST1-0/00000000000000000000.log
index e69de29..e69de29 100644
--- a/docker_files/data-kafka/kafka-logs/.kafka_cleanshutdown
+++ b/docker_files/data-kafka/kafka-logs/APPC-TEST1-0/00000000000000000000.log
diff --git a/docker_files/data-kafka/kafka-logs/APPC-TEST2-0/00000000000000000000.index b/docker_files/data-kafka/kafka-logs/APPC-TEST2-0/00000000000000000000.index
new file mode 100644
index 0000000..6c5d403
--- /dev/null
+++ b/docker_files/data-kafka/kafka-logs/APPC-TEST2-0/00000000000000000000.index
diff --git a/docker_files/data-kafka/kafka-logs/APPC-TEST2-0/00000000000000000000.log b/docker_files/data-kafka/kafka-logs/APPC-TEST2-0/00000000000000000000.log
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/docker_files/data-kafka/kafka-logs/APPC-TEST2-0/00000000000000000000.log
diff --git a/docker_files/data-kafka/kafka-logs/APPC-TEST2-1/00000000000000000000.index b/docker_files/data-kafka/kafka-logs/APPC-TEST2-1/00000000000000000000.index
new file mode 100644
index 0000000..6c5d403
--- /dev/null
+++ b/docker_files/data-kafka/kafka-logs/APPC-TEST2-1/00000000000000000000.index
diff --git a/docker_files/data-kafka/kafka-logs/APPC-TEST2-1/00000000000000000000.log b/docker_files/data-kafka/kafka-logs/APPC-TEST2-1/00000000000000000000.log
new file mode 100644
index 0000000..66dcea9
--- /dev/null
+++ b/docker_files/data-kafka/kafka-logs/APPC-TEST2-1/00000000000000000000.log
diff --git a/docker_files/data-kafka/kafka-logs/DCAE-CL-EVENT-0/00000000000000000000.index b/docker_files/data-kafka/kafka-logs/DCAE-CL-EVENT-0/00000000000000000000.index
index e69de29..6c5d403 100644
--- a/docker_files/data-kafka/kafka-logs/DCAE-CL-EVENT-0/00000000000000000000.index
+++ b/docker_files/data-kafka/kafka-logs/DCAE-CL-EVENT-0/00000000000000000000.index
diff --git a/docker_files/data-kafka/kafka-logs/DCAE-CL-EVENT-0/00000000000000000000.log b/docker_files/data-kafka/kafka-logs/DCAE-CL-EVENT-0/00000000000000000000.log
index 51b4500..bb73f23 100644
--- a/docker_files/data-kafka/kafka-logs/DCAE-CL-EVENT-0/00000000000000000000.log
+++ b/docker_files/data-kafka/kafka-logs/DCAE-CL-EVENT-0/00000000000000000000.log
diff --git a/docker_files/data-kafka/kafka-logs/DCAE-CL-EVENT-1/00000000000000000000.index b/docker_files/data-kafka/kafka-logs/DCAE-CL-EVENT-1/00000000000000000000.index
index e69de29..6c5d403 100644
--- a/docker_files/data-kafka/kafka-logs/DCAE-CL-EVENT-1/00000000000000000000.index
+++ b/docker_files/data-kafka/kafka-logs/DCAE-CL-EVENT-1/00000000000000000000.index
diff --git a/docker_files/data-kafka/kafka-logs/DCAE-CL-EVENT-1/00000000000000000000.log b/docker_files/data-kafka/kafka-logs/DCAE-CL-EVENT-1/00000000000000000000.log
index e69de29..53364c5 100644
--- a/docker_files/data-kafka/kafka-logs/DCAE-CL-EVENT-1/00000000000000000000.log
+++ b/docker_files/data-kafka/kafka-logs/DCAE-CL-EVENT-1/00000000000000000000.log
diff --git a/docker_files/data-kafka/kafka-logs/ECOMP-PORTAL-INBOX-0/00000000000000000000.index b/docker_files/data-kafka/kafka-logs/ECOMP-PORTAL-INBOX-0/00000000000000000000.index
new file mode 100644
index 0000000..6c5d403
--- /dev/null
+++ b/docker_files/data-kafka/kafka-logs/ECOMP-PORTAL-INBOX-0/00000000000000000000.index
diff --git a/docker_files/data-kafka/kafka-logs/ECOMP-PORTAL-INBOX-0/00000000000000000000.log b/docker_files/data-kafka/kafka-logs/ECOMP-PORTAL-INBOX-0/00000000000000000000.log
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/docker_files/data-kafka/kafka-logs/ECOMP-PORTAL-INBOX-0/00000000000000000000.log
diff --git a/docker_files/data-kafka/kafka-logs/ECOMP-PORTAL-OUTBOX-APP1-0/00000000000000000000.index b/docker_files/data-kafka/kafka-logs/ECOMP-PORTAL-OUTBOX-APP1-0/00000000000000000000.index
new file mode 100644
index 0000000..6c5d403
--- /dev/null
+++ b/docker_files/data-kafka/kafka-logs/ECOMP-PORTAL-OUTBOX-APP1-0/00000000000000000000.index
diff --git a/docker_files/data-kafka/kafka-logs/ECOMP-PORTAL-OUTBOX-APP1-0/00000000000000000000.log b/docker_files/data-kafka/kafka-logs/ECOMP-PORTAL-OUTBOX-APP1-0/00000000000000000000.log
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/docker_files/data-kafka/kafka-logs/ECOMP-PORTAL-OUTBOX-APP1-0/00000000000000000000.log
diff --git a/docker_files/data-kafka/kafka-logs/ECOMP-PORTAL-OUTBOX-DBC1-0/00000000000000000000.index b/docker_files/data-kafka/kafka-logs/ECOMP-PORTAL-OUTBOX-DBC1-0/00000000000000000000.index
new file mode 100644
index 0000000..6c5d403
--- /dev/null
+++ b/docker_files/data-kafka/kafka-logs/ECOMP-PORTAL-OUTBOX-DBC1-0/00000000000000000000.index
diff --git a/docker_files/data-kafka/kafka-logs/ECOMP-PORTAL-OUTBOX-DBC1-0/00000000000000000000.log b/docker_files/data-kafka/kafka-logs/ECOMP-PORTAL-OUTBOX-DBC1-0/00000000000000000000.log
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/docker_files/data-kafka/kafka-logs/ECOMP-PORTAL-OUTBOX-DBC1-0/00000000000000000000.log
diff --git a/docker_files/data-kafka/kafka-logs/ECOMP-PORTAL-OUTBOX-POL1-0/00000000000000000000.index b/docker_files/data-kafka/kafka-logs/ECOMP-PORTAL-OUTBOX-POL1-0/00000000000000000000.index
new file mode 100644
index 0000000..6c5d403
--- /dev/null
+++ b/docker_files/data-kafka/kafka-logs/ECOMP-PORTAL-OUTBOX-POL1-0/00000000000000000000.index
diff --git a/docker_files/data-kafka/kafka-logs/ECOMP-PORTAL-OUTBOX-POL1-0/00000000000000000000.log b/docker_files/data-kafka/kafka-logs/ECOMP-PORTAL-OUTBOX-POL1-0/00000000000000000000.log
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/docker_files/data-kafka/kafka-logs/ECOMP-PORTAL-OUTBOX-POL1-0/00000000000000000000.log
diff --git a/docker_files/data-kafka/kafka-logs/ECOMP-PORTAL-OUTBOX-SDC1-0/00000000000000000000.index b/docker_files/data-kafka/kafka-logs/ECOMP-PORTAL-OUTBOX-SDC1-0/00000000000000000000.index
new file mode 100644
index 0000000..6c5d403
--- /dev/null
+++ b/docker_files/data-kafka/kafka-logs/ECOMP-PORTAL-OUTBOX-SDC1-0/00000000000000000000.index
diff --git a/docker_files/data-kafka/kafka-logs/ECOMP-PORTAL-OUTBOX-SDC1-0/00000000000000000000.log b/docker_files/data-kafka/kafka-logs/ECOMP-PORTAL-OUTBOX-SDC1-0/00000000000000000000.log
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/docker_files/data-kafka/kafka-logs/ECOMP-PORTAL-OUTBOX-SDC1-0/00000000000000000000.log
diff --git a/docker_files/data-kafka/kafka-logs/ECOMP-PORTAL-OUTBOX-VID1-0/00000000000000000000.index b/docker_files/data-kafka/kafka-logs/ECOMP-PORTAL-OUTBOX-VID1-0/00000000000000000000.index
new file mode 100644
index 0000000..6c5d403
--- /dev/null
+++ b/docker_files/data-kafka/kafka-logs/ECOMP-PORTAL-OUTBOX-VID1-0/00000000000000000000.index
diff --git a/docker_files/data-kafka/kafka-logs/ECOMP-PORTAL-OUTBOX-VID1-0/00000000000000000000.log b/docker_files/data-kafka/kafka-logs/ECOMP-PORTAL-OUTBOX-VID1-0/00000000000000000000.log
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/docker_files/data-kafka/kafka-logs/ECOMP-PORTAL-OUTBOX-VID1-0/00000000000000000000.log
diff --git a/docker_files/data-kafka/kafka-logs/PDPD-CONFIGURATION-0/00000000000000000000.index b/docker_files/data-kafka/kafka-logs/PDPD-CONFIGURATION-0/00000000000000000000.index
index e69de29..6c5d403 100644
--- a/docker_files/data-kafka/kafka-logs/PDPD-CONFIGURATION-0/00000000000000000000.index
+++ b/docker_files/data-kafka/kafka-logs/PDPD-CONFIGURATION-0/00000000000000000000.index
diff --git a/docker_files/data-kafka/kafka-logs/PDPD-CONFIGURATION-0/00000000000000000000.log b/docker_files/data-kafka/kafka-logs/PDPD-CONFIGURATION-0/00000000000000000000.log
index e69de29..b466eda 100644
--- a/docker_files/data-kafka/kafka-logs/PDPD-CONFIGURATION-0/00000000000000000000.log
+++ b/docker_files/data-kafka/kafka-logs/PDPD-CONFIGURATION-0/00000000000000000000.log
diff --git a/docker_files/data-kafka/kafka-logs/PDPD-CONFIGURATION-1/00000000000000000000.index b/docker_files/data-kafka/kafka-logs/PDPD-CONFIGURATION-1/00000000000000000000.index
index e69de29..6c5d403 100644
--- a/docker_files/data-kafka/kafka-logs/PDPD-CONFIGURATION-1/00000000000000000000.index
+++ b/docker_files/data-kafka/kafka-logs/PDPD-CONFIGURATION-1/00000000000000000000.index
diff --git a/docker_files/data-kafka/kafka-logs/PDPD-CONFIGURATION-1/00000000000000000000.log b/docker_files/data-kafka/kafka-logs/PDPD-CONFIGURATION-1/00000000000000000000.log
index 14d61f3..e69de29 100644
--- a/docker_files/data-kafka/kafka-logs/PDPD-CONFIGURATION-1/00000000000000000000.log
+++ b/docker_files/data-kafka/kafka-logs/PDPD-CONFIGURATION-1/00000000000000000000.log
diff --git a/docker_files/data-kafka/kafka-logs/POLICY-CL-MGT-0/00000000000000000000.index b/docker_files/data-kafka/kafka-logs/POLICY-CL-MGT-0/00000000000000000000.index
index e69de29..6c5d403 100644
--- a/docker_files/data-kafka/kafka-logs/POLICY-CL-MGT-0/00000000000000000000.index
+++ b/docker_files/data-kafka/kafka-logs/POLICY-CL-MGT-0/00000000000000000000.index
diff --git a/docker_files/data-kafka/kafka-logs/POLICY-CL-MGT-0/00000000000000000000.log b/docker_files/data-kafka/kafka-logs/POLICY-CL-MGT-0/00000000000000000000.log
index cd462c1..bc5db56 100644
--- a/docker_files/data-kafka/kafka-logs/POLICY-CL-MGT-0/00000000000000000000.log
+++ b/docker_files/data-kafka/kafka-logs/POLICY-CL-MGT-0/00000000000000000000.log
diff --git a/docker_files/data-kafka/kafka-logs/POLICY-CL-MGT-1/00000000000000000000.index b/docker_files/data-kafka/kafka-logs/POLICY-CL-MGT-1/00000000000000000000.index
index e69de29..6c5d403 100644
--- a/docker_files/data-kafka/kafka-logs/POLICY-CL-MGT-1/00000000000000000000.index
+++ b/docker_files/data-kafka/kafka-logs/POLICY-CL-MGT-1/00000000000000000000.index
diff --git a/docker_files/data-kafka/kafka-logs/POLICY-CL-MGT-1/00000000000000000000.log b/docker_files/data-kafka/kafka-logs/POLICY-CL-MGT-1/00000000000000000000.log
index e69de29..978eeb6 100644
--- a/docker_files/data-kafka/kafka-logs/POLICY-CL-MGT-1/00000000000000000000.log
+++ b/docker_files/data-kafka/kafka-logs/POLICY-CL-MGT-1/00000000000000000000.log
diff --git a/docker_files/data-kafka/kafka-logs/SDC-DISTR-NOTIF-TOPIC-SDC-OPENSOURCE-ENV1-0/00000000000000000000.index b/docker_files/data-kafka/kafka-logs/SDC-DISTR-NOTIF-TOPIC-SDC-OPENSOURCE-ENV1-0/00000000000000000000.index
index e69de29..6c5d403 100644
--- a/docker_files/data-kafka/kafka-logs/SDC-DISTR-NOTIF-TOPIC-SDC-OPENSOURCE-ENV1-0/00000000000000000000.index
+++ b/docker_files/data-kafka/kafka-logs/SDC-DISTR-NOTIF-TOPIC-SDC-OPENSOURCE-ENV1-0/00000000000000000000.index
diff --git a/docker_files/data-kafka/kafka-logs/SDC-DISTR-STATUS-TOPIC-SDC-OPENSOURCE-ENV1-0/00000000000000000000.index b/docker_files/data-kafka/kafka-logs/SDC-DISTR-STATUS-TOPIC-SDC-OPENSOURCE-ENV1-0/00000000000000000000.index
index e69de29..6c5d403 100644
--- a/docker_files/data-kafka/kafka-logs/SDC-DISTR-STATUS-TOPIC-SDC-OPENSOURCE-ENV1-0/00000000000000000000.index
+++ b/docker_files/data-kafka/kafka-logs/SDC-DISTR-STATUS-TOPIC-SDC-OPENSOURCE-ENV1-0/00000000000000000000.index
diff --git a/docker_files/data-kafka/kafka-logs/SDC-DISTR-STATUS-TOPIC-SDC-OPENSOURCE-ENV1-0/00000000000000000000.log b/docker_files/data-kafka/kafka-logs/SDC-DISTR-STATUS-TOPIC-SDC-OPENSOURCE-ENV1-0/00000000000000000000.log
index 15727d7..e69de29 100644
--- a/docker_files/data-kafka/kafka-logs/SDC-DISTR-STATUS-TOPIC-SDC-OPENSOURCE-ENV1-0/00000000000000000000.log
+++ b/docker_files/data-kafka/kafka-logs/SDC-DISTR-STATUS-TOPIC-SDC-OPENSOURCE-ENV1-0/00000000000000000000.log
diff --git a/docker_files/data-kafka/kafka-logs/msgrtr.apinode.metrics.dmaap-0/00000000000000000000.index b/docker_files/data-kafka/kafka-logs/msgrtr.apinode.metrics.dmaap-0/00000000000000000000.index
index 21ee01e..b95416d 100644
--- a/docker_files/data-kafka/kafka-logs/msgrtr.apinode.metrics.dmaap-0/00000000000000000000.index
+++ b/docker_files/data-kafka/kafka-logs/msgrtr.apinode.metrics.dmaap-0/00000000000000000000.index
diff --git a/docker_files/data-kafka/kafka-logs/msgrtr.apinode.metrics.dmaap-0/00000000000000000000.log b/docker_files/data-kafka/kafka-logs/msgrtr.apinode.metrics.dmaap-0/00000000000000000000.log
index cb02c46..de38c07 100644
--- a/docker_files/data-kafka/kafka-logs/msgrtr.apinode.metrics.dmaap-0/00000000000000000000.log
+++ b/docker_files/data-kafka/kafka-logs/msgrtr.apinode.metrics.dmaap-0/00000000000000000000.log
diff --git a/docker_files/data-kafka/kafka-logs/msgrtr.apinode.metrics.dmaap-1/00000000000000000000.index b/docker_files/data-kafka/kafka-logs/msgrtr.apinode.metrics.dmaap-1/00000000000000000000.index
index d960b7c..81534e3 100644
--- a/docker_files/data-kafka/kafka-logs/msgrtr.apinode.metrics.dmaap-1/00000000000000000000.index
+++ b/docker_files/data-kafka/kafka-logs/msgrtr.apinode.metrics.dmaap-1/00000000000000000000.index
diff --git a/docker_files/data-kafka/kafka-logs/msgrtr.apinode.metrics.dmaap-1/00000000000000000000.log b/docker_files/data-kafka/kafka-logs/msgrtr.apinode.metrics.dmaap-1/00000000000000000000.log
index edd435e..e3e471a 100644
--- a/docker_files/data-kafka/kafka-logs/msgrtr.apinode.metrics.dmaap-1/00000000000000000000.log
+++ b/docker_files/data-kafka/kafka-logs/msgrtr.apinode.metrics.dmaap-1/00000000000000000000.log
diff --git a/docker_files/data-kafka/kafka-logs/recovery-point-offset-checkpoint b/docker_files/data-kafka/kafka-logs/recovery-point-offset-checkpoint
index 0f3e18d..a003b5d 100644
--- a/docker_files/data-kafka/kafka-logs/recovery-point-offset-checkpoint
+++ b/docker_files/data-kafka/kafka-logs/recovery-point-offset-checkpoint
@@ -1,14 +1,27 @@
 0
-12
-PDPD-CONFIGURATION 0 0
-msgrtr.apinode.metrics.dmaap 1 22
-APPC-CL 0 0
-APPC-CL 1 1
+25
+ECOMP-PORTAL-OUTBOX-VID1 0 0
+PDPD-CONFIGURATION 0 2
+msgrtr.apinode.metrics.dmaap 1 26
+unauthenticated.SEC_MEASUREMENT_OUTPUT 1 1
+APPC-TEST2 0 0
+unauthenticated.TCA_EVENT_OUTPUT 1 1
+APPC-TEST1 0 0
+APPC-CL 0 2
+ECOMP-PORTAL-INBOX 0 0
+APPC-CL 1 0
+APPC-TEST2 1 1
+unauthenticated.TCA_EVENT_OUTPUT 0 1
+unauthenticated.SEC_MEASUREMENT_OUTPUT 0 1
 SDC-DISTR-NOTIF-TOPIC-SDC-OPENSOURCE-ENV1 0 0
-POLICY-CL-MGT 1 0
-PDPD-CONFIGURATION 1 1
-DCAE-CL-EVENT 1 0
-msgrtr.apinode.metrics.dmaap 0 24
+POLICY-CL-MGT 1 1
+PDPD-CONFIGURATION 1 0
+DCAE-CL-EVENT 1 1
+msgrtr.apinode.metrics.dmaap 0 4
+ECOMP-PORTAL-OUTBOX-APP1 0 0
+ECOMP-PORTAL-OUTBOX-SDC1 0 0
 POLICY-CL-MGT 0 1
-SDC-DISTR-STATUS-TOPIC-SDC-OPENSOURCE-ENV1 0 6
+SDC-DISTR-STATUS-TOPIC-SDC-OPENSOURCE-ENV1 0 0
 DCAE-CL-EVENT 0 1
+ECOMP-PORTAL-OUTBOX-DBC1 0 0
+ECOMP-PORTAL-OUTBOX-POL1 0 0
diff --git a/docker_files/data-kafka/kafka-logs/replication-offset-checkpoint b/docker_files/data-kafka/kafka-logs/replication-offset-checkpoint
index 0f3e18d..f7064f8 100644
--- a/docker_files/data-kafka/kafka-logs/replication-offset-checkpoint
+++ b/docker_files/data-kafka/kafka-logs/replication-offset-checkpoint
@@ -1,14 +1,27 @@
 0
-12
-PDPD-CONFIGURATION 0 0
-msgrtr.apinode.metrics.dmaap 1 22
-APPC-CL 0 0
-APPC-CL 1 1
+25
+ECOMP-PORTAL-OUTBOX-VID1 0 0
+PDPD-CONFIGURATION 0 2
+msgrtr.apinode.metrics.dmaap 1 26
+unauthenticated.SEC_MEASUREMENT_OUTPUT 1 1
+APPC-TEST2 0 0
+unauthenticated.TCA_EVENT_OUTPUT 1 1
+APPC-TEST1 0 0
+APPC-CL 0 2
+ECOMP-PORTAL-INBOX 0 0
+APPC-CL 1 0
+APPC-TEST2 1 1
+unauthenticated.TCA_EVENT_OUTPUT 0 1
+unauthenticated.SEC_MEASUREMENT_OUTPUT 0 1
 SDC-DISTR-NOTIF-TOPIC-SDC-OPENSOURCE-ENV1 0 0
-POLICY-CL-MGT 1 0
-PDPD-CONFIGURATION 1 1
-DCAE-CL-EVENT 1 0
-msgrtr.apinode.metrics.dmaap 0 24
+POLICY-CL-MGT 1 1
+PDPD-CONFIGURATION 1 0
+DCAE-CL-EVENT 1 1
+msgrtr.apinode.metrics.dmaap 0 11
+ECOMP-PORTAL-OUTBOX-APP1 0 0
+ECOMP-PORTAL-OUTBOX-SDC1 0 0
 POLICY-CL-MGT 0 1
-SDC-DISTR-STATUS-TOPIC-SDC-OPENSOURCE-ENV1 0 6
+SDC-DISTR-STATUS-TOPIC-SDC-OPENSOURCE-ENV1 0 0
 DCAE-CL-EVENT 0 1
+ECOMP-PORTAL-OUTBOX-DBC1 0 0
+ECOMP-PORTAL-OUTBOX-POL1 0 0
diff --git a/docker_files/data-kafka/kafka-logs/unauthenticated.SEC_MEASUREMENT_OUTPUT-0/00000000000000000000.index b/docker_files/data-kafka/kafka-logs/unauthenticated.SEC_MEASUREMENT_OUTPUT-0/00000000000000000000.index
new file mode 100644
index 0000000..6c5d403
--- /dev/null
+++ b/docker_files/data-kafka/kafka-logs/unauthenticated.SEC_MEASUREMENT_OUTPUT-0/00000000000000000000.index
diff --git a/docker_files/data-kafka/kafka-logs/unauthenticated.SEC_MEASUREMENT_OUTPUT-0/00000000000000000000.log b/docker_files/data-kafka/kafka-logs/unauthenticated.SEC_MEASUREMENT_OUTPUT-0/00000000000000000000.log
new file mode 100644
index 0000000..33bee2d
--- /dev/null
+++ b/docker_files/data-kafka/kafka-logs/unauthenticated.SEC_MEASUREMENT_OUTPUT-0/00000000000000000000.log
diff --git a/docker_files/data-kafka/kafka-logs/unauthenticated.SEC_MEASUREMENT_OUTPUT-1/00000000000000000000.index b/docker_files/data-kafka/kafka-logs/unauthenticated.SEC_MEASUREMENT_OUTPUT-1/00000000000000000000.index
new file mode 100644
index 0000000..6c5d403
--- /dev/null
+++ b/docker_files/data-kafka/kafka-logs/unauthenticated.SEC_MEASUREMENT_OUTPUT-1/00000000000000000000.index
diff --git a/docker_files/data-kafka/kafka-logs/unauthenticated.SEC_MEASUREMENT_OUTPUT-1/00000000000000000000.log b/docker_files/data-kafka/kafka-logs/unauthenticated.SEC_MEASUREMENT_OUTPUT-1/00000000000000000000.log
new file mode 100644
index 0000000..69b1e68
--- /dev/null
+++ b/docker_files/data-kafka/kafka-logs/unauthenticated.SEC_MEASUREMENT_OUTPUT-1/00000000000000000000.log
diff --git a/docker_files/data-kafka/kafka-logs/unauthenticated.TCA_EVENT_OUTPUT-0/00000000000000000000.index b/docker_files/data-kafka/kafka-logs/unauthenticated.TCA_EVENT_OUTPUT-0/00000000000000000000.index
new file mode 100644
index 0000000..6c5d403
--- /dev/null
+++ b/docker_files/data-kafka/kafka-logs/unauthenticated.TCA_EVENT_OUTPUT-0/00000000000000000000.index
diff --git a/docker_files/data-kafka/kafka-logs/unauthenticated.TCA_EVENT_OUTPUT-0/00000000000000000000.log b/docker_files/data-kafka/kafka-logs/unauthenticated.TCA_EVENT_OUTPUT-0/00000000000000000000.log
new file mode 100644
index 0000000..68a76bc
--- /dev/null
+++ b/docker_files/data-kafka/kafka-logs/unauthenticated.TCA_EVENT_OUTPUT-0/00000000000000000000.log
diff --git a/docker_files/data-kafka/kafka-logs/unauthenticated.TCA_EVENT_OUTPUT-1/00000000000000000000.index b/docker_files/data-kafka/kafka-logs/unauthenticated.TCA_EVENT_OUTPUT-1/00000000000000000000.index
new file mode 100644
index 0000000..6c5d403
--- /dev/null
+++ b/docker_files/data-kafka/kafka-logs/unauthenticated.TCA_EVENT_OUTPUT-1/00000000000000000000.index
diff --git a/docker_files/data-kafka/kafka-logs/unauthenticated.TCA_EVENT_OUTPUT-1/00000000000000000000.log b/docker_files/data-kafka/kafka-logs/unauthenticated.TCA_EVENT_OUTPUT-1/00000000000000000000.log
new file mode 100644
index 0000000..89ec482
--- /dev/null
+++ b/docker_files/data-kafka/kafka-logs/unauthenticated.TCA_EVENT_OUTPUT-1/00000000000000000000.log
diff --git a/docker_files/data-zookeeper/version-2/log.1 b/docker_files/data-zookeeper/version-2/log.1
index d925fca..f3cb136 100644
--- a/docker_files/data-zookeeper/version-2/log.1
+++ b/docker_files/data-zookeeper/version-2/log.1
diff --git a/docker_files/data-zookeeper/version-2/log.98 b/docker_files/data-zookeeper/version-2/log.103
index a101dca..9b648e2 100644
--- a/docker_files/data-zookeeper/version-2/log.98
+++ b/docker_files/data-zookeeper/version-2/log.103
diff --git a/docker_files/data-zookeeper/version-2/log.125 b/docker_files/data-zookeeper/version-2/log.125
new file mode 100644
index 0000000..0613642
--- /dev/null
+++ b/docker_files/data-zookeeper/version-2/log.125
diff --git a/docker_files/data-zookeeper/version-2/log.b0 b/docker_files/data-zookeeper/version-2/log.175
index d19996d..246370e 100644
--- a/docker_files/data-zookeeper/version-2/log.b0
+++ b/docker_files/data-zookeeper/version-2/log.175
diff --git a/docker_files/dgltest/data.2.5.json b/docker_files/dgltest/data.2.5.json
deleted file mode 100644
index 949b5cb..0000000
--- a/docker_files/dgltest/data.2.5.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "datestamp": "Wed Dec 14 06:14:23 UTC 2016", "appkey": "x100", "appval": "some value" }
diff --git a/docker_files/dgltest/data.3.1.txt b/docker_files/dgltest/data.3.1.txt
deleted file mode 100644
index a03d04d..0000000
--- a/docker_files/dgltest/data.3.1.txt
+++ /dev/null
@@ -1 +0,0 @@
-datestamp: Wed Dec 14 06:14:33 UTC 2016, key: 3.1, value: this is a test 
diff --git a/docker_files/dgltest/data.3.3.json b/docker_files/dgltest/data.3.3.json
deleted file mode 100644
index 5ec7d8e..0000000
--- a/docker_files/dgltest/data.3.3.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "datestamp": "Wed Dec 14 06:14:35 UTC 2016", "key": "3.3", "value": "this is a test" }
diff --git a/docker_files/dgltest/out/2.3.out b/docker_files/dgltest/out/2.3.out
deleted file mode 100644
index 98ffddc..0000000
--- a/docker_files/dgltest/out/2.3.out
+++ /dev/null
@@ -1,6 +0,0 @@
-{"topics": [
-    "msgrtr.apinode.metrics.dmaap",
-    "Topic-11479-2",
-    "11479.3",
-    "Topic-11538-2"
-]}
\ No newline at end of file
diff --git a/docker_files/dgltest/out/2.5.out b/docker_files/dgltest/out/2.5.out
deleted file mode 100644
index 78e55ec..0000000
--- a/docker_files/dgltest/out/2.5.out
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "serverTimeMs": 8,
-    "count": 1
-}
\ No newline at end of file
diff --git a/docker_files/dgltest/out/3.3.out b/docker_files/dgltest/out/3.3.out
deleted file mode 100644
index ed2a213..0000000
--- a/docker_files/dgltest/out/3.3.out
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "serverTimeMs": 3,
-    "count": 1
-}
\ No newline at end of file
diff --git a/docker_files/dgltest/out/3.4.out b/docker_files/dgltest/out/3.4.out
deleted file mode 100644
index f58f5f7..0000000
--- a/docker_files/dgltest/out/3.4.out
+++ /dev/null
@@ -1 +0,0 @@
-["{\"datestamp\":\"Wed Dec 14 06:14:35 UTC 2016\",\"value\":\"this is a test\",\"key\":\"3.3\"}"]
\ No newline at end of file
diff --git a/docker_files/dme2reg/service=com.att.authz.AuthorizationService/version=2.0/envContext=DEV/.gitignore b/docker_files/dme2reg/service=com.att.authz.AuthorizationService/version=2.0/envContext=DEV/.gitignore
deleted file mode 100755
index 25b6eed..0000000
--- a/docker_files/dme2reg/service=com.att.authz.AuthorizationService/version=2.0/envContext=DEV/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/routeOffer=BAU_SE.lock
-/routeOffer=BAU_SE.txt
diff --git a/docker_files/docker-compose.yml b/docker_files/docker-compose.yml
new file mode 100644
index 0000000..dddf153
--- /dev/null
+++ b/docker_files/docker-compose.yml
@@ -0,0 +1,50 @@
+version: '2'
+services:
+  zookeeper:
+    image: wurstmeister/zookeeper
+    ports:
+      - "2181:2181"
+    volumes:
+      - ./data-zookeeper:/opt/zookeeper-3.4.9/data
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "30m"
+        max-file: "5"
+
+  kafka:
+    build: .
+    ports:
+      - "9092:9092"
+    environment:
+      #KAFKA_ADVERTISED_HOST_NAME: 172.17.0.1
+      KAFKA_ADVERTISED_HOST_NAME: kafka
+      KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
+      KAFKA_BROKER_ID: 1
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+      - ./data-kafka:/kafka
+      - ./start-kafka.sh:/start-kafka.sh
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "30m"
+        max-file: "5"
+      
+  dmaap:
+    image: attos/dmaap
+    ports:
+      - "3904:3904"
+      - "3905:3905"
+    volumes:
+      - ./MsgRtrApi.properties:/appl/dmaapMR1/bundleconfig/etc/appprops/MsgRtrApi.properties 
+      - ./cadi.properties:/appl/dmaapMR1/etc/cadi.properties 
+      - ./mykey:/appl/dmaapMR1/etc/keyfile 
+    depends_on:
+      - zookeeper
+      - kafka
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "30m"
+        max-file: "5"
diff --git a/docker_files/env.sh b/docker_files/env.sh
deleted file mode 100644
index c8039e4..0000000
--- a/docker_files/env.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-alias dcup='/opt/docker/docker-compose up'
-alias dcdown='/opt/docker/docker-compose down'
-alias din-kafka='docker exec -it "$(docker ps |grep kafka |cut -b 1-12)" /bin/bash'
-alias din-zk='docker exec -it "$(docker ps |grep zookeeper |cut -b 1-12)" /bin/bash'
-alias dlogs-kafka='docker logs "$(docker ps |grep kafka |cut -b 1-12)"'
-alias dlogs-zk='docker logs "$(docker ps |grep zookeeper |cut -b 1-12)"'
diff --git a/docker_files/init-ecomp-topics.sh b/docker_files/init-ecomp-topics.sh
deleted file mode 100755
index 78fbeae..0000000
--- a/docker_files/init-ecomp-topics.sh
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/bash
-
-# lji: this is the script to run to initialize a MR from its 0 day state to eCOMP topics loaded
-
-HOSTPORT="127.0.0.1:3904"
-ANON_TOPICS="APPC-CL PDPD-CONFIGURATION POLICY-CL-MGT DCAE-CL-EVENT"
-API_TOPICS_SDC="SDC-DISTR-NOTIF-TOPIC-SDC-OPENSOURCE-ENV1 SDC-DISTR-STATUS-TOPIC-SDC-OPENSOURCE-ENV1"
-API_KEYFILE="./uebapikey-sdc"
-
-echo "blah" > /tmp/sample.txt
-
-# list topics
-curl http://${HOSTPORT}/topics
-
-declare -A TOPICS
-
-echo "adding anonymous topics"
-for ANON_TOPIC in $ANON_TOPICS ; do
-  echo "curl  -H "Content-Type:text/plain" -X POST -d @/tmp/sample.txt http://${HOSTPORT}/events/${ANON_TOPIC}"
-  curl  -H "Content-Type:text/plain" -X POST -d @/tmp/sample.txt http://${HOSTPORT}/events/${ANON_TOPIC}
-  echo "done creating anonymous topic $ANON_TOPIC"
-  echo
-done
-
-echo "generating API key"
-echo '{"email":"no email","description":"API key for SDC"}' > /tmp/input.txt
-curl -s -o ${API_KEYFILE} -H "Content-Type:application/json" -X POST -d @/tmp/input.txt http://${HOSTPORT}/apiKeys/create 
-cat ${API_KEYFILE}
-echo
-
-echo "adding API key topics"
-UEBAPIKEYSECRET=`cat ${API_KEYFILE} |jq -r ".secret"`
-UEBAPIKEYKEY=`cat ${API_KEYFILE} |jq -r ".key"`
-for API_TOPIC in $API_TOPICS_SDC; do
-  echo '{"topicName":"'${API_TOPIC}'","topicDescription":"SDC API Key secure topic for ","partitionCount":"1","replicationCount":"1","transactionEnabled":"true"}' > /tmp/topicname.txt
-  time=`date --iso-8601=seconds`
-  signature=$(echo -n "$time" | openssl sha1 -hmac $UEBAPIKEYSECRET -binary | openssl base64)
-  xAuth=$UEBAPIKEYKEY:$signature
-  xDate="$time"
-  echo "curl -i -H "Content-Type: application/json"  -H "X-CambriaAuth:$xAuth"  -H "X-CambriaDate:$xDate" -X POST -d @/tmp/topicname.txt http://${HOSTPORT}/topics/create"
-  curl -i -H "Content-Type: application/json"  -H "X-CambriaAuth:$xAuth"  -H "X-CambriaDate:$xDate" -X POST -d @/tmp/topicname.txt http://${HOSTPORT}/topics/create
-  echo "done creating api key topic $API_TOPIC"
-  echo
-done
-
-
-echo 
-echo "============ post loading state of topics ================="
-for TOPIC in "$API_TOPICS_SDC $ANON_TOPIC"; do
-  curl http://${HOSTPORT}/topics/${TOPIC}
-done 
diff --git a/docker_files/preconfigure-ecomp-keystopics.sh b/docker_files/preconfigure-ecomp-keystopics.sh
new file mode 100755
index 0000000..03cf45c
--- /dev/null
+++ b/docker_files/preconfigure-ecomp-keystopics.sh
@@ -0,0 +1,191 @@
+#!/bin/bash
+
+HOSTPORT="127.0.0.1:3904"
+KEYDIR="."
+
+
+# dictionary of API Keys and the tpics owned by each API key
+declare -A topics
+topics=( \
+["anonymous"]="APPC-CL APPC-TEST2 PDPD-CONFIGURATION POLICY-CL-MGT DCAE-CL-EVENT unauthenticated.SEC_MEASUREMENT_OUTPUT unauthenticated.TCA_EVENT_OUTPUT " \
+["apikey-SDC1"]="SDC-DISTR-NOTIF-TOPIC-SDC-OPENSOURCE-ENV1 SDC-DISTR-STATUS-TOPIC-SDC-OPENSOURCE-ENV1" \
+["apikey-APPC1"]="APPC-TEST1" \
+["apikey-PORTAL1"]="ECOMP-PORTAL-INBOX" \
+["apikey-PORTALAPP1"]="ECOMP-PORTAL-OUTBOX-APP1" \
+["apikey-PORTALDBC1"]="ECOMP-PORTAL-OUTBOX-DBC1" \
+["apikey-PORTALSDC1"]="ECOMP-PORTAL-OUTBOX-SDC1" \
+["apikey-PORTALVID1"]="ECOMP-PORTAL-OUTBOX-VID1" \
+["apikey-PORTALPOL1"]="ECOMP-PORTAL-OUTBOX-POL1" \
+)
+
+# dictionary of producers for each topic
+declare -A acl_producers
+acl_producers=(\
+["SDC-DISTR-NOTIF-TOPIC-SDC-OPENSOURCE-ENV1"]="apikey-sdc1" \
+["SDC-DISTR-STATUS-TOPIC-SDC-OPENSOURCE-ENV1"]="apikey-sdc1" \
+["ECOMP-PORTAL-INBOX"]="apikey-PORTALAPP1 apikey-PORTALDBC1 apikey-PORTALSDC1 apikey-PORTALVID1 apikey-PORTALPOL1" \
+["ECOMP-PORTAL-OUTBOX-APP1"]="apikey-PORTAL1" \
+["ECOMP-PORTAL-OUTBOX-DBC1"]="apikey-PORTAL1" \
+["ECOMP-PORTAL-OUTBOX-SDC1"]="apikey-PORTAL1" \
+["ECOMP-PORTAL-OUTBOX-VID1"]="apikey-PORTAL1" \
+["ECOMP-PORTAL-OUTBOX-POL1"]="apikey-PORTAL1" \
+["APPC-TEST1"]="apikey-APPC1" \
+)
+
+# dictionary of consumers for each topic
+declare -A acl_consumers
+acl_consumers=(\
+["SDC-DISTR-NOTIF-TOPIC-SDC-OPENSOURCE-ENV1"]="apikey-sdc1" \
+["SDC-DISTR-STATUS-TOPIC-SDC-OPENSOURCE-ENV1"]="apikey-sdc1" \
+["ECOMP-PORTAL-INBOX"]="apikey-PORTAL1" \
+["ECOMP-PORTAL-OUTBOX-APP1"]="apikey-PORTALAPP1" \
+["ECOMP-PORTAL-OUTBOX-DBC1"]="apikey-PORTALDBC1" \
+["ECOMP-PORTAL-OUTBOX-SDC1"]="apikey-PORTALSDC1" \
+["ECOMP-PORTAL-OUTBOX-VID1"]="apikey-PORTALVID1" \
+["ECOMP-PORTAL-OUTBOX-POL1"]="apikey-PORTALPOL1" \
+["APPC-TEST1"]="apikey-APPC1" \
+)
+
+myrun () {
+    CMD="$1"
+    echo "CMD:[$CMD]"
+    eval $CMD
+}
+
+getowner () {
+    local -n outowner=$2
+    target_topic="$1"
+    echo "look for owner for $target_topic"
+    for o in "${!topics[@]}"; do 
+        keytopics=${topics[$o]}
+        for topic in ${keytopics}; do
+            if [ "$topic" == "-" ]; then
+                continue
+            fi
+            if [ "$topic" == "$target_topic" ]; then
+                echo "found owner $o"
+                outowner=$o
+                return
+            fi
+        done
+    done
+}
+
+add_acl () {
+    acl_group="$1"
+    topic="$2"
+    client="$3"
+    echo " adding $client to group $acl_group for topic $2"
+
+    getowner "$topic" owner
+    echo "==owner for $topic is $owner"
+
+
+    if [ -z "$owner" ]; then
+        echo "No owner API key found for topic $topic"
+        #exit
+    fi
+    OWNER_API_KEYFILE="${KEYDIR}/${owner}.key"
+    if [ ! -e $API_KEYFILE ]; then
+        echo "No API key file $OWNER_API_KEYFILE for owner $owner of topic $topic, exit "
+        #exit
+    fi 
+
+    CLIENT_API_KEYFILE="${KEYDIR}/${client}.key"
+    if [ ! -e $CLIENT_API_KEYFILE ]; then
+        echo "No API key file $CLIENT_API_KEYFILE for client $client, exit "
+        #exit
+    else
+        CLIENTKEY=`cat ${CLIENT_API_KEYFILE} |jq -r ".key"`
+        UEBAPIKEYSECRET=`cat ${OWNER_API_KEYFILE} |jq -r ".secret"`
+        UEBAPIKEYKEY=`cat ${OWNER_API_KEYFILE} |jq -r ".key"`
+        time=`date --iso-8601=seconds`
+        signature=$(echo -n "$time" | openssl sha1 -hmac $UEBAPIKEYSECRET -binary | openssl base64)
+        xAuth=$UEBAPIKEYKEY:$signature
+        xDate="$time"
+        CMD="curl -i -H \"Content-Type: application/json\"  -H \"X-CambriaAuth:$xAuth\"  -H \"X-CambriaDate:$xDate\" -X PUT http://${HOSTPORT}/topics/${topic}/${acl_group}/${CLIENTKEY}"
+        myrun "$CMD"
+    fi
+}
+
+
+for key in "${!topics[@]}"; do 
+    # try to create key if no such key exists
+    API_KEYFILE="${KEYDIR}/${key}.key"
+    if [ "$key" != "anonymous" ]; then
+        if [ -e ${API_KEYFILE} ]; then
+            echo "API key for $key already exists, no need to create new"
+        else
+            echo "generating API key $key"
+            echo '{"email":"no email","description":"API key for '$key'"}' > /tmp/input.txt
+
+            CMD="curl -s -o ${API_KEYFILE} -H \"Content-Type: application/json\" -X POST -d @/tmp/input.txt http://${HOSTPORT}/apiKeys/create"
+            myrun "$CMD"
+            echo "API key for $key has been created: "; cat ${API_KEYFILE}
+            echo "generating API key $key done"; echo
+        fi
+    fi
+
+    # create the topics for this key
+    keytopics=${topics[$key]}
+    for topic in ${keytopics}; do
+        if [ "$topic" == "-" ]; then
+            continue
+        fi
+        if [ "$key" == "anonymous" ]; then
+            echo "creating anonymous topic $topic"
+            CMD="curl  -H \"Content-Type:text/plain\" -X POST -d @/tmp/sample.txt http://${HOSTPORT}/events/${topic}"
+            myrun "$CMD"
+            echo "done creating anonymous topic $topic"; echo
+        else
+            echo "creating API key secured topic $topic for API key $key"
+            UEBAPIKEYSECRET=`cat ${API_KEYFILE} |jq -r ".secret"`
+            UEBAPIKEYKEY=`cat ${API_KEYFILE} |jq -r ".key"`
+            echo '{"topicName":"'${topic}'","topicDescription":"'$key' API Key secure topic","partitionCount":"1","replicationCount":"1","transactionEnabled":"true"}' > /tmp/topicname.txt
+            time=`date --iso-8601=seconds`
+            signature=$(echo -n "$time" | openssl sha1 -hmac $UEBAPIKEYSECRET -binary | openssl base64)
+            xAuth=$UEBAPIKEYKEY:$signature
+            xDate="$time"
+            CMD="curl -i -H \"Content-Type: application/json\"  -H \"X-CambriaAuth: $xAuth\"  -H \"X-CambriaDate: $xDate\" -X POST -d @/tmp/topicname.txt http://${HOSTPORT}/topics/create"
+            myrun "$CMD"
+            echo "done creating api key topic $topic"
+            echo
+        fi
+    done
+done
+
+
+echo 
+echo "============ post loading state of topics ================="
+CMD="curl http://${HOSTPORT}/topics"
+myrun "$CMD"
+for key in "${!topics[@]}"; do 
+    keytopics=${topics[$key]}
+    echo "---------- key: ${key} "
+    for topic in ${keytopics}; do
+        if [ "$topic" == "-" ]; then
+            continue
+        fi
+        CMD="curl http://${HOSTPORT}/topics/${topic}"
+        myrun "$CMD"
+        echo
+    done
+    echo "end of key: ${key} secured topics"
+done
+
+
+# adding publisher and subscriber ACL 
+for topic in "${!acl_consumers[@]}"; do 
+    consumers=${acl_consumers[$topic]}
+    for consumer in ${consumers}; do
+        add_acl "consumers" "$topic" "$consumer"
+    done
+done
+
+for topic in "${!acl_producers[@]}"; do 
+    producers=${acl_producers[$topic]}
+    for producer in ${producers}; do
+        add_acl "producers" "$topic" "$producer"
+    done
+done
+
diff --git a/docker_files/state-pre1/apikey-PORTAL1.key b/docker_files/state-pre1/apikey-PORTAL1.key
new file mode 100644
index 0000000..a54fd7a
--- /dev/null
+++ b/docker_files/state-pre1/apikey-PORTAL1.key
@@ -0,0 +1,8 @@
+{
+    "aux": {
+        "description": "API key for apikey-PORTAL1",
+        "email": "no email"
+    },
+    "secret": "nZIbXiCvFckyfP3xWHWnwIE9",
+    "key": "J8knmUAxYQhtRMZ4"
+}
\ No newline at end of file
diff --git a/docker_files/state-pre1/apikey-PORTALAPP1.key b/docker_files/state-pre1/apikey-PORTALAPP1.key
new file mode 100644
index 0000000..8e73787
--- /dev/null
+++ b/docker_files/state-pre1/apikey-PORTALAPP1.key
@@ -0,0 +1,8 @@
+{
+    "aux": {
+        "description": "API key for apikey-PORTALAPP1",
+        "email": "no email"
+    },
+    "secret": "NgekpfVn6F1pL34UyWp96pSw",
+    "key": "NuC91YJnVCCw4hOc"
+}
\ No newline at end of file
diff --git a/docker_files/state-pre1/apikey-PORTALDBC1.key b/docker_files/state-pre1/apikey-PORTALDBC1.key
new file mode 100644
index 0000000..a9775d0
--- /dev/null
+++ b/docker_files/state-pre1/apikey-PORTALDBC1.key
@@ -0,0 +1,8 @@
+{
+    "aux": {
+        "description": "API key for apikey-PORTALDBC1",
+        "email": "no email"
+    },
+    "secret": "6XufoJJnGikJE6rco9yfJrpY",
+    "key": "ezXa5SMUCeHHJEHV"
+}
\ No newline at end of file
diff --git a/docker_files/state-pre1/apikey-PORTALPOL1.key b/docker_files/state-pre1/apikey-PORTALPOL1.key
new file mode 100644
index 0000000..47929a7
--- /dev/null
+++ b/docker_files/state-pre1/apikey-PORTALPOL1.key
@@ -0,0 +1,8 @@
+{
+    "aux": {
+        "description": "API key for apikey-PORTALPOL1",
+        "email": "no email"
+    },
+    "secret": "1Qa6wm5FtHLLce9VjBBEeJ9Q",
+    "key": "FCBbMkCqFiZzZYw8"
+}
\ No newline at end of file
diff --git a/docker_files/state-pre1/apikey-PORTALSDC1.key b/docker_files/state-pre1/apikey-PORTALSDC1.key
new file mode 100644
index 0000000..31be4a8
--- /dev/null
+++ b/docker_files/state-pre1/apikey-PORTALSDC1.key
@@ -0,0 +1,8 @@
+{
+    "aux": {
+        "description": "API key for apikey-PORTALSDC1",
+        "email": "no email"
+    },
+    "secret": "MAFye7eBPAggYmBd3giXKu4P",
+    "key": "bxDPf9CmuOEbMwrM"
+}
\ No newline at end of file
diff --git a/docker_files/state-pre1/apikey-PORTALVID1.key b/docker_files/state-pre1/apikey-PORTALVID1.key
new file mode 100644
index 0000000..ec1c489
--- /dev/null
+++ b/docker_files/state-pre1/apikey-PORTALVID1.key
@@ -0,0 +1,8 @@
+{
+    "aux": {
+        "description": "API key for apikey-PORTALVID1",
+        "email": "no email"
+    },
+    "secret": "sc4WpmcEtoTMpyuMZ9GkYsyw",
+    "key": "MWCKW6q1f3sM9NnV"
+}
\ No newline at end of file
diff --git a/docker_files/state-pre1/apikey-SDC1.key b/docker_files/state-pre1/apikey-SDC1.key
new file mode 100644
index 0000000..1ef75ba
--- /dev/null
+++ b/docker_files/state-pre1/apikey-SDC1.key
@@ -0,0 +1,8 @@
+{
+    "aux": {
+        "description": "API key for apikey-SDC1",
+        "email": "no email"
+    },
+    "secret": "sXhbBfzptZfsrx0SX6GNk099",
+    "key": "19KMBpqOAPGbItgW"
+}
\ No newline at end of file
diff --git a/docker_files/state-pre1/data-kafka/kafka-logs/.kafka_cleanshutdown b/docker_files/state-pre1/data-kafka/kafka-logs/.kafka_cleanshutdown
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/docker_files/state-pre1/data-kafka/kafka-logs/.kafka_cleanshutdown
diff --git a/docker_files/state-pre1/data-kafka/kafka-logs/.lock b/docker_files/state-pre1/data-kafka/kafka-logs/.lock
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/docker_files/state-pre1/data-kafka/kafka-logs/.lock
diff --git a/docker_files/state-pre1/data-kafka/kafka-logs/APPC-CL-0/00000000000000000000.index b/docker_files/state-pre1/data-kafka/kafka-logs/APPC-CL-0/00000000000000000000.index
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/docker_files/state-pre1/data-kafka/kafka-logs/APPC-CL-0/00000000000000000000.index
diff --git a/docker_files/state-pre1/data-kafka/kafka-logs/APPC-CL-0/00000000000000000000.log b/docker_files/state-pre1/data-kafka/kafka-logs/APPC-CL-0/00000000000000000000.log
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/docker_files/state-pre1/data-kafka/kafka-logs/APPC-CL-0/00000000000000000000.log
diff --git a/docker_files/state-pre1/data-kafka/kafka-logs/APPC-CL-1/00000000000000000000.index b/docker_files/state-pre1/data-kafka/kafka-logs/APPC-CL-1/00000000000000000000.index
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/docker_files/state-pre1/data-kafka/kafka-logs/APPC-CL-1/00000000000000000000.index
diff --git a/docker_files/state-pre1/data-kafka/kafka-logs/APPC-CL-1/00000000000000000000.log b/docker_files/state-pre1/data-kafka/kafka-logs/APPC-CL-1/00000000000000000000.log
new file mode 100644
index 0000000..2568bfd
--- /dev/null
+++ b/docker_files/state-pre1/data-kafka/kafka-logs/APPC-CL-1/00000000000000000000.log
diff --git a/docker_files/state-pre1/data-kafka/kafka-logs/DCAE-CL-EVENT-0/00000000000000000000.index b/docker_files/state-pre1/data-kafka/kafka-logs/DCAE-CL-EVENT-0/00000000000000000000.index
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/docker_files/state-pre1/data-kafka/kafka-logs/DCAE-CL-EVENT-0/00000000000000000000.index
diff --git a/docker_files/state-pre1/data-kafka/kafka-logs/DCAE-CL-EVENT-0/00000000000000000000.log b/docker_files/state-pre1/data-kafka/kafka-logs/DCAE-CL-EVENT-0/00000000000000000000.log
new file mode 100644
index 0000000..f6c7f1e
--- /dev/null
+++ b/docker_files/state-pre1/data-kafka/kafka-logs/DCAE-CL-EVENT-0/00000000000000000000.log
diff --git a/docker_files/state-pre1/data-kafka/kafka-logs/DCAE-CL-EVENT-1/00000000000000000000.index b/docker_files/state-pre1/data-kafka/kafka-logs/DCAE-CL-EVENT-1/00000000000000000000.index
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/docker_files/state-pre1/data-kafka/kafka-logs/DCAE-CL-EVENT-1/00000000000000000000.index
diff --git a/docker_files/state-pre1/data-kafka/kafka-logs/DCAE-CL-EVENT-1/00000000000000000000.log b/docker_files/state-pre1/data-kafka/kafka-logs/DCAE-CL-EVENT-1/00000000000000000000.log
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/docker_files/state-pre1/data-kafka/kafka-logs/DCAE-CL-EVENT-1/00000000000000000000.log
diff --git a/docker_files/state-pre1/data-kafka/kafka-logs/ECOMP-PORTAL-INBOX-0/00000000000000000000.index b/docker_files/state-pre1/data-kafka/kafka-logs/ECOMP-PORTAL-INBOX-0/00000000000000000000.index
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/docker_files/state-pre1/data-kafka/kafka-logs/ECOMP-PORTAL-INBOX-0/00000000000000000000.index
diff --git a/docker_files/state-pre1/data-kafka/kafka-logs/ECOMP-PORTAL-INBOX-0/00000000000000000000.log b/docker_files/state-pre1/data-kafka/kafka-logs/ECOMP-PORTAL-INBOX-0/00000000000000000000.log
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/docker_files/state-pre1/data-kafka/kafka-logs/ECOMP-PORTAL-INBOX-0/00000000000000000000.log
diff --git a/docker_files/state-pre1/data-kafka/kafka-logs/ECOMP-PORTAL-OUTBOX-APP1-0/00000000000000000000.index b/docker_files/state-pre1/data-kafka/kafka-logs/ECOMP-PORTAL-OUTBOX-APP1-0/00000000000000000000.index
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/docker_files/state-pre1/data-kafka/kafka-logs/ECOMP-PORTAL-OUTBOX-APP1-0/00000000000000000000.index
diff --git a/docker_files/state-pre1/data-kafka/kafka-logs/ECOMP-PORTAL-OUTBOX-APP1-0/00000000000000000000.log b/docker_files/state-pre1/data-kafka/kafka-logs/ECOMP-PORTAL-OUTBOX-APP1-0/00000000000000000000.log
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/docker_files/state-pre1/data-kafka/kafka-logs/ECOMP-PORTAL-OUTBOX-APP1-0/00000000000000000000.log
diff --git a/docker_files/state-pre1/data-kafka/kafka-logs/ECOMP-PORTAL-OUTBOX-DBC1-0/00000000000000000000.index b/docker_files/state-pre1/data-kafka/kafka-logs/ECOMP-PORTAL-OUTBOX-DBC1-0/00000000000000000000.index
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/docker_files/state-pre1/data-kafka/kafka-logs/ECOMP-PORTAL-OUTBOX-DBC1-0/00000000000000000000.index
diff --git a/docker_files/state-pre1/data-kafka/kafka-logs/ECOMP-PORTAL-OUTBOX-DBC1-0/00000000000000000000.log b/docker_files/state-pre1/data-kafka/kafka-logs/ECOMP-PORTAL-OUTBOX-DBC1-0/00000000000000000000.log
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/docker_files/state-pre1/data-kafka/kafka-logs/ECOMP-PORTAL-OUTBOX-DBC1-0/00000000000000000000.log
diff --git a/docker_files/state-pre1/data-kafka/kafka-logs/PDPD-CONFIGURATION-0/00000000000000000000.index b/docker_files/state-pre1/data-kafka/kafka-logs/PDPD-CONFIGURATION-0/00000000000000000000.index
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/docker_files/state-pre1/data-kafka/kafka-logs/PDPD-CONFIGURATION-0/00000000000000000000.index
diff --git a/docker_files/state-pre1/data-kafka/kafka-logs/PDPD-CONFIGURATION-0/00000000000000000000.log b/docker_files/state-pre1/data-kafka/kafka-logs/PDPD-CONFIGURATION-0/00000000000000000000.log
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/docker_files/state-pre1/data-kafka/kafka-logs/PDPD-CONFIGURATION-0/00000000000000000000.log
diff --git a/docker_files/state-pre1/data-kafka/kafka-logs/PDPD-CONFIGURATION-1/00000000000000000000.index b/docker_files/state-pre1/data-kafka/kafka-logs/PDPD-CONFIGURATION-1/00000000000000000000.index
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/docker_files/state-pre1/data-kafka/kafka-logs/PDPD-CONFIGURATION-1/00000000000000000000.index
diff --git a/docker_files/state-pre1/data-kafka/kafka-logs/PDPD-CONFIGURATION-1/00000000000000000000.log b/docker_files/state-pre1/data-kafka/kafka-logs/PDPD-CONFIGURATION-1/00000000000000000000.log
new file mode 100644
index 0000000..8943ae0
--- /dev/null
+++ b/docker_files/state-pre1/data-kafka/kafka-logs/PDPD-CONFIGURATION-1/00000000000000000000.log
diff --git a/docker_files/state-pre1/data-kafka/kafka-logs/POLICY-CL-MGT-0/00000000000000000000.index b/docker_files/state-pre1/data-kafka/kafka-logs/POLICY-CL-MGT-0/00000000000000000000.index
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/docker_files/state-pre1/data-kafka/kafka-logs/POLICY-CL-MGT-0/00000000000000000000.index
diff --git a/docker_files/state-pre1/data-kafka/kafka-logs/POLICY-CL-MGT-0/00000000000000000000.log b/docker_files/state-pre1/data-kafka/kafka-logs/POLICY-CL-MGT-0/00000000000000000000.log
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/docker_files/state-pre1/data-kafka/kafka-logs/POLICY-CL-MGT-0/00000000000000000000.log
diff --git a/docker_files/state-pre1/data-kafka/kafka-logs/POLICY-CL-MGT-1/00000000000000000000.index b/docker_files/state-pre1/data-kafka/kafka-logs/POLICY-CL-MGT-1/00000000000000000000.index
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/docker_files/state-pre1/data-kafka/kafka-logs/POLICY-CL-MGT-1/00000000000000000000.index
diff --git a/docker_files/state-pre1/data-kafka/kafka-logs/POLICY-CL-MGT-1/00000000000000000000.log b/docker_files/state-pre1/data-kafka/kafka-logs/POLICY-CL-MGT-1/00000000000000000000.log
new file mode 100644
index 0000000..4a15a81
--- /dev/null
+++ b/docker_files/state-pre1/data-kafka/kafka-logs/POLICY-CL-MGT-1/00000000000000000000.log
diff --git a/docker_files/state-pre1/data-kafka/kafka-logs/SDC-DISTR-NOTIF-TOPIC-SDC-OPENSOURCE-ENV1-0/00000000000000000000.index b/docker_files/state-pre1/data-kafka/kafka-logs/SDC-DISTR-NOTIF-TOPIC-SDC-OPENSOURCE-ENV1-0/00000000000000000000.index
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/docker_files/state-pre1/data-kafka/kafka-logs/SDC-DISTR-NOTIF-TOPIC-SDC-OPENSOURCE-ENV1-0/00000000000000000000.index
diff --git a/docker_files/state-pre1/data-kafka/kafka-logs/SDC-DISTR-NOTIF-TOPIC-SDC-OPENSOURCE-ENV1-0/00000000000000000000.log b/docker_files/state-pre1/data-kafka/kafka-logs/SDC-DISTR-NOTIF-TOPIC-SDC-OPENSOURCE-ENV1-0/00000000000000000000.log
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/docker_files/state-pre1/data-kafka/kafka-logs/SDC-DISTR-NOTIF-TOPIC-SDC-OPENSOURCE-ENV1-0/00000000000000000000.log
diff --git a/docker_files/state-pre1/data-kafka/kafka-logs/SDC-DISTR-STATUS-TOPIC-SDC-OPENSOURCE-ENV1-0/00000000000000000000.index b/docker_files/state-pre1/data-kafka/kafka-logs/SDC-DISTR-STATUS-TOPIC-SDC-OPENSOURCE-ENV1-0/00000000000000000000.index
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/docker_files/state-pre1/data-kafka/kafka-logs/SDC-DISTR-STATUS-TOPIC-SDC-OPENSOURCE-ENV1-0/00000000000000000000.index
diff --git a/docker_files/state-pre1/data-kafka/kafka-logs/SDC-DISTR-STATUS-TOPIC-SDC-OPENSOURCE-ENV1-0/00000000000000000000.log b/docker_files/state-pre1/data-kafka/kafka-logs/SDC-DISTR-STATUS-TOPIC-SDC-OPENSOURCE-ENV1-0/00000000000000000000.log
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/docker_files/state-pre1/data-kafka/kafka-logs/SDC-DISTR-STATUS-TOPIC-SDC-OPENSOURCE-ENV1-0/00000000000000000000.log
diff --git a/docker_files/state-pre1/data-kafka/kafka-logs/msgrtr.apinode.metrics.dmaap-0/00000000000000000000.index b/docker_files/state-pre1/data-kafka/kafka-logs/msgrtr.apinode.metrics.dmaap-0/00000000000000000000.index
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/docker_files/state-pre1/data-kafka/kafka-logs/msgrtr.apinode.metrics.dmaap-0/00000000000000000000.index
diff --git a/docker_files/state-pre1/data-kafka/kafka-logs/msgrtr.apinode.metrics.dmaap-0/00000000000000000000.log b/docker_files/state-pre1/data-kafka/kafka-logs/msgrtr.apinode.metrics.dmaap-0/00000000000000000000.log
new file mode 100644
index 0000000..ddc8eae
--- /dev/null
+++ b/docker_files/state-pre1/data-kafka/kafka-logs/msgrtr.apinode.metrics.dmaap-0/00000000000000000000.log
diff --git a/docker_files/state-pre1/data-kafka/kafka-logs/msgrtr.apinode.metrics.dmaap-1/00000000000000000000.index b/docker_files/state-pre1/data-kafka/kafka-logs/msgrtr.apinode.metrics.dmaap-1/00000000000000000000.index
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/docker_files/state-pre1/data-kafka/kafka-logs/msgrtr.apinode.metrics.dmaap-1/00000000000000000000.index
diff --git a/docker_files/state-pre1/data-kafka/kafka-logs/msgrtr.apinode.metrics.dmaap-1/00000000000000000000.log b/docker_files/state-pre1/data-kafka/kafka-logs/msgrtr.apinode.metrics.dmaap-1/00000000000000000000.log
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/docker_files/state-pre1/data-kafka/kafka-logs/msgrtr.apinode.metrics.dmaap-1/00000000000000000000.log
diff --git a/docker_files/state-pre1/data-kafka/kafka-logs/recovery-point-offset-checkpoint b/docker_files/state-pre1/data-kafka/kafka-logs/recovery-point-offset-checkpoint
new file mode 100644
index 0000000..3197f49
--- /dev/null
+++ b/docker_files/state-pre1/data-kafka/kafka-logs/recovery-point-offset-checkpoint
@@ -0,0 +1,21 @@
+0
+19
+PDPD-CONFIGURATION 0 0
+msgrtr.apinode.metrics.dmaap 1 0
+unauthenticated.SEC_MEASUREMENT_OUTPUT 1 0
+unauthenticated.TCA_EVENT_OUTPUT 1 1
+APPC-CL 0 0
+ECOMP-PORTAL-INBOX 0 0
+APPC-CL 1 1
+unauthenticated.TCA_EVENT_OUTPUT 0 0
+unauthenticated.SEC_MEASUREMENT_OUTPUT 0 1
+SDC-DISTR-NOTIF-TOPIC-SDC-OPENSOURCE-ENV1 0 0
+POLICY-CL-MGT 1 1
+PDPD-CONFIGURATION 1 1
+DCAE-CL-EVENT 1 0
+msgrtr.apinode.metrics.dmaap 0 1
+ECOMP-PORTAL-OUTBOX-APP1 0 0
+POLICY-CL-MGT 0 0
+SDC-DISTR-STATUS-TOPIC-SDC-OPENSOURCE-ENV1 0 0
+DCAE-CL-EVENT 0 1
+ECOMP-PORTAL-OUTBOX-DBC1 0 0
diff --git a/docker_files/state-pre1/data-kafka/kafka-logs/replication-offset-checkpoint b/docker_files/state-pre1/data-kafka/kafka-logs/replication-offset-checkpoint
new file mode 100644
index 0000000..3197f49
--- /dev/null
+++ b/docker_files/state-pre1/data-kafka/kafka-logs/replication-offset-checkpoint
@@ -0,0 +1,21 @@
+0
+19
+PDPD-CONFIGURATION 0 0
+msgrtr.apinode.metrics.dmaap 1 0
+unauthenticated.SEC_MEASUREMENT_OUTPUT 1 0
+unauthenticated.TCA_EVENT_OUTPUT 1 1
+APPC-CL 0 0
+ECOMP-PORTAL-INBOX 0 0
+APPC-CL 1 1
+unauthenticated.TCA_EVENT_OUTPUT 0 0
+unauthenticated.SEC_MEASUREMENT_OUTPUT 0 1
+SDC-DISTR-NOTIF-TOPIC-SDC-OPENSOURCE-ENV1 0 0
+POLICY-CL-MGT 1 1
+PDPD-CONFIGURATION 1 1
+DCAE-CL-EVENT 1 0
+msgrtr.apinode.metrics.dmaap 0 1
+ECOMP-PORTAL-OUTBOX-APP1 0 0
+POLICY-CL-MGT 0 0
+SDC-DISTR-STATUS-TOPIC-SDC-OPENSOURCE-ENV1 0 0
+DCAE-CL-EVENT 0 1
+ECOMP-PORTAL-OUTBOX-DBC1 0 0
diff --git a/docker_files/state-pre1/data-kafka/kafka-logs/unauthenticated.SEC_MEASUREMENT_OUTPUT-0/00000000000000000000.index b/docker_files/state-pre1/data-kafka/kafka-logs/unauthenticated.SEC_MEASUREMENT_OUTPUT-0/00000000000000000000.index
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/docker_files/state-pre1/data-kafka/kafka-logs/unauthenticated.SEC_MEASUREMENT_OUTPUT-0/00000000000000000000.index
diff --git a/docker_files/state-pre1/data-kafka/kafka-logs/unauthenticated.SEC_MEASUREMENT_OUTPUT-0/00000000000000000000.log b/docker_files/state-pre1/data-kafka/kafka-logs/unauthenticated.SEC_MEASUREMENT_OUTPUT-0/00000000000000000000.log
new file mode 100644
index 0000000..9371ed0
--- /dev/null
+++ b/docker_files/state-pre1/data-kafka/kafka-logs/unauthenticated.SEC_MEASUREMENT_OUTPUT-0/00000000000000000000.log
diff --git a/docker_files/state-pre1/data-kafka/kafka-logs/unauthenticated.SEC_MEASUREMENT_OUTPUT-1/00000000000000000000.index b/docker_files/state-pre1/data-kafka/kafka-logs/unauthenticated.SEC_MEASUREMENT_OUTPUT-1/00000000000000000000.index
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/docker_files/state-pre1/data-kafka/kafka-logs/unauthenticated.SEC_MEASUREMENT_OUTPUT-1/00000000000000000000.index
diff --git a/docker_files/state-pre1/data-kafka/kafka-logs/unauthenticated.SEC_MEASUREMENT_OUTPUT-1/00000000000000000000.log b/docker_files/state-pre1/data-kafka/kafka-logs/unauthenticated.SEC_MEASUREMENT_OUTPUT-1/00000000000000000000.log
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/docker_files/state-pre1/data-kafka/kafka-logs/unauthenticated.SEC_MEASUREMENT_OUTPUT-1/00000000000000000000.log
diff --git a/docker_files/state-pre1/data-kafka/kafka-logs/unauthenticated.TCA_EVENT_OUTPUT-0/00000000000000000000.index b/docker_files/state-pre1/data-kafka/kafka-logs/unauthenticated.TCA_EVENT_OUTPUT-0/00000000000000000000.index
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/docker_files/state-pre1/data-kafka/kafka-logs/unauthenticated.TCA_EVENT_OUTPUT-0/00000000000000000000.index
diff --git a/docker_files/state-pre1/data-kafka/kafka-logs/unauthenticated.TCA_EVENT_OUTPUT-0/00000000000000000000.log b/docker_files/state-pre1/data-kafka/kafka-logs/unauthenticated.TCA_EVENT_OUTPUT-0/00000000000000000000.log
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/docker_files/state-pre1/data-kafka/kafka-logs/unauthenticated.TCA_EVENT_OUTPUT-0/00000000000000000000.log
diff --git a/docker_files/state-pre1/data-kafka/kafka-logs/unauthenticated.TCA_EVENT_OUTPUT-1/00000000000000000000.index b/docker_files/state-pre1/data-kafka/kafka-logs/unauthenticated.TCA_EVENT_OUTPUT-1/00000000000000000000.index
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/docker_files/state-pre1/data-kafka/kafka-logs/unauthenticated.TCA_EVENT_OUTPUT-1/00000000000000000000.index
diff --git a/docker_files/state-pre1/data-kafka/kafka-logs/unauthenticated.TCA_EVENT_OUTPUT-1/00000000000000000000.log b/docker_files/state-pre1/data-kafka/kafka-logs/unauthenticated.TCA_EVENT_OUTPUT-1/00000000000000000000.log
new file mode 100644
index 0000000..9b80295
--- /dev/null
+++ b/docker_files/state-pre1/data-kafka/kafka-logs/unauthenticated.TCA_EVENT_OUTPUT-1/00000000000000000000.log
diff --git a/docker_files/state-pre1/data-zookeeper/version-2/log.1 b/docker_files/state-pre1/data-zookeeper/version-2/log.1
new file mode 100644
index 0000000..e301ff0
--- /dev/null
+++ b/docker_files/state-pre1/data-zookeeper/version-2/log.1
diff --git a/docker_files/subscriber.sh b/docker_files/subscriber.sh
new file mode 100755
index 0000000..3e193f0
--- /dev/null
+++ b/docker_files/subscriber.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+
+GET/events/{topic}/{consumerGroup}/{clientId}
diff --git a/docker_files/dgltest/data.2.2.json b/docker_files/tests/data.2.2.json
index 277690d..c1bcdfd 100644
--- a/docker_files/dgltest/data.2.2.json
+++ b/docker_files/tests/data.2.2.json
@@ -1 +1 @@
-{ "topicName": "Topic-11538-2", "topicDescription": "topic for test 2.2", "partitionCount": "1", "replicationCount": "1", "transactionEnabled": "true" }
+{ "topicName": "Topic-28592-2", "topicDescription": "topic for test 2.2", "partitionCount": "1", "replicationCount": "1", "transactionEnabled": "true" }
diff --git a/docker_files/tests/data.2.5.json b/docker_files/tests/data.2.5.json
new file mode 100644
index 0000000..75bade1
--- /dev/null
+++ b/docker_files/tests/data.2.5.json
@@ -0,0 +1 @@
+{ "datestamp": "Thu Dec 15 19:50:28 UTC 2016", "appkey": "x100", "appval": "some value" }
diff --git a/docker_files/tests/data.3.1.txt b/docker_files/tests/data.3.1.txt
new file mode 100644
index 0000000..c6a738a
--- /dev/null
+++ b/docker_files/tests/data.3.1.txt
@@ -0,0 +1 @@
+datestamp: Thu Dec 15 19:50:38 UTC 2016, key: 3.1, value: this is a test 
diff --git a/docker_files/tests/data.3.3.json b/docker_files/tests/data.3.3.json
new file mode 100644
index 0000000..9866789
--- /dev/null
+++ b/docker_files/tests/data.3.3.json
@@ -0,0 +1 @@
+{ "datestamp": "Thu Dec 15 19:50:40 UTC 2016", "key": "3.3", "value": "this is a test" }
diff --git a/docker_files/dgltest/key.req b/docker_files/tests/key.req
index a7e4092..a7e4092 100644
--- a/docker_files/dgltest/key.req
+++ b/docker_files/tests/key.req
diff --git a/docker_files/dgltest/out/1.1.out b/docker_files/tests/out/1.1.out
index 6fc17f8..a9488d8 100644
--- a/docker_files/dgltest/out/1.1.out
+++ b/docker_files/tests/out/1.1.out
@@ -1,5 +1,5 @@
 {"topics": [
     "msgrtr.apinode.metrics.dmaap",
-    "Topic-11479-2",
-    "11479.3"
+    "28537.3",
+    "Topic-28537-2"
 ]}
\ No newline at end of file
diff --git a/docker_files/dgltest/out/2.1.out b/docker_files/tests/out/2.1.out
index 514bdca..ef4eada 100644
--- a/docker_files/dgltest/out/2.1.out
+++ b/docker_files/tests/out/2.1.out
@@ -3,6 +3,6 @@
         "description": "request for direct response KEY",
         "email": "no.email"
     },
-    "secret": "ckvKmWw5JAtxVYroWNM0bNZh",
-    "key": "Hje2R7zy89VTLufl"
+    "secret": "5V6YSDm8R6v6TArrLLtJUx4L",
+    "key": "HnJm7b9Zr16hgpU5"
 }
\ No newline at end of file
diff --git a/docker_files/dgltest/out/2.2.out b/docker_files/tests/out/2.2.out
index f636b9d..d682023 100644
--- a/docker_files/dgltest/out/2.2.out
+++ b/docker_files/tests/out/2.2.out
@@ -1,10 +1,10 @@
 {
-    "owner": "Hje2R7zy89VTLufl",
+    "owner": "HnJm7b9Zr16hgpU5",
     "readerAcl": {
         "enabled": true,
         "users": []
     },
-    "name": "Topic-11538-2",
+    "name": "Topic-28592-2",
     "description": "topic for test 2.2",
     "writerAcl": {
         "enabled": true,
diff --git a/docker_files/tests/out/2.3.out b/docker_files/tests/out/2.3.out
new file mode 100644
index 0000000..d62034e
--- /dev/null
+++ b/docker_files/tests/out/2.3.out
@@ -0,0 +1,6 @@
+{"topics": [
+    "Topic-28592-2",
+    "msgrtr.apinode.metrics.dmaap",
+    "28537.3",
+    "Topic-28537-2"
+]}
\ No newline at end of file
diff --git a/docker_files/dgltest/out/2.4.out b/docker_files/tests/out/2.4.out
index f636b9d..d682023 100644
--- a/docker_files/dgltest/out/2.4.out
+++ b/docker_files/tests/out/2.4.out
@@ -1,10 +1,10 @@
 {
-    "owner": "Hje2R7zy89VTLufl",
+    "owner": "HnJm7b9Zr16hgpU5",
     "readerAcl": {
         "enabled": true,
         "users": []
     },
-    "name": "Topic-11538-2",
+    "name": "Topic-28592-2",
     "description": "topic for test 2.2",
     "writerAcl": {
         "enabled": true,
diff --git a/docker_files/tests/out/2.5.out b/docker_files/tests/out/2.5.out
new file mode 100644
index 0000000..670bf46
--- /dev/null
+++ b/docker_files/tests/out/2.5.out
@@ -0,0 +1,4 @@
+{
+    "serverTimeMs": 9,
+    "count": 1
+}
\ No newline at end of file
diff --git a/docker_files/dgltest/out/2.6.out b/docker_files/tests/out/2.6.out
index 0637a08..0637a08 100644
--- a/docker_files/dgltest/out/2.6.out
+++ b/docker_files/tests/out/2.6.out
diff --git a/docker_files/dgltest/out/3.1.out b/docker_files/tests/out/3.1.out
index d2a9b4e..d2a9b4e 100644
--- a/docker_files/dgltest/out/3.1.out
+++ b/docker_files/tests/out/3.1.out
diff --git a/docker_files/dgltest/out/3.2.out b/docker_files/tests/out/3.2.out
index 0637a08..0637a08 100644
--- a/docker_files/dgltest/out/3.2.out
+++ b/docker_files/tests/out/3.2.out
diff --git a/docker_files/tests/out/3.3.out b/docker_files/tests/out/3.3.out
new file mode 100644
index 0000000..b823f1c
--- /dev/null
+++ b/docker_files/tests/out/3.3.out
@@ -0,0 +1,4 @@
+{
+    "serverTimeMs": 2,
+    "count": 1
+}
\ No newline at end of file
diff --git a/docker_files/tests/out/3.4.out b/docker_files/tests/out/3.4.out
new file mode 100644
index 0000000..9930076
--- /dev/null
+++ b/docker_files/tests/out/3.4.out
@@ -0,0 +1 @@
+["{\"datestamp\":\"Thu Dec 15 19:50:40 UTC 2016\",\"value\":\"this is a test\",\"key\":\"3.3\"}"]
\ No newline at end of file
diff --git a/docker_files/dgltest/regress.sh b/docker_files/tests/regress.sh
index 758dd7c..758dd7c 100755
--- a/docker_files/dgltest/regress.sh
+++ b/docker_files/tests/regress.sh
diff --git a/docker_files/ljitest/test.sh b/docker_files/tests/test.sh
index 0e06d5a..0e06d5a 100644..100755
--- a/docker_files/ljitest/test.sh
+++ b/docker_files/tests/test.sh
diff --git a/prep-vm1-message-router.sh b/prep-vm1-message-router.sh
new file mode 100755
index 0000000..d884071
--- /dev/null
+++ b/prep-vm1-message-router.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+set -e
+
+# Assuming running this script from a VM that is spun up by Open eCOMP HEAT template.  
+# Hence it has the git and docker registry configurations provided as files under /opt/config 
+
+if [ -e /opt/config/gitlab_repo.txt ]; then
+  export GIT_PATH=`cat cat /opt/config/gitlab_repo.txt`
+fi
+if [ -e /opt/config/gitlab_username.txt ]; then
+  export GIT_USERNAME=`cat /opt/config/gitlab_username.txt`
+fi
+if [ -e /opt/config/gitlab_password.txt ]; then
+  export GIT_PASSWORD=`cat /opt/config/gitlab_password.txt`
+fi
+if [ -e /opt/config/gitlab_branch.txt ]; then
+  export GIT_BRANCH=`cat /opt/config/gitlab_branch.txt`
+else
+  export GIT_BRANCH="master"
+fi
+
+
+
+#https://23.253.149.175/lj1412/dcae-startup-vm-message-router
+
+
+git -c http.sslVerify=false clone -b ${GIT_BRANCH} https://${GIT_USERNAME}:${GIT_PASSWORD}@${GIT_PATH}/dcae-startup-vm-message-router.git
+cd dcae-startup-vm-message-router && ./deploy.sh
+