diff --git a/ci-scripts/as_ue/aw2s-multi-00102-20.cfg b/ci-scripts/as_ue/aw2s-multi-00102-20.cfg
new file mode 100644
index 0000000000..48901cf6f0
--- /dev/null
+++ b/ci-scripts/as_ue/aw2s-multi-00102-20.cfg
@@ -0,0 +1,284 @@
+/* UE simulator configuration file version 2021-06-17
+ * LTE / 5G Non StandAlone
+ * Copyright (C) 2019-2021 Amarisoft
+ */
+{
+#define N_ANTENNA_DL 1
+#define N_ANTENNA_UL 1
+#define DL_ARFCN 631296
+#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_20/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,
+ ldpc_max_its:8,
+ cells: [{
+ rf_port: 0,
+ bandwidth: 20,
+ band: 78,
+ dl_nr_arfcn: DL_ARFCN,
+ ssb_nr_arfcn: DL_ARFCN,
+ subcarrier_spacing: 30,
+ n_antenna_dl: N_ANTENNA_DL,
+ n_antenna_ul: N_ANTENNA_UL,
+ rx_to_tx_latency:2,
+ global_timing_advance:-1,
+ }],
+ }],
+
+ /* UE capabilities */
+ /* USIM data */
+ ue_list: [
+ {
+ "ue_id" : 1,
+ "imsi": "001020000000001",
+ "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": "001020000000002",
+ "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": "001020000000003",
+ "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": "001020000000004",
+ "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": "001020000000005",
+ "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": "001020000000006",
+ "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": "001020000000007",
+ "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": "001020000000008",
+ "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": "001020000000009",
+ "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": "001020000000010",
+ "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": "001020000000011",
+ "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": "001020000000012",
+ "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": "001020000000013",
+ "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": "001020000000014",
+ "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": "001020000000015",
+ "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": "001020000000016",
+ "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",
+ },
+ ],
+}
diff --git a/ci-scripts/as_ue/aw2s-multi-00102-2x2.cfg b/ci-scripts/as_ue/aw2s-multi-00102-2x2-v2.cfg
similarity index 98%
rename from ci-scripts/as_ue/aw2s-multi-00102-2x2.cfg
rename to ci-scripts/as_ue/aw2s-multi-00102-2x2-v2.cfg
index 04d2bb9ffd..b70ffbb0af 100644
--- a/ci-scripts/as_ue/aw2s-multi-00102-2x2.cfg
+++ b/ci-scripts/as_ue/aw2s-multi-00102-2x2-v2.cfg
@@ -5,6 +5,7 @@
{
#define N_ANTENNA_DL 2
#define N_ANTENNA_UL 2
+#define DL_ARFCN 631296
#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",
@@ -25,8 +26,8 @@ allow dynamic UE creation from remote API */
rf_port: 0,
bandwidth: 20,
band: 78,
- dl_nr_arfcn:630048,
- ssb_nr_arfcn:630048,
+ dl_nr_arfcn: DL_ARFCN,
+ ssb_nr_arfcn: DL_ARFCN,
subcarrier_spacing: 30,
n_antenna_dl: N_ANTENNA_DL,
n_antenna_ul: N_ANTENNA_UL,
diff --git a/ci-scripts/ci_infra.yaml b/ci-scripts/ci_infra.yaml
index 1bc26659c6..65c7c464b6 100644
--- a/ci-scripts/ci_infra.yaml
+++ b/ci-scripts/ci_infra.yaml
@@ -111,7 +111,11 @@ ltebox-nepes:
amarisoft_ue:
Host: amariue
- InitScript: /root/lteue-linux-2023-10-27/ue/lteue /root/oaicicd/ran_sa_aw2s_asue_2x2/aw2s-multi-00102-2x2.cfg &
+ InitScript: /root/lteue-linux-2023-10-27/ue/lteue /root/oaicicd/ran_sa_aw2s_asue/aw2s-multi-00102-20.cfg &
+ TermScript: /root/2023-10-27/libs/ws.js -t 10 127.0.0.1:9002 '{"message":"quit"}' || killall -KILL lteue-avx2
+amarisoft_ue_2x2:
+ Host: amariue
+ InitScript: /root/lteue-linux-2023-10-27/ue/lteue /root/oaicicd/ran_sa_aw2s_asue_2x2/aw2s-multi-00102-2x2-v2.cfg &
TermScript: /root/2023-10-27/libs/ws.js -t 10 127.0.0.1:9002 '{"message":"quit"}' || killall -KILL lteue-avx2
amarisoft_ue_fhi72:
Host: amariue
diff --git a/ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.2x2.conf b/ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.2x2.conf
new file mode 100644
index 0000000000..a32aec583a
--- /dev/null
+++ b/ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.2x2.conf
@@ -0,0 +1,272 @@
+Active_gNBs = ( "gNB-Eurecom-n78_20");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+#device :{
+# name = "aw2sori_transpro";
+#}
+
+gNBs =
+(
+ {
+ ////////// Identification parameters:
+ gNB_ID = 0xe00;
+
+ gNB_name = "gNB-Eurecom-n78_20";
+
+ // Tracking area code, 0x0000 and 0xfffe are reserved values
+ tracking_area_code = 0x1;
+ plmn_list = ({ mcc = 001; mnc = 02; mnc_length = 2; snssaiList = ({ sst =0x1; }) });
+
+ nr_cellid = 12345678L
+
+ ////////// Physical parameters:
+ pdsch_AntennaPorts_XP = 2;
+ pusch_AntennaPorts = 2;
+ do_CSIRS = 1;
+ do_SRS = 1;
+
+ servingCellConfigCommon = (
+ {
+ #spCellConfigCommon
+
+ physCellId = 0;
+
+# downlinkConfigCommon
+ #frequencyInfoDL
+ # this is 3469.44 MHz => 301 REs from PointA 25 PRBs + 1 RE
+ absoluteFrequencySSB = 631296;
+ dl_frequencyBand = 78;
+ # this is 3469.44 - (51*12*30e-3/2) = 3460.26 MHz
+ dl_absoluteFrequencyPointA = 630684;
+ #scs-SpecificCarrierList
+ dl_offstToCarrier = 0;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+ dl_subcarrierSpacing = 1;
+ dl_carrierBandwidth = 51;
+ #initialDownlinkBWP
+ #genericParameters
+ # this is RBstart=0,L=50 (275*(L-1))+RBstart
+ initialDLBWPlocationAndBandwidth = 13750;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+ initialDLBWPsubcarrierSpacing = 1;
+ #pdcch-ConfigCommon
+ initialDLBWPcontrolResourceSetZero = 11; # this means shift of 14, so Coreset is in PRBs 1..48, SSB starts at PRB 15
+ initialDLBWPsearchSpaceZero = 0;
+ #pdsch-ConfigCommon
+
+ #uplinkConfigCommon
+ #frequencyInfoUL
+ ul_frequencyBand = 78;
+ #scs-SpecificCarrierList
+ ul_offstToCarrier = 0;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+ ul_subcarrierSpacing = 1;
+ ul_carrierBandwidth = 51;
+ pMax = 20;
+ #initialUplinkBWP
+ #genericParameters
+ initialULBWPlocationAndBandwidth = 13750;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+ initialULBWPsubcarrierSpacing = 1;
+ #rach-ConfigCommon
+ #rach-ConfigGeneric
+ prach_ConfigurationIndex = 100;
+#prach_msg1_FDM
+#0 = one, 1=two, 2=four, 3=eight
+ prach_msg1_FDM = 0;
+ prach_msg1_FrequencyStart = 0;
+ zeroCorrelationZoneConfig = 15;
+ preambleReceivedTargetPower = -104;
+#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
+ preambleTransMax = 6;
+#powerRampingStep
+# 0=dB0,1=dB2,2=dB4,3=dB6
+ powerRampingStep = 1;
+#ra_ReponseWindow
+#1,2,4,8,10,20,40,80
+ ra_ResponseWindow = 4;
+#ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
+#1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
+ ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR = 3;
+#oneHalf (0..15) 4,8,12,16,...60,64
+ ssb_perRACH_OccasionAndCB_PreamblesPerSSB = 15;
+#ra_ContentionResolutionTimer
+#(0..7) 8,16,24,32,40,48,56,64
+ ra_ContentionResolutionTimer = 7;
+ rsrp_ThresholdSSB = 19;
+#prach-RootSequenceIndex_PR
+#1 = 839, 2 = 139
+ prach_RootSequenceIndex_PR = 2;
+ prach_RootSequenceIndex = 1;
+ # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
+ #
+ msg1_SubcarrierSpacing = 1,
+# restrictedSetConfig
+# 0=unrestricted, 1=restricted type A, 2=restricted type B
+ restrictedSetConfig = 0,
+
+ msg3_DeltaPreamble = 1;
+ p0_NominalWithGrant =-96;
+
+# pucch-ConfigCommon setup :
+# pucchGroupHopping
+# 0 = neither, 1= group hopping, 2=sequence hopping
+ pucchGroupHopping = 0;
+ hoppingId = 40;
+ p0_nominal = -96;
+
+ ssb_PositionsInBurst_Bitmap = 1;
+
+# ssb_periodicityServingCell
+# 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1
+ ssb_periodicityServingCell = 2;
+
+# dmrs_TypeA_position
+# 0 = pos2, 1 = pos3
+ dmrs_TypeA_Position = 0;
+
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+ subcarrierSpacing = 1;
+
+
+ #tdd-UL-DL-ConfigurationCommon
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+ referenceSubcarrierSpacing = 1;
+ # pattern1
+ # dl_UL_TransmissionPeriodicity
+ # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
+ dl_UL_TransmissionPeriodicity = 5;
+ nrofDownlinkSlots = 2;
+ nrofDownlinkSymbols = 6;
+ nrofUplinkSlots = 2;
+ nrofUplinkSymbols = 4;
+
+ ssPBCH_BlockPower = -10;
+ }
+
+ );
+
+
+ # ------- SCTP definitions
+ SCTP :
+ {
+ # Number of streams to use in input/output
+ SCTP_INSTREAMS = 2;
+ SCTP_OUTSTREAMS = 2;
+ };
+
+
+ ////////// AMF parameters:
+ amf_ip_address = ({ ipv4 = "172.21.6.100"; });
+
+ NETWORK_INTERFACES :
+ {
+
+ GNB_IPV4_ADDRESS_FOR_NG_AMF = "172.21.16.124/20";
+ GNB_IPV4_ADDRESS_FOR_NGU = "172.21.16.124/20";
+ GNB_PORT_FOR_S1U = 2152; # Spec 2152
+ };
+ }
+);
+
+MACRLCs = (
+ {
+ num_cc = 1;
+ tr_s_preference = "local_L1";
+ tr_n_preference = "local_RRC";
+ pusch_TargetSNRx10 = 200;
+ pucch_TargetSNRx10 = 200;
+ }
+);
+
+L1s = (
+ {
+ num_cc = 1;
+ tr_n_preference = "local_mac";
+ prach_dtx_threshold = 120;
+ pucch0_dtx_threshold = 50;
+ pusch_dtx_threshold = 10;
+ }
+);
+
+RUs = (
+ {
+ local_if_name = "ens7f3";
+ remote_address = "192.168.80.239";
+ local_address = "192.168.80.24";
+ local_portc = 50000;
+ remote_portc = 55444;
+ local_portd = 52001;
+ remote_portd = 52183;
+ local_rf = "no"
+ tr_preference = "udp_ecpri_if5"
+ nb_tx = 2
+ nb_rx = 2
+ att_tx = 18
+ att_rx = 0;
+ num_tp_cores = 4;
+ rxfh_core_id = 9;
+ txfh_core_id = 10;
+ tp_cores = [11,12,13,14];
+ nr_flag = 1;
+ eNB_instances = [0];
+ bands = [78];
+ sl_ahead = 5;
+ ##beamforming 1x2 matrix: 1 layer x 2 antennas
+ bf_weights = [0x00007fff, 0x0000];
+ ##beamforming 1x4 matrix: 1 layer x 4 antennas
+ #bf_weights = [0x00007fff, 0x0000,0x0000, 0x0000];
+ ## beamforming 2x2 matrix:
+ # bf_weights = [0x00007fff, 0x00000000, 0x00000000, 0x00007fff];
+ ## beamforming 4x4 matrix:
+ #bf_weights = [0x00007fff, 0x0000, 0x0000, 0x0000, 0x00000000, 0x00007fff, 0x0000, 0x0000, 0x0000, 0x0000, 0x00007fff, 0x0000, 0x0000, 0x0000, 0x0000, 0x00007fff];
+ }
+);
+
+
+security = {
+ # preferred ciphering algorithms
+ # the first one of the list that an UE supports in chosen
+ # valid values: nea0, nea1, nea2, nea3
+ ciphering_algorithms = ( "nea2", "nea0" );
+
+ # preferred integrity algorithms
+ # the first one of the list that an UE supports in chosen
+ # valid values: nia0, nia1, nia2, nia3
+ integrity_algorithms = ( "nia2", "nia0" );
+
+ # setting 'drb_ciphering' to "no" disables ciphering for DRBs, no matter
+ # what 'ciphering_algorithms' configures; same thing for 'drb_integrity'
+ drb_ciphering = "yes";
+ drb_integrity = "yes";
+};
+
+ log_config :
+ {
+ global_log_level ="info";
+ global_log_verbosity ="medium";
+ hw_log_level ="info";
+ hw_log_verbosity ="medium";
+ phy_log_level ="info";
+ phy_log_verbosity ="medium";
+ mac_log_level ="info";
+ mac_log_verbosity ="high";
+ rlc_log_level ="info";
+ rlc_log_verbosity ="medium";
+ pdcp_log_level ="info";
+ pdcp_log_verbosity ="medium";
+ rrc_log_level ="info";
+ rrc_log_verbosity ="medium";
+ f1ap_log_level ="debug";
+ f1ap_log_verbosity ="medium";
+ ngap_log_level ="debug";
+ ngap_log_verbosity ="medium";
+ };
+
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 4cc3c2be2b..9ee7787eed 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
@@ -21,10 +21,10 @@ gNBs =
nr_cellid = 12345678L
////////// Physical parameters:
- pdsch_AntennaPorts_XP = 2;
- pusch_AntennaPorts = 2;
+ pdsch_AntennaPorts_XP = 1;
+ pusch_AntennaPorts = 1;
do_CSIRS = 1;
- do_SRS = 1;
+ do_SRS = 0;
servingCellConfigCommon = (
{
@@ -34,11 +34,11 @@ gNBs =
# downlinkConfigCommon
#frequencyInfoDL
- # this is 3410.4 MHz => 301 REs from PointA 25 PRBs + 1 RE
- absoluteFrequencySSB = 630048;
+ # this is 3469.44 MHz => 301 REs from PointA 25 PRBs + 1 RE
+ absoluteFrequencySSB = 631296;
dl_frequencyBand = 78;
- # this is 3410.4 - (51*12*30e-3/2) = 3401.22 MHz
- dl_absoluteFrequencyPointA = 629436;
+ # this is 3469.44 - (51*12*30e-3/2) = 3460.26 MHz
+ dl_absoluteFrequencyPointA = 630684;
#scs-SpecificCarrierList
dl_offstToCarrier = 0;
# subcarrierSpacing
@@ -207,8 +207,8 @@ RUs = (
remote_portd = 52183;
local_rf = "no"
tr_preference = "udp_ecpri_if5"
- nb_tx = 2
- nb_rx = 2
+ nb_tx = 1
+ nb_rx = 1
att_tx = 18
att_rx = 0;
num_tp_cores = 4;
diff --git a/ci-scripts/xml_files/container_sa_aw2s_asue.xml b/ci-scripts/xml_files/container_sa_aw2s_asue.xml
index 71789cca52..f023da8402 100644
--- a/ci-scripts/xml_files/container_sa_aw2s_asue.xml
+++ b/ci-scripts/xml_files/container_sa_aw2s_asue.xml
@@ -24,55 +24,64 @@
TEST-5G-AW2S
20 MHz TDD SA
tasks
+ 1
- 010000
- 001000
- 800813
- 020000
- 002000
- 002001
- 002002
- 002003
- 002004
- 002005
- 002006
- 002007
- 002008
- 002009
- 002010
- 002011
- 002012
- 002013
- 002014
- 002015
- 000100
- 000010
- 000020
- 000030
- 000040
- 002016
- 000200
- 003000
- 004000
- 000002
- 030000
- 333333
+ 110000
+ 101000
+ 100813
+ 120000
+ 102000
+ 102001
+ 102002
+ 102003
+ 102004
+ 102005
+ 102006
+ 102007
+ 102008
+ 102009
+ 102010
+ 102011
+ 102012
+ 102013
+ 102014
+ 102015
+ 100100
+ 100010
+ 100020
+ 100030
+ 100040
+ 102016
+ 100200
+ 103000
+ 104000
+ 100002
+ 130000
+ 444444
-
+
Pull_Cluster_Image
Pull Images from Cluster
oaicicd-ran
oai-gnb-aw2s
-
+
+
+ Initialize_UE
+ Initialize Amarisoft UE
+ amarisoft_ue
+
+
+
Create_Workspace
- Create new Workspace
+ Creating new Workspace
0
0
-
+
+
Deploy_Object
Deploy gNB (TDD/Band78/20MHz/aw2s) in a container
ci-scripts/yaml_files/sa_aw2s_gnb
@@ -80,106 +89,100 @@
0
-
- Initialize_UE
- Initialize Amarisoft UE
- amarisoft_ue
-
-
-
+
Attach_UE
Attach UE
amarisoft_ue_1
-
+
Attach_UE
Attach UE
amarisoft_ue_2
-
+
Attach_UE
Attach UE
amarisoft_ue_3
-
+
Attach_UE
Attach UE
amarisoft_ue_4
-
+
Attach_UE
Attach UE
amarisoft_ue_5
-
+
Attach_UE
Attach UE
amarisoft_ue_6
-
+
Attach_UE
Attach UE
amarisoft_ue_7
-
+
Attach_UE
Attach UE
amarisoft_ue_8
-
+
Attach_UE
Attach UE
amarisoft_ue_9
-
+
Attach_UE
Attach UE
amarisoft_ue_10
-
+
Attach_UE
Attach UE
amarisoft_ue_11
-
+
Attach_UE
Attach UE
amarisoft_ue_12
-
+
Attach_UE
Attach UE
amarisoft_ue_13
-
+
Attach_UE
Attach UE
amarisoft_ue_14
-
+
Attach_UE
Attach UE
amarisoft_ue_15
-
+
Iperf
- iperf (DL/7Mbps/UDP)(30 sec)(multi-ue profile)
- -u -b 70M -t 30 -R
+ iperf (DL/3Mbps/UDP)(30 sec)(multi-ue profile)
+ -u -b 45M -t 30 -R
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 amarisoft_ue_11 amarisoft_ue_12 amarisoft_ue_13 amarisoft_ue_14 amarisoft_ue_15
25
80
@@ -187,19 +190,19 @@
oc-cn5g
-
+
Iperf
iperf (DL/TCP)(30 sec)(multi-ue profile)
-t 30 -R
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 amarisoft_ue_11 amarisoft_ue_12 amarisoft_ue_13 amarisoft_ue_14 amarisoft_ue_15
- 4
+ 2
oc-cn5g
-
+
Iperf
- iperf (UL/3.6Mbps/UDP)(30 sec)(multi-ue profile)
- -u -b 36M -t 30
+ iperf (UL/1Mbps/UDP)(30 sec)(multi-ue profile)
+ -u -b 15M -t 30
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 amarisoft_ue_11 amarisoft_ue_12 amarisoft_ue_13 amarisoft_ue_14 amarisoft_ue_15
25
80
@@ -207,7 +210,7 @@
oc-cn5g
-
+
Iperf
iperf (UL/TCP)(30 sec)(multi-ue profile)
-t 30
@@ -217,51 +220,51 @@
oc-cn5g
-
+
Ping
- Ping: 20pings in 20sec, multi-ue
+ Ping: 50 pings in 10sec, multi-ue
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 amarisoft_ue_11 amarisoft_ue_12 amarisoft_ue_13 amarisoft_ue_14 amarisoft_ue_15
- -c 20 %cn_ip%
+ -c 50 -i 0.2 %cn_ip%
5
25
-
+
Attach_UE
Attach UE
amarisoft_ue_16
-
+
Ping
Ping: 50pings in 10sec, multi-ue
amarisoft_ue_16
-c 50 -i 0.2 %cn_ip%
- 1
+ 5
30
-
+
Detach_UE
true
Detach UE
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 amarisoft_ue_11 amarisoft_ue_12 amarisoft_ue_13 amarisoft_ue_14 amarisoft_ue_15 amarisoft_ue_16
-
+
Terminate_UE
true
Terminate UE
amarisoft_ue
-
+
IdleSleep
Sleep
5
-
+
Undeploy_Object
true
Undeploy gNB
@@ -270,7 +273,7 @@
0
-
+
Clean_Test_Server_Images
true
Clean Test Images on Test Server
diff --git a/ci-scripts/xml_files/container_sa_aw2s_asue_2x2.xml b/ci-scripts/xml_files/container_sa_aw2s_asue_2x2.xml
new file mode 100644
index 0000000000..5d43c89c3c
--- /dev/null
+++ b/ci-scripts/xml_files/container_sa_aw2s_asue_2x2.xml
@@ -0,0 +1,280 @@
+
+
+ TEST-5G-2x2-AW2S
+ 20 MHz TDD 2x2 SA
+ tasks
+
+ 010000
+ 001000
+ 800813
+ 020000
+ 002000
+ 002001
+ 002002
+ 002003
+ 002004
+ 002005
+ 002006
+ 002007
+ 002008
+ 002009
+ 002010
+ 002011
+ 002012
+ 002013
+ 002014
+ 002015
+ 000100
+ 000010
+ 000020
+ 000030
+ 000040
+ 002016
+ 000200
+ 003000
+ 004000
+ 000002
+ 030000
+ 333333
+
+
+
+
+ Pull_Cluster_Image
+ Pull Images from Cluster
+ oaicicd-ran
+ oai-gnb-aw2s
+
+
+ Create_Workspace
+ Create new Workspace
+ 0
+ 0
+
+
+ Deploy_Object
+ Deploy gNB (TDD/Band78/20MHz/aw2s) in a container
+ ci-scripts/yaml_files/sa_aw2s_2x2_gnb
+ 0
+ 0
+
+
+
+ Initialize_UE
+ Initialize Amarisoft UE
+ amarisoft_ue_2x2
+
+
+
+ Attach_UE
+ Attach UE
+ amarisoft_ue_1
+
+
+
+ Attach_UE
+ Attach UE
+ amarisoft_ue_2
+
+
+
+ Attach_UE
+ Attach UE
+ amarisoft_ue_3
+
+
+
+ Attach_UE
+ Attach UE
+ amarisoft_ue_4
+
+
+
+ Attach_UE
+ Attach UE
+ amarisoft_ue_5
+
+
+
+ Attach_UE
+ Attach UE
+ amarisoft_ue_6
+
+
+
+ Attach_UE
+ Attach UE
+ amarisoft_ue_7
+
+
+
+ Attach_UE
+ Attach UE
+ amarisoft_ue_8
+
+
+
+ Attach_UE
+ Attach UE
+ amarisoft_ue_9
+
+
+
+ Attach_UE
+ Attach UE
+ amarisoft_ue_10
+
+
+
+ Attach_UE
+ Attach UE
+ amarisoft_ue_11
+
+
+
+ Attach_UE
+ Attach UE
+ amarisoft_ue_12
+
+
+
+ Attach_UE
+ Attach UE
+ amarisoft_ue_13
+
+
+
+ Attach_UE
+ Attach UE
+ amarisoft_ue_14
+
+
+
+ Attach_UE
+ Attach UE
+ amarisoft_ue_15
+
+
+
+ Iperf
+ iperf (DL/4Mbps/UDP)(30 sec)(multi-ue profile)
+ -u -b 60M -t 30 -R
+ 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 amarisoft_ue_11 amarisoft_ue_12 amarisoft_ue_13 amarisoft_ue_14 amarisoft_ue_15
+ 25
+ 80
+ balanced
+ oc-cn5g
+
+
+
+ Iperf
+ iperf (DL/TCP)(30 sec)(multi-ue profile)
+ -t 30 -R
+ 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 amarisoft_ue_11 amarisoft_ue_12 amarisoft_ue_13 amarisoft_ue_14 amarisoft_ue_15
+ 4
+ oc-cn5g
+
+
+
+ Iperf
+ iperf (UL/1.5Mbps/UDP)(30 sec)(multi-ue profile)
+ -u -b 22.5M -t 30
+ 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 amarisoft_ue_11 amarisoft_ue_12 amarisoft_ue_13 amarisoft_ue_14 amarisoft_ue_15
+ 25
+ 80
+ balanced
+ oc-cn5g
+
+
+
+ Iperf
+ iperf (UL/TCP)(30 sec)(multi-ue profile)
+ -t 30
+ oc-cn5g
+ 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 amarisoft_ue_11 amarisoft_ue_12 amarisoft_ue_13 amarisoft_ue_14 amarisoft_ue_15
+ 1
+ oc-cn5g
+
+
+
+ Ping
+ Ping: 20pings in 20sec, multi-ue
+ 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 amarisoft_ue_11 amarisoft_ue_12 amarisoft_ue_13 amarisoft_ue_14 amarisoft_ue_15
+ -c 20 %cn_ip%
+ 5
+ 25
+
+
+
+ Attach_UE
+ Attach UE
+ amarisoft_ue_16
+
+
+
+ Ping
+ Ping: 50pings in 10sec, multi-ue
+ amarisoft_ue_16
+ -c 50 -i 0.2 %cn_ip%
+ 5
+ 30
+
+
+
+ Detach_UE
+ true
+ Detach UE
+ 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 amarisoft_ue_11 amarisoft_ue_12 amarisoft_ue_13 amarisoft_ue_14 amarisoft_ue_15 amarisoft_ue_16
+
+
+
+ Terminate_UE
+ true
+ Terminate UE
+ amarisoft_ue_2x2
+
+
+
+ IdleSleep
+ Sleep
+ 5
+
+
+
+ Undeploy_Object
+ true
+ Undeploy gNB
+ ci-scripts/yaml_files/sa_aw2s_2x2_gnb
+ 0
+ 0
+
+
+
+ Clean_Test_Server_Images
+ true
+ Clean Test Images on Test Server
+ 0
+
+
+
diff --git a/ci-scripts/yaml_files/sa_aw2s_2x2_gnb/docker-compose.yml b/ci-scripts/yaml_files/sa_aw2s_2x2_gnb/docker-compose.yml
new file mode 100644
index 0000000000..d1f5ae2475
--- /dev/null
+++ b/ci-scripts/yaml_files/sa_aw2s_2x2_gnb/docker-compose.yml
@@ -0,0 +1,22 @@
+services:
+ oai-gnb:
+ image: ${REGISTRY:-oaisoftwarealliance}/oai-gnb-aw2s:${TAG:-develop}
+ network_mode: "host"
+ container_name: oai-gnb-aw2s
+ cap_drop:
+ - ALL
+ cap_add:
+ - SYS_NICE
+ - IPC_LOCK
+ ulimits:
+ core: -1 # for core dumps
+ environment:
+ TZ: Europe/Paris
+ USE_ADDITIONAL_OPTIONS: --sa
+ volumes:
+ - ../../conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.2x2.conf:/opt/oai-gnb-aw2s/etc/gnb.conf
+ healthcheck:
+ test: /bin/bash -c "pgrep nr-softmodem"
+ interval: 10s
+ timeout: 5s
+ retries: 5