Cbs Client integration

Cbs Client is integrated to read configurations from consul

Issue-ID: DCAEGEN2-1595
Change-Id: Idb0ebd34eba077f9c1cb584abab4d8722b56f6c5
Signed-off-by: YongchaoWu <yongchao.wu@est.tech>

2 files changed, 85 insertions, 73 deletions

diff --git a/datafile-app-server/src/test/resources/datafile_endpoints_test.json b/datafile-app-server/src/test/resources/datafile_endpoints_test.json
index 4d4d00ab..0157c7d2 100644
--- a/datafile-app-server/src/test/resources/datafile_endpoints_test.json
+++ b/datafile-app-server/src/test/resources/datafile_endpoints_test.json
@@ -1,31 +1,35 @@
 {
-   "dmaap.ftpesConfig.keyCert":"/config/dfc.jks",
-   "dmaap.ftpesConfig.keyPassword":"secret",
-   "dmaap.ftpesConfig.trustedCa":"config/ftp.jks",
-   "dmaap.ftpesConfig.trustedCaPassword":"secret",
-   "dmaap.security.trustStorePath":"trustStorePath",
-   "dmaap.security.trustStorePasswordPath":"trustStorePasswordPath",
-   "dmaap.security.keyStorePath":"keyStorePath",
-   "dmaap.security.keyStorePasswordPath":"keyStorePasswordPath",
-   "dmaap.security.enableDmaapCertAuth":"true",
-   "dmaap.dmaapProducerConfiguration": {
-         "changeIdentifier":"PM_MEAS_FILES",
-         "feedName":"feed00"
-   },
-   "streams_subscribes":{
-      "dmaap_subscriber":{
-         "dmmap_info":{
-            "topic_url":"http://admin:admin@message-router.onap.svc.cluster.local:2222/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": "trustStorePath",
+    "dmaap.security.trustStorePasswordPath": "trustStorePasswordPath",
+    "dmaap.security.keyStorePath": "keyStorePath",
+    "dmaap.security.keyStorePasswordPath": "keyStorePasswordPath",
+    "dmaap.security.enableDmaapCertAuth": "true",
+    "streams_publishes": {
+      "PM_MEAS_FILES": {
+        "type": "data_router",
+        "dmaap_info": {
+          "username": "user",
+          "log_url": "https://dmaap.example.com/feedlog/972",
+          "publish_url": "https://message-router.onap.svc.cluster.local:3907/publish/1",
+          "location": "loc00",
+          "password": "password",
+          "publisher_id": "972.360gm"
+        }
       }
-   },
-   "feed00":{
-      "username":"user",
-      "log_url":"https://dmaap.example.com/feedlog/972",
-      "publish_url":"https://message-router.onap.svc.cluster.local:3907/publish/1",
-      "location":"loc00",
-      "password":"password",
-      "publisher_id":"972.360gm"
-   }
-}
+    },
+    "streams_subscribes": {
+      "dmaap_subscriber": {
+        "dmaap_info": {
+          "topic_url": "http://admin:admin@message-router.onap.svc.cluster.local:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT/OpenDcae-c12/C12"
+        },
+        "type": "message_router"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/datafile-app-server/src/test/resources/datafile_endpoints_test_2producers.json b/datafile-app-server/src/test/resources/datafile_endpoints_test_2producers.json
index a7e2497d..61b324ce 100644
--- a/datafile-app-server/src/test/resources/datafile_endpoints_test_2producers.json
+++ b/datafile-app-server/src/test/resources/datafile_endpoints_test_2producers.json
@@ -1,49 +1,57 @@
 {
-   "dmaap.ftpesConfig.keyCert":"/config/dfc.jks",
-   "dmaap.ftpesConfig.keyPassword":"secret",
-   "dmaap.ftpesConfig.trustedCa":"config/ftp.jks",
-   "dmaap.ftpesConfig.trustedCaPassword":"secret",
-   "dmaap.security.trustStorePath":"trustStorePath",
-   "dmaap.security.trustStorePasswordPath":"trustStorePasswordPath",
-   "dmaap.security.keyStorePath":"keyStorePath",
-   "dmaap.security.keyStorePasswordPath":"keyStorePasswordPath",
-   "dmaap.security.enableDmaapCertAuth":"true",
-   "dmaap.dmaapProducerConfiguration":[
-      {
-         "changeIdentifier":"PM_MEAS_FILES",
-         "feedName":"feed00"
+  "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": "trustStorePath",
+    "dmaap.security.trustStorePasswordPath": "trustStorePasswordPath",
+    "dmaap.security.keyStorePath": "keyStorePath",
+    "dmaap.security.keyStorePasswordPath": "keyStorePasswordPath",
+    "dmaap.security.enableDmaapCertAuth": "true",
+    "streams_publishes": {
+      "PM_MEAS_FILES": {
+        "type": "data_router",
+        "dmaap_info": {
+          "username": "CYE9fl40",
+          "location": "loc00",
+          "log_url": "https://dmaap-dr-prov/feedlog/4",
+          "publisher_id": "4.307dw",
+          "password": "izBJD8nLjawq0HMG",
+          "publish_url": "https://dmaap-dr-prov/publish/4"
+        }
       },
-      {
-         "changeIdentifier":"XX_FILES",
-         "feedName":"feed01"
+      "XX_FILES": {
+        "type": "data_router",
+        "dmaap_info": {
+          "username": "user",
+          "log_url": "feed01::log_url",
+          "publish_url": "feed01::publish_url",
+          "location": "loc00",
+          "password": "",
+          "publisher_id": ""
+        }
       },
-      {
-         "changeIdentifier":"YY_FILES",
-         "feedName":"feed01"
+      "YY_FILES": {
+        "type": "data_router",
+        "dmaap_info": {
+          "username": "user",
+          "log_url": "feed01::log_url",
+          "publish_url": "feed01::publish_url",
+          "location": "loc00",
+          "password": "",
+          "publisher_id": ""
+        }
       }
-   ],
-   "streams_subscribes":{
-      "dmaap_subscriber":{
-         "dmmap_info":{
-            "topic_url":"http://admin:admin@message-router.onap.svc.cluster.local:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT/OpenDcae-c12/C12"
-         },
-         "type":"message_router"
+    },
+    "streams_subscribes": {
+      "dmaap_subscriber": {
+        "dmaap_info": {
+          "topic_url": "http://admin:admin@message-router.onap.svc.cluster.local:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT/OpenDcae-c12/C12"
+        },
+        "type": "message_router"
       }
-   },
-   "feed00":{
-      "username":"user",
-      "log_url":"https://dmaap.example.com/feedlog/972",
-      "publish_url":"https://message-router.onap.svc.cluster.local:3907/publish/1",
-      "location":"loc00",
-      "password":"password",
-      "publisher_id":"972.360gm"
-   },
-   "feed01":{
-      "username":"user",
-      "log_url":"feed01::log_url",
-      "publish_url":"feed01::publish_url",
-      "location":"loc00",
-      "password":"",
-      "publisher_id":""
-   }
-}
+    }
+  }
+}
\ No newline at end of file