Merge "Added support for publishing PM Mapper"

10 files changed, 110 insertions, 198 deletions

diff --git a/plans/dcaegen2-pmmapper/pmmapper/assets/addSubscriber.json b/plans/dcaegen2-pmmapper/pmmapper/assets/addSubscriber.json
new file mode 100644
index 00000000..43a4a65c
--- /dev/null
+++ b/plans/dcaegen2-pmmapper/pmmapper/assets/addSubscriber.json
@@ -0,0 +1,20 @@
+{
+    "delivery":{
+       "url":"http://dcae-pm-mapper.onap.svc.cluster.local:8081/delivery",
+       "user":"username",
+       "password":"password",
+       "use100":true
+    },
+    "follow_redirect":false,
+    "metadataOnly":false,
+    "suspend":false,
+    "groupid":0,
+    "links":{
+       "self": "https://dmaap-dr-prov/subscribe/1",
+       "log": "https://dmaap-dr-prov/feedlog/1",
+       "feed": "https://dmaap-dr-prov/feed/1"
+    },
+    "subscriber":"pmmapper",
+    "decompress":true,
+    "privilegedSubscriber": true
+ }
\ No newline at end of file
diff --git a/plans/dcaegen2-pmmapper/pmmapper/assets/config.json b/plans/dcaegen2-pmmapper/pmmapper/assets/config.json
index 79b32012..62e4f402 100644
--- a/plans/dcaegen2-pmmapper/pmmapper/assets/config.json
+++ b/plans/dcaegen2-pmmapper/pmmapper/assets/config.json
@@ -7,10 +7,10 @@
             "aaf_password": null,
             "dmaap_info": {
                 "location": "csit-pmmapper",
-                "delivery_url": "http://3gpppmmapper:8081/delivery",
+                "delivery_url": "http://dcae-pm-mapper.onap.svc.cluster.local:8081/delivery",
                 "username": "username",
                 "password": "password",
-                "subscriber_id": "subscriber_id"
+                "subscriber_id": "1"
             }
         }
     },
@@ -19,7 +19,7 @@
             "type": "message_router",
             "aaf_password": null,
             "dmaap_info": {
-                "topic_url": "http://message-router:3904/events/topic.org.onap.dmaap.mr.test1",
+                "topic_url": "http://message-router:3904/events/PM_MAPPER",
                 "client_role": "org.onap.dmaap.mr.topic",
                 "location": "csit-pmmapper",
                 "client_id": null
@@ -27,8 +27,13 @@
             "aaf_username": null
         }
     },
-    "dmaap_dr_feed_id": "1",
-    "buscontroller_feed_subscription_endpoint": "http://dmaap-bc:8080/webapi/dr_subs",
-    "dmaap_dr_delete_endpoint": "http://dmaap-dr-node:8443/delete",
-    "services_calls": {}
+    "dmaap_dr_feed_name": "1",
+    "dmaap_dr_delete_endpoint": "https://dmaap-dr-node:8443/delete",
+    "services_calls": {},
+    "enable_http": true,
+    "key_store_path": "/opt/app/pm-mapper/etc/cert/cert.jks.b64",
+    "key_store_pass_path": "/opt/app/pm-mapper/etc/cert/jks.pass",
+    "trust_store_path": "/opt/app/pm-mapper/etc/cert/trust.jks.b64",
+    "trust_store_pass_path": "/opt/app/pm-mapper/etc/cert/trust.pass"
+
 }
\ No newline at end of file
diff --git a/plans/dcaegen2-pmmapper/pmmapper/assets/createFeed.json b/plans/dcaegen2-pmmapper/pmmapper/assets/createFeed.json
new file mode 100644
index 00000000..f93633dc
--- /dev/null
+++ b/plans/dcaegen2-pmmapper/pmmapper/assets/createFeed.json
@@ -0,0 +1,18 @@
+{
+    "name": "PM Mapper Feed",
+    "version": "m1.0",
+    "description": "PM Mapper Feed",
+    "business_description": "PM Mapper",
+    "suspend": false,
+    "deleted": false,
+    "changeowner": true,
+    "authorization": {
+      "classification": "unclassified",
+      "endpoint_addrs": [],
+      "endpoint_ids": [
+        {
+          "password": "pmmapper",
+          "id": "pmmapper"
+        }]
+    }
+  }
\ No newline at end of file
diff --git a/plans/dcaegen2-pmmapper/pmmapper/assets/createTopic.json b/plans/dcaegen2-pmmapper/pmmapper/assets/createTopic.json
new file mode 100644
index 00000000..c1a296dc
--- /dev/null
+++ b/plans/dcaegen2-pmmapper/pmmapper/assets/createTopic.json
@@ -0,0 +1,5 @@
+{ 
+    "topicName":"PM_MAPPER",
+    "topicDescription":"PM Mapper VES Event",
+    "owner":"pmmapper"
+}
\ No newline at end of file
diff --git a/plans/dcaegen2-pmmapper/pmmapper/assets/docker-databus-controller.conf b/plans/dcaegen2-pmmapper/pmmapper/assets/docker-databus-controller.conf
deleted file mode 100644
index 6ec13797..00000000
--- a/plans/dcaegen2-pmmapper/pmmapper/assets/docker-databus-controller.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-# environment settings for Dmaap Bus Controller Integration Test.
-DMAAPBC_INT_HTTPS_PORT=8443
-DMAAPBC_INSTANCE_NAME=ONAP-CSIT
-DMAAPBC_MR_CNAME=DMAAPMR
-DMAAPBC_DRPROV_FQDN=DMAAPDR
-DMAAPBC_CSIT=Yes
-DMAAPBC_PG_ENABLED=false
\ No newline at end of file
diff --git a/plans/dcaegen2-pmmapper/pmmapper/composefile/docker-compose-e2e.yml b/plans/dcaegen2-pmmapper/pmmapper/composefile/docker-compose-e2e.yml
index 99361d40..c972bd7a 100644
--- a/plans/dcaegen2-pmmapper/pmmapper/composefile/docker-compose-e2e.yml
+++ b/plans/dcaegen2-pmmapper/pmmapper/composefile/docker-compose-e2e.yml
@@ -1,7 +1,7 @@
 version: '2.1'
 services:
   datarouter-prov:
-    image: nexus3.onap.org:10001/onap/dmaap/datarouter-prov:2.0.1
+    image: nexus3.onap.org:10001/onap/dmaap/datarouter-prov:2.0.2-SNAPSHOT-latest
     container_name: datarouter-prov
     hostname: dmaap-dr-prov
     ports:
@@ -20,9 +20,12 @@ services:
       interval: 10s
       timeout: 10s
       retries: 5
+    extra_hosts:
+      - "dmaap-dr-node:1.1.1.1"
+      - "dcae-pm-mapper.onap.svc.cluster.local:3.3.3.3"
 
   datarouter-node:
-    image: nexus3.onap.org:10001/onap/dmaap/datarouter-node:2.0.1
+    image: nexus3.onap.org:10001/onap/dmaap/datarouter-node:2.0.2-SNAPSHOT-latest
     container_name: datarouter-node
     hostname: dmaap-dr-node
     ports:
@@ -33,6 +36,9 @@ services:
     depends_on:
       datarouter-prov:
         condition: service_healthy
+    extra_hosts:
+      - "dmaap-dr-prov:2.2.2.2"
+      - "dcae-pm-mapper.onap.svc.cluster.local:3.3.3.3"
 
   mariadb_container:
     image: mariadb:10.2.14
@@ -58,18 +64,4 @@ services:
     container_name: cbs
     image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.platform.configbinding.app-app:latest
     environment:
-       CONSUL_HOST:
-
-  buscontroller:
-    container_name: buscontroller
-    image: nexus3.onap.org:10001/onap/dmaap/dmaap-bc:latest
-    ports:
-      - "18080:8080"
-      - "18443:8443"
-    extra_hosts:
-      - "dmaap-dr-prov:DMAAPDR"
-      - "message-router:DMAAPMR"
-    volumes:
-      - /tmp/docker-databus-controller.conf:/opt/app/config/conf
-    depends_on:
-      - datarouter-prov
\ No newline at end of file
+       CONSUL_HOST:
\ No newline at end of file
diff --git a/plans/dcaegen2-pmmapper/pmmapper/composefile/docker-compose-pmmapper.yml b/plans/dcaegen2-pmmapper/pmmapper/composefile/docker-compose-pmmapper.yml
index a7f5b973..bf03d1f1 100644
--- a/plans/dcaegen2-pmmapper/pmmapper/composefile/docker-compose-pmmapper.yml
+++ b/plans/dcaegen2-pmmapper/pmmapper/composefile/docker-compose-pmmapper.yml
@@ -2,7 +2,7 @@ version: '2.1'
 services:
   pmmapper:
     container_name: pmmapper
-    image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.pm-mapper
+    image: dfarrelly/onap:csit
     ports:
      - "8081:8081"
     environment:
@@ -10,6 +10,5 @@ services:
        CONFIG_BINDING_SERVICE_SERVICE_PORT: 10000
        HOSTNAME: pmmapper
     extra_hosts:
-      - "dmaap-bc:BUSIP"
-      - "dmaap-dr-node:DRNODEIP"
-      - "message-router:DMAAPMRIP"
+      - "dmaap-dr-node:1.1.1.1"
+      - "message-router:4.4.4.4"
diff --git a/plans/dcaegen2-pmmapper/pmmapper/dmaapbc.sh b/plans/dcaegen2-pmmapper/pmmapper/dmaapbc.sh
deleted file mode 100755
index 14302589..00000000
--- a/plans/dcaegen2-pmmapper/pmmapper/dmaapbc.sh
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/bin/bash
-# $1 is the IP address of the buscontroller
-
-# INITIALIZE: dmaap object
-echo $'\nInitializing /dmaap endpoint'
-JSON=/tmp/dmaap.json
-cat << EOF > $JSON
-{
-"version": "1",
-"topicNsRoot": "topic.org.onap.dmaap",
-"drProvUrl": "https://dmaap-dr-prov:8443",
-"dmaapName": "mr",
-"bridgeAdminTopic": "MM_AGENT_PROV"
-
-}
-EOF
-curl -v -X POST -d @${JSON} -H "Content-Type: application/json" http://$1:8080/webapi/dmaap
-
-# INITIALIZE: dcaeLocation object
-echo $'\nInitializing /dcaeLocations endpoint'
-JSON=/tmp/dcaeLocation.json
-cat << EOF > $JSON
-{
-"dcaeLocationName": "csit-pmmapper",
-"dcaeLayer": "central-cloud",
-"clli": "CSIT",
-"zone": "zoneA"
-}
-EOF
-curl -v -X POST -d @${JSON} -H "Content-Type: application/json" http://$1:8080/webapi/dcaeLocations
-
-# INITIALIZE: MR object in 1 site
-echo $'\nInitializing /mr_clusters endpoint'
-DMAAP=$(docker ps -a -q --filter="name=dmaap_1")
-DMAAP_MR_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $DMAAP)
-JSON=/tmp/mr.json
-cat << EOF > $JSON
-{
-"dcaeLocationName": "csit-pmmapper",
-"fqdn": "${DMAAP_MR_IP}",
-"topicProtocol" : "http",
-"topicPort": "3904"
-}
-EOF
-curl -v -X POST -d @${JSON} -H "Content-Type: application/json" http://$1:8080/webapi/mr_clusters
-
-# CREATING: DR feed
-echo $'\nInitializing /feeds endpoint'
-JSON=/tmp/feed.json
-cat << EOF > $JSON
-{
-"feedName":"pmmapper",
-"feedVersion": "1",
-"feedDescription":"PM Mapper Feed",
-"owner":"bulkpm",
-"asprClassification": "unclassified",
-"pubs": [
-        {
-            "dcaeLocationName": "csit-pmmapper",
-            "feedId": "1",
-            "lastMod": "2015-01-01T15:00:00.000Z",
-            "pubId": "10",
-            "status": "EMPTY",
-            "username": "pmmapper",
-            "userpwd": "pmmapper"
-        }
-        ]
-}
-EOF
-curl -v -X POST -d @${JSON} -H "Content-Type: application/json" http://$1:8080/webapi/feeds
-
-# CREATING: MR Topic
-echo $'\nInitializing /topic endpoint'
-JSON=/tmp/topic.json
-cat << EOF > $JSON
-{
-"topicName":"test1",
-"topicDescription":"PM Mapper - VES Event",
-"owner":"pmmapper"
-}
-EOF
-curl -v -X POST -d @${JSON} -H "Content-Type: application/json" http://$1:8080/webapi/topics
-
-# CREATING: MR Client
-echo $'\nInitializing /mr_clients endpoint'
-JSON=/tmp/mrclients.json
-cat << EOF > $JSON
-{
-"fqtn": "topic.org.onap.dmaap.mr.test1",
-"dcaeLocationName": "csit-pmmapper",
-"clientRole": "org.onap.dmaap.mr.topic",
-"action": [ "pub", "view" ]
-}
-EOF
-curl -v -X POST -d @${JSON} -H "Content-Type: application/json" http://$1:8080/webapi/mr_clients
-sleep 5
\ No newline at end of file
diff --git a/plans/dcaegen2-pmmapper/pmmapper/setup.sh b/plans/dcaegen2-pmmapper/pmmapper/setup.sh
index 18d82373..5a0339ea 100644
--- a/plans/dcaegen2-pmmapper/pmmapper/setup.sh
+++ b/plans/dcaegen2-pmmapper/pmmapper/setup.sh
@@ -18,20 +18,6 @@ ZOOKEEPER=$(docker ps -a -q --filter="name=zookeeper_1")
 KAFKA=$(docker ps -a -q --filter="name=kafka_1")
 DMAAP=$(docker ps -a -q --filter="name=dmaap_1")
 
-# Wait for initialization of Docker contaienr for DMaaP MR, Kafka and Zookeeper
-for i in {1..10}; do
-if [ $(docker inspect --format '{{ .State.Running }}' $KAFKA) ] && \
-[ $(docker inspect --format '{{ .State.Running }}' $ZOOKEEPER) ] && \
-[ $(docker inspect --format '{{ .State.Running }}' $DMAAP) ]
-then
-   echo "DMaaP Service Running"
-   break
-else
-   echo sleep $i
-   sleep $i
-fi
-done
-
 # Get IP address of KAFKA, Zookeeper
 KAFKA_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $KAFKA)
 ZOOKEEPER_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $ZOOKEEPER)
@@ -51,7 +37,7 @@ sleep 5
 # Get IP address of DMAAP Message Router.
 DMAAP_MR_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $DMAAP)
 
-# Clone DMaaP Data Router repo and Initialization of Data Router, Consul, Config Binding Service and Buscontroller
+# Clone DMaaP Data Router repo and Initialization of Data Router, Consul, Config Binding Service
 mkdir -p $WORKSPACE/archives/dmaapdr
 cd $WORKSPACE/archives/dmaapdr
 git clone --depth 1 https://gerrit.onap.org/r/dmaap/datarouter -b master
@@ -59,13 +45,10 @@ cd $WORKSPACE/archives/dmaapdr/datarouter/datarouter-docker-compose/src/main/res
 mkdir docker-compose
 cd $WORKSPACE/archives/dmaapdr/datarouter/datarouter-docker-compose/src/main/resources/docker-compose
 cp $WORKSPACE/plans/dcaegen2-pmmapper/pmmapper/composefile/docker-compose-e2e.yml $WORKSPACE/archives/dmaapdr/datarouter/datarouter-docker-compose/src/main/resources/docker-compose/docker-compose.yml
-cp $WORKSPACE/plans/dcaegen2-pmmapper/pmmapper/assets/docker-databus-controller.conf /tmp/
-sed -i 's/DMAAPMR/'$DMAAP_MR_IP'/g' /tmp/docker-databus-controller.conf
 docker login -u docker -p docker nexus3.onap.org:10001
 docker-compose up -d
 echo "Disregard the message ERROR: for datarouter-node  Container 1234456 is unhealthy, this is expected behaiour at this stage"
-docker kill datarouter-prov
-docker kill datarouter-node
+sleep 10
 docker kill cbs
 CONSUL_IP=$(docker inspect '--format={{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' consul )
 sed -i -e '/CONSUL_HOST:/ s/:.*/: '$CONSUL_IP'/' docker-compose.yml
@@ -73,46 +56,13 @@ MARIADB=$(docker inspect '--format={{range .NetworkSettings.Networks}}{{.IPAddre
 sed -i 's/datarouter-mariadb/'$MARIADB'/g' $WORKSPACE/archives/dmaapdr/datarouter/datarouter-docker-compose/src/main/resources/prov_data/provserver.properties
 docker-compose up -d
 DR_PROV_IP=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' datarouter-prov)
-docker kill buscontroller
-sed -i 's/DMAAPDR/'$DR_PROV_IP'/g' docker-compose.yml
-sed -i 's/DMAAPMR/'$DMAAP_MR_IP'/g' docker-compose.yml
-docker-compose up -d
-sed -i 's/DMAAPDR/'$DR_PROV_IP'/g' /tmp/docker-databus-controller.conf
-
-# Wait for initialization of Docker container for datarouter-node, datarouter-prov and mariadb, Consul, CBS, Buscontroller
-for i in {1..10}; do
-    if [ $(docker inspect --format '{{ .State.Running }}' datarouter-node) ] && \
-        [ $(docker inspect --format '{{ .State.Running }}' datarouter-prov) ] && \
-        [ $(docker inspect --format '{{ .State.Running }}' mariadb) ] && \
-        [ $(docker inspect --format '{{ .State.Running }}' consul) ] && \
-        [ $(docker inspect --format '{{ .State.Running }}' cbs) ] && \
-        [ $(docker inspect --format '{{ .State.Running }}' buscontroller) ]
-    then
-        echo "Data Router, Consul, Config Binding Service, Buscontroller Services Running"
-        break
-    else
-        echo sleep $i
-        sleep $i
-    fi
-done
-sleep 15
-# Data Router Configuration.
 DR_NODE_IP=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' datarouter-node)
-DR_GATEWAY_IP=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.Gateway}}{{end}}' datarouter-prov)
-docker exec -i datarouter-prov sh -c "curl -k  -X PUT https://$DR_PROV_IP:8443/internal/api/NODES?val=dmaap-dr-node\|$DR_GATEWAY_IP"
-docker exec -i datarouter-prov sh -c "curl -k  -X PUT https://$DR_PROV_IP:8443/internal/api/PROV_AUTH_ADDRESSES?val=dmaap-dr-prov\|$DR_GATEWAY_IP"
-docker exec datarouter-prov /bin/sh -c "echo '${DR_NODE_IP}' dmaap-dr-node >> /etc/hosts"
-docker exec datarouter-node /bin/sh -c "echo '${DR_PROV_IP}' dmaap-dr-prov >> /etc/hosts"
-
-# Bus Controller Configuration
-DMAAPBC_IP=$(docker inspect '--format={{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' buscontroller)
-$WORKSPACE/plans/dcaegen2-pmmapper/pmmapper/dmaapbc.sh ${DMAAPBC_IP}
 
 # Consul Configuration for PM Mapper
 cp $WORKSPACE/plans/dcaegen2-pmmapper/pmmapper/assets/cbs.json /tmp/cbs.json
 sed -i 's/ipaddress/'${CBS_IP}'/g' /tmp/cbs.json
 curl --request PUT --data @/tmp/cbs.json http://$CONSUL_IP:8500/v1/agent/service/register
-curl 'http://'$CONSUL_IP':8500/v1/kv/pmmapper?dc=dc1' -X PUT -H 'Accept: application/^Con' -H 'Content-Type: application/json' -H 'X-Requested-With: XMLHttpRequest' --data @$WORKSPACE/plans/dcaegen2-pmmapper/pmmapper/assets/config.json
+curl 'http://'$CONSUL_IP':8500/v1/kv/pmmapper?dc=dc1' -X PUT -H 'Accept: application/json' -H 'Content-Type: application/json' -H 'X-Requested-With: XMLHttpRequest' --data @$WORKSPACE/plans/dcaegen2-pmmapper/pmmapper/assets/config.json
 
 # PM Mapper startup and configuration
 mkdir /tmp/docker-compose
@@ -120,31 +70,58 @@ cd /tmp/docker-compose
 cp $WORKSPACE/plans/dcaegen2-pmmapper/pmmapper/composefile/docker-compose-pmmapper.yml /tmp/docker-compose/docker-compose.yml
 CBS_IP=$(docker inspect '--format={{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' cbs)
 sed -i 's/CBSIP/'$CBS_IP'/g' docker-compose.yml
-sed -i 's/BUSIP/'$DMAAPBC_IP'/g' docker-compose.yml
-sed -i 's/DRNODEIP/'$DR_NODE_IP'/g' docker-compose.yml
-sed -i 's/DMAAPMRIP/'$DMAAP_MR_IP'/g' docker-compose.yml
+sed -i 's/1.1.1.1/'$DR_NODE_IP'/g' docker-compose.yml
+sed -i 's/4.4.4.4/'$DMAAP_MR_IP'/g' docker-compose.yml
 docker-compose up -d
 
-# Wait for initialization of Docker container for 3GPP PM Mapper
-for i in {1..10}; do
-    if [ $(docker inspect --format '{{ .State.Running }}' pmmapper) ]
+cd $WORKSPACE/archives/dmaapdr/datarouter/datarouter-docker-compose/src/main/resources/docker-compose
+PMMAPPER_IP=$(docker inspect '--format={{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' pmmapper)
+docker kill datarouter-node
+docker kill datarouter-prov
+sed -i 's/1.1.1.1/'$DR_NODE_IP'/g' docker-compose.yml
+sed -i 's/2.2.2.2/'$DR_PROV_IP'/g' docker-compose.yml
+sed -i 's/3.3.3.3/'$PMMAPPER_IP'/g' docker-compose.yml
+docker-compose up -d
+
+# Wait for initialization of Docker container for datarouter-node, datarouter-prov and mariadb, Consul, CBS
+for i in {1..5}; do
+    if [ $(docker inspect --format '{{ .State.Running }}' datarouter-node) ] && \
+        [ $(docker inspect --format '{{ .State.Running }}' datarouter-prov) ] && \
+        [ $(docker inspect --format '{{ .State.Running }}' mariadb) ] && \
+        [ $(docker inspect --format '{{ .State.Running }}' consul) ] && \
+        [ $(docker inspect --format '{{ .State.Running }}' cbs) ] && \
+        [ $(docker inspect --format '{{ .State.Running }}' pmmapper) ] && \
+        [ $(docker inspect --format '{{ .State.Running }}' $KAFKA) ] && \
+        [ $(docker inspect --format '{{ .State.Running }}' $ZOOKEEPER) ] && \
+        [ $(docker inspect --format '{{ .State.Running }}' $DMAAP) ]
     then
-        echo "PM Mapper Service Running"
+        echo "Message Router, Data Router, Consul, Config Binding Service Running and PM Mapper services are running healthy"
         break
     else
         echo sleep $i
         sleep $i
     fi
 done
+# Data Router Configuration.
+DR_NODE_IP=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' datarouter-node)
+DR_GATEWAY_IP=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.Gateway}}{{end}}' datarouter-prov)
+docker exec -i datarouter-prov sh -c "curl -k  -X PUT https://$DR_PROV_IP:8443/internal/api/NODES?val=dmaap-dr-node\|$DR_GATEWAY_IP"
+docker exec -i datarouter-prov sh -c "curl -k  -X PUT https://$DR_PROV_IP:8443/internal/api/PROV_AUTH_ADDRESSES?val=dmaap-dr-prov\|$DR_GATEWAY_IP"
+
+# Create PM Mapper feed and create PM Mapper subscriber on data router
+curl -v -X POST -H "Content-Type:application/vnd.dmaap-dr.feed" -H "X-DMAAP-DR-ON-BEHALF-OF:pmmapper" --data-ascii @$WORKSPACE/plans/dcaegen2-pmmapper/pmmapper/assets/createFeed.json --post301 --location-trusted -k https://${DR_PROV_IP}:8443
+curl -v -X POST -H "Content-Type:application/vnd.dmaap-dr.subscription" -H "X-DMAAP-DR-ON-BEHALF-OF:pmmapper" --data-ascii @$WORKSPACE/plans/dcaegen2-pmmapper/pmmapper/assets/addSubscriber.json --post301 --location-trusted -k https://${DR_PROV_IP}:8443/subscribe/1
+
+# Create PM Mapper tocic in Message Router
+curl -v -X POST http://${DMAAP_MR_IP}:3904/topics/create -d @$WORKSPACE/plans/dcaegen2-pmmapper/pmmapper/assets/createTopic.json -H "Content-Type: application/json"
 PMMAPPER_IP=$(docker inspect '--format={{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' pmmapper)
-docker exec datarouter-prov /bin/sh -c "echo '${PMMAPPER_IP}' 3gpppmmapper >> /etc/hosts"
-docker exec datarouter-node /bin/sh -c "echo '${PMMAPPER_IP}' 3gpppmmapper >> /etc/hosts"
-sleep 10
 docker exec pmmapper /bin/sh -c "cat /var/log/ONAP/dcaegen2/services/pm-mapper/pm-mapper_output.log" > /tmp/pmmapper.log
 cat /tmp/pmmapper.log
-docker exec buscontroller /bin/sh -c "cat /opt/app/dmaapbc/logs/ONAP/application.log"
+docker exec -it datarouter-prov sh -c "curl http://dmaap-dr-node:8080/internal/fetchProv"
+sleep 10
 curl -k https://$DR_PROV_IP:8443/internal/prov
-curl http://${DMAAP_MR_IP}:3904/events/topic.org.onap.dmaap.mr.test1/CG1/C1?timeout=1000
+curl http://${DMAAP_MR_IP}:3904/events/PM_MAPPER/CG1/C1?timeout=1000
 
 #Pass any variables required by Robot test suites in ROBOT_VARIABLES
-ROBOT_VARIABLES="-v DMAAP_MR_IP:${DMAAP_MR_IP} -v CONSUL_IP:${CONSUL_IP} -v DR_PROV_IP:${DR_PROV_IP} -v DMAAPBC_IP:${DMAAPBC_IP} -v DMAAP_MR_IP:${DMAAP_MR_IP} -v CBS_IP:${CBS_IP} -v PMMAPPER_IP:${PMMAPPER_IP} -v DR_NODE_IP:${DR_NODE_IP}"
\ No newline at end of file
+ROBOT_VARIABLES="-v CONSUL_IP:${CONSUL_IP} -v DR_PROV_IP:${DR_PROV_IP} -v DMAAP_MR_IP:${DMAAP_MR_IP} -v CBS_IP:${CBS_IP} -v PMMAPPER_IP:${PMMAPPER_IP} -v DR_NODE_IP:${DR_NODE_IP}"
+export ROBOT_VARIABLES
\ No newline at end of file
diff --git a/plans/dcaegen2-pmmapper/pmmapper/teardown.sh b/plans/dcaegen2-pmmapper/pmmapper/teardown.sh
index bcbcffff..45ef0d93 100644
--- a/plans/dcaegen2-pmmapper/pmmapper/teardown.sh
+++ b/plans/dcaegen2-pmmapper/pmmapper/teardown.sh
@@ -9,5 +9,4 @@ kill-instance.sh datarouter-prov
 kill-instance.sh mariadb
 kill-instance.sh cbs
 kill-instance.sh consul
-kill-instance.sh buscontroller
 kill-instance.sh pmmapper
\ No newline at end of file