maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/entrypoint-update' into integration_2022_wk41

Browse Source
This commit is contained in:
Robert Schmidt
2022-10-11 23:33:51 +02:00
parent c3f48da419 98bf50cf33
commit 10dff4ac00
10 changed files with 48 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ci-scripts/conf_files/episci/proxy_gnb.band78.sa.fr1.106PRB.usrpn310.conf
+1 -1
View File
@@ -11,7 +11,7 @@ gNBs =
// Tracking area code, 0x0000 and 0xfffe are reserved values // Tracking area code, 0x0000 and 0xfffe are reserved values
tracking_area_code = 1; 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; nr_cellid = 12345678L;
ci-scripts/conf_files/gNB_SA_CU.conf
+1 -1
View File
@@ -15,7 +15,7 @@ gNBs =
// Tracking area code, 0x0000 and 0xfffe are reserved values // Tracking area code, 0x0000 and 0xfffe are reserved values
tracking_area_code = 1; 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; nr_cellid = 12345678L;
ci-scripts/conf_files/gNB_SA_DU.conf
+1 -1
View File
@@ -14,7 +14,7 @@ gNBs =
// Tracking area code, 0x0000 and 0xfffe are reserved values // Tracking area code, 0x0000 and 0xfffe are reserved values
tracking_area_code = 1; 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; nr_cellid = 12345678L;
ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.usrpn310.conf
+1 -1
View File
@@ -15,7 +15,7 @@ gNBs =
// Tracking area code, 0x0000 and 0xfffe are reserved values // Tracking area code, 0x0000 and 0xfffe are reserved values
tracking_area_code = 1; 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 nr_cellid = 12345678L
ci-scripts/conf_files/gnb.sa.band66.fr1.106PRB.usrpn300.conf
+1 -1
View File
@@ -11,7 +11,7 @@ gNBs =
// Tracking area code, 0x0000 and 0xfffe are reserved values // Tracking area code, 0x0000 and 0xfffe are reserved values
tracking_area_code = 1; 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; nr_cellid = 12345678L;
ci-scripts/conf_files/gnb.sa.band78.fr1.106PRB.usrpb210.conf
+1 -1
View File
@@ -11,7 +11,7 @@ gNBs =
// Tracking area code, 0x0000 and 0xfffe are reserved values // Tracking area code, 0x0000 and 0xfffe are reserved values
tracking_area_code = 1; 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; nr_cellid = 12345678L;
ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml
+1
View File
@@ -248,6 +248,7 @@ services:
GNB_NGA_IP_ADDRESS: 192.168.71.140 GNB_NGA_IP_ADDRESS: 192.168.71.140
GNB_NGU_IF_NAME: eth0 GNB_NGU_IF_NAME: eth0
GNB_NGU_IP_ADDRESS: 192.168.71.140 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 USE_ADDITIONAL_OPTIONS: --sa -E --rfsim --log_config.global_log_options level,nocolor,time
depends_on: depends_on:
- oai-ext-dn - oai-ext-dn
docker/scripts/generateTemplate.py
+5 -2
View File
@@ -90,7 +90,7 @@ def main():
if templine.find(key["key"]) >= 0: if templine.find(key["key"]) >= 0:
if re.search(r'preference', templine): # false positive if re.search(r'preference', templine): # false positive
continue 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 continue
elif re.search('downlink_frequency', line): elif re.search('downlink_frequency', line):
templine = re.sub(r'[0-9]+', key["env"], line) templine = re.sub(r'[0-9]+', key["env"], line)
@@ -106,7 +106,10 @@ def main():
r'\1' + key["env"] + r"\2", templine) r'\1' + key["env"] + r"\2", templine)
# next: matches key = NUMBER # next: matches key = NUMBER
elif re.search(key["key"] + "\s*=\s*[x0-9]+", templine): # x for "0x" hex start 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) outputfile.write(templine)
if __name__ == "__main__": if __name__ == "__main__":
docker/scripts/gnb_entrypoint.sh
+6 -1
View File
@@ -18,8 +18,13 @@ 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. # 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 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:-e00}
NSSAI_SD=${NSSAI_SD:-ffffff}
USE_FQDN=${USE_FQDN:-false}
AMF_FQDN=${AMF_FQDN:-oai-amf-svc} 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 if ($USE_FQDN); then AMF_IP_ADDRESS=(`getent hosts $AMF_FQDN | awk '{print $1}'`); fi
# Only this template will be manipulated # Only this template will be manipulated
docker/scripts/gnb_parameters.yaml
+30
View File
@@ -28,6 +28,8 @@
- filePrefix: gnb.band78.tm1.fr1.106PRB.usrpb210.conf - filePrefix: gnb.band78.tm1.fr1.106PRB.usrpb210.conf
outputfilename: "gnb.nsa.tdd.conf" outputfilename: "gnb.nsa.tdd.conf"
config: config:
- key: gNB_ID
env: "@GNB_ID@"
- key: Active_gNBs - key: Active_gNBs
env: "@GNB_NAME@" env: "@GNB_NAME@"
- key: gNB_name - key: gNB_name
@@ -72,6 +74,8 @@
- filePrefix: gnb.band78.sa.fr1.106PRB.usrpn310.conf - filePrefix: gnb.band78.sa.fr1.106PRB.usrpn310.conf
outputfilename: "gnb.sa.tdd.conf" outputfilename: "gnb.sa.tdd.conf"
config: config:
- key: gNB_ID
env: "@GNB_ID@"
- key: Active_gNBs - key: Active_gNBs
env: "@GNB_NAME@" env: "@GNB_NAME@"
- key: gNB_name - key: gNB_name
@@ -88,6 +92,8 @@
env: "@NSSAI_SST@" env: "@NSSAI_SST@"
- key: sd - key: sd
env: "@NSSAI_SD@" env: "@NSSAI_SD@"
- key: tracking_area_code
env: "@TAC@"
- key: ipv4 - key: ipv4
env: "@AMF_IP_ADDRESS@" env: "@AMF_IP_ADDRESS@"
- key: GNB_INTERFACE_NAME_FOR_NG_AMF - key: GNB_INTERFACE_NAME_FOR_NG_AMF
@@ -98,12 +104,16 @@
env: "@GNB_NGU_IF_NAME@" env: "@GNB_NGU_IF_NAME@"
- key: GNB_IPV4_ADDRESS_FOR_NGU - key: GNB_IPV4_ADDRESS_FOR_NGU
env: "@GNB_NGU_IP_ADDRESS@" env: "@GNB_NGU_IP_ADDRESS@"
- key: sdr_addrs
env: "@SDR_ADDRS@"
- key: parallel_config - key: parallel_config
env: "@THREAD_PARALLEL_CONFIG@" env: "@THREAD_PARALLEL_CONFIG@"
- filePrefix: gnb.sa.band78.fr1.106PRB.usrpb210.conf - filePrefix: gnb.sa.band78.fr1.106PRB.usrpb210.conf
outputfilename: "gnb.sa.tdd.b2xx.conf" outputfilename: "gnb.sa.tdd.b2xx.conf"
config: config:
- key: gNB_ID
env: "@GNB_ID@"
- key: Active_gNBs - key: Active_gNBs
env: "@GNB_NAME@" env: "@GNB_NAME@"
- key: gNB_name - key: gNB_name
@@ -118,6 +128,10 @@
env: "@TAC@" env: "@TAC@"
- key: sst - key: sst
env: "@NSSAI_SST@" env: "@NSSAI_SST@"
- key: sd
env: "@NSSAI_SD@"
- key: tracking_area_code
env: "@TAC@"
- key: ipv4 - key: ipv4
env: "@AMF_IP_ADDRESS@" env: "@AMF_IP_ADDRESS@"
- key: GNB_INTERFACE_NAME_FOR_NG_AMF - key: GNB_INTERFACE_NAME_FOR_NG_AMF
@@ -134,6 +148,8 @@
- filePrefix: gnb.sa.band66.fr1.106PRB.usrpn300.conf - filePrefix: gnb.sa.band66.fr1.106PRB.usrpn300.conf
outputfilename: "gnb.sa.fdd.conf" outputfilename: "gnb.sa.fdd.conf"
config: config:
- key: gNB_ID
env: "@GNB_ID@"
- key: Active_gNBs - key: Active_gNBs
env: "@GNB_NAME@" env: "@GNB_NAME@"
- key: gNB_name - key: gNB_name
@@ -150,6 +166,8 @@
env: "@NSSAI_SST@" env: "@NSSAI_SST@"
- key: sd - key: sd
env: "@NSSAI_SD@" env: "@NSSAI_SD@"
- key: tracking_area_code
env: "@TAC@"
- key: ipv4 - key: ipv4
env: "@AMF_IP_ADDRESS@" env: "@AMF_IP_ADDRESS@"
- key: GNB_INTERFACE_NAME_FOR_NG_AMF - key: GNB_INTERFACE_NAME_FOR_NG_AMF
@@ -166,6 +184,8 @@
- filePrefix: gNB_SA_CU.conf - filePrefix: gNB_SA_CU.conf
outputfilename: "gnb.sa.cu.conf" outputfilename: "gnb.sa.cu.conf"
config: config:
- key: gNB_ID
env: "@GNB_ID@"
- key: Active_gNBs - key: Active_gNBs
env: "@GNB_NAME@" env: "@GNB_NAME@"
- key: gNB_name - key: gNB_name
@@ -182,6 +202,8 @@
env: "@NSSAI_SST@" env: "@NSSAI_SST@"
- key: sd - key: sd
env: "@NSSAI_SD@" env: "@NSSAI_SD@"
- key: tracking_area_code
env: "@TAC@"
- key: ipv4 - key: ipv4
env: "@AMF_IP_ADDRESS@" env: "@AMF_IP_ADDRESS@"
- key: GNB_INTERFACE_NAME_FOR_NG_AMF - key: GNB_INTERFACE_NAME_FOR_NG_AMF
@@ -206,6 +228,8 @@
- filePrefix: gNB_SA_DU.conf - filePrefix: gNB_SA_DU.conf
outputfilename: "gnb.sa.du.tdd.conf" outputfilename: "gnb.sa.du.tdd.conf"
config: config:
- key: gNB_ID
env: "@GNB_ID@"
- key: Active_gNBs - key: Active_gNBs
env: "@GNB_NAME@" env: "@GNB_NAME@"
- key: gNB_name - key: gNB_name
@@ -222,6 +246,8 @@
env: "@NSSAI_SST@" env: "@NSSAI_SST@"
- key: sd - key: sd
env: "@NSSAI_SD@" env: "@NSSAI_SD@"
- key: tracking_area_code
env: "@TAC@"
- key: ipv4 - key: ipv4
env: "@AMF_IP_ADDRESS@" env: "@AMF_IP_ADDRESS@"
- key: GNB_INTERFACE_NAME_FOR_NG_AMF - key: GNB_INTERFACE_NAME_FOR_NG_AMF
@@ -248,6 +274,8 @@
- filePrefix: proxy_gnb.band78.sa.fr1.106PRB.usrpn310.conf - filePrefix: proxy_gnb.band78.sa.fr1.106PRB.usrpn310.conf
outputfilename: "gnb.sa.nfapi.vnf.conf" outputfilename: "gnb.sa.nfapi.vnf.conf"
config: config:
- key: gNB_ID
env: "@GNB_ID@"
- key: Active_gNBs - key: Active_gNBs
env: "@GNB_NAME@" env: "@GNB_NAME@"
- key: gNB_name - key: gNB_name
@@ -264,6 +292,8 @@
env: "@NSSAI_SST@" env: "@NSSAI_SST@"
- key: sd - key: sd
env: "@NSSAI_SD@" env: "@NSSAI_SD@"
- key: tracking_area_code
env: "@TAC@"
- key: ipv4 - key: ipv4
env: "@AMF_IP_ADDRESS@" env: "@AMF_IP_ADDRESS@"
- key: GNB_INTERFACE_NAME_FOR_NG_AMF - key: GNB_INTERFACE_NAME_FOR_NG_AMF