Update to Setup and Test Case due to dmaap plugin feature in PM Mapper

Change-Id: I1eece6a9f642bdf989c91810bff8d859c7cb95db
Issue-ID: DCAEGEN2-1581
Signed-off-by: rajendrajaiswal <rajendra.jaiswal@ericsson.com>

3 files changed, 58 insertions, 42 deletions

diff --git a/plans/dcaegen2-pmmapper/pmmapper/assets/config.json b/plans/dcaegen2-pmmapper/pmmapper/assets/config.json
index 0b62454d..aacbb5b0 100644
--- a/plans/dcaegen2-pmmapper/pmmapper/assets/config.json
+++ b/plans/dcaegen2-pmmapper/pmmapper/assets/config.json
@@ -1,39 +1,35 @@
 {
-    "pm-mapper-filter": { "filters":[]},
-    "streams_subscribes": {
-        "dmaap_subscriber": {
-            "type": "data_router",
-            "aaf_username": null,
-            "aaf_password": null,
-            "dmaap_info": {
-                "location": "csit-pmmapper",
-                "delivery_url": "http://dcae-pm-mapper:8081/delivery",
-                "username": "username",
-                "password": "password",
-                "subscriber_id": "1"
-            }
-        }
-    },
-    "streams_publishes": {
-        "dmaap_publisher": {
-            "type": "message_router",
-            "aaf_password": null,
-            "dmaap_info": {
-                "topic_url": "http://message-router:3904/events/PM_MAPPER",
-                "client_role": "org.onap.dmaap.mr.topic",
-                "location": "csit-pmmapper",
-                "client_id": null
-            },
-            "aaf_username": null
-        }
-    },
-    "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.jks.b64",
-    "key_store_pass_path": "/opt/app/pm-mapper/etc/jks.pass",
-    "trust_store_path": "/opt/app/pm-mapper/etc/trust.jks.b64",
-    "trust_store_pass_path": "/opt/app/pm-mapper/etc/trust.pass"
-
+  "pm-mapper-filter": { "filters":[]},
+  "key_store_path": "/opt/app/pm-mapper/etc/cert.jks.b64",
+  "key_store_pass_path": "/opt/app/pm-mapper/etc/jks.pass",
+  "trust_store_path": "/opt/app/pm-mapper/etc/trust.jks.b64",
+  "trust_store_pass_path": "/opt/app/pm-mapper/etc/trust.pass",
+  "dmaap_dr_delete_endpoint": "https://dmaap-dr-node:8443/delete",
+  "dmaap_dr_feed_name": "1",
+  "aaf_identity": "aaf_admin@people.osaaf.org",
+  "aaf_password": "demo123456!",
+  "enable_http": true,
+  "streams_publishes": {
+    "dmaap_publisher": {
+      "type": "message_router",
+      "dmaap_info": {
+        "topic_url": "http://message-router:3904/events/org.onap.dmaap.mr.VES_PM",
+        "client_role": "org.onap.dcae.pmPublisher",
+        "location": "csit-pmmapper",
+        "client_id": "1562763644939"
+      }
+    }
+  },
+  "streams_subscribes": {
+    "dmaap_subscriber": {
+      "type": "data_router",
+      "dmaap_info": {
+        "username": "username",
+        "password": "password",
+        "location": "csit-pmmapper",
+        "delivery_url": "http://dcae-pm-mapper:8081/delivery",
+        "subscriber_id": 1
+      }
+    }
+  }
 }
\ No newline at end of file
diff --git a/plans/dcaegen2-pmmapper/pmmapper/assets/createTopic.json b/plans/dcaegen2-pmmapper/pmmapper/assets/createTopic.json
deleted file mode 100644
index 4d20974b..00000000
--- a/plans/dcaegen2-pmmapper/pmmapper/assets/createTopic.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "topicName":"PM_MAPPER",
-    "topicDescription":"PM Mapper VES Event",
-    "owner":"pmmapper"
-}
\ No newline at end of file
diff --git a/plans/dcaegen2-pmmapper/pmmapper/assets/mrserver.js b/plans/dcaegen2-pmmapper/pmmapper/assets/mrserver.js
new file mode 100644
index 00000000..a6a61303
--- /dev/null
+++ b/plans/dcaegen2-pmmapper/pmmapper/assets/mrserver.js
@@ -0,0 +1,25 @@
+var httpServer = function() {
+var http = require('http'),
+url = require('url'),
+fs = require('fs'),
+
+start = function(port) {
+    var server = http.createServer(function(req, res) {
+    processHttpRequest(res);	
+    });
+    server.listen(port, function() {
+    console.log('Listening on ' + port + '...');
+    });
+},
+
+processHttpRequest = function(res) {
+    res.writeHead(200, {'Content-Type': 'text/plain'});
+    res.end('Published Successfully.\n');
+};
+
+return {
+    start: start		
+}
+}();
+
+httpServer.start(3904);
\ No newline at end of file