aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorYongchaoWu <yongchao.wu@est.tech>2019-07-17 17:15:59 +0000
committerYongchaoWu <yongchao.wu@est.tech>2019-07-17 17:15:59 +0000
commit2f3caa5c27d339c6a371d6e5f9d81519e919d96c (patch)
treeadb0e0854a95418c55b9bdb0477133bbf107a430 /test
parenta79a043b5a99fa05e9f73559ff1c3b2e36bd70c0 (diff)
modify the configuration in consul for dfc
modify the configuration in consul in order to support dfc to fetch the merged configuration Issue-ID: INT-1155 Change-Id: I6d73987183851ed38225796c9f426a1010376fd3 Signed-off-by: YongchaoWu <yongchao.wu@est.tech>
Diffstat (limited to 'test')
-rw-r--r--test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed1_PM.json49
-rw-r--r--test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed1_PM_feed2_CTR.json32
-rw-r--r--test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_CTR.json51
-rw-r--r--test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_CTR_feed3_LOG_TEMP.json45
-rw-r--r--test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_PM.json49
-rw-r--r--test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed3_PM_CTR.json32
-rw-r--r--test/mocks/datafilecollector-testharness/simulator-group/consul/c13_feed2_CTR.json17
-rw-r--r--test/mocks/datafilecollector-testharness/simulator-group/consul/c14_feed3_LOG.json17
-rw-r--r--test/mocks/datafilecollector-testharness/simulator-group/consul/c15_feed1_PM_feed4_TEST.json32
-rw-r--r--test/mocks/datafilecollector-testharness/simulator-group/consul/c16_feed4_TEST_feed5_TEMP.json32
10 files changed, 240 insertions, 116 deletions
diff --git a/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed1_PM.json b/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed1_PM.json
index 282085c55..29acb16ce 100644
--- a/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed1_PM.json
+++ b/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed1_PM.json
@@ -1,23 +1,32 @@
{
- "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":"feed01"
- },
- "streams_subscribes":{
- "dmaap_subscriber":{
- "dmmap_info":{
- "topic_url":"http://dradmin:dradmin@mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT/OpenDcae-c12/C12"
- },
- "type":"message_router"
+ "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": "user",
+ "log_url": "https://drsim:3907/feedlog/1",
+ "publish_url": "https://drsim:3907/publish/1",
+ "location": "loc00",
+ "password": "password",
+ "publisher_id": "972.360gm"
}
- }
+ }
+ },
+ "streams_subscribes":{
+ "dmaap_subscriber":{
+ "dmaap_info":{
+ "topic_url":"http://dradmin:dradmin@mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT/OpenDcae-c12/C12"
+ },
+ "type":"message_router"
+ }
+ }
} \ No newline at end of file
diff --git a/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed1_PM_feed2_CTR.json b/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed1_PM_feed2_CTR.json
index 2e4f62c86..a37c3be4d 100644
--- a/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed1_PM_feed2_CTR.json
+++ b/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed1_PM_feed2_CTR.json
@@ -8,19 +8,33 @@
"dmaap.security.keyStorePath": "keyStorePath",
"dmaap.security.keyStorePasswordPath": "change it",
"dmaap.security.enableDmaapCertAuth": "false",
- "dmaap.dmaapProducerConfiguration": [
- {
- "changeIdentifier": "PM_MEAS_FILES",
- "feedName": "feed01"
+ "streams_publishes": {
+ "PM_MEAS_FILES": {
+ "type": "data_router",
+ "username": "user",
+ "log_url": "https://drsim:3907/feedlog/1",
+ "publish_url": "https://drsim:3907/publish/1",
+ "location": "loc00",
+ "password": "password",
+ "publisher_id": "972.360gm"
},
- {
- "changeIdentifier": "CTR_FILES",
- "feedName": "feed02"
+ "CTR_FILES": {
+ "type": "data_router",
+ "dmaap_info": {
+ "feed02": {
+ "username": "user",
+ "log_url": "https://drsim:3907/feedlog/2",
+ "publish_url": "https://drsim:3907/publish/2",
+ "location": "loc00",
+ "password": "password",
+ "publisher_id": "972.360gm"
+ }
+ }
}
- ],
+ },
"streams_subscribes": {
"dmaap_subscriber": {
- "dmmap_info": {
+ "dmaap_info": {
"topic_url": "http://dradmin:dradmin@mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT/OpenDcae-c12/C12"
},
"type": "message_router"
diff --git a/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_CTR.json b/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_CTR.json
index 7eeed24a9..31d3a4b67 100644
--- a/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_CTR.json
+++ b/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_CTR.json
@@ -1,23 +1,34 @@
{
- "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":"CTR_MEAS_FILES",
- "feedName":"feed02"
- },
- "streams_subscribes":{
- "dmaap_subscriber":{
- "dmmap_info":{
- "topic_url":"http://dradmin:dradmin@mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT/OpenDcae-c12/C12"
- },
- "type":"message_router"
+ "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_subscribes": {
+ "dmaap_subscriber": {
+ "dmaap_info": {
+ "topic_url": "http://dradmin:dradmin@mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT/OpenDcae-c12/C12"
+ },
+ "type": "message_router"
+ }
+ },
+ "streams_publishes": {
+ "CTR_MEAS_FILES": {
+ "type": "data_router",
+ "dmaap_info": {
+ "feed02": {
+ "username": "user",
+ "log_url": "https://drsim:3907/feedlog/2",
+ "publish_url": "https://drsim:3907/publish/2",
+ "location": "loc00",
+ "password": "password",
+ "publisher_id": "972.360gm"
+ }
}
- }
+ }
+ }
} \ No newline at end of file
diff --git a/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_CTR_feed3_LOG_TEMP.json b/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_CTR_feed3_LOG_TEMP.json
index 83be949fd..b7b63cc27 100644
--- a/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_CTR_feed3_LOG_TEMP.json
+++ b/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_CTR_feed3_LOG_TEMP.json
@@ -8,23 +8,44 @@
"dmaap.security.keyStorePath": "keyStorePath",
"dmaap.security.keyStorePasswordPath": "change it",
"dmaap.security.enableDmaapCertAuth": "false",
- "dmaap.dmaapProducerConfiguration": [
- {
- "changeIdentifier": "CTR_MEAS_FILES",
- "feedName": "feed02"
+ "streams_publishes": {
+ "CTR_MEAS_FILES": {
+ "type": "data_router",
+ "dmaap_info": {
+ "username": "user",
+ "log_url": "https://drsim:3907/feedlog/2",
+ "publish_url": "https://drsim:3907/publish/2",
+ "location": "loc00",
+ "password": "password",
+ "publisher_id": "972.360gm"
+ }
},
- {
- "changeIdentifier": "LOG_FILES",
- "feedName": "feed03"
+ "LOG_FILES": {
+ "type": "data_router",
+ "dmaap_info": {
+ "username": "user",
+ "log_url": "https://drsim:3907/feedlog/3",
+ "publish_url": "https://drsim:3907/publish/3",
+ "location": "loc00",
+ "password": "password",
+ "publisher_id": "972.360gm"
+ }
},
- {
- "changeIdentifier": "TEMP_FILES",
- "feedName": "feed03"
+ "TEMP_FILES": {
+ "type": "data_router",
+ "dmaap_info": {
+ "username": "user",
+ "log_url": "https://drsim:3907/feedlog/3",
+ "publish_url": "https://drsim:3907/publish/3",
+ "location": "loc00",
+ "password": "password",
+ "publisher_id": "972.360gm"
+ }
}
- ],
+ },
"streams_subscribes": {
"dmaap_subscriber": {
- "dmmap_info": {
+ "dmaap_info": {
"topic_url": "http://dradmin:dradmin@mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT/OpenDcae-c12/C12"
},
"type": "message_router"
diff --git a/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_PM.json b/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_PM.json
index a366b4c91..9974c187f 100644
--- a/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_PM.json
+++ b/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_PM.json
@@ -1,23 +1,32 @@
{
- "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":"feed02"
- },
- "streams_subscribes":{
- "dmaap_subscriber":{
- "dmmap_info":{
- "topic_url":"http://dradmin:dradmin@mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT/OpenDcae-c12/C12"
- },
- "type":"message_router"
+ "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": "user",
+ "log_url": "https://drsim:3907/feedlog/2",
+ "publish_url": "https://drsim:3907/publish/2",
+ "location": "loc00",
+ "password": "password",
+ "publisher_id": "972.360gm"
}
- }
+ }
+ },
+ "streams_subscribes":{
+ "dmaap_subscriber":{
+ "dmaap_info":{
+ "topic_url":"http://dradmin:dradmin@mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT/OpenDcae-c12/C12"
+ },
+ "type":"message_router"
+ }
+ }
}
diff --git a/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed3_PM_CTR.json b/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed3_PM_CTR.json
index eca72be5d..617126863 100644
--- a/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed3_PM_CTR.json
+++ b/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed3_PM_CTR.json
@@ -8,19 +8,33 @@
"dmaap.security.keyStorePath": "keyStorePath",
"dmaap.security.keyStorePasswordPath": "change it",
"dmaap.security.enableDmaapCertAuth": "false",
- "dmaap.dmaapProducerConfiguration": [
- {
- "changeIdentifier": "PM_MEAS_FILES",
- "feedName": "feed03"
+ "streams_publishes":{
+ "PM_MEAS_FILES":{
+ "type":"data_router",
+ "dmaap_info":{
+ "username": "user",
+ "log_url": "https://drsim:3907/feedlog/3",
+ "publish_url": "https://drsim:3907/publish/3",
+ "location": "loc00",
+ "password": "password",
+ "publisher_id": "972.360gm"
+ }
},
- {
- "changeIdentifier": "CTR_MEAS_FILES",
- "feedName": "feed03"
+ "CTR_FILES":{
+ "type":"data_router",
+ "dmaap_info":{
+ "username": "user",
+ "log_url": "https://drsim:3907/feedlog/3",
+ "publish_url": "https://drsim:3907/publish/3",
+ "location": "loc00",
+ "password": "password",
+ "publisher_id": "972.360gm"
+ }
}
- ],
+ },
"streams_subscribes": {
"dmaap_subscriber": {
- "dmmap_info": {
+ "dmaap_info": {
"topic_url": "http://dradmin:dradmin@mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT/OpenDcae-c12/C12"
},
"type": "message_router"
diff --git a/test/mocks/datafilecollector-testharness/simulator-group/consul/c13_feed2_CTR.json b/test/mocks/datafilecollector-testharness/simulator-group/consul/c13_feed2_CTR.json
index c8e199d74..ade30aa89 100644
--- a/test/mocks/datafilecollector-testharness/simulator-group/consul/c13_feed2_CTR.json
+++ b/test/mocks/datafilecollector-testharness/simulator-group/consul/c13_feed2_CTR.json
@@ -8,13 +8,22 @@
"dmaap.security.keyStorePath": "keyStorePath",
"dmaap.security.keyStorePasswordPath": "change it",
"dmaap.security.enableDmaapCertAuth": "false",
- "dmaap.dmaapProducerConfiguration": {
- "changeIdentifier": "CTR_MEAS_FILES",
- "feedName": "feed02"
+ "streams_publishes": {
+ "CTR_MEAS_FILES": {
+ "type": "data_router",
+ "dmaap_info": {
+ "username": "user",
+ "log_url": "https://drsim:3907/feedlog/2",
+ "publish_url": "https://drsim:3907/publish/2",
+ "location": "loc00",
+ "password": "password",
+ "publisher_id": "972.360gm"
+ }
+ }
},
"streams_subscribes": {
"dmaap_subscriber": {
- "dmmap_info": {
+ "dmaap_info": {
"topic_url": "http://dradmin:dradmin@mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT/OpenDcae-c13/C13"
},
"type": "message_router"
diff --git a/test/mocks/datafilecollector-testharness/simulator-group/consul/c14_feed3_LOG.json b/test/mocks/datafilecollector-testharness/simulator-group/consul/c14_feed3_LOG.json
index 1f91a382e..b98a46f73 100644
--- a/test/mocks/datafilecollector-testharness/simulator-group/consul/c14_feed3_LOG.json
+++ b/test/mocks/datafilecollector-testharness/simulator-group/consul/c14_feed3_LOG.json
@@ -8,13 +8,22 @@
"dmaap.security.keyStorePath": "keyStorePath",
"dmaap.security.keyStorePasswordPath": "change it",
"dmaap.security.enableDmaapCertAuth": "false",
- "dmaap.dmaapProducerConfiguration": {
- "changeIdentifier": "LOG_FILES",
- "feedName": "feed03"
+ "streams_publishes": {
+ "LOG_FILES": {
+ "type": "data_router",
+ "dmaap_info": {
+ "username": "user",
+ "log_url": "https://drsim:3907/feedlog/3",
+ "publish_url": "https://drsim:3907/publish/3",
+ "location": "loc00",
+ "password": "password",
+ "publisher_id": "972.360gm"
+ }
+ }
},
"streams_subscribes": {
"dmaap_subscriber": {
- "dmmap_info": {
+ "dmaap_info": {
"topic_url": "http://dradmin:dradmin@mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT/OpenDcae-c14/C14"
},
"type": "message_router"
diff --git a/test/mocks/datafilecollector-testharness/simulator-group/consul/c15_feed1_PM_feed4_TEST.json b/test/mocks/datafilecollector-testharness/simulator-group/consul/c15_feed1_PM_feed4_TEST.json
index acef9b970..7ee78f5cd 100644
--- a/test/mocks/datafilecollector-testharness/simulator-group/consul/c15_feed1_PM_feed4_TEST.json
+++ b/test/mocks/datafilecollector-testharness/simulator-group/consul/c15_feed1_PM_feed4_TEST.json
@@ -8,19 +8,33 @@
"dmaap.security.keyStorePath": "keyStorePath",
"dmaap.security.keyStorePasswordPath": "change it",
"dmaap.security.enableDmaapCertAuth": "false",
- "dmaap.dmaapProducerConfiguration": [
- {
- "changeIdentifier": "PM_MEAS_FILES",
- "feedName": "feed01"
+ "streams_publishes": {
+ "PM_MEAS_FILES": {
+ "type": "data_router",
+ "dmaap_info": {
+ "username": "user",
+ "log_url": "https://drsim:3907/feedlog/1",
+ "publish_url": "https://drsim:3907/publish/1",
+ "location": "loc00",
+ "password": "password",
+ "publisher_id": "972.360gm"
+ }
},
- {
- "changeIdentifier": "TEST_FILES",
- "feedName": "feed04"
+ "TEST_FILES": {
+ "type": "data_router",
+ "dmaap_info": {
+ "username": "user",
+ "log_url": "https://drsim:3907/feedlog/4",
+ "publish_url": "https://drsim:3907/publish/4",
+ "location": "loc00",
+ "password": "password",
+ "publisher_id": "972.360gm"
+ }
}
- ],
+ },
"streams_subscribes": {
"dmaap_subscriber": {
- "dmmap_info": {
+ "dmaap_info": {
"topic_url": "http://dradmin:dradmin@mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT/OpenDcae-c15/C15"
},
"type": "message_router"
diff --git a/test/mocks/datafilecollector-testharness/simulator-group/consul/c16_feed4_TEST_feed5_TEMP.json b/test/mocks/datafilecollector-testharness/simulator-group/consul/c16_feed4_TEST_feed5_TEMP.json
index e10fe0713..7c68d7ac6 100644
--- a/test/mocks/datafilecollector-testharness/simulator-group/consul/c16_feed4_TEST_feed5_TEMP.json
+++ b/test/mocks/datafilecollector-testharness/simulator-group/consul/c16_feed4_TEST_feed5_TEMP.json
@@ -8,19 +8,33 @@
"dmaap.security.keyStorePath": "keyStorePath",
"dmaap.security.keyStorePasswordPath": "change it",
"dmaap.security.enableDmaapCertAuth": "false",
- "dmaap.dmaapProducerConfiguration": [
- {
- "changeIdentifier": "TEST_FILES",
- "feedName": "feed04"
+ "streams_publishes": {
+ "TEST_FILES": {
+ "type": "data_router",
+ "dmaap_info": {
+ "username": "user",
+ "log_url": "https://drsim:3907/feedlog/4",
+ "publish_url": "https://drsim:3907/publish/4",
+ "location": "loc00",
+ "password": "password",
+ "publisher_id": "972.360gm"
+ }
},
- {
- "changeIdentifier": "TEMP_FILES",
- "feedName": "feed05"
+ "TEMP_FILES": {
+ "type": "data_router",
+ "dmaap_info": {
+ "username": "user",
+ "log_url": "https://drsim:3907/feedlog/5",
+ "publish_url": "https://drsim:3907/publish/4",
+ "location": "loc00",
+ "password": "password",
+ "publisher_id": "972.360gm"
+ }
}
- ],
+ },
"streams_subscribes": {
"dmaap_subscriber": {
- "dmmap_info": {
+ "dmaap_info": {
"topic_url": "http://dradmin:dradmin@mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT/OpenDcae-c15/C15"
},
"type": "message_router"