From b2b796833345b285b766355f7b2698f5e77bcdb3 Mon Sep 17 00:00:00 2001 From: sebdet Date: Thu, 22 Apr 2021 09:54:47 +0200 Subject: Update socketTimeout Update socketTimeout for DCAE deployment command, this has been changed during the camel&Spring upgrades + adding enc: to sdc password to verify that it works well Issue-ID: POLICY-3169 Signed-off-by: sebdet Change-Id: Ia19f5eb372c2e383d67be48d62c1a355560ab889 --- src/main/resources/application-noaaf.properties | 2 +- src/main/resources/application.properties | 2 +- src/test/resources/clds/sdc-controllers-config.json | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/resources/application-noaaf.properties b/src/main/resources/application-noaaf.properties index f7f9229f6..1145b393d 100644 --- a/src/main/resources/application-noaaf.properties +++ b/src/main/resources/application-noaaf.properties @@ -141,7 +141,7 @@ clamp.config.files.cldsUsers=classpath:/clds/clds-users.json clamp.config.files.globalProperties=classpath:/clds/templates/globalProperties.json clamp.config.files.sdcController=classpath:/clds/sdc-controllers-config.json -clamp.config.httpclient.socketTimeout=20000 +clamp.config.httpclient.socketTimeout=60000 clamp.config.httpclient.connectTimeout=10000 # diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index a4a51091f..3cbb7e8af 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -144,7 +144,7 @@ clamp.config.files.cldsUsers=classpath:/clds/clds-users.json clamp.config.files.globalProperties=classpath:/clds/templates/globalProperties.json clamp.config.files.sdcController=classpath:/clds/sdc-controllers-config.json -clamp.config.httpclient.socketTimeout=20000 +clamp.config.httpclient.socketTimeout=60000 clamp.config.httpclient.connectTimeout=10000 # # Configuration Settings for Policy Engine Components diff --git a/src/test/resources/clds/sdc-controllers-config.json b/src/test/resources/clds/sdc-controllers-config.json index 75e5be1b9..aafd7d61d 100644 --- a/src/test/resources/clds/sdc-controllers-config.json +++ b/src/test/resources/clds/sdc-controllers-config.json @@ -6,7 +6,7 @@ "consumerId": "consumerId1", "environmentName": "environmentName1", "sdcAddress": "localhost:${docker.http-cache.port.host}", - "password": "QpF2TcrdRSFADqDxH1HwDYdYUIbMxOj-TrGd6Vqvwzd", + "password": "enc:QpF2TcrdRSFADqDxH1HwDYdYUIbMxOj-TrGd6Vqvwzd", "pollingInterval": 10, "pollingTimeout": 30, "messageBusAddresses": [ @@ -19,7 +19,7 @@ "consumerId": "consumerId2", "environmentName": "environmentName2", "sdcAddress": "localhost:${docker.http-cache.port.host}", - "password": "QpF2TcrdRSFADqDxH1HwDYdYUIbMxOj-TrGd6Vqvwzd", + "password": "enc:QpF2TcrdRSFADqDxH1HwDYdYUIbMxOj-TrGd6Vqvwzd", "pollingInterval": 10, "pollingTimeout": 30, "messageBusAddresses": [ -- cgit 1.2.3-korg