diff options
author | 2019-04-08 11:21:06 +0200 | |
---|---|---|
committer | 2019-04-08 11:22:31 +0200 | |
commit | 3f50cd449b9152cc69586536268e2551b33f0985 (patch) | |
tree | 8ff8653587e011cf7a5462f08efe18a339377859 | |
parent | 6a5f3b7c00d298cceddf860764ed144f7daa9b20 (diff) |
Flatten configuration structure
This follows related commit with same name in
DCAEGEN2-710 for hv-ves repository.
Change-Id: I0da209ad567ebc0259843db0ca4550f67ed8d918
Issue-ID: DCAEGEN2-710
Signed-off-by: Filip Krzywka <filip.krzywka@nokia.com>
-rw-r--r-- | plans/dcaegen2-collectors-hv-ves/testsuites/collector/configuration/insecure.json | 20 | ||||
-rw-r--r-- | plans/dcaegen2-collectors-hv-ves/testsuites/collector/configuration/secure.json | 29 |
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 |