Merge "adapt csit to integration, update the configurations"

1 files changed, 32 insertions, 29 deletions

diff --git a/plans/usecases/5G-bulkpm/assets/datafile_endpoints.json b/plans/usecases/5G-bulkpm/assets/datafile_endpoints.json
index 4d9c1974..6ba0f257 100644
--- a/plans/usecases/5G-bulkpm/assets/datafile_endpoints.json
+++ b/plans/usecases/5G-bulkpm/assets/datafile_endpoints.json
@@ -1,32 +1,35 @@
 {
-    "//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@dmaapmrhost:3904/events/unauthenticated.VES_NOTIFICATION_OUTPUT/OpenDcae-c12/C12"
-          },
-          "type":"message_router"
-       }
+  "config": {
+    "//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",
+    "streams_publishes": {
+      "PM_MEAS_FILES": {
+        "type": "data_router",
+        "dmaap_info": {
+          "username": "dradmin",
+          "location": "san-francisco",
+          "log_url": "https://dmaapdrhost:8443/feedlog/1",
+          "publisher_id": "972.360gm",
+          "password": "dradmin",
+          "publish_url": "https://dmaapdrhost:8443/publish/1"
+        }
+      }
     },
-     "feed00":{
-       "username":"dradmin",
-       "log_url":"https://dmaapdrhost:8443/feedlog/1",
-       "publish_url":"https://dmaapdrhost:8443/publish/1",
-       "location":"san-francisco",
-       "password":"dradmin",
-       "publisher_id":"972.360gm"
+    "streams_subscribes": {
+      "dmaap_subscriber": {
+        "dmaap_info": {
+             "topic_url":"http://dradmin:dradmin@dmaapmrhost:3904/events/unauthenticated.VES_NOTIFICATION_OUTPUT/OpenDcae-c12/C12"
+        },
+        "type": "message_router"
+      }
     }
- }
\ No newline at end of file
+  }
+}