Generalizing Data File Collection to handle any type of file

Extension of the DFC to be able to handle any file types types, which are published on different DR feeds.
This association between file type and DR feed is defined by configuration.
The file type is defined by the changeIdentifier in the fileReady VES message reported from the PNF.

The creation of DR feeds and configuration will be done by the DMAAP plugin, but that is
not tested yet.

Change-Id: I13b36acd926a6941ee733e6b37922049fb54a5d9
Issue-ID: DCAEGEN2-1532
Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>

1 files changed, 30 insertions, 41 deletions

diff --git a/datafile-app-server/config/datafile_endpoints.json b/datafile-app-server/config/datafile_endpoints.json
index 833f1e91..cd1b502f 100644
--- a/datafile-app-server/config/datafile_endpoints.json
+++ b/datafile-app-server/config/datafile_endpoints.json
@@ -1,44 +1,33 @@
 {
-    "configs": {
-        "dmaap": {
-            "dmaapConsumerConfiguration": {
-                "dmaapHostName": "localhost",
-                "dmaapPortNumber": 2222,
-                "dmaapTopicName": "/events/unauthenticated.VES_NOTIFICATION_OUTPUT",
-                "dmaapProtocol": "http",
-                "dmaapUserName": "",
-                "dmaapUserPassword": "",
-                "dmaapContentType": "application/json",
-                "consumerId": "C12",
-                "consumerGroup": "OpenDcae-c12",
-                "timeoutMs": -1,
-                "messageLimit": 1
-            },
-            "dmaapProducerConfiguration": {
-                "dmaapHostName": "localhost",
-                "dmaapPortNumber": 3907,
-                "dmaapTopicName": "publish",
-                "dmaapProtocol": "https",
-                "dmaapUserName": "dradmin",
-                "dmaapUserPassword": "dradmin",
-                "dmaapContentType": "application/octet-stream"
-            }
-        },
-        "ftp": {
-            "ftpesConfiguration": {
-                "keyCert": "config/dfc.jks",
-                "keyPassword": "secret",
-                "trustedCa": "config/ftp.jks",
-                "trustedCaPassword": "secret"
-            }
-        },
-        "security": {
-            "trustStorePath" : "change it",
-            "trustStorePasswordPath" : "change it",
-            "keyStorePath" : "change it",
-            "keyStorePasswordPath" : "change it",
-            "enableDmaapCertAuth" : "false"
-        }
-    }
+   "//description":"This file is only used for testing purposes",
+   "dmaap.ftpesConfig.keyCert":"/config/dfc.jks",
+   "dmaap.ftpesConfig.keyPassword":"secret",
+   "dmaap.ftpesConfig.trustedCa":"config/ftp.jks",
+   "dmaap.ftpesConfig.trustedCaPassword":"secret",
+   "dmaap.security.trustStorePath":"change it",
+   "dmaap.security.trustStorePasswordPath":"trustStorePasswordPath",
+   "dmaap.security.keyStorePath":"keyStorePath",
+   "dmaap.security.keyStorePasswordPath":"change it",
+   "dmaap.security.enableDmaapCertAuth":"false",
+   "dmaap.dmaapProducerConfiguration" : {
+         "changeIdentifier":"PM_MEAS_FILES",
+         "feedName":"feed00"
+    },  
+    "streams_subscribes":{
+      "dmaap_subscriber":{
+         "dmmap_info":{
+            "topic_url":"http://dradmin:dradmin@localhost:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT/OpenDcae-c12/C12"
+         },
+         "type":"message_router"
+      }
+   },
+    "feed00":{
+      "username":"user",
+      "log_url":"https://localhost:3907/feedlog/1",
+      "publish_url":"https://localhost:3907/publish/1",
+      "location":"loc00",
+      "password":"dradmin",
+      "publisher_id":"972.360gm"
+   }
 }