X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=cps-application%2Fsrc%2Fmain%2Fresources%2Fapplication.yml;h=6d458356686095589c2ca1ca150f83870561cc33;hb=8c32ab510d9554ef6713f34d9895e2909e17200e;hp=14abebb2be2284a3b1eb7bb4f0d58d06fdb00a51;hpb=1c90848a0cb078e0249a7dc888ea05390f59a1e6;p=cps.git

diff --git a/cps-application/src/main/resources/application.yml b/cps-application/src/main/resources/application.yml
index 14abebb2b..6d4583566 100644
--- a/cps-application/src/main/resources/application.yml
+++ b/cps-application/src/main/resources/application.yml
@@ -1,7 +1,7 @@
 #  ============LICENSE_START=======================================================
 #  Copyright (C) 2021 Pantheon.tech
 #  Modifications Copyright (C) 2021-2022 Bell Canada
-#  Modifications Copyright (C) 2021-2022 Nordix Foundation
+#  Modifications Copyright (C) 2021-2023 Nordix Foundation
 #  ================================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -33,6 +33,7 @@ spring:
     application:
         name: "cps-application"
     jpa:
+        show-sql: false
         ddl-auto: create
         open-in-view: false
         properties:
@@ -45,7 +46,13 @@ spring:
         username: ${DB_USERNAME}
         password: ${DB_PASSWORD}
         driverClassName: org.postgresql.Driver
-        initialization-mode: always
+        hikari:
+            minimumIdle: 5
+            maximumPoolSize: 80
+            idleTimeout: 60000
+            connectionTimeout: 120000
+            leakDetectionThreshold: 30000
+            pool-name: CpsDatabasePool
 
     cache:
         type: caffeine
@@ -77,17 +84,29 @@ spring:
             properties:
                 spring.deserializer.key.delegate.class: org.apache.kafka.common.serialization.StringDeserializer
                 spring.deserializer.value.delegate.class: org.springframework.kafka.support.serializer.JsonDeserializer
-                spring.json.value.default.type: org.onap.cps.ncmp.event.model.DmiAsyncRequestResponseEvent
                 spring.json.use.type.headers: false
 
     jackson:
-      default-property-inclusion: NON_NULL
+        default-property-inclusion: NON_NULL
+        serialization:
+            FAIL_ON_EMPTY_BEANS: false
+    sql:
+        init:
+            mode: ALWAYS
 app:
     ncmp:
         async-m2m:
             topic: ${NCMP_ASYNC_M2M_TOPIC:ncmp-async-m2m}
+        avc:
+            subscription-topic: ${NCMP_CM_AVC_SUBSCRIPTION:cm-avc-subscription}
+            cm-events-topic: ${NCMP_CM_EVENTS_TOPIC:cm-events}
+    lcm:
         events:
-            topic: ${NCMP_EVENTS_TOPIC:ncmp-events}
+            topic: ${LCM_EVENTS_TOPIC:ncmp-events}
+    dmi:
+        cm-events:
+            topic: ${DMI_CM_EVENTS_TOPIC:dmi-cm-events}
+
 
 notification:
     enabled: true
@@ -147,18 +166,32 @@ logging:
             springframework: INFO
             onap:
                 cps: INFO
-
-dmi:
-    auth:
-        username: ${DMI_USERNAME}
-        password: ${DMI_PASSWORD}
-    api:
-        base-path: dmi
-
-timers:
-    advised-modules-sync:
-        sleep-time-ms: 30000
-    locked-modules-sync:
-        sleep-time-ms: 300000
-    cm-handle-data-sync:
-        sleep-time-ms: 30000
+ncmp:
+    dmi:
+        auth:
+            username: ${DMI_USERNAME}
+            password: ${DMI_PASSWORD}
+        api:
+            base-path: dmi
+
+    timers:
+        advised-modules-sync:
+            sleep-time-ms: 5000
+        locked-modules-sync:
+            sleep-time-ms: 300000
+        cm-handle-data-sync:
+            sleep-time-ms: 30000
+
+    modules-sync-watchdog:
+        async-executor:
+            parallelism-level: 10
+
+    model-loader:
+        subscription: false
+
+# Custom Hazelcast Config.
+hazelcast:
+  mode:
+    kubernetes:
+      enabled: ${HAZELCAST_MODE_KUBERNETES_ENABLED:false}
+      service-name: ${CPS_NCMP_SERVICE_NAME:"cps-and-ncmp-service"}
\ No newline at end of file