From 508f5bb52429f19b118835af460f6e1a95b3e2d1 Mon Sep 17 00:00:00 2001 From: "saul.gill" Date: Tue, 4 Feb 2025 17:08:11 +0000 Subject: [PATCH] Fix intermittent callback receiver test failure Issue-ID: NONRTRIC-753 Change-Id: I69ca1bd8225530c3abb198c1415637cc2a6bbbdb Signed-off-by: saul.gill --- test/simulator-group/ric/config/nginx.conf | 106 ++++++++++++++++++++++++++++ test/simulator-group/ric/docker-compose.yml | 2 + 2 files changed, 108 insertions(+) create mode 100644 test/simulator-group/ric/config/nginx.conf diff --git a/test/simulator-group/ric/config/nginx.conf b/test/simulator-group/ric/config/nginx.conf new file mode 100644 index 00000000..d40a8669 --- /dev/null +++ b/test/simulator-group/ric/config/nginx.conf @@ -0,0 +1,106 @@ +# ============LICENSE_START=============================================== +# Copyright (C) 2025 OpenInfra Foundation Europe. 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================================================= +# + +worker_processes auto; +pid /run/nginx.pid; +include /etc/nginx/modules-enabled/*.conf; +load_module /usr/lib/nginx/modules/ndk_http_module.so; +load_module /usr/lib/nginx/modules/ngx_http_lua_module.so; + +env ALLOW_HTTP; + +events { + worker_connections 768; +} + +http { + ## + # Basic Settings + ## + sendfile on; + tcp_nopush on; + tcp_nodelay on; + keepalive_timeout 65; + types_hash_max_size 2048; + include /etc/nginx/mime.types; + default_type application/octet-stream; + + ## + # Upstream Service (localhost:2222) + ## + upstream backend_service { + server 0.0.0.0:2222; + keepalive 16; + } + + ## + # HTTP Reverse Proxy + ## + server { + set_by_lua $allow_http 'return os.getenv("ALLOW_HTTP")'; + listen 8085; + listen [::]:8085; + server_name localhost; + + if ($allow_http != true) { + return 444; + } + + location / { + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_pass http://backend_service; + } + } + + ## + # HTTPS Reverse Proxy + ## + server { + listen 8185 ssl; + listen [::]:8185 ssl; + server_name localhost; + ssl_certificate /usr/src/app/cert/cert.crt; + ssl_certificate_key /usr/src/app/cert/key.crt; + ssl_password_file /usr/src/app/cert/pass; + + location / { + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_pass http://backend_service; + } + } + + ## + # SSL Settings + ## + ssl_protocols TLSv1 TLSv1.1 TLSv1.2; + ssl_prefer_server_ciphers on; + + ## + # Logging + ## + access_log /var/log/nginx/access.log; + error_log /var/log/nginx/error.log debug; + + ## + # Gzip + ## + gzip on; +} \ No newline at end of file diff --git a/test/simulator-group/ric/docker-compose.yml b/test/simulator-group/ric/docker-compose.yml index 9e35882a..4051face 100644 --- a/test/simulator-group/ric/docker-compose.yml +++ b/test/simulator-group/ric/docker-compose.yml @@ -1,5 +1,6 @@ # ============LICENSE_START=============================================== # Copyright (C) 2020-2023 Nordix Foundation. All rights reserved. +# Modifications Copyright 2025 OpenInfra Foundation Europe. 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. @@ -39,6 +40,7 @@ services: - DUPLICATE_CHECK=1 volumes: - ${RIC_SIM_CERT_MOUNT_DIR}:/usr/src/app/cert:ro + - ./config/nginx.conf:/usr/src/app/nginx.conf:ro labels: - "a1sim=app" - "nrttest_app=RICSIM" -- 2.16.6