Merge "Ensure Additional Properties for CM Handles are included"
diff --git a/INFO.yaml b/INFO.yaml
index 88e186e..a411e37 100755
--- a/INFO.yaml
+++ b/INFO.yaml
@@ -62,6 +62,11 @@
company: 'Ericsson Software Technology'
id: 'JosephKeenan'
timezone: 'Europe/Dublin'
+ - name: 'Sourabh Sharma'
+ email: 'sourabh.sourabh@est.tech'
+ company: 'Ericsson Software Technology'
+ id: 'sourabh_sourabh'
+ timezone: 'Europe/Dublin'
repositories:
- cps
tsc:
diff --git a/cps-application/src/main/resources/application.yml b/cps-application/src/main/resources/application.yml
index 6bbe80b..1755134 100644
--- a/cps-application/src/main/resources/application.yml
+++ b/cps-application/src/main/resources/application.yml
@@ -46,6 +46,13 @@
password: ${DB_PASSWORD}
driverClassName: org.postgresql.Driver
initialization-mode: always
+ hikari:
+ minimumIdle: 5
+ maximumPoolSize: 80
+ idleTimeout: 120000
+ connectionTimeout: 300000
+ leakDetectionThreshold: 300000
+ pool-name: CpsDatabasePool
cache:
type: caffeine
@@ -100,8 +107,8 @@
enabled-dataspaces: ${NOTIFICATION_DATASPACE_FILTER_PATTERNS:""}
async:
executor:
- core-pool-size: 10
- max-pool-size: 100
+ core-pool-size: 2
+ max-pool-size: 10
queue-capacity: 500
wait-for-tasks-to-complete-on-shutdown: true
thread-name-prefix: Async-
@@ -164,4 +171,4 @@
locked-modules-sync:
sleep-time-ms: 300000
cm-handle-data-sync:
- sleep-time-ms: 30000
\ No newline at end of file
+ sleep-time-ms: 30000
diff --git a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/config/NcmpConfiguration.java b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/config/NcmpConfiguration.java
index a418155..f250ddb 100644
--- a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/config/NcmpConfiguration.java
+++ b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/config/NcmpConfiguration.java
@@ -20,6 +20,7 @@
package org.onap.cps.ncmp.api.impl.config;
+import java.time.Duration;
import java.util.Arrays;
import lombok.AccessLevel;
import lombok.Getter;
@@ -39,6 +40,9 @@
@RequiredArgsConstructor(access = AccessLevel.PROTECTED)
public class NcmpConfiguration {
+ private static final Duration CONNECTION_TIMEOUT_MILLISECONDS = Duration.ofMillis(180000);
+ private static final Duration READ_TIMEOUT_MILLISECONDS = Duration.ofMillis(180000);
+
@Getter
@Component
public static class DmiProperties {
@@ -59,7 +63,8 @@
@Bean
@Scope(ConfigurableBeanFactory.SCOPE_SINGLETON)
public static RestTemplate restTemplate(final RestTemplateBuilder restTemplateBuilder) {
- final RestTemplate restTemplate = restTemplateBuilder.build();
+ final RestTemplate restTemplate = restTemplateBuilder.setConnectTimeout(CONNECTION_TIMEOUT_MILLISECONDS)
+ .setReadTimeout(READ_TIMEOUT_MILLISECONDS).build();
setRestTemplateMessageConverters(restTemplate);
return restTemplate;
}
diff --git a/csit/plans/cps/test.properties b/csit/plans/cps/test.properties
index 47bb43b..449aa93 100644
--- a/csit/plans/cps/test.properties
+++ b/csit/plans/cps/test.properties
@@ -23,4 +23,7 @@
DOCKER_REPO=nexus3.onap.org:10003
CPS_VERSION=latest
-DMI_VERSION=1.2.0-SNAPSHOT-latest
\ No newline at end of file
+DMI_VERSION=1.2.0-SNAPSHOT-latest
+
+ADVISED_MODULES_SYNC_SLEEP_TIME_MS=2000
+CMHANDLE_DATA_SYNC_SLEEP_TIME_MS=2000
\ No newline at end of file
diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index 8d3a0a3..ca7795f 100644
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -49,8 +49,8 @@
notification.enabled: 'true'
notification.async.executor.time-out-value-in-ms: 2000
NOTIFICATION_DATASPACE_FILTER_PATTERNS: '.*'
- TIMERS_ADVISED-MODULES-SYNC_SLEEP-TIME-MS: 2000
- TIMERS_CM-HANDLE-DATA-SYNC_SLEEP-TIME-MS: 2000
+ TIMERS_ADVISED-MODULES-SYNC_SLEEP-TIME-MS: ${ADVISED_MODULES_SYNC_SLEEP_TIME_MS:-30000}
+ TIMERS_CM-HANDLE-DATA-SYNC_SLEEP-TIME-MS: ${CMHANDLE_DATA_SYNC_SLEEP_TIME_MS:-30000}
restart: unless-stopped
depends_on:
- dbpostgresql