From 37452e4b088d18cdd47e8c85628b86d95db390f2 Mon Sep 17 00:00:00 2001
From: rajendrajaiswal <rajendra.jaiswal@ericsson.com>
Date: Tue, 2 Apr 2019 08:40:58 +0000
Subject: Added support for publishing PM Mapper

Change-Id: I69ae4d5d2a1844b559e664a863963cce01c8151d
Issue-ID: INT-863
Signed-off-by: rajendrajaiswal <rajendra.jaiswal@ericsson.com>
---
 .../pmmapper/assets/C20190328.0000-0015.xml        | 49 ++++++++++++++++++++++
 .../pmmapper/assets/pm_filter_config.json          | 18 ++++----
 .../pmmapper/assets/vendor_filter_config.json      | 20 +++++----
 3 files changed, 72 insertions(+), 15 deletions(-)
 create mode 100644 tests/dcaegen2-pmmapper/pmmapper/assets/C20190328.0000-0015.xml

(limited to 'tests/dcaegen2-pmmapper/pmmapper/assets')

diff --git a/tests/dcaegen2-pmmapper/pmmapper/assets/C20190328.0000-0015.xml b/tests/dcaegen2-pmmapper/pmmapper/assets/C20190328.0000-0015.xml
new file mode 100644
index 00000000..b6a3b436
--- /dev/null
+++ b/tests/dcaegen2-pmmapper/pmmapper/assets/C20190328.0000-0015.xml
@@ -0,0 +1,49 @@
+<measCollecFile xmlns="http://www.3gpp.org/ftp/specs/archive/32_series/32.435#measCollec">
+    <fileHeader dnPrefix="some dnPrefix" vendorName="FooBar Ltd"
+                fileFormatVersion="32.435 V10.0">
+        <fileSender localDn="Dublin"/>
+        <measCollec beginTime="2018-10-02T12:00:00+01:00"/>
+    </fileHeader>
+    <measData>
+        <managedElement swVersion="r0.1" localDn="Dublin1"/>
+        <measInfo measInfoId="measInfoId1">
+            <job jobId="jobId1"/>
+            <granPeriod endTime="2001-10-02T12:15:00Z" duration="PT100S"/>
+            <repPeriod duration="PT100S"/>
+            <measTypes>z1 a1 zz1 b1</measTypes>
+            <measValue measObjLdn="objLdn">
+                <measResults>1 11 111 1111</measResults>
+                <suspect>false</suspect>
+            </measValue>
+        </measInfo>
+    </measData>
+    <measData>
+        <managedElement swVersion="r0.2" localDn="Dublin2"/>
+        <measInfo measInfoId="measInfoId2">
+            <job jobId="jobId"/>
+            <granPeriod endTime="2002-10-02T12:15:00Z" duration="PT200S"/>
+            <repPeriod duration="PT200S"/>
+            <measTypes>z2 a2 zz2 b2</measTypes>
+            <measValue measObjLdn="objLdn">
+                <measResults>2 22 222 2222</measResults>
+                <suspect>false</suspect>
+            </measValue>
+        </measInfo>
+    </measData>
+    <measData>
+        <managedElement swVersion="r0.3" localDn="Dublin3"/>
+        <measInfo measInfoId="measInfoId3">
+            <job jobId="jobId"/>
+            <granPeriod endTime="2003-10-02T12:15:00Z" duration="PT300S"/>
+            <repPeriod duration="PT300S"/>
+            <measTypes>z3 a3 zz3 b3</measTypes>
+            <measValue measObjLdn="objLdn">
+                <measResults>3 33 333 3333</measResults>
+                <suspect>false</suspect>
+            </measValue>
+        </measInfo>
+    </measData>
+    <fileFooter>
+        <measCollec endTime="2018-10-02T12:15:00+01:00"/>
+    </fileFooter>
+</measCollecFile>
diff --git a/tests/dcaegen2-pmmapper/pmmapper/assets/pm_filter_config.json b/tests/dcaegen2-pmmapper/pmmapper/assets/pm_filter_config.json
index 4bd48839..544b6980 100644
--- a/tests/dcaegen2-pmmapper/pmmapper/assets/pm_filter_config.json
+++ b/tests/dcaegen2-pmmapper/pmmapper/assets/pm_filter_config.json
@@ -14,10 +14,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"
             }
         }
     },
@@ -26,7 +26,7 @@
             "type": "message_router",
             "aaf_password": null,
             "dmaap_info": {
-                "topic_url": "https://message-router:3904/events/org.onap.dmaap.onapCSIT.pm_mapper",
+                "topic_url": "http://message-router:3904/events/PM_MAPPER",
                 "client_role": "org.onap.dmaap.client.pub",
                 "location": "csit-pmmapper",
                 "client_id": null
@@ -34,8 +34,12 @@
             "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/tests/dcaegen2-pmmapper/pmmapper/assets/vendor_filter_config.json b/tests/dcaegen2-pmmapper/pmmapper/assets/vendor_filter_config.json
index fff43a15..64fefa48 100644
--- a/tests/dcaegen2-pmmapper/pmmapper/assets/vendor_filter_config.json
+++ b/tests/dcaegen2-pmmapper/pmmapper/assets/vendor_filter_config.json
@@ -2,7 +2,7 @@
     "pm-mapper-filter": { 
         "filters":[{
             "pmDefVsn": "1.0",
-            "nfType": "5G",
+            "nfType": "gnb",
             "vendor": "Ericsson",
             "measTypes": []
         }]
@@ -14,10 +14,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"
             }
         }
     },
@@ -26,7 +26,7 @@
             "type": "message_router",
             "aaf_password": null,
             "dmaap_info": {
-                "topic_url": "https://message-router:3904/events/org.onap.dmaap.onapCSIT.pm_mapper",
+                "topic_url": "http://message-router:3904/events/PM_MAPPER",
                 "client_role": "org.onap.dmaap.client.pub",
                 "location": "csit-pmmapper",
                 "client_id": null
@@ -34,8 +34,12 @@
             "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
-- 
cgit 1.2.3-korg