diff --git a/scripts/jinja/customize.py b/scripts/jinja/customize.py index 60f69d9..acf3872 100644 --- a/scripts/jinja/customize.py +++ b/scripts/jinja/customize.py @@ -311,6 +311,17 @@ def log_level(_context: _Context) -> str: return 'info' # default log level return ret +@j2_function +def log_report_caller(_context: _Context) -> str: + '''Get global log report_caller''' + ret = 'false' # default log report_caller + try: + if _context.dict['config']['topology']['log_level'] in ("trace", "verbose", "debug"): + ret = 'true' + except KeyError: + return ret + return ret + @j2_function def ipv4(host: str, subnet: str, _context: _Context) -> str: '''Get IPv4 Address''' diff --git a/templates/compose.yaml.j2 b/templates/compose.yaml.j2 index 37a73e7..bf92f16 100644 --- a/templates/compose.yaml.j2 +++ b/templates/compose.yaml.j2 @@ -297,6 +297,7 @@ services: condition: service_started environment: LOG_LEVEL: "{{ log_level() }}" + LOG_REPORT_CALLER: "{{ log_report_caller() }}" GIN_MODE: "release" N2: "{{ ipv4('amf', 'control') }}" SBI_REGISTER_IP: "amf.sbi" @@ -351,6 +352,7 @@ services: condition: service_started environment: LOG_LEVEL: "{{ log_level() }}" + LOG_REPORT_CALLER: "{{ log_report_caller() }}" GIN_MODE: "release" MONGO_HOST: "mongodb.db" SBI_REGISTER_IP: "nrf.sbi" @@ -360,6 +362,9 @@ services: MNC: "01" NRF_PEM: "{{ openssl_secret_pem('nrf', 'sbi') }}" NRF_KEY: "{{ openssl_secret_key('nrf', 'sbi') }}" + ROOT_PEM: "{{ openssl_secret_pem('nrf', 'sbi') }}" + ROOT_KEY: "{{ openssl_secret_key('nrf', 'sbi') }}" + OAUTH_ENABLE: "false" # disabled until https://github.com/free5gc/nrf/issues/57 is fixed secrets: {{ openssl_secrets_s('nrf', 'sbi') | indent(2) }} networks: @@ -373,6 +378,7 @@ services: condition: service_started environment: LOG_LEVEL: "{{ log_level() }}" + LOG_REPORT_CALLER: "{{ log_report_caller() }}" GIN_MODE: "release" SBI_REGISTER_IP: "ausf.sbi" SBI_BINDING_IP: "{{ ipv4('ausf', 'sbi') }}" @@ -393,6 +399,7 @@ services: condition: service_started environment: LOG_LEVEL: "{{ log_level() }}" + LOG_REPORT_CALLER: "{{ log_report_caller() }}" GIN_MODE: "release" SBI_REGISTER_IP: "udm.sbi" SBI_BINDING_IP: "{{ ipv4('udm', 'sbi') }}" @@ -414,6 +421,7 @@ services: condition: service_started environment: LOG_LEVEL: "{{ log_level() }}" + LOG_REPORT_CALLER: "{{ log_report_caller() }}" GIN_MODE: "release" MONGO_HOST: "mongodb.db" SBI_REGISTER_IP: "udr.sbi" @@ -437,6 +445,7 @@ services: condition: service_started environment: LOG_LEVEL: "{{ log_level() }}" + LOG_REPORT_CALLER: "{{ log_report_caller() }}" GIN_MODE: "release" MONGO_HOST: "mongodb.db" SBI_REGISTER_IP: "pcf.sbi" @@ -462,6 +471,7 @@ services: condition: service_started environment: LOG_LEVEL: "{{ log_level() }}" + LOG_REPORT_CALLER: "{{ log_report_caller() }}" GIN_MODE: "release" MONGO_HOST: "mongodb.db" SBI_REGISTER_IP: "chf.sbi" @@ -487,6 +497,7 @@ services: condition: service_started environment: LOG_LEVEL: "{{ log_level() }}" + LOG_REPORT_CALLER: "{{ log_report_caller() }}" GIN_MODE: "release" MONGO_HOST: "mongodb.db" NRF: "nrf.sbi:8000" @@ -516,6 +527,7 @@ services: #~ endif environment: LOG_LEVEL: "{{ log_level() }}" + LOG_REPORT_CALLER: "{{ log_report_caller() }}" GIN_MODE: "release" SBI_REGISTER_IP: "smf.sbi" SBI_BINDING_IP: "{{ ipv4('smf', 'sbi') }}" @@ -862,6 +874,7 @@ services: condition: service_started environment: LOG_LEVEL: "{{ log_level() }}" + LOG_REPORT_CALLER: "{{ log_report_caller() }}" GIN_MODE: "release" SBI_REGISTER_IP: "nssf.sbi" SBI_BINDING_IP: "{{ ipv4('nssf', 'sbi') }}" @@ -1531,6 +1544,7 @@ services: {{ container_s(name='upfi1-f5gc', image='docker.io/louisroyer/dev-free5gc-upf', image_build='https://github.com/louisroyer-docker/free5gc.git#master:upf', restart='always', cap_net_admin=True, debug='allow') }} environment: LOG_LEVEL: "{{ log_level() }}" + LOG_REPORT_CALLER: "{{ log_report_caller() }}" N4: "{{ ipv4('upfi1-f5gc', 'control') }}" IF_LIST: |- - addr: "{{ ipv4('upfi1-f5gc', 'dataplane') }}" @@ -1549,6 +1563,7 @@ services: {{ container_s(name='upfi2-f5gc', image='docker.io/louisroyer/dev-free5gc-upf', image_build='https://github.com/louisroyer-docker/free5gc.git#master:upf', restart='always', cap_net_admin=True, debug='allow') }} environment: LOG_LEVEL: "{{ log_level() }}" + LOG_REPORT_CALLER: "{{ log_report_caller() }}" N4: "{{ ipv4('upfi2-f5gc', 'control') }}" IF_LIST: |- - addr: "{{ ipv4('upfi2-f5gc', 'dataplane') }}" @@ -1567,6 +1582,7 @@ services: {{ container_s(name='upfa1-f5gc', image='docker.io/louisroyer/dev-free5gc-upf', image_build='https://github.com/louisroyer-docker/free5gc.git#master:upf', restart='always', cap_net_admin=True, debug='allow') }} environment: LOG_LEVEL: "{{ log_level() }}" + LOG_REPORT_CALLER: "{{ log_report_caller() }}" N4: "{{ ipv4('upfa1-f5gc', 'control') }}" IF_LIST: |- - addr: "{{ ipv4('upfa1-f5gc', 'dataplane') }}" @@ -1587,6 +1603,7 @@ services: {{ container_s(name='upfa2-f5gc', image='docker.io/louisroyer/dev-free5gc-upf', image_build='https://github.com/louisroyer-docker/free5gc.git#master:upf', restart='always', cap_net_admin=True, debug='allow') }} environment: LOG_LEVEL: "{{ log_level() }}" + LOG_REPORT_CALLER: "{{ log_report_caller() }}" N4: "{{ ipv4('upfa2-f5gc', 'control') }}" IF_LIST: |- - addr: "{{ ipv4('upfa2-f5gc', 'dataplane') }}" @@ -1608,6 +1625,7 @@ services: {{ container_s(name='upfa3-f5gc', image='docker.io/louisroyer/dev-free5gc-upf', image_build='https://github.com/louisroyer-docker/free5gc.git#master:upf', restart='always', cap_net_admin=True, debug='allow') }} environment: LOG_LEVEL: "{{ log_level() }}" + LOG_REPORT_CALLER: "{{ log_report_caller() }}" N4: "{{ ipv4('upfa3-f5gc', 'control') }}" IF_LIST: |- - addr: "{{ ipv4('upfa3-f5gc', 'dataplane') }}"