StndDefined event routing

Route stndDefined events to streams defined in namespace event field.

Change-Id: I3963e220095665f8ca3fd1b21c5c20b44057cf76
Issue-ID: DCAEGEN2-1771
Signed-off-by: Zebek Bogumil <bogumil.zebek@nokia.com>

2 files changed, 35 insertions, 3 deletions

diff --git a/etc/DmaapConfig.json b/etc/DmaapConfig.json
index 27328216..2ef77dcd 100644
--- a/etc/DmaapConfig.json
+++ b/etc/DmaapConfig.json
@@ -47,6 +47,38 @@
       "stripHpId": "true",
       "type": "out",
       "cambria.hosts": "onap-dmaap"
+    },
+    {
+      "name": "ves-3gpp-fault-supervision",
+      "cambria.topic": "unauthenticated.SEC_3GPP_FAULTSUPERVISION_OUTPUT",
+      "class": "HpCambriaOutputStream",
+      "stripHpId": "true",
+      "type": "out",
+      "cambria.hosts": "onap-dmaap"
+    },
+    {
+      "name": "ves-3gpp-provisioning",
+      "cambria.topic": "unauthenticated.SEC_3GPP_PROVISIONING_OUTPUT",
+      "class": "HpCambriaOutputStream",
+      "stripHpId": "true",
+      "type": "out",
+      "cambria.hosts": "onap-dmaap"
+    },
+    {
+      "name": "ves-3gpp-heartbeat",
+      "cambria.topic": "unauthenticated.SEC_3GPP_HEARTBEAT_OUTPUT",
+      "class": "HpCambriaOutputStream",
+      "stripHpId": "true",
+      "type": "out",
+      "cambria.hosts": "onap-dmaap"
+    },
+    {
+      "name": "ves-3gpp-performance-assurance",
+      "cambria.topic": "unauthenticated.unauthenticated.SEC_3GPP_PERFORMANCEASSURANCE_OUTPUT",
+      "class": "HpCambriaOutputStream",
+      "stripHpId": "true",
+      "type": "out",
+      "cambria.hosts": "onap-dmaap"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/etc/collector.properties b/etc/collector.properties
index 3684f5e0..0d408cc4 100755
--- a/etc/collector.properties
+++ b/etc/collector.properties
@@ -50,8 +50,8 @@ collector.truststore.passwordfile=etc/trustpasswordfile
 collector.schema.checkflag=1

 collector.schema.file={\"v1\":\"./etc/CommonEventFormat_27.2.json\",\"v2\":\"./etc/CommonEventFormat_27.2.json\",\"v3\":\"./etc/CommonEventFormat_27.2.json\",\"v4\":\"./etc/CommonEventFormat_27.2.json\",\"v5\":\"./etc/CommonEventFormat_28.4.1.json\",\"v7\":\"./etc/CommonEventFormat_30.2_ONAP.json\"}

 

-## List all streamid per domain to be supported. The streamid should match to channel name on dmaapfile  

-collector.dmaap.streamid=fault=ves-fault|syslog=ves-syslog|heartbeat=ves-heartbeat|measurementsForVfScaling=ves-measurement|mobileFlow=ves-mobileflow|other=ves-other|stateChange=ves-statechange|thresholdCrossingAlert=ves-thresholdCrossingAlert|voiceQuality=ves-voicequality|sipSignaling=ves-sipsignaling|notification=ves-notification|pnfRegistration=ves-pnfRegistration|stndDefined=ves-other

+## List all streamid per domain to be supported. The streamid should match to channel name on dmaapfile

+collector.dmaap.streamid=fault=ves-fault|syslog=ves-syslog|heartbeat=ves-heartbeat|measurementsForVfScaling=ves-measurement|mobileFlow=ves-mobileflow|other=ves-other|stateChange=ves-statechange|thresholdCrossingAlert=ves-thresholdCrossingAlert|voiceQuality=ves-voicequality|sipSignaling=ves-sipsignaling|notification=ves-notification|pnfRegistration=ves-pnfRegistration|3GPP-FaultSupervision=ves-3gpp-fault-supervision|3GPP-Heartbeat=ves-3gpp-heartbeat|3GPP-Provisioning=ves-3gpp-provisioning|3GPP-PerformanceAssurance=ves-3gpp-performance-assurance

 collector.dmaapfile=./etc/DmaapConfig.json

 

 ## Event transformation Flag - when set expects configurable transformation