X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=cps-application%2Fsrc%2Fmain%2Fresources%2Fapplication.yml;h=17551344fefc1100fba468e7a780211235c83085;hb=0f4c024974edfb6185dc744ec60acec5b9d75b9d;hp=fcd91c26d73f76e24ebef8dd160614f694dc3020;hpb=c328551bdfd069343cc4c4e0249516d07938c78a;p=cps.git

diff --git a/cps-application/src/main/resources/application.yml b/cps-application/src/main/resources/application.yml
index fcd91c26d..17551344f 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 Bell Canada
-#  Modifications Copyright (C) 2021 Nordix Foundation
+#  Modifications Copyright (C) 2021-2022 Bell Canada
+#  Modifications Copyright (C) 2021-2022 Nordix Foundation
 #  ================================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -24,11 +24,14 @@ server:
 rest:
     api:
         cps-base-path: /cps/api
-        ncmp-base-path: /cps-ncmp/api
+        ncmp-base-path: /ncmp
+        ncmp-inventory-base-path: /ncmpInventory
 
 spring:
     main:
         banner-mode: "off"
+    application:
+        name: "cps-application"
     jpa:
         ddl-auto: create
         open-in-view: false
@@ -38,11 +41,18 @@ spring:
                 dialect: org.hibernate.dialect.PostgreSQLDialect
 
     datasource:
-        url: jdbc:postgresql://${DB_HOST}:5432/cpsdb
+        url: jdbc:postgresql://${DB_HOST}:${DB_PORT:5432}/cpsdb
         username: ${DB_USERNAME}
         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
@@ -67,20 +77,59 @@ spring:
         producer:
             value-serializer: org.springframework.kafka.support.serializer.JsonSerializer
             client-id: cps-core
+        consumer:
+            group-id: ${NCMP_CONSUMER_GROUP_ID:ncmp-group}
+            key-deserializer: org.springframework.kafka.support.serializer.ErrorHandlingDeserializer
+            value-deserializer: org.springframework.kafka.support.serializer.ErrorHandlingDeserializer
+            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
+      serialization:
+        FAIL_ON_EMPTY_BEANS: false
+app:
+    ncmp:
+        async-m2m:
+            topic: ${NCMP_ASYNC_M2M_TOPIC:ncmp-async-m2m}
+    lcm:
+        events:
+            topic: ${LCM_EVENTS_TOPIC:ncmp-events}
 
 notification:
+    enabled: true
     data-updated:
-        enabled: false
-        topic: ${CPS_CHANGE_EVENT_TOPIC:cps.cfg-state-events}
+        topic: ${CPS_CHANGE_EVENT_TOPIC:cps.data-updated-events}
+        filters:
+            enabled-dataspaces: ${NOTIFICATION_DATASPACE_FILTER_PATTERNS:""}
+    async:
+        executor:
+            core-pool-size: 2
+            max-pool-size: 10
+            queue-capacity: 500
+            wait-for-tasks-to-complete-on-shutdown: true
+            thread-name-prefix: Async-
+            time-out-value-in-ms: 2000
 
 springdoc:
     swagger-ui:
-        url: /openapi.yml
-        path: /swagger-ui/index.html
-        
+        disable-swagger-default-url: true
+        urlsPrimaryName: cps-core
+        urls:
+            - name: cps-core
+              url: /api-docs/cps-core/openapi.yaml
+            - name: cps-ncmp
+              url: /api-docs/cps-ncmp/openapi.yaml
+            - name: cps-ncmp-inventory
+              url: /api-docs/cps-ncmp/openapi-inventory.yaml
+
+
 security:
     # comma-separated uri patterns which do not require authorization
-    permit-uri: /manage/**,/swagger-ui/**,/swagger-resources/**,/v3/api-docs
+    permit-uri: /manage/**,/swagger-ui.html,/swagger-ui/**,/swagger-resources/**,/api-docs/**
     auth:
         username: ${CPS_USERNAME}
         password: ${CPS_PASSWORD}
@@ -102,11 +151,24 @@ management:
                 enabled: true
 
 logging:
+    format: json
     level:
         org:
             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