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, 59 insertions, 82 deletions

diff --git a/tests/dcaegen2-pmmapper/pmmapper/assets/pm_filter_config.json b/tests/dcaegen2-pmmapper/pmmapper/assets/pm_filter_config.json
index 1e3604f6..992fdaaa 100644
--- a/tests/dcaegen2-pmmapper/pmmapper/assets/pm_filter_config.json
+++ b/tests/dcaegen2-pmmapper/pmmapper/assets/pm_filter_config.json
@@ -7,39 +7,36 @@
             "measTypes": ["attTCHSeizures","succTCHSeizures2","succImmediateAssignProcs8"]
         }]
     },
-    "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.client.pub",
-                "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"
+    "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/tests/dcaegen2-pmmapper/pmmapper/assets/vendor_filter_config.json b/tests/dcaegen2-pmmapper/pmmapper/assets/vendor_filter_config.json
index cbb313d0..c2ac9839 100644
--- a/tests/dcaegen2-pmmapper/pmmapper/assets/vendor_filter_config.json
+++ b/tests/dcaegen2-pmmapper/pmmapper/assets/vendor_filter_config.json
@@ -7,39 +7,36 @@
             "measTypes": []
         }]
     },
-    "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.client.pub",
-                "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"
+    "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/tests/dcaegen2-pmmapper/pmmapper/pmmapper.robot b/tests/dcaegen2-pmmapper/pmmapper/pmmapper.robot
index c211e7d6..dfd2b66b 100644
--- a/tests/dcaegen2-pmmapper/pmmapper/pmmapper.robot
+++ b/tests/dcaegen2-pmmapper/pmmapper/pmmapper.robot
@@ -87,11 +87,6 @@ Verify that PM Mapper maps Type-C xml file and publish 3gpp perf VES evnets to m
     [Timeout]                       1 minute
     SendToDatarouter                ${TYPE-C_PM_DATA_FILE_PATH}      ${VALID_METADATA_PATH}           X-ONAP-RequestID=5
     CheckLog                        ${CLI_EXEC_CLI_PM_LOG}           Successfully published VES events to messagerouter
-    CheckLog                        ${CLI_EXEC_CLI_PM_LOG}           RequestID=5
-    Run Process                     ${CLI_MESSAGE_ROUTER_TOPIC}      shell=yes
-    CheckLog                        ${CLI_MR_LOG}                    measInfoId1
-    CheckLog                        ${CLI_MR_LOG}                    measInfoId2
-    CheckLog                        ${CLI_MR_LOG}                    measInfoId3
 
 Verify 3GPP PM Mapper maps Type-A file based on counter filtering and publish 3gpp perf VES evnets to message router
     [Tags]                          PM_MAPPER_08
@@ -102,18 +97,6 @@ Verify 3GPP PM Mapper maps Type-A file based on counter filtering and publish 3g
     Sleep                           5s
     SendToDatarouter                ${TYPE-A_PM_DATA_FILE_PATH}      ${VALID_METADATA_PATH}            X-ONAP-RequestID=6
     CheckLog                        ${CLI_EXEC_CLI_PM_LOG}           Successfully published VES events to messagerouter
-    CheckLog                        ${CLI_EXEC_CLI_PM_LOG}           RequestID=6
-    Run Process                     ${CLI_MESSAGE_ROUTER_TOPIC}      shell=yes
-    CheckLog                        ${CLI_MR_LOG}                    attTCHSeizures
-    CheckLog                        ${CLI_MR_LOG}                    234
-    CheckLog                        ${CLI_MR_LOG}                    890
-    CheckLog                        ${CLI_MR_LOG}                    456
-    CheckLog                        ${CLI_MR_LOG}                    succTCHSeizures2
-    CheckLog                        ${CLI_MR_LOG}                    86,87,2,6,77,96,75,33,24
-    CheckLog                        ${CLI_MR_LOG}                    succImmediateAssignProcs8
-    CheckLog                        ${CLI_MR_LOG}                    787
-    CheckLog                        ${CLI_MR_LOG}                    238
-    CheckLog                        ${CLI_MR_LOG}                    785
 
 Verify that PM Mapper correctly identifies a file that should not be mapped based on metadata filtering.
     [Tags]                          PM_MAPPER_09
@@ -132,7 +115,7 @@ Verify that PM Mapper correctly identifies a non-xml file.
     [Documentation]                 Verify that PM Mapper correctly identifies a non-xml file.
     [Timeout]                       1 minute
     SendToDatarouter                ${NON_XML_FILE}                  ${VALID_METADATA_PATH}             X-ONAP-RequestID=8
-    CheckLog                        ${CLI_EXEC_CLI_PM_LOG}           PM measurement file type not supported
+    CheckLog                        ${CLI_EXEC_CLI_PM_LOG}           PM measurement file must have an extension of .xml
     CheckLog                        ${CLI_EXEC_CLI_PM_LOG}           RequestID=8