diff --git a/configs/310014.yaml.in b/configs/310014.yaml.in index 997b90f2f..6690ab14d 100644 --- a/configs/310014.yaml.in +++ b/configs/310014.yaml.in @@ -213,16 +213,6 @@ nssf: port: 7777 s_nssai: sst: 1 - - addr: 127.0.0.19 - port: 7777 - s_nssai: - sst: 1 - sd: 000080 - - addr: 127.0.0.10 - port: 7777 - s_nssai: - sst: 1 - sd: 009000 udr: sbi: diff --git a/configs/csfb.yaml.in b/configs/csfb.yaml.in index 324d1cb95..9c5bc0334 100644 --- a/configs/csfb.yaml.in +++ b/configs/csfb.yaml.in @@ -247,16 +247,6 @@ nssf: port: 7777 s_nssai: sst: 1 - - addr: 127.0.0.19 - port: 7777 - s_nssai: - sst: 1 - sd: 000080 - - addr: 127.0.0.10 - port: 7777 - s_nssai: - sst: 1 - sd: 009000 udr: sbi: diff --git a/configs/open5gs/nssf.yaml.in b/configs/open5gs/nssf.yaml.in index e6674393d..6fc8d7827 100644 --- a/configs/open5gs/nssf.yaml.in +++ b/configs/open5gs/nssf.yaml.in @@ -62,10 +62,52 @@ logger: # sbi: # dev: eth0 # +# +# +# o One NSI +# - NRF[http://::1:7777/nnrf-nfm/v1/nf-instances] +# NSSAI[SST:1] +# +# nsi: +# - addr: ::1 +# port: 7777 +# s_nssai: +# sst: 1 +# +# o Three NSI +# 1. NRF[http://::1:7777/nnrf-nfm/v1/nf-instances] +# S-NSSAI[SST:1] +# +# 2. NRF[http://127.0.0.19:7777/nnrf-nfm/v1/nf-instances] +# NSSAI[SST:1, SD:000080] +# +# 2. NRF[http://127.0.0.10:7777/nnrf-nfm/v1/nf-instances] +# NSSAI[SST:1, SD:009000] +# +# nsi: +# - addr: ::1 +# port: 7777 +# s_nssai: +# sst: 1 +# - addr: 127.0.0.19 +# port: 7777 +# s_nssai: +# sst: 1 +# sd: 000080 +# - addr: 127.0.0.10 +# port: 7777 +# s_nssai: +# sst: 1 +# sd: 009000 nssf: sbi: - addr: 127.0.0.14 port: 7777 + nsi: + - addr: ::1 + port: 7777 + s_nssai: + sst: 1 # # nrf: diff --git a/configs/sample.yaml.in b/configs/sample.yaml.in index aee674721..6525b13fd 100644 --- a/configs/sample.yaml.in +++ b/configs/sample.yaml.in @@ -213,17 +213,6 @@ nssf: port: 7777 s_nssai: sst: 1 - - addr: 127.0.0.19 - port: 7777 - s_nssai: - sst: 1 - sd: 000080 - - addr: 127.0.0.10 - port: 7777 - s_nssai: - sst: 1 - sd: 009000 - udr: sbi: - addr: 127.0.0.20 diff --git a/configs/srslte.yaml.in b/configs/srslte.yaml.in index fc739c6ac..f4690c7ad 100644 --- a/configs/srslte.yaml.in +++ b/configs/srslte.yaml.in @@ -213,16 +213,6 @@ nssf: port: 7777 s_nssai: sst: 1 - - addr: 127.0.0.19 - port: 7777 - s_nssai: - sst: 1 - sd: 000080 - - addr: 127.0.0.10 - port: 7777 - s_nssai: - sst: 1 - sd: 009000 udr: sbi: diff --git a/configs/volte.yaml.in b/configs/volte.yaml.in index 70e715d24..719306ba8 100644 --- a/configs/volte.yaml.in +++ b/configs/volte.yaml.in @@ -218,16 +218,6 @@ nssf: port: 7777 s_nssai: sst: 1 - - addr: 127.0.0.19 - port: 7777 - s_nssai: - sst: 1 - sd: 000080 - - addr: 127.0.0.10 - port: 7777 - s_nssai: - sst: 1 - sd: 009000 udr: sbi: diff --git a/configs/vonr.yaml.in b/configs/vonr.yaml.in index b83eb769b..bc28a0352 100644 --- a/configs/vonr.yaml.in +++ b/configs/vonr.yaml.in @@ -218,16 +218,6 @@ nssf: port: 7777 s_nssai: sst: 1 - - addr: 127.0.0.19 - port: 7777 - s_nssai: - sst: 1 - sd: 000080 - - addr: 127.0.0.10 - port: 7777 - s_nssai: - sst: 1 - sd: 009000 udr: sbi: diff --git a/src/amf/context.c b/src/amf/context.c index 7078caec5..99a14749c 100644 --- a/src/amf/context.c +++ b/src/amf/context.c @@ -123,7 +123,7 @@ static int amf_context_validation(void) if (ogs_list_first(&self.ngap_list) == NULL && ogs_list_first(&self.ngap_list6) == NULL) { ogs_error("No amf.ngap in '%s'", ogs_app()->file); - return OGS_RETRY; + return OGS_ERROR; } if (self.num_of_served_guami == 0) { diff --git a/src/nssf/context.c b/src/nssf/context.c index 5fba9a0ec..62678a357 100644 --- a/src/nssf/context.c +++ b/src/nssf/context.c @@ -66,6 +66,11 @@ static int nssf_context_prepare(void) static int nssf_context_validation(void) { + if (ogs_list_first(&self.nsi_list) == NULL) { + ogs_error("No nssf.nsi in '%s'", ogs_app()->file); + return OGS_ERROR; + } + return OGS_OK; }