Code Review
/
cps.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Migrate CPS to Spring-boot 3.0"
[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
ed71339
..
0163568
100644
(file)
--- a/
cps-application/src/main/resources/application.yml
+++ b/
cps-application/src/main/resources/application.yml
@@
-98,10
+98,10
@@
app:
async-m2m:
topic: ${NCMP_ASYNC_M2M_TOPIC:ncmp-async-m2m}
avc:
async-m2m:
topic: ${NCMP_ASYNC_M2M_TOPIC:ncmp-async-m2m}
avc:
- subscription-topic: ${NCMP_CM_AVC_SUBSCRIPTION:
cm-avc-
subscription}
+ 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-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:
cm-avc-
subscription-response}
+ subscription-outcome-topic: ${NCMP_OUTCOME_CM_AVC_SUBSCRIPTION:subscription-response}
cm-events-topic: ${NCMP_CM_EVENTS_TOPIC:cm-events}
lcm:
events:
cm-events-topic: ${NCMP_CM_EVENTS_TOPIC:cm-events}
lcm:
events:
@@
-109,6
+109,8
@@
app:
dmi:
cm-events:
topic: ${DMI_CM_EVENTS_TOPIC:dmi-cm-events}
dmi:
cm-events:
topic: ${DMI_CM_EVENTS_TOPIC:dmi-cm-events}
+ device-heartbeat:
+ topic: ${DMI_DEVICE_HEARTBEAT_TOPIC:dmi-device-heartbeat}
notification:
notification:
@@
-138,10
+140,10
@@
springdoc:
- name: cps-ncmp-inventory
url: /api-docs/cps-ncmp/openapi-inventory.yaml
- name: cps-ncmp-inventory
url: /api-docs/cps-ncmp/openapi-inventory.yaml
+permit-uri: /manage/**,/swagger-ui.html,/swagger-ui/**,/swagger-resources/**,/api-docs/**
security:
# comma-separated uri patterns which do not require authorization
security:
# comma-separated uri patterns which do not require authorization
- permit-uri: /manage/**,/swagger-ui.html,/swagger-ui/**,/swagger-resources/**,/api-docs/**
auth:
username: ${CPS_USERNAME}
password: ${CPS_PASSWORD}
auth:
username: ${CPS_USERNAME}
password: ${CPS_PASSWORD}
@@
-174,6
+176,7
@@
ncmp:
auth:
username: ${DMI_USERNAME}
password: ${DMI_PASSWORD}
auth:
username: ${DMI_USERNAME}
password: ${DMI_PASSWORD}
+ enabled: ${DMI_AUTH_ENABLED:true}
api:
base-path: dmi
api:
base-path: dmi
@@
-188,6
+191,8
@@
ncmp:
dmi-response-timeout-ms: 30000
model-loader:
retry-time-ms: 1000
dmi-response-timeout-ms: 30000
model-loader:
retry-time-ms: 1000
+ trust-level:
+ dmi-availability-watchdog-ms: 30000
modules-sync-watchdog:
async-executor:
modules-sync-watchdog:
async-executor: