Update PM Mapper Setup & Test Case

*Remove space in extra_hosts of compose files
*Update setup to include pm-mapper host entry in node
*Update config file to match latest expected config
*Update metadata tests to use new endpoint & new headers
*Update docker image versions

Issue-ID: INT-863
Change-Id: I1c4d7bb48824031c1fd11ea11266b42af4f57cc0
Signed-off-by: JoeOLeary <joseph.o.leary@est.tech>

5 files changed, 17 insertions, 14 deletions

diff --git a/plans/dcaegen2-pmmapper/pmmapper/assets/config.json b/plans/dcaegen2-pmmapper/pmmapper/assets/config.json
index 47b215f5..56629e09 100644
--- a/plans/dcaegen2-pmmapper/pmmapper/assets/config.json
+++ b/plans/dcaegen2-pmmapper/pmmapper/assets/config.json
@@ -1,6 +1,5 @@
 {
     "pm-mapper-filter": "{ \"filters\":[]}",
-    "3GPP.schema.file": "{\"3GPP_Schema\":\"./etc/3GPP_relaxed_schema.xsd\"}",
     "streams_subscribes": {
         "dmaap_subscriber": {
             "type": "data_router",
@@ -8,15 +7,15 @@
             "aaf_password": null,
             "dmaap_info": {
                 "location": "csit-pmmapper",
-                "delivery_url": "3gpppmmapper",
+                "delivery_url": "http://3gpppmmapper:8081/delivery",
                 "username": "username",
                 "password": "password",
-                "subscriber_id": "subsriber_id"
+                "subscriber_id": "subscriber_id"
             }
         }
     },
     "streams_publishes": {
-        "pm_mapper_handle_out": {
+        "dmaap_publisher": {
             "type": "message_router",
             "aaf_password": null,
             "dmaap_info": {
@@ -28,7 +27,8 @@
             "aaf_username": null
         }
     },
-    "buscontroller_feed_id": "1",
+    "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": {}
 }
\ 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 ff1b517a..9c8805b7 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.0-SNAPSHOT
+    image: nexus3.onap.org:10001/onap/dmaap/datarouter-prov:2.0.1
     container_name: datarouter-prov
     hostname: dmaap-dr-prov
     ports:
@@ -22,7 +22,7 @@ services:
       retries: 5
 
   datarouter-node:
-    image: nexus3.onap.org:10001/onap/dmaap/datarouter-node:2.0.0-SNAPSHOT
+    image: nexus3.onap.org:10001/onap/dmaap/datarouter-node:2.0.1
     container_name: datarouter-node
     hostname: dmaap-dr-node
     ports:
@@ -67,8 +67,8 @@ services:
       - "18080:8080"
       - "18443:8443"
     extra_hosts:
-      - "dmaap-dr-prov: DMAAPDR"
-      - "message-router: DMAAPMR"
+      - "dmaap-dr-prov:DMAAPDR"
+      - "message-router:DMAAPMR"
     volumes:
       - /tmp/docker-databus-controller.conf:/opt/app/config/conf
     depends_on:
diff --git a/plans/dcaegen2-pmmapper/pmmapper/composefile/docker-compose-pmmapper.yml b/plans/dcaegen2-pmmapper/pmmapper/composefile/docker-compose-pmmapper.yml
index 0833dfe8..b14a73c6 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:1.0-SNAPSHOT
+    image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.pm-mapper
     ports:
      - "8081:8081"
     environment:
@@ -10,4 +10,5 @@ services:
        CONFIG_BINDING_SERVICE_SERVICE_PORT: 10000
        HOSTNAME: pmmapper
     extra_hosts:
-      - "dmaap-bc: BUSIP"
\ No newline at end of file
+      - "dmaap-bc:BUSIP"
+      - "dmaap-dr-node:DRNODEIP"
diff --git a/plans/dcaegen2-pmmapper/pmmapper/setup.sh b/plans/dcaegen2-pmmapper/pmmapper/setup.sh
index 9de81667..806728d5 100644
--- a/plans/dcaegen2-pmmapper/pmmapper/setup.sh
+++ b/plans/dcaegen2-pmmapper/pmmapper/setup.sh
@@ -121,6 +121,7 @@ cp $WORKSPACE/plans/dcaegen2-pmmapper/pmmapper/composefile/docker-compose-pmmapp
 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
 docker-compose up -d
 
 # Wait for initialization of Docker container for 3GPP PM Mapper
@@ -136,6 +137,7 @@ for i in {1..10}; do
 done
 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
diff --git a/tests/dcaegen2-pmmapper/pmmapper/pmmapper.robot b/tests/dcaegen2-pmmapper/pmmapper/pmmapper.robot
index a05defb5..71344632 100644
--- a/tests/dcaegen2-pmmapper/pmmapper/pmmapper.robot
+++ b/tests/dcaegen2-pmmapper/pmmapper/pmmapper.robot
@@ -38,7 +38,7 @@ Verify 3GPP PM Mapper responds appropriately when no metadata is provided
     [Documentation]                 Verify 3GPP PM Mapper responds 400 with the message "Missing Metadata." when no metadata is provided
     [Timeout]                       1 minute
     ${headers}=                     Create Dictionary               X-ONAP-RequestID=1  Content-Type=application/xml
-    ${resp}=                        Put Request                     mapper_session  ${DELIVERY_ENDPOINT}    data='${EMPTY}'    headers=${headers}
+    ${resp}=                        Put Request                     mapper_session  ${DELIVERY_ENDPOINT}/filename    data='${EMPTY}'    headers=${headers}
     Should Be Equal As Strings      ${resp.status_code}             400
     Should Be Equal As Strings      ${resp.content}                 Missing Metadata.
 
@@ -46,8 +46,8 @@ Verify 3GPP PM Mapper responds appropriately when invalid metadata is provided
     [Tags]                          PM_MAPPER_11
     [Documentation]                 Verify 3GPP PM Mapper responds 400 with the message "Malformed Metadata." when invalid metadata is provided
     [Timeout]                       1 minute
-    ${headers}=                     Create Dictionary               X-ONAP-RequestID=1  X-ATT-DR-META='not metadata'  Content-Type=application/xml
-    ${resp}=                        Put Request                     mapper_session  ${DELIVERY_ENDPOINT}  data='${EMPTY}'  headers=${headers}
+    ${headers}=                     Create Dictionary               X-ONAP-RequestID=1  X-DMAAP-DR-META='not metadata'  Content-Type=application/xml
+    ${resp}=                        Put Request                     mapper_session  ${DELIVERY_ENDPOINT}/filename  data='${EMPTY}'  headers=${headers}
     Should Be Equal As Strings      ${resp.status_code}             400
     Should Be Equal As Strings      ${resp.content}                 Malformed Metadata.