Added support for publishing PM Mapper

Change-Id: I69ae4d5d2a1844b559e664a863963cce01c8151d
Issue-ID: INT-863
Signed-off-by: rajendrajaiswal <rajendra.jaiswal@ericsson.com>

2 files changed, 12 insertions, 21 deletions

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"