From 18ead40b842f1b9610bc785d1393cf4a56a47fc3 Mon Sep 17 00:00:00 2001 From: Rohan Date: Tue, 20 Sep 2022 19:46:44 +0000 Subject: [PATCH 1/6] Entrypoint updated for deployment on cluster --- docker/scripts/gnb_entrypoint.sh | 7 ++++++- docker/scripts/gnb_parameters.yaml | 14 ++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/docker/scripts/gnb_entrypoint.sh b/docker/scripts/gnb_entrypoint.sh index 4e8983599e..c9c5415105 100755 --- a/docker/scripts/gnb_entrypoint.sh +++ b/docker/scripts/gnb_entrypoint.sh @@ -11,6 +11,7 @@ THREAD_PARALLEL_CONFIG=${THREAD_PARALLEL_CONFIG:-PARALLEL_SINGLE_THREAD} if [[ -v USE_NSA_TDD_MONO ]]; then cp $PREFIX/etc/gnb.nsa.tdd.conf $PREFIX/etc/gnb.conf; fi if [[ -v USE_SA_TDD_MONO ]]; then cp $PREFIX/etc/gnb.sa.tdd.conf $PREFIX/etc/gnb.conf; fi if [[ -v USE_SA_TDD_MONO_B2XX ]]; then cp $PREFIX/etc/gnb.sa.tdd.b2xx.conf $PREFIX/etc/gnb.conf; fi +if [[ -v USE_SA_TDD_MONO_X3XX ]]; then cp $PREFIX/etc/gnb.sa.tdd.conf $PREFIX/etc/gnb.conf; fi if [[ -v USE_SA_FDD_MONO ]]; then cp $PREFIX/etc/gnb.sa.fdd.conf $PREFIX/etc/gnb.conf; fi if [[ -v USE_SA_CU ]]; then cp $PREFIX/etc/gnb.sa.cu.conf $PREFIX/etc/gnb.conf; fi if [[ -v USE_SA_TDD_CU ]]; then cp $PREFIX/etc/gnb.sa.du.tdd.conf $PREFIX/etc/gnb.conf; fi @@ -18,8 +19,12 @@ if [[ -v USE_SA_NFAPI_VNF ]]; then cp $PREFIX/etc/gnb.sa.nfapi.vnf.conf $PREFIX/ # Sometimes, the templates are not enough. We mount a conf file on $PREFIX/etc. It can be a template itself. if [[ -v USE_VOLUMED_CONF ]]; then cp $PREFIX/etc/mounted.conf $PREFIX/etc/gnb.conf; fi -# Resolve AMF FQDN +# Defualt Parameters +GNB_ID=${GNB_ID:-0xe00} +USE_FQDN=${USE_FQDN:-false} AMF_FQDN=${AMF_FQDN:-oai-amf-svc} + +# Resolve AMF FQDN if ($USE_FQDN); then AMF_IP_ADDRESS=(`getent hosts $AMF_FQDN | awk '{print $1}'`); fi # Only this template will be manipulated diff --git a/docker/scripts/gnb_parameters.yaml b/docker/scripts/gnb_parameters.yaml index a7539daa69..a1a03c1423 100644 --- a/docker/scripts/gnb_parameters.yaml +++ b/docker/scripts/gnb_parameters.yaml @@ -28,6 +28,8 @@ - filePrefix: gnb.band78.tm1.fr1.106PRB.usrpb210.conf outputfilename: "gnb.nsa.tdd.conf" config: + - key: GNB_ID + env: "@GNB_ID@" - key: Active_gNBs env: "@GNB_NAME@" - key: gNB_name @@ -72,6 +74,8 @@ - filePrefix: gnb.band78.sa.fr1.106PRB.usrpn310.conf outputfilename: "gnb.sa.tdd.conf" config: + - key: GNB_ID + env: "@GNB_ID@" - key: Active_gNBs env: "@GNB_NAME@" - key: gNB_name @@ -104,6 +108,8 @@ - filePrefix: gnb.sa.band78.fr1.106PRB.usrpb210.conf outputfilename: "gnb.sa.tdd.b2xx.conf" config: + - key: GNB_ID + env: "@GNB_ID@" - key: Active_gNBs env: "@GNB_NAME@" - key: gNB_name @@ -134,6 +140,8 @@ - filePrefix: gnb.sa.band66.fr1.106PRB.usrpn300.conf outputfilename: "gnb.sa.fdd.conf" config: + - key: GNB_ID + env: "@GNB_ID@" - key: Active_gNBs env: "@GNB_NAME@" - key: gNB_name @@ -166,6 +174,8 @@ - filePrefix: gNB_SA_CU.conf outputfilename: "gnb.sa.cu.conf" config: + - key: GNB_ID + env: "@GNB_ID@" - key: Active_gNBs env: "@GNB_NAME@" - key: gNB_name @@ -206,6 +216,8 @@ - filePrefix: gNB_SA_DU.conf outputfilename: "gnb.sa.du.tdd.conf" config: + - key: GNB_ID + env: "@GNB_ID@" - key: Active_gNBs env: "@GNB_NAME@" - key: gNB_name @@ -248,6 +260,8 @@ - filePrefix: proxy_gnb.band78.sa.fr1.106PRB.usrpn310.conf outputfilename: "gnb.sa.nfapi.vnf.conf" config: + - key: GNB_ID + env: "@GNB_ID@" - key: Active_gNBs env: "@GNB_NAME@" - key: gNB_name -- GitLab From 0dff2c9bc39f9ed98dfa322780c955238914c03b Mon Sep 17 00:00:00 2001 From: Raphael Defosseux Date: Wed, 21 Sep 2022 10:52:05 +0200 Subject: [PATCH 2/6] fix(docker): fixes when generating the templates for gNB conf files * The '0x' format was forgetting that an hexadecimal value can have a-f chars * If someone wants to use a dedicated NSSAI_SD value, it is possible now * For experimental purpose in cluster, SDR addresses can be provided for one config - could be expended later on other conf files Signed-off-by: Raphael Defosseux --- docker/scripts/generateTemplate.py | 7 +++++-- docker/scripts/gnb_entrypoint.sh | 7 ++++++- docker/scripts/gnb_parameters.yaml | 28 +++++++++------------------- 3 files changed, 20 insertions(+), 22 deletions(-) diff --git a/docker/scripts/generateTemplate.py b/docker/scripts/generateTemplate.py index b79d25f8f3..1d5dbb5cb5 100644 --- a/docker/scripts/generateTemplate.py +++ b/docker/scripts/generateTemplate.py @@ -90,7 +90,7 @@ def main(): if templine.find(key["key"]) >= 0: if re.search(r'preference', templine): # false positive continue - if re.search(r'sdr_addrs', templine): # false positive + if key["key"] != 'sdr_addrs' and re.search(r'sdr_addrs', templine): # false positive continue elif re.search('downlink_frequency', line): templine = re.sub(r'[0-9]+', key["env"], line) @@ -106,7 +106,10 @@ def main(): r'\1' + key["env"] + r"\2", templine) # next: matches key = NUMBER elif re.search(key["key"] + "\s*=\s*[x0-9]+", templine): # x for "0x" hex start - templine = re.sub("(" + key["key"] + "\s*=\s*(?:0x)?)[x0-9]+", r"\1" + key["env"], templine) + templine = re.sub("(" + key["key"] + "\s*=\s*(?:0x)?)[x0-9a-fA-F]+", r"\1" + key["env"], templine) + # next: special case for sdr_addrs + elif key["key"] == 'sdr_addrs' and re.search(key["key"] + "\s*=\s*", templine): + templine = re.sub("(" + key["key"] + "\s*=\s*.*$)", key["key"] + " = \"" + key["env"] + "\"", templine) outputfile.write(templine) if __name__ == "__main__": diff --git a/docker/scripts/gnb_entrypoint.sh b/docker/scripts/gnb_entrypoint.sh index c9c5415105..c54ba49ec9 100755 --- a/docker/scripts/gnb_entrypoint.sh +++ b/docker/scripts/gnb_entrypoint.sh @@ -20,9 +20,14 @@ if [[ -v USE_SA_NFAPI_VNF ]]; then cp $PREFIX/etc/gnb.sa.nfapi.vnf.conf $PREFIX/ if [[ -v USE_VOLUMED_CONF ]]; then cp $PREFIX/etc/mounted.conf $PREFIX/etc/gnb.conf; fi # Defualt Parameters -GNB_ID=${GNB_ID:-0xe00} +GNB_ID=${GNB_ID:-e00} USE_FQDN=${USE_FQDN:-false} AMF_FQDN=${AMF_FQDN:-oai-amf-svc} +# if you explicitly want to use an SD, it should be added in the docker-compose or the helm chart +# if you want to support more than 1 NSSAI, then you need to mount a more-complex conf file +if [[ -v NSSAI_SST ]] && [[ -v NSSAI_SD ]] then + NSSAI_SST=$NSSAI_SST" , sd = "$NSSAI_SD +fi # Resolve AMF FQDN if ($USE_FQDN); then AMF_IP_ADDRESS=(`getent hosts $AMF_FQDN | awk '{print $1}'`); fi diff --git a/docker/scripts/gnb_parameters.yaml b/docker/scripts/gnb_parameters.yaml index a1a03c1423..0894bd88ad 100644 --- a/docker/scripts/gnb_parameters.yaml +++ b/docker/scripts/gnb_parameters.yaml @@ -28,7 +28,7 @@ - filePrefix: gnb.band78.tm1.fr1.106PRB.usrpb210.conf outputfilename: "gnb.nsa.tdd.conf" config: - - key: GNB_ID + - key: gNB_ID env: "@GNB_ID@" - key: Active_gNBs env: "@GNB_NAME@" @@ -42,8 +42,6 @@ env: "@MNC_LENGTH@" - key: sst env: "@NSSAI_SST@" - - key: sd - env: "@NSSAI_SD@" - key: tracking_area_code env: "@TAC@" - key: enable_x2 @@ -74,7 +72,7 @@ - filePrefix: gnb.band78.sa.fr1.106PRB.usrpn310.conf outputfilename: "gnb.sa.tdd.conf" config: - - key: GNB_ID + - key: gNB_ID env: "@GNB_ID@" - key: Active_gNBs env: "@GNB_NAME@" @@ -90,8 +88,6 @@ env: "@TAC@" - key: sst env: "@NSSAI_SST@" - - key: sd - env: "@NSSAI_SD@" - key: ipv4 env: "@AMF_IP_ADDRESS@" - key: GNB_INTERFACE_NAME_FOR_NG_AMF @@ -102,13 +98,15 @@ env: "@GNB_NGU_IF_NAME@" - key: GNB_IPV4_ADDRESS_FOR_NGU env: "@GNB_NGU_IP_ADDRESS@" + - key: sdr_addrs + env: "@SDR_ADDRESSES@" - key: parallel_config env: "@THREAD_PARALLEL_CONFIG@" - filePrefix: gnb.sa.band78.fr1.106PRB.usrpb210.conf outputfilename: "gnb.sa.tdd.b2xx.conf" config: - - key: GNB_ID + - key: gNB_ID env: "@GNB_ID@" - key: Active_gNBs env: "@GNB_NAME@" @@ -140,7 +138,7 @@ - filePrefix: gnb.sa.band66.fr1.106PRB.usrpn300.conf outputfilename: "gnb.sa.fdd.conf" config: - - key: GNB_ID + - key: gNB_ID env: "@GNB_ID@" - key: Active_gNBs env: "@GNB_NAME@" @@ -156,8 +154,6 @@ env: "@TAC@" - key: sst env: "@NSSAI_SST@" - - key: sd - env: "@NSSAI_SD@" - key: ipv4 env: "@AMF_IP_ADDRESS@" - key: GNB_INTERFACE_NAME_FOR_NG_AMF @@ -174,7 +170,7 @@ - filePrefix: gNB_SA_CU.conf outputfilename: "gnb.sa.cu.conf" config: - - key: GNB_ID + - key: gNB_ID env: "@GNB_ID@" - key: Active_gNBs env: "@GNB_NAME@" @@ -190,8 +186,6 @@ env: "@TAC@" - key: sst env: "@NSSAI_SST@" - - key: sd - env: "@NSSAI_SD@" - key: ipv4 env: "@AMF_IP_ADDRESS@" - key: GNB_INTERFACE_NAME_FOR_NG_AMF @@ -216,7 +210,7 @@ - filePrefix: gNB_SA_DU.conf outputfilename: "gnb.sa.du.tdd.conf" config: - - key: GNB_ID + - key: gNB_ID env: "@GNB_ID@" - key: Active_gNBs env: "@GNB_NAME@" @@ -232,8 +226,6 @@ env: "@TAC@" - key: sst env: "@NSSAI_SST@" - - key: sd - env: "@NSSAI_SD@" - key: ipv4 env: "@AMF_IP_ADDRESS@" - key: GNB_INTERFACE_NAME_FOR_NG_AMF @@ -260,7 +252,7 @@ - filePrefix: proxy_gnb.band78.sa.fr1.106PRB.usrpn310.conf outputfilename: "gnb.sa.nfapi.vnf.conf" config: - - key: GNB_ID + - key: gNB_ID env: "@GNB_ID@" - key: Active_gNBs env: "@GNB_NAME@" @@ -276,8 +268,6 @@ env: "@TAC@" - key: sst env: "@NSSAI_SST@" - - key: sd - env: "@NSSAI_SD@" - key: ipv4 env: "@AMF_IP_ADDRESS@" - key: GNB_INTERFACE_NAME_FOR_NG_AMF -- GitLab From 837a6085c204fde1543155678d3f1f5777377566 Mon Sep 17 00:00:00 2001 From: kharade Date: Tue, 27 Sep 2022 10:56:52 +0200 Subject: [PATCH 3/6] removed duplicate flag in entrypoint Signed-off-by: kharade --- docker/scripts/gnb_entrypoint.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/docker/scripts/gnb_entrypoint.sh b/docker/scripts/gnb_entrypoint.sh index c54ba49ec9..c17f71de65 100755 --- a/docker/scripts/gnb_entrypoint.sh +++ b/docker/scripts/gnb_entrypoint.sh @@ -11,7 +11,6 @@ THREAD_PARALLEL_CONFIG=${THREAD_PARALLEL_CONFIG:-PARALLEL_SINGLE_THREAD} if [[ -v USE_NSA_TDD_MONO ]]; then cp $PREFIX/etc/gnb.nsa.tdd.conf $PREFIX/etc/gnb.conf; fi if [[ -v USE_SA_TDD_MONO ]]; then cp $PREFIX/etc/gnb.sa.tdd.conf $PREFIX/etc/gnb.conf; fi if [[ -v USE_SA_TDD_MONO_B2XX ]]; then cp $PREFIX/etc/gnb.sa.tdd.b2xx.conf $PREFIX/etc/gnb.conf; fi -if [[ -v USE_SA_TDD_MONO_X3XX ]]; then cp $PREFIX/etc/gnb.sa.tdd.conf $PREFIX/etc/gnb.conf; fi if [[ -v USE_SA_FDD_MONO ]]; then cp $PREFIX/etc/gnb.sa.fdd.conf $PREFIX/etc/gnb.conf; fi if [[ -v USE_SA_CU ]]; then cp $PREFIX/etc/gnb.sa.cu.conf $PREFIX/etc/gnb.conf; fi if [[ -v USE_SA_TDD_CU ]]; then cp $PREFIX/etc/gnb.sa.du.tdd.conf $PREFIX/etc/gnb.conf; fi -- GitLab From edcbff8f587d36621047c1cfc4b90019c7408209 Mon Sep 17 00:00:00 2001 From: Raphael Defosseux Date: Tue, 27 Sep 2022 11:34:00 +0200 Subject: [PATCH 4/6] chore(ci): changes after peer review Signed-off-by: Raphael Defosseux --- ...oxy_gnb.band78.sa.fr1.106PRB.usrpn310.conf | 2 +- ci-scripts/conf_files/gNB_SA_CU.conf | 2 +- ci-scripts/conf_files/gNB_SA_DU.conf | 2 +- .../gnb.band78.sa.fr1.106PRB.usrpn310.conf | 2 +- .../gnb.sa.band66.fr1.106PRB.usrpn300.conf | 2 +- .../gnb.sa.band78.fr1.106PRB.usrpb210.conf | 2 +- docker/scripts/gnb_entrypoint.sh | 6 +--- docker/scripts/gnb_parameters.yaml | 28 +++++++++++++++++-- 8 files changed, 32 insertions(+), 14 deletions(-) diff --git a/ci-scripts/conf_files/episci/proxy_gnb.band78.sa.fr1.106PRB.usrpn310.conf b/ci-scripts/conf_files/episci/proxy_gnb.band78.sa.fr1.106PRB.usrpn310.conf index 50dba38a51..20b0d3caf7 100644 --- a/ci-scripts/conf_files/episci/proxy_gnb.band78.sa.fr1.106PRB.usrpn310.conf +++ b/ci-scripts/conf_files/episci/proxy_gnb.band78.sa.fr1.106PRB.usrpn310.conf @@ -11,7 +11,7 @@ gNBs = // Tracking area code, 0x0000 and 0xfffe are reserved values tracking_area_code = 1; - plmn_list = ({ mcc = 208; mnc = 99; mnc_length = 2; snssaiList = ({ sst = 1 }) }); + plmn_list = ({ mcc = 208; mnc = 99; mnc_length = 2; snssaiList = ({ sst = 1, sd = 0xffffff }) }); nr_cellid = 12345678L; diff --git a/ci-scripts/conf_files/gNB_SA_CU.conf b/ci-scripts/conf_files/gNB_SA_CU.conf index 664af9d65e..81635f7eb2 100644 --- a/ci-scripts/conf_files/gNB_SA_CU.conf +++ b/ci-scripts/conf_files/gNB_SA_CU.conf @@ -15,7 +15,7 @@ gNBs = // Tracking area code, 0x0000 and 0xfffe are reserved values tracking_area_code = 1; - plmn_list = ({ mcc = 208; mnc = 99; mnc_length = 2; snssaiList = ({ sst = 1 }) }); + plmn_list = ({ mcc = 208; mnc = 99; mnc_length = 2; snssaiList = ({ sst = 1, sd = 0xffffff }) }); nr_cellid = 12345678L; diff --git a/ci-scripts/conf_files/gNB_SA_DU.conf b/ci-scripts/conf_files/gNB_SA_DU.conf index 50a3468340..2a2524cb87 100644 --- a/ci-scripts/conf_files/gNB_SA_DU.conf +++ b/ci-scripts/conf_files/gNB_SA_DU.conf @@ -14,7 +14,7 @@ gNBs = // Tracking area code, 0x0000 and 0xfffe are reserved values tracking_area_code = 1; - plmn_list = ({ mcc = 208; mnc = 99; mnc_length = 2; snssaiList = ({ sst = 1 }) }); + plmn_list = ({ mcc = 208; mnc = 99; mnc_length = 2; snssaiList = ({ sst = 1, sd = 0xffffff }) }); nr_cellid = 12345678L; diff --git a/ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.usrpn310.conf b/ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.usrpn310.conf index 9f83c3f654..53adb4eae1 100644 --- a/ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.usrpn310.conf +++ b/ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.usrpn310.conf @@ -15,7 +15,7 @@ gNBs = // Tracking area code, 0x0000 and 0xfffe are reserved values tracking_area_code = 1; - plmn_list = ({ mcc = 208; mnc = 97; mnc_length = 2; snssaiList = ({ sst = 1 }) }); + plmn_list = ({ mcc = 208; mnc = 97; mnc_length = 2; snssaiList = ({ sst = 1, sd = 0xffffff }) }); nr_cellid = 12345678L diff --git a/ci-scripts/conf_files/gnb.sa.band66.fr1.106PRB.usrpn300.conf b/ci-scripts/conf_files/gnb.sa.band66.fr1.106PRB.usrpn300.conf index 787701fc9c..d45f9bfd62 100644 --- a/ci-scripts/conf_files/gnb.sa.band66.fr1.106PRB.usrpn300.conf +++ b/ci-scripts/conf_files/gnb.sa.band66.fr1.106PRB.usrpn300.conf @@ -11,7 +11,7 @@ gNBs = // Tracking area code, 0x0000 and 0xfffe are reserved values tracking_area_code = 1; - plmn_list = ({ mcc = 208; mnc = 95; mnc_length = 2; snssaiList = ({ sst = 1 }) }); + plmn_list = ({ mcc = 208; mnc = 95; mnc_length = 2; snssaiList = ({ sst = 1, sd = 0xffffff }) }); nr_cellid = 12345678L; diff --git a/ci-scripts/conf_files/gnb.sa.band78.fr1.106PRB.usrpb210.conf b/ci-scripts/conf_files/gnb.sa.band78.fr1.106PRB.usrpb210.conf index 3ec265f12c..b82944805a 100644 --- a/ci-scripts/conf_files/gnb.sa.band78.fr1.106PRB.usrpb210.conf +++ b/ci-scripts/conf_files/gnb.sa.band78.fr1.106PRB.usrpb210.conf @@ -11,7 +11,7 @@ gNBs = // Tracking area code, 0x0000 and 0xfffe are reserved values tracking_area_code = 1; - plmn_list = ({ mcc = 222; mnc = 01; mnc_length = 2; snssaiList = ({ sst = 1; }) }); + plmn_list = ({ mcc = 222; mnc = 01; mnc_length = 2; snssaiList = ({ sst = 1, sd = 0xffffff }) }); nr_cellid = 12345678L; diff --git a/docker/scripts/gnb_entrypoint.sh b/docker/scripts/gnb_entrypoint.sh index c17f71de65..f1d6bd8333 100755 --- a/docker/scripts/gnb_entrypoint.sh +++ b/docker/scripts/gnb_entrypoint.sh @@ -20,13 +20,9 @@ if [[ -v USE_VOLUMED_CONF ]]; then cp $PREFIX/etc/mounted.conf $PREFIX/etc/gnb.c # Defualt Parameters GNB_ID=${GNB_ID:-e00} +NSSAI_SD=${NSSAI_SD:-ffffff} USE_FQDN=${USE_FQDN:-false} AMF_FQDN=${AMF_FQDN:-oai-amf-svc} -# if you explicitly want to use an SD, it should be added in the docker-compose or the helm chart -# if you want to support more than 1 NSSAI, then you need to mount a more-complex conf file -if [[ -v NSSAI_SST ]] && [[ -v NSSAI_SD ]] then - NSSAI_SST=$NSSAI_SST" , sd = "$NSSAI_SD -fi # Resolve AMF FQDN if ($USE_FQDN); then AMF_IP_ADDRESS=(`getent hosts $AMF_FQDN | awk '{print $1}'`); fi diff --git a/docker/scripts/gnb_parameters.yaml b/docker/scripts/gnb_parameters.yaml index 0894bd88ad..d1c41d966b 100644 --- a/docker/scripts/gnb_parameters.yaml +++ b/docker/scripts/gnb_parameters.yaml @@ -40,8 +40,6 @@ env: "@MNC@" - key: mnc_length env: "@MNC_LENGTH@" - - key: sst - env: "@NSSAI_SST@" - key: tracking_area_code env: "@TAC@" - key: enable_x2 @@ -88,6 +86,10 @@ env: "@TAC@" - key: sst env: "@NSSAI_SST@" + - key: sd + env: "@NSSAI_SD@" + - key: tracking_area_code + env: "@TAC@" - key: ipv4 env: "@AMF_IP_ADDRESS@" - key: GNB_INTERFACE_NAME_FOR_NG_AMF @@ -99,7 +101,7 @@ - key: GNB_IPV4_ADDRESS_FOR_NGU env: "@GNB_NGU_IP_ADDRESS@" - key: sdr_addrs - env: "@SDR_ADDRESSES@" + env: "@SDR_ADDRS@" - key: parallel_config env: "@THREAD_PARALLEL_CONFIG@" @@ -122,6 +124,10 @@ env: "@TAC@" - key: sst env: "@NSSAI_SST@" + - key: sd + env: "@NSSAI_SD@" + - key: tracking_area_code + env: "@TAC@" - key: ipv4 env: "@AMF_IP_ADDRESS@" - key: GNB_INTERFACE_NAME_FOR_NG_AMF @@ -154,6 +160,10 @@ env: "@TAC@" - key: sst env: "@NSSAI_SST@" + - key: sd + env: "@NSSAI_SD@" + - key: tracking_area_code + env: "@TAC@" - key: ipv4 env: "@AMF_IP_ADDRESS@" - key: GNB_INTERFACE_NAME_FOR_NG_AMF @@ -186,6 +196,10 @@ env: "@TAC@" - key: sst env: "@NSSAI_SST@" + - key: sd + env: "@NSSAI_SD@" + - key: tracking_area_code + env: "@TAC@" - key: ipv4 env: "@AMF_IP_ADDRESS@" - key: GNB_INTERFACE_NAME_FOR_NG_AMF @@ -226,6 +240,10 @@ env: "@TAC@" - key: sst env: "@NSSAI_SST@" + - key: sd + env: "@NSSAI_SD@" + - key: tracking_area_code + env: "@TAC@" - key: ipv4 env: "@AMF_IP_ADDRESS@" - key: GNB_INTERFACE_NAME_FOR_NG_AMF @@ -268,6 +286,10 @@ env: "@TAC@" - key: sst env: "@NSSAI_SST@" + - key: sd + env: "@NSSAI_SD@" + - key: tracking_area_code + env: "@TAC@" - key: ipv4 env: "@AMF_IP_ADDRESS@" - key: GNB_INTERFACE_NAME_FOR_NG_AMF -- GitLab From 91ff939d52574a152f4259d3a9c6cff4e7e12173 Mon Sep 17 00:00:00 2001 From: kharade Date: Fri, 7 Oct 2022 12:19:38 +0200 Subject: [PATCH 5/6] Typo fix for config parameter Signed-off-by: kharade --- docker/scripts/gnb_parameters.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docker/scripts/gnb_parameters.yaml b/docker/scripts/gnb_parameters.yaml index d1c41d966b..524c6fbb42 100644 --- a/docker/scripts/gnb_parameters.yaml +++ b/docker/scripts/gnb_parameters.yaml @@ -40,6 +40,10 @@ env: "@MNC@" - key: mnc_length env: "@MNC_LENGTH@" + - key: sst + env: "@NSSAI_SST@" + - key: sd + env: "@NSSAI_SD@" - key: tracking_area_code env: "@TAC@" - key: enable_x2 -- GitLab From 98bf50cf33c3966095decb84b61d597dc02f3afa Mon Sep 17 00:00:00 2001 From: Raphael Defosseux Date: Tue, 11 Oct 2022 16:40:19 +0200 Subject: [PATCH 6/6] fix(ci): putting dummy serial nb, ignored in RF sim anyway Signed-off-by: Raphael Defosseux --- ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml index 183d184977..107ec626e2 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml @@ -248,6 +248,7 @@ services: GNB_NGA_IP_ADDRESS: 192.168.71.140 GNB_NGU_IF_NAME: eth0 GNB_NGU_IP_ADDRESS: 192.168.71.140 + SDR_ADDRS: serial=XXXXXXX USE_ADDITIONAL_OPTIONS: --sa -E --rfsim --log_config.global_log_options level,nocolor,time depends_on: - oai-ext-dn -- GitLab