Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Loglevel #74

Merged
merged 2 commits into from
Nov 7, 2024
Merged

Loglevel #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1926de7
Add `LOG_LEVEL` for Free5GC; close #72
louisroyer Nov 7, 2024
ac8b045
Update Makefile default target
louisroyer Nov 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@ PROJECT_DIRECTORY = --project-directory $(BUILD_DIR)
MAKE = make --no-print-directory


$(BCONFIG): default-config.yaml
@echo Copying default-config.yaml into $(BCONFIG)
@mkdir -p $$(dirname $(BCONFIG))
@cp default-config.yaml $(BCONFIG)

$(BCOMPOSE): templates/compose.yaml.j2 scripts/jinja/customize.py $(BCONFIG)
@echo Building $(BCOMPOSE) from jinja template
@mkdir -p $$(dirname $(BCOMPOSE))
@j2 --customize scripts/jinja/customize.py -o $(BCOMPOSE) templates/compose.yaml.j2 $(BCONFIG)

$(BCONFIG): default-config.yaml
@echo Copying default-config.yaml into $(BCONFIG)
@mkdir -p $$(dirname $(BCONFIG))
@cp default-config.yaml $(BCONFIG)

.PHONY: test
test:
@$(MAKE) clean
Expand Down
13 changes: 13 additions & 0 deletions templates/compose.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,7 @@ services:
nrf: # required to being able to deregister propertly
condition: service_started
environment:
LOG_LEVEL: "{{ log_level() }}"
GIN_MODE: "release"
N2: "{{ ipv4('amf', 'control') }}"
SBI_REGISTER_IP: "amf.sbi"
Expand Down Expand Up @@ -337,6 +338,7 @@ services:
mongodb: # required to being able to deregister propertly
condition: service_started
environment:
LOG_LEVEL: "{{ log_level() }}"
GIN_MODE: "release"
MONGO_HOST: "mongodb.db"
SBI_REGISTER_IP: "nrf.sbi"
Expand All @@ -358,6 +360,7 @@ services:
nrf: # required to being able to deregister propertly
condition: service_started
environment:
LOG_LEVEL: "{{ log_level() }}"
GIN_MODE: "release"
SBI_REGISTER_IP: "ausf.sbi"
SBI_BINDING_IP: "{{ ipv4('ausf', 'sbi') }}"
Expand All @@ -377,6 +380,7 @@ services:
nrf: # required to being able to deregister propertly
condition: service_started
environment:
LOG_LEVEL: "{{ log_level() }}"
GIN_MODE: "release"
SBI_REGISTER_IP: "udm.sbi"
SBI_BINDING_IP: "{{ ipv4('udm', 'sbi') }}"
Expand All @@ -397,6 +401,7 @@ services:
nrf: # required to being able to deregister propertly
condition: service_started
environment:
LOG_LEVEL: "{{ log_level() }}"
GIN_MODE: "release"
MONGO_HOST: "mongodb.db"
SBI_REGISTER_IP: "udr.sbi"
Expand All @@ -419,6 +424,7 @@ services:
nrf: # required to being able to deregister propertly
condition: service_started
environment:
LOG_LEVEL: "{{ log_level() }}"
GIN_MODE: "release"
MONGO_HOST: "mongodb.db"
SBI_REGISTER_IP: "pcf.sbi"
Expand All @@ -443,6 +449,7 @@ services:
webconsole:
condition: service_started
environment:
LOG_LEVEL: "{{ log_level() }}"
GIN_MODE: "release"
MONGO_HOST: "mongodb.db"
SBI_REGISTER_IP: "chf.sbi"
Expand All @@ -467,6 +474,7 @@ services:
nrf: # required to being able to deregister propertly
condition: service_started
environment:
LOG_LEVEL: "{{ log_level() }}"
GIN_MODE: "release"
MONGO_HOST: "mongodb.db"
NRF: "nrf.sbi:8000"
Expand Down Expand Up @@ -495,6 +503,7 @@ services:
condition: service_healthy
#~ endif
environment:
LOG_LEVEL: "{{ log_level() }}"
GIN_MODE: "release"
SBI_REGISTER_IP: "smf.sbi"
SBI_BINDING_IP: "{{ ipv4('smf', 'sbi') }}"
Expand Down Expand Up @@ -840,6 +849,7 @@ services:
nrf: # required to being able to deregister propertly
condition: service_started
environment:
LOG_LEVEL: "{{ log_level() }}"
GIN_MODE: "release"
SBI_REGISTER_IP: "nssf.sbi"
SBI_BINDING_IP: "{{ ipv4('nssf', 'sbi') }}"
Expand Down Expand Up @@ -1270,6 +1280,7 @@ services:
#~ if "free5gc" in config["topology"]["dataplane"]
{{ container_s(name='upfi-f5gc', image='louisroyer/dev-free5gc-upf', restart='always', cap_net_admin=True, debug='allow') }}
environment:
LOG_LEVEL: "{{ log_level() }}"
N4: "{{ ipv4('upfi-f5gc', 'control') }}"
IF_LIST: |-
- addr: "{{ ipv4('upfi-f5gc', 'dataplane') }}"
Expand All @@ -1286,6 +1297,7 @@ services:
ipv4_address: "{{ ipv4('upfi-f5gc', 'dataplane') }}"
{{ container_s(name='upfa1-f5gc', image='louisroyer/dev-free5gc-upf', restart='always', cap_net_admin=True, debug='allow') }}
environment:
LOG_LEVEL: "{{ log_level() }}"
N4: "{{ ipv4('upfa1-f5gc', 'control') }}"
IF_LIST: |-
- addr: "{{ ipv4('upfa1-f5gc', 'dataplane') }}"
Expand All @@ -1305,6 +1317,7 @@ services:
#~ if config["topology"]["nb_edges"] > 1
{{ container_s(name='upfa2-f5gc', image='louisroyer/dev-free5gc-upf', restart='always', cap_net_admin=True, debug='allow') }}
environment:
LOG_LEVEL: "{{ log_level() }}"
N4: "{{ ipv4('upfa2-f5gc', 'control') }}"
IF_LIST: |-
- addr: "{{ ipv4('upfa2-f5gc', 'dataplane') }}"
Expand Down
Loading