From dd2d790dd97ec4260531bc1fdce5766bf85797d8 Mon Sep 17 00:00:00 2001 From: "Determe, Sebastien (sd378r)" Date: Fri, 6 Apr 2018 11:48:07 +0200 Subject: Update SDC library Upgrade SDC library to latest and remove the message bus condition, it's now a mandatory parameter as well Issue-ID: CLAMP-149 Change-Id: I4c7ddcca6ac176380821bd8f1e4e3ef3d9fcea30 Signed-off-by: Determe, Sebastien (sd378r) --- src/test/resources/clds/sdc-controller-config-NULL.json | 5 +++-- src/test/resources/clds/sdc-controller-config-TLS.json | 2 +- .../resources/clds/sdc-controller-config-bad-address.json | 12 ------------ src/test/resources/clds/sdc-controller-config-bad.json | 2 +- .../clds/sdc-controller-config-empty-encrypted.json | 14 ++++++++++++++ 5 files changed, 19 insertions(+), 16 deletions(-) delete mode 100644 src/test/resources/clds/sdc-controller-config-bad-address.json create mode 100644 src/test/resources/clds/sdc-controller-config-empty-encrypted.json (limited to 'src/test/resources') diff --git a/src/test/resources/clds/sdc-controller-config-NULL.json b/src/test/resources/clds/sdc-controller-config-NULL.json index 5c8ec0cf..bf310c70 100644 --- a/src/test/resources/clds/sdc-controller-config-NULL.json +++ b/src/test/resources/clds/sdc-controller-config-NULL.json @@ -3,8 +3,9 @@ "consumerGroup": "NULL", "consumerId": "consumerId", "environmentName": "environmentName", - "sdcAddress": "hostname", + "sdcAddress": "hostname:8080", "password": "bb3871669d893c7fb8aaacda31b77b4f537E67A081C2726889548ED7BC4C2DE6", "pollingInterval":10, - "pollingTimeout":30 + "pollingTimeout":30, + "messageBusAddresses":["localhost"] } diff --git a/src/test/resources/clds/sdc-controller-config-TLS.json b/src/test/resources/clds/sdc-controller-config-TLS.json index 066448ee..99366b76 100644 --- a/src/test/resources/clds/sdc-controller-config-TLS.json +++ b/src/test/resources/clds/sdc-controller-config-TLS.json @@ -3,7 +3,7 @@ "consumerGroup": "consumerGroup", "consumerId": "consumerId", "environmentName": "environmentName", - "sdcAddress": "hostname", + "sdcAddress": "hostname:8080", "password": "bb3871669d893c7fb8aaacda31b77b4f537E67A081C2726889548ED7BC4C2DE6", "pollingInterval":10, "pollingTimeout":30, diff --git a/src/test/resources/clds/sdc-controller-config-bad-address.json b/src/test/resources/clds/sdc-controller-config-bad-address.json deleted file mode 100644 index 6775c6b3..00000000 --- a/src/test/resources/clds/sdc-controller-config-bad-address.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "user": "User", - "consumerGroup": "consumerGroup", - "consumerId": "consumerId", - "environmentName": "environmentName", - "password": "bb3871669d893c7fb8aaacda31b77b4f537E67A081C2726889548ED7BC4C2DE6", - "pollingInterval":10, - "pollingTimeout":30, - "activateServerTLSAuth": true, - "keyStorePassword":"bb3871669d893c7fb8aaacda31b77b4f537E67A081C2726889548ED7BC4C2DE6", - "keyStorePath": "/test" -} diff --git a/src/test/resources/clds/sdc-controller-config-bad.json b/src/test/resources/clds/sdc-controller-config-bad.json index d99ed580..194ff5f4 100644 --- a/src/test/resources/clds/sdc-controller-config-bad.json +++ b/src/test/resources/clds/sdc-controller-config-bad.json @@ -5,7 +5,7 @@ "consumerGroup": "consumerGroup", "consumerId": "consumerId", "environmentName": "environmentName", - "sdcAddress": "hostname1", + "sdcAddress": "hostname1:8080", "pollingInterval": 10, "pollingTimeout": 30 } diff --git a/src/test/resources/clds/sdc-controller-config-empty-encrypted.json b/src/test/resources/clds/sdc-controller-config-empty-encrypted.json new file mode 100644 index 00000000..2a70b9ed --- /dev/null +++ b/src/test/resources/clds/sdc-controller-config-empty-encrypted.json @@ -0,0 +1,14 @@ +{ + "user": "User", + "consumerGroup": "consumerGroup", + "consumerId": "consumerId", + "environmentName": "environmentName", + "sdcAddress": "hostname:8080", + "password": "bb3871669d893c7fb8aaacda31b77b4f537E67A081C2726889548ED7BC4C2DE6", + "pollingInterval":10, + "pollingTimeout":30, + "activateServerTLSAuth": true, + "keyStorePassword":"", + "keyStorePath": "/test", + "messageBusAddresses":["localhost"] +} -- cgit 1.2.3-korg