From cd53b0c4a9c6055c3766658f9f18c673b2539c14 Mon Sep 17 00:00:00 2001 From: PatrikBuhr Date: Tue, 10 Nov 2020 13:59:49 +0100 Subject: Added documentation in the application-yaml Issue-ID: CCSDK-2502 Signed-off-by: PatrikBuhr Change-Id: Ia28deef87353f00bd29b021679f5669a68495b66 --- a1-policy-management/config/application.yaml | 13 ++++++++++++- .../clients/AsyncRestClientFactory.java | 2 +- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/a1-policy-management/config/application.yaml b/a1-policy-management/config/application.yaml index 823b93b2..150dca47 100644 --- a/a1-policy-management/config/application.yaml +++ b/a1-policy-management/config/application.yaml @@ -30,9 +30,11 @@ management: endpoints: web: exposure: + # Enabling of springboot actuator features. See springboot documentation. include: "loggers,logfile,health,info,metrics,threaddump,heapdump" logging: + # Configuration of logging level: ROOT: ERROR org.springframework: ERROR @@ -42,6 +44,8 @@ logging: file: name: /var/log/policy-agent/application.log server: + # Configuration of the HTTP/REST server. The parameters are defined and handeled by the springboot framework. + # See springboot documentation. port : 8433 http-port: 8081 ssl: @@ -51,11 +55,18 @@ server: key-password: policy_agent key-alias: policy_agent app: + # Location of the component configuration file. The file will only be used if the Consul database is not used; + # configuration from the Consul will override the file. filepath: /opt/app/policy-agent/data/application_configuration.json webclient: + # Configuration of the trust store used for the HTTP client (outgoing requests) + # The file location and the password for the truststore is only relevant if trust-store-used == true + # Note that the same keystore as for the server is used. trust-store-used: false trust-store-password: policy_agent trust-store: /opt/app/policy-agent/etc/cert/truststore.jks - http.proxy-host: + # Configuration of usage of HTTP Proxy for the southbound accesses. + # The HTTP proxy (if configured) will only be used for accessing NearRT RIC:s + http.proxy-host: http.proxy-port: 0 diff --git a/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/clients/AsyncRestClientFactory.java b/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/clients/AsyncRestClientFactory.java index b5590cc2..db3834a9 100644 --- a/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/clients/AsyncRestClientFactory.java +++ b/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/clients/AsyncRestClientFactory.java @@ -62,7 +62,7 @@ public class AsyncRestClientFactory { this.sslContextFactory = new CachingSslContextFactory(clientConfig); this.httpProxyConfig = clientConfig.httpProxyConfig(); } else { - logger.warn("HTTPS will not work"); + logger.warn("No configuration for web client defined, HTTPS will not work"); this.sslContextFactory = null; this.httpProxyConfig = null; } -- cgit 1.2.3-korg