summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsebdet <sebastien.determe@intl.att.com>2021-04-22 09:54:47 +0200
committersebdet <sebastien.determe@intl.att.com>2021-04-22 09:54:47 +0200
commitb2b796833345b285b766355f7b2698f5e77bcdb3 (patch)
tree4f0f30a715c51fb54be77cf62738f07f23835ac3
parent9b5272f14ad2747e23b9ab3d0b5f4d21b42af4ef (diff)
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 <sebastien.determe@intl.att.com> Change-Id: Ia19f5eb372c2e383d67be48d62c1a355560ab889
-rw-r--r--src/main/resources/application-noaaf.properties2
-rw-r--r--src/main/resources/application.properties2
-rw-r--r--src/test/resources/clds/sdc-controllers-config.json4
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": [