Policy Executor and DMI WebClient configurations

- separated dmi and policy executor http client configuration

Issue-ID: CPS-2324
Change-Id: Ib4e757da188673e163abe6078dfd6ddae447eaab
Signed-off-by: ToineSiebelink <toine.siebelink@est.tech>

1 files changed, 19 insertions, 6 deletions

diff --git a/cps-application/src/main/resources/application.yml b/cps-application/src/main/resources/application.yml
index f61a09ba17..dd4576ec02 100644
--- a/cps-application/src/main/resources/application.yml
+++ b/cps-application/src/main/resources/application.yml
@@ -188,22 +188,35 @@ logging:
             onap:
                 cps: INFO
 ncmp:
-    dmi:
+    policy-executor:
+        enabled: true
+        server:
+            address: "http://localhost"
+            port: "8785"
         httpclient:
-            data-services:
+            all-services:
+                maximumInMemorySizeInMegabytes: 16
+                maximumConnectionsTotal: 100
+                pendingAcquireMaxCount: 50
                 connectionTimeoutInSeconds: 30
                 readTimeoutInSeconds: 30
                 writeTimeoutInSeconds: 30
+    dmi:
+        httpclient:
+            data-services:
+                maximumInMemorySizeInMegabytes: 16
                 maximumConnectionsTotal: 100
                 pendingAcquireMaxCount: 50
-                maximumInMemorySizeInMegabytes: 16
-            model-services:
                 connectionTimeoutInSeconds: 30
                 readTimeoutInSeconds: 30
                 writeTimeoutInSeconds: 30
+            model-services:
+                maximumInMemorySizeInMegabytes: 16
                 maximumConnectionsTotal: 100
                 pendingAcquireMaxCount: 50
-                maximumInMemorySizeInMegabytes: 16
+                connectionTimeoutInSeconds: 30
+                readTimeoutInSeconds: 30
+                writeTimeoutInSeconds: 30
         auth:
             username: ${DMI_USERNAME:cpsuser}
             password: ${DMI_PASSWORD:cpsr0cks!}
@@ -244,4 +257,4 @@ otel:
     exporter:
         otlp:
             traces:
-                protocol: ${ONAP_OTEL_EXPORTER_OTLP_TRACES_PROTOCOL:grpc}
\ No newline at end of file
+                protocol: ${ONAP_OTEL_EXPORTER_OTLP_TRACES_PROTOCOL:grpc}