aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBartek Grzybowski <b.grzybowski@partner.samsung.com>2020-02-26 15:18:52 +0100
committerMorgan Richomme <morgan.richomme@orange.com>2020-03-02 14:20:42 +0000
commit8b22815044566565bbcc69c6d1ce8f59d7cc65fe (patch)
tree229897dd9a596bb5ecd759d445d8168fac013b63
parenta69f6ca637ba6a4af45f4920316b157de89cf6da (diff)
Fix JSON files linter issues in test/mocks/datafilecollector-testharness
This is needed prior to adding job for JSON files linting in CI. Change-Id: I144873a8511f38a4336b73ac19276b213207a9fa Issue-ID: INT-1451 Signed-off-by: Bartek Grzybowski <b.grzybowski@partner.samsung.com>
-rw-r--r--test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed1_PM.json22
-rw-r--r--test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed1_PM_feed2_CTR.json2
-rw-r--r--test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_CTR.json2
-rw-r--r--test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_CTR_feed3_LOG_TEMP.json2
-rw-r--r--test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_PM.json20
-rw-r--r--test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_PM_MEAS.json20
-rw-r--r--test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_PM_secureMR.json20
-rw-r--r--test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed3_PM_CTR.json16
-rw-r--r--test/mocks/datafilecollector-testharness/simulator-group/consul/c13_feed2_CTR.json2
-rw-r--r--test/mocks/datafilecollector-testharness/simulator-group/consul/c14_feed3_LOG.json4
-rw-r--r--test/mocks/datafilecollector-testharness/simulator-group/consul/c15_feed1_PM_feed4_TEST.json2
-rw-r--r--test/mocks/datafilecollector-testharness/simulator-group/consul/c16_feed4_TEST_feed5_TEMP.json2
12 files changed, 57 insertions, 57 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 eac26a9ab..787e6c607 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
@@ -7,11 +7,11 @@
"dmaap.security.trustStorePasswordPath": "/opt/app/datafile/etc/cert/trust.pass",
"dmaap.security.keyStorePath": "/opt/app/datafile/etc/cert/cert.jks",
"dmaap.security.keyStorePasswordPath": "/opt/app/datafile/etc/cert/jks.pass",
- "dmaap.security.enableDmaapCertAuth":"false",
- "streams_publishes":{
- "PM_MEAS_FILES":{
- "type":"data_router",
- "dmaap_info":{
+ "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",
@@ -21,12 +21,12 @@
}
}
},
- "streams_subscribes":{
- "dmaap_subscriber":{
- "dmaap_info":{
- "topic_url":"http://dradmin:dradmin@mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT/OpenDcae-c12/C12"
+ "streams_subscribes": {
+ "dmaap_subscriber": {
+ "dmaap_info": {
+ "topic_url": "http://dradmin:dradmin@mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT/OpenDcae-c12/C12"
},
- "type":"message_router"
+ "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 c320eda7a..c7115179b 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
@@ -40,4 +40,4 @@
"type": "message_router"
}
}
-} \ No newline at end of file
+}
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 c7e5fc904..bc21a968e 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
@@ -31,4 +31,4 @@
}
}
}
-} \ 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 3a5280c27..90ddc258b 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
@@ -51,4 +51,4 @@
"type": "message_router"
}
}
-} \ No newline at end of file
+}
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 a78849890..d54b9e50c 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
@@ -7,11 +7,11 @@
"dmaap.security.trustStorePasswordPath": "/opt/app/datafile/etc/cert/trust.pass",
"dmaap.security.keyStorePath": "/opt/app/datafile/etc/cert/cert.jks",
"dmaap.security.keyStorePasswordPath": "/opt/app/datafile/etc/cert/jks.pass",
- "dmaap.security.enableDmaapCertAuth":"false",
- "streams_publishes":{
- "PM_MEAS_FILES":{
- "type":"data_router",
- "dmaap_info":{
+ "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",
@@ -21,12 +21,12 @@
}
}
},
- "streams_subscribes":{
- "dmaap_subscriber":{
- "dmaap_info":{
- "topic_url":"http://dradmin:dradmin@dfc_mr-sim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT/OpenDcae-c12/C12"
+ "streams_subscribes": {
+ "dmaap_subscriber": {
+ "dmaap_info": {
+ "topic_url": "http://dradmin:dradmin@dfc_mr-sim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT/OpenDcae-c12/C12"
},
- "type":"message_router"
+ "type": "message_router"
}
}
}
diff --git a/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_PM_MEAS.json b/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_PM_MEAS.json
index dbcf08ab5..b1e894011 100644
--- a/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_PM_MEAS.json
+++ b/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_PM_MEAS.json
@@ -7,11 +7,11 @@
"dmaap.security.trustStorePasswordPath": "/opt/app/datafile/etc/cert/trust.pass",
"dmaap.security.keyStorePath": "/opt/app/datafile/etc/cert/cert.jks",
"dmaap.security.keyStorePasswordPath": "/opt/app/datafile/etc/cert/jks.pass",
- "dmaap.security.enableDmaapCertAuth":"false",
- "streams_publishes":{
- "PM_MEAS_FILES":{
- "type":"data_router",
- "dmaap_info":{
+ "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",
@@ -21,12 +21,12 @@
}
}
},
- "streams_subscribes":{
- "dmaap_subscriber":{
- "dmaap_info":{
- "topic_url":"http://dradmin:dradmin@mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT/OpenDcae-c12/C12"
+ "streams_subscribes": {
+ "dmaap_subscriber": {
+ "dmaap_info": {
+ "topic_url": "http://dradmin:dradmin@mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT/OpenDcae-c12/C12"
},
- "type":"message_router"
+ "type": "message_router"
}
}
}
diff --git a/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_PM_secureMR.json b/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_PM_secureMR.json
index d8189bd8d..82c2f5807 100644
--- a/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_PM_secureMR.json
+++ b/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_PM_secureMR.json
@@ -7,11 +7,11 @@
"dmaap.security.trustStorePasswordPath": "/opt/app/datafile/etc/cert/trust.pass",
"dmaap.security.keyStorePath": "/opt/app/datafile/etc/cert/cert.jks",
"dmaap.security.keyStorePasswordPath": "/opt/app/datafile/etc/cert/jks.pass",
- "dmaap.security.enableDmaapCertAuth":"false",
- "streams_publishes":{
- "PM_MEAS_FILES":{
- "type":"data_router",
- "dmaap_info":{
+ "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",
@@ -21,12 +21,12 @@
}
}
},
- "streams_subscribes":{
- "dmaap_subscriber":{
- "dmaap_info":{
- "topic_url":"https://dradmin:dradmin@mrsim:2223/events/unauthenticated.VES_NOTIFICATION_OUTPUT/OpenDcae-c12/C12"
+ "streams_subscribes": {
+ "dmaap_subscriber": {
+ "dmaap_info": {
+ "topic_url": "https://dradmin:dradmin@mrsim:2223/events/unauthenticated.VES_NOTIFICATION_OUTPUT/OpenDcae-c12/C12"
},
- "type":"message_router"
+ "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 489580a4f..6d3f205d2 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,10 +8,10 @@
"dmaap.security.keyStorePath": "/opt/app/datafile/etc/cert/cert.jks",
"dmaap.security.keyStorePasswordPath": "/opt/app/datafile/etc/cert/jks.pass",
"dmaap.security.enableDmaapCertAuth": "false",
- "streams_publishes":{
- "PM_MEAS_FILES":{
- "type":"data_router",
- "dmaap_info":{
+ "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",
@@ -20,9 +20,9 @@
"publisher_id": "972.360gm"
}
},
- "CTR_MEAS_FILES":{
- "type":"data_router",
- "dmaap_info":{
+ "CTR_MEAS_FILES": {
+ "type": "data_router",
+ "dmaap_info": {
"username": "user",
"log_url": "https://drsim:3907/feedlog/3",
"publish_url": "https://drsim:3907/publish/3",
@@ -40,4 +40,4 @@
"type": "message_router"
}
}
-} \ No newline at end of file
+}
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 a98752b65..9841a241b 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
@@ -29,4 +29,4 @@
"type": "message_router"
}
}
-} \ No newline at end of file
+}
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 07d3f3e78..c76974f8d 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,7 +8,7 @@
"dmaap.security.keyStorePath": "/opt/app/datafile/etc/cert/cert.jks",
"dmaap.security.keyStorePasswordPath": "/opt/app/datafile/etc/cert/jks.pass",
"dmaap.security.enableDmaapCertAuth": "false",
- "streams_publishes": {
+ "streams_publishes": {
"LOG_FILES": {
"type": "data_router",
"dmaap_info": {
@@ -29,4 +29,4 @@
"type": "message_router"
}
}
-} \ No newline at end of file
+}
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 55ffa1ba0..3f43b6756 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
@@ -40,4 +40,4 @@
"type": "message_router"
}
}
-} \ No newline at end of file
+}
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 5ab297466..5afee1b4c 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
@@ -40,4 +40,4 @@
"type": "message_router"
}
}
-} \ No newline at end of file
+}