Merge "[k6] Add JVM warmup phase (#2)"

[cps.git] / cps-application / src / main / resources / application.yml

diff --git a/cps-application/src/main/resources/application.yml b/cps-application/src/main/resources/application.yml
index e56e0e1..4f08bb6 100644 (file)
--- a/cps-application/src/main/resources/application.yml
+++ b/cps-application/src/main/resources/application.yml
@@ -2,6 +2,7 @@
 #  Copyright (C) 2021 Pantheon.tech
 #  Modifications Copyright (C) 2021-2022 Bell Canada
 #  Modifications Copyright (C) 2021-2024 Nordix Foundation
+#  Modifications Copyright (C) 2024 TechMahindra Ltd
 #  ================================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -52,7 +53,7 @@ spring:
             minimumIdle: 5
             maximumPoolSize: 80
             idleTimeout: 60000
-            connectionTimeout: 120000
+            connectionTimeout: 30000
             leakDetectionThreshold: 30000
             pool-name: CpsDatabasePool
 
@@ -64,7 +65,7 @@ spring:
 
     liquibase:
         change-log: classpath:changelog/changelog-master.yaml
-        labels: ${LIQUIBASE_LABELS}
+        label-filter: ${LIQUIBASE_LABELS}
 
     servlet:
         multipart:
@@ -100,10 +101,10 @@ app:
         async-m2m:
             topic: ${NCMP_ASYNC_M2M_TOPIC:ncmp-async-m2m}
         avc:
-            subscription-topic: ${NCMP_CM_AVC_SUBSCRIPTION:subscription}
-            subscription-forward-topic-prefix: ${NCMP_FORWARD_CM_AVC_SUBSCRIPTION:ncmp-dmi-cm-avc-subscription-}
-            subscription-response-topic: ${NCMP_RESPONSE_CM_AVC_SUBSCRIPTION:dmi-ncmp-cm-avc-subscription}
-            subscription-outcome-topic: ${NCMP_OUTCOME_CM_AVC_SUBSCRIPTION:subscription-response}
+            cm-subscription-ncmp-in: ${CM_SUBSCRIPTION_NCMP_IN_TOPIC:subscription}
+            cm-subscription-dmi-in: ${CM_SUBSCRIPTION_DMI_IN_TOPIC:ncmp-dmi-cm-avc-subscription}
+            cm-subscription-dmi-out: ${CM_SUBSCRIPTION_DMI_OUT_TOPIC:dmi-ncmp-cm-avc-subscription}
+            cm-subscription-ncmp-out: ${CM_SUBSCRIPTION_NCMP_OUT_TOPIC:subscription-response}
             cm-events-topic: ${NCMP_CM_EVENTS_TOPIC:cm-events}
     lcm:
         events:
@@ -113,6 +114,11 @@ app:
             topic: ${DMI_CM_EVENTS_TOPIC:dmi-cm-events}
         device-heartbeat:
             topic: ${DMI_DEVICE_HEARTBEAT_TOPIC:dmi-device-heartbeat}
+    cps:
+        data-updated:
+            change-event-notifications-enabled: ${CPS_CHANGE_EVENT_NOTIFICATIONS_ENABLED:true}
+            topic: ${CPS_CHANGE_EVENT_TOPIC:cps-data-updated-events}
+
 
 
 notification:
@@ -124,7 +130,7 @@ notification:
             queue-capacity: 500
             wait-for-tasks-to-complete-on-shutdown: true
             thread-name-prefix: Async-
-            time-out-value-in-ms: 2000
+            time-out-value-in-ms: 60000
 
 springdoc:
     swagger-ui:
@@ -138,17 +144,30 @@ springdoc:
             - name: cps-ncmp-inventory
               url: /api-docs/cps-ncmp/openapi-inventory.yaml
 
-
-
 security:
     # comma-separated uri patterns which do not require authorization
     permit-uri: /actuator/**,/swagger-ui.html,/swagger-ui/**,/swagger-resources/**,/api-docs/**,/v3/api-docs/**
     auth:
-        username: ${CPS_USERNAME}
-        password: ${CPS_PASSWORD}
+        username: ${CPS_USERNAME:cpsuser}
+        password: ${CPS_PASSWORD:cpsr0cks!}
+
+cps:
+    tracing:
+        sampler:
+            jaeger_remote:
+                endpoint: ${ONAP_OTEL_SAMPLER_JAEGER_REMOTE_ENDPOINT:http://onap-otel-collector:14250}
+        exporter:
+            endpoint: ${ONAP_OTEL_EXPORTER_ENDPOINT:http://onap-otel-collector:4317}
+            protocol: ${ONAP_OTEL_EXPORTER_PROTOCOL:grpc}
+        enabled: ${ONAP_TRACING_ENABLED:false}
 
 # Actuator
 management:
+    tracing:
+        propagation:
+            produce: ${ONAP_PROPAGATOR_PRODUCE:[W3C]}
+        sampling:
+            probability: 1.0
     endpoints:
         web:
             exposure:
@@ -170,13 +189,21 @@ logging:
 ncmp:
     dmi:
         httpclient:
-            connectionTimeoutInSeconds: 180
-            maximumConnectionsPerRoute: 50
-            maximumConnectionsTotal: 100
-            idleConnectionEvictionThresholdInSeconds: 5
+            data-services:
+                connectionTimeoutInSeconds: 30
+                readTimeoutInSeconds: 30
+                writeTimeoutInSeconds: 30
+                maximumConnectionsTotal: 100
+                maximumInMemorySizeInMegabytes: 16
+            model-services:
+                connectionTimeoutInSeconds: 30
+                readTimeoutInSeconds: 30
+                writeTimeoutInSeconds: 30
+                maximumConnectionsTotal: 100
+                maximumInMemorySizeInMegabytes: 16
         auth:
-            username: ${DMI_USERNAME}
-            password: ${DMI_PASSWORD}
+            username: ${DMI_USERNAME:cpsuser}
+            password: ${DMI_PASSWORD:cpsr0cks!}
             enabled: ${DMI_AUTH_ENABLED:true}
         api:
             base-path: dmi
@@ -200,7 +227,6 @@ ncmp:
             parallelism-level: 10
 
     model-loader:
-        subscription: true
         maximum-attempt-count: 20
 
 # Custom Hazelcast Config.
@@ -210,3 +236,9 @@ hazelcast:
         kubernetes:
             enabled: ${HAZELCAST_MODE_KUBERNETES_ENABLED:false}
             service-name: ${CPS_NCMP_SERVICE_NAME:"cps-and-ncmp-service"}
+
+otel:
+    exporter:
+        otlp:
+            traces:
+                protocol: ${ONAP_OTEL_EXPORTER_OTLP_TRACES_PROTOCOL:grpc}
\ No newline at end of file