From: RehanRaza Date: Tue, 2 Feb 2021 10:24:34 +0000 (+0100) Subject: Add docker-compose for nonrtric-gateway X-Git-Tag: 2.2.0~76^2 X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=e838dbdd9079fc24094da66693a678624a22afc1;p=nonrtric.git Add docker-compose for nonrtric-gateway Change-Id: I7e835d098d2390edfafd276d23e98495b9e80902 Issue-ID: NONRTRIC-422 Signed-off-by: RehanRaza --- diff --git a/docker-compose/control-panel/config/nginx.conf b/docker-compose/control-panel/config/nginx.conf index 81102eb8..374910f6 100644 --- a/docker-compose/control-panel/config/nginx.conf +++ b/docker-compose/control-panel/config/nginx.conf @@ -12,8 +12,11 @@ http { server_name localhost; root /usr/share/nginx/html; index index.html; - location /api/ { + location /a1-policy/v2/ { proxy_pass http://backend; } + location / { + try_files $uri $uri/ /index.html; + } } } \ No newline at end of file diff --git a/docker-compose/nonrtric-gateway/config/application-nonrtricgateway.yaml b/docker-compose/nonrtric-gateway/config/application-nonrtricgateway.yaml new file mode 100644 index 00000000..ac39f6bf --- /dev/null +++ b/docker-compose/nonrtric-gateway/config/application-nonrtricgateway.yaml @@ -0,0 +1,52 @@ +################################################################################ +# Copyright (c) 2021 Nordix Foundation. # +# # +# Licensed under the Apache License, Version 2.0 (the "License"); # +# you may not use this file except in compliance with the License. # +# You may obtain a copy of the License at # +# # +# http://www.apache.org/licenses/LICENSE-2.0 # +# # +# Unless required by applicable law or agreed to in writing, software # +# distributed under the License is distributed on an "AS IS" BASIS, # +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # +# See the License for the specific language governing permissions and # +# limitations under the License. # +################################################################################ + +server: + port: 9090 +spring: + cloud: + gateway: + httpclient: + ssl: + useInsecureTrustManager: true + wiretap: true + httpserver: + wiretap: true + routes: + - id: policytypes + uri: https://policy-agent:8433 + predicates: + - Path=/a1-policy/v2/policy-types/** + - id: policies + uri: https://policy-agent:8433 + predicates: + - Path=/a1-policy/v2/policies/** +management: + endpoint: + gateway: + enabled: true + endpoints: + web: + exposure: + include: "gateway,loggers,logfile,health,info,metrics,threaddump,heapdump" +logging: + level: + ROOT: ERROR + org.springframework: ERROR + org.springframework.cloud.gateway: INFO + reactor.netty: INFO + file: + name: /var/log/nonrtric-gateway/application.log \ No newline at end of file diff --git a/docker-compose/nonrtric-gateway/docker-compose.yaml b/docker-compose/nonrtric-gateway/docker-compose.yaml new file mode 100644 index 00000000..6a7707f5 --- /dev/null +++ b/docker-compose/nonrtric-gateway/docker-compose.yaml @@ -0,0 +1,34 @@ +# Copyright (C) 2021 Nordix Foundation. All rights reserved. +# ======================================================================== +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ============LICENSE_END================================================= +# +version: '3.5' + +networks: + default: + driver: bridge + name: nonrtric-docker-net + +services: + nonrtric-gateway: + image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-gateway:0.0.1 + container_name: nonrtric-gateway + networks: + default: + aliases: + - nonrtric-gateway-container + ports: + - 9090:9090 + volumes: + - ./nonrtric-gateway/config/application-nonrtricgateway.yaml:/opt/app/nonrtric-gateway/config/application.yaml:ro diff --git a/docker-compose/policy-service/config/application-policyagent.yaml b/docker-compose/policy-service/config/application-policyagent.yaml index e9146e01..4b9e3848 100755 --- a/docker-compose/policy-service/config/application-policyagent.yaml +++ b/docker-compose/policy-service/config/application-policyagent.yaml @@ -9,17 +9,22 @@ 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 org.springframework.data: ERROR org.springframework.web.reactive.function.client.ExchangeFunctions: ERROR - org.oransc.policyagent: INFO - file: /var/log/policy-agent/application.log + org.onap.ccsdk.oran.a1policymanagementservice: INFO + 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: @@ -29,9 +34,17 @@ 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 - + # 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 \ No newline at end of file diff --git a/docker-compose/policy-service/docker-compose.yaml b/docker-compose/policy-service/docker-compose.yaml index fd2e9b06..d755f211 100644 --- a/docker-compose/policy-service/docker-compose.yaml +++ b/docker-compose/policy-service/docker-compose.yaml @@ -32,6 +32,7 @@ services: - 8081:8081 - 8433:8433 volumes: + - ./policy-service/config/application-policyagent.yaml:/opt/app/policy-agent/config/application.yaml:ro - ./policy-service/config/application_configuration.json:/opt/app/policy-agent/data/application_configuration.json:ro # For using own certs instead of the default ones (built into the container), # place them in config/ directory, update the application-policyagent.yaml file, and uncomment the following lines