Merge "Flatten configuration structure"

2 files changed, 17 insertions, 32 deletions

diff --git a/plans/dcaegen2-collectors-hv-ves/testsuites/collector/configuration/insecure.json b/plans/dcaegen2-collectors-hv-ves/testsuites/collector/configuration/insecure.json
index 3df8e6e8..357824dd 100644
--- a/plans/dcaegen2-collectors-hv-ves/testsuites/collector/configuration/insecure.json
+++ b/plans/dcaegen2-collectors-hv-ves/testsuites/collector/configuration/insecure.json
@@ -1,15 +1,9 @@
 {
-  "server": {
-    "listenPort": 6061,
-    "idleTimeoutSec": 60,
-    "maxPayloadSizeBytes": 1048576
-  },
-  "cbs": {
-    "firstRequestDelaySec": 5,
-    "requestIntervalSec": 10
-  },
-  "security": {
-    "sslDisable": true
-  },
-  "logLevel": "DEBUG"
+  "logLevel": "DEBUG",
+  "server.listenPort": 6061,
+  "server.idleTimeoutSec": 60,
+  "server.maxPayloadSizeBytes": 1048576,
+  "cbs.firstRequestDelaySec": 3,
+  "cbs.requestIntervalSec": 5,
+  "security.sslDisable": true
 }
\ No newline at end of file
diff --git a/plans/dcaegen2-collectors-hv-ves/testsuites/collector/configuration/secure.json b/plans/dcaegen2-collectors-hv-ves/testsuites/collector/configuration/secure.json
index 60ac2366..2c2610a0 100644
--- a/plans/dcaegen2-collectors-hv-ves/testsuites/collector/configuration/secure.json
+++ b/plans/dcaegen2-collectors-hv-ves/testsuites/collector/configuration/secure.json
@@ -1,21 +1,12 @@
 {
-  "server": {
-    "listenPort": 6061,
-    "idleTimeoutSec": 60,
-    "maxPayloadSizeBytes": 1048576
-  },
-  "cbs": {
-    "firstRequestDelaySec": 5,
-    "requestIntervalSec": 10
-  },
-  "security": {
-    "sslDisable": false,
-    "keys": {
-      "keyStoreFile": "/etc/hv-ves/ssl/server.p12",
-      "keyStorePassword": "onaponap",
-      "trustStoreFile": "/etc/hv-ves/ssl/trust.p12",
-      "trustStorePassword": "onaponap"
-    }
-  },
-  "logLevel": "DEBUG"
+  "logLevel": "DEBUG",
+  "server.listenPort": 6061,
+  "server.idleTimeoutSec": 60,
+  "server.maxPayloadSizeBytes": 1048576,
+  "cbs.firstRequestDelaySec": 3,
+  "cbs.requestIntervalSec": 5,
+  "security.keys.keyStoreFile": "/etc/hv-ves/ssl/server.p12",
+  "security.keys.keyStorePassword": "onaponap",
+  "security.keys.trustStoreFile": "/etc/hv-ves/ssl/trust.p12",
+  "security.keys.trustStorePassword": "onaponap"
 }
\ No newline at end of file