From d96a2522a69658d0c6347e2cb96d78cac465023f Mon Sep 17 00:00:00 2001 From: Jaroslava Fiedlerova Date: Fri, 15 Dec 2023 13:57:01 +0100 Subject: [PATCH 1/4] Enable 2 UL layers for AW2S gNB --- ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.conf | 4 ++-- ci-scripts/xml_files/container_sa_aw2s_asue.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.conf b/ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.conf index 5f6d6a4937..802d2b2290 100644 --- a/ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.conf +++ b/ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.conf @@ -22,9 +22,9 @@ gNBs = ////////// Physical parameters: pdsch_AntennaPorts_XP = 2; - pusch_AntennaPorts = 1; + pusch_AntennaPorts = 2; do_CSIRS = 1; - do_SRS = 0; + do_SRS = 1; servingCellConfigCommon = ( { diff --git a/ci-scripts/xml_files/container_sa_aw2s_asue.xml b/ci-scripts/xml_files/container_sa_aw2s_asue.xml index a7e1dc25df..b918b6a797 100644 --- a/ci-scripts/xml_files/container_sa_aw2s_asue.xml +++ b/ci-scripts/xml_files/container_sa_aw2s_asue.xml @@ -145,8 +145,8 @@ Iperf - iperf (UL/2Mbps/UDP)(30 sec)(multi-ue profile) - -u -b 20M -t 30 -i 1 + iperf (UL/4Mbps/UDP)(30 sec)(multi-ue profile) + -u -b 40M -t 30 -i 1 IPERF3 amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5 amarisoft_ue_6 amarisoft_ue_7 amarisoft_ue_8 amarisoft_ue_9 amarisoft_ue_10 25 From 693f668d450022cca82be201f308a9656ad5d0d1 Mon Sep 17 00:00:00 2001 From: Jaroslava Fiedlerova Date: Wed, 20 Dec 2023 12:57:24 +0100 Subject: [PATCH 2/4] Change AmariUE conf file - use 2 UL antennas --- ci-scripts/ci_ueinfra.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-scripts/ci_ueinfra.yaml b/ci-scripts/ci_ueinfra.yaml index 9d70d9f1c0..f5aabf9167 100644 --- a/ci-scripts/ci_ueinfra.yaml +++ b/ci-scripts/ci_ueinfra.yaml @@ -49,7 +49,7 @@ adb_ue_2: amarisoft_ue: Host: amariue - InitScript: /root/lteue-linux-2023-10-27/ue/lteue /root/oaicicd/ran_sa_aw2s_asue/aw2s-multi-20897-2x2.cfg & + InitScript: /root/lteue-linux-2023-10-27/ue/lteue /root/oaicicd/ran_sa_aw2s_asue_2x2/aw2s-multi-20897-2x2.cfg & TermScript: /root/2023-10-27/libs/ws.js -t 10 127.0.0.1:9002 '{"message":"quit"}' || killall -KILL lteue-avx2 amarisoft_ue_1: Host: amariue From 5b17519e706256adeb31cca94d82cf3a5bc4db07 Mon Sep 17 00:00:00 2001 From: Jaroslava Fiedlerova Date: Wed, 20 Dec 2023 13:14:09 +0100 Subject: [PATCH 3/4] Add new Amariue conf file --- ci-scripts/as_ue/aw2s-multi-20897-2x2.cfg | 281 ++++++++++++++++++++++ 1 file changed, 281 insertions(+) create mode 100644 ci-scripts/as_ue/aw2s-multi-20897-2x2.cfg diff --git a/ci-scripts/as_ue/aw2s-multi-20897-2x2.cfg b/ci-scripts/as_ue/aw2s-multi-20897-2x2.cfg new file mode 100644 index 0000000000..b9707b801e --- /dev/null +++ b/ci-scripts/as_ue/aw2s-multi-20897-2x2.cfg @@ -0,0 +1,281 @@ +/* UE simulator configuration file version 2021-06-17 + * LTE / 5G Non StandAlone + * Copyright (C) 2019-2021 Amarisoft + */ +{ +#define N_ANTENNA_DL 2 +#define N_ANTENNA_UL 2 +#define TDD 1 + +log_options: "all.level=warn,all.max_size=0,nas.level=debug,nas.max_size=1,rrc.level=debug,rrc.max_size=1", +log_filename: "/tmp/ue.log", + +/* Enable remote API and Web interface */ +com_addr: "0.0.0.0:9002", + +include "rf_driver/1chan.cfg", + +/* If true, allow the simulation of several UEs at the same time and +allow dynamic UE creation from remote API */ + + cell_groups: [{ + group_type: "nr", + multi_ue: true, + cells: [{ + rf_port: 0, + bandwidth: 20, + band: 78, + dl_nr_arfcn:627360, + ssb_nr_arfcn:627360, + subcarrier_spacing: 30, + n_antenna_dl: N_ANTENNA_DL, + n_antenna_ul: N_ANTENNA_UL, + rx_to_tx_latency:2, + }], + }], + + /* UE capabilities */ + /* USIM data */ + ue_list: [ + { + "ue_id" : 1, + "imsi": "208970000000111", + "K": "fec86ba6eb707ed08905757b1bb44b8f", + "sim_algo":"milenage", + "op": "1006020f0a478bf6b699f15c062e42b3", + + as_release: 15, + ue_category: "nr", + apn:"oai", + attach_pdn_type:"ipv4", + default_nssai: [ { sst: 1, }, ], + default_pdu_session_snssai: { sst: 1, }, + tun_setup_script: "ue-ifup", + }, + { + "ue_id" : 2, + "imsi": "208970000000112", + "K": "fec86ba6eb707ed08905757b1bb44b8f", + "sim_algo":"milenage", + "op": "1006020f0a478bf6b699f15c062e42b3", + + as_release: 15, + ue_category: "nr", + apn:"oai", + attach_pdn_type:"ipv4", + default_nssai: [ { sst: 1, }, ], + default_pdu_session_snssai: { sst: 1, }, + tun_setup_script: "ue-ifup", + }, + { + "ue_id" : 3, + "imsi": "208970000000113", + "K": "fec86ba6eb707ed08905757b1bb44b8f", + "sim_algo":"milenage", + "op": "1006020f0a478bf6b699f15c062e42b3", + + as_release: 15, + ue_category: "nr", + apn:"oai", + attach_pdn_type:"ipv4", + default_nssai: [ { sst: 1, }, ], + default_pdu_session_snssai: { sst: 1, }, + tun_setup_script: "ue-ifup", + }, + { + "ue_id" : 4, + "imsi": "208970000000114", + "K": "fec86ba6eb707ed08905757b1bb44b8f", + "sim_algo":"milenage", + "op": "1006020f0a478bf6b699f15c062e42b3", + + as_release: 15, + ue_category: "nr", + apn:"oai", + attach_pdn_type:"ipv4", + default_nssai: [ { sst: 1, }, ], + default_pdu_session_snssai: { sst: 1, }, + tun_setup_script: "ue-ifup", + }, + { + "ue_id" : 5, + "imsi": "208970000000115", + "K": "fec86ba6eb707ed08905757b1bb44b8f", + "sim_algo":"milenage", + "op": "1006020f0a478bf6b699f15c062e42b3", + + as_release: 15, + ue_category: "nr", + apn:"oai", + attach_pdn_type:"ipv4", + default_nssai: [ { sst: 1, }, ], + default_pdu_session_snssai: { sst: 1, }, + tun_setup_script: "ue-ifup", + }, + { + "ue_id" : 6, + "imsi": "208970000000116", + "K": "fec86ba6eb707ed08905757b1bb44b8f", + "sim_algo":"milenage", + "op": "1006020f0a478bf6b699f15c062e42b3", + + as_release: 15, + ue_category: "nr", + apn:"oai", + attach_pdn_type:"ipv4", + default_nssai: [ { sst: 1, }, ], + default_pdu_session_snssai: { sst: 1, }, + tun_setup_script: "ue-ifup", + }, + { + "ue_id" : 7, + "imsi": "208970000000100", + "K": "fec86ba6eb707ed08905757b1bb44b8f", + "sim_algo":"milenage", + "op": "1006020f0a478bf6b699f15c062e42b3", + + as_release: 15, + ue_category: "nr", + apn:"oai", + attach_pdn_type:"ipv4", + default_nssai: [ { sst: 1, }, ], + default_pdu_session_snssai: { sst: 1, }, + tun_setup_script: "ue-ifup", + }, + { + "ue_id" : 8, + "imsi": "208970000000102", + "K": "fec86ba6eb707ed08905757b1bb44b8f", + "sim_algo":"milenage", + "op": "1006020f0a478bf6b699f15c062e42b3", + + as_release: 15, + ue_category: "nr", + apn:"oai", + attach_pdn_type:"ipv4", + default_nssai: [ { sst: 1, }, ], + default_pdu_session_snssai: { sst: 1, }, + tun_setup_script: "ue-ifup", + }, + { + "ue_id" : 9, + "imsi": "208970000000103", + "K": "fec86ba6eb707ed08905757b1bb44b8f", + "sim_algo":"milenage", + "op": "1006020f0a478bf6b699f15c062e42b3", + + as_release: 15, + ue_category: "nr", + apn:"oai", + attach_pdn_type:"ipv4", + default_nssai: [ { sst: 1, }, ], + default_pdu_session_snssai: { sst: 1, }, + tun_setup_script: "ue-ifup", + }, + { + "ue_id" : 10, + "imsi": "208970000000104", + "K": "fec86ba6eb707ed08905757b1bb44b8f", + "sim_algo":"milenage", + "op": "1006020f0a478bf6b699f15c062e42b3", + + as_release: 15, + ue_category: "nr", + apn:"oai", + attach_pdn_type:"ipv4", + default_nssai: [ { sst: 1, }, ], + default_pdu_session_snssai: { sst: 1, }, + tun_setup_script: "ue-ifup", + }, + { + "ue_id" : 11, + "imsi": "208970000000110", + "K": "fec86ba6eb707ed08905757b1bb44b8f", + "sim_algo":"milenage", + "op": "1006020f0a478bf6b699f15c062e42b3", + + as_release: 15, + ue_category: "nr", + apn:"oai", + attach_pdn_type:"ipv4", + default_nssai: [ { sst: 1, }, ], + default_pdu_session_snssai: { sst: 1, }, + tun_setup_script: "ue-ifup", + }, + { + "ue_id" : 12, + "imsi": "208970000000105", + "K": "fec86ba6eb707ed08905757b1bb44b8f", + "sim_algo":"milenage", + "op": "1006020f0a478bf6b699f15c062e42b3", + + as_release: 15, + ue_category: "nr", + apn:"oai", + attach_pdn_type:"ipv4", + default_nssai: [ { sst: 1, }, ], + default_pdu_session_snssai: { sst: 1, }, + tun_setup_script: "ue-ifup", + }, + { + "ue_id" : 13, + "imsi": "208970000000106", + "K": "fec86ba6eb707ed08905757b1bb44b8f", + "sim_algo":"milenage", + "op": "1006020f0a478bf6b699f15c062e42b3", + + as_release: 15, + ue_category: "nr", + apn:"oai", + attach_pdn_type:"ipv4", + default_nssai: [ { sst: 1, }, ], + default_pdu_session_snssai: { sst: 1, }, + tun_setup_script: "ue-ifup", + }, + { + "ue_id" : 14, + "imsi": "208970000000107", + "K": "fec86ba6eb707ed08905757b1bb44b8f", + "sim_algo":"milenage", + "op": "1006020f0a478bf6b699f15c062e42b3", + + as_release: 15, + ue_category: "nr", + apn:"oai", + attach_pdn_type:"ipv4", + default_nssai: [ { sst: 1, }, ], + default_pdu_session_snssai: { sst: 1, }, + tun_setup_script: "ue-ifup", + }, + { + "ue_id" : 15, + "imsi": "208970000000108", + "K": "fec86ba6eb707ed08905757b1bb44b8f", + "sim_algo":"milenage", + "op": "1006020f0a478bf6b699f15c062e42b3", + + as_release: 15, + ue_category: "nr", + apn:"oai", + attach_pdn_type:"ipv4", + default_nssai: [ { sst: 1, }, ], + default_pdu_session_snssai: { sst: 1, }, + tun_setup_script: "ue-ifup", + }, + { + "ue_id" : 16, + "imsi": "208970000000109", + "K": "fec86ba6eb707ed08905757b1bb44b8f", + "sim_algo":"milenage", + "op": "1006020f0a478bf6b699f15c062e42b3", + + as_release: 15, + ue_category: "nr", + apn:"oai", + attach_pdn_type:"ipv4", + default_nssai: [ { sst: 1, }, ], + default_pdu_session_snssai: { sst: 1, }, + tun_setup_script: "ue-ifup", + }, + ], +} From 3f94ecf65a45a59a6c4e435d74ce03c1fe50e51d Mon Sep 17 00:00:00 2001 From: Jaroslava Fiedlerova Date: Wed, 20 Dec 2023 16:27:34 +0100 Subject: [PATCH 4/4] Reduce tested UL bitrate in AW2S pipeline --- ci-scripts/xml_files/container_sa_aw2s_asue.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci-scripts/xml_files/container_sa_aw2s_asue.xml b/ci-scripts/xml_files/container_sa_aw2s_asue.xml index b918b6a797..4d81b123e6 100644 --- a/ci-scripts/xml_files/container_sa_aw2s_asue.xml +++ b/ci-scripts/xml_files/container_sa_aw2s_asue.xml @@ -145,8 +145,8 @@ Iperf - iperf (UL/4Mbps/UDP)(30 sec)(multi-ue profile) - -u -b 40M -t 30 -i 1 + iperf (UL/3.6Mbps/UDP)(30 sec)(multi-ue profile) + -u -b 36M -t 30 -i 1 IPERF3 amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5 amarisoft_ue_6 amarisoft_ue_7 amarisoft_ue_8 amarisoft_ue_9 amarisoft_ue_10 25