summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKAPIL SINGAL <ks220y@att.com>2020-11-11 14:38:49 +0000
committerGerrit Code Review <gerrit@onap.org>2020-11-11 14:38:49 +0000
commite78c27efa1b2bbd9db762211e907777f49aba7d2 (patch)
tree267e6eaf346519b9bb8004e7dc8ef0eb283d3fdc
parent8bd3cd5ccb72eeb2999206e16e849be47e02b122 (diff)
parentcd53b0c4a9c6055c3766658f9f18c673b2539c14 (diff)
Merge "Added documentation in the application-yaml"
-rw-r--r--a1-policy-management/config/application.yaml13
-rw-r--r--a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/clients/AsyncRestClientFactory.java2
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;
}