From 2c8ddf3501cfc5106d20b51ef077cc6d07ab65dc Mon Sep 17 00:00:00 2001
From: JoeOLeary <joseph.o.leary@est.tech>
Date: Fri, 19 Jul 2019 10:02:12 +0000
Subject: Add DMaaP plugin support

- Update blueprint with DMaaP plugin support.
- Update configuration with new DMaaP plugin format.
- Move Configuration tests to correct package.
- Add latest-staging Docker image tag to pom.
- Change file endings in some files to LF.
- Remove publishing to non authenticated topic.
- Fix some tests which were not executing correctly.
- Fix some Sonar smells.

Issue-ID: DCAEGEN2-1581
Change-Id: I37fbb662419179e3fe9fb8bdf710d6a6e8f0308a
Signed-off-by: JoeOLeary <joseph.o.leary@est.tech>
---
 src/test/resources/valid_mapper_config.json | 80 ++++++++++++++++-------------
 1 file changed, 45 insertions(+), 35 deletions(-)

(limited to 'src/test/resources/valid_mapper_config.json')

diff --git a/src/test/resources/valid_mapper_config.json b/src/test/resources/valid_mapper_config.json
index 3d9d707..39d4ee6 100644
--- a/src/test/resources/valid_mapper_config.json
+++ b/src/test/resources/valid_mapper_config.json
@@ -1,37 +1,47 @@
 {
-    "pm-mapper-filter": {"filters":[{"pmDefVsn": "V9","nfType": "NrRadio","vendor": "Ericsson","measTypes": [ "A", "B" ]}]},
-    "streams_subscribes": {
-        "dmaap_subscriber": {
-            "type": "data_router",
-            "aaf_username": null,
-            "aaf_password": null,
-            "dmaap_info": {
-                "location": "location",
-                "delivery_url": "delivery_url",
-                "username": "username",
-                "password": "password",
-                "subscriber_id": "subscriber_id"
-            }
-        }
-    },
-    "streams_publishes": {
-        "dmaap_publisher": {
-            "type": "message_router",
-            "aaf_password": null,
-            "dmaap_info": {
-                "topic_url": "https://message-router.onap.svc.cluster.local:3904/events/some-topic",
-                "client_role": null,
-                "location": null,
-                "client_id": null
-            },
-            "aaf_username": null
-        }
-    },
-    "dmaap_dr_delete_endpoint": "http://dmaap-dr-node.onap.svc.cluster.local:8443/delete",
-    "services_calls": {},
-    "key_store_path": "src/test/resources/testkeystore.jks.b64",
-    "key_store_pass_path": "src/test/resources/password",
-    "trust_store_path": "src/test/resources/testkeystore.jks.b64",
-    "trust_store_pass_path": "src/test/resources/password",
-    "enable_http": false
+  "pm-mapper-filter": {
+    "filters": [
+      {
+        "pmDefVsn": "V9",
+        "nfType": "NrRadio",
+        "vendor": "Ericsson",
+        "measTypes": [
+          "A",
+          "B"
+        ]
+      }
+    ]
+  },
+  "key_store_path": "src/test/resources/testkeystore.jks.b64",
+  "key_store_pass_path": "src/test/resources/password",
+  "trust_store_path": "src/test/resources/testkeystore.jks.b64",
+  "trust_store_pass_path": "src/test/resources/password",
+  "dmaap_dr_delete_endpoint": "https://dmaap-dr-node:8443/delete",
+  "dmaap_dr_feed_name": "bulk_pm_feed",
+  "aaf_identity": "dcae@dcae.onap.org",
+  "aaf_password": "iheartrainbows44",
+  "enable_http": false,
+  "streams_publishes": {
+    "dmaap_publisher": {
+      "type": "message_router",
+      "dmaap_info": {
+        "topic_url": "https://message-router:3905/events/org.onap.dmaap.mr.VES_PM",
+        "client_role": "org.onap.dcae.pmPublisher",
+        "location": "san-francisco",
+        "client_id": "1562763644939"
+      }
+    }
+  },
+  "streams_subscribes": {
+    "dmaap_subscriber": {
+      "type": "data_router",
+      "dmaap_info": {
+        "username": "username",
+        "password": "password",
+        "location": "san-francisco",
+        "delivery_url": "https://dcae-pm-mapper:8443/delivery",
+        "subscriber_id": 1
+      }
+    }
+  }
 }
\ No newline at end of file
-- 
cgit 1.2.3-korg