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

Merge remote-tracking branch 'origin/fix-regression-4G' into integration_2024_w44 (!3008)

Browse Source 
Fix Regression 4G

- Fix various bugs and/or regressions in 4G code
- Also, the CI does not test RFsim 4G with --sanitize, enables this to
  detect problems.
This commit is contained in:
Robert Schmidt
2024-11-04 19:43:52 +01:00
parent 01aadcac1f 538c115fb7
commit f216c47ace
58 changed files with 363 additions and 470 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ci-scripts/cls_containerize.py
+6 -2
View File
@@ -52,7 +52,7 @@ import cls_oaicitest
# Helper functions used here and in other classes
# (e.g., cls_cluster.py)
#-----------------------------------------------------------
IMAGES = ['oai-enb', 'oai-lte-ru', 'oai-lte-ue', 'oai-gnb', 'oai-nr-cuup', 'oai-gnb-aw2s', 'oai-nr-ue', 'oai-gnb-asan', 'oai-nr-ue-asan', 'oai-nr-cuup-asan', 'oai-gnb-aerial', 'oai-gnb-fhi72']
IMAGES = ['oai-enb', 'oai-lte-ru', 'oai-lte-ue', 'oai-gnb', 'oai-nr-cuup', 'oai-gnb-aw2s', 'oai-nr-ue', 'oai-enb-asan', 'oai-gnb-asan', 'oai-lte-ue-asan', 'oai-nr-ue-asan', 'oai-nr-cuup-asan', 'oai-gnb-aerial', 'oai-gnb-fhi72']
def CreateWorkspace(host, sourcePath, ranRepository, ranCommitID, ranTargetBranch, ranAllowMerge):
if ranCommitID == '':
@@ -208,7 +208,9 @@ def WriteEnvFile(ssh, services, wd, tag):
ret = ssh.run(f'docker image inspect {checkimg}', reportNonZero=False)
if ret.returncode == 0:
logging.info(f"detected pulled image {checkimg}")
if "oai-gnb" in image: envs["GNB_IMG"] = "oai-gnb-asan"
if "oai-enb" in image: envs["ENB_IMG"] = "oai-enb-asan"
elif "oai-gnb" in image: envs["GNB_IMG"] = "oai-gnb-asan"
elif "oai-lte-ue" in image: envs["LTEUE_IMG"] = "oai-lte-ue-asan"
elif "oai-nr-ue" in image: envs["NRUE_IMG"] = "oai-nr-ue-asan"
elif "oai-nr-cuup" in image: envs["NRCUUP_IMG"] = "oai-nr-cuup-asan"
else: logging.warning("undetected image format {image}, cannot use asan")
@@ -415,7 +417,9 @@ class Containerize():
imageNames.append(('oai-gnb-aerial', 'gNB.aerial', 'oai-gnb-aerial', ''))
# Building again the 5G images with Address Sanitizer
imageNames.append(('ran-build', 'build', 'ran-build-asan', '--build-arg "BUILD_OPTION=--sanitize"'))
imageNames.append(('oai-enb', 'eNB', 'oai-enb-asan', '--build-arg "BUILD_OPTION=--sanitize"'))
imageNames.append(('oai-gnb', 'gNB', 'oai-gnb-asan', '--build-arg "BUILD_OPTION=--sanitize"'))
imageNames.append(('oai-lte-ue', 'lteUE', 'oai-lte-ue-asan', '--build-arg "BUILD_OPTION=--sanitize"'))
imageNames.append(('oai-nr-ue', 'nrUE', 'oai-nr-ue-asan', '--build-arg "BUILD_OPTION=--sanitize"'))
imageNames.append(('oai-nr-cuup', 'nr-cuup', 'oai-nr-cuup-asan', '--build-arg "BUILD_OPTION=--sanitize"'))
imageNames.append(('ran-build-fhi72', 'build.fhi72', 'ran-build-fhi72', ''))
ci-scripts/conf_files/enb-rcc.band7.25prb.tm1.if4p5.conf
+1 -1
View File
@@ -228,7 +228,7 @@ RUs = (
nb_tx = 1
nb_rx = 1
att_tx = 0
att_rx = 0;
att_rx = 6;
eNB_instances = [0];
}
);
ci-scripts/conf_files/enb.band40.100prb.usrpb200.tm1-defaultscheduler.conf
+1 -1
View File
@@ -191,7 +191,7 @@ RUs = (
nb_tx = 1
nb_rx = 1
att_tx = 6
att_rx = 6;
att_rx = 12;
bands = [38];
max_pdschReferenceSignalPower = -27;
max_rxgain = 125;
ci-scripts/conf_files/enb.band40.25prb.usrpb200.conf
+1 -1
View File
@@ -191,7 +191,7 @@ RUs = (
nb_tx = 1
nb_rx = 1
att_tx = 6
att_rx = 6;
att_rx = 12;
bands = [38];
max_pdschReferenceSignalPower = -27;
max_rxgain = 125;
ci-scripts/conf_files/enb.band7.100prb.rfsim.conf
+1 -1
View File
@@ -224,7 +224,7 @@ RUs =
nb_tx = 1
nb_rx = 1
att_tx = 3
att_rx = 0;
att_rx = 6;
bands = [7];
max_pdschReferenceSignalPower = -27;
max_rxgain = 115;
ci-scripts/conf_files/enb.band7.100prb.usrpb200.tm1.conf
+1 -1
View File
@@ -224,7 +224,7 @@ RUs =
nb_tx = 1
nb_rx = 1
att_tx = 3
att_rx = 0;
att_rx = 6;
bands = [7];
max_pdschReferenceSignalPower = -27;
max_rxgain = 115;
ci-scripts/conf_files/enb.band7.25prb.rfsim.conf
+1 -1
View File
@@ -224,7 +224,7 @@ RUs =
nb_tx = 1
nb_rx = 1
att_tx = 3
att_rx = 0;
att_rx = 6;
bands = [7];
max_pdschReferenceSignalPower = -27;
max_rxgain = 115;
ci-scripts/conf_files/enb.band7.25prb.rfsim.nos1.conf
+1 -1
View File
@@ -224,7 +224,7 @@ RUs =
nb_tx = 1
nb_rx = 1
att_tx = 3
att_rx = 0;
att_rx = 6;
bands = [7];
max_pdschReferenceSignalPower = -27;
max_rxgain = 115;
ci-scripts/conf_files/enb.band7.50prb.rfsim.conf
+1 -1
View File
@@ -224,7 +224,7 @@ RUs =
nb_tx = 1
nb_rx = 1
att_tx = 3
att_rx = 0;
att_rx = 6;
bands = [7];
max_pdschReferenceSignalPower = -27;
max_rxgain = 115;
ci-scripts/conf_files/enb.band7.50prb.usrpb200.tm1.conf
+1 -1
View File
@@ -224,7 +224,7 @@ RUs =
nb_tx = 1
nb_rx = 1
att_tx = 3
att_rx = 0;
att_rx = 6;
bands = [7];
max_pdschReferenceSignalPower = -27;
max_rxgain = 115;
ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz.xml
+1 -1
View File
@@ -53,7 +53,7 @@
<class>Pull_Local_Registry</class>
<desc>Pull Images from Local Registry</desc>
<test_svr_id>0</test_svr_id>
<images_to_pull>oai-enb oai-lte-ue</images_to_pull>
<images_to_pull>oai-enb-asan oai-lte-ue-asan</images_to_pull>
</testCase>
<testCase id="000011">
ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1.xml
+1 -1
View File
@@ -44,7 +44,7 @@
<class>Pull_Local_Registry</class>
<desc>Pull Images from Local Registry</desc>
<test_svr_id>0</test_svr_id>
<images_to_pull>oai-enb oai-lte-ue</images_to_pull>
<images_to_pull>oai-enb-asan oai-lte-ue-asan</images_to_pull>
</testCase>
<testCase id="800813">
<class>Create_Workspace</class>
ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz.xml
+1 -1
View File
@@ -48,7 +48,7 @@
<class>Pull_Local_Registry</class>
<desc>Pull Images from Local Registry</desc>
<test_svr_id>0</test_svr_id>
<images_to_pull>oai-enb oai-lte-ue</images_to_pull>
<images_to_pull>oai-enb-asan oai-lte-ue-asan</images_to_pull>
</testCase>
<testCase id="800813">
<class>Create_Workspace</class>
ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz.xml
+1 -1
View File
@@ -48,7 +48,7 @@
<class>Pull_Local_Registry</class>
<desc>Pull Images from Local Registry</desc>
<test_svr_id>0</test_svr_id>
<images_to_pull>oai-enb oai-lte-ue</images_to_pull>
<images_to_pull>oai-enb-asan oai-lte-ue-asan</images_to_pull>
</testCase>
<testCase id="800813">
<class>Create_Workspace</class>
ci-scripts/xml_files/container_4g_rfsim_fembms.xml
+1 -1
View File
@@ -41,7 +41,7 @@
<class>Pull_Local_Registry</class>
<desc>Pull Images from Local Registry</desc>
<test_svr_id>0</test_svr_id>
<images_to_pull>oai-enb oai-lte-ue</images_to_pull>
<images_to_pull>oai-enb-asan oai-lte-ue-asan</images_to_pull>
</testCase>
<testCase id="800813">
<class>Create_Workspace</class>
ci-scripts/xml_files/container_4g_rfsim_mbms.xml
+1 -1
View File
@@ -41,7 +41,7 @@
<class>Pull_Local_Registry</class>
<desc>Pull Images from Local Registry</desc>
<test_svr_id>0</test_svr_id>
<images_to_pull>oai-enb oai-lte-ue</images_to_pull>
<images_to_pull>oai-enb-asan oai-lte-ue-asan</images_to_pull>
</testCase>
<testCase id="800813">
<class>Create_Workspace</class>
ci-scripts/yaml_files/4g_l2sim_fdd/docker-compose.yml
+3 -3
View File
@@ -178,7 +178,7 @@ services:
retries: 5
oai_enb:
image: ${REGISTRY:-oaisoftwarealliance}/oai-enb:${TAG:-develop}
image: ${REGISTRY:-oaisoftwarealliance}/${ENB_IMG:-oai-enb}:${TAG:-develop}
privileged: true
container_name: l2sim4g-oai-enb
network_mode: "host"
@@ -210,7 +210,7 @@ services:
retries: 5
oai_ue1:
image: ${REGISTRY:-oaisoftwarealliance}/oai-lte-ue:${TAG:-develop}
image: ${REGISTRY:-oaisoftwarealliance}/${LTEUE_IMG:-oai-lte-ue}:${TAG:-develop}
privileged: true
container_name: l2sim4g-oai-lte-ue1
network_mode: "host"
@@ -229,7 +229,7 @@ services:
retries: 5
oai_ue2:
image: ${REGISTRY:-oaisoftwarealliance}/oai-lte-ue:${TAG:-develop}
image: ${REGISTRY:-oaisoftwarealliance}/${LTEUE_IMG:-oai-lte-ue}:${TAG:-develop}
privileged: true
container_name: l2sim4g-oai-lte-ue2
network_mode: "host"
ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/docker-compose.yml
+4 -2
View File
@@ -178,7 +178,7 @@ services:
retries: 5
oai_enb0:
image: ${REGISTRY:-oaisoftwarealliance}/oai-enb:${TAG:-develop}
image: ${REGISTRY:-oaisoftwarealliance}/${ENB_IMG:-oai-enb}:${TAG:-develop}
privileged: true
container_name: rfsim4g-oai-enb
networks:
@@ -186,6 +186,7 @@ services:
ipv4_address: 192.168.61.20
environment:
TZ: Europe/Paris
ASAN_OPTIONS: detect_leaks=0
USE_ADDITIONAL_OPTIONS: --rfsim --log_config.global_log_options level,nocolor,time
volumes:
- ../../conf_files/enb.band7.25prb.rfsim.conf:/opt/oai-enb/etc/enb.conf
@@ -196,7 +197,7 @@ services:
retries: 5
oai_ue0:
image: ${REGISTRY:-oaisoftwarealliance}/oai-lte-ue:${TAG:-develop}
image: ${REGISTRY:-oaisoftwarealliance}/${LTEUE_IMG:-oai-lte-ue}:${TAG:-develop}
privileged: true
container_name: rfsim4g-oai-lte-ue0
networks:
@@ -206,6 +207,7 @@ services:
- "10000"
environment:
TZ: Europe/Paris
ASAN_OPTIONS: detect_leaks=0
USE_ADDITIONAL_OPTIONS: --rfsim -C 2680000000 -r 25 --ue-rxgain 140 --ue-txgain 120 --rfsimulator.serveraddr 192.168.61.20 --log_config.global_log_options level,nocolor,time
volumes:
- ../../conf_files/lteue.usim-ci.conf:/opt/oai-lte-ue/etc/ue_usim.conf
ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz_noS1/docker-compose.yml
+4 -2
View File
@@ -1,6 +1,6 @@
services:
oai_enb0:
image: ${REGISTRY:-oaisoftwarealliance}/oai-enb:${TAG:-develop}
image: ${REGISTRY:-oaisoftwarealliance}/${ENB_IMG:-oai-enb}:${TAG:-develop}
privileged: true
container_name: rfsim4g-oai-enb
networks:
@@ -8,6 +8,7 @@ services:
ipv4_address: 192.168.61.20
environment:
TZ: Europe/Paris
ASAN_OPTIONS: detect_leaks=0
USE_ADDITIONAL_OPTIONS: --rfsim --log_config.global_log_options level,nocolor,time --noS1
volumes:
- ../../conf_files/enb.band7.25prb.rfsim.nos1.conf:/opt/oai-enb/etc/enb.conf
@@ -18,7 +19,7 @@ services:
retries: 5
oai_ue0:
image: ${REGISTRY:-oaisoftwarealliance}/oai-lte-ue:${TAG:-develop}
image: ${REGISTRY:-oaisoftwarealliance}/${LTEUE_IMG:-oai-lte-ue}:${TAG:-develop}
privileged: true
container_name: rfsim4g-oai-lte-ue0
networks:
@@ -28,6 +29,7 @@ services:
- "10000"
environment:
TZ: Europe/Paris
ASAN_OPTIONS: detect_leaks=0
USE_ADDITIONAL_OPTIONS: --rfsim -C 2680000000 -r 25 --ue-rxgain 140 --ue-txgain 120 --rfsimulator.serveraddr 192.168.61.20 --log_config.global_log_options level,nocolor,time --noS1
volumes:
- ../../conf_files/lteue.usim-ci.conf:/opt/oai-lte-ue/etc/ue_usim.conf
ci-scripts/yaml_files/4g_rfsimulator_fdd_10MHz/docker-compose.yml
+4 -2
View File
@@ -178,7 +178,7 @@ services:
retries: 5
oai_enb0:
image: ${REGISTRY:-oaisoftwarealliance}/oai-enb:${TAG:-develop}
image: ${REGISTRY:-oaisoftwarealliance}/${ENB_IMG:-oai-enb}:${TAG:-develop}
privileged: true
container_name: rfsim4g-oai-enb
networks:
@@ -186,6 +186,7 @@ services:
ipv4_address: 192.168.61.20
environment:
TZ: Europe/Paris
ASAN_OPTIONS: detect_leaks=0
USE_ADDITIONAL_OPTIONS: --rfsim --log_config.global_log_options level,nocolor,time
volumes:
- ../../conf_files/enb.band7.50prb.rfsim.conf:/opt/oai-enb/etc/enb.conf
@@ -196,7 +197,7 @@ services:
retries: 5
oai_ue0:
image: ${REGISTRY:-oaisoftwarealliance}/oai-lte-ue:${TAG:-develop}
image: ${REGISTRY:-oaisoftwarealliance}/${LTEUE_IMG:-oai-lte-ue}:${TAG:-develop}
privileged: true
container_name: rfsim4g-oai-lte-ue0
networks:
@@ -206,6 +207,7 @@ services:
- "10000"
environment:
TZ: Europe/Paris
ASAN_OPTIONS: detect_leaks=0
USE_ADDITIONAL_OPTIONS: --rfsim -C 2680000000 -r 50 --ue-rxgain 140 --ue-txgain 120 --rfsimulator.serveraddr 192.168.61.20 --log_config.global_log_options level,nocolor,time
volumes:
- ../../conf_files/lteue.usim-ci.conf:/opt/oai-lte-ue/etc/ue_usim.conf
ci-scripts/yaml_files/4g_rfsimulator_fdd_20MHz/docker-compose.yml
+4 -2
View File
@@ -178,7 +178,7 @@ services:
retries: 5
oai_enb0:
image: ${REGISTRY:-oaisoftwarealliance}/oai-enb:${TAG:-develop}
image: ${REGISTRY:-oaisoftwarealliance}/${ENB_IMG:-oai-enb}:${TAG:-develop}
privileged: true
container_name: rfsim4g-oai-enb
networks:
@@ -186,6 +186,7 @@ services:
ipv4_address: 192.168.61.20
environment:
TZ: Europe/Paris
ASAN_OPTIONS: detect_leaks=0
USE_ADDITIONAL_OPTIONS: --rfsim --log_config.global_log_options level,nocolor,time
volumes:
- ../../conf_files/enb.band7.100prb.rfsim.conf:/opt/oai-enb/etc/enb.conf
@@ -196,7 +197,7 @@ services:
retries: 5
oai_ue0:
image: ${REGISTRY:-oaisoftwarealliance}/oai-lte-ue:${TAG:-develop}
image: ${REGISTRY:-oaisoftwarealliance}/${LTEUE_IMG:-oai-lte-ue}:${TAG:-develop}
privileged: true
container_name: rfsim4g-oai-lte-ue0
networks:
@@ -206,6 +207,7 @@ services:
- "10000"
environment:
TZ: Europe/Paris
ASAN_OPTIONS: detect_leaks=0
USE_ADDITIONAL_OPTIONS: --rfsim -C 2680000000 -r 100 --ue-rxgain 140 --ue-txgain 120 --rfsimulator.serveraddr 192.168.61.20 --log_config.global_log_options level,nocolor,time
volumes:
- ../../conf_files/lteue.usim-ci.conf:/opt/oai-lte-ue/etc/ue_usim.conf
ci-scripts/yaml_files/4g_rfsimulator_fembms/docker-compose.yml
+4 -2
View File
@@ -1,6 +1,6 @@
services:
oai_enb0:
image: ${REGISTRY:-oaisoftwarealliance}/oai-enb:${TAG:-develop}
image: ${REGISTRY:-oaisoftwarealliance}/${ENB_IMG:-oai-enb}:${TAG:-develop}
privileged: true
container_name: rfsim4g-oai-enb
networks:
@@ -8,6 +8,7 @@ services:
ipv4_address: 192.168.61.20
environment:
TZ: Europe/Paris
ASAN_OPTIONS: detect_leaks=0
USE_ADDITIONAL_OPTIONS: --rfsim --noS1 --eNBs.[0].component_carriers.[0].mbms_dedicated_serving_cell ENABLE --log_config.global_log_options level,nocolor,time
volumes:
- ../../conf_files/enb.band7.tm1.25prb.rfsim.mbms.conf:/opt/oai-enb/etc/enb.conf
@@ -18,7 +19,7 @@ services:
retries: 5
oai_ue0:
image: ${REGISTRY:-oaisoftwarealliance}/oai-lte-ue:${TAG:-develop}
image: ${REGISTRY:-oaisoftwarealliance}/${LTEUE_IMG:-oai-lte-ue}:${TAG:-develop}
privileged: true
container_name: rfsim4g-oai-lte-ue0
networks:
@@ -26,6 +27,7 @@ services:
ipv4_address: 192.168.61.30
environment:
TZ: Europe/Paris
ASAN_OPTIONS: detect_leaks=0
USE_ADDITIONAL_OPTIONS: -C 2680000000 -r 25 --ue-rxgain 140 --ue-txgain 120 --rfsim --noS1 --rfsimulator.serveraddr 192.168.61.20 --log_config.global_log_options level,nocolor,time --noS1
volumes:
- ../../conf_files/lteue.usim-mbs.conf:/opt/oai-lte-ue/etc/ue_usim.conf
ci-scripts/yaml_files/4g_rfsimulator_mbms/docker-compose.yml
+4 -2
View File
@@ -1,6 +1,6 @@
services:
oai_enb0:
image: ${REGISTRY:-oaisoftwarealliance}/oai-enb:${TAG:-develop}
image: ${REGISTRY:-oaisoftwarealliance}/${ENB_IMG:-oai-enb}:${TAG:-develop}
privileged: true
container_name: rfsim4g-oai-enb
networks:
@@ -8,6 +8,7 @@ services:
ipv4_address: 192.168.61.20
environment:
TZ: Europe/Paris
ASAN_OPTIONS: detect_leaks=0
USE_ADDITIONAL_OPTIONS: --rfsim --noS1 --log_config.global_log_options level,nocolor,time
volumes:
- ../../conf_files/enb.band7.tm1.25prb.rfsim.mbms.conf:/opt/oai-enb/etc/enb.conf
@@ -18,7 +19,7 @@ services:
retries: 5
oai_ue0:
image: ${REGISTRY:-oaisoftwarealliance}/oai-lte-ue:${TAG:-develop}
image: ${REGISTRY:-oaisoftwarealliance}/${LTEUE_IMG:-oai-lte-ue}:${TAG:-develop}
privileged: true
container_name: rfsim4g-oai-lte-ue0
networks:
@@ -31,6 +32,7 @@ services:
environment:
TZ: Europe/Paris
HOSTNAME: oai_ue0
ASAN_OPTIONS: detect_leaks=0
USE_ADDITIONAL_OPTIONS: -C 2680000000 -r 25 --ue-rxgain 140 --ue-txgain 120 --rfsim --noS1 --rfsimulator.serveraddr 192.168.61.20 --log_config.global_log_options level,nocolor,time --noS1
volumes:
- ../../conf_files/lteue.usim-mbs.conf:/opt/oai-lte-ue/etc/ue_usim.conf
ci-scripts/yaml_files/4g_rfsimulator_tdd_05MHz/docker-compose.yml
+4 -2
View File
@@ -178,7 +178,7 @@ services:
retries: 5
oai_enb0:
image: ${REGISTRY:-oaisoftwarealliance}/oai-enb:${TAG:-develop}
image: ${REGISTRY:-oaisoftwarealliance}/${ENB_IMG:-oai-enb}:${TAG:-develop}
privileged: true
container_name: rfsim4g-oai-enb
networks:
@@ -186,6 +186,7 @@ services:
ipv4_address: 192.168.61.20
environment:
TZ: Europe/Paris
ASAN_OPTIONS: detect_leaks=0
USE_ADDITIONAL_OPTIONS: --rfsim --log_config.global_log_options level,nocolor,time
volumes:
- ../../conf_files/enb.band38.25prb.rfsim.conf:/opt/oai-enb/etc/enb.conf
@@ -196,7 +197,7 @@ services:
retries: 5
oai_ue0:
image: ${REGISTRY:-oaisoftwarealliance}/oai-lte-ue:${TAG:-develop}
image: ${REGISTRY:-oaisoftwarealliance}/${LTEUE_IMG:-oai-lte-ue}:${TAG:-develop}
privileged: true
container_name: rfsim4g-oai-lte-ue0
networks:
@@ -206,6 +207,7 @@ services:
- "10000"
environment:
TZ: Europe/Paris
ASAN_OPTIONS: detect_leaks=0
USE_ADDITIONAL_OPTIONS: --rfsim -T -C 2605000000 -r 25 --ue-rxgain 140 --ue-txgain 120 --rfsimulator.serveraddr 192.168.61.20 --log_config.global_log_options level,nocolor,time
volumes:
- ../../conf_files/lteue.usim-ci.conf:/opt/oai-lte-ue/etc/ue_usim.conf