Replace cambria with DmaaP client

- remove cambria, add DmaaP client
- sending event for many topics at once is no longer supported
- add backward compatibility status codes
- add additional validation for batchEvent

Issue-ID: DCAEGEN2-1483
Signed-off-by: Maciej Malewski <maciej.malewski@nokia.com>
Change-Id: I945c38b4ab04b697ecfabd5ce38502f83fa70d1a

3 files changed, 212 insertions, 85 deletions

diff --git a/etc/DmaapConfig.json b/etc/DmaapConfig.json
deleted file mode 100644
index 2ef77dcd..00000000
--- a/etc/DmaapConfig.json
+++ /dev/null
@@ -1,84 +0,0 @@
-{
-  "channels": [
-    {
-      "name": "ves-measurement",
-      "cambria.topic": "unauthenticated.SEC_MEASUREMENT_OUTPUT",
-      "class": "HpCambriaOutputStream",
-      "stripHpId": "true",
-      "type": "out",
-      "cambria.hosts": "onap-dmaap"
-    },
-    {
-      "name": "ves-fault",
-      "cambria.topic": "unauthenticated.SEC_FAULT_OUTPUT",
-      "class": "HpCambriaOutputStream",
-      "stripHpId": "true",
-      "type": "out",
-      "cambria.hosts": "onap-dmaap"
-    },
-    {
-      "name": "ves-heartbeat",
-      "cambria.topic": "unauthenticated.SEC_FAULT_OUTPUT",
-      "class": "HpCambriaOutputStream",
-      "stripHpId": "true",
-      "type": "out",
-      "cambria.hosts": "onap-dmaap"
-    },
-    {
-      "name": "ves-other",
-      "cambria.topic": "unauthenticated.SEC_OTHER_OUTPUT",
-      "class": "HpCambriaOutputStream",
-      "stripHpId": "true",
-      "type": "out",
-      "cambria.hosts": "onap-dmaap"
-    },
-    {
-      "name": "ves-notification",
-      "cambria.topic": "unauthenticated.VES_NOTIFICATION_OUTPUT",
-      "class": "HpCambriaOutputStream",
-      "stripHpId": "true",
-      "type": "out",
-      "cambria.hosts": "onap-dmaap"
-    },
-    {
-      "name": "ves-pnfRegistration",
-      "cambria.topic": "unauthenticated.VES_PNFREG_OUTPUT",
-      "class": "HpCambriaOutputStream",
-      "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"
-    }
-  ]
-}
diff --git a/etc/collector.properties b/etc/collector.properties
index 8861fb8d..e810761a 100755
--- a/etc/collector.properties
+++ b/etc/collector.properties
@@ -63,7 +63,7 @@ event.externalSchema.stndDefinedDataPath=$.event.stndDefinedFields.data
 

 ## 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

+collector.dmaapfile=./etc/ves-dmaap-config.json

 

 ## Path to the file containing description of api versions

 collector.description.api.version.location=etc/api_version_description.json

@@ -75,3 +75,9 @@ event.transform.flag=1
 

 # Describes at what frequency (measured in minutes) should application try to fetch config from CBS

 collector.dynamic.config.update.frequency=5

+

+# Response compatibility (set to None to turn off ves 7.2 compatibility)

+# v7.2 response codes: 202, 500

+# None response code: 200, 413, 503

+collector.response.compatibility=v7.2

+

diff --git a/etc/ves-dmaap-config.json b/etc/ves-dmaap-config.json
new file mode 100644
index 00000000..b8731123
--- /dev/null
+++ b/etc/ves-dmaap-config.json
@@ -0,0 +1,205 @@
+{
+  "ves-syslog": {
+    "type": "message_router",
+    "dmaap_info": {
+      "location": "mtl5",
+      "topic_url": "http://onap-dmaap:3904/events/DCAE-SE-COLLECTOR-EVENTS-DEV"
+    }
+  },
+  "ves-statechange": {
+    "type": "message_router",
+    "dmaap_info": {
+      "location": "mtl5",
+      "topic_url": "http://onap-dmaap:3904/events/DCAE-SE-COLLECTOR-EVENTS-DEV"
+    }
+  },
+  "ves-thresholdCrossingAlert": {
+    "type": "message_router",
+    "dmaap_info": {
+      "location": "mtl5",
+      "topic_url": "http://onap-dmaap:3904/events/DCAE-SE-COLLECTOR-EVENTS-DEV"
+    }
+  },
+  "ves-heartbeat": {
+    "type": "message_router",
+    "dmaap_info": {
+      "location": "mtl5",
+      "topic_url": "http://onap-dmaap:3904/events/unauthenticated.SEC_HEARTBEAT_OUTPUT/"
+    }
+  },
+  "ves-other": {
+    "type": "message_router",
+    "dmaap_info": {
+      "location": "mtl5",
+      "topic_url": "http://onap-dmaap:3904/events/unauthenticated.SEC_OTHER_OUTPUT/"
+    }
+  },
+  "ves-mobileflow": {
+    "type": "message_router",
+    "dmaap_info": {
+      "location": "mtl5",
+      "topic_url": "http://onap-dmaap:3904/events/DCAE-SE-COLLECTOR-EVENTS-DEV"
+    }
+  },
+  "ves-sipsignaling": {
+    "type": "message_router",
+    "dmaap_info": {
+      "location": "mtl5",
+      "topic_url": "http://onap-dmaap:3904/events/DCAE-SE-COLLECTOR-EVENTS-DEV"
+    }
+  },
+  "ves-voicequality": {
+    "type": "message_router",
+    "dmaap_info": {
+      "location": "mtl5",
+      "topic_url": "http://onap-dmaap:3904/events/DCAE-SE-COLLECTOR-EVENTS-DEV"
+    }
+  },
+  "ves-fault": {
+    "type": "message_router",
+    "dmaap_info": {
+      "location": "mtl5",
+      "topic_url": "http://onap-dmaap:3904/events/unauthenticated.SEC_FAULT_OUTPUT/"
+    }
+  },
+  "ves-measurement": {
+    "type": "message_router",
+    "dmaap_info": {
+      "location": "mtl5",
+      "topic_url": "http://onap-dmaap:3904/events/unauthenticated.VES_MEASUREMENT_OUTPUT/"
+    }
+  },
+  "ves-3gpp-fault-supervision": {
+    "type": "message_router",
+    "dmaap_info": {
+      "location": "mtl5",
+      "topic_url": "http://onap-dmaap:3904/events/unauthenticated.SEC_3GPP_FAULTSUPERVISION_OUTPUT/"
+    }
+  },
+  "ves-3gpp-provisioning": {
+    "type": "message_router",
+    "dmaap_info": {
+      "location": "mtl5",
+      "topic_url": "http://onap-dmaap:3904/events/unauthenticated.SEC_3GPP_PROVISIONING_OUTPUT/"
+    }
+  },
+  "ves-3gpp-heartbeat": {
+    "type": "message_router",
+    "dmaap_info": {
+      "location": "mtl5",
+      "topic_url": "http://onap-dmaap:3904/events/unauthenticated.SEC_3GPP_HEARTBEAT_OUTPUT/"
+    }
+  },
+  "ves-3gpp-performance-assurance": {
+    "type": "message_router",
+    "dmaap_info": {
+      "location": "mtl5",
+      "topic_url": "http://onap-dmaap:3904/events/unauthenticated.SEC_3GPP_PERFORMANCEASSURANCE_OUTPUT/"
+    }
+  },
+  "ves-syslog-secondary": {
+    "type": "message_router",
+    "dmaap_info": {
+      "location": "mtl5",
+      "topic_url": "http://onap-dmaap:3904/events/DCAE-SE-COLLECTOR-EVENTS-DEV"
+    }
+  },
+  "ves-statechange-secondary": {
+    "type": "message_router",
+    "dmaap_info": {
+      "location": "mtl5",
+      "topic_url": "http://onap-dmaap:3904/events/DCAE-SE-COLLECTOR-EVENTS-DEV"
+    }
+  },
+  "ves-thresholdCrossingAlert-secondary": {
+    "type": "message_router",
+    "dmaap_info": {
+      "location": "mtl5",
+      "topic_url": "http://onap-dmaap:3904/events/DCAE-SE-COLLECTOR-EVENTS-DEV"
+    }
+  },
+  "ves-heartbeat-secondary": {
+    "type": "message_router",
+    "dmaap_info": {
+      "location": "mtl5",
+      "topic_url": "http://onap-dmaap:3904/events/DCAE-SE-COLLECTOR-EVENTS-DEV"
+    }
+  },
+  "ves-other-secondary": {
+    "type": "message_router",
+    "dmaap_info": {
+      "location": "mtl5",
+      "topic_url": "http://onap-dmaap:3904/events/DCAE-SE-COLLECTOR-EVENTS-DEV"
+    }
+  },
+  "ves-mobileflow-secondary": {
+    "type": "message_router",
+    "dmaap_info": {
+      "location": "mtl5",
+      "topic_url": "http://onap-dmaap:3904/events/DCAE-SE-COLLECTOR-EVENTS-DEV"
+    }
+  },
+  "ves-sipsignaling-secondary": {
+    "type": "message_router",
+    "dmaap_info": {
+      "location": "mtl5",
+      "topic_url": "http://onap-dmaap:3904/events/DCAE-SE-COLLECTOR-EVENTSves7_valid_ip_v4.json-DEV"
+    }
+  },
+  "ves-voicequality-secondary": {
+    "type": "message_router",
+    "dmaap_info": {
+      "location": "mtl5",
+      "topic_url": "http://onap-dmaap:3904/events/DCAE-SE-COLLECTOR-EVENTS-DEV"
+    }
+  },
+  "ves-fault-secondary": {
+    "type": "message_router",
+    "dmaap_info": {
+      "location": "mtl5",
+      "topic_url": "http://onap-dmaap:3904/events/DCAE-SE-COLLECTOR-EVENTS-DEV"
+    }
+  },
+  "ves-measurement-secondary": {
+    "type": "message_router",
+    "dmaap_info": {
+      "location": "mtl5",
+      "topic_url": "http://onap-dmaap:3904/events/DCAE-SE-COLLECTOR-EVENTS-DEV"
+    }
+  },
+  "ves-3gpp-fault-supervision-secondary": {
+    "type": "message_router",
+    "dmaap_info": {
+      "location": "mtl5",
+      "topic_url": "http://onap-dmaap:3904/events/unauthenticated.SEC_3GPP_FAULTSUPERVISION_OUTPUT"
+    }
+  },
+  "ves-3gpp-provisioning-secondary": {
+    "type": "message_router",
+    "dmaap_info": {
+      "location": "mtl5",
+      "topic_url": "http://onap-dmaap:3904/events/unauthenticated.SEC_3GPP_FAULTSUPERVISION_OUTPUT"
+    }
+  },
+  "ves-3gpp-heartbeat-secondary": {
+    "type": "message_router",
+    "dmaap_info": {
+      "location": "mtl5",
+      "topic_url": "http://onap-dmaap:3904/events/DCAE-SE-COLLECTOR-EVENTS-DEV"
+    }
+  },
+  "ves-3gpp-performance-assurance-secondary": {
+    "type": "message_router",
+    "dmaap_info": {
+      "location": "mtl5",
+      "topic_url": "http://onap-dmaap:3904/events/DCAE-SE-COLLECTOR-EVENTS-DEV"
+    }
+  },
+  "ves-pnfRegistration": {
+    "type": "message_router",
+    "dmaap_info": {
+      "location": "mtl5",
+      "topic_url": "http://onap-dmaap:3904/events/unauthenticated.VES_PNFREG_OUTPUT/"
+    }
+  }
+}