X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=cps-application%2Fsrc%2Fmain%2Fresources%2Fapplication.yml;h=263ae6b3ddd27463c6513c2f4e0d11a803755bb0;hb=ac5ae3e24e347bb6d643e9b4e5ebcf3baa7152a2;hp=ac620f6cb37f4c8a9727e7b14b3f34d2eb216320;hpb=2472e61ecf2f5ebf9c5e3ddcf9c2b66ab0d4219e;p=cps.git

diff --git a/cps-application/src/main/resources/application.yml b/cps-application/src/main/resources/application.yml
index ac620f6cb..263ae6b3d 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 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,7 +41,7 @@ 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
@@ -71,16 +74,35 @@ spring:
 notification:
     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:
+        enabled: false
+        executor:
+            core-pool-size: 2
+            max-pool-size: 10
+            queue-capacity: 500
+            wait-for-tasks-to-complete-on-shutdown: true
+            thread-name-prefix: Async-
+
 
 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,6 +124,16 @@ 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