From bdfe516aa7d7072c0c76f1122dd450c3b308ee17 Mon Sep 17 00:00:00 2001 From: maki Date: Mon, 1 Dec 2025 19:12:08 +0900 Subject: [PATCH] update --- .../gnb.sa.band78.106prb.rfsim.2x2.conf | 4 +-- .../5g_rfsimulator/docker-compose.yaml | 27 ++++++++++--------- common/platform_constants.h | 4 +-- tools/scripts/traffic_runner.sh | 2 +- 4 files changed, 19 insertions(+), 18 deletions(-) diff --git a/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.2x2.conf b/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.2x2.conf index 2227331753..35542cba95 100644 --- a/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.2x2.conf +++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.2x2.conf @@ -60,7 +60,7 @@ gNBs = #initialDownlinkBWP #genericParameters # this is RBstart=27,L=48 (275*(L-1))+RBstart - initialDLBWPlocationAndBandwidth = 28875; # 6366 12925 12956 28875 12952 + initialDLBWPlocationAndBandwidth = 12956; # 6366 12925 12956 28875 12952 # subcarrierSpacing # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120 initialDLBWPsubcarrierSpacing = 1; @@ -80,7 +80,7 @@ gNBs = pMax = 20; #initialUplinkBWP #genericParameters - initialULBWPlocationAndBandwidth = 28875; + initialULBWPlocationAndBandwidth = 12956; # subcarrierSpacing # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120 initialULBWPsubcarrierSpacing = 1; diff --git a/ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml index f8fc3e4662..37353fb4b7 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml @@ -72,6 +72,7 @@ services: traffic_net: ipv4_address: 192.168.72.134 interface_name: eth1 + oai-ext-dn: privileged: true container_name: oai-ext-dn @@ -100,14 +101,14 @@ services: - ALL depends_on: - oai-ext-dn - command: ["-c", "/oai-ran/cmake_targets/ran_build/build/nr-softmodem -O /opt/oai-gnb/etc/gnb.conf --rfsim --log_config.global_log_options level,nocolor,time"] + command: ["-c", "/oai-ran/cmake_targets/ran_build/build/nr-softmodem -O /opt/oai-gnb/etc/gnb.yaml --rfsim --log_config.global_log_options level,nocolor,time"] networks: public_net: ipv4_address: 192.168.71.140 volumes: # - ../../conf_files/gnb.sa.band78.273prb.rfsim.2x2.conf:/opt/oai-gnb/etc/gnb.conf - # - ../../conf_files/gnb.sa.band78.106prb.rfsim.yaml:/opt/oai-gnb/etc/gnb.yaml - - ../../conf_files/gnb.sa.band78.106prb.rfsim.2x2.conf:/opt/oai-gnb/etc/gnb.conf + - ../../conf_files/gnb.sa.band78.106prb.rfsim.yaml:/opt/oai-gnb/etc/gnb.yaml + # - ../../conf_files/gnb.sa.band78.106prb.rfsim.2x2.conf:/opt/oai-gnb/etc/gnb.conf healthcheck: test: /bin/bash -c "pgrep nr-softmodem" start_period: 10s @@ -156,7 +157,7 @@ services: oai-nr-ue1: image: nakaolab:oct29 - command: ["-c", "stdbuf -oL /oai-ran/cmake_targets/ran_build/build/nr-uesoftmodem --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001100 -C 3319680000 --ssb 516 --ue-nb-ant-tx 2 --ue-nb-ant-rx 2 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time"] + command: ["-c", "stdbuf -oL /oai-ran/cmake_targets/ran_build/build/nr-uesoftmodem --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001100 -C 3319680000 --ssb 516 --uecap_file ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/uecap_ports2.xml --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time"] container_name: oai-nr-ue1 cap_drop: - ALL @@ -182,7 +183,7 @@ services: oai-nr-ue2: image: nakaolab:oct29 - command: ["-c", "stdbuf -oL /oai-ran/cmake_targets/ran_build/build/nr-uesoftmodem --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001101 -C 3319680000 --ssb 516 --ue-nb-ant-tx 2 --ue-nb-ant-rx 2 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time"] + command: ["-c", "stdbuf -oL /oai-ran/cmake_targets/ran_build/build/nr-uesoftmodem --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001101 -C 3319680000 --ssb 516 --uecap_file ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/uecap_ports2.xml --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time"] container_name: oai-nr-ue2 cap_drop: - ALL @@ -208,7 +209,7 @@ services: oai-nr-ue3: image: nakaolab:oct29 - command: ["-c", "stdbuf -oL /oai-ran/cmake_targets/ran_build/build/nr-uesoftmodem --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001102 -C 3319680000 --ssb 516 --ue-nb-ant-tx 2 --ue-nb-ant-rx 2 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time"] + command: ["-c", "stdbuf -oL /oai-ran/cmake_targets/ran_build/build/nr-uesoftmodem --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001102 -C 3319680000 --ssb 516 --uecap_file ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/uecap_ports2.xml --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time"] container_name: oai-nr-ue3 cap_drop: - ALL @@ -234,7 +235,7 @@ services: oai-nr-ue4: image: nakaolab:oct29 - command: ["-c", "stdbuf -oL /oai-ran/cmake_targets/ran_build/build/nr-uesoftmodem --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001103 -C 3319680000 --ssb 516 --ue-nb-ant-tx 2 --ue-nb-ant-rx 2 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time"] + command: ["-c", "stdbuf -oL /oai-ran/cmake_targets/ran_build/build/nr-uesoftmodem --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001103 -C 3319680000 --ssb 516 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time"] container_name: oai-nr-ue4 cap_drop: - ALL @@ -260,7 +261,7 @@ services: oai-nr-ue5: image: nakaolab:oct29 - command: ["-c", "stdbuf -oL /oai-ran/cmake_targets/ran_build/build/nr-uesoftmodem --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001104 -C 3319680000 --ssb 516 --ue-nb-ant-tx 2 --ue-nb-ant-rx 2 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time"] + command: ["-c", "stdbuf -oL /oai-ran/cmake_targets/ran_build/build/nr-uesoftmodem --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001104 -C 3319680000 --ssb 516 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time"] container_name: oai-nr-ue5 cap_drop: - ALL @@ -286,7 +287,7 @@ services: oai-nr-ue6: image: nakaolab:oct29 - command: ["-c", "stdbuf -oL /oai-ran/cmake_targets/ran_build/build/nr-uesoftmodem --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001105 -C 3319680000 --ssb 516 --ue-nb-ant-tx 2 --ue-nb-ant-rx 2 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time"] + command: ["-c", "stdbuf -oL /oai-ran/cmake_targets/ran_build/build/nr-uesoftmodem --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001105 -C 3319680000 --ssb 516 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time"] container_name: oai-nr-ue6 cap_drop: - ALL @@ -312,7 +313,7 @@ services: oai-nr-ue7: image: nakaolab:oct29 - command: ["-c", "stdbuf -oL /oai-ran/cmake_targets/ran_build/build/nr-uesoftmodem --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001100 -C 3319680000 --ssb 516 --ue-nb-ant-tx 2 --ue-nb-ant-rx 2 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time"] + command: ["-c", "stdbuf -oL /oai-ran/cmake_targets/ran_build/build/nr-uesoftmodem --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001100 -C 3319680000 --ssb 516 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time"] container_name: oai-nr-ue7 cap_drop: - ALL @@ -338,7 +339,7 @@ services: oai-nr-ue8: image: nakaolab:oct29 - command: ["-c", "stdbuf -oL /oai-ran/cmake_targets/ran_build/build/nr-uesoftmodem --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001107 -C 3319680000 --ssb 516 --ue-nb-ant-tx 2 --ue-nb-ant-rx 2 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time"] + command: ["-c", "stdbuf -oL /oai-ran/cmake_targets/ran_build/build/nr-uesoftmodem --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001107 -C 3319680000 --ssb 516 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time"] container_name: oai-nr-ue8 cap_drop: - ALL @@ -364,7 +365,7 @@ services: oai-nr-ue9: image: nakaolab:oct29 - command: ["-c", "stdbuf -oL /oai-ran/cmake_targets/ran_build/build/nr-uesoftmodem --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001108 -C 3319680000 --ssb 516 --ue-nb-ant-tx 2 --ue-nb-ant-rx 2 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time"] + command: ["-c", "stdbuf -oL /oai-ran/cmake_targets/ran_build/build/nr-uesoftmodem --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001108 -C 3319680000 --ssb 516 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time"] container_name: oai-nr-ue9 cap_drop: - ALL @@ -390,7 +391,7 @@ services: oai-nr-ue10: image: nakaolab:oct29 - command: ["-c", "stdbuf -oL /oai-ran/cmake_targets/ran_build/build/nr-uesoftmodem --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001109 -C 3319680000 --ssb 516 --ue-nb-ant-tx 2 --ue-nb-ant-rx 2 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time"] + command: ["-c", "stdbuf -oL /oai-ran/cmake_targets/ran_build/build/nr-uesoftmodem --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001109 -C 3319680000 --ssb 516 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time"] container_name: oai-nr-ue10 cap_drop: - ALL diff --git a/common/platform_constants.h b/common/platform_constants.h index db7eaf114e..17eeb25b9d 100644 --- a/common/platform_constants.h +++ b/common/platform_constants.h @@ -83,8 +83,8 @@ #define MAX_NUM_SLICES 1024 // RLC Entity -#define RLC_TX_MAXSIZE 10000 -#define RLC_RX_MAXSIZE 10000 +#define RLC_TX_MAXSIZE 100000 +#define RLC_RX_MAXSIZE 100000 #define SEND_MRW_ON 240 #define MAX_ANT 8 // CBA constant diff --git a/tools/scripts/traffic_runner.sh b/tools/scripts/traffic_runner.sh index bade388b8a..b7178bc820 100755 --- a/tools/scripts/traffic_runner.sh +++ b/tools/scripts/traffic_runner.sh @@ -41,7 +41,7 @@ iperf_udp_ul_forever() { ( iperf -u -c "$IPERF_HOST_UDP" -B "$OAITUN_IP" -p "$IP # ---------------- profiles ---------------- do_boring() { - iperf_udp_ul_forever 10M + iperf_udp_ul_forever 3M wait # iperf -c "$IPERF_HOST" -p "$IPERF_PORT" -B "$OAITUN_IP" -u -b 25M -t "$LONG_T" }