Compare commits

...

5408 Commits

Author SHA1 Message Date
sfn
6a02803a78 Add codebook type I precoding matrices generation function 2021-08-03 12:39:33 +02:00
Raphael Defosseux
96997d1eca Merge branch 'integration_2021_wk31' into 'develop'
integration_2021_wk31

See merge request oai/openairinterface5g!1219
2021-08-02 15:07:36 +00:00
Raphael Defosseux
6b6215e628 fix(ci): adding detection of timed-out run on the physims on cluster
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-08-02 10:00:36 +02:00
Raphael Defosseux
a9ffbc6b07 Merge remote-tracking branch 'origin/hack-bch-no-sched-sf-0' into develop 2021-08-02 10:00:14 +02:00
Raphael Defosseux
599287b632 Merge remote-tracking branch 'origin/fix-retransmission-rbg' into develop 2021-08-02 09:59:46 +02:00
Raphael Defosseux
5adf940b99 Merge remote-tracking branch 'origin/ci_nsa_2x2_implem' into develop 2021-08-02 09:58:35 +02:00
hardy
58825cd92a fix USRP address detection in xml 2021-07-29 09:42:58 +02:00
Raphael Defosseux
3cfb169b37 fix(build): protobuf location has changed
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-07-29 08:29:27 +02:00
hardy
7c12ec6b30 Merge remote-tracking branch 'origin/ci_update_build_nasmesh' into ci_nsa_2x2_implem 2021-07-29 08:04:19 +02:00
hardy
087a2da298 SA test pipeline udpate 2021-07-28 21:41:15 +02:00
Remi Hardy
32e5e46490 [CI] support for 5G Core (sabox only for the moment) 2021-07-28 09:35:05 +00:00
hardy
dabf5c8b55 fix ping target address for module, depending on EPC type 2021-07-27 17:53:22 +02:00
hardy
de6d928d1f fix remote access for LogRotation method 2021-07-27 17:37:09 +02:00
hardy
65aa130547 sa xml testcase (basic) 2021-07-27 16:47:43 +02:00
hardy
017b362359 added reboot control of Eth USRP 2021-07-27 15:50:25 +02:00
hardy
bd5ac98793 add ping to testcase 2021-07-26 17:35:22 +02:00
hardy
515a30a636 fix avg file size computation when folder is empty 2021-07-26 17:32:28 +02:00
Raphael Defosseux
22e1f0c220 fix(ci): fix build HTML report
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-07-26 08:48:28 +02:00
Remi Hardy
4bfbb6f128 integration_2021_wk30
MR !1206 : nr_ue_remove_high_speed_flag
This flag is always set to 1, 
With multiple DMRS symbols configuration, very recent DMRS containing symbol shall be for channel estimation.

MR !1205 : fix-lte-ue-modem-in-docker-container
We bind the socket to any_addr (instead of localhost), so the commands to the UE can come also from a remote machine

MR !1178 : NR_CSIRS_tomerge
Implementation of CSI RS transmission at gNB

MR !1211 : develop-NSA_SA_fixes
Small fixes for NSA and SA
2021-07-25 07:32:44 +00:00
hardy
c93a9497db Merge remote-tracking branch 'origin/develop-NSA_SA_fixes' into integration_2021_wk30_b 2021-07-24 17:56:38 +02:00
hardy
e241fb5034 fix ssh remote access to UE module 2021-07-23 16:31:43 +02:00
rmagueta
165b406839 Avoid segmentation fault for LTE 2021-07-23 13:12:35 +01:00
hardy
03edcdeceb make module log storage configurable 2021-07-23 11:55:26 +02:00
Raphael Defosseux
1c907e922f fix(ci): removed the 2 log expected by nasmesh and rbtool builds
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-07-23 10:29:41 +02:00
hardy
94ba6157ef Merge remote-tracking branch 'origin/fix-lte-ue-modem-in-docker-container' into integration_2021_wk30 2021-07-23 09:19:15 +02:00
hardy
0b472dd9f9 Merge remote-tracking branch 'origin/nr_ue_remove_high_speed_flag' into integration_2021_wk30 2021-07-23 09:18:52 +02:00
hardy
fad5fbda34 Merge remote-tracking branch 'origin/NR_CSIRS_tomerge' into integration_2021_wk30 2021-07-23 09:18:33 +02:00
luis_pereira87
1beffd1ecc Remove the MAC and RRC context after UL failure when gNB is not connected to CN5G 2021-07-22 14:05:10 +01:00
luis_pereira87
67bccd8c80 Fix handling failure of CFRA procedure for OAI UE 2021-07-22 11:36:52 +01:00
Raphael Defosseux
244a7a9a3d feat(ci): adding support for 5G Core (sabox only for the moment)
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-07-22 12:17:57 +02:00
luis_pereira87
7c61f6d969 Fix pusch_TargetSNRx10 and pucch_TargetSNRx10 in configuration files 2021-07-22 11:13:14 +01:00
luis_pereira87
a038df0459 Discard Random Access when max number of users is achieved 2021-07-22 10:55:46 +01:00
luis_pereira87
95372bd2da Fix RNTI selection for CFRA 2021-07-22 10:51:49 +01:00
luis_pereira87
17f466a9bf Fix define MACRLC idx that overlaps 2021-07-22 10:50:44 +01:00
hardy
7ce90b8dc4 Merge remote-tracking branch 'origin/ci_update_build_nasmesh' into ci_nsa_2x2_implem 2021-07-22 11:41:28 +02:00
hardy
c72ac04f63 remove nasmesh compile ; nokrnmod =1 by default 2021-07-22 11:34:41 +02:00
Remi Hardy
d7839d8a60 integration_2021_wk29
MR !1193 : Update for 5G SA implementation
2021-07-22 09:14:34 +00:00
francescomani
618e33aca0 adding check for ul failure in nr_csi_meas_reporting 2021-07-22 09:16:10 +02:00
Cedric Roux
4a2c0b1eff bugfix: fix allocation of RBGs for retransmission
When there is a retransmission, we want to use the same number of RBs.

The RBs are allocated by groups (RBGs).

In some cases (like a cell with 25 PRBs), the last RBG contains less RBs.
So in case of a retransmission, if this last RBG was used before we need
to reuse it to have the same number of RBs. If not, we will use more RBs
for the retransmission than the previous transmission.

In an experiment with two UEs (quectel modules) it was seen that when a
retransmission happens with a different number of RBs then the UE is not
happy at all, leading to way more NACKs in the harq processes than should
happen (actually the first NACK was not a NACK at all, but the eNB did
interpret it as a NACK; so the next transmission should simply be discarded
by the UE that successfully received the first transmission; instead the UE
fails to decode the data and sends a NACK, a real one this time).

Maybe it's not the correct solution, but it improve things, there are
much less NACKs.
2021-07-21 23:22:48 +02:00
Cedric Roux
f6e0321860 hack: do not use BCH RBs for DL scheduling in subframe 0
The problem is that when using those RBs with MCS 28 we may exceed the
code rate 0.93 and according to 36.213 7.1.7 the UE may skip decoding
PDSCH entirely in this case.

This is a hack. The real solution is to check that the code rate is below
0.93 for each scheduling decision and, I don't know, reduce the MCS if the
code rate is above, so that in the end it is below. That means that we need
a proper resource grid for the configuration of the eNB and this is not an
easy thing (at least from my point of view) given all the possible
configurations for the eNB, so I prefer not to do it rather than do something
incorrect, thus this hack.

The problem of this hack is that we won't use all the available RBs for
scheduling, potentially reducing the maximum throughput achievable.

To be fixed properly at some time, by someone who understands fully the
resource grid and all the possible combinations (fdd/tdd, number of
antennas, whatever else).
2021-07-21 23:22:02 +02:00
hardy
59f4cfd92a [CI] for gNB Phy test : update of the execution timings ref values, according to the latest developments 2021-07-21 08:19:46 +02:00
hardy
a052e1b719 update conf files for CI 2021-07-20 17:27:59 +02:00
hardy
71e8ed8086 changed path of cql as it is copied locally in the same folder as yaml 2021-07-20 15:36:49 +02:00
hardy
756ec666e8 epc docker compose fix for testing 2021-07-20 09:32:34 +02:00
francescomani
bff2251242 Merge remote-tracking branch 'origin/develop' into NR_CSIRS_tomerge 2021-07-20 07:03:24 +02:00
rmagueta
6b028522bd Fix warning after merge 2021-07-19 14:22:00 +01:00
rmagueta
3ea6d6f878 Merge remote-tracking branch 'origin/develop' into develop-NR_SA_F1AP_5GRECORDS-abs
# Conflicts:
#	openair1/PHY/INIT/nr_init_ru.c
2021-07-19 13:51:38 +01:00
hardy
a6d53823a3 nsa 2x2 test implem 2021-07-19 14:42:39 +02:00
Raphael Defosseux
f89d367ad4 CI: adding bsd exception
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-07-19 14:08:17 +02:00
Raphael Defosseux
1ec50d4d2c fix(oai-lte-ue): unrestrict socket in nas init. Fix running with a docker Ubuntu container
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-07-19 12:19:27 +02:00
Remi Hardy
218aec0080 integration_2021_wk28
MR !1197 : dongzhanyi-zte-develop1
function nr_generate_dci_top and nr_generate_dci has the frame_parms parameter, whose type is the structure NR_DL_FRAME_PARMS.
The better way is to pass the parameter as a pointer. 

MR !1176 : NR_phytest_bugfixes
This fixes a bug for configurations with less than 50 PRBs in phy-test mode.

MR !1142 : nr-dl-mimo-2layer
2021-07-18 19:53:43 +00:00
hardy
042e45efa7 Merge remote-tracking branch 'origin/nr-dl-mimo-2layer' into integration_2021_wk28_b 2021-07-18 10:37:36 +02:00
hardy
3c64c73dd1 Merge remote-tracking branch 'origin/NR_phytest_bugfixes' into integration_2021_wk28_b 2021-07-18 10:37:08 +02:00
hardy
0133678cc4 Merge remote-tracking branch 'origin/dongzhanyi-zte-develop1' into integration_2021_wk28_b 2021-07-18 10:36:39 +02:00
luis_pereira87
9c010e3056 Apply patch for gNB ulsch retransmission scheduler 2021-07-17 22:25:07 +01:00
luis_pereira87
cbbce10f3f Merge remote-tracking branch 'origin/develop' into develop-NR_SA_F1AP_5GRECORDS-abs 2021-07-17 21:39:10 +01:00
hardy
c97bb97235 [CI] : comment out the nsa tests that are disabled, so that the remaining test runs all MR 2021-07-17 08:30:43 +02:00
rmagueta
64c28bf9ac Normalization of energy over ifft and receive antennas 2021-07-16 16:50:51 +01:00
Roberto Louro Magueta
abef7f0b08 Revert "Temporary fix for prach_thres"
This reverts commit af0d7dabba
2021-07-16 15:34:53 +00:00
rmagueta
1c17196f73 Merge remote-tracking branch 'origin/develop' into develop-NR_SA_F1AP_5GRECORDS-abs 2021-07-16 11:38:04 +01:00
Parminder Singh
bb9c3ca173 ue->high_speed_flag is removed from UE channel estimation
- This flag is always set to 1, furthermore with multiple DMRS symbols
  configuration very recent DMRS containing symbol shall be for channel
  estimation.
2021-07-16 09:36:36 +02:00
Francesco Mani
fd9e0b64ef Update FEATURE_SET.md 2021-07-16 07:33:14 +00:00
Remi Hardy
33a2f1df42 [CI] improve/fix iperf for module
-fixes UL iperf log collection/analysis for UE module
-fixes iperf processes mgt for UE module
2021-07-16 07:17:44 +00:00
luis_pereira87
a30b86cb45 Update NSA config file 2021-07-15 18:55:51 +01:00
luis_pereira87
1c0d045396 Merge remote-tracking branch 'origin/develop-NR_SA_F1AP_5GRECORDS-abs' into develop-NR_SA_F1AP_5GRECORDS-abs 2021-07-15 12:59:58 +01:00
luis_pereira87
ff7cc7ec1b Add ulsch_max_slots_inactivity to SA config files 2021-07-15 12:59:15 +01:00
francescomani
88b8b4212b fix gnb compilation 2021-07-15 12:01:22 +02:00
rmagueta
f2b52ba3da Revert some xer_fprints 2021-07-15 10:35:54 +01:00
Luis Pereira
78b3292c9c Revert "Add noS1 flag in gnb_phytest_usrp_run"
This reverts commit a8a5146029
2021-07-15 09:02:18 +00:00
hardy
2bfc418e68 improve/fix iperf for module 2021-07-15 10:18:19 +02:00
rmagueta
a2450bb4b7 Protect some xer_fprints by an if 2021-07-14 15:30:07 +01:00
francescomani
88cec72b02 avoid segmentation fault in scheduling csirs for sa 2021-07-14 16:15:47 +02:00
francescomani
b72f2a6a8e Merge remote-tracking branch 'origin/develop' into NR_CSIRS_tomerge 2021-07-14 13:54:02 +02:00
Thomas Schlichter
9f070b74ae NR_UE: use correct HARQ PID when setting the HARQ status to ACTIVE in nr_ue_scheduled_response() 2021-07-13 20:47:05 +02:00
Thomas Schlichter
bf50c61e8a NR_UE: fix nr_ue_dlsch_procedures() for sa mode
But that part should be moved to the MAC anyways
2021-07-13 20:45:19 +02:00
Thomas Schlichter
44d57829cc NR_UE: revert changes in nr_ue_procedures.c
I have to revert this to be consistent with the OAI gNB.
But I think it is wrong to take the BWPSize from scc or scc_SIB, and the BWPStart from DLbwp[0].
2021-07-13 20:44:39 +02:00
rmagueta
7758e8acfc Revert min_rb to 5 and avoid mixed slots for initialUplinkBWP 2021-07-13 18:48:38 +01:00
rmagueta
a8a5146029 Add noS1 flag in gnb_phytest_usrp_run 2021-07-13 18:08:57 +01:00
rmagueta
b98836940a Change log levels 2021-07-13 12:00:25 +01:00
rmagueta
2dd3051916 Merge remote-tracking branch 'origin/develop' into develop-NR_SA_F1AP_5GRECORDS-abs 2021-07-12 15:51:16 +01:00
rmagueta
4f873e9a26 Fix IP packet received at gNB, to be sent to TUN interface 2021-07-12 15:44:16 +01:00
hardy
f3ea310429 quick fix for CI NR phy test 2021-07-12 14:56:48 +02:00
Laurent THOMAS
bc528d0c73 fix wireshark interface headers 2021-07-12 13:22:38 +02:00
rmagueta
389a8e58be Revert security_mode for phy-test 2021-07-10 02:17:36 +01:00
rmagueta
af0d7dabba Temporary fix for prach_thres 2021-07-09 20:32:54 +01:00
rmagueta
02e20e9021 Fix frequencyDomainResources for coreset0 2021-07-09 20:18:49 +01:00
rmagueta
ba122c9cb4 Fix max_association_period for FDD 2021-07-09 15:59:19 +01:00
rmagueta
3c9ca36651 Fix fill slot bitmap for FR2 2021-07-09 13:22:30 +01:00
Roberto Louro Magueta
b19d396828 Revert "Fix is_xlsch_in_slot"
This reverts commit 7821a12998
2021-07-09 11:34:01 +00:00
rmagueta
7821a12998 Fix is_xlsch_in_slot 2021-07-08 19:57:03 +01:00
rmagueta
9c571bd933 Fix segmentation fault in nr-ru 2021-07-08 18:38:49 +01:00
rmagueta
39670007be Merge remote-tracking branch 'origin/develop' into develop-NR_SA_F1AP_5GRECORDS-abs 2021-07-08 17:43:43 +01:00
Remi Hardy
ca8106ea13 integration_2021_wk27
MR !1188 : NR_gNB_initial_MIB_fix  
This MR fixes a bug for which the gNB would send an empty MIB in the first frames of execution. This is because MIB is generated every 8 frames but the first MIB wouldn't be generated before frame 8 at the beginning of each run.

MR !1184 : x2_handle_sctp_shutdown
Avoid eNB exiting after gNB tries to reconnect over X2 for NSA
2021-07-08 08:18:47 +00:00
luispereira87
38e3517029 Fix build warning 2021-07-07 19:11:33 +01:00
luispereira87
8743f58d23 Improve schedule msg3 and fix tda for mixed slots 2021-07-07 18:25:31 +01:00
luispereira87
65bf29eecc Fix uplink retransmission information 2021-07-07 16:34:29 +01:00
Luis Pereira
214b44885d Revert "Temporary fix: avoid mixed slots in initialUplinkBWP"
This reverts commit 06a8ec9893
2021-07-07 15:27:38 +00:00
dongzhanyi
8814c2c3dc replace the NR_DL_FRAME_PARMS structure into the NR_DL_FRAME_PARMS structure pointer 2021-07-07 21:16:59 +08:00
luispereira87
06a8ec9893 Temporary fix: avoid mixed slots in initialUplinkBWP 2021-07-06 20:33:18 +01:00
luis_pereira87
2cea4c4c87 Compute TBS and rbSize considering always MAC long header 2021-07-06 10:57:32 +01:00
Luis Pereira
6cc98eba85 Revert "Fix gNB downlink MAC short/long header accordingly with RLC buffer size"
This reverts commit 081a287929
2021-07-06 09:44:37 +00:00
Luis Pereira
5da8195d23 Revert "Improved fix gNB downlink MAC short/long header accordingly with RLC buffer size"
This reverts commit 88d7ad11a2
2021-07-06 09:44:03 +00:00
hardy
cc89d3606b Merge remote-tracking branch 'origin/x2_handle_sctp_shutdown' into integration_2021_wk27 2021-07-06 10:49:30 +02:00
Thomas Schlichter
c3482e376d Merge remote-tracking branch 'origin/develop' into nr-dl-mimo-2layer 2021-07-05 16:25:26 +02:00
Thomas Schlichter
ea72bde160 fix DL channel estimation around DC for DMRS type 1 and muliple antenna ports
bug found and fix proposed by: Francesco Mani
2021-07-05 14:49:39 +02:00
luis_pereira87
88d7ad11a2 Improved fix gNB downlink MAC short/long header accordingly with RLC buffer size 2021-07-03 08:54:16 +01:00
luis_pereira87
081a287929 Fix gNB downlink MAC short/long header accordingly with RLC buffer size 2021-07-02 21:36:02 +01:00
Laurent THOMAS
ee0e7c97a3 merge develop 2021-07-02 12:22:42 +02:00
Laurent THOMAS
670352d548 add array size fix 2021-07-02 12:15:59 +02:00
Laurent THOMAS
1f80f4f4dd merge develop
Merge branch 'develop' of gitlab.eurecom.fr:oai/openairinterface5g into x2_handle_sctp_shutdown
2021-07-02 11:43:52 +02:00
francescomani
c9c416cb01 Merge remote-tracking branch 'origin/develop' into NR_gNB_initial_MIB_fix 2021-07-02 11:43:37 +02:00
luispereira87
dcfec657df Fix BWPstart and BWPsize for bwp_Dedicated 2021-07-01 15:02:59 +01:00
francescomani
38ad4bbfbc Merge remote-tracking branch 'origin/develop' into NR_CSIRS_tomerge 2021-07-01 15:23:28 +02:00
Remi Hardy
2d4e8cc323 2021_wk26 Merge develop-NR_SA_F1AP_5GRECORDS
Initial implementation of NR5G Standalone Access Registration procedures with CN5G.
2021-07-01 11:55:26 +00:00
rmagueta
282fe1063e Fix build 2021-06-30 18:48:45 +01:00
rmagueta
160cb0b930 Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS-lts2
# Conflicts:
#	cmake_targets/CMakeLists.txt
#	cmake_targets/build_oai
#	cmake_targets/tools/build_helper
#	executables/nr-gnb.c
#	openair1/PHY/INIT/nr_init_ru.c
#	openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
#	openair1/PHY/NR_TRANSPORT/nr_ulsch.c
#	openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c
#	openair1/PHY/NR_UE_TRANSPORT/nr_prach.c
#	openair1/SCHED_NR/phy_procedures_nr_gNB.c
#	openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
#	openair2/F1AP/f1ap_du_rrc_message_transfer.c
#	openair2/F1AP/f1ap_du_rrc_message_transfer.h
#	openair2/F1AP/f1ap_du_task.c
#	openair2/GNB_APP/gnb_app.c
#	openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
#	openair2/LAYER2/NR_MAC_gNB/config.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
#	openair2/LAYER2/nr_pdcp/nr_pdcp_entity.c
#	openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
#	openair2/RRC/LTE/rrc_eNB_GTPV1U.c
#	openair2/RRC/NR/L2_nr_interface.c
#	openair2/RRC/NR/MESSAGES/asn1_msg.c
#	openair2/RRC/NR/rrc_gNB.c
#	openair2/RRC/NR/rrc_gNB_NGAP.c
#	openair2/RRC/NR_UE/rrc_UE.c
#	openair3/NAS/NR_UE/nr_nas_msg_sim.c
#	openair3/ocp-gtpu/gtp_itf.cpp
#	targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
2021-06-30 17:00:30 +01:00
rmagueta
18fae95fc7 Fix UL TDA in config file for NSA 2021-06-29 18:54:52 +01:00
rmagueta
a65fb113c1 Merge remote-tracking branch 'origin/develop' into develop-NR_SA_F1AP_5GRECORDS 2021-06-28 14:22:57 +01:00
Remi Hardy
635dabae31 Merge branch 'integration_2021_wk25' into 'develop'
Integration 2021 wk25

MR !1187 : improve UE module control
* improve UE module control
* make Qlog generation optional
* add nsa tests
* update jenkins pipeline
2021-06-28 12:24:08 +00:00
hardy
9fa3e1a758 fix the module CM process start/check 2021-06-27 22:12:16 +02:00
matzakos
408d05c682 Configure PDCP entity for UE DRB with no integrity and ciphering to comply with configuration at gNB
-To be revisited if we want to enable integrity and ciphering for DRBs
2021-06-27 10:34:37 +02:00
rmagueta
c3c925bd4d Remove obsolete code from rrc_gNB_reconfig 2021-06-24 15:20:55 +01:00
rmagueta
4e449a0c40 Fix build warnings 2021-06-24 14:51:16 +01:00
luis_pereira87
e0769db455 Remove SRB2 from fill_initial_cellGroupConfig 2021-06-24 12:55:01 +01:00
francescomani
c249ca0bd8 fix for empty mib at beginning of execution 2021-06-24 12:22:03 +02:00
sfn
ae3e3c5f39 Fix PDSCH precoding bug 2021-06-24 11:08:33 +02:00
sfn
3a7dc238e0 Fix PUCCH bugs 2021-06-24 11:08:33 +02:00
sfn
3ac1f62bbb Enable DMRS Config Type 2 for MIMO transmission 2021-06-24 11:08:33 +02:00
sfn
3613927bc8 Extend rfsimulator to support 2 layers for DL transmission from cm line with option --l 1 or 2 2021-06-24 11:08:05 +02:00
luis_pereira87
7017306cfb RRCSetup should only configure SRB1 2021-06-23 21:13:26 +01:00
Laurent THOMAS
64e58a4300 dirty fixes that fix the UL malformed packets (detected in wireshark), and also internally memory corrpution 2021-06-23 21:41:56 +02:00
Thomas Schlichter
6f89a63d2c Merge remote-tracking branch 'origin/develop' into nr-dl-mimo-2layer 2021-06-23 14:00:07 +02:00
luis_pereira87
4015724213 Fix a regression in UE (LCID loop) 2021-06-23 11:29:37 +01:00
Laurent THOMAS
aa9837395e force UE DRB no integrity 2021-06-23 09:46:53 +02:00
Remi Hardy
195a87fdc7 fixing missing (new) arguments in TerminateUE call 2021-06-23 08:41:43 +02:00
luis_pereira87
8cef72ef9b Fix xer_printf buffer address 2021-06-23 05:01:51 +01:00
rmagueta
a675de4c8b Initialization of ssb_mask and ssb_period at UE for SA 2021-06-22 18:48:46 +01:00
Remi Hardy
014c09fddd fix nsa job trigger 2021-06-22 18:36:04 +02:00
Laurent THOMAS
17775c7ecc fix DRB bug in DL 2021-06-22 15:58:28 +02:00
Remi Hardy
49088aed1d fix AutoTerminate 2021-06-22 15:09:09 +02:00
Laurent THOMAS
75e999572f add DLinformationTransfer in nrUE, process SRB!=1 in UE (instead of discard), change struct member pdusession into pduSession to increase code readability (another struct contains also pdusession in lower case) 2021-06-22 14:26:25 +02:00
rmagueta
99ec7f0958 Fix ul_failure option for phy_test mode 2021-06-22 13:05:52 +01:00
Roberto Louro Magueta
0649737aa7 Revert "Revert ul_failure option"
This reverts commit 0cd356864a
2021-06-22 13:50:04 +02:00
rmagueta
0cd356864a Revert ul_failure option 2021-06-22 12:34:20 +01:00
Remi Hardy
86225c3b8f implement optional Qlog trace 2021-06-22 09:25:02 +02:00
Laurent THOMAS
24a84716df Merge branch 'NR_SA_F1AP_5GRECORDS' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_SA_F1AP_5GRECORDS-USIM 2021-06-21 21:06:31 +02:00
Laurent THOMAS
aef67d0310 fix merge NR_SA_F1AP_5GRECORDS and fix warnings, a regression in UE (LCID lopp) 2021-06-21 21:01:59 +02:00
rmagueta
ac79ceb3f4 Fix build of phy-simulators 2021-06-21 19:10:56 +01:00
rmagueta
6cefe15467 Fix issues after cherry-pick 2021-06-21 17:48:47 +01:00
Raymond Knopp
df21836f1d removed stats file generation for RRC temporarily 2021-06-21 18:46:58 +02:00
rmagueta
6bcc976c95 Merge remote-tracking branch 'origin/develop-NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS 2021-06-21 17:17:09 +01:00
Panos Matzakos
c9f72efc94 Update TESTING_5GSA_setup.md for setup with OAI UE 2021-06-21 16:13:48 +00:00
Laurent THOMAS
5d11b7444e fix array overflow and wrong LCID 2021-06-21 16:48:44 +01:00
Laurent THOMAS
83950e6c57 Merge branch 'NR_SA_F1AP_5GRECORDS' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_SA_F1AP_5GRECORDS-USIM 2021-06-21 13:00:35 +02:00
Laurent THOMAS
a88c33b148 fix array overflow and wrong LCID 2021-06-21 12:56:57 +02:00
Raymond Knopp
6293f61087 small changes for multiple lcid handling in gNB scheduler. PUSCH DTX handling and suspension of scheduling when UL failure is detected 2021-06-21 11:34:17 +01:00
Masayuki Harada
3a662d95f5 Move memory for USIM information to UICC. 2021-06-21 18:52:05 +09:00
rmagueta
5293e9bbe0 Merge remote-tracking branch 'origin/develop' into develop-NR_SA_F1AP_5GRECORDS
# Conflicts:
#	common/utils/system.c
2021-06-18 14:41:01 +01:00
hardy
0d3b42465a support of module attach detach + new nsa tests 2021-06-18 14:53:06 +02:00
Remi Hardy
fcecd0dfdb Integration 2021 wk24
MR !1179 : Fix Incorrect Array Size computation  
MR !1182 : CI NSA test fixes and enhancements  
MR !1169 : Dataplane bug in L2NFAPI_NOS1
2021-06-18 10:52:58 +00:00
Florian Kaltenberger
867d789476 Update TESTING_GNB_W_COTS_UE.md 2021-06-18 09:15:40 +00:00
hardy
03f7deccda Merge remote-tracking branch 'origin/512-dataplane-bug-in-l2nfapi_nos1' into integration_2021_wk24 2021-06-18 07:10:05 +02:00
hardy
b1df028c5b Merge remote-tracking branch 'origin/fix-check' into integration_2021_wk24 2021-06-18 07:09:05 +02:00
rmagueta
0108d75ecd Reset variables in rrc_gNB_generate_RRCRelease 2021-06-17 17:01:06 +01:00
Laurent THOMAS
b9268222a3 revert wrong commit on targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp 2021-06-17 16:59:20 +02:00
Laurent THOMAS
6fb9f92b84 replace itti message GTPV1U_DELETE_TUNNEL_REQ by direct call to gtpv1u_delete_s1u_tunnel() 2021-06-17 16:40:34 +02:00
Panos Matzakos
7076ac9afc Initiate tutorial for 5G SA setups (work in progress) 2021-06-17 13:30:48 +00:00
hardy
569dfb1420 change storage location of zipped qlog 2021-06-17 15:25:09 +02:00
Remi Hardy
8371109a93 adding new class for log mgt/rotation on remote servers 2021-06-17 09:58:15 +02:00
Thomas Schlichter
1c244de782 gNB: add nrOfLayers to sched_pdsch 2021-06-17 08:59:48 +02:00
matzakos
5bce383cc9 Remove X2 data RB tree entry at eNB after receiving sctp shutdown event from gNB
-If the gNB crashes when the X2 connection is established with the eNB, an sctp shutdown event is received from the eNB. However the x2 data related with
the connection were not removed from the RB tree. Then if the gNB tried to reconnect, it made the eNB exit because the eNB had kept the previous data.
Now we remove the x2 data as soon as the sctp shutdown event is received so that the eNB does not exit anymore at the next connection attempts.
2021-06-16 22:44:02 +02:00
hardy
5ef64f467a update att_tx in config to improve 5g attach in our setup 2021-06-16 13:40:08 +02:00
Laurent THOMAS
ec7958ed81 merge parent branch 2021-06-16 10:45:04 +02:00
Laurent THOMAS
c224ca8f6c fix srb error 2021-06-16 10:43:57 +02:00
Laurent THOMAS
763f034149 Merge branch 'NR_SA_F1AP_5GRECORDS' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_SA_F1AP_5GRECORDS 2021-06-16 10:41:49 +02:00
Laurent THOMAS
015ba5f076 fix arry size bug 2021-06-16 10:41:45 +02:00
hardy
534a58c558 fix iperf + tune max_rxgain for our setup 2021-06-15 17:06:35 +02:00
Raymond Knopp
66ab8e12a5 Avoid double call of gtpu task and call it only for the NSA and SA scenarios 2021-06-15 16:36:54 +02:00
Raymond Knopp
1198ef18dc Add missing function calls for proper gtp-u initialization in NSA scenario 2021-06-15 15:35:53 +02:00
Roberto Louro Magueta
5b5b48d32b Revert "Temporary assigment of incoming_rb_id in newGtpuCreateTunnel"
This reverts commit 7011c0d97e
2021-06-14 20:52:37 +02:00
rmagueta
7011c0d97e Temporary assigment of incoming_rb_id in newGtpuCreateTunnel 2021-06-14 19:03:40 +01:00
rmagueta
f0ff8b7cbe Remove call nr_DRB_preconfiguration after rrc_gNB_generate_RRCSetup 2021-06-14 17:57:48 +01:00
rmagueta
ebede5c932 Merge remote-tracking branch 'origin/develop' into develop-NR_SA_F1AP_5GRECORDS
# Conflicts:
#	openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
2021-06-14 16:53:10 +01:00
Laurent THOMAS
1b62c91532 add configurable USIM 2021-06-14 16:32:29 +02:00
Raphael Defosseux
2a6ebaaaae Fixes on the array size computation.
This work is based on feedback from Thomas Schlichter.
His comments and suggestions were made just after the original MR was merged.

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-06-14 14:56:01 +02:00
Remi Hardy
df645ef750 Integration 2021 wk23
MR !1180: \[CI\] nsa traces 
-NSA test and pipeline update for UE-module
-improve traces and log collection (pcap, QLog, stats)
 
MR !1126: bugfix-nr-t-reordering 
-deal with "infinity" case for t-reordering
-some small fixes (one bug i pdcp, one log set to LOG_E in rlc)
 
MR !1168: nr-pdcp-small-bugfixes
-better nettle version detection
-bad HFN computation at PDU reception
2021-06-14 10:53:47 +00:00
luis_pereira87
630b8b5806 Differentiate NSA and SA in some pieces of code 2021-06-11 16:22:16 +01:00
luis_pereira87
1c0640a21b Remove SRB configuration from gNB in NSA 2021-06-11 12:12:14 +01:00
hardy
c923a9ea30 Merge remote-tracking branch 'origin/nr-pdcp-small-bugfixes' into integration_2021_wk23 2021-06-11 11:04:18 +02:00
hardy
0494d38459 Merge remote-tracking branch 'origin/bugfix-nr-t-reordering' into integration_2021_wk23 2021-06-11 11:03:50 +02:00
hardy
2bf4571d70 Merge remote-tracking branch 'origin/ci_nsa_traces' into integration_2021_wk23 2021-06-11 11:03:21 +02:00
hardy
328664b4d6 remove benetel from nsa trigger (temporarily) 2021-06-10 22:17:15 +02:00
Raphael Defosseux
dafa448790 CI: fix command2, killing record process and building w/ ninja
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-06-10 16:37:56 +02:00
hardy
cd25915cd0 new html log to detect errors (removing ue) 2021-06-10 14:40:15 +02:00
Laurent THOMAS
6749c5f762 Make more accurate sctp socket failure messages 2021-06-10 13:11:56 +02:00
hardy
2f84dc6bd0 making enb pcap generation optional in xml 2021-06-09 21:45:50 +02:00
hardy
2c2d8bbf62 fixing tshark termination ; zip of QLog file 2021-06-09 15:51:07 +02:00
hardy
688cb7ae4e Qlog archive mgt 2021-06-09 14:18:36 +02:00
rmagueta
09a6d825b7 Avoid read null pointer file 2021-06-09 12:37:16 +01:00
hardy
19f5c7baa2 nsa test for usrp update 2021-06-09 12:46:04 +02:00
rmagueta
12f7f82391 Merge remote-tracking branch 'origin/develop' into develop-NR_SA_F1AP_5GRECORDS
# Conflicts:
#	openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
2021-06-09 11:10:07 +01:00
hardy
4e238b8700 fixing copy of pcap artifacts 2021-06-09 10:25:29 +02:00
hardy
19aadc07bb no longer need 3 resources reservation 2021-06-09 09:04:59 +02:00
Remi Hardy
97d0973476 update module mgt and log collect for nsa test 2021-06-08 17:38:40 +02:00
Remi Hardy
530b74dde9 Integration 2021 wk22
MR !1171 : \[RHEL8\]\[CONTAINER\] Runtime check when creating pThreads  
MR !1172 : \[Docker\] adding OAI LTE RU target build in a container image  
MR !1174 : flexran-rtc repository is now public  
MR !1167 : fixing bugs in pucch ue functions
2021-06-08 07:00:45 +00:00
Masayuki Harada
1b69c2a00d Remove pdcp_layer_init_for_CU function and merge to pdcp_layer_init. 2021-06-08 15:32:12 +09:00
Remi Hardy
773f2a58e4 add QLog traces and fix autoterminate for module 2021-06-07 23:05:36 +02:00
Luis Pereira
54666a932c Revert "Skip PDCP integrity verification"
This reverts commit cc71b3f88a
2021-06-07 10:24:33 +02:00
rmagueta
c7f0a287b0 Update dummy_enb.c 2021-06-06 18:59:28 +01:00
luis_pereira87
e8655d680a Update SA documentation in RUNMODEM.md 2021-06-06 13:19:33 +01:00
rmagueta
e72a6798c1 Change some LOG levels 2021-06-05 14:20:39 +01:00
Roberto Louro Magueta
98caeb10e1 Revert "Temporary assigment of incoming_rb_id in newGtpuCreateTunnel"
This reverts commit 3585d7da7b
2021-06-05 09:34:22 +02:00
rmagueta
98e9ee81c5 Fix build 2021-06-05 02:22:38 +01:00
luis_pereira87
37cf95c40a Fix indentation 2021-06-04 21:48:50 +01:00
luis_pereira87
126db8c96a Revert rlc_data_req instead of du_rlc_data_req for LTE 2021-06-04 21:37:46 +01:00
rmagueta
3585d7da7b Temporary assigment of incoming_rb_id in newGtpuCreateTunnel 2021-06-04 19:45:32 +01:00
rmagueta
72654d70b2 Revert build for ITTI_SIM OR RFSIM_NAS in CMakeLists 2021-06-04 18:24:12 +01:00
Luis Pereira
cf3e74082a Revert "Temporary hardcoded UhdVersion for CI (to be reverted)"
This reverts commit 5724498b1f
2021-06-04 07:10:01 +02:00
luis_pereira87
cc71b3f88a Skip PDCP integrity verification 2021-06-03 19:09:48 +01:00
rmagueta
5724498b1f Temporary hardcoded UhdVersion for CI (to be reverted) 2021-06-03 16:10:04 +01:00
rmagueta
af8d115dae Revert more pieces of code for LTE 2021-06-03 16:01:51 +01:00
rmagueta
c9a9c619c7 Add some LOGs 2021-06-03 13:47:38 +01:00
matzakos
0f98a57162 Remove redundant hack to send RRCSetupRequest through DCCH in F1 (CU/DU) mode
-Instead RRCSetupRequest is sent from DU to CU through nr_mac_rrc_data_ind()->DU_send_INITIAL_UL_RRC_MESSAGE_TRANSFER() and then through F1AP to CU.
2021-06-02 20:57:45 +02:00
rmagueta
b98cf717e5 Fix worker_config 2021-06-02 19:11:04 +01:00
luis_pereira87
5406a4534d Release RNTI of LTE PHY when RA does not succeed 2021-06-02 16:29:45 +01:00
hardy
53fe49227b Merge remote-tracking branch 'origin/NR_UE_PUCCH_bugfixes' into integration_2021_wk22 2021-06-02 14:23:50 +02:00
luis_pereira87
9068db43e0 Update CMakeLists.txt to choose NEW_GTPU for NR binaries, and keep legacy GTPU for LTE 2021-06-01 19:00:07 +01:00
luis_pereira87
22ef918b11 Fix removed declaration of "message_p" 2021-06-01 18:10:49 +01:00
hardy
003b1303d6 Merge remote-tracking branch 'origin/flexran-rtc-repo-is-public' into integration_2021_wk22 2021-06-01 17:03:22 +02:00
hardy
eed7ac0c56 Merge remote-tracking branch 'origin/add-ru-docker-image' into integration_2021_wk22 2021-06-01 17:02:48 +02:00
luis_pereira87
ff531831be Avoid decoding UL-CCCH with all zeros 2021-06-01 14:54:42 +01:00
Eurecom
d249c1ef80 testing with 2x2 and 4x4 with N310, small modifications in nr_ru_procedures and usrp_lib.cpp for multiple antennas 2021-06-01 09:48:20 +02:00
rmagueta
ac1d0dd09c Merge remote-tracking branch 'origin/ci_sa_rfsim_test' into develop-NR_SA_F1AP_5GRECORDS 2021-05-31 15:15:07 +01:00
rmagueta
42365c9a0f Set NEW_GTPU to false 2021-05-31 13:55:40 +01:00
Roberto Louro Magueta
2e518d95fa Revert "Merge remote-tracking branch 'remotes/oai/develop-NR_SA_F1AP_5GRECORDS' into..."
This reverts commit 4100dc3338
2021-05-31 14:13:46 +02:00
Masayuki Harada
4100dc3338 Merge remote-tracking branch 'remotes/oai/develop-NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS 2021-05-31 20:30:21 +09:00
rmagueta
a205dcbf44 Fix GTP for LTE 2021-05-31 12:10:24 +01:00
Masayuki Harada
46183f895f Merge remote-tracking branch 'remotes/oai/develop-NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS 2021-05-31 18:45:37 +09:00
Xue Song
7379717ddf Remove duplicate code
In the UE executable, delete the initialization of NR.nrrrc and check the NULL of NR.nrrrc
2021-05-31 17:36:18 +09:00
Roberto Louro Magueta
1145a5516c Revert "Change hardcoded task id to TASK_VARIABLE"
This reverts commit 64aa42d646
2021-05-31 02:05:38 +02:00
Eurecom
ac4670990c handling for UL failure. added do_precoding flag to nr-ru procedures. testing with 2x2 N310. 2021-05-30 23:14:12 +02:00
rmagueta
64aa42d646 Change hardcoded task id to TASK_VARIABLE 2021-05-30 20:16:55 +01:00
rmagueta
769da284fb Change some hardcode values 2021-05-30 12:33:21 +01:00
rmagueta
024808e6fa Revert more pieces of code to LTE 2021-05-29 20:35:53 +01:00
Roberto Louro Magueta
8c80b83478 Revert "Temporary revert of GTPU"
This reverts commit 372982d502
2021-05-29 17:50:50 +02:00
rmagueta
9a2ba4ece7 Merge remote-tracking branch 'origin/develop-NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS 2021-05-29 00:14:55 +01:00
rmagueta
372982d502 Temporary revert of GTPU 2021-05-29 00:13:55 +01:00
francescomani
9460c27589 current implementation does not allow 2 csi report in a frame, moving second one in the following frame 2021-05-28 18:58:51 +02:00
luis_pereira87
ef509a9810 Uncomment fields in F1 gNB-CU CONFIGURATION UPDATE 2021-05-28 14:07:22 +01:00
luis_pereira87
9ae4d8639a Fix fiveGS_TAC byte order for LTE 2021-05-28 12:38:44 +01:00
francescomani
a3b5b905b2 bugfixes for phy-test mode and BWP less than 50 PRBs 2021-05-28 12:08:34 +02:00
Raphael Defosseux
2632d81d36 CI: adding setting the routes for L2 Simulator in noS1 mode
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-05-28 10:36:52 +02:00
Luis Pereira
fa33b048b0 Revert "Add logs for cellId in F1"
This reverts commit ffb6fa7cc6
2021-05-28 07:02:42 +02:00
luis_pereira87
ffb6fa7cc6 Add logs for cellId in F1 2021-05-28 00:38:46 +01:00
luis_pereira87
6c494737f0 Revert LTE related code in DU_handle_UE_CONTEXT_SETUP_REQUEST 2021-05-28 00:20:33 +01:00
luis_pereira87
e78e296eb0 Avoid assertion in F1 for LTE 2021-05-27 16:52:00 +01:00
francescomani
dd92d7b651 rrc configuration for SSB and CSI RSRP measurements 2021-05-27 17:36:54 +02:00
luis_pereira87
55936d24bf Refactor some logs 2021-05-27 16:14:19 +01:00
Luis Pereira
ed0d8ee0be Revert "Add logs for debug segmentation fault (to be reverted)"
This reverts commit a9527371e7
2021-05-27 17:07:20 +02:00
Luis Pereira
5040d32964 Revert "Temporary commit (to be reverted)"
This reverts commit 28ca9cfc38
2021-05-27 17:06:44 +02:00
Luis Pereira
4473ac7c00 Revert "Temporary commit #2 (to be reverted)"
This reverts commit b17b688c58
2021-05-27 17:05:44 +02:00
Raymond Knopp
8456908ef8 F1Setup procedure working for both LTE and NR 2021-05-27 15:49:30 +02:00
hardy
8fbf444598 add/update sa conf file 2021-05-27 15:30:30 +02:00
hardy
a5bab48bf8 fix syntax error 2021-05-27 15:30:13 +02:00
Raphael Defosseux
6e981f6b65 CI: removing all credentials
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-05-27 14:59:22 +02:00
luis_pereira87
fb0b99af3e Fix another SI_container index for LTE 2021-05-27 11:56:17 +01:00
francescomani
a1e3b5476b Merge remote-tracking branch 'origin/develop' into NR_CSIRS_tomerge 2021-05-27 11:52:12 +02:00
luis_pereira87
b17b688c58 Temporary commit #2 (to be reverted) 2021-05-27 07:53:05 +01:00
Eurecom
5530f0ce8b Merge branch 'NR_SA_F1AP_5GRECORDS' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_SA_F1AP_5GRECORDS 2021-05-27 08:15:32 +02:00
Eurecom
51d93911f0 Merge branch 'NR_SA_F1AP_5GRECORDS' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_SA_F1AP_5GRECORDS
Conflicts:
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
2021-05-27 08:15:22 +02:00
luis_pereira87
28ca9cfc38 Temporary commit (to be reverted) 2021-05-27 06:24:48 +01:00
luis_pereira87
a9527371e7 Add logs for debug segmentation fault (to be reverted) 2021-05-26 22:33:55 +01:00
luis_pereira87
892dcfa295 Fix another SI_container index for LTE 2021-05-26 22:29:16 +01:00
luis_pereira87
8d096b22fd Remove unused variable 2021-05-26 22:24:03 +01:00
luis_pereira87
2be74a6452 Revert dci format indicator assignment for NR_UL_DCI_FORMAT_0_0 2021-05-26 17:53:06 +01:00
matzakos
f60e599730 Enable IP TUN interface configuration upon reception of PDU Session Establishment Accept NAS message
-User plane traffic validation with OAI UE and OAI CN:

-Downlink ping initiated from the CN is received at the IP interface of the UE. However it seems that there is some packet corruption preventing the generaration of ping reply.

-Uplink ping initiated from the UE reaches the OAI CN machine. However no ping reply is seen yet either.
2021-05-26 17:56:02 +02:00
matzakos
01635a40f8 Enable DRB configuration for PDCP, RLC at OAI UE 2021-05-26 17:47:53 +02:00
hardy
39e3196ec9 fix typo 2021-05-26 17:42:17 +02:00
hardy
44f7766a3d adding SA rfsim test 2021-05-26 17:39:19 +02:00
rmagueta
56c5a0b3c3 Fix SI_container index for LTE 2021-05-26 16:19:07 +01:00
Roberto Louro Magueta
a257024cf1 Revert "Add condition in CU_handle_F1_SETUP_REQUEST to LTE version"
This reverts commit 65d24ae205
2021-05-26 17:16:00 +02:00
Raphael Defosseux
c7bad3db4a [Docker] adding IF4.5 template conf files for eNB target image
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-05-26 17:14:00 +02:00
Raphael Defosseux
f4e7c2ae0a [Docker] adding OAI LTE RU target build in a container image
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-05-26 16:15:42 +02:00
rmagueta
65d24ae205 Add condition in CU_handle_F1_SETUP_REQUEST to LTE version 2021-05-26 11:37:21 +01:00
rmagueta
9bbfd60d2f Revert if in CU_send_UE_CONTEXT_SETUP_REQUEST to LTE version 2021-05-26 11:35:10 +01:00
Roberto Louro Magueta
35d6cb706f Revert "Temporary commit (will be reverted)"
This reverts commit f207446117
2021-05-26 12:14:39 +02:00
Raphael Defosseux
1b4faa8ddd fix added cppcheck errors
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-05-26 10:00:45 +02:00
rmagueta
f207446117 Temporary commit (will be reverted) 2021-05-26 02:50:06 +01:00
luis_pereira87
13990e614c Fix nRNRB for LTE 2021-05-25 15:08:51 +01:00
Raphael Defosseux
aa6b36a60f [RHEL8][CONTAINER] Runtime check when creating pThreads
It looks like :
  - when running on a Fedora-host
  - with generic kernel
  - in a container
  - even in privileged mode

That is not enough and priority/schedule settings is not allowed.

So at runtime, we check and in case, we don't set up priorities.

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-05-25 14:41:30 +02:00
Francesco Mani
1e4d4b1e04 Apply 1 suggestion(s) to 1 file(s) 2021-05-25 12:32:42 +01:00
francescomani
fb413c8bde fixing bugs in pucch ue functions 2021-05-25 12:32:37 +01:00
luis_pereira87
145dd0c9bf Update condition to preconfigure DRB in phy-test mode 2021-05-25 12:32:03 +01:00
Xenofon Foukas
db4769bc35 Fixes to L2NFAPI_NOS1 dataplane traffic forwarding
This commit fixes a bug that makes the dataplane traffic of all the
emulated UEs to go through the interface of the first UE (oaitun_ue1).

The fix uses the last octet of the IP assigned to each UE to map it to its
UE_id, which is then used to get its RNTI and the correct PDCP queue.
For the emulator to work properly, the routing tables of the emulated UEs
must also be set. This patch introduces a script (setup_routes.sh) in
cmake_targets/tools that configures the routing tables. This script
must be run at the UE host machine once the UEs have successfully attached,
passing the number of emulated UEs as the argument. For example, in the
case of 16 emulated UEs, one must run "./setup_routes.sh 16".
2021-05-24 16:33:12 +01:00
luis_pereira87
2a0510e29d Fix num_dmrs_cdm_grps_no_data in allocate_dl_retransmission 2021-05-24 16:17:11 +01:00
luis_pereira87
6d311e9e63 Avoid segmentation fault when RC.nrrrc is not present 2021-05-24 15:52:02 +01:00
luis_pereira87
08832facaa Fix setup parameters for F1U 2021-05-24 14:51:42 +01:00
luis_pereira87
824faeb163 Avoid a segmentation fault in LTE when first_uci_stats is NULL 2021-05-22 17:11:19 +01:00
Cedric Roux
02cedc0ca1 nr pdcp: bugfix: better nettle version detection
This fix may fail to work.

we should stop supporting old versions of nettle at some point.
2021-05-22 12:56:52 +02:00
Cedric Roux
e26c1f6f6d nr pdcp: bugfix: bad HFN computation at PDU reception 2021-05-22 12:56:43 +02:00
Francesco Mani
fe09b529b3 Apply 1 suggestion(s) to 1 file(s) 2021-05-22 06:22:42 +00:00
rmagueta
363c2bc74a Merge remote-tracking branch 'origin/develop' into develop-NR_SA_F1AP_5GRECORDS 2021-05-21 18:39:48 +01:00
Thomas Schlichter
1c440be48e NR_UE: in nr_ue_dlsch_procedures() use TimeDomainAllocationList from bwp_Common if there is none in bwp_Dedicated 2021-05-21 18:00:33 +02:00
francescomani
56def3a18e fixing bugs in pucch ue functions 2021-05-21 17:11:09 +02:00
hardy
c19ba39eaa reverted from MR1153 to make Benetel UL traffic run ok 2021-05-21 16:15:44 +02:00
matzakos
c7ce307d70 Fix removing of gtp-u extension header 2021-05-21 11:57:26 +02:00
luis_pereira87
a7cb146dce Merge remote-tracking branch 'origin/develop' into develop-NR_SA_F1AP_5GRECORDS
# Conflicts:
#	ci-scripts/cls_oaicitest.py
2021-05-21 10:41:34 +01:00
hardy
f2c564444a fix nsa benetel testcase (not correctly merged) 2021-05-21 09:59:19 +02:00
Eurecom
cf1b125705 minor change in logging 2021-05-21 08:52:12 +02:00
Thomas Schlichter
97c199dd84 Merge remote-tracking branch 'origin/develop' into nr-dl-mimo-2layer 2021-05-21 08:38:14 +02:00
Remi Hardy
ccd6a0ee12 Integration 2021 wk20
MR !1161 : Improvements on CCE-to-REG mapping and interleaver
- Improvements on CCE-to-REG mapping and interleaver to support coresets with more than 1 symbol duration

MR !1153 : Nr cleanup pucch resources
- Removing unused PUCCH resources and accordingly increasing the PUCCH symbol allocation by 1 unit (now 13 symbols in regular slot)

MR !1162 : [CI] nsa and benetel pipelines with quectel
-adapt iperf routines for quectel 
-change quectel NIC name 
-new NSA test markers for eNB and gNB 
-several bugfixes (CI python)

MR !1164 : fix compile
- Fix several compilation issues nr-ittisim, uescope, telnetsrv, 
- fixed also the F1AP asn1c recompilation 
- some compilation warnings struct members "Status" is a problem as long as we use a Xwindow include

MR !1154 : implementation of handling csi and harq in the same pucch2
- Implementation of multiplexing CSI report and ACKs in the same PUCCH (format 2)

MR !1158 : Fix nr_ulsim
- fix call nr_ue_pusch_common_procedures() in nr_ulsim. This means there was no actual PUSCH transmission and all LLR were 0

MR !1159 : physim-deploy-handle-error-cases
-When failing, physim test on openshift cluster is not properly creating HTML report 
-Removing trailing / in xxx.git/ 
-Increased timeout of git checkout -f calls

MR !1165 : [CI] fixing test retry for module UE
- CI hotfix for module UE ip addresses mgt

MR !1166 : [CI] NSA uplink + benetel longrun
-fix moduleUE UL iperf implem
-add UL test for benetel
-xml file cleaning
-new benetel long run test
2021-05-20 20:38:16 +00:00
Thomas Schlichter
581c0f062a update FEATURE_SET.md 2021-05-20 19:03:14 +02:00
francescomani
bccd61a262 adding non-PMI-portindication to config 2021-05-20 19:02:39 +02:00
francescomani
0ce2f47725 add assertions in compute_csi_bitlen to avoid segmentation fault 2021-05-20 18:47:28 +02:00
Thomas Schlichter
d62f92c6a7 NR_UE: remove several unused structures from PHY layer 2021-05-20 18:32:51 +02:00
luis_pereira87
c1a8c3fd15 Fix all RRC status to StatusRrc 2021-05-20 15:27:31 +01:00
Thomas Schlichter
71a5ae2454 NR_UE: further cleanup of DMRS configuration 2021-05-20 16:24:11 +02:00
Thomas Schlichter
20f8895316 fix nr_dlsim: make dmrs_config_type optional again 2021-05-20 16:11:38 +02:00
matzakos
5c33daa803 Trigger DRB mac configuration (Fujitsu patch) 2021-05-20 14:37:58 +02:00
Laurent THOMAS
449bab30c7 fix nr UE bug: random freeze (mutex not init) 2021-05-20 14:20:00 +02:00
Laurent THOMAS
83688c964d rf calibration tool improvement 2021-05-20 09:53:52 +02:00
hardy
aef47088b1 Merge remote-tracking branch 'origin/ci_nsa_uplink' into integration_2021_wk20_a 2021-05-19 23:52:06 +02:00
hardy
c3f429b022 update for benetel long run 2021-05-19 23:48:26 +02:00
rmagueta
49ea1197bb Fix CI UE status "oaitun_ue1 interface is either NOT mounted or NOT configured" 2021-05-19 16:04:54 +01:00
rmagueta
cb0a80d25a Merge remote-tracking branch 'origin/ci_nsa_uplink' into develop-NR_SA_F1AP_5GRECORDS
# Conflicts:
#	ci-scripts/cls_oaicitest.py
2021-05-19 15:46:20 +01:00
hardy
9f64696d3b adding nsa benetel long run 2x20min test 2021-05-19 15:43:02 +01:00
hardy
56ec847b47 update nsa benetel with UL test step 2021-05-19 15:42:58 +01:00
hardy
921f624b68 solve iperf UL implementation for module UE 2021-05-19 15:42:50 +01:00
Laurent THOMAS
96e3d00ac7 fix again RU compilation case 2021-05-19 15:25:42 +01:00
Laurent THOMAS
3b560229c4 fix constant in weird case 'NO_RRC', linked to 'RU' compilation case 2021-05-19 15:25:32 +01:00
Raphael Defosseux
7a71c6c64a CI: increased timeouts on uhd_find_devices commands
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-05-19 15:24:41 +01:00
rmagueta
a7a3bf5d90 Merge remote-tracking branch 'origin/NR_multiplexing_HARQ_CSI_PUCCH' into develop-NR_SA_F1AP_5GRECORDS
# Conflicts:
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
#	openair2/LAYER2/NR_MAC_gNB/mac_proto.h
2021-05-19 15:00:52 +01:00
rmagueta
be3d187727 Merge remote-tracking branch 'origin/ci_test_nsa_fix_quectel_nic' into develop-NR_SA_F1AP_5GRECORDS 2021-05-19 14:36:22 +01:00
hardy
a06e5041b2 Merge remote-tracking branch 'origin/ci_nsa_uplink' into integration_2021_wk20_a 2021-05-19 15:26:45 +02:00
hardy
5af1e3fc97 adding nsa benetel long run 2x20min test 2021-05-19 15:15:15 +02:00
hardy
dc0260697d update nsa benetel with UL test step 2021-05-19 15:12:05 +02:00
rmagueta
cae536525e Merge remote-tracking branch 'origin/develop-CCE' into develop-NR_SA_F1AP_5GRECORDS 2021-05-19 14:07:26 +01:00
rmagueta
e96a4b04d8 Fix issue after merge 2021-05-19 14:05:10 +01:00
hardy
c8acf1baa7 solve iperf UL implementation for module UE 2021-05-19 14:53:01 +02:00
Thomas Schlichter
ff5eb3e657 Merge remote-tracking branch 'origin/develop' into nr-dl-mimo-2layer 2021-05-19 11:42:04 +00:00
rmagueta
2c47d15fc0 Merge remote-tracking branch 'origin/fix_nr_ulsim' into develop-NR_SA_F1AP_5GRECORDS
# Conflicts:
#	openair1/SCHED_NR/phy_procedures_nr_gNB.c
2021-05-19 12:40:49 +01:00
rmagueta
997b198bb1 Fix issues after merge 2021-05-19 12:28:40 +01:00
rmagueta
8c5725ed46 Merge remote-tracking branch 'origin/fix-compile' into develop-NR_SA_F1AP_5GRECORDS
# Conflicts:
#	cmake_targets/CMakeLists.txt
#	openair2/RRC/NR_UE/rrc_UE.c
#	openair2/SIMULATION/NR_RRC/itti_sim.c
2021-05-19 12:09:27 +01:00
rmagueta
a11ff65350 Merge remote-tracking branch 'origin/ci_hotfix_module_ue_ip_address' into develop-NR_SA_F1AP_5GRECORDS 2021-05-19 11:50:57 +01:00
rmagueta
e7f2bb73f9 Merge remote-tracking branch 'origin/physim-deploy-handle-error-cases' into develop-NR_SA_F1AP_5GRECORDS 2021-05-19 11:45:15 +01:00
Laurent THOMAS
d40486b100 fix again RU compilation case 2021-05-19 12:08:51 +02:00
Laurent THOMAS
d42e44ec28 revert thread configuration specific to test 2021-05-19 12:02:29 +02:00
Laurent THOMAS
9130197657 add wireshark header files 2021-05-19 10:26:26 +02:00
Laurent THOMAS
16d9d33d04 Fix minor bugs and wrong reported trace 2021-05-19 09:58:48 +02:00
Laurent THOMAS
b719f5712e fix constant in weird case 'NO_RRC', linked to 'RU' compilation case 2021-05-19 09:52:09 +02:00
rmagueta
081fbd3593 Make all compile in same tree 2021-05-18 18:45:11 +01:00
Raphael Defosseux
a8691d5d22 CI: increased timeouts on uhd_find_devices commands
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-05-18 13:37:05 +02:00
luis_pereira87
7743c84e30 Merge remote-tracking branch 'origin/develop' into develop-NR_SA_F1AP_5GRECORDS 2021-05-18 09:41:58 +01:00
Cedric Roux
e257f76dd0 nr: rlc: minor: set log level to error for max retx reached
Just in case there is a problem, better to see it.

max retx reached means "radio link failure". We should do
something about it at some point. For the moment, let's
inform the user that there is a problem.

We can set back to LOG_D later in time when we deal with it
properly.
2021-05-18 10:30:26 +02:00
Cedric Roux
913f402280 nr: pdcp: accept "infinity" for t-reordering
"infinity" is -1 in the code.
2021-05-18 10:30:26 +02:00
Cedric Roux
8393744c3f nr: bugfix: bad check
38.323 5.2.2.1 says:

    "if t-Reordering is running, and if RX_DELIV >= RX_REORD"

Let's do as is said.
2021-05-18 10:30:26 +02:00
hardy
2067d79a2d Merge remote-tracking branch 'origin/ci_hotfix_module_ue_ip_address' into integration_2021_wk20_a 2021-05-17 18:39:24 +02:00
hardy
ff31beac07 fixing test retry with different IP adresses assigned to module UE 2021-05-17 18:35:32 +02:00
hardy
ab125e0320 Merge remote-tracking branch 'origin/physim-deploy-handle-error-cases' into integration_2021_wk20_a 2021-05-17 15:44:29 +02:00
rmagueta
6dab5f4a8d Fix segmentations fault after merge 2021-05-17 14:40:41 +01:00
hardy
ed814c0fef Merge remote-tracking branch 'origin/fix_nr_ulsim' into integration_2021_wk20_a 2021-05-17 15:24:27 +02:00
Raphael Defosseux
bee7e57b4b RHEL8-UHD support: revert back to 4.0.0.0 version
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-05-17 14:55:20 +02:00
rmagueta
fd3a45de82 Fix build issues 2021-05-17 12:01:32 +01:00
Thomas Schlichter
61de3bf995 Merge remote-tracking branch 'origin/develop' into fix_nr_ulsim 2021-05-17 11:52:07 +02:00
hardy
ca60a69fc6 Merge remote-tracking branch 'origin/NR_multiplexing_HARQ_CSI_PUCCH' into integration_2021_wk20_a 2021-05-17 10:13:39 +02:00
hardy
568af88807 Merge remote-tracking branch 'origin/fix-compile' into integration_2021_wk20_a 2021-05-17 10:12:27 +02:00
rmagueta
cf605f4c77 Merge remote-tracking branch 'origin/develop' into develop-NR_SA_F1AP_5GRECORDS
# Conflicts:
#	cmake_targets/CMakeLists.txt
#	cmake_targets/build_oai
#	openair1/PHY/INIT/nr_init_ru.c
#	openair1/PHY/NR_TRANSPORT/nr_ulsch.c
#	openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c
#	openair1/SCHED_NR/phy_procedures_nr_gNB.c
#	openair1/SIMULATION/NR_PHY/ulsim.c
#	openair2/COMMON/platform_constants.h
#	openair2/ENB_APP/enb_config.c
#	openair2/F1AP/f1ap_cu_interface_management.c
#	openair2/F1AP/f1ap_cu_rrc_message_transfer.c
#	openair2/F1AP/f1ap_cu_ue_context_management.c
#	openair2/F1AP/f1ap_du_interface_management.c
#	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
#	openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
#	openair2/RRC/LTE/rrc_eNB.c
#	openair2/RRC/NR/rrc_gNB.c
#	openair2/RRC/NR_UE/rrc_UE.c
2021-05-17 01:36:39 +01:00
Laurent THOMAS
b5bbfdade3 after merge, remain compile errors 2021-05-16 23:57:35 +02:00
hardy
a07e39593c Merge remote-tracking branch 'origin/ci_test_nsa_fix_quectel_nic' into integration_2021_wk20_a 2021-05-16 21:25:26 +02:00
hardy
a362493cce Merge remote-tracking branch 'origin/NR_cleanup_PUCCH_resources' into integration_2021_wk20_a 2021-05-16 21:24:38 +02:00
hardy
6c23cb6591 Merge remote-tracking branch 'origin/develop-CCE' into integration_2021_wk20_a 2021-05-16 21:24:19 +02:00
Remi Hardy
df6b6a723f Integration 2021 wk19
MR !1028 : oairu
-standalone RRU executable for quick building on simple platforms (no building of L1/L2 procedures) 
-small changes for improving eNB in outdoor deployment scenarios - power control loop, bugfixes, gathering of statistics (L1,MAC,PDCP,RRC), UL measurement procedures, 2/4 antenna reception testing for LTE eNB 
-x300/n300 eNB testing and minor improvements 
-level shifting for x300/n300 
-minimizing L1 variables in MAC 
-removal of RC in RU code sections, minimizing use of RC in L1 code sections

MR !1141 : nr-dmrs-fixes
-NR fixes, identified by UXM tests
2021-05-15 06:51:03 +00:00
Raymond Knopp
1a8c9a562f small changes for multiple lcid handling in gNB scheduler. PUSCH DTX handling and suspension of scheduling when UL failure is detected 2021-05-14 15:53:58 +02:00
Francesco Mani
e15231264a Update description of function nr_acknack_scheduling 2021-05-14 07:10:40 +00:00
luis_pereira87
b62e8d9c1f Change LOG level 2021-05-13 16:31:42 +01:00
luis_pereira87
a6069f7481 Fix dl_carrier assignment 2021-05-13 16:30:21 +01:00
Roberto Louro Magueta
1bad80c692 Revert "Update gnb.band78.tm1.106PRB.usrpn300.conf to a valid pair..."
This reverts commit ee6b77023f
2021-05-13 16:46:19 +02:00
Raymond Knopp
d81a5da4c7 Merge branch 'NR_SA_F1AP_5GRECORDS' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_SA_F1AP_5GRECORDS
Conflicts:
	openair1/PHY/NR_TRANSPORT/nr_prach.c
2021-05-13 09:12:39 +02:00
Raymond Knopp
4c3b718825 commit before merge 2021-05-13 09:11:34 +02:00
Eurecom
d2ec72b09c Merge branch 'NR_SA_F1AP_5GRECORDS' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_SA_F1AP_5GRECORDS 2021-05-13 09:10:03 +02:00
Eurecom
586fc52f8d 50 MHz formats, prach RX scaling 2021-05-13 09:09:09 +02:00
Eurecom
6e49488f74 Merge branch 'gnb-n300-fixes' into NR_SA_F1AP_5GRECORDS 2021-05-13 09:06:46 +02:00
rmagueta
0ef6ef2b28 Code format improvements in differences for develop 2021-05-12 19:29:10 +01:00
rmagueta
ee6b77023f Update gnb.band78.tm1.106PRB.usrpn300.conf to a valid pair absoluteFrequencySSB/dl_absoluteFrequencyPointA for 106 RBs 2021-05-12 14:20:35 +01:00
Remi Hardy
985d02f8e1 align nsa-usrp and nsa-benetel tests 2021-05-12 13:36:15 +02:00
Remi Hardy
59bbef3b2f change NSA test trigger (tag) 2021-05-12 10:57:40 +02:00
Remi Hardy
318d4c08c9 several bugfixes + make pipelines work for DL, iperf UL KO 2021-05-12 10:40:00 +02:00
hardy
3d908be3a1 new nsa markers for enb and gnb when terminating 2021-05-12 10:40:00 +02:00
hardy
9769fb6231 fix a bug in IperfNoS1, from moduleUE related work 2021-05-12 10:39:59 +02:00
francescomani
052f254306 fix in a condition for pucch2 2021-05-12 10:23:58 +02:00
Laurent THOMAS
e7a43fb394 fix 4G DL rb id 2021-05-11 22:26:50 +02:00
matzakos
64cb9407ba Add support for Initial context setup request carrying PDU Session resource setup list
-Apply patch from Fujitsu
-Trigger dedicated RRC Reconfiguration with DRB and SRB2 configuration once the PDU session is established
-Validation of control plane sequence with OAI CN and Nokia SA Box
2021-05-11 22:19:55 +02:00
rmagueta
bfd7954fb7 Fix srb cppcheck errors/warnings 2021-05-11 15:43:40 +01:00
rmagueta
9c417e1a14 Fix uplink data in phy-test 2021-05-11 15:38:49 +01:00
Laurent THOMAS
f04008a423 add file 2021-05-11 16:14:39 +02:00
rmagueta
0792bf767a Merge remote-tracking branch 'origin/develop-NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS 2021-05-11 15:01:08 +01:00
rmagueta
5919b891bb Fix new cppcheck errors/warnings 2021-05-11 15:00:39 +01:00
Laurent THOMAS
a51d0d37bf Merge branch 'develop-NR_SA_F1AP_5GRECORDS' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-NR_SA_F1AP_5GRECORDS 2021-05-11 14:35:05 +02:00
Laurent THOMAS
7d3c60ed37 small fixes, make all compile is same tree 2021-05-11 14:34:27 +02:00
rmagueta
f1da217dc3 Do not call nr_ue_prach_scheduler in phy_test mode 2021-05-11 12:17:58 +01:00
hardy
a2574a9397 fix a bug in IperfNoS1, from moduleUE related work 2021-05-11 10:21:04 +02:00
hardy
681beefd76 Merge remote-tracking branch 'origin/nr-dmrs-fixes' into integration_2021_wk19 2021-05-10 21:41:44 +02:00
rmagueta
657bcd8f46 CCE-to-REG mapping extended for 2 or more DCI symbols at UE 2021-05-10 20:11:26 +01:00
Raphael Defosseux
df084c5825 CI: some cosmetics changes and better handling physim cluster deployment errors
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-05-10 14:04:51 +02:00
Laurent THOMAS
2508a020ec fix random crash (uninitialized memory) 2021-05-10 11:31:54 +01:00
Laurent THOMAS
c631c96975 bug fixes 2021-05-10 11:29:44 +01:00
rmagueta
47ae1b4b65 Merge remote-tracking branch 'origin/develop' into develop-NR_SA_F1AP_5GRECORDS 2021-05-10 11:14:12 +01:00
rmagueta
2c52a71587 Merge remote-tracking branch 'origin/develop' into develop-CCE 2021-05-10 11:09:47 +01:00
Laurent THOMAS
98e3afe7db fix random crash (uninitialized memory) 2021-05-10 11:52:43 +02:00
Laurent THOMAS
7ee6b61f4b bug fixes 2021-05-10 11:29:49 +02:00
hardy
71b0818327 added cleaning of module ue iperf artifacts 2021-05-10 09:58:05 +02:00
Raymond Knopp
83ccc50f18 Merge remote-tracking branch 'origin/develop' into oairu 2021-05-10 00:39:55 +02:00
Remi Hardy
0aff278472 CI fix quectel nic name 2021-05-09 17:51:02 +02:00
Raymond Knopp
e2b68a99a9 CU/DU support for most recent changes. UE continues as far as in monolithic mode. Still to apply masterCellGroupConfig in DU from RRCReconfiguration. This has to be detected in DU and applied after decoding the RRC message intended for UE. 2021-05-09 12:44:55 +02:00
francescomani
74e2ea96cf Merge remote-tracking branch 'origin/develop' into NR_multiplexing_HARQ_CSI_PUCCH 2021-05-08 11:39:04 +02:00
Remi Hardy
6d1bc204f0 Integration 2021 wk18 b
MR !1156 : bugfix_gnb_rt_stats_html
-bugfix for 5G NR phy test: the rt report in html shall be displayed only for gNB

MR !1155 : fix-physim-deploy
-The pexpect method has echo issues and is not reliable when we do the polling.
-added a few wait states when pushing the image to the cluster.
-first step also for giving up on remote hosts credentials as the used method implies SSH key authentication.

MR !1146: ci_quectel_support
-Support for quectel module as UE for NSA and Benetel tests
-First step for UE infra / testbench infra as code
2021-05-08 06:51:00 +00:00
rmagueta
eed0c89feb CCE-to-REG mapping extended for 2 or more DCI symbols 2021-05-07 20:13:17 +01:00
matzakos
31d73a7bf2 Remove artificial triggering of RRC Setup Request from nrUE 2021-05-07 15:06:52 +02:00
matzakos
0ea7946da8 Remove redundant call to init_pdcp for noS1 2021-05-07 15:05:05 +02:00
Parminder Singh
8c023d7c66 Added uplink processing check to avoid false detection in ULSIM.
- In case no signal is received then energy of ULSCH is zero,
  the phy_procedures_gNB_uespec_RX will return 1 as an error.
2021-05-07 11:23:38 +02:00
francescomani
e7fb3c11ce Merge remote-tracking branch 'origin/develop' into NR_scheduling_CSIRS 2021-05-07 11:11:18 +02:00
hardy
c374cda62d Merge remote-tracking branch 'origin/ci_quectel_support' into integration_2021_wk18_b 2021-05-07 11:04:04 +02:00
hardy
4881275269 Merge remote-tracking branch 'origin/fix-physim-deploy' into integration_2021_wk18_b 2021-05-07 11:03:39 +02:00
Luis Pereira
31b12e2e0c Revert "Temporary fix for skip DL slots with invalid dl_DataToUL_ACK timing with OAI UE"
This reverts commit 9512e914fa
2021-05-07 10:16:21 +02:00
hardy
f5a76d7983 fix test retry due to N310 init issue 2021-05-06 23:41:15 +02:00
hardy
405bbac936 CI hotfix for rt stats table in HTML 2021-05-06 23:01:54 +02:00
Thomas Schlichter
4db9c78450 fix PDSCH DMRS configuration type 2 2021-05-06 20:27:56 +02:00
rmagueta
d2ddfa1fbd Update SA config files 2021-05-06 18:41:26 +01:00
rmagueta
9512e914fa Temporary fix for skip DL slots with invalid dl_DataToUL_ACK timing with OAI UE 2021-05-06 17:46:12 +01:00
francescomani
5bacfb4015 another attempt at fixing FR2 RA 2021-05-06 15:32:23 +02:00
rmagueta
9b903ea20c Merge remote-tracking branch 'origin/develop' into develop-NR_SA_F1AP_5GRECORDS 2021-05-06 11:07:24 +01:00
Parminder Singh
9f16383331 Call common pusch procedure in ulsim
- The TX signal is prepared but not sent which leads to all 0's TX signal.
2021-05-06 11:31:30 +02:00
Raphael Defosseux
f75d0126d2 CI: fix renaming artifact
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-05-06 11:18:01 +02:00
hardy
3dc9e3d19c [CI] hotfix, gNB N310 conf file update 2021-05-06 10:49:30 +02:00
Thomas Schlichter
985338756a Merge remote-tracking branch 'origin/develop' into nr-dl-mimo-2layer 2021-05-06 09:36:43 +02:00
francescomani
6222463fd8 Merge branch 'develop-NR_SA_F1AP_5GRECORDS' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-NR_SA_F1AP_5GRECORDS 2021-05-06 09:34:44 +02:00
francescomani
a8308db7bc fixes for FR2 RA 2021-05-06 09:34:25 +02:00
rmagueta
055f147d13 Fix build in phy-simulators 2021-05-05 19:59:24 +01:00
rmagueta
bd1283e40a Fix phy-simulators 2021-05-05 17:39:57 +01:00
Raphael Defosseux
e5498d21a2 CI: fixing the detection for the end of execution on pods
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-05-05 16:46:15 +02:00
rmagueta
f59dcb9b1a Change LOG levels 2021-05-05 14:25:46 +01:00
rmagueta
8e5ccb00fd Replace AssertFatal by LOG_E when UDP bind socket fails 2021-05-05 14:18:37 +01:00
Roberto Louro Magueta
0816940fb5 Revert "Revert "Call the right function for the initiation of gtp-u task at gNB""
This reverts commit 278bfa8d6a
2021-05-05 15:13:52 +02:00
Raphael Defosseux
668bb056df CI: hotfix on the target creation detection
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-05-05 10:59:02 +02:00
francescomani
ffca5124b5 Revert "fix warning"
This reverts commit 1c2c00f260.
2021-05-05 10:06:42 +02:00
rmagueta
5916450327 Fix SRB2 warning for NSA 2021-05-04 18:45:05 +01:00
rmagueta
33ba50fd66 Fix SRB2 warning for SA 2021-05-04 16:19:42 +01:00
hardy
4f64703d5a adding review form column to dashb 2021-05-04 16:01:23 +02:00
francescomani
638f1b8203 Merge remote-tracking branch 'origin/develop' into NR_scheduling_CSIRS 2021-05-04 14:11:29 +02:00
francescomani
1c2c00f260 fix warning 2021-05-04 13:46:17 +02:00
rmagueta
662cda8a87 Fix build warnings after merge 2021-05-04 12:30:16 +01:00
Thomas Schlichter
e04e09e5d4 fix warnings about missing const in polar_encoder_fast() parameter list
make t_nrPolar_params a constant input to all nr polar encoders and nr polar decoders
2021-05-04 13:24:00 +02:00
rmagueta
8fab3da97e Fix segmentation fault after merge 2021-05-04 12:07:02 +01:00
rmagueta
102a76fd56 Merge remote-tracking branch 'origin/develop' into develop-NR_SA_F1AP_5GRECORDS
# Conflicts:
#	openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
#	openair2/GNB_APP/MACRLC_nr_paramdef.h
#	openair2/LAYER2/NR_MAC_gNB/config.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
#	openair2/NR_PHY_INTERFACE/NR_IF_Module.c
2021-05-04 11:23:21 +01:00
francescomani
13acbd1d82 Merge remote-tracking branch 'origin/develop' into NR_cleanup_PUCCH_resources 2021-05-04 12:00:19 +02:00
francescomani
64e42cacf2 implementation of handling csi and harq in the same pucch2 2021-05-04 11:47:48 +02:00
Thomas Schlichter
0ac5fcbfad Merge remote-tracking branch 'origin/develop' into nr-dmrs-fixes 2021-05-04 11:32:07 +02:00
hardy
e0960c35d3 removed in code comments 2021-05-04 08:37:30 +02:00
Remi Hardy
cf1822be64 Integration 2021 wk18 a
MR !1145 NR_FR2_initsync_fixes
-bug fixes that caused failure in PBCH detection after initial sync in FR2

MR !1100 NR_scheduling_request
-per-UE PUCCH F0 resource, CSI, Preamble 
-Scheduling Request 
-MAC scheduler fixes

MR !1150  rh_ci_phy_test_improve
-beautified HTML report for 5G NR phy test

MR !1113 hack-exit-gnb-when-no-enb-nsa
-Exit gNB if connection to eNB failed - to be modified if needed. We may want to try to connect over and over again until we succeed but the modifications to the code to get this behavior are complex
2021-05-04 06:28:37 +00:00
rmagueta
ad0be5b161 Fix build errors after merge 2021-05-03 20:15:20 +01:00
rmagueta
948df0e034 Merge remote-tracking branch 'origin/develop' into develop-NR_SA_F1AP_5GRECORDS
# Conflicts:
#	executables/softmodem-common.h
#	openair1/PHY/NR_UE_TRANSPORT/dci_nr.c
#	openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
#	openair1/SIMULATION/NR_PHY/dlsim.c
#	openair1/SIMULATION/NR_PHY/prachsim.c
#	openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
2021-05-03 19:50:30 +01:00
rmagueta
48305fd14d Fix warning after merge 2021-05-03 19:13:32 +01:00
rmagueta
4b5cef595a Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS
# Conflicts:
#	openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
#	openair1/PHY/NR_TRANSPORT/nr_ulsch.c
#	openair1/SIMULATION/NR_PHY/dlsim.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
#	openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
2021-05-03 18:44:54 +01:00
rmagueta
6079b1a829 Put back AssertFatal 2021-05-03 18:22:20 +01:00
rmagueta
c0f3394048 Fix LTE build error 2021-05-03 18:07:07 +01:00
francescomani
ad10ef0dfe to remove unused PUCCH resources and extend PUSCH tda allocation to 13 symbols 2021-05-03 17:59:08 +02:00
Thomas Schlichter
221cd2a3a2 gNB: fix memory allocation for multiple layers in new_gNB_dlsch() 2021-05-03 17:44:52 +02:00
sfn
c2bf3aabf6 Support high cqi with 2 layers for mimo precoding PDSCH 2021-05-03 17:44:52 +02:00
Raphael Defosseux
158c0639d6 CI: fix pipeline
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-05-03 17:36:02 +02:00
Remi Hardy
4489aa0894 Merge branch 'integration_2021_wk17_b' into 'develop'
MR #1148 : Fix coreset dmrs idx
 -- Fix coreset dmrs idx for coresets with more than 1 symbol duration

MR #1139 : bugfix for sib1 in case of ssb different from 0
 -- solving a small bug in handling sib1 relative to ssb other than 0

MR #1136 : CI: Migration of the physical-simulators to OpenShift
 -- switch to a parallel pod deployment on the OpenShift Cluster
 -- Huge gain in time : 1h30m down to 25 minutes

MR #1134 : Docker improvements 2021 april
 -- updated the LTE-UE image generation.
    * Proper configuration file in nfapi case
    * Proper entrypoint

MR #1131 : Removing deprecated dl and ul_bwp_dedicated in config request at UE

MR #1091 : Ue pdsch pusch parallel
 -- The UE code for now is unfit to process more than 1 slot in parallel.
    This is why the PUCCH signal is not transmitted most of the time.
    Hence, the following changes are made:

    * Process only one slot at a time. Previously it was 2 slots in parallel.
    * Now we do parallelization with the slot i.e., PUSCH and PDSCH are processed in parallel.
    * Option for the UE to go back to sync mode instead of stopping if it loses sync with gNB. Command line parameter --non-stop enables it.
    * New feature: Included a mechanism to detect false DCIs.

MR #1147 : benetel conf files fix
2021-05-03 17:35:34 +02:00
hardy
ba3bea88e7 Merge remote-tracking branch 'origin/develop' into ci_quectel_support 2021-05-03 15:55:21 +02:00
hardy
c2acb9e9e5 Merge remote-tracking branch 'origin/NR_FR2_initsync_fixes' into integration_2021_wk18_a 2021-05-03 15:45:39 +02:00
hardy
010d39c9ab Merge remote-tracking branch 'origin/NR_scheduling_request' into integration_2021_wk18_a 2021-05-03 15:44:31 +02:00
hardy
4525e10257 Merge remote-tracking branch 'origin/hack-exit-gnb-when-no-enb-nsa' into integration_2021_wk18_a 2021-05-03 15:44:05 +02:00
hardy
b370494cf7 Merge remote-tracking branch 'origin/rh_ci_phy_test_improve' into integration_2021_wk18_a 2021-05-03 15:43:16 +02:00
Remi Hardy
d81b0ce9ae Merge branch 'integration_2021_wk17_b' into 'develop'
WIP : Integration 2021 wk17 b

See merge request oai/openairinterface5g!1149
2021-05-03 13:30:21 +00:00
hardy
4ae5ac690c missing parameter in InitializeUE 2021-05-03 13:47:08 +02:00
Remi Hardy
1d07f25595 update ssPBCH_BlockPower in conf file for N310 2021-05-03 11:42:51 +02:00
Laurent THOMAS
5036540281 add create tunnel trace 2021-05-03 11:32:47 +02:00
Raymond Knopp
366118ddb3 reverted Msg2 slot back to DL portion of mixed slot 2021-05-03 10:43:39 +02:00
hardy
d18a7e219c Merge remote-tracking branch 'origin/benetel_config_file_fix' into integration_2021_wk17_b 2021-05-03 09:18:31 +02:00
Raymond Knopp
3fa878101e handling of SDAP header, move RAR to slot last DL slot in TDD period (need change in configuration file) 2021-05-02 22:32:58 +02:00
Laurent THOMAS
6882ea7a7b functional new gtpu, to be tested 2021-05-02 16:06:45 +02:00
Eurecom
35236c818f Merge branch 'NR_SA_F1AP_5GRECORDS' into gnb-n300-fixes
Conflicts:
	executables/nr-ru.c
	openair1/SCHED_NR/phy_procedures_nr_gNB.c
	openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c
2021-05-02 10:04:37 +02:00
Raymond Knopp
85aab6e826 changes in gtpu interface for testing, small changes in L1 for PUSCH signal/noise measurements. SRB2 interfaces. 2021-05-02 09:50:40 +02:00
rmagueta
ed0fedc1b6 Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS
# Conflicts:
#	openair1/PHY/NR_TRANSPORT/pucch_rx.c
2021-05-01 18:42:28 +01:00
rmagueta
e924caa677 Fix phy-simulators 2021-05-01 18:39:30 +01:00
rmagueta
64ce543b3a Fix DRB warning for phy-test 2021-05-01 14:45:31 +01:00
rmagueta
079932e007 Change some default values 2021-05-01 14:12:20 +01:00
Raymond Knopp
ab0e14ce8d logging for debugging DRB/SRB2 establishment at gNodeB 2021-05-01 09:55:00 +02:00
rmagueta
513c07e7a3 Remove some hardcode 2021-05-01 02:23:13 +01:00
rmagueta
00b0c558f5 Fix allocate_ul_retransmission after merge 2021-05-01 02:06:49 +01:00
Raymond Knopp
fd2ea253be masterCellGroup in RRCReconfiguration 2021-04-30 22:30:46 +02:00
Raymond Knopp
202dd9727a Merge branch 'NR_SA_F1AP_5GRECORDS' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_SA_F1AP_5GRECORDS 2021-04-30 21:18:01 +02:00
rmagueta
e0833b74d8 Fix warning after merge 2021-04-30 18:25:19 +01:00
rmagueta
655c5481e3 Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS
# Conflicts:
#	executables/nr-uesoftmodem.h
#	openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
#	openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
#	openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
#	openair2/RRC/NR/rrc_gNB_reconfig.c
#	openair2/RRC/NR_UE/L2_interface_ue.c
2021-04-30 18:00:27 +01:00
rmagueta
916daed3a9 Fix DL after CFRA 2021-04-30 17:03:21 +01:00
Laurent THOMAS
04b28b4518 fixes from testing 2021-04-30 16:47:40 +02:00
Robert Schmidt
2319b4e76f Introduce configuration for maximum UE ULSCH inactivity 2021-04-30 16:40:59 +02:00
Remi Hardy
4b23e6a7bf adding HTML row for detach 2021-04-30 15:45:39 +02:00
Remi Hardy
7d03c14ece logging fix -> pass 2021-04-30 15:04:11 +02:00
rmagueta
fece683445 Fix issues after merge 2021-04-30 12:14:37 +01:00
rmagueta
cb0bb5f8b9 Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS 2021-04-30 11:12:15 +01:00
hardy
7050044fcd improve understanding of results 2021-04-30 10:24:44 +02:00
rmagueta
0bd675b364 Merge remote-tracking branch 'origin/develop-NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS 2021-04-29 22:59:36 +01:00
rmagueta
3c0aadfd23 Fix warnings 2021-04-29 22:58:14 +01:00
hardy
7ca8872216 fix test status fail/pass + test update + cleaning 2021-04-29 23:31:13 +02:00
Raymond Knopp
c66f7da278 missing declarations in main_ru.c 2021-04-29 22:45:23 +02:00
hardy
37cc4d6033 fixing html columns 2021-04-29 22:02:04 +02:00
rmagueta
770b864fb3 Fix segmentation fault after CFRA 2021-04-29 20:07:17 +01:00
Laurent THOMAS
8383843e9b Merge branch 'NR_SA_F1AP_5GRECORDS' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_SA_F1AP_5GRECORDS 2021-04-29 19:06:47 +02:00
Laurent THOMAS
9643a5fb9b memory mgmt error 2021-04-29 19:06:10 +02:00
Raymond Knopp
66650cd597 Merge branch 'NR_SA_F1AP_5GRECORDS' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_SA_F1AP_5GRECORDS 2021-04-29 18:28:43 +02:00
rmagueta
8a5319fc61 Fix tda and nr_schedule_ue_spec after merge 2021-04-29 16:25:05 +01:00
Raymond Knopp
a9603c8a48 Include second RRC Reconfiguration message to carry DRB, SRB2 configuration and NAS PDU Session Establishment Accept message
-Remove DRB and SRB configuration from the first RRC Reconfiguration message. Missing radio configuration to be filled in first RRC Reconfiguration message.
2021-04-29 16:44:10 +02:00
Cedric Roux
d2c9b7cb5a nr pdcp: bugfix: reset integrity context
CMAC_Init has to be called between each usage of the cmac context.
2021-04-29 15:15:18 +02:00
Raymond Knopp
3caa78ea9a adding band info to UE capabilty enquiry 2021-04-29 15:06:47 +02:00
francescomani
6188e9e37f fixing also the comment 2021-04-29 14:58:59 +02:00
francescomani
d74181aa19 fix after merge with develop 2021-04-29 14:57:48 +02:00
francescomani
e39e2dbafd Merge remote-tracking branch 'origin/develop' into NR_scheduling_CSIRS 2021-04-29 14:46:19 +02:00
Remi Hardy
9581b5cce2 adding conf file for n310 2021-04-29 14:01:53 +02:00
Remi Hardy
9d50c5ea02 update of ci nsa and benetel jenkins pipelines 2021-04-29 13:25:20 +02:00
Eurecom
518edc742c n300 fixes 50 MHz configuration 2021-04-29 13:07:20 +02:00
francescomani
d2f1e41bcb using n_frames to compute init_sync_frame 2021-04-29 12:02:51 +02:00
hardy
273c6ff39f Merge remote-tracking branch 'origin/ue-pdsch-pusch-parallel' into integration_2021_wk17_b 2021-04-29 11:55:17 +02:00
hardy
af1735059e Merge remote-tracking branch 'origin/NR_UE_CONFIG_REQ_FIXES' into integration_2021_wk17_b 2021-04-29 11:54:37 +02:00
hardy
44672c4c4c Merge remote-tracking branch 'origin/docker-improvements-2021-april' into integration_2021_wk17_b 2021-04-29 11:53:12 +02:00
hardy
13113e5049 Merge remote-tracking branch 'origin/physim-build-deploy' into integration_2021_wk17_b 2021-04-29 11:52:33 +02:00
hardy
47fee08a0c Merge remote-tracking branch 'origin/multiple_ssb_sib1_bugfix' into integration_2021_wk17_b 2021-04-29 11:49:29 +02:00
hardy
6b45eb8210 update of the AT-based module control for automation 2021-04-29 11:41:53 +02:00
hardy
bad3e98301 need to update dummy UE for CI 2021-04-29 11:41:53 +02:00
hardy
a8bbd77087 fixing auto termination 2021-04-29 11:41:53 +02:00
Raymond Knopp
6d1a92275f usrp_tx_thread redefinition in nr_ulsim::wq 2021-04-29 11:38:48 +02:00
Raymond Knopp
439ceafa62 applied extra MAC config IE to RRCSetup 2021-04-29 10:39:18 +02:00
hardy
ccf6624f79 changing col name in html report 2021-04-29 10:26:10 +02:00
Raymond Knopp
970ccd55f0 Merge branch 'NR_SA_F1AP_5GRECORDS' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_SA_F1AP_5GRECORDS 2021-04-29 07:37:28 +02:00
Raymond Knopp
048f98f7a0 Merge branch 'NR_SA_F1AP_5GRECORDS' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_SA_F1AP_5GRECORDS
Conflicts:
	openair1/PHY/NR_TRANSPORT/pucch_rx.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
2021-04-29 07:37:09 +02:00
Raymond Knopp
e203120477 usrp_tx_thread flag in nr_dlsim 2021-04-28 21:29:58 +02:00
rmagueta
7a07d57ac9 Fix segmentation fault after merge 2021-04-28 20:02:12 +01:00
rmagueta
537d81058f Fix uplink for NR_UL_DCI_FORMAT_0_0 after merge 2021-04-28 19:51:06 +01:00
Thomas Schlichter
5f6be27f5d fix 2 layer MIMO in nr_dlsim after last merge with develop 2021-04-28 18:06:14 +02:00
hardy
67b9e92a5c improving stats appearance 2021-04-28 17:50:39 +02:00
francescomani
cc15ac25b9 simplification of previous fix 2021-04-28 17:49:27 +02:00
luis_pereira87
401151bff4 Fix dmrs_idx for coreset with duration > 1 symbol 2021-04-28 16:39:10 +01:00
luis_pereira87
bc725e116c Fix dmrs_idx for coreset with duration > 1 symbol 2021-04-28 16:18:03 +01:00
Raymond Knopp
fdc91e791f removed discard in pdcp upon integrity failure for testing 2021-04-28 15:58:00 +02:00
rmagueta
d5a7e6ad7e Fix segmentations fault after merge 2021-04-28 14:22:23 +01:00
Raphael Defosseux
285650d354 CI: Adding missing reason for image build failure
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-04-28 10:54:02 +02:00
Raphael Defosseux
1041a6d807 CI: better silent and resync optional arguments
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-04-28 09:39:27 +02:00
rmagueta
43b7c16e83 Fix RA after merge 2021-04-28 00:17:25 +01:00
Raymond Knopp
146f38af16 build for nr_pbchsim after merge with develop 2021-04-27 20:41:28 +02:00
Florian Kaltenberger
8d0b9e4cdb yet some more fixes to the benetel config files 2021-04-27 20:34:00 +02:00
rmagueta
72b5fccce3 Fix build issues after merge 2021-04-27 18:44:39 +01:00
hardy
b6daabc2b5 tentative to improve Module control encapsulation 2021-04-27 17:49:45 +02:00
rmagueta
0a3f128e27 Merge remote-tracking branch 'origin/develop' into develop-NR_SA_F1AP_5GRECORDS
# Conflicts:
#	openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
#	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
#	openair2/LAYER2/NR_MAC_gNB/config.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
#	openair2/LAYER2/NR_MAC_gNB/mac_proto.h
#	openair2/RRC/LTE/rrc_eNB_GTPV1U.c
2021-04-27 15:46:18 +01:00
francescomani
b08037d6d1 Merge remote-tracking branch 'origin/develop' into multiple_ssb_sib1_bugfix 2021-04-27 16:14:43 +02:00
francescomani
ff9846993f Merge remote-tracking branch 'origin/develop' into NR_FR2_initsync_fixes 2021-04-27 15:48:52 +02:00
francescomani
31aade2002 tentative fix for wrong frame caused by rx offset 2021-04-27 15:48:23 +02:00
Raphael Defosseux
42a217228b CI: fixes for OpenShift deployment of physical-simulators
-- Missing finished tag in one deployment
  -- Deep copy of the array of pod names
  -- Hack for the out-of-sync on pexpect for `oc logs` and `oc get pods` commands

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-04-27 15:19:49 +02:00
Cedric Roux
3633bcd367 nr pdcp: bugfixes
- use bearer-1 in compute_t of integrity NIA2
- compare integrity at the right place in nr_pdcp_entity_recv_pdu
- proper handling of security parameters settings (algos, keys)
2021-04-27 14:46:42 +02:00
rmagueta
278bfa8d6a Revert "Call the right function for the initiation of gtp-u task at gNB"
This reverts commit 19ba8dd7
2021-04-27 13:05:35 +01:00
rmagueta
edb790ab04 Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS 2021-04-27 12:36:31 +01:00
rmagueta
987455b9e6 Fix warnings after merge 2021-04-27 12:35:35 +01:00
matzakos
19ba8dd7a9 Call the right function for the initiation of gtp-u task at gNB 2021-04-27 13:31:41 +02:00
matzakos
52f8506b5c Include PDU session type field in PDU Session Establishment Request NAS message 2021-04-27 13:30:02 +02:00
matzakos
9f0c10617a Include rlc bearer configuration list for the configuration of RLC and PDCP RBs 2021-04-27 13:28:59 +02:00
matzakos
ee3b913864 Small correction in NGAP UERadioCapabilityInfoIndication message 2021-04-27 13:28:03 +02:00
matzakos
20653cd31b Modify configuration of NGAP and NAS messages to comply with OAI CN configuration according to Fujitsu patch
-Hardcodings to be removed later when the NAS extensions will be integrated for OAI UE
2021-04-27 13:26:06 +02:00
rmagueta
9372be0466 Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS 2021-04-27 12:12:59 +01:00
rmagueta
e8d48e5cc1 Minor improvements for RA at gNB 2021-04-27 12:10:27 +01:00
Raymond Knopp
d88ce5b9bf Merge remote-tracking branch 'origin/develop' into oairu 2021-04-27 11:58:31 +02:00
Raymond Knopp
fe737d4c29 minor changes 2021-04-27 11:50:30 +02:00
Thomas Schlichter
2ec2486ae4 shave off some run-time from nr_ulsim test cases 2021-04-27 11:27:14 +02:00
Thomas Schlichter
247637f5ed Merge remote-tracking branch 'origin/develop' into nr-dl-mimo-2layer 2021-04-27 11:26:11 +02:00
Raymond Knopp
6e91e56b50 lowmem option for nr_pbchsim for CI tests 2021-04-27 10:55:40 +02:00
Thomas Schlichter
0da9ec9cfb Merge remote-tracking branch 'origin/develop' into nr-dmrs-fixes 2021-04-27 10:27:31 +02:00
Cedric Roux
a8adcf862c sa: nr pdcp: we don't use the hash table anymore 2021-04-27 10:00:24 +02:00
Robert Schmidt
6c162e3808 Remove unused variables 2021-04-27 08:36:43 +02:00
Robert Schmidt
821a5e5dfe Correct T310 & N310 to avoid RA 2021-04-27 08:30:33 +02:00
Robert Schmidt
74fa01463c Do PUCCH TPC only if Acknack or positive SR
otherwise, if we only have a (negative) SR, the UE did not send
anything, and the PUCCH CQI is invalid
2021-04-27 08:30:33 +02:00
Robert Schmidt
8187361615 Schedule UE periodically every 10 frames in UL 2021-04-27 08:30:33 +02:00
imad
800330e41c Call nr_sr_reporting 2021-04-27 08:30:33 +02:00
Robert Schmidt
cba2d9e413 Schedule UEs on SR or BSR 2021-04-27 08:30:33 +02:00
imad
a8149b5e0e Add functions for SR scheduling 2021-04-27 08:30:33 +02:00
imad
27bfe23c9b Add schedulingRequestResourceConfig 2021-04-27 08:30:33 +02:00
imad
50ac9ef252 Add schedulingRequestConfig 2021-04-27 08:30:33 +02:00
Robert Schmidt
51e844e19f Bugfix ul preproc: check correct slot for UL 2021-04-27 08:30:33 +02:00
Robert Schmidt
f73e8e0459 Bugfixes in nr_acknack_scheduling()
1: there can be 2bits AckNack + SR in PUCCH F0
2: when allocating csi_pucch, zero out struct
3: Make unfree resources a warning
4: When asserting, explain the issue
2021-04-27 08:30:33 +02:00
Robert Schmidt
4f4e25852f Reduce sched_pucch array length, we only need two entries 2021-04-27 08:30:33 +02:00
Robert Schmidt
b005f9594b Statically allocate PUCCH F0 resource index 0 for AckNack 2021-04-27 08:30:33 +02:00
Robert Schmidt
c2d16eb8d5 Configure secondaryCellGroup: dedicated PUCCH, CSI, Preamble
- Configure PUCCH Format 0 to be in separate RBs (each UE has dedicated
  resources)
- Configure RA preamble to be different per UE
- Configure CSI offset such that no two UEs have their report in the
  same frame
2021-04-27 08:30:31 +02:00
Robert Schmidt
f39b97a9e8 Execute nr_schedule_pucch() only in UL slots 2021-04-27 08:29:55 +02:00
Robert Schmidt
84e57113c8 initial_csi_index depends on local_uid
Nb_ue is not unique among UEs: consider 2 UEs present. The last UE has
CSI idx "2". Now the first UE disconnects, and a new UE connects. It
will also get CSI idx "2", and I assume this is not what we want.
2021-04-27 08:29:55 +02:00
Remi Hardy
d953b25353 Integration 2021 wk17 a
MR !1079 / MR !1108:
1. Read slots from config file and schedules all slots *except* for slots 0 and 10. This is not a problem, since currently we cannot allocate more than six HARQ feedbacks in a slot, but we might have up to 7 with current configuration

2. phytest mode is configurable. From `nr-softmodem -h`:

   -m: Set the downlink MCS for PHYTEST mode
   -t: Set the uplink MCS for PHYTEST mode
   -M: Set the downlink banwdwidth (in PRBs) for PHYTEST mode
   -T: Set the uplink banwdwidth (in PRBs) for PHYTEST mode
   -D: Bitmap for DLSCH slots (slot 0 starts at LSB)
   -U: Bitmap for ULSCH slots (slot 0 starts at LSB)

3. Scheduler prints more information: UE PHR, PUCCH SNR, PUSCH SNR, RSSI
4. The scheduler learned to scheduler DLSCH/ULSCH in mixed slots (if the time domain allocation matches the mixed slot)
5. The scheduler expects
   * PDSCH Time Domain allocation index 0 to be the DL slot allocation
   * PDSCH TDA index 1 for Mixed DL slot
   * PUSCH TDA index 0 for UL slot
   * PUSCH TDA index 1 for Mixed UL slot
   * PUSCH TDA index 2 for Msg.3
6. Some more cleanup, e.g., separate PDSCH/PUSCH data structures into "semi-static" data (e.g., TDA allocation to use, since it changes seldomly) and "dynamic" data (e.g., RB allocation per slot, which changes every slot)


MR !1137 : Benetel config files fix
2021-04-27 06:16:06 +00:00
francescomani
bd06094338 another bug fixed 2021-04-26 17:56:51 +02:00
rmagueta
5aa999337a Minor corrections after merge 2021-04-26 15:44:50 +01:00
francescomani
ff87164011 bugfixes in FR2 scheduling of ssbs 2021-04-26 16:31:20 +02:00
rmagueta
e1ef4e2d3b Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS
# Conflicts:
#	openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c
#	openair1/SCHED_NR/phy_procedures_nr_gNB.c
#	openair2/GNB_APP/L1_nr_paramdef.h
#	openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
#	openair2/SIMULATION/NR_RRC/itti_sim.c
2021-04-26 15:11:00 +01:00
Mohammed Ismail
7acc966b94 CI: logs delay fix
Signed-off-by: Mohammed Ismail <mohammed.ismail@openairinterface.org>
2021-04-26 16:07:40 +02:00
Raymond Knopp
458f199dce Merge branch 'NR_SA_F1AP_5GRECORDS' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_SA_F1AP_5GRECORDS 2021-04-26 12:06:43 +02:00
Raymond Knopp
a304c87659 resolved a missing conflict after merge with develop 2021-04-26 12:06:03 +02:00
Cedric Roux
9135d4200f sa: nr pdcp: improve security
This commit implements integrity and security settings for nr pdcp. It will
only work for SRBs.

This commit has not been tested. It may fail to work completely. To be checked.
2021-04-26 11:43:44 +02:00
Raymond Knopp
2be602e938 Merge remote-tracking branch 'origin/develop' into NR_SA_F1AP_5GRECORDS 2021-04-26 10:51:18 +02:00
hardy
e2ab8bc54b Merge remote-tracking branch 'origin/benetel_config_file_fix' into integration_2021_wk17_a 2021-04-26 10:21:05 +02:00
Raymond Knopp
f916590e58 put NIA2 as default integrity algorithm 2021-04-26 10:15:43 +02:00
francescomani
844170d72b fix for multibyte multi report payload 2021-04-26 10:05:46 +02:00
Thomas Schlichter
b6a564369f Merge remote-tracking branch 'origin/develop' into nr-dmrs-fixes 2021-04-26 09:42:10 +02:00
Raymond Knopp
10ea3b674e reduced logging, added PUSCH DTX threshold and counter. Improved n1L1_stats.log. 2021-04-25 22:36:14 +02:00
Mohammed Ismail
92b19e2d45 CI: fix on true negative result
Signed-off-by: Mohammed Ismail <mohammed.ismail@openairinterface.org>
2021-04-25 22:07:53 +02:00
rmagueta
63663ac4b2 Fix warning after merge 2021-04-25 19:39:59 +01:00
rmagueta
146369015f Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS
# Conflicts:
#	openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c
#	openair1/SCHED_NR/phy_procedures_nr_gNB.c
2021-04-25 18:44:17 +01:00
Robert Schmidt
26b6d87fa3 Merge branch 'develop' into integration_2021_wk13_b 2021-04-25 16:34:30 +02:00
Robert Schmidt
089246c693 Fix Msg.2 TDA to be 1, revert DL TDA configs to two entries 2021-04-25 14:44:46 +02:00
rmagueta
cc727b4a89 Add SRB 2021-04-25 04:31:15 +01:00
rmagueta
23c272dac4 Add SRB 2021-04-25 04:30:53 +01:00
rmagueta
e2863d5841 Fix DRB null pointer after CFRA 2021-04-25 02:55:32 +01:00
Raymond Knopp
c89b5f2fd2 changed DCI candidates to 4 for initialDownlinkBWP ue-specific searchSpace. ulsch/pusch stats added to nrL1stats.log 2021-04-25 00:21:23 +02:00
rmagueta
0c6762f148 Remove duplicated itti msg for NRRRC_CONFIGURATION_REQ 2021-04-24 19:17:15 +01:00
rmagueta
b1ae636d75 Remove hardcoded rnti for CFRA 2021-04-24 14:42:44 +01:00
rmagueta
45de9e7b25 Merge remote-tracking branch 'origin/develop' into develop-NR_SA_F1AP_5GRECORDS 2021-04-24 13:27:11 +01:00
Remi Hardy
5d83447384 Integration 2021 wk16
MR !1129 : gnb-realtime-hotfix
-Hotfix for realtime performance issue
-Enabled L1 and scheduler timing statistics
-Changed order of UL Indication. L1 Rx -> UL Ind -> L1 Tx

MR !1123 : [CI] ci_phytest
-new 5G NR phy test -q -U 787200 -T 106 -t 28 -D 130175 -m 28 -M 106

MR !1128 : [CI] ci_add_runtime_stats
-adding L1 processing stats

MR !1132 : [CI] ci_add_uldlharq_stats
-additonal ulsch/dlsch stat

no MR : hotfix branch fixgtpu 
-revert default values for 5GS
-fix T_IDs.h build
2021-04-24 07:47:37 +00:00
rmagueta
b34d8a1ce4 Fix assertion after CFRA at gNB 2021-04-24 04:22:07 +01:00
rmagueta
7cd4b11101 Fix selection of Msg3 for CFRA at UE 2021-04-23 23:36:19 +01:00
rmagueta
b468c0b3f6 Fix BWP for CFRA-Msg2 at UE 2021-04-23 20:08:12 +01:00
rmagueta
f528703f51 Fix first CBRA failure 2021-04-23 18:19:19 +01:00
rmagueta
100a012327 Fix DCI extract for CFRA-Msg2 at UE 2021-04-23 17:56:23 +01:00
rmagueta
b6f0597b0d Fix segmentation fault for CFRA-Msg2 at gNB 2021-04-23 16:48:00 +01:00
Thomas Schlichter
bee0721126 Add 4x4 MIMO test cases for nr_dlsim 2021-04-23 17:32:28 +02:00
rmagueta
d4d1871999 Fix numerology for CFRA at UE 2021-04-23 16:21:46 +01:00
francescomani
48b847cbd3 reworking extraction of csi meas report (first version) 2021-04-23 15:41:47 +02:00
rmagueta
ffdffb1b83 Fix warnings 2021-04-23 12:57:49 +01:00
Thomas Schlichter
1c61be68e6 Add more test cases for nr_dlsim and nr_ulsim 2021-04-23 13:25:41 +02:00
rmagueta
16870b6263 Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS
# Conflicts:
#	openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
2021-04-23 12:11:24 +01:00
Raghavendra Dinavahi
efb43528bc Channel estimation of all PUSCH dmrs symbols before compensation 2021-04-23 12:22:31 +02:00
Remi Hardy
0c3280b554 fix nsa n310 conf file for CI 2021-04-23 10:41:15 +02:00
Raghavendra Dinavahi
5edee9b546 Mapping type A enabled in PUSCH dmrs mask calculation
- Procedure get_l_prime is modified
	- Single and double symbol DMRS are handled in Type A and Type B
2021-04-23 10:33:56 +02:00
Raghavendra Dinavahi
e658023ff5 Fix for the 16byte alignment issue observed during DMRS modulation.
Segmentation fault observed in case the address for mod_dmrs[dmrssymbol] is not 16byte aligned.
2021-04-23 10:33:56 +02:00
Raghavendra Dinavahi
f3be3daa32 pusch_proc_threads=8 added to configuration files 2021-04-23 10:33:56 +02:00
Raghavendra Dinavahi
fc1a7f7b8c Adjusting LocationBandwidth of initial BWP1 in configuration files.
LocationandBandwidth adjusted according to the location of SSB and Controlresourceset 0
For example for 106RBs configuration files -
	- AbsoluteFrequencySSB = 641032 = RB43 (1032/24) - points to Subcarrier 0 of RB10 of SSB block
	- Hence SSB is located from RB33-RB53
	- Coresetzero sent in MIB is 0 which means offset 0, RBsize 24 from Start of SSB according to table 13.4 in Spec 38.213
	- InitialBWP should start from RB 33 (offset is 0 from SSB) and should be a size of minimum 24 RBs.
	- SLIV = 275 * (24-1) + 33 = 6358
Controlresourceset value wrongly configured to 12 , changed to 0 as sent in MIB.
2021-04-23 10:33:56 +02:00
Raghavendra Dinavahi
5934e8e4ee Changes to Downlink DMRS MASK calculation
Procedure fill_dmrs_mask is modified.
	- PDSCH Mapping Type B is supported
	- Modified according to sections 5.1.6.2 of Spec 38.214
	- Single and double symbol DMRS are handled in Type A and Type B

Mapping type according to the time domain allocation from DCI should be used to get the values of DMRS config
For sending sib1 - DCI FORMAT 1_0 will be used with SI_RNTI, UE should perform these actions
according to sections 5.1.6.2 of Spec 38.214

Additional DMRS set to pos2 in case of msg2 reception, msg3 transmission.

Mapping type B is added to RRC reconfig.
	- nr_dlsim updated to test typeA and typeB. Verified the changes.
	- RFSIM Validation of PDSCH Mapping TypeB  by changing timedomainallocation in configuration files.
2021-04-23 10:33:56 +02:00
Raymond Knopp
5f0e2e748d minor changes in SNR/noise computation for ulsch 2021-04-23 09:18:40 +02:00
hardy
80a9aaf5dd adding new conf file to use n310 on mozart 2021-04-22 21:56:37 +02:00
rmagueta
a7d4ecb343 Fix initialization of CFRA procedure at UE 2021-04-22 20:10:43 +01:00
Raymond Knopp
dc2182cf50 modifications in get_searchspace => handle case for ue-specific on initialDownlinkBWP 2021-04-22 20:59:16 +02:00
hardy
0ca618a68a Merge remote-tracking branch 'origin/fixgtpu' into integration_2021_wk16 2021-04-22 19:45:31 +02:00
sfn
aacc37613b Fix zero-forcing for 2 layers 2021-04-22 19:07:07 +02:00
sfn
8530989d41 Extend dlsim to support 2 layers for MIMO in AWGN channel 2021-04-22 19:07:07 +02:00
sfn
f1e88d1f8d fix multipath_tv_channel to support MIMO 2021-04-22 19:07:07 +02:00
rmagueta
bb646da064 Put back cell_group_config when do-ra 2021-04-22 17:13:34 +01:00
Mohammed Ismail
d236045704 CI: format correction on testid
Signed-off-by: Mohammed Ismail <mohammed.ismail@openairinterface.org>
2021-04-22 17:01:41 +02:00
sfn
81cfccf6e1 remove printf 2021-04-22 16:52:53 +02:00
sfn
9897ae64c8 Add a new nr_dlsim test case -x 1 or 2 to run 1 and 2 layers 2021-04-22 16:52:53 +02:00
sfn
08ff33a0ec Fix llr calculation to support multiple layers 2021-04-22 16:52:53 +02:00
sfn
77a450d0b6 Add R to -g to model mimo channel 2021-04-22 16:52:53 +02:00
sfn
388b73ec4d Extend nr_dlsim to test dmrs_config_type 2 2021-04-22 16:52:53 +02:00
Mohammed Ismail
b54fbaecb0 CI: correction and update
Signed-off-by: Mohammed Ismail <mohammed.ismail@openairinterface.org>
2021-04-22 16:48:57 +02:00
francescomani
773ebbb63b Merge remote-tracking branch 'origin/develop' into NR_scheduling_CSIRS 2021-04-22 14:36:32 +02:00
Sakthivel Velumani
e956c372df Fixed physim build issues 2021-04-22 13:42:59 +02:00
rmagueta
e80880917c Fix PUCCH BWP parameters 2021-04-22 11:50:19 +01:00
rmagueta
46db55b131 Fix warnings 2021-04-22 11:31:38 +01:00
rmagueta
39e506e30f Merge remote-tracking branch 'origin/develop' into develop-NR_SA_F1AP_5GRECORDS 2021-04-22 10:43:33 +01:00
luis_pereira87
0f00ac116b Change a few logs level 2021-04-22 10:23:50 +01:00
luis_pereira87
5d66008003 Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS 2021-04-22 10:23:06 +01:00
luis_pereira87
db1d423a49 Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS
# Conflicts:
#	openair1/PHY/NR_TRANSPORT/pucch_rx.c
#	openair1/SCHED_NR/phy_procedures_nr_gNB.c
#	openair2/GNB_APP/L1_nr_paramdef.h
2021-04-22 09:41:53 +01:00
Cedric Roux
cca4ce9bf1 minor: indentation 2021-04-22 10:39:27 +02:00
francescomani
f4cbc50f59 bugfix for sib1 in case of ssb different from 0 2021-04-22 10:32:23 +02:00
Raphael Defosseux
977226c815 Merge remote-tracking branch 'origin/develop' into physim-build-deploy 2021-04-22 10:07:33 +02:00
Raymond Knopp
7ed637a954 added n1L1_stats.log. improvements to noise level (PUCCH/PUSCH) and signal level (PUCCH) computations. added DTX detection parameters for PUCCH/PUSCH/PRACH in L1 section of configuration file. hotfix from C. Roux for SRB PDCP integrity. extra logging to debug missing PUSCH/DCI at UE. 2021-04-22 09:32:06 +02:00
hardy
d7913bb0e5 Merge remote-tracking branch 'origin/git-dashboard' into develop 2021-04-22 08:53:51 +02:00
hardy
e3692f0905 [CI] add hyperlinks to git MR + reduce API calls (quotas) 2021-04-21 22:09:20 +02:00
rmagueta
d8f8583c9c Fix PUCCH BWP parameters 2021-04-21 20:01:55 +01:00
Luis Pereira
0bf7f22a33 Revert "Fix for harq round when pucch fails"
This reverts commit e708b63bf7
2021-04-21 20:40:38 +02:00
Luis Pereira
58ecfde647 Revert "Fix for harq round when pucch fails"
This reverts commit e50335b93c
2021-04-21 20:40:06 +02:00
luis_pereira87
e50335b93c Fix for harq round when pucch fails 2021-04-21 18:54:12 +01:00
rmagueta
e708b63bf7 Fix for harq round when pucch fails 2021-04-21 17:03:36 +01:00
Raphael Defosseux
5033ec6dc3 CI: transition from VM-based phy-simulator testing
to Cluster-based testing

- In old VM pipeline, disabled phy-sim VM creation, build and testing
- In new Container pipeline, added new stage

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-04-21 16:38:27 +02:00
Laurent THOMAS
df56f5d345 fix4 T_IDs.h 2021-04-21 15:28:48 +02:00
Laurent THOMAS
2a1025165c fix, third trial T_IDs.h 2021-04-21 14:49:44 +02:00
Florian Kaltenberger
1b9901953f reverting some changes in benetel-5g config files that were introduced in anticipation of MR 1079, but which has not been merged yet. 2021-04-21 12:55:01 +02:00
Laurent THOMAS
d0e091294e more on T_IDs.h 2021-04-21 12:44:40 +02:00
Laurent THOMAS
b8480de3c5 try fix T_IDs.h 2021-04-21 12:15:17 +02:00
Laurent THOMAS
2784cd484e revert default values for 5GS 2021-04-21 10:37:55 +02:00
hardy
c6ae2f554b Merge remote-tracking branch 'origin/rh_ci_add_uldlharq_stats' into integration_2021_wk16 2021-04-21 10:23:03 +02:00
hardy
cace7e0e12 Merge remote-tracking branch 'origin/rh_ci_add_runtime_stats' into integration_2021_wk16 2021-04-21 10:22:33 +02:00
hardy
fc4be199ee Merge remote-tracking branch 'origin/ci_phytest' into integration_2021_wk16 2021-04-21 10:22:03 +02:00
hardy
5c137e1590 Merge remote-tracking branch 'origin/gnb-realtime-hotfix' into integration_2021_wk16 2021-04-21 10:21:21 +02:00
Raymond Knopp
c0ae143264 extra logging for PUCCH power control, DL NAS debugging. Fixed issue with power control configuration parameterss (pucchSNRx10,puschSNRx10) which were not read in properly. Consequence of moving them from the RRC setion to MAC section. 2021-04-21 08:22:57 +02:00
rmagueta
a5d6b2f41d Uncomment nr_DRB_preconfiguration 2021-04-20 18:02:29 +01:00
Florian Kaltenberger
13d5ef51ca OAI EPC 2021-04-20 18:45:22 +02:00
luis_pereira87
8b113b002b Remove/refactor LOGs 2021-04-20 17:37:32 +01:00
rmagueta
ef8aaa8c9b Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS
# Conflicts:
#	openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
2021-04-20 11:37:33 +01:00
Raymond Knopp
03f00ee7ba fixed dynamic range in PUCCH RX for 2 symbol/frequency-hopping 2021-04-20 12:02:06 +02:00
Mohammed Ismail
f6b8351e29 CI: fix on the tag
Signed-off-by: Mohammed Ismail <mohammed.ismail@openairinterface.org>
2021-04-20 11:52:09 +02:00
hardy
e2ef05e5f5 added 2 detections in the ul dl harq stats for HTML 2021-04-20 11:09:11 +02:00
Mohammed Ismail
ea88b0585c CI: added resource lock
Signed-off-by: Mohammed Ismail <mohammed.ismail@openairinterface.org>
2021-04-20 11:08:22 +02:00
Mohammed Ismail
74d7bcb442 CI: fix on the image tag
Signed-off-by: Mohammed Ismail <mohammed.ismail@openairinterface.org>
2021-04-20 10:25:08 +02:00
Raymond Knopp
564311525e applied patch for UE PUCCH TX from Albesmart. changed p-NR-FR1 to 0 (from 20) to reduce SNR on UL. PUCCH is now functional after inserting physicalCellGroupConfig (before and after applying MasterCellGroupConfig) 2021-04-19 23:53:28 +02:00
francescomani
33101b27f2 getting rid of dl and ul_bwp_dedicated in config request 2021-04-19 17:28:35 +02:00
rmagueta
d4a6fffc95 Fix nasmesh warning 2021-04-19 15:36:21 +01:00
Roberto Louro Magueta
9a79ef0e10 Revert "Fix nasmesh warning"
This reverts commit b99f81f701
2021-04-19 16:35:08 +02:00
rmagueta
b99f81f701 Fix nasmesh warning 2021-04-19 14:29:18 +01:00
rmagueta
2e3fc53304 Fix warnings 2021-04-19 13:37:46 +01:00
luis_pereira87
bab03e24f9 fix warning: assignment makes integer from pointer without a cast 2021-04-19 13:05:12 +01:00
luis_pereira87
955ef9042f Merge remote-tracking branch 'origin/develop' into develop-NR_SA_F1AP_5GRECORDS 2021-04-19 12:13:13 +01:00
luis_pereira87
2fb267145e Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS
# Conflicts:
#	openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
#	openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
2021-04-19 12:12:44 +01:00
Raymond Knopp
a22a2b5745 fixed bug in physicalCellGroupConfig initialization 2021-04-19 13:01:08 +02:00
Raymond Knopp
2556b087f9 added physicalCellGroupConfig to RRCSetup message 2021-04-19 12:41:21 +02:00
hardy
ad135dd1e2 adding the case where no rt stat found in log 2021-04-19 10:05:13 +02:00
Remi Hardy
f207b20238 [CI] Pipeline to automate RAN Merge Requests Status Dashboard 2021-04-19 07:47:56 +00:00
Remi Hardy
0399077141 Merge branch 'Fix_SA_SIB1' into 'develop'
Fix SA SIB1 segmentation fault
2021-04-19 07:29:12 +00:00
Raymond Knopp
7d100407ee added ue-specific searchspace on initialBWP to RRCSetup message. 2021-04-19 00:02:48 +02:00
Raymond Knopp
3e0e0635a8 reduce logging 2021-04-18 19:22:10 +02:00
rmagueta
8613aeb9e6 Fixes after merge
- No warning in RRC
- Ethernet lib fix: correct include
- fixes Msg.4
- fixes conf: the UE cannot handle mixed slots
2021-04-18 12:42:34 +02:00
Raymond Knopp
e452f3bbc4 corrections in PUCCH handling for dedicated configuration on initialBWP. first transmission handling for DL harq processes at UE. 2021-04-17 23:15:46 +02:00
hardy
2995662fd7 fixed incorrect indentation + removed L1 ready msg (no longer used) 2021-04-17 22:12:06 +02:00
Raymond Knopp
2b2285747d OK up to RRCSetupComplete received in RRC and decoded correctly 2021-04-17 00:09:43 +02:00
Sakthivel Velumani
6f7a3fdcd2 Laurent's change: bugfix in usrp lib 2021-04-16 18:54:35 +02:00
Sakthivel Velumani
3e411abb7c Fixed compiler warning 2021-04-16 18:37:57 +02:00
Sakthivel Velumani
cf87873f21 Calling ul indication after L1 RX 2021-04-16 17:48:47 +02:00
Sakthivel Velumani
bf8b621995 Adding timing stats for ul indication and scheduler 2021-04-16 17:36:48 +02:00
Mohammed Ismail
382ab05a3d CI: fix on commands delay
Signed-off-by: Mohammed Ismail <mohammed.ismail@openairinterface.org>
2021-04-16 17:11:18 +02:00
Sakthivel Velumani
b56bfa7dbe fixed max print 2021-04-16 17:07:56 +02:00
Sakthivel Velumani
8185060b09 printing max 2021-04-16 17:07:56 +02:00
Sakthivel Velumani
8656b12210 Added L1 stats to softmodem 2021-04-16 17:07:56 +02:00
Sakthivel Velumani
dc65173b69 Fixed RX proc perf stat 2021-04-16 17:07:56 +02:00
Sakthivel Velumani
992e8323e1 Reducing the size of bf structs
quickfix for realtime problem caused by memset
2021-04-16 17:05:26 +02:00
Robert Schmidt
b548f9a3d2 Correctly check for used symbols in UL phytest scheduler 2021-04-16 16:46:46 +02:00
Robert Schmidt
052739f01d Update phytest cmdline parameter description after review 2021-04-16 16:46:17 +02:00
Sakthivel Velumani
21948e89c0 Always do PUSCH decoding in phy_test mode 2021-04-16 16:45:54 +02:00
Sakthivel Velumani
b7ad0ec21d Add cmd line options for DL&UL phytest scheduling
Add parameters: MCS, Bandwidth (in PRBs), slot scheduling bitmap

Conflicts:
	executables/nr-softmodem.h
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
2021-04-16 16:45:15 +02:00
Mohammed Ismail
72d5cec7ad CI: log fix
Signed-off-by: Mohammed Ismail <mohammed.ismail@openairinterface.org>
2021-04-16 16:38:44 +02:00
luis_pereira87
1d7a8a2da2 Fix SA SIB1 segmentation fault [reapplied after merge] 2021-04-16 16:00:32 +02:00
Mohammed Ismail
c55e253f11 CI: physim image stream added
Signed-off-by: Mohammed Ismail <mohammed.ismail@openairinterface.org>
2021-04-16 15:56:30 +02:00
Raymond Knopp
7818958da0 Validated up to reception of first PUSCH after Msg4 (contains RRCSetupComplete) 2021-04-16 15:30:50 +02:00
Raphael Defosseux
7b0877054e [DOCKER] adding new parameter on eNB side, fixing the LTE-UE entrypoint
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-04-16 13:59:14 +02:00
Raymond Knopp
80cc9b445c Add script file for (re)starting gNB automatically 2021-04-16 12:36:44 +02:00
Cedric Roux
c63abcd0f2 nsa: x2ap: hack: exit gNB if connection to eNB failed
Exit gNB if connection to eNB failed - to be modified if needed.

We may want to try to connect over and over again until we succeed
but the modifications to the code to get this behavior are complex.

Exit on error is a simple solution.
2021-04-16 12:36:44 +02:00
Raphael Defosseux
599f56272c [DOCKER] adding entrypoint to LTE-UE image
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-04-16 10:42:39 +02:00
Robert Schmidt
e0780320fa Fix to make nrUE compile 2021-04-16 07:27:11 +02:00
Robert Schmidt
c3796c044f Merge branch 'develop' into integration_2021_wk13_b 2021-04-16 07:23:46 +02:00
rmagueta
50bd0f0f33 Remove bwp_dedicated from fill_default_initialDownlinkBWP 2021-04-15 23:46:39 +01:00
rmagueta
131cef2b6b Fix build warnings 2021-04-15 22:59:35 +01:00
hardy
e9df88885e adding real time stats from log to HTML 2021-04-15 23:36:23 +02:00
rmagueta
31a753b38f Fix build error 2021-04-15 18:02:53 +01:00
Mohammed Ismail
bd580dac20 CI: update
Signed-off-by: Mohammed Ismail <mohammed.ismail@openairinterface.org>
2021-04-15 17:55:19 +02:00
luis_pereira87
d3719fece9 Fix SA SIB1 segmentation fault 2021-04-15 16:09:13 +01:00
rmagueta
4301582f88 Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS
# Conflicts:
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
#	openair2/SIMULATION/NR_RRC/itti_sim.c
2021-04-15 15:29:03 +01:00
rmagueta
2c907fb6e5 Fix minor issues of develop 2021-04-15 15:09:22 +01:00
Mohammed Ismail
e67a50719a CI: fix on phySim
Signed-off-by: Mohammed Ismail <mohammed.ismail@openairinterface.org>
2021-04-15 15:32:50 +02:00
Remi Hardy
875e2906e5 Integration 2020 wk15
MR !1114 : sanitize v1
-bugs or dirty code fixed 
-add first version of a rf board calibration tool, not finished

MR !1094 : sim channels
Channel simulation: 
-command mode: to change noise, path loss, model (AWGN, RICE, ...) parameters channel simulation 
-channels separation: each channel can have a different model (for HO test for example) 
-a new build option --sanitize to compile all OAI with gcc --sanitize=address

MR !1034 : new gtpu
-New GTPU implementation

MR !1101 : develop-SA-CBRA
-Implementation of Contention Based Random Access procedures for 5G-NR Initial Access in SA mode (including contributions from BUPT and Fujitsu)
2021-04-15 09:22:21 +00:00
hardy
5a4d29e864 adding check if milestone is empty 2021-04-14 16:45:00 +02:00
hardy
3fee93c79a from poc to python class 2021-04-14 16:45:00 +02:00
hardy
b5ffe11bd8 Merge remote-tracking branch 'origin/develop-SA-CBRA' into integration_2020_wk15
Conflicts:
	openair1/PHY/TOOLS/nr_phy_scope.c
	targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
2021-04-14 15:14:03 +02:00
hardy
c4745c3e46 Merge remote-tracking branch 'origin/new-gtpu' into integration_2020_wk15
Conflicts:
	cmake_targets/CMakeLists.txt
	openair1/PHY/TOOLS/time_meas.h
	openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
	openair2/LAYER2/RLC/rlc.h
2021-04-14 14:56:04 +02:00
hardy
246afc7ccb Merge remote-tracking branch 'origin/sim-channels' into integration_2020_wk15 2021-04-14 14:37:09 +02:00
Raymond Knopp
26fc7b3dbf Merge branch 'oairu' of https://gitlab.eurecom.fr/oai/openairinterface5g into oairu 2021-04-14 12:25:44 +02:00
Robert Schmidt
71ecec6744 Fix: mark delayed HARQ feedback as free 2021-04-14 12:19:12 +02:00
Robert Schmidt
b10ba9f88c Fix: don't go beyond 3rd retx 2021-04-14 12:19:12 +02:00
Robert Schmidt
8edacdede4 UL Scheduler: Check vrb_map_UL against symb map 2021-04-14 12:19:04 +02:00
Raymond Knopp
cfe8224590 Merge branch 'NR_SA_F1AP_5GRECORDS' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_SA_F1AP_5GRECORDS 2021-04-14 12:19:02 +02:00
Raymond Knopp
cee0f9451d intermediate commit. up to Msg4 ACK and DCI_0_0 reception verified with COTS UE (Quectel).
- first PUSCH containing RRCSetupComplete not programmed for reception in PHY for some reason. DCI_0_0 received by UE.
- if RA fails, on the second attempt there is usually a crash (sometimes in L2_interface.c when getting UE context (added AssertFatal on this now).
2021-04-14 12:15:59 +02:00
Raphael Defosseux
80b52a8eaf [CI] : when running gNB in RA-test mode, noS1 SHALL be enable. Otherwise it's trying to connect to core network
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-04-14 11:50:50 +02:00
matzakos
ea65e1899e Add calls to initialization and configuration functions for RLC and PDCP at nrUE for SA mode
-RRCSetupComplete successfully transferred to RLC of the UE now through SRB1, but not at the MAC yet.
-Needed to enable some additional elements for RLC config. at the gNB side (asn1_msg.c) so that the addition of the SRB does not fail at the UE.
 To verify if these are really required.
2021-04-14 10:20:33 +02:00
rmagueta
a8a34df01f Fix compilation warning in oai_usrpdevif 2021-04-14 00:28:41 +01:00
Laurent THOMAS
86881b1463 merge again develop 2021-04-13 22:45:41 +02:00
Laurent THOMAS
86f1c69f26 Fix code review remarks, merge develop, revert some merge errors 2021-04-13 22:28:02 +02:00
rmagueta
3c59974b23 Fix phy-test DL traffic 2021-04-13 15:26:44 +01:00
hardy
357866b3e6 adding phy test to 5G NR testsuite 2021-04-13 15:42:22 +02:00
Robert Schmidt
e04affbc7c UL scheduler: use correct TDA 2021-04-13 13:15:59 +02:00
Robert Schmidt
aca57eb969 DL scheduler: correctly calculate mixed slot TDA, check TDA before scheduling 2021-04-13 13:15:59 +02:00
Sakthivel Velumani
4189af6c7c Removed common txFifo for multiple threads 2021-04-13 08:28:29 +02:00
Raymond Knopp
22059801fe reduced logging, UE MIB processing 2021-04-12 23:10:02 +02:00
hardy
dbb0bca580 new ci files to build gir MR dashboard 2021-04-12 22:57:40 +02:00
rmagueta
2c9b67431a Merge remote-tracking branch 'origin/develop' into develop-SA-CBRA 2021-04-12 19:21:23 +01:00
rmagueta
e8f8297892 Fix search space and coreset for Msg2 and Msg4 at gNB 2021-04-12 19:20:23 +01:00
Raymond Knopp
42d4c6c195 reduced logging 2021-04-12 18:56:50 +02:00
Robert Schmidt
7f774d5fbc Merge branch 'develop' into integration_2021_wk13_b 2021-04-12 17:23:21 +02:00
Raymond Knopp
4b712adc76 removed reading reconfig.raw with --sa. Also a segfault upon reception of RRCSetup-CellGroupConfig when this is not in the RRC context. 2021-04-12 16:36:11 +02:00
Raymond Knopp
1236f4c389 Merge remote-tracking branch 'origin/develop-SA-CBRA' into NR_SA_F1AP_5GRECORDS
Conflicts:
	cmake_targets/build_oai
	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
2021-04-12 16:03:09 +02:00
rmagueta
a8ca37a782 Add support for InitialBWP in nr_configure_pdcch 2021-04-12 13:48:47 +01:00
Mohammed Ismail
1450bc598e CI: helm charts for physim
Signed-off-by: Mohammed Ismail <mohammed.ismail@openairinterface.org>
2021-04-12 14:35:52 +02:00
Mohammed Ismail
367d23c726 CI: error correction
Signed-off-by: Mohammed Ismail <mohammed.ismail@openairinterface.org>
2021-04-12 14:26:56 +02:00
Mohammed Ismail
8af044e35b CI: parameters changes
Signed-off-by: Mohammed Ismail <mohammed.ismail@openairinterface.org>
2021-04-12 14:23:20 +02:00
Mohammed Ismail
5013180a29 CI: error fix
Signed-off-by: Mohammed Ismail <mohammed.ismail@openairinterface.org>
2021-04-12 13:54:39 +02:00
Mohammed Ismail
075ebd9eb4 CI: print oc login output
Signed-off-by: Mohammed Ismail <mohammed.ismail@openairinterface.org>
2021-04-12 13:41:45 +02:00
Mohammed Ismail
3a3a3efcd9 CI: missing parameters added
Signed-off-by: Mohammed Ismail <mohammed.ismail@openairinterface.org>
2021-04-12 13:30:10 +02:00
Mohammed Ismail
52442573a2 CI: syntax fix
Signed-off-by: Mohammed Ismail <mohammed.ismail@openairinterface.org>
2021-04-12 12:41:29 +02:00
Mohammed Ismail
20cd80c1a0 CI: physim ci initial draft
Signed-off-by: Mohammed Ismail <mohammed.ismail@openairinterface.org>
2021-04-12 12:18:26 +02:00
Raymond Knopp
743c19e560 Merge branch 'NR_SA_F1AP_5GRECORDS' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_SA_F1AP_5GRECORDS 2021-04-12 10:21:33 +02:00
Raymond Knopp
1e60fbd49f Merge branch 'NR_SA_F1AP_5GRECORDS' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_SA_F1AP_5GRECORDS
Conflicts:
	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
2021-04-12 10:21:25 +02:00
hardy
8def752818 adding module UE detach, to be tested 2021-04-12 10:18:10 +02:00
hardy
756ab7ab42 solving merge conflicts (import) 2021-04-12 09:52:37 +02:00
Laurent THOMAS
ceb96a36e7 astyle 2021-04-11 20:07:26 +02:00
Raymond Knopp
f7f8935ce3 minor wqupdates after merge with develop 2021-04-10 23:28:34 +02:00
Raymond Knopp
48b5b5d7c7 Merge remote-tracking branch 'origin/develop' into oairu 2021-04-10 23:27:56 +02:00
Roberto Louro Magueta
cd14ba9667 Revert "Revert "Revert RA preamble shift at gNB""
This reverts commit e06c727604
2021-04-10 13:51:51 +02:00
rmagueta
ddfc737c65 Fix search space for Msg2 and Msg4 at gNB 2021-04-09 19:46:35 +01:00
matzakos
e7e4cb5869 Fix nrUE build error due to depndency of nas_nrue_task from RFSIM_NAS macro 2021-04-09 18:03:37 +02:00
matzakos
45b2b61d1f Trigger gNB registration with AMF for monolithic mode 2021-04-09 18:01:51 +02:00
Laurent Thomas
ab3ac5b29e Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into sim-channels 2021-04-09 14:49:48 +02:00
Laurent Thomas
657b525efc merge develop 2021-04-09 14:31:02 +02:00
Laurent Thomas
7c6ece0f51 Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into new-gtpu 2021-04-09 12:39:36 +02:00
Laurent Thomas
307098da4a merge develop 2021-04-09 12:39:33 +02:00
Raphael Defosseux
f21ac1a84c [CI] increase time out for waits
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-04-09 10:15:53 +02:00
rmagueta
b2b3f38344 Skip invalid MAC CCCH messages for being processed at both gNB and UE 2021-04-08 16:04:19 +01:00
rmagueta
7c37794513 Revert code indentation in usrp_lib 2021-04-08 14:56:05 +01:00
Raymond Knopp
979a5d9389 pucch_ResourceCommon added to configuration file 2021-04-08 15:52:51 +02:00
rmagueta
2efe75130d Merge remote-tracking branch 'origin/develop' into develop-SA-CBRA 2021-04-08 14:10:14 +01:00
Raphael Defosseux
f91ce72868 Merge branch 'integration_2021_w14' into 'develop'
Integration Branch : 2021 week 14

See merge request oai/openairinterface5g!1121
2021-04-08 12:52:00 +00:00
francescomani
0818e4b986 ssb start subcarrier in ssb indication for reception of sib1 2021-04-08 14:31:16 +02:00
Raymond Knopp
e3d13131b4 fix for last commit (removal on one line in asn1_msg.c) 2021-04-08 11:00:03 +02:00
Raphael Defosseux
5c2a5fd74d [CI]: removing the cppcheck stages from the old pipeline
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-04-08 10:30:03 +02:00
Raphael Defosseux
1019a56bea Merge remote-tracking branch 'origin/nr_ue_pdcp_fix' into integration_2021_w14 2021-04-08 10:27:50 +02:00
Raphael Defosseux
c38dfae7e3 Merge remote-tracking branch 'origin/bugfix-free-ra-process' into integration_2021_w14 2021-04-08 10:27:31 +02:00
Raphael Defosseux
8754cc1f96 Merge remote-tracking branch 'origin/physim-build-deploy' into integration_2021_w14 2021-04-08 10:27:10 +02:00
Raphael Defosseux
ad17204eac Merge remote-tracking branch 'origin/docker-no-cache-option' into integration_2021_w14 2021-04-08 10:26:55 +02:00
Raymond Knopp
60e0048c29 added call to NAS for RRCSetupComplete message in UE. other minor modification in gNB/UE scheduling for SA 2021-04-08 08:40:40 +02:00
hardy
d727eebaf5 fix incorrect indentation that makes the CI fail for multiple UEs 2021-04-07 20:30:42 +02:00
francescomani
25756a40c7 reworking function for csi meas report bitlen (still not complete) 2021-04-07 17:56:26 +02:00
luis_pereira87
04b28e5f2a Fix Msg4 mac pdu with padding 2021-04-07 16:31:06 +01:00
luis_pereira87
2ec6ee5f5b Fix Msg4 mac pdu with padding 2021-04-07 16:03:26 +01:00
Thomas Schlichter
650645f883 NR_UE: send tick to RLC and PDCP every ms 2021-04-07 14:21:00 +00:00
Raymond Knopp
0b59ce4faf Merge remote-tracking branch 'origin/develop' into oairu 2021-04-07 15:50:46 +02:00
Mohammed Ismail
25d7eb6c88 CI: adding physim imgae build
Signed-off-by: Mohammed Ismail <mohammed.ismail@openairinterface.org>
2021-04-07 14:05:54 +02:00
hardy
87a5e40eda fix CI issue (removing code that should have been deleted) 2021-04-07 14:03:45 +02:00
Raphael Defosseux
3b187925e8 [CI] fix cppcheck reporting
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-04-07 13:55:01 +02:00
Raphael Defosseux
45f6266b5f [CI] fix
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-04-07 12:20:55 +02:00
Raphael Defosseux
a4b836ac21 [CI] disabling cppcheck on the old pipeline
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-04-07 11:39:59 +02:00
Raphael Defosseux
6b6df21d35 [CI] triggering child pipeline
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-04-07 11:35:04 +02:00
Raphael Defosseux
d0578d77c8 [CI] cppcheck analysis in the python framework
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-04-07 11:13:17 +02:00
Raymond Knopp
470d0ac121 full configuration including Msg4/RRCSetup. InitialBWP handling at gNodeB 2021-04-07 10:57:00 +02:00
Laurent Thomas
04f2ec2352 merge develop, documentation fix 2021-04-06 21:33:13 +02:00
Laurent Thomas
873e42612a merge develop, documentation fix 2021-04-06 21:32:19 +02:00
Raphael Defosseux
2cfc1a6cdb [CI] adding new cppcheck docker for container CI operations
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-04-06 17:08:03 +02:00
Raymond Knopp
2473a25ca1 Merge remote-tracking branch 'origin/develop-SA-CBRA' into NR_SA_F1AP_5GRECORDS
Conflicts:
	openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c
	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
	openair2/LAYER2/NR_MAC_gNB/config.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
2021-04-06 16:38:37 +02:00
Raphael Defosseux
b263ff15ec [CI] fix the email generation
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-04-06 13:57:17 +02:00
rmagueta
79864d001b Merge remote-tracking branch 'origin/develop' into develop-SA-CBRA 2021-04-06 11:38:33 +01:00
Laurent Thomas
89598e3bad Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into sanitize-v1 2021-04-06 12:11:29 +02:00
Cedric Roux
1a5f10be90 bugfix: nr: free RA process when UE is removed
The bug was:
connect a phone, disconnect, repeat five times. The fifth time the phone
does not reconnect because there is no free RA process.

When an UE is removed, we have to free associated RA processes.
2021-04-06 10:40:37 +02:00
Remi Hardy
f0a1d0c23f Integration 2021 wk14 a
MR !1111 : fix x2 without gnb  
-fix x2 without gnb (that is: the eNB is running without gNB, then we must not switch the UE to NR)
-exit gNB if eNB crashes (and exit eNB if gNB crashes)

MR !1102 : nr rlc: bugfix: fix NACK with range 
We do some sanity checks for incoming rlc control packets. One of them is to check that so_start is not > so_end when present.
But when 'range' is present and bigger than 1 it means that so_start refers to one PDU and so_end to another one. So we may well have so_start > so_end.
This MR fixes that and reorganizes a bit the code to do the check before processing and rejecting the PDU if the values are not correct. (Before this commit we were NACKing the whole PDUs if so_start > so_end.)
 
MR !1096 : build_oai: Add --sanitize-address option
-pass the -fsanitize=address option to the compiler which enables run-time checks for some kinds of memory mismanagement
2021-04-06 08:10:52 +00:00
Remi Hardy
7878f8af6e adding some inline doc/comments to ci_ctl_qtel.py 2021-04-05 20:14:38 +02:00
Remi Hardy
31726d685f fixing qtel control 2021-04-05 19:58:54 +02:00
Laurent OpenCells
4511e70fac fix from ci results 2021-04-05 12:56:52 +02:00
hardy
53e624e4c2 improving module control scripts, to be tested 2021-04-05 12:25:50 +02:00
hardy
c1be8be1bc new nsa testcase for quectel 2021-04-05 11:14:53 +02:00
hardy
5a3dc09fdb fixes for other CI pipelines 2021-04-04 21:27:28 +02:00
Remi Hardy
69451ed33f fix UE name in html for ping 2021-04-04 15:54:57 +02:00
Remi Hardy
41cb06546f fix UE name in html for iperf 2021-04-04 15:36:34 +02:00
Remi Hardy
ea89cfa1a1 iperf UL and DL working ok 2021-04-04 15:29:45 +02:00
hardy
31bc110de0 a bit of re factoring 2021-04-04 15:29:45 +02:00
Raymond Knopp
0f98cad8db UE Configuration after SIB1 ok, RAR configuraiton/reception ok, Msg3 transmission / reception ok, CU fails when needing to at SRB1 2021-04-04 13:20:38 +02:00
hardy
cffdac0445 adding module support, primary test/debug 2021-04-04 12:06:20 +02:00
hardy
77a3dd7e41 Merge remote-tracking branch 'origin/sanitize-address' into integration_2021_wk14_a 2021-04-04 08:18:50 +02:00
hardy
dac2388ed1 Merge remote-tracking branch 'origin/fix-nr-rlc-range-nack' into integration_2021_wk14_a 2021-04-04 08:18:25 +02:00
hardy
02504ef747 Merge remote-tracking branch 'origin/fix-x2-without-gnb' into integration_2021_wk14_a 2021-04-04 08:18:04 +02:00
Laurent OpenCells
c0ef3e6f88 fix gcc reported issues 2021-04-03 23:37:58 +02:00
rmagueta
713e3e713a Merge remote-tracking branch 'origin/develop' into develop-SA-CBRA 2021-04-03 04:00:37 +01:00
Laurent OpenCells
fed90543bc Merge branch 'develop' of gitlab.eurecom.fr:oai/openairinterface5g into sanitize-v1 2021-04-02 18:43:28 +02:00
Florian Kaltenberger
7ed03d5021 Update TESTING_GNB_W_COTS_UE.md 2021-04-02 12:42:06 +00:00
Raphael Defosseux
3d5170f6a0 [CI][Docker] adding no-cache options to make to take executables from Merge Requests
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-04-02 11:35:02 +02:00
Laurent THOMAS
0317d6725b sanitize, calibration tool kickoff 2021-04-02 10:12:13 +02:00
Laurent THOMAS
55315b8fae revert removal of a dirty workaround 2021-04-01 21:43:47 +02:00
rmagueta
d964cf60b8 Fix for RA when Msg3 fails 2021-04-01 18:45:29 +01:00
Sakthivel Velumani
f011b7981c fixed typo 2021-04-01 16:14:25 +02:00
rmagueta
4a807dd083 Minor improvements and LOG updates 2021-04-01 14:11:14 +01:00
Sakthivel Velumani
ca9ebcc959 Merge branch 'develop' into ue-pdsch-pusch-parallel 2021-04-01 12:44:59 +02:00
rmagueta
1aab76a48d Merge remote-tracking branch 'origin/develop' into develop-SA-CBRA
# Conflicts:
#	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
2021-04-01 11:19:28 +01:00
francescomani
db25430922 csirep configuration for cri_RI_CQI 2021-04-01 10:40:52 +02:00
Remi Hardy
91909a4ba6 Integration 2021 wk13 d
MR !1085 : Nr mac ssb
-MAC scheduling of multiple SSBs
-Symbol level occupation of VRB map for SSBs
-Multi SSB SIB1 scheduling

MR !1097 : NR_PRACH: nr_du\[\] buffer not filled in High Speed case for both gNB and nrUE
Issue: TC nr_prachsim failed with High Speed(-H) enabled.
While generating NR PRACH for High Speed case : Array nr_du\[\] was not filled for both gNB and nrUE. Added function nr_fill_du() to resolve the issue. 

MR !1107 : Small bugfixes for 5G NR
2021-04-01 08:16:03 +00:00
francescomani
5498e2b84a Merge remote-tracking branch 'origin/develop' into NR_scheduling_CSIRS 2021-04-01 09:18:23 +02:00
hardy
0fe69eafda pusch_proc_threads = 6 vs 8 2021-03-31 17:08:23 +02:00
rmagueta
d86566d366 gNB: update ssPBCH_BlockPower to -25 dBm/RE in all USRP conf files 2021-03-31 15:52:51 +01:00
Cedric Roux
6c6b46985b x2: exit if connection between eNB and gNB breaks
Before this commit, when the gNB crashes, the eNB keeps running.
Same, if the eNB crashes, the gNB keeps running.

In a far past when this happened, the other program (the one not
crashing) was forced to exit.

Then this behavior was changed, for some reason.
But the code was not finished, so now we have a system in an inconsistent
state.

So either we accept that the connection between eNB and gNB can break,
that is one of the programs crashes, and we clean the state of the
program that keeps running. But this is a complex work and it will
surely not survive very long, because someone will change something
in the code later that will break this complex behavior.

Or, simpler, we go back to initial behavior, which is: the program that
did not crash does actually exit when the other crashes.

This commit provides the second solution.

It can easily be reverted whenever someone wants to implement the complex
solution.
2021-03-31 16:39:30 +02:00
Cedric Roux
46c1aff489 fix: do NR only if at least one gNB is connected to the eNB
We used to set 'does_nr' of an UE if we detect ENDC supported in the
UE capabilities.

Then we activate NR measurements if 'does_nr' is true.

The problem is that if the eNB is not connected to a gNB but the UE
reports some NR measurements (because a gNB is running somewhere near)
then the eNB will crash when starting the switch to NR.

A (quick) solution is to set 'does_nr' only if there is a gNB connected to
the eNB.

Maybe not the best solution. To be changed if needed.
2021-03-31 16:39:30 +02:00
rmagueta
1175463c7e Merge remote-tracking branch 'origin/develop' into develop-SA-CBRA 2021-03-31 15:33:48 +01:00
rmagueta
8c9ed555d9 Remove runtime callocs for dmrs_AdditionalPosition 2021-03-31 15:32:45 +01:00
Sakthivel Velumani
0c7008dd7a Changed gNB rxgain on CI conf 2021-03-31 15:44:38 +02:00
Raymond Knopp
f851af22f2 fixing previous commit 2021-03-31 14:39:55 +01:00
rmagueta
53f77219d4 Rework default PDSCH time domain resource allocation tables 2021-03-31 14:31:19 +01:00
hardy
5af77e8fb3 Merge remote-tracking branch 'origin/small_nr_bugfixes' into integration_2021_wk13_d 2021-03-31 13:49:24 +02:00
hardy
d5f8a6161f Merge remote-tracking branch 'origin/NRPRACH_highSpeed_saankhya' into integration_2021_wk13_d 2021-03-31 13:48:45 +02:00
hardy
4896e80e2c Merge remote-tracking branch 'origin/NR_MAC_SSB' into integration_2021_wk13_d 2021-03-31 13:47:58 +02:00
Raymond Knopp
9be7c35f68 changing config file for SA to connect to AMF
also enabling connection to AMF only when --sa option is used.
2021-03-31 11:44:56 +02:00
Raymond Knopp
ce4e699874 fixing previous commit 2021-03-31 11:44:56 +02:00
Laurent THOMAS
de5e64c722 Merge branch 'develop' of gitlab.eurecom.fr:oai/openairinterface5g into sanitize-v1 2021-03-31 10:13:50 +02:00
Raymond Knopp
13a9e49d65 additional DMRS for CoreSet0 back in gNB/UE resource allocations 2021-03-31 10:05:27 +02:00
Laurent THOMAS
58d372d3a2 one cppcheck, merge develop 2021-03-31 10:01:11 +02:00
Laurent THOMAS
e1c73a0632 Merge branch 'develop' of gitlab.eurecom.fr:oai/openairinterface5g into sim-channels 2021-03-31 09:45:53 +02:00
Remi Hardy
1f3513b1e7 Integration 2021 wk13 c
MR !1092: Nr pdcp nia2 integrity
This code has not been tested with a COTS UE. We need SRB1/2 (so we need SA) to test.
The activation of security and integrity for SRB1 will need more code (new functions) because it happens after some time, not at creation time of the PDCP entity and there is no way to do this with current code.
 
MR !1075: Fft bench hotfix 
Simple fix to make the FFT testbench compile and run on current develop.

MR !1083: NR power measurement fixes
2021-03-31 05:15:29 +00:00
Raymond Knopp
2913757461 Merge remote-tracking branch 'origin/develop-SA-CBRA' into NR_SA_F1AP_5GRECORDS
Conflicts:
	executables/nr-softmodem.c
	executables/nr-ue.c
	openair2/GNB_APP/gnb_app.c
	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
2021-03-31 03:14:48 +02:00
Sakthivel Velumani
cbaa901b81 Merge branch 'develop' into ue-pdsch-pusch-parallel 2021-03-31 01:42:16 +02:00
Raymond Knopp
cbe2da1c46 OAI UE and eNB SA configuration up to reception of SIB1 and configuration of UE L1/L2 stack 2021-03-31 00:43:52 +02:00
Laurent THOMAS
c2257d8687 Merge branch 'develop' of gitlab.eurecom.fr:oai/openairinterface5g into sanitize-v1 2021-03-30 19:46:45 +02:00
Laurent THOMAS
29dd729a93 Merge branch 'develop' of gitlab.eurecom.fr:oai/openairinterface5g into sim-channels 2021-03-30 19:45:10 +02:00
hardy
f76ec27726 Merge remote-tracking branch 'origin/fft_bench_hotfix' into integration_2021_wk13_c 2021-03-30 16:41:24 +02:00
hardy
1214836e75 Merge remote-tracking branch 'origin/nr_power_measurement_fixes' into integration_2021_wk13_c 2021-03-30 16:40:41 +02:00
Sakthivel Velumani
fa55cafda4 fixed warning 2021-03-30 16:11:39 +02:00
Sakthivel Velumani
a0422a607d Changed threshold after testing 2021-03-30 16:07:40 +02:00
Cedric Roux
fe4a9b005a nr: add some comments to pdcp nia2 integrity 2021-03-30 16:01:57 +02:00
Sakthivel Velumani
1e8c7dca82 Merge branch 'ue-dci-false-detection' into ue-pdsch-pusch-parallel 2021-03-30 15:38:51 +02:00
francescomani
579f0290f6 Merge remote-tracking branch 'origin/develop' into NR_MAC_SSB 2021-03-30 15:10:28 +02:00
Sakthivel Velumani
4c3d0dddaa Added threashold estimation
Estimate the threshold by simple averaging of mismatched bits of all detected DCI.
2021-03-30 14:36:05 +02:00
Thomas Schlichter
ca963e68ff gNB: fix allocation of RC.gNB[] array
If the array of pointers is allocated using malloc(), it is not guaranteed that the pointers are NULL, so the actual PHY_VARS_gNB might nit be allocated correctly!
Also replace a malloc() + memset() combination by just a calloc().
2021-03-30 14:05:40 +02:00
Sakthivel Velumani
76273a2aa0 Merge branch 'ue-dci-false-detection' into ue-pdsch-pusch-parallel 2021-03-30 13:43:28 +02:00
rmagueta
feb2651ea7 Fix issues due to merge 2021-03-30 12:38:31 +01:00
rmagueta
b55b11b125 Merge remote-tracking branch 'origin/develop' into develop-SA-CBRA
# Conflicts:
#	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
#	openair2/RRC/NR/rrc_gNB_reconfig.c
2021-03-30 11:51:56 +01:00
Sakthivel Velumani
e1e459d27c Check for DCI false positive
by comparing the received bits with re-encoded payload bits
2021-03-30 12:07:15 +02:00
Cedric Roux
63b7ff981e bugfix: fix compilation of simulators 2021-03-30 11:57:51 +02:00
Cedric Roux
18cb68ecc2 nr pdcp: first draft of NIA2 integrity
This code has not been tested with a COTS UE. We need SRB1/2 (so we need SA)
to test.

The activation of security and integrity for SRB1 will need more code
(new functions) because it happens after some time, not at creation time
of the PDCP entity and there is no way to do this with current code.
2021-03-30 11:57:51 +02:00
Cedric Roux
14c823037f nr pdcp: bugfix: D/C bit set only for DRBs 2021-03-30 11:57:51 +02:00
Robert Schmidt
f5a1d356db Refactor after merge
With the merge of fix_NR_DLUL_PF, gNB_dlsch_ulsch_scheduler() has no
nb_periods_per_frame variable. There are two changes here:

1) calculate this locally for initializing tdd_beam_association

2) do not pass it into schedule_nr_mib(). Further, use the following:
   nb_periods_per_frame = slots_per_frame / slots_per_period
   slots_per_frame / nb_periods_per_frame =
     = slots_per_frame / (slots_per_frame / slots_per_period)
     = slots_per_period
2021-03-30 10:49:00 +02:00
Robert Schmidt
576df55450 Merge remote-tracking branch 'origin/fix_NR_DLUL_PF' into integration_2021_wk12 2021-03-30 10:48:57 +02:00
Thomas Schlichter
9916076fbd gNB: fix pucch indexing in fill_ul_rb_mask() 2021-03-30 10:45:03 +02:00
Thomas Schlichter
7848e2575c add missing pusch_AntennaPorts to conf files 2021-03-30 10:44:15 +02:00
Remi Hardy
77c36950d4 Integration 2021 wk13 a
-MR !1052 : Nr fapi beamindex ssb ro
This branch completes RA procedure for FR2 and includes improvements for beam index communication through FAPI interface.

-fix_rb_corruption:
A memcpy() introduced to optimize for the case of no precoding corrupted RBs which are not allocated to PDSCH in the common txdataF array.
So instead, fall back to memcpy() for each PDSCH RB.

-benetel configuration files update
2021-03-30 08:27:48 +00:00
francescomani
d65af6d8ca Merge remote-tracking branch 'origin/develop' into NR_MAC_SSB 2021-03-30 09:35:18 +02:00
Raymond Knopp
df05672a4c Merge remote-tracking branch 'origin/develop-SA-CBRA' into NR_SA_F1AP_5GRECORDS
Conflicts:
	openair2/GNB_APP/gnb_config.c
	openair2/GNB_APP/gnb_paramdef.h
	openair2/LAYER2/NR_MAC_UE/config_ue.c
	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
	openair2/LAYER2/NR_MAC_gNB/config.c
	openair2/LAYER2/NR_MAC_gNB/mac_proto.h
	openair2/RRC/NR/rrc_gNB.c
	openair2/RRC/NR/rrc_gNB_nsa.c
2021-03-30 04:48:51 +02:00
Raymond Knopp
707c20dd74 changes in UE to start configuration from Initial/MIB/SIB1/RRCSetup 2021-03-30 03:44:58 +02:00
Sakthivel Velumani
2738f7669a Fixed warnings 2021-03-29 23:48:00 +02:00
Sakthivel Velumani
e63212bdf3 Bugfix in PUSCH schedule
Fixes one of the assertions when there is false DCI detecteted
2021-03-29 23:35:17 +02:00
Laurent THOMAS
f5022585d9 format astyle only 2021-03-29 21:50:06 +02:00
Sakthivel Velumani
2686ffb39b Bugfix in last commit 2021-03-29 21:36:52 +02:00
rmagueta
56673386dc Skip invalid MAC CCCH messages for being processed at UE 2021-03-29 16:56:25 +01:00
rmagueta
80941b0c31 Minor LOG improvements 2021-03-29 16:43:55 +01:00
rmagueta
b43c054f02 Merge remote-tracking branch 'origin/develop' into develop-SA-CBRA
# Conflicts:
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
#	targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.106PRB.usrpb210.conf
#	targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf
2021-03-29 15:51:37 +01:00
Sakthivel Velumani
cefa6918fa Enabled a error log on PUCCH 2021-03-29 16:43:50 +02:00
rmagueta
1b427efaa1 Revert LOG to pass CI tests for RA 2021-03-29 15:42:03 +01:00
Sakthivel Velumani
4c76c4fb1e Fixed sending ack for false retrans 2021-03-29 16:30:55 +02:00
Sakthivel Velumani
cbd000e02d Improved the 'non-stop' feature 2021-03-29 16:30:19 +02:00
Laurent THOMAS
738728142f merge develop 2021-03-29 15:33:45 +02:00
Thomas Schlichter
104aa7eed5 gNB: fix precoding matrix related compile error 2021-03-29 14:59:58 +02:00
rohan
7a65decae4 Added High Speed flag Test case for nr_prachsim 2021-03-29 12:03:32 +00:00
Laurent THOMAS
68a81f65b2 merge develop 2021-03-29 11:24:34 +02:00
Florian Kaltenberger
d08bb68b15 updating config file for benetel in CI folder 2021-03-29 10:35:35 +02:00
Florian Kaltenberger
5e9248938a applying new TDA to benetel config file 2021-03-29 10:35:17 +02:00
Florian Kaltenberger
2e9ac3672d removing annoying printf 2021-03-29 10:35:00 +02:00
hardy
74d2a6bbab Merge remote-tracking branch 'origin/fix_rb_corruption' into integration_2021_wk13_a 2021-03-29 10:31:15 +02:00
Thomas Schlichter
fe191c7d0a gNB: fix corruption of RBs not used by PDSCH in nr_generate_pdsch()
A memcpy() introduced to optimize for the case of no precoding corrupted RBs which are not allocated to PDSCH in the common txdataF array.
So instead fall back to memcpy() for each PDSCH RB.
2021-03-29 10:10:08 +02:00
hardy
ddf3f9e88c Merge remote-tracking branch 'origin/NR_FAPI_beamindex_SSB_RO' into integration_2021_wk13_a 2021-03-29 10:02:51 +02:00
Remi Hardy
c5546228f4 Integration 2021 wk12
MR !1037: 5G NR DL MIMO

MR !1089: Fixes two issues that we encountered with the new Quectel modules (RM500Q-GL)
-make LTE RRC buffers large enough
-fix initial{D,U}LBWPlocationAndBandwidth in NR config file so that all accept it
2021-03-29 06:24:49 +00:00
hardy
a84b1b4340 Merge remote-tracking branch 'origin/fix-quectel' into integration_2021_wk12_b 2021-03-28 21:36:45 +02:00
hardy
ede67ce2ed Merge remote-tracking branch 'origin/NR_DL_MIMO' into integration_2021_wk12_b 2021-03-28 21:36:25 +02:00
luis_pereira87
86d252ef92 Revert LOG to pass CI tests for RA 2021-03-28 11:35:15 +01:00
rmagueta
8e89ab0022 Fix Msg4 Ack at gNB and pdsch_to_harq_feedback_time_ind at UE 2021-03-27 23:46:37 +00:00
Raymond Knopp
4d0d4fcb29 Merge remote-tracking branch 'origin/develop-SA-CBRA' into NR_SA_F1AP_5GRECORDS
Conflicts:
	cmake_targets/CMakeLists.txt
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
	openair2/LAYER2/nr_pdcp/nr_pdcp_entity.c
	openair2/LAYER2/nr_pdcp/nr_pdcp_entity.h
	openair2/LAYER2/nr_pdcp/nr_pdcp_entity_drb_am.c
	openair2/LAYER2/nr_pdcp/nr_pdcp_sdu.h
	openair2/RRC/NR/rrc_gNB.c
	openair2/RRC/NR_UE/rrc_UE.c
2021-03-27 15:31:22 +01:00
rmagueta
774b8d9a9f Fix TA in CFRA 2021-03-26 16:54:34 +00:00
Laurent THOMAS
fbf39eecc1 cppcheck fixes 2021-03-26 16:32:20 +01:00
Cedric Roux
9d1c24d461 nr rlc: bugfix: fix NACK with range
We do some sanity checks for incoming rlc control packets. One of them
is to check that so_start is not > so_end when present.

But when 'range' is present and bigger than 1 it means that so_start refers
to one PDU and so_end to another one. So we may well have so_start > so_end.

This commit fixes that and reorganizes a bit the code to do the check before
processing and rejecting the PDU if the values are not correct. (Before this
commit we were NACKing the whole PDUs if so_start > so_end.)
2021-03-26 15:36:43 +01:00
Laurent THOMAS
fc967bab3c Merge branch 'sim-channels' of gitlab.eurecom.fr:oai/openairinterface5g into sim-channels 2021-03-26 14:07:28 +01:00
Laurent THOMAS
364ea7685f fix warings 2021-03-26 14:07:10 +01:00
frtabu
1a93c759c8 fix cppcheck error 2021-03-26 12:14:32 +01:00
luis_pereira87
1af7e716e6 Fix mac sdu len calculation for CCCH and skip invalid CCCH1 messages for being processed 2021-03-26 09:46:30 +00:00
Laurent THOMAS
b35155274c Merge branch 'develop' of gitlab.eurecom.fr:oai/openairinterface5g into sim-channels 2021-03-26 09:47:03 +01:00
Laurent THOMAS
818c9b2c88 first pass 2021-03-25 20:13:50 +01:00
rmagueta
7c90e58d39 Fix BWP selection for NSA mode 2021-03-25 17:37:03 +00:00
rmagueta
8800789b0a Fix preamble detection for NSA 2021-03-25 15:15:03 +00:00
Raymond Knopp
a6b24211ac configuration of SRB1 for monolithic and CU/DU, move some parameters from RRC to MACRLC section in configuration file. 2021-03-25 14:26:28 +01:00
Thomas Schlichter
f9410f7a69 gNB: update ssPBCH_BlockPower to -25 dBm/RE in all USRP conf files 2021-03-25 09:20:08 +01:00
Thomas Schlichter
7b76f3f2e1 Merge remote-tracking branch 'origin/develop' into nr_power_measurement_fixes 2021-03-25 09:10:55 +01:00
Raymond Knopp
e6ead93ad1 removed 3 warnings in lte-softmodem 2021-03-25 07:32:58 +01:00
Raymond Knopp
08b781ebfe Merge remote-tracking branch 'origin/develop' into oairu 2021-03-25 06:44:11 +01:00
rmagueta
114508c120 Minor fix in nr_prachsim 2021-03-24 16:17:48 +00:00
Raymond Knopp
39868c400a adding format_indicator to dci_payload of msg3 2021-03-24 16:09:48 +01:00
Raymond Knopp
e84d1fe678 adding UL LCID 52 for CCCH with 48 bits 2021-03-24 16:09:48 +01:00
Raymond Knopp
4840b895dd adding PRACH signal to T tracer 2021-03-24 16:09:48 +01:00
Florian Kaltenberger
feb2b9c8bb adding rxdataF signal to debug output 2021-03-24 10:24:24 +01:00
Raymond Knopp
f6d53094c4 added DUtoCURRCContainer IE in UL INITIAL RRC MESSAGE TRANSFER
added generation of initial Master Cell Group Configuration for both CU/DU and monolithic gNB.

Tested until transmission of RRCSetupComplete from UE
2021-03-23 21:52:57 +01:00
rmagueta
86f70e2777 Add RA support for up to NUMBER_OF_NR_ULSCH_MAX UEs 2021-03-23 20:13:23 +00:00
rmagueta
ee047b88e9 Remove TC-RNTI at PHY when RA procedure does not succeeded 2021-03-23 17:59:31 +00:00
rmagueta
4bd9972f3b Merge remote-tracking branch 'origin/develop' into develop-SA-CBRA 2021-03-23 15:23:13 +00:00
rmagueta
8c13604d61 Fix PRACH with k1 = msg1-FrequencyStart + initialUplinkBWPStart 2021-03-23 15:22:36 +00:00
Roberto Louro Magueta
7c2591f318 Revert "Fix PRACH msg1-FrequencyStart/k1"
This reverts commit b6513faa82
2021-03-23 16:04:01 +01:00
hardy
b28ac6d982 Merge remote-tracking branch 'origin/ci_benetel_test' into develop 2021-03-23 13:44:25 +01:00
rmagueta
b6513faa82 Fix PRACH msg1-FrequencyStart/k1 2021-03-22 20:07:14 +00:00
sfn
e7da2c88b3 skip the precoding lines of the code if there is no precoding info from nfapi 2021-03-22 18:23:06 +01:00
Luis Pereira
e82915c4b1 Revert "Fix msg1-FrequencyStart in config files for SA"
This reverts commit b067406097
2021-03-22 15:28:15 +01:00
Francesco Mani
763b3c675d change in set_tdd_config_nr description 2021-03-22 15:01:32 +01:00
rohan
ee4938b9f0 Update nr_prach.c: NR_PRACH_DEBUG flag disabled. 2021-03-22 14:49:24 +01:00
Rohan Patil
ad0f5ba26f nr_du[] not filled in High Speed case for both gNB and nrUE 2021-03-22 09:38:12 -04:00
francescomani
6b391b3274 activating a log to print rsrp 2021-03-22 10:26:02 +01:00
hardy
e419ae05bd adding benetel to overnight trig 2021-03-22 10:23:11 +01:00
Laurent THOMAS
1cb33aa7de code review fixes, merge latest develop 2021-03-22 09:46:24 +01:00
Laurent THOMAS
5a12698583 Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_FAPI_beamindex_SSB_RO 2021-03-22 08:55:34 +01:00
Laurent THOMAS
230af8db6f fix a old issue about T_IDs.h that killed my CI run 2021-03-22 07:59:24 +01:00
Laurent THOMAS
3bd3f452c2 :( remove sanitize=address option, fix some cppchecks 2021-03-21 23:48:46 +01:00
Laurent THOMAS
8c61e9ff83 Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into sim-channels 2021-03-21 12:47:39 +01:00
Raphael Defosseux
fe330f7b5e Merge branch 'ci-new-docker-pipeline' into 'develop'
Ci new docker pipeline

See merge request oai/openairinterface5g!1095
2021-03-21 11:04:48 +01:00
Raphael Defosseux
6f2622900e [CI] renaming the scenario
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-03-20 21:20:30 +01:00
Michael Cook
2f4767a7d4 build_oai: Add --sanitize-address option
To enable -fsanitize=address option to the compiler
which enables run-time checks for some kinds of memory
mismanagement.
2021-03-20 10:53:34 -04:00
francescomani
70a1556c51 Merge remote-tracking branch 'origin/develop' into NR_scheduling_CSIRS 2021-03-19 18:50:59 +01:00
Thomas Schlichter
bc041092c8 NR_UE: always break out of MAC PDU processing after pdu_len Bytes
In case of false positive PDSCH CRC check, a random MAC PDU is processed.
Currently pdu_len is unsigned 16 Bit, so we did break out of the processing loop only if we _exactly_ hit a residual pdu_len of 0, or we hit a LCID of DL_SCH_LCID_PADDING.
If we didn't hit either of these, pdu_len wrapped to a very positive value, and we continued processing the PDU even beyond its bounds!
This behavior was observed with SNR 1 dB and MCS 9.

So better make pdu_len signed and break out of the loop after processing at max. pdu_len Bytes!
2021-03-19 17:45:14 +01:00
Raphael Defosseux
13a204f027 [CI][DOCKER] handle build failure, and Merge Requests do not build shared image to speed up process
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-03-19 17:32:53 +01:00
rmagueta
d37552db4c Merge remote-tracking branch 'origin/develop' into develop-SA-CBRA
# Conflicts:
#	openair1/SIMULATION/NR_PHY/ulsim.c
#	openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.h
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
#	targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
2021-03-19 15:07:08 +00:00
Raphael Defosseux
144457c258 [CI][DOCKER] fix indentation
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-03-19 14:34:42 +01:00
Raphael Defosseux
76638ec283 [CI][DOCKER] handling the case of build not successful
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-03-19 13:55:01 +01:00
hardy
677172f205 Merge remote-tracking branch 'origin/develop' into ci_benetel_test 2021-03-19 13:23:29 +01:00
hardy
38f3ca2b35 fix workspace corruption issue 2021-03-19 13:04:10 +01:00
Laurent THOMAS
fcda7b97fe add sanitize option, merge develop 2021-03-19 12:21:04 +01:00
Thomas Schlichter
14f3d6a77a gNB: fix memory allocations in fix_scc() and prepare_scd()
issues found by valgrind
2021-03-19 11:40:21 +01:00
francescomani
d76c50e34a Merge remote-tracking branch 'origin/develop' into nr_power_measurement_fixes 2021-03-19 11:22:18 +01:00
Laurent THOMAS
0009fefce2 Merge branch 'develop' of gitlab.eurecom.fr:oai/openairinterface5g into sim-channels 2021-03-19 11:19:58 +01:00
Thomas Schlichter
dade64ea43 Merge remote-tracking branch 'develop' into NR_DL_MIMO 2021-03-19 11:18:02 +01:00
Raphael Defosseux
a2fc1a5d3b [CI][DOCKER] display intermediate logs for CI purpose
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-03-19 11:10:24 +01:00
francescomani
f659a76f43 Merge remote-tracking branch 'origin/develop' into NR_FAPI_beamindex_SSB_RO 2021-03-19 10:06:20 +01:00
francescomani
9d37feecb8 Merge remote-tracking branch 'origin/develop' into NR_FAPI_beamindex_SSB_RO 2021-03-19 09:55:30 +01:00
francescomani
f0d6298475 new attempt at improving call to RC L1 config 2021-03-19 09:55:18 +01:00
Remi Hardy
3dc0a09878 Integration 2021 wk11
MR !1071 : rohan_ulsim2RxFix
-Support added for 2RX antennas case in ulsim
-fixed indexing issue in gNB RX chain 

MR !1086 : fix-nr-pdcp-timer
-The discard timer (set to infinity) is used by the PDCP layer to discard packets that were not transmitted to RLC after some time.

MR !995 : NR_MAC_TCI_UCI_GlobalEdge
TCI:
-Activation of PDSCH TCI states, Activation of PDCCH TCI state
-Construction of the codepoint, Updating nFAPI DCI1_1 (tci_field)
-SSB Beam switching on basis of CSI MeasReport(SSB RSRP) 
-Added get_measured_rsrp and get_diff_rsrp API’s to get SSB RSRP’s. 
UCI:
-Bit length calculation for the scheduled UCI Reporting for CSI-RS and SSB 
-Extraction of received CSI Report (L1-RSRP) when according to the calculated bit lengths and processing it.

MR !1082 : NR_10MHz
-Support of 10MHz BW for 5G NR

MR !1013 : ptrs_rrc_config
-Remove hardcoding of DL and UL PTRS parameters at gNB and NR UE
2021-03-19 06:34:41 +01:00
Sakthivel Velumani
7b9815b316 Fixed do-ra bug 2021-03-19 01:49:55 +01:00
Sakthivel Velumani
80c261c9ae Fixed lte-dlsim segflt 2021-03-19 00:56:44 +01:00
Sakthivel Velumani
58d10d592f Fix nr_dlsim segflt 2021-03-19 00:06:30 +01:00
hardy
5b8e2734e2 updating xNB start detection for Benetel 2021-03-18 21:46:56 +01:00
Raymond Knopp
91168581a5 small fix for basic simulator in TDD 2021-03-18 20:35:17 +01:00
Sakthivel Velumani
874cefb924 Fixed build errors
Also added warning messages for gNB number of threads required
2021-03-18 20:17:41 +01:00
luis_pereira87
b067406097 Fix msg1-FrequencyStart in config files for SA 2021-03-18 18:49:16 +00:00
rmagueta
1ee7d7e551 Remove some hard code values 2021-03-18 17:39:01 +00:00
Roberto Louro Magueta
642c639406 Revert "Fix preamble sequence"
This reverts commit 9efe4187e7
2021-03-18 17:14:31 +01:00
Raphael Defosseux
4a68d007aa [DOCKER] force copy for workspace in each child dockerfiles
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-03-18 16:11:45 +01:00
hardy
b5192b6b12 fixing gNB init 2021-03-18 15:33:21 +01:00
hardy
ee8cfe0e0e fix dependency path for dpdk lib
increasing timeout for command related to waitbuild

debug

removing parallel build of xNB

updating test xml with benetel conf files
2021-03-18 15:33:21 +01:00
Raphael Defosseux
71538abf1c [CI][DOCKER] real fix on RHEL build
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-03-18 15:13:03 +01:00
Raphael Defosseux
0973cb879d [CI][DOCKER] fix RHEL8 build
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-03-18 14:36:14 +01:00
Thomas Schlichter
ccee372aa5 NR: don't enable PRINT_CRC_CHECK by default in nr_ulsch_decoding.c 2021-03-18 14:06:51 +01:00
Thomas Schlichter
2a73b2d0c4 NR_UE: fix typo in nr_dlsch_decoding() 2021-03-18 14:02:22 +01:00
francescomani
0274e09690 internal clock in testing conf files 2021-03-18 13:54:55 +01:00
Raphael Defosseux
bbb7489983 CI: better reporting
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-03-18 13:51:40 +01:00
hardy
710fcba5b9 fixing CI NSA Jenkins allow merge
add new nsa reference test
2021-03-18 13:39:24 +01:00
Thomas Schlichter
58af72a640 fix nr_dlsim for CI: use AWGN instead of Rayleigh1 channel by default 2021-03-18 13:27:56 +01:00
Thomas Schlichter
62a1cf49ab NR: initialize t_nrLDPC_time_stats structure 2021-03-18 13:25:18 +01:00
Thomas Schlichter
d7f89ae686 NR: allocate memory for 2 slots of OFDM symbols in txdataF_precoding 2021-03-18 13:23:37 +01:00
francescomani
a1f1d53cb5 another tentative fix for gnb initialization crashes 2021-03-18 13:09:36 +01:00
Raphael Defosseux
6d028fb180 CI: podman3 cannot run rootless and some little fixes in pipeline
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-03-18 12:15:27 +01:00
Raphael Defosseux
00a7060184 CI: adding comments
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-03-18 11:18:21 +01:00
Raphael Defosseux
43b867c55e CI: adding child jobs trigger => Building U18 and RHEL8 images
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-03-18 11:10:47 +01:00
Robert Schmidt
decd654ad0 Change initial{D,U}LBWPlocationAndBandwidth for quectel to connect in testing_gnb.conf files 2021-03-18 09:16:36 +01:00
Remi Hardy
149785740d update of the CI NSA reference test 2021-03-18 09:10:42 +01:00
Raymond Knopp
9dd6e3bb82 Merge remote-tracking branch 'origin/develop-SA-CBRA-CUDU' into NR_SA_F1AP_5GRECORDS
Conflicts:
	executables/nr-uesoftmodem.c
	openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
	openair2/RRC/NR/L2_nr_interface.c
2021-03-18 07:50:08 +01:00
rmagueta
9efe4187e7 Fix preamble sequence 2021-03-18 01:20:59 +00:00
frtabu
5c025c321e set libconfig AUTOCONVERT option to true 2021-03-18 00:22:11 +01:00
Laurent THOMAS
0827488303 noise power 2021-03-17 19:34:27 +01:00
francescomani
d30b8c69ae fix dlsim crashes (wrong detection of dci for ul) 2021-03-17 18:45:56 +01:00
Laurent THOMAS
7e1f6fc203 Merge branch 'develop' of gitlab.eurecom.fr:oai/openairinterface5g into sim-channels 2021-03-17 17:08:28 +01:00
Thomas Schlichter
5d6863ddd2 NR_UE: fix memory allocations in phy_init_nr_ue__PDSCH() 2021-03-17 17:01:42 +01:00
Sakthivel Velumani
a702fd55b3 Fixed blocking bug 2021-03-17 14:58:06 +01:00
Raphael Defosseux
d4cd65f6c6 CI: initial draft for new container pipeline
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-03-17 14:31:38 +01:00
Sakthivel Velumani
cdda2a4a6f Merge branch 'develop' into ue-pdsch-pusch-parallel 2021-03-17 12:59:26 +01:00
Sakthivel Velumani
85b0aa0497 More fixes
1.Changes to support multi slot parallel processing
2.Changes to run rfsimulator without multi-threading
2021-03-17 12:39:06 +01:00
rmagueta
27f0414e60 Fill pusch_proc_threads in config files 2021-03-16 16:49:30 +00:00
rmagueta
9456542678 Merge remote-tracking branch 'origin/develop' into develop-SA-CBRA
# Conflicts:
#	openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c
2021-03-16 16:04:23 +00:00
rmagueta
986a9fac1d Fixed issues to allow coexistence of CFRA and CBRA implementations 2021-03-16 16:00:37 +00:00
hardy
9abc8a6425 Merge remote-tracking branch 'origin/ptrs_rrc_config' into integration_2021_wk11 2021-03-16 16:28:31 +01:00
hardy
d12aaf98e8 Merge remote-tracking branch 'origin/NR_10MHz' into integration_2021_wk11 2021-03-16 16:27:42 +01:00
hardy
dc60f04a46 Merge remote-tracking branch 'origin/NR_MAC_TCI_UCI_GlobalEdge' into integration_2021_wk11 2021-03-16 16:26:41 +01:00
Raymond Knopp
9f8d702727 fix after merge with develop 2021-03-16 16:26:25 +01:00
Thomas Schlichter
b7ef903cb4 Merge remote-tracking branch 'develop' into NR_10MHz 2021-03-16 16:13:17 +01:00
hardy
d6c07d81a8 Merge remote-tracking branch 'origin/rh_ci_nsa2jenkins' into develop 2021-03-16 16:07:28 +01:00
hardy
6fc492819e dummy test files cleanup 2021-03-16 15:28:19 +01:00
Remi Hardy
32cdc2703c nsa test integration into jenkins
dummy files cleanup
2021-03-16 15:27:46 +01:00
sfn
f1083dc14a Extend nr_dlsim to simulate performance over MIMO Rayleigh1 fading for MIMO test 2021-03-16 14:32:12 +01:00
Thomas Schlichter
8768deaf74 Merge remote-tracking branch 'develop' into ptrs_rrc_config 2021-03-16 14:01:32 +01:00
rmagueta
8646dd0bcb DRB configuration for a new crnti 2021-03-16 12:51:04 +00:00
Thomas Schlichter
3152df445e Merge remote-tracking branch 'develop' into NR_DL_MIMO 2021-03-16 13:37:07 +01:00
Sakthivel Velumani
33afbc9eee Revert "Multiple RXTX sequential threads"
This reverts commit 85e1c34c65.
2021-03-16 13:17:10 +01:00
Sakthivel Velumani
0bbaa0db2b Revert "Threadsafe FIFOs"
This reverts commit 0280c08391.
2021-03-16 13:16:54 +01:00
Sakthivel Velumani
0280c08391 Threadsafe FIFOs
1. Changed FIFO types to threadsafe to ensure order of execution
2. Changed RB_NB_TH to 1 because PUCCH have some issues when running 2 slots in parallel (race). Dont know exactly where it happens.
2021-03-16 12:44:26 +01:00
hardy
ee398c7610 solved merge conflicts related to CI scripts 2021-03-16 11:55:23 +01:00
luis_pereira87
bdc97f7a56 Send MAC NR-BCCH-SL-SCH to RRC through ITTI at UE 2021-03-16 10:08:54 +00:00
francescomani
5eb86207db Merge remote-tracking branch 'origin/develop' into NR_MAC_TCI_UCI_GlobalEdge 2021-03-16 08:49:54 +01:00
Raymond Knopp
94085a41cd Merge remote-tracking branch 'origin/develop' into oairu 2021-03-16 08:07:16 +01:00
Sakthivel Velumani
85e1c34c65 Multiple RXTX sequential threads
Created separate job for PDSCH processing so that its exectued in the right order in rfsimulator mode.
2021-03-16 00:39:54 +01:00
frtabu
98c354fedd Set path for libconfig include directive, so that all config files could be located in the same directory. minor fixes in softmodem-common 2021-03-15 23:26:09 +01:00
Raymond Knopp
a3f6fe4260 L2 emulator seems ok now 2021-03-15 22:45:54 +01:00
sfn
1c2cbc76dc review pdsch precoding 2021-03-15 21:43:04 +01:00
luis_pereira87
fd9f2b8fe7 Build errors resolved 2021-03-15 17:44:23 +00:00
francescomani
9e0938f59b fix pbchsim compilation error 2021-03-15 17:33:38 +01:00
francescomani
c6df134b5d another bugfix in csirs scheduling 2021-03-15 17:23:36 +01:00
hardy
25bba6d068 update benetel test = nsa test 2021-03-15 16:37:40 +01:00
Florian Kaltenberger
544f47bdb0 increasing initial[DL|UL]BWPlocationAndBandwidth for benetel config file to support newer handsets 2021-03-15 15:00:34 +01:00
Robert Schmidt
9dd8572359 Change initial{D,U}LBWPlocationAndBandwidth for quectel to connect 2021-03-15 15:00:34 +01:00
Robert Schmidt
8307d79929 Make RRC buffer sufficiently large 2021-03-15 15:00:34 +01:00
luis_pereira87
5ab73a228f Merge remote-tracking branch 'origin/NR_SA_F1AP_RFSIMULATOR_w5GCN' into develop-SA-CBRA-CUDU
# Conflicts:
#	executables/nr-softmodem.c
#	executables/nr-uesoftmodem.c
#	openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
#	openair2/LAYER2/NR_MAC_gNB/main.c
#	openair2/RRC/NR/rrc_gNB_reconfig.c
#	openair2/RRC/NR_UE/rrc_UE.c
2021-03-15 12:44:16 +00:00
guhan
92c9d80ce0 Reverted the changes as same as develop 2021-03-15 17:47:04 +05:30
frtabu
d118e7e60b Merge branch 'sim-channels' of https://gitlab.eurecom.fr/oai/openairinterface5g into sim-channels 2021-03-15 12:53:36 +01:00
frtabu
8ad4895f55 Add common option telnetclt 2021-03-15 12:51:49 +01:00
Laurent THOMAS
a97bf1da6e fix phy simulators, merge develop 2021-03-15 12:40:15 +01:00
francescomani
75b3097f8a bugfix in csirs scheduling 2021-03-15 11:53:18 +01:00
hardy
cf864cbb59 updaing ci files for benetel test 2021-03-15 11:00:22 +01:00
francescomani
13a561104b Merge remote-tracking branch 'origin/develop' into NR_MAC_SSB 2021-03-15 10:23:06 +01:00
Laurent THOMAS
d659ceb849 merge develop
Merge branch 'develop' of gitlab.eurecom.fr:oai/openairinterface5g into sim-channels
2021-03-15 09:44:33 +01:00
hardy
de32d6d555 Merge remote-tracking branch 'origin/rohan_ulsim2RxFix' into integration_2021_wk11 2021-03-15 09:31:57 +01:00
hardy
ca3aaf700f Merge remote-tracking branch 'origin/fix-nr-pdcp-timer' into integration_2021_wk11 2021-03-15 09:31:40 +01:00
Remi Hardy
fe49a22572 Integration 2021 wk10
MR !1054 : gNB_multi-threading_rework
-Replacing the existing multi-threading pipeline with threadPool library, simpler and more robust
-Updated dlsim to print stats to matlab file.
-Small fix for UE Ulsch coding.


MR !1063 : T_tracer__add_gnb_tracer
Minimalist gnb tracer to trace (for the moment) rxdataF when some decoding for PUCCH or PUSCH has been done

MR !1070 : nr_pdcp_improvements
Implement data transfer (38.331 5.2): - transmit operation (in nr_pdcp_entity_recv_sdu) - receive operation (in nr_pdcp_entity_recv_pdu) - t-Reordering expiration

MR !1076 : PBCHNRTCFIX
Issue Details: If bchPayload is changed to non-zero value, then the test case used to fail.
Solution: While final check against UE decoded bchpayload and input bchpayload, the AND operation with 0xff is missing along with RIGHT SHIFT operation for input bchpayload.


MR !973 : s1_subnormal
LTE update in S1 functions from Fujitsu.
-NNSF
-S1AP auto recovery.
-Handling unexpected messages.
-Fix memory leak.


MR !1048 : develop_SA_RA
-Draft and initial trigger of RA procedures upon SIB1 reception. 
-Improvements on SA SIB1 reception.
-Get Msg3 from RRC to MAC layer (this fixes random Msg3). 
-Fix Tables 7.4.1.1.2-1/2 from 38.211.
2021-03-15 07:16:26 +01:00
Florian Kaltenberger
fc4e1a4f1e adding Benetel RRUs to build script. 2021-03-14 23:17:11 +01:00
Raymond Knopp
4c8fb83e82 lowmem option for allocating transport channel buffers in NR_DLSCH/NR_ULSCH. Used for unitary simulation in CI. 2021-03-14 22:47:43 +01:00
Raymond Knopp
0043063d40 fixed bandwidth scaling for 6 PRBs in eNB and UE. 2021-03-14 22:17:48 +01:00
Raymond Knopp
f5fcd5687d small changes in main-ocp to reflect initialization differences int phy_init_lte_eNB(). 2021-03-14 09:28:06 +01:00
Raymond Knopp
7f5dc92265 testing with multi-RU 2021-03-13 21:43:00 +01:00
Raymond Knopp
74a44d686d minor changes 2021-03-13 21:27:39 +01:00
Raymond Knopp
e5226adcb0 Merge branch 'oairu' of https://gitlab.eurecom.fr/oai/openairinterface5g into oairu 2021-03-13 21:26:47 +01:00
magounak
28f65fb297 Merge branch 'oairu' of https://gitlab.eurecom.fr/oai/openairinterface5g into oairu 2021-03-13 21:26:14 +01:00
magounak
a4666ba7e5 OTA synch changes for slave RRU 2021-03-13 21:25:54 +01:00
Raymond Knopp
092eb544b6 slave RRU testing with OTA synch. 2021-03-13 21:24:42 +01:00
rmagueta
bad2a56b06 Implementation of the RA-Msg4 Ack 2021-03-13 20:12:57 +00:00
rmagueta
7ef6611d7d Remove hard code in nr_pdsch_channel_estimation 2021-03-13 17:56:23 +00:00
rmagueta
dff9c29b1d Fix regarding ra_PreambleIndex in new RA attempts after fail 2021-03-12 20:39:48 +00:00
rmagueta
8f28685cf3 Fix in new RA attempts after fail 2021-03-12 20:15:48 +00:00
Sakthivel Velumani
cef0567aa9 Process PDSCH and PUSCH in parallel
1. RX PBCH slot n
2. RX PDCCH slot n
3. Start TX PUSCH in parallel for slot n+6
4. RX PDSCH slot n
5. Join PUSCH
6. TX PUCCH slot n+6
2021-03-12 20:49:13 +01:00
rmagueta
8b5d5bbb47 Set crnti with t_crnti value when RA succeeded 2021-03-12 18:48:00 +00:00
rmagueta
732617f5ae Fix RNTI type for Msg3 at UE 2021-03-12 18:31:34 +00:00
rmagueta
1821c8c9d6 Merge remote-tracking branch 'origin/develop' into develop-SA-CBRA 2021-03-12 16:02:57 +00:00
rmagueta
53d0fc05ca Add more RA_state_t to accommodate all the output values from nr_ue_get_rach 2021-03-12 16:02:28 +00:00
francescomani
08d2c9fb74 Merge remote-tracking branch 'origin/develop' into NR_scheduling_CSIRS 2021-03-12 15:54:13 +01:00
rmagueta
e2627f8025 Improve UE mode 2021-03-12 13:47:59 +00:00
hardy
73e609db40 adding benetel conf files for ci 2021-03-12 14:07:39 +01:00
hardy
70b7284581 adding xml files for benetel build and test 2021-03-12 13:31:01 +01:00
francescomani
dd1b8b64cf tentative fix for RC.gNB[inst] allocation 2021-03-12 13:15:48 +01:00
rohan
eaed521bec Update test_case_list.xml with test14 tag for nr_ulsim 2021-03-12 13:07:21 +01:00
sfn
7dc97108e1 Fix indentation issues in nr_dlsch_demodulation.c 2021-03-12 13:04:14 +01:00
rohan
6d195d7399 Updated nr_ulsim to support 2 RX Antenna.
(Test14: MCS 16 50 PRBs 2 RX_Antenna)
2021-03-12 11:15:05 +01:00
Remi Hardy
de9c8634ad Merge remote-tracking branch 'origin/s1_subnormal' into integration_2021_wk10 2021-03-12 11:08:09 +01:00
Remi Hardy
17e10eb2a6 Merge remote-tracking branch 'origin/PBCHNRTCFIX' into integration_2021_wk10 2021-03-12 11:07:58 +01:00
Remi Hardy
c775073aad Merge remote-tracking branch 'origin/nr-pdcp-improvements' into integration_2021_wk10 2021-03-12 11:07:44 +01:00
Remi Hardy
c12dd11d6e Merge remote-tracking branch 'origin/develop-SA-RA' into integration_2021_wk10 2021-03-12 11:07:25 +01:00
sfn
3a83e8df03 Fix pdsch UE variables memory allocation 2021-03-12 09:19:44 +01:00
Sakthivel Velumani
616477a5af Option to run UE without stopping
when signal quality drops. when cmd line option used ue goes back to sync mode
2021-03-11 17:29:22 +01:00
Raphael Defosseux
3f6df6b9ad CI: try to optimize the file system usage when building in the CI VM env. Increased the VM memory of one to allow linking
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-03-11 16:13:13 +01:00
rmagueta
acb9a6e0dc Update band 41 config file 2021-03-11 14:11:08 +00:00
rmagueta
e06c727604 Revert "Revert RA preamble shift at gNB"
This reverts commit fa79cdb5
2021-03-11 13:57:29 +00:00
Robert Schmidt
43f6e2f0de Shorten RSRP meas print, avoid SIGFPE 2021-03-11 12:22:32 +01:00
Robert Schmidt
9e707bb2d6 Remove uselessly added code 2021-03-11 12:12:35 +01:00
Robert Schmidt
6274348dfb Remove redundant code 2021-03-11 12:12:35 +01:00
He Shanyun
44288d7553 fix issue about ittiSIM and CplaneNG of withS1 2021-03-11 16:54:38 +09:00
Shweta Shrivastava
95df7843f3 Fix issues with NSA mode 2021-03-11 00:11:16 -06:00
He Shanyun
8965dd782b Merge remote-tracking branch 'remotes/origin/develop_SA_CUDU_rfsim_with_5gc' into integration_w5GC
Conflicts:
	cmake_targets/CMakeLists.txt
	openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
2021-03-11 14:39:36 +09:00
Shweta Shrivastava
a0fa146e04 Merge branch 'ptrs_rrc_config' of https://gitlab.eurecom.fr/oai/openairinterface5g into ptrs_rrc_config 2021-03-10 22:58:06 -06:00
Shweta Shrivastava
7eec3e3bcc Merge branch 'develop' into ptrs_rrc_config 2021-03-10 22:37:44 -06:00
Sakthivel Velumani
2473ed0a90 Added PUCCH signal level 2021-03-11 00:00:56 +01:00
frtabu
de87c02ea9 start doc 2021-03-10 21:39:20 +01:00
Sakthivel Velumani
787cc6e90d Pipeline process
thread1: RX
thread2: TX
2021-03-10 21:28:50 +01:00
rmagueta
8cec7f7171 Revert commit b6ab1eb9 2021-03-10 20:04:14 +00:00
rmagueta
fa79cdb5ba Revert RA preamble shift at gNB 2021-03-10 19:21:06 +00:00
rmagueta
f6a1c1883f Add support for PUSCH scheduled by RAR when BWPStart>0 2021-03-10 19:13:29 +00:00
Turker YILMAZ
c56a7e2037 Very minor update to test git on new the machine 2021-03-10 19:30:23 +01:00
masayuki.harada
535efa0fd2 Remove s1ap_eNB_timer.c and s1ap_eNB_timer.h 2021-03-10 23:16:12 +09:00
francescomani
c05b62d620 including measured rsrp in mac stats 2021-03-10 15:05:26 +01:00
francescomani
bc1942f99a fixing a segfault in dlschsim 2021-03-10 14:07:11 +01:00
Thomas Schlichter
f032830465 gNB: don't use gNB->RU_list in nr_measurements_gNB.c
this list is not initialized in phy-simulators
2021-03-10 13:15:03 +01:00
luis_pereira87
982a054631 Add support for PUSCH DMRS sequence generation when BWPStart>0 2021-03-10 10:42:11 +00:00
Thomas Schlichter
367241ef47 fix compile warnings 2021-03-10 11:34:00 +01:00
Thomas Schlichter
4e87bc3c96 add missing parameter 'pusch_proc_threads' to configuration files
also harmonize configuration files some more
2021-03-10 10:45:31 +01:00
Cedric Roux
4ff8f8832e NR: fix: set PDCP discard timer to infinity
The discard timer is used by the PDCP layer to discard packets that were not
transmitted to RLC after some time.

We don't really need it for the moment, maybe never for the default
bearer which is a best-effort bearer passing all kind of IP traffic.
Maybe for voice over IP kind of traffic it's important, or realtime
applications.

I ran an iperf UDP uplink test and saw no error on the PHY layer but still
lots of packets lost in the iperf logs, which was very surprising. By
analyzing the logs in wireshark I saw that, with the current scheduler,
an IP packet sent by the UE took 40ms to be sent piece by piece to the
gNB, and then the next uplink IP packet was never sent at all because
the discard timer was expired, leading to the high count of packets lost
in the iperf logs.

So let's put infinity for the moment for the discard timer. From my
understanding of the moment it's not a problem. If for some reason we
should set it to some non-infinity value, then we can change later.
2021-03-10 10:30:23 +01:00
francescomani
35bbbe635f fixing a compilation error 2021-03-10 09:12:18 +01:00
frtabu
9c94e72fa8 Merge branch 'sim-channels' of https://gitlab.eurecom.fr/oai/openairinterface5g into sim-channels 2021-03-10 02:56:03 +01:00
frtabu
1f0e82664f enhance channel model configuration 2021-03-10 02:33:31 +01:00
Raymond Knopp
35fe7569a2 removed some debugging assertions in DU, added sending and handling of GNB-CU-Configuration-Update-Acknowledge. Note: Still need to do GNB-CU-Configuration-Update-Failure. 2021-03-09 23:32:24 +01:00
matzakos
3aec9a43ea Merge branch 'NR_SA_F1AP_5GRECORDS' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_SA_F1AP_5GRECORDS 2021-03-09 17:47:39 +01:00
rmagueta
7be1952c82 Add back-off indicator subheader to Msg2 2021-03-09 16:29:04 +00:00
Remi Hardy
51c55f6f6a Merge remote-tracking branch 'origin/gnb-threadpool' into integration_2021_wk10 2021-03-09 16:13:09 +01:00
Remi Hardy
1142acf0fe Merge remote-tracking branch 'origin/t-gnb-tracer' into integration_2021_wk10 2021-03-09 16:12:52 +01:00
Remi Hardy
e78d6e97bb Merge remote-tracking branch 'origin/NR_FDD_FIX' into integration_2021_wk10 2021-03-09 16:12:24 +01:00
Raymond Knopp
b192ce7ca0 removed assertions on non-presense of extensions for Cells_to_be_Activated_List_Item in both F1-Setup-Response and GNB-CU-Confiruation-Update 2021-03-09 16:01:41 +01:00
rmagueta
e5ee51964b Add temporary LOGs for Msg2 2021-03-09 15:00:06 +00:00
matzakos
3801c55f0f Merge branch 'NR_SA_F1AP_5GRECORDS' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_SA_F1AP_5GRECORDS 2021-03-09 15:25:23 +01:00
matzakos
906fd2b68f Merge branch NR_SA_F1AP_RFSIMULATOR3 into NR_SA_F1AP_5GRECORDS 2021-03-09 15:24:11 +01:00
Raymond Knopp
aaa7a3411b removed assertion on nRPCI being null, it is not mandatory. 2021-03-09 14:50:34 +01:00
francescomani
3cfc9ae93c fix in handling csi meas report on pucch 2021-03-09 14:32:40 +01:00
Thomas Schlichter
5d50553c29 Merge remote-tracking branch 'develop' into nr_power_measurement_fixes 2021-03-09 14:09:53 +01:00
Thomas Schlichter
82cd7c44da nr_ulsim: whitespace cleanup 2021-03-09 13:11:16 +01:00
Raymond Knopp
3700759aa2 fixed byte-endian of fiveGS-TAC IE in F1AP. 2021-03-09 12:32:22 +01:00
rohan
7da57e7608 Update ulsim.c, whitespace error corrected. 2021-03-09 12:04:42 +01:00
Thomas Schlichter
2cf4daefa8 NR: move nr_bandtable from nr_mac_common.c to nr_common.c so PHY can use it, too 2021-03-09 11:56:06 +01:00
Laurent THOMAS
c9d2754087 Merge branch 'sim-channels' of gitlab.eurecom.fr:oai/openairinterface5g into sim-channels 2021-03-09 11:12:28 +01:00
Laurent THOMAS
05dedf568a Merge branch 'develop' of gitlab.eurecom.fr:oai/openairinterface5g into sim-channels 2021-03-09 11:12:17 +01:00
francescomani
feaccd964c change a log to D from I 2021-03-09 11:12:16 +01:00
cig
443a449119 Fix after review MR 1039
- FAPI structures not to be used as config_req at MAC since that FAPI is
  just for communication between MAC and PHY
- additional frame_type member added to the FAPI struct
2021-03-09 10:36:27 +01:00
yoshio.inoue
81c92d226f Define variables according to coding conventions. 2021-03-09 18:14:39 +09:00
cig
a2e2968244 Fix after review MR 1039
- use LOG_D for debug logging
2021-03-09 10:06:33 +01:00
francescomani
a4da922053 bugfix in switch 2021-03-09 09:02:50 +01:00
Raymond Knopp
1c8618efb9 fixed bug with fiveGS_TAC IE and added RRC_Version IE in F1-Setup-Req 2021-03-09 08:34:51 +01:00
Wang He
264af1860f fix build error and core dump error. 2021-03-09 15:43:18 +09:00
frtabu
782053f03f enhance channel model configuration 2021-03-09 01:21:38 +01:00
luis_pereira87
45b86847b7 Fix DMRS sequence generation for BWPStart>0 (Msg2 and Msg4) 2021-03-08 19:35:49 +00:00
masayuki.harada
969425f6a8 Replace to itti timer.
Fix nnsf selection.
Fix indentation and opening brace.
2021-03-09 03:25:00 +09:00
Thomas Schlichter
681c03667d NR: fix init_symbol_rotation() for UL 2021-03-08 16:23:20 +01:00
cig
77c1ccdf56 Update ssPBCH_BlockPower value in the conf file to match actual outpur power
- currently, -25 dBm/RE is the maximum measured power from USRP
  corresponding to att_tx = 0 dB, therefore ssPBCH_BlockPower has been
  updated accordingly
- this param is used at UE side for the pathloss computation, which now
  seems to match measurements observed during lab testing
2021-03-08 15:25:45 +01:00
cig
5d8d478ffb NR gNB UL power measurements
- new function has been introduced for the computation of UL SNR
- minor bugfix to noise power computation
- FAPI data type for referenceSignalPower has been updated to reflect the
  range of values for the SSB power
2021-03-08 15:25:45 +01:00
cig
76ef9b4285 Fixes to NR UE power measurements
- pathloss, RSSI, RSRP and Noise measurements have been reviewed and wrong
  implementation has been fixed
- referenceSignalPower type in the FAPI struct has been changed to int
  has its range include negative values
2021-03-08 15:25:43 +01:00
hardy
7d2b45d8e2 Merge remote-tracking branch 'origin/ci_test_ra_fr2' into NR_FAPI_beamindex_SSB_RO 2021-03-08 14:35:25 +01:00
francescomani
c758736885 Merge remote-tracking branch 'origin/develop' into NR_MAC_SSB 2021-03-08 14:13:39 +01:00
rmagueta
f88dff1bca Uniformization of coreset start subcarrier at gNB for coreset0 2021-03-08 14:02:56 +01:00
Raymond Knopp
d72b9c4e71 Merge remote-tracking branch 'origin/develop' into oairu 2021-03-08 13:41:14 +01:00
rmagueta
6ecf50bc2f Merge remote-tracking branch 'origin/develop' into develop-SA-CBRA 2021-03-08 12:05:59 +00:00
rmagueta
dc9425ee91 Uniformization of coreset start subcarrier at gNB for coreset0 2021-03-08 12:05:25 +00:00
francescomani
de0492b26e adding a log at mac 2021-03-08 11:02:09 +01:00
Thomas Schlichter
606fa3c3aa fix nr_prachsim: 3.5 GHz is _not_ a valid DL frequency for 30 kHz SCS, so change it to 3.6 GHz 2021-03-08 10:59:43 +01:00
Raymond Knopp
666aee7fc2 addition of GNB-CU-Configuration-Update/Update-Acknowledge/Update-Failure 2021-03-08 10:57:00 +01:00
francescomani
118eb3f798 fix compilation of phy simulators 2021-03-08 10:17:10 +01:00
francescomani
a9ed3baafd reworking PHY functions for scheduling SSBs 2021-03-08 08:53:56 +01:00
masayuki.harada
ff994453a4 Merge remote-tracking branch 'remotes/oai/develop' into HEAD
# Conflicts:
#	openair3/S1AP/s1ap_eNB.c
#	openair3/S1AP/s1ap_eNB_handlers.c
2021-03-08 14:51:11 +09:00
masayuki.harada
c9906d1a70 Merge remote-tracking branch 'remotes/oai/NR_SA_F1AP_RFSIMULATOR3' into NR_SA_F1AP_RFSIMULATOR3_Lo
# Conflicts:
#	openair2/LAYER2/nr_pdcp/nr_pdcp_entity_drb_am.c
#	openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
2021-03-08 13:43:39 +09:00
Raphael Defosseux
ea3f924632 Merge branch 'ci-reduce-nb-vms' into 'develop'
CI: removing 1 VM in the pipeline

See merge request oai/openairinterface5g!1078
2021-03-07 18:09:03 +01:00
rmagueta
99711020bd Update generate_nr_prach after receiving RA-Msg2 at UE 2021-03-06 20:13:14 +00:00
Raphael Defosseux
11755fc473 CI: remove --mu option
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-03-06 10:50:49 +01:00
Florian Kaltenberger
deb19f19fa Revert "temporarily enabling beamforming also for FR1 + some logs (revert this commit before MR)"
This reverts commit 87a8a94ae9.
2021-03-05 21:09:38 +01:00
Thomas Schlichter
2411743f44 gNB: move get_band() to its only user in nr_init.c 2021-03-05 17:27:45 +01:00
francescomani
287e6078e2 ssb slot computation from starting symbol in sib1 function 2021-03-05 15:36:43 +01:00
Raymond Knopp
347dec4fff Merge branch 'fft_bench_hotfix' of https://gitlab.eurecom.fr/oai/openairinterface5g into fft_bench_hotfix 2021-03-05 15:33:55 +01:00
Thomas Schlichter
2266d4611a NR_UE: move OFDM symbol cut position handling to nr_slot_fep()
this slightly cleans up nr_initial_sync() and UE_thread()
2021-03-05 15:02:18 +01:00
Thomas Schlichter
dd275d0148 improve nr_slot_fep() and variants 2021-03-05 15:01:19 +01:00
Raphael Defosseux
7c6213ba47 CI: increase timeout for wait stages and fix wait on v1
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-03-05 14:47:26 +01:00
Thomas Schlichter
eab6379bff gNB: cut OFDM symbol for PUSCH reception within 1/8th of CP to avoid ISI 2021-03-05 14:06:09 +01:00
Raphael Defosseux
2f23751a88 CI: try some sleeps
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-03-05 13:57:57 +01:00
Xue Song
c273a9d356 fix problem about CU/DU c-plane failed 2021-03-05 19:43:42 +09:00
Xue Song
834d6f1055 Merge branch 'master' into NR_SA_F1AP_RFSIMULATOR3_Lo
Conflicts:
	cmake_targets/CMakeLists.txt
	executables/nr-softmodem.c
	executables/nr-uesoftmodem.c
	openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
	openair2/LAYER2/nr_pdcp/nr_pdcp_entity.c
	openair2/LAYER2/nr_pdcp/nr_pdcp_entity_drb_am.c
	openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
	openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c
2021-03-05 19:07:43 +09:00
Raphael Defosseux
7cb8acf6ca CI: removing 1 VM in the pipeline
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-03-05 10:50:53 +01:00
Sakthivel Velumani
62a7165c5a Adding thread count parameter to ci-scripts config file 2021-03-04 22:15:56 +01:00
rmagueta
ba8c14debc Update RA succeeded procedures 2021-03-04 19:58:11 +00:00
Raymond Knopp
40fd1296a3 FFT unitary simulator compilation fix 2021-03-04 19:21:54 +01:00
francescomani
8756a56121 tentative fix for scheduling multiple sib1 instances 2021-03-04 17:48:10 +01:00
rmagueta
cfd5adcc84 Segmentation fault prevention in RA-Msg2 2021-03-04 16:11:44 +00:00
hardy
1ac13d90e4 typo fix 2021-03-04 16:44:32 +01:00
Laurent THOMAS
a0922cef2f merge develop 2021-03-04 14:49:38 +01:00
francescomani
18b1218779 reworking of MAC functions to schedule SSBs, including VRB map occupation and get_type0_PDCCH_CSS_config_parameters 2021-03-04 14:32:41 +01:00
Laurent THOMAS
3b1b74cfd2 starting 2021-03-04 13:22:14 +01:00
wf
d6763661be du-cu tested ok 2021-03-04 19:30:49 +08:00
Laurent THOMAS
6c7dc65981 Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into gnb-threadpool 2021-03-04 12:05:01 +01:00
knopp
055d582403 Update oai_dfts.c 2021-03-04 11:49:07 +01:00
Rohan Patil
06b368914b PBCH test case support for non-zero bchpyload 2021-03-04 15:19:22 +05:30
wf
44d40219f2 modify fro comments, no warning now 2021-03-04 16:42:20 +08:00
Francesco Mani
1eb4438742 bugfix in csirs vrb map occupation 2021-03-04 09:02:09 +01:00
rohan
bae3bebdeb Update ulsim.c, build issue resolved. 2021-03-04 08:02:48 +01:00
rmagueta
245f1e066f Improvements in RA-Msg4 2021-03-04 01:23:56 +00:00
rmagueta
ab3794e62c Improvements in RA-Msg2 2021-03-03 20:16:14 +00:00
Thomas Schlichter
62612feebf change get_band() to take the duplex spacing into account 2021-03-03 18:02:10 +01:00
Thomas Schlichter
7a6f789aed Merge remote-tracking branch 'develop' into NR_FDD_FIX 2021-03-03 17:59:17 +01:00
cig
222933a59b Updated arbitrary frequencies section in RUNMODEM.md file 2021-03-03 17:58:07 +01:00
cig
f2bc1012be Minor cleanup UE
- removed commented out code
- improved logging in UL channel estimation
- minor fixes according to OAI coding guidelines
- moving fetching TDD configuration parameters in nr-ue.c only in TDD case
2021-03-03 17:58:07 +01:00
Thomas Schlichter
01645168f0 NR_UE: handle initial TA the same way as TA updates, independent of the UE_mode
In FDD mode, the UE_mode switches to PUSCH mode before the initial TA value was applied.
Because of this, the ta_command was misinterpreted.
Fix this by adding 31 to the initial TA comamnd and handle it the same as TA updates.
2021-03-03 17:58:07 +01:00
luis_pereira87
bb0507a846 Revert code from commit fc9b781c 2021-03-03 16:03:18 +00:00
hardy
c25da4b3aa update of HTML report 2021-03-03 15:33:58 +01:00
Cedric Roux
9edc8cce0a nr pdcp: improvements
Implement data transfer (38.331 5.2):
    - transmit operation (in nr_pdcp_entity_recv_sdu)
    - receive operation (in nr_pdcp_entity_recv_pdu)
    - t-Reordering expiration

To keep track of time the function nr_pdcp_wakeup_timer_thread has been
added and is called by the gNB's MAC scheduler via nr_pdcp_tick.

(The UE has not been modified.)

A thread has been introduced to set time of all the existing PDCP
entities in the system. This probably does not scale well with many
PDCP entities (many UEs connected to the gNB). To be changed at some
point when needed. Hopefully, with a few UEs this mechanism won't be
too problematic (ie. won't cause realtime problems).

The problem with time in PDCP is that SDUs are kept if some are
missing, to do reordering. A timer is started and when it expires
we have to transmit the SDUs even if some are still missing. We
want to do that as soon as possible. So we have to check timers
often (every millisecond).

In RLC the time is set when there is some activity (SDU or PDU
received). In PDCP we cannot wait for this kind of activity. We
would keep packets longer than necessary, which may disturb
upper layers (think: TCP). That is why we introduced the thread,
as a simple mechanism to keep packets no longer than necessary.

The locking done by this thread may create realtime issues.

The whole logic of time keeping can be changed later if it turns
out that it is not efficient.

The functions dealing with DRB AM have been removed. All the types
of PDCP entities (DRB AM, DRB UM, SRB) use the same mechanism for
transmit and receive operations. So the code has been made common
for all those types.

We don't deal with:
    - entity re-establishment, entity release or entity suspend
    - SDU discard (the timer is present but not used)
    - status reporting
    - data recovery
    - data volume calculation
    - header compression / decompression

There is no plan to implement those features in a near future.

Integrity protection is not done yet, and will be implemented soon.
2021-03-03 14:06:31 +01:00
luis_pereira87
efd1f46f1f Fix Msg4 mcsIndex assignment 2021-03-03 12:12:39 +00:00
Rohan Patil
429a5d4187 Support added for 2 RX Antenna case in ulsim and fixed indexing issue in gNB RX chain 2021-03-03 17:10:02 +05:30
hardy
c8d26ad5b2 Merge remote-tracking branch 'origin/rh_ci_ra_fr2' into ci_test_ra_fr2 2021-03-03 11:05:24 +01:00
luis_pereira87
c457cf6455 Msg2 temporary fix for PDSCH time domain resource allocation (use the same as SIB1 from TS 38.214 Table 5.1.2.1.1-2) 2021-03-03 10:01:35 +00:00
luis_pereira87
d0b9146cd0 Msg4 transmitted from MAC to RRC through ITTI (TASK_RRC_NRUE created) 2021-03-03 01:27:50 +00:00
luis_pereira87
d1c56742d3 Msg4 transmitted with UE Contention Resolution Identity and with RRCSetup 2021-03-03 00:11:07 +00:00
Florian Kaltenberger
fdc818bc06 Update TESTING_GNB_W_COTS_UE.md 2021-03-02 21:39:19 +01:00
rmagueta
abb894be6b Draft RA-Msg4 at gNB 2021-03-02 20:20:11 +00:00
matzakos
4d685a0036 Proper separation of handling DCCH SRB1 and DTCH LCIDs at MAC gNB
-Remove redundant calls to mac_rlc_data_ind for DTCH case
2021-03-02 20:15:46 +01:00
francescomani
97ed2dfe5b Merge remote-tracking branch 'origin/develop' into NR_10MHz 2021-03-02 14:31:12 +01:00
rmagueta
ce5b59c938 Merge remote-tracking branch 'origin/develop' into develop-SA-CBRA
# Conflicts:
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
2021-03-02 12:58:32 +00:00
rmagueta
5f66269a8b Merge remote-tracking branch 'origin/develop' into develop-SA-RA
# Conflicts:
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
2021-03-02 12:01:11 +00:00
Cedric Roux
95b659ab44 T tracer: add gnb tracer
Minimalist gnb tracer to trace (for the moment) rxdataF when some
decoding for PUCCH or PUSCH has been done.

Important: T_BUFFER_MAX and T_CACHE_SIZE have been changed. T_BUFFER_MAX
is twice as big as before. T_CACHE_SIZE has been devided by two. Globally,
the memory usage of the T tracer is the same, but since we divided by two
the number of buffers in the cache, we may hit some realtime problems if
all the buffers are busy at some point. The simple solution would be to
use 8192*2 for T_CACHE_SIZE as it was, but then we double the memory usage
of the T tracer. This, or another solution, to be defined.
2021-03-02 10:08:00 +01:00
Sakthivel Velumani
76acfbf993 Merge branch 'develop-SA-CBRA' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-SA-CBRA 2021-03-01 23:50:57 +01:00
Sakthivel Velumani
1a7a086480 Passing symbolStart to fill_dmrs_mask
Adding missed changes in previous commit
2021-03-01 23:50:16 +01:00
luis_pereira87
ca5eb17f28 Fix SIB1 with offsetToPointA = 86 2021-03-01 22:18:51 +00:00
Remi Hardy
a494950b0b Integration 2021 wk09
MR1029 : Benetel driver update  
This MR fixes an issue with the driver for the 4G Benetel RRUs.
Power levels on the 5G side were adapted to avoid saturation of the signals. 
5G performance is now the same as with USRP. 
Support for 2 antennas for both 4G and 5G was added

MR1062 : fixing the RE offset for each Rx antenna in pusch channel estimation
2021-03-01 21:08:19 +01:00
Sakthivel Velumani
75cad822c5 Merge branch 'develop-SA-CBRA' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-SA-CBRA 2021-03-01 20:47:54 +01:00
Sakthivel Velumani
240f411fed Passing symbolStart to fill_dmrs_mask
It is sufficient to pass l_d directly to the function but considering future extension to mapping type B, this way makes more sense.
2021-03-01 20:41:02 +01:00
rmagueta
e5aba9eda1 Fix RA-Msg3 to logical channel CCCH 2021-03-01 19:23:43 +00:00
rmagueta
deef82d70b Fix RA-Msg3 to logical channel CCCH 2021-03-01 19:23:23 +00:00
luis_pereira87
ee9210c69b Correction proposal for HARQ when ULSCH is not received 2021-03-01 11:22:39 +00:00
luis_pereira87
f18db2bad8 Update SIB1 with q_RxLevMin to -65 and MCC and MNC to match SIM card values 2021-03-01 10:32:12 +00:00
francescomani
4e6fb20fe9 adding symbol based vrb map for csirs 2021-03-01 09:15:23 +01:00
Guhan
02ae169250 Rebased to latest develop and removed nr_rx_acknack function 2021-03-01 11:43:30 +05:30
Laurent Thomas
9ce7f94518 record/replay for 5G, nrscope bug fix 2021-02-28 21:39:53 +01:00
Laurent Thomas
f5a22a7426 Merge branch 'develop-SA-CBRA' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-SA-CBRA 2021-02-28 11:06:02 +01:00
rmagueta
fc9b781c2a Avoid multiple transmissions in the RA-Msg4 slot 2021-02-26 20:15:06 +00:00
matzakos
1e8a23f519 Resolve remaining conflict from merge in CMakelists 2021-02-26 20:31:19 +01:00
hardy
d143cec5ba Merge remote-tracking branch 'origin/sarma_pvnp_oai' into integration_2021_wk09_b 2021-02-26 16:09:17 +01:00
hardy
8d05695722 Merge remote-tracking branch 'origin/benetel_driver_update' into integration_2021_wk09_b 2021-02-26 16:09:05 +01:00
matzakos
09652d2910 Add sample configuration files for preliminary NR SA monolithic and CU/DU split deployment options 2021-02-26 13:06:26 +01:00
matzakos
20805c1314 Remove confusing mixed SRB/DRB functions for SRB addition in RLC
- SRB addition is now done through add_srb, add_srb_am functions
2021-02-26 13:01:17 +01:00
matzakos
e186134061 Preliminary work for separation of SRB from DRB handling in RLC
-For the moment SRBs are preconfigured (as was done for DRBs in noS1 mode)
but this should be removed
2021-02-26 12:11:01 +01:00
guhan
89c1a9c284 Removed SR 2021-02-26 14:16:35 +05:30
guhan
6505729aad some modifications in gNB_scheduler_uci.c 2021-02-26 14:16:01 +05:30
guhan
f338d6d65d Removed rrc dependency, code rearrangement 2021-02-26 14:16:01 +05:30
guhan
5d4f815181 Removed dead code 2021-02-26 11:50:13 +05:30
guhan
e914cb28a6 Fixed some warnings 2021-02-26 11:47:33 +05:30
rangaswamy
0e61b612ba fixed warnings 2021-02-26 11:47:33 +05:30
k.ramya
0a0a5e48c3 code rearrangement 2021-02-26 11:37:58 +05:30
r.karey
e703638522 fixed memory leaks 2021-02-26 11:31:06 +05:30
Francesco Mani
27cfdd4974 some cleanup 2021-02-26 11:29:28 +05:30
Francesco Mani
2e17bd241f bugfix in pucch_rx 2021-02-26 11:29:28 +05:30
Francesco Mani
cfdfd789b0 some code cleanup in csi_bitlen 2021-02-26 11:29:28 +05:30
Francesco Mani
17f830e587 revert to old rrc csi confriguration 2021-02-26 11:29:28 +05:30
Francesco Mani
898f752059 uci mac functions in a new file 2021-02-26 11:29:28 +05:30
Rangaswami
dfa39d5441 fixed CSI payload issue with multiple SSBs 2021-02-26 11:08:32 +05:30
Francesco Mani
5c35c9fba2 bugix for cri-rsrp in bitlen computation 2021-02-26 11:08:32 +05:30
p.shashikala
ee7b48ee01 CSI payload bits inversion issue 2021-02-26 11:08:32 +05:30
Rangaswami
8c923c9796 Fixed the segemntation fault and added CSI bitlength in uci_pdu 2021-02-26 11:08:32 +05:30
r.karey
c779ca120f Fixed the calculation of received csi payload size at MAC 2021-02-26 11:08:32 +05:30
Francesco Mani
827fcb2d30 remove log 2021-02-26 11:04:20 +05:30
Francesco Mani
e746ee5e96 make ue and physim compile again 2021-02-26 11:04:20 +05:30
r.karey
dbe30e81f6 CSI-RS reporting bitlength calculation for type1 single panel two CSI-RS ports 2021-02-26 11:04:20 +05:30
r.karey
c15855b9ab Bit length calculation for CRI-RSRP 2021-02-26 11:04:20 +05:30
r.karey
778dec6634 Changed periodicity calculation according to CSI_Reporting branch 2021-02-26 11:04:20 +05:30
r.karey
befcb33d1b Modified bitlen calculation for ssbri 2021-02-26 11:04:20 +05:30
r.karey
3fa6b36ac3 UCI bitlength calculation 2021-02-26 11:04:20 +05:30
r.karey
802f69a574 Added more logs and fixed assertion 2021-02-26 11:04:20 +05:30
vr.devendra
6a1a0e8257 updated TCI handling apis 2021-02-26 11:00:37 +05:30
Rangaswami
1dfec690f5 Initial commits for TCI and CSI reporting changes 2021-02-26 11:00:37 +05:30
Rangaswami
f344f69d1c Initial commits for TCI and CSI reporting changes 2021-02-26 10:54:40 +05:30
Francesco Mani
656d2abc7c Remove PRACH logging nr_mac_common.c 2021-02-26 10:53:54 +05:30
r.karey
207c0bd4a4 Fixed the calculation of received csi payload size at MAC 2021-02-26 10:53:54 +05:30
Francesco Mani
dc204e333c remove log 2021-02-26 10:53:54 +05:30
r.karey
8c9ec48457 CSI-RS reporting bitlength calculation for type1 single panel two CSI-RS ports 2021-02-26 10:53:54 +05:30
r.karey
5d5d4a1099 Bit length calculation for CRI-RSRP 2021-02-26 10:51:42 +05:30
r.karey
83cff97129 Changed periodicity calculation according to CSI_Reporting branch 2021-02-26 10:51:42 +05:30
r.karey
8c488bfdf8 UCI bitlength calculation 2021-02-26 10:51:42 +05:30
r.karey
03ea28df44 Merged rrc_gNB_reconfig for NR_CSI_reporting 2021-02-26 10:48:37 +05:30
r.karey
4c3c53d288 receiving of CSI report 2021-02-26 10:48:37 +05:30
r.karey
32139c6f91 Added more logs and fixed assertion 2021-02-26 10:48:36 +05:30
Rangaswami
59937eeb2b Initial commits for TCI and CSI reporting changes 2021-02-26 10:48:36 +05:30
Rangaswami
947eba9be8 Initial commits for TCI and CSI reporting changes 2021-02-26 10:46:17 +05:30
Francesco Mani
c54062194e bugfix in pucch_rx 2021-02-26 10:20:51 +05:30
Francesco Mani
cad40aabff uci mac functions in a new file 2021-02-26 10:20:51 +05:30
Francesco Mani
7bdf086301 fix in csi pucch2 payload reporting 2021-02-26 10:20:51 +05:30
Rangaswami
8e9b8f6cd0 fixed CSI payload issue with multiple SSBs 2021-02-26 10:20:51 +05:30
p.shashikala
6a0168b42b CSI payload bits inversion issue 2021-02-26 10:20:51 +05:30
Rangaswami
db718321be Fixed the segemntation fault and added CSI bitlength in uci_pdu 2021-02-26 10:20:51 +05:30
r.karey
91bb8d2fab Fixed the calculation of received csi payload size at MAC 2021-02-26 10:20:51 +05:30
r.karey
642679ddf4 Changed the TCI handling after processing of CSI_measurements 2021-02-26 10:20:51 +05:30
Francesco Mani
7edba1b1e8 remove log 2021-02-26 10:20:51 +05:30
r.karey
78dd18940c CSI-RS reporting bitlength calculation for type1 single panel two CSI-RS ports 2021-02-26 10:20:51 +05:30
r.karey
88bf90e587 Bit length calculation for CRI-RSRP 2021-02-26 10:20:51 +05:30
r.karey
132d139c92 Changed periodicity calculation according to CSI_Reporting branch 2021-02-26 10:20:51 +05:30
r.karey
bece5400d7 UCI bitlength calculation 2021-02-26 10:20:51 +05:30
r.karey
33f3fb2262 receiving of CSI report 2021-02-26 10:20:51 +05:30
r.karey
356a0033fc Added more logs and fixed assertion 2021-02-26 10:20:51 +05:30
vr.devendra
94ae29d9e5 updated TCI handling apis 2021-02-26 10:20:51 +05:30
Rangaswami
1dfc02fdf4 Initial commits for TCI and CSI reporting changes 2021-02-26 10:20:51 +05:30
Rangaswami
abc13b60b2 Initial commits for TCI and CSI reporting changes 2021-02-26 10:20:51 +05:30
Francesco Mani
c47a0d272f bugix for cri-rsrp in bitlen computation 2021-02-26 10:20:51 +05:30
p.shashikala
55c55d7d17 CSI payload bits inversion issue 2021-02-26 10:20:51 +05:30
Rangaswami
c9d7455dea Fixed the segemntation fault and added CSI bitlength in uci_pdu 2021-02-26 10:20:51 +05:30
r.karey
e6d057ec8a Fixed the calculation of received csi payload size at MAC 2021-02-26 10:20:51 +05:30
r.karey
5fdadbfe84 Changed the TCI handling after processing of CSI_measurements 2021-02-26 10:20:51 +05:30
Francesco Mani
8cfc99bd98 remove log 2021-02-26 10:20:51 +05:30
Francesco Mani
fcf481f8cb make ue and physim compile again 2021-02-26 10:20:51 +05:30
r.karey
7b4a863018 CSI-RS reporting bitlength calculation for type1 single panel two CSI-RS ports 2021-02-26 10:20:51 +05:30
r.karey
1e1258742e Bit length calculation for CRI-RSRP 2021-02-26 10:20:51 +05:30
r.karey
da383da93d Changed periodicity calculation according to CSI_Reporting branch 2021-02-26 10:20:51 +05:30
r.karey
07d90b44b9 Modified bitlen calculation for ssbri 2021-02-26 10:20:51 +05:30
r.karey
13ed4a3aa3 Added debug logs 2021-02-26 10:20:51 +05:30
r.karey
72d0566666 UCI bitlength calculation 2021-02-26 10:20:51 +05:30
r.karey
21c0af1b7c Merged rrc_gNB_reconfig for NR_CSI_reporting 2021-02-26 10:20:51 +05:30
r.karey
5196599833 receiving of CSI report 2021-02-26 10:20:51 +05:30
r.karey
ed39ad6a0c Added more logs and fixed assertion 2021-02-26 10:20:51 +05:30
vr.devendra
6bff696646 updated TCI handling apis 2021-02-26 10:20:51 +05:30
r.karey
b47a736276 added more debug logs 2021-02-26 10:10:23 +05:30
Rangaswami
d4fde1eb4d Initial commits for TCI and CSI reporting changes 2021-02-26 10:10:23 +05:30
r.karey
7c6744f3ba added more debug logs 2021-02-26 10:10:23 +05:30
Rangaswami
eb93c078bc Initial commits for TCI and CSI reporting changes 2021-02-26 10:10:23 +05:30
rmagueta
eb17629d34 nr_generate_Msg4 support for multiple RA procedures 2021-02-26 00:51:03 +00:00
Raymond Knopp
14379074a7 added TDD configuration information to F1-Setup-Request based on the configuration file contents.. Corrected some bugs in F1AP encoding for TDD. 2021-02-25 23:44:29 +01:00
francescomani
1541a6b808 fix for ssb preamble index association in rrc configuration 2021-02-25 16:24:28 +01:00
rmagueta
6a16fe9e3f Fix issues caused by merge of branch develop 2021-02-25 14:57:53 +00:00
rmagueta
cf70265ba6 Merge remote-tracking branch 'origin/develop' into develop-SA-CBRA
# Conflicts:
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
#	openair2/LAYER2/NR_MAC_gNB/mac_proto.h
2021-02-25 13:03:06 +00:00
Sakthivel Velumani
0e2ecd7bce Merge branch 'develop' into gnb-threadpool 2021-02-25 13:48:13 +01:00
rmagueta
c8fbcdf7b9 Minor fix 2021-02-25 12:47:23 +00:00
francescomani
9afb19858a Merge remote-tracking branch 'origin/develop' into NR_FAPI_beamindex_SSB_RO 2021-02-25 12:04:24 +01:00
luis_pereira87
adaf5a721c Define Initial BWP with the same locationAndBandwidth as Coreset0 defined by PDCCHConfigSIB1 in MIB 2021-02-25 10:56:08 +00:00
Raymond Knopp
6b5a47081f filling in some missing information in F1-Setup-Request 2021-02-25 11:54:38 +01:00
Laurent Thomas
77806538a7 Merge branch 'develop-SA-CBRA' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-SA-CBRA 2021-02-25 10:55:59 +01:00
Xue Song
b6febe214f add GTPV1U_GNB_TUNNEL_DATA_REQ and UDP_DATA_IND
if the UE is running with noS1, u-plane for rfsim with Free5GC + CU/DU is OK
2021-02-25 14:00:14 +09:00
Raymond Knopp
32b74d2f38 nr-softmodem compilation after merge with develop 2021-02-25 01:00:34 +01:00
Raymond Knopp
4d9ebf0ac0 Merge remote-tracking branch 'origin/develop' into NR_SA_F1AP_RFSIMULATOR2
Conflicts:
	cmake_targets/CMakeLists.txt
	executables/nr-softmodem.c
	executables/nr-uesoftmodem.c
	openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
	openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
	openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
	openair2/LAYER2/nr_pdcp/nr_pdcp_entity.c
	openair2/LAYER2/nr_pdcp/nr_pdcp_entity_drb_am.c
	openair2/RRC/NR/rrc_gNB.c
	openair2/RRC/NR/rrc_gNB_NGAP.c
	openair2/RRC/NR_UE/rrc_UE.c
	openair3/NGAP/ngap_gNB.c
	openair3/NGAP/ngap_gNB_nas_procedures.c
2021-02-24 23:00:04 +01:00
Raymond Knopp
11c3a26414 Merge remote-tracking branch 'origin/develop' into oairu
Conflicts:
	openair2/RRC/LTE/rrc_eNB.c
2021-02-24 21:52:14 +01:00
rmagueta
d1ba40cc56 Fix RA-Msg2 to Initial BWP 2021-02-24 19:34:53 +00:00
rmagueta
2060cf45bb Fix RA-Msg4 to Initial BWP 2021-02-24 18:49:00 +00:00
Remi Hardy
17d4c5c2f4 Integration 2021 wk08
MR1046 : Add support for NR UL SC-FDMA up to 100 MHz

MR1053Nr : pdcp nea2 security

MR1049 : improve rfsim
-Fix a regression 
Earlier parameter reading was moved to an external thread,  
Eventually the check at the end of the main was too early, 
Declaration of  some extra parameters are now on command line
-Enhancement: 
use the rfsim as a server on UE side, so we can connect two xNB to one UE
-Simplification: 
remove rfsim flags that have been made for convergence with replay function in usrp driver, but this is useless as they changed their code
-Fix a bug in ubuntu 20.04 (now the code is ready in whole OAI)


MR1056 : Bugfix: NR BSR calculation
Fixes a bug in the scheduler for BSR calculation. 
Before, we might wrongly track the BSR of a UE and not schedule it anymore although it has data. 
Should be fixed now and improve UL throughput. 

MR963 : Nr mac multi rach global edge
-Handling of Multiple Users triggering RACH request in different RACH Occasions in same slot
-Providing Random Access Response according to RACH request
2021-02-24 18:47:54 +01:00
Saankhya
37a2ce7d3d following coding guideline
fixing the RE offset for each Rx antenna in pusch channel estimation
2021-02-24 12:01:58 +05:30
rmagueta
aacf75b298 Transmission and reception of a fake RA-Msg4 2021-02-24 02:54:53 +00:00
Laurent Thomas
8e5ee096e1 Merge branch 'develop-SA-CBRA' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-SA-CBRA 2021-02-23 16:25:26 +01:00
rmagueta
48811d0f34 Merge branch 'develop' into develop-SA-CBRA
# Conflicts:
#	cmake_targets/CMakeLists.txt
#	openair1/SIMULATION/NR_PHY/dlsim.c
#	openair1/SIMULATION/NR_PHY/ulsim.c
2021-02-23 13:29:53 +00:00
Raymond Knopp
d5cff2c3c3 nfapi_setmode dummy for oairu exectuable 2021-02-23 14:07:12 +01:00
rmagueta
910154c7af Merge branch 'develop' into develop-SA-RA
# Conflicts:
#	cmake_targets/CMakeLists.txt
#	openair1/SIMULATION/NR_PHY/dlsim.c
#	openair1/SIMULATION/NR_PHY/ulsim.c
2021-02-23 13:04:01 +00:00
Laurent Thomas
92e90c2c4f Merge branch 'develop-SA-CBRA' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-SA-CBRA 2021-02-23 13:58:18 +01:00
Laurent Thomas
9d72f65e9c small fix 2021-02-23 13:58:14 +01:00
Raymond Knopp
a6e16e7c8a Merge remote-tracking branch 'origin/develop' into oairu 2021-02-23 11:51:29 +01:00
hardy
88ce69608c Merge remote-tracking branch 'origin/NR_MAC_Multi_Rach_GlobalEdge' into integration_2021_wk08 2021-02-23 10:29:50 +01:00
Raymond Knopp
9f35010ea3 changes for multi-RRU OTA synch 2021-02-23 10:19:05 +01:00
hardy
30bede544c Merge remote-tracking branch 'origin/nr-bsr-fix' into integration_2021_wk08 2021-02-23 09:31:22 +01:00
hardy
accae67113 Merge remote-tracking branch 'origin/nr-pdcp-nea2-security' into integration_2021_wk08 2021-02-23 09:31:05 +01:00
hardy
3199b81584 Merge remote-tracking branch 'origin/enhance-rfsim' into integration_2021_wk08 2021-02-23 09:30:42 +01:00
hardy
90d6a57a3c Merge remote-tracking branch 'origin/NR_UL_SCFDMA_100MHz' into integration_2021_wk08 2021-02-23 09:30:22 +01:00
Remi Hardy
0114160246 Merge branch 'integration_2021_wk06_MR978' into 'develop'
MR978 : 
We have incorporated 5G NR nFAPI into the develop branch
P5 and P7 interfaces for NR have been implemented. 
With this MR, downlink transmission through nFAPI will be possible. 
We have also made sure that 4G nFAPI can be used from within the develop branch.
2021-02-23 09:15:56 +01:00
rmagueta
31cf9ab847 Fix ra->rnti 2021-02-23 02:22:27 +00:00
Raymond Knopp
596b54bcbe synchronization for oairu 2021-02-22 21:47:12 +01:00
rmagueta
495ba8920d Merge branch 'develop-SA-RA' into develop-SA-CBRA 2021-02-22 16:35:06 +00:00
rmagueta
bed43a2a79 Address review comments 2021-02-22 16:31:13 +00:00
francescomani
465529ce45 adapting scheduling csirs for multi UE (to be verified) 2021-02-22 17:04:40 +01:00
rmagueta
4ea560f291 Address review comments 2021-02-22 16:01:05 +00:00
rmagueta
b6ab1eb9e1 Fix RA preamble shift at gNB 2021-02-22 15:34:15 +00:00
francescomani
ba02f61f28 Merge remote-tracking branch 'origin/develop' into NR_scheduling_CSIRS 2021-02-22 16:30:49 +01:00
rmagueta
23695a52d7 Fix stored node 2021-02-22 14:30:04 +00:00
Gokul Srinivasan
880096cc95 Delete create_nr_tasks.c 2021-02-21 18:40:51 +01:00
rmagueta
a613617737 Fix preamble shift at gNB for RA works with all preambles 2021-02-21 04:05:29 +00:00
Robert Schmidt
305902da42 Correctly allocate memory for NR measurement array 2021-02-20 15:43:02 +01:00
Raymond Knopp
f8e6e1fd85 bugfix in PHR, addition of configuration parameters for MAC scheduler 2021-02-19 21:57:54 +01:00
luis_pereira87
22fa28e7fe Merge remote-tracking branch 'origin/enhance-rfsim' into develop-SA-CBRA 2021-02-19 16:18:22 +00:00
Florian Kaltenberger
2651cd0cd3 removing dead code 2021-02-19 11:16:29 +01:00
Florian Kaltenberger
a51e3defa8 when PRACH config 4 is used (Benetel RRU) we only schedule UL slots 8 and 9 2021-02-19 11:15:59 +01:00
Florian Kaltenberger
30aaa0dc44 reducing UL target power for Benetel 5G RRU and adding missing parameter for PUSCH multi thread processing 2021-02-19 11:47:25 +01:00
Florian Kaltenberger
670c807a56 Merge remote-tracking branch 'origin/develop' into benetel_driver_update 2021-02-19 11:46:41 +01:00
laurent
c910668e7b add LOG_M() binary format 2021-02-19 10:48:35 +01:00
guhan
e893ee8a16 Fixed the issue w.r.t looping of configured preamble list 2021-02-19 11:47:55 +05:30
Laurent Thomas
abea2ef926 protect nrscope when thread starts before end of init 2021-02-18 22:36:45 +01:00
Laurent Thomas
11a318170e memory wrong free in global vars used for configuration storage 2021-02-18 22:23:31 +01:00
Mahesh
7ea8211b85 Code fixes for NSA test 2021-02-18 16:19:12 +05:30
Francesco Mani
80cac226fc fixed a warning in gNB_scheduler_ulsch.c 2021-02-18 08:50:45 +01:00
rmagueta
edccb98691 First draft implementation of CBRA 2021-02-17 20:16:03 +00:00
Raymond Knopp
7fa5d4188f added include to suppress warning 2021-02-17 18:41:23 +01:00
Raymond Knopp
b193771387 12-bit frequency-domain equalizer LUT. fix for log2_maxh in ULSCH receiver 2021-02-17 15:34:49 +01:00
cig
e023f67ed8 Compute and apply symbol rotation for DL and UL
- now done according to the proper DL/UL frequency
- this makes it compatible with FDD mode
2021-02-17 14:14:06 +01:00
Robert Schmidt
a3b1216b23 Fixup sched_ul_bytes logic
1) Only count new transmission as scheduled bytes (which is then
compared against the BSR)

2) When subtracting scheduled bytes after successful reception, subtract
TBsize from correct HARQ process
2021-02-17 10:17:59 +01:00
cig
c89d349300 Bugfix in nr_ue_prach_scheduler
- scheduled_response was called regardless of the UL config in the PRACH slot
  this was leading to wrong behaviour since it was interfering with the
  UL config of PUSCH
2021-02-16 15:25:48 +01:00
Sakthivel Velumani
7c86b9c289 Ulsch coding fix
Do encoding only if NDI toggles instead of doing on first round. Both are same but we now remove the dependancy on rv_round_mapping.
2021-02-16 12:07:27 +01:00
Sakthivel Velumani
f62095fb32 Updated nr_dlsim to generate matlab files
Updated matlab file write function to write multiple vectors to a single file.
2021-02-16 10:29:38 +01:00
Xue Song
bd765c7505 C-plane for rfsim with Free5GC + CU/DU separation is OK 2021-02-16 14:14:55 +09:00
Xue Song
5918c03cd4 add nrue nas task 2021-02-16 14:14:46 +09:00
luis_pereira87
9d498e1a09 Improve PDSCH DMRS modulation for numDmrsCdmGrpsNoData=1 2021-02-15 16:49:07 +00:00
francescomani
eef684d91a adding 24 PRB to X2AP function 2021-02-15 16:25:30 +01:00
Cedric Roux
21ff70e84f hack: put back a hack that seems necessary for NR rfsim tests in the CI
go figure...
2021-02-15 15:25:52 +01:00
Cedric Roux
3cfa2c266b hack: fix NR prachsim compilation
Dirty!
2021-02-15 15:25:52 +01:00
Cedric Roux
778e487323 hack: fix NR ulsim compilation
Dirty.
2021-02-15 15:25:52 +01:00
Cedric Roux
67b9cd1892 hack: fix NR dlsim compilation
Dirty...
2021-02-15 15:25:52 +01:00
Cedric Roux
73f3a458cf NSA: finalize nea2 security for gNB
- a new section in the configuration file to select security algorithms,
  with new code to deal with it
- cleanup CG-ConfigInfo: specs seem to indicate that we must not
  add mcg_RB_Config; the gNB has to deal with that
- as a consequence, modify fill_default_rbconfig() that is called in
  every cases and needs security and bearer parameters

The new section in the configuration file looks like:

    security = {
      # preferred ciphering algorithms
      # the first one of the list that an UE supports in chosen
      # valid values: nea0, nea1, nea2, nea3
      ciphering_algorithms = ( "nea0", "nea2" );

      # preferred integrity algorithms
      # the first one of the list that an UE supports in chosen
      # valid values: nia0, nia1, nia2, nia3
      integrity_algorithms = ( "nia0" );
    };
2021-02-15 15:25:52 +01:00
Cedric Roux
cb589c211c minor trivial bugfix 2021-02-15 15:25:52 +01:00
Cedric Roux
10e021e96d NSA: first draft of nea2 security for gNB
The code is forced to use nea2, no matter what the UE supports.

After 2^18 PDCP packets, it will fail to work (we don't use HFN yet).

These limitations will be fixed in later commits.

The existing security function was not reused, because it does too
much memory allocation and initializes the security context at each
ciphering. So here comes nr_pdcp_security_nea2_cipher(). And also
the ciphering is done inplace. To be changed if necessary.
2021-02-15 15:25:47 +01:00
cig
94d956fa55 Fixed warning about use of wrong enum 2021-02-15 13:24:20 +01:00
Laurent Thomas
abfa103247 fix re-reading and end marker code 2021-02-15 10:54:35 +01:00
Raymond Knopp
d77f9ad096 build oairu ok 2021-02-15 08:13:15 +01:00
Raymond Knopp
a135f261b2 adjust includes for oairu target. Now test X-Ysoftmodem on another machine 2021-02-14 17:59:28 +01:00
Raymond Knopp
7b4c1eae33 Merge branch 'oairu' of https://gitlab.eurecom.fr/oai/openairinterface5g into oairu 2021-02-14 14:06:18 +01:00
Raymond Knopp
b67a3502b8 commit before merge 2021-02-14 14:06:05 +01:00
Raymond Knopp
5b865df202 fixed for oairu target after merge with develop 2021-02-14 14:05:16 +01:00
Raymond Knopp
5ed79a27de Merge remote-tracking branch 'origin/develop' into oairu 2021-02-14 07:18:13 +01:00
Sakthivel Velumani
3776379eb1 Merge branch 'develop' into gnb-threadpool 2021-02-13 17:00:00 +01:00
Sakthivel Velumani
08ab234501 Removing sync_thread 2021-02-13 15:14:03 +01:00
rmagueta
e7fb928758 Fix dlsch_config_pdu for DCI with format 1.1 2021-02-12 21:40:04 +00:00
Robert Schmidt
ef90d77b0e Reformat nr_initiate_ra_proc() [no other changes] 2021-02-12 20:53:36 +01:00
cig
d5877d75bf Bugfix in gNB RA scheduling for FDD duplex mode
- the RA SFN index wasn't increased in the FDD case, therefore the PRACH
  RX was never scheduled
2021-02-12 18:41:19 +01:00
cig
24fc20e2e2 Bugfix in USRP flags configuration for NR UE
- missing check on duplex mode before fetching the TDD period
- missing flags configuration for FDD mode
2021-02-12 17:02:20 +01:00
Thomas Schlichter
d3982e5809 Merge remote-tracking branch 'develop' into NR_FDD_FIX 2021-02-12 16:39:58 +01:00
Cedric Roux
0b4335accc NSA: some work on security (for PDCP)
- compute correct kgNB
- propagate properly NR security capabilities of an UE
  (involves: rrc, s1ap, x2ap)
2021-02-12 16:01:37 +01:00
Thomas Schlichter
d2f353acf6 Merge remote-tracking branch 'develop' into NR_DL_MIMO 2021-02-12 15:33:51 +01:00
guhan
0d5f1dfea0 Fixed the index issue 2021-02-12 19:49:42 +05:30
luis_pereira87
9a55e64e54 Fix build errors in physical unitary tests simulators, minor update in the documentation 2021-02-12 12:28:17 +00:00
Mahesh
b681d67d7f Cleanup 2021-02-12 16:36:58 +05:30
Mahesh
f69af6abaf merge MR978 (5G nFAPI) into develop 2021-02-12 16:26:22 +05:30
francescomani
63f264a3d7 quickfix for fr2 xlsch bitmap 2021-02-12 11:20:57 +01:00
kn.raju
37d112f511 Check that resources are free for Msg2/RAR 2021-02-12 08:31:35 +01:00
kn.raju
13e719d74a fixes nr_initiate_ra_proc() 2021-02-12 08:31:30 +01:00
kn.raju
bf81ea19d3 Check cfra in nr_initiate_ra_proc() 2021-02-12 08:31:28 +01:00
kn.raju
66ffa08a3d Handle individual RAs in nr_generate_Msg2() and nr_add_msg3()
* add the RA process to handle to command parameters
* Do not create the RAR_pdu into an intermediate array, but directly
  into the nFAPI TX_req
* Slightly restructure nr_generate_Msg2() to first make AssertFatal()
  checks, then proceed allocating
2021-02-12 08:31:26 +01:00
kn.raju
25a520e4fa find_SSB_and_RO_available() 2021-02-12 08:31:23 +01:00
kn.raju
68b4a6bf28 Fixing association period 2021-02-12 08:31:17 +01:00
kn.raju
054934c4f8 Do nr_schedule_RA() for all RA processes 2021-02-12 08:31:13 +01:00
kn.raju
baba8d69be nr_initiate_ra_proc(): check in all RA processes, check beam_index 2021-02-12 08:31:11 +01:00
kn.raju
4dacea921c New UE: check for free RA and copy preamble list 2021-02-12 08:31:07 +01:00
kn.raju
eaadda1f5d Update FAPI nfapi_nr_tx_precoding_and_beamforming_t 2021-02-12 08:31:01 +01:00
rmagueta
7011b04b75 Code clean up and minor correction in RA for SA 2021-02-12 00:24:31 +00:00
rmagueta
d2e9ca590c Fix segmentation fault in PDSCH DMRS when using additional DMRS symbols 2021-02-11 22:21:45 +00:00
Mahesh
7f4ffe29c8 Fix whitespaces 2021-02-12 01:25:09 +05:30
Mahesh
eb19e02cf3 Merging MR978 with develop 2021-02-11 22:50:25 +05:30
francescomani
cb296fa050 Merge remote-tracking branch 'origin/develop' into NR_FAPI_beamindex_SSB_RO 2021-02-11 18:15:12 +01:00
cig
00a7adf198 NR_UE: cleanup and fix computation of ta_slot (when to apply the timing advance value)
- made hardcoded constants explicit
- made the code more readable according to OAI coding style guidelines
- fixed some formatting and logging
2021-02-11 18:04:36 +01:00
Thomas Schlichter
82804981bd fix timing advance command scaling
scaling with 2^mu is already part of 'bw_scaling', so don't do it twice!
Also simplify the computation in get_bw_scaling() by using a one-line computation instead of a switch-case table.
2021-02-11 18:00:30 +01:00
rmagueta
d0c5bea3be Log improvements 2021-02-11 13:01:39 +00:00
Raymond Knopp
a30eabbe21 OTA testing 4G, configuration parameters for fairRR scheduler and common parameters for both fairRR and default 2021-02-11 13:43:25 +01:00
rmagueta
c5ab33ffd9 Merge remote-tracking branch 'origin/develop' into develop-SA-RA
# Conflicts:
#	openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
#	openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
2021-02-11 12:27:06 +00:00
Laurent Thomas
c93482c4c6 trivial merge with develop" 2021-02-11 13:27:00 +01:00
Raphael Defosseux
39ab3c1e9e * MR 1015: Multi-UE + more slots
This MR adds a multi-UE scheduler (proportional fair) for multiple UEs. Tested for two UEs, but should work for more. Additionally, it enables 12 DL slots and 2 UL slots (still fixed, will be read from the configuration file in a clean-up/follow-up MR).

* MR 1019: NASMESH: support for kernel version >= 5.6.0
he syntax for ndo_tx_timeout in Linux Kernel has changed since 5.6.0 i.e it has changed

* MR 1033: ue fixes
1. Write tx data to radio unit only on tx slots.
2. Fixed a bug in DL HARQ.
3. Disabled UE and some gNB side logs which were enabled (maybe by mistake) in previous MRs.
4. In UE, check if NDI toggled before reading SDU for PUSCH.
2021-02-11 12:21:21 +01:00
rmagueta
e2f749d8b2 Fix nr_dlsim, nr_ulsim and nr_prachsim 2021-02-11 10:56:08 +00:00
Sakthivel Velumani
7854133bc2 Removing some of the old pthreads
Leaving ru_thread and L1 stats thread
2021-02-10 22:00:09 +01:00
Laurent Thomas
b3e21ad87b only a printf 2021-02-10 17:58:10 +01:00
Laurent Thomas
2c5bd9fa8c improve rfsim 2021-02-10 17:49:14 +01:00
rmagueta
79e8098382 Minor code clean up 2021-02-10 15:15:35 +00:00
Sakthivel Velumani
31fb7f3120 Merge branch 'develop' into gnb-threadpool 2021-02-10 14:56:09 +01:00
Sakthivel Velumani
2e0ed038d3 Using only one threadPool for nr-softmodem 2021-02-10 15:45:40 +01:00
Raymond Knopp
37ef411c2e traces for fairRR scheduler 2021-02-10 14:14:29 +01:00
luis_pereira87
f4b3a869a6 minor fix at SIB1 decoding 2021-02-10 13:07:04 +00:00
Thomas Schlichter
f59a9360f5 Apply 2 suggestion(s) to 1 file(s) 2021-02-10 13:43:35 +01:00
Thomas Schlichter
13086925c9 Add tests for 80 and 100 MHz SC-FDMA to nr_ulsim autotests for CI 2021-02-10 11:21:40 +01:00
Parminder Singh
9202c583f5 Spaces are corrected, tabs replaced with spaces 2021-02-10 11:10:19 +01:00
Thomas Schlichter
97801299dc some whitespace fixes in openair1/PHY/MODULATION/nr_modulation.c 2021-02-10 09:10:22 +01:00
Xue Song
e1a92eadba Merge branch 'master' into develop_SA_rfsim_for_F1
Conflicts:
	openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
	openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
	openair2/RRC/NR/rrc_gNB.c
	openair2/RRC/NR/rrc_gNB_NGAP.c
	openair2/RRC/NR_UE/rrc_UE.c
	openair3/NGAP/ngap_gNB.c
	openair3/NGAP/ngap_gNB_nas_procedures.c
2021-02-10 15:56:50 +09:00
He Shanyun
01999cfcc7 fix build error of enb and ittisim 2021-02-10 01:07:02 +00:00
Thomas Schlichter
75cd4c79d9 update tx_sample_advance for 40 MHz and USRP X300 (3/4 sampling)
Testing RA with OAI gNB and UE both using X300 via PCIe link indicated a value of 15 was way too small.
The correct value for this setup seems to be 65.
2021-02-09 18:09:11 +01:00
Thomas Schlichter
b9e99f1e64 update tx_sample_advance for 10 MHz and USRP X300
Tests with our USRP X300, connected via PCIe, show that tx_sample_advance of 45 is slightly too much.
Unfortunately, transmitting the PRACH preamble too early is very bad, slightly too late is no problem.
So change this value from 45 to 40. This helps receiving the PRACH preamble reliably.
2021-02-09 17:51:33 +01:00
Thomas Schlichter
28f739bb70 add 10 MHz configuration file for USRP X300 2021-02-09 17:50:32 +01:00
Robert Schmidt
54a2d698db Fix build: test for slot from within preprocessor 2021-02-09 16:46:44 +01:00
dir
cfebcd19bd Corrections to 217RBs, 273RB configuration files. RFSIM works with these changes 2021-02-09 17:32:51 +02:00
luis_pereira87
5a1e2b1db7 Add support for SIB1 and SI in BCCH-DL-SCH 2021-02-09 15:32:17 +00:00
dir
d2aa132616 Msg3_transformprecoder value initialised to TRANSFORM PRECODING DISABLED 2021-02-09 15:16:40 +02:00
Florian Kaltenberger
04a4a6f451 Merge remote-tracking branch 'origin/develop' into benetel_driver_update 2021-02-09 11:13:01 +01:00
Florian Kaltenberger
12517f02e2 Reverting shifting the TX 4 bits to the left to exploit dynamic range.
adapted ssb_block_power to measured value

This partially reverts commit 857f9179f3.

Conflicts:
	targets/ARCH/ETHERNET/benetel/5g/benetel.c
2021-02-09 11:10:58 +01:00
dir
3efdb2775e NR SCFDMA changes for higher RB sizes (RB Sizes until 100Mhz) 2021-02-09 11:07:53 +01:00
yincong
c416e545e2 fix problems about rfsim noS1 2021-02-09 19:01:34 +09:00
hardy
665688681b Merge remote-tracking branch 'origin/ue-fixes' into integration_2021_wk06_b 2021-02-09 10:54:58 +01:00
hardy
421cb60fa4 Merge remote-tracking branch 'origin/NR_DLUL_PF' into integration_2021_wk06_b 2021-02-09 10:49:28 +01:00
hardy
bcc009b2f9 Merge remote-tracking branch 'origin/nasmesh_kernel_5.8' into integration_2021_wk06_b 2021-02-09 10:48:57 +01:00
Thomas Schlichter
14e84f8782 Merge remote-tracking branch 'develop' into NR_DL_MIMO 2021-02-09 10:02:54 +01:00
Raphael Defosseux
09230ceb5e CI: forgot to add 5G GNB FDD conf file for RF sim test
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-02-09 09:38:23 +01:00
Sakthivel Velumani
d29e09cdb1 Passing tx timestamp through pipeline 2021-02-08 23:59:33 +01:00
rmagueta
2b9d0f95c9 Fix develop merge conflicts in the RA-Msg3 2021-02-08 22:40:23 +00:00
Mahesh
2d58536c52 Phy simulators build error fixed 2021-02-09 02:11:54 +05:30
Sakthivel Velumani
f622bdedf4 Replacing tryPull by pull for L1 rx 2021-02-08 21:15:40 +01:00
Raymond Knopp
199ce8ac55 fixed segfault in ulsim when trials > 1000 2021-02-08 20:58:48 +01:00
rmagueta
5b7ae1228f Fix develop merge conflicts 2021-02-08 19:18:00 +00:00
Sakthivel Velumani
ff05ec89f6 Slot tx compute in ru_thread 2021-02-08 18:23:41 +01:00
Thomas Schlichter
2db2112aee Merge remote-tracking branch 'develop' into NR_FDD_FIX 2021-02-08 18:06:29 +01:00
rmagueta
03b52cec84 Merge remote-tracking branch 'origin/develop' into develop-SA-RA
# Conflicts:
#	openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
#	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
#	openair2/LAYER2/NR_MAC_UE/rar_tools_nrUE.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
#	openair2/RRC/NR_UE/rrc_UE.c
2021-02-08 15:17:12 +00:00
Raymond Knopp
4d47e3da96 IF4p5 testing. seems to work again with fixes after merge with develop 2021-02-08 15:27:37 +01:00
Sakthivel Velumani
8902902706 Merge branch 'develop' into ue-fixes 2021-02-08 15:06:17 +01:00
Thomas Schlichter
adc24a797e NR_UE: Add PRACH generation for 10 to 30 MHz (30 kHz SCS) 2021-02-08 14:21:30 +01:00
Thomas Schlichter
c5734aa110 NR_UE: slightly cleanup PRACH generation 2021-02-08 14:21:30 +01:00
Thomas Schlichter
92e654c6fc gNB: Add PRACH reception support for 10 to 30 MHz (30 kHz SCS) 2021-02-08 14:21:30 +01:00
Thomas Schlichter
a676ccbb80 gNB: fix PRACH reception for some configurations and some cleanup 2021-02-08 14:21:30 +01:00
Thomas Schlichter
6e57abc7ae NR_UE: consider sync position (1/8 CP) in initial sync and UL write timestamp 2021-02-08 14:21:30 +01:00
Thomas Schlichter
3eb2b4d7b2 Generalize some frame parameter calculations
Enabling more numerology combinations and 100 MHz support with 3/4 sampling for USRP X300/X310, too.
2021-02-08 14:21:30 +01:00
Thomas Schlichter
3743ead91a Merge remote-tracking branch 'develop' into NR_10MHz 2021-02-08 14:20:20 +01:00
Parminder Singh
222b37ff13 Merge remote-tracking branch 'origin/develop' into ptrs_rrc_config 2021-02-08 14:16:36 +01:00
Mahesh
0e6f1e6ad6 Merge conflicts resolved 2021-02-08 18:05:29 +05:30
Sakthivel Velumani
3380f1a455 send data from MAC to PHY when NDI toggles 2021-02-08 12:49:32 +01:00
francescomani
58ad2bf06f Merge remote-tracking branch 'origin/develop' into NR_FAPI_beamindex_SSB_RO 2021-02-08 12:05:06 +01:00
Laurent Thomas
fa63d9a4e6 merge develop 2021-02-08 11:56:42 +01:00
Robert Schmidt
b86fdaf59b Revert "Lower UE log level"
This reverts commit 71e297de9d.
2021-02-08 11:20:23 +01:00
Sakthivel Velumani
f4fd79c4d9 First commit
Created 3 threadpools for L1 rx, L1 tx and RU tx processing
2021-02-08 01:06:30 +01:00
Raymond Knopp
1bf9ea6d23 fixed NR build issues after merge with develop 2021-02-07 22:01:41 +01:00
Raymond Knopp
846c67b9bd Merge remote-tracking branch 'origin/develop' into oairu
Conflicts:
	openair2/LAYER2/NR_MAC_COMMON/nr_mac.h
2021-02-07 18:23:46 +01:00
Raymond Knopp
d06018d1e3 Merge branch 'four_antenna_eNB' into oairu 2021-02-07 17:46:23 +01:00
Raymond Knopp
7a169947da Merge branch 'oairu' of https://gitlab.eurecom.fr/oai/openairinterface5g into oairu 2021-02-07 17:41:57 +01:00
Raymond Knopp
008f9060a1 unitary simulators tested 2021-02-07 14:14:28 +01:00
Robert Schmidt
9b77575af2 Use the MAX_BWP_SIZE macro everywhere 2021-02-07 10:45:57 +01:00
Robert Schmidt
318c4e0fd7 Skip DL HARQ feedbacks if the timing does not match
As the precedent commit, this commit deals with the realtime problems
that we currently have on the CI bench.

For DL HARQ feedback, nFAPI does not give us the HARQ process ID.
Instead, we have to figure this out "from timing", i.e., if we trigger
PUCCH reception, we will get a message with HARQ if we instructed the
PHY to do so. If we have real-time problems, it seems (I cannot verify:
don't have real time problems) that we do not get the nFAPI message with
HARQ feedback. Thus, we need to skip the HARQ processes that should have
been processed in the past, which happens in this commit.
2021-02-07 10:45:57 +01:00
Robert Schmidt
f23890e0b9 Search correct UL HARQ, don't assert on late slot
At the time of this commit, the CI has realtime issues. This can mean
that the HARQ result is delivered in a delayed fashion. Before this
commit, we were asserting on whether the slot corresponds to the HARQ
process's expected feedback slot, but a particular feedback might be
delayed under realtime issues, and we actually don't care about the
timing since we get the HARQ process ID.

Instead, we loop through the HARQ processes for which we wait for a
feedback in the beginning until we have the right process (which did not
seem to cause a problem till now, but who knows.
2021-02-07 10:45:57 +01:00
Robert Schmidt
423a0e4afe Handle UL HARQ slot wrap around for slot = 0 2021-02-07 10:45:57 +01:00
Robert Schmidt
8bd3ec7602 Fix whitespace issues (review request) 2021-02-07 10:45:57 +01:00
Robert Schmidt
71fd526e12 Remove unused variables 2021-02-07 10:45:57 +01:00
Robert Schmidt
30d13ebf6d Lower various log levels 2021-02-07 10:45:57 +01:00
Robert Schmidt
77203ee989 Fix nr_dlschsim unitary simulator 2021-02-07 10:45:57 +01:00
ChiehChun
a8cc08ace5 Cannot allocate CCE error -> debug message 2021-02-07 10:45:57 +01:00
ChiehChun
8a823d22cf Better format dump_mac_stats() 2021-02-07 10:45:57 +01:00
ChiehChun
c51cb3f40b Enable 2 UL slots 2021-02-07 10:45:57 +01:00
Robert Schmidt
dcd591bd2b Schedule BSR0 UE only one at a time, in round-robin 2021-02-07 10:45:57 +01:00
Robert Schmidt
3b972f6766 ULSCH fix: Only allocate CCEs when necessary 2021-02-07 10:45:57 +01:00
Robert Schmidt
77de70c82f Calculate TBS for coefficient only when needed 2021-02-07 10:45:57 +01:00
ChiehChun
8bf2d1a12f Remove assert of allocate CSI PUCCH 2021-02-07 10:45:57 +01:00
ChiehChun
fde6c46ef1 Remove assertion for single UE 2021-02-07 10:45:57 +01:00
Robert Schmidt
6294ce715e Reorder pf_ul to process retransmission 2021-02-07 10:45:57 +01:00
ChiehChun
14614d74cf Find max coeff & Decrease n_rb_sched 2021-02-07 10:45:57 +01:00
ChiehChun
56831038d0 Check BSR & Create UE_sched for UL new transmission 2021-02-07 10:39:40 +01:00
Robert Schmidt
c8168085dd Calculate UL coefficient 2021-02-07 10:39:40 +01:00
ChiehChun
1b1411727c Calculate UL throughput & Initial ulsch_current_bytes 2021-02-07 10:39:40 +01:00
ChiehChun
cf725a1801 Create find_CCE in primitive 2021-02-07 10:39:40 +01:00
ChiehChun
bec348405b Find the largest contiguos region 2021-02-07 10:39:40 +01:00
ChiehChun
8f988e384d Add pf_ul & pseudo code 2021-02-07 10:39:40 +01:00
ChiehChun
5573b8e18c Change vrb_map_UL to rballoc_mask 2021-02-07 10:39:40 +01:00
ChiehChun
2becbb9210 Verify the same K2 2021-02-07 10:39:40 +01:00
ChiehChun
7da43c95d2 Change pre_precessor_ul type to bool
- To check the current slot is the scheduled slot(UL slot - K2) and
  only execute the post processor in scheduled slot.
2021-02-07 10:39:40 +01:00
ChiehChun
0234015f8e Check slot is DL slot to pre-schedule UL data 2021-02-07 10:39:40 +01:00
ChiehChun
2283e12560 Calculate rbSize from estimated buffer 2021-02-07 10:39:40 +01:00
ChiehChun
c7ffd5740f Add sched_ul_bytes/ulsch_current_bytes & Update in rx_sdu/schedule_ulsch 2021-02-07 10:39:40 +01:00
ChiehChun
4d0a2e4877 Save selected UL HARQ PID in post-processor 2021-02-07 10:39:40 +01:00
Robert Schmidt
4b1be522a5 Add estimated_ul_buffer & Update in DTCH 2021-02-07 10:39:40 +01:00
ChiehChun
989aade7b8 Log lcid default case & pirntout MAC PDU 2021-02-07 10:39:40 +01:00
ChiehChun
21e9339427 Add short/long BSR Table & Log the BSR value 2021-02-07 10:39:40 +01:00
ChiehChun
c316f2fc57 Correct bit ordering in struct NR_BSR_LONG 2021-02-07 10:39:40 +01:00
ChiehChun
a95346d169 Modify the case of truncated BSR 2021-02-07 10:39:40 +01:00
ChiehChun
1ff770ff20 Add CE & BSR pointer 2021-02-07 10:39:40 +01:00
ChiehChun
2b6a651aae Fix LCID of CRNTI for nr UE 2021-02-07 10:39:40 +01:00
ChiehChun
5e226b9e22 Remove assertion for single UE 2021-02-07 10:39:40 +01:00
ChiehChun
3bb4bddc0d Allocate DL new transmission 2021-02-07 10:39:40 +01:00
ChiehChun
a7cb83889a Find max coeff from UE_sched 2021-02-07 10:39:40 +01:00
ChiehChun
6d5634b8ce Check DL buf and Calculate the coeff to create UE_sched 2021-02-07 10:39:40 +01:00
ChiehChun
a3cc9f730b Add dlsch_current_bytes and Calculate throughput 2021-02-07 10:39:40 +01:00
ChiehChun
0dd0f5ce4a Create function for find CCE and retransmission 2021-02-07 10:39:40 +01:00
ChiehChun
13da3d6e8a Create nr_store_dlsch_buffer() 2021-02-07 10:39:40 +01:00
ChiehChun
68b03e9cb6 Create pf_dl function 2021-02-07 10:39:40 +01:00
ChiehChun
3b4ec2c82b Change vrb_map to rballoc_mask 2021-02-07 10:39:40 +01:00
ChiehChun
6c3897d4a7 Save selected DL HARQ PID in post-processor 2021-02-07 10:39:40 +01:00
ChiehChun
9fb45867a1 Initial num_pdcch_cand for multi-UE 2021-02-07 10:39:40 +01:00
Robert Schmidt
75dbf5fa4d Don't log retransmissions explicitly 2021-02-07 10:39:40 +01:00
Raymond Knopp
0496c15d27 Remove PHY HARQ round_trials logs 2021-02-07 10:39:40 +01:00
Cedric Roux
16b9f4ed60 Increase RLC buffer size to 10MB, warn when buffer full 2021-02-07 10:39:40 +01:00
Robert Schmidt
ca47955293 Bugfix: check that retransmission can be allocated 2021-02-07 10:39:39 +01:00
Robert Schmidt
78da8c9345 Save TB in MAC, transmit TX_req also on retx 2021-02-07 10:39:39 +01:00
Robert Schmidt
80e23a179e Enable 12 slots
This commit enables more slots so that the "real UE" preprocessor can
schedule them. The DL phytest preprocessor continues to only schedule
slots 1 & 3.  This is because the OAI-UE needs to have PUCCH scheduled
at least six slots in advance.  Since we do not support this (yet), but
assume that two slots are enough, we schedule the UE only in slot 1 & 3
so it has 6 slots until slot 7 to send PUCCH.
2021-02-07 10:39:39 +01:00
Robert Schmidt
59cb9c87e0 Refactor nr_rx_sdu() 2021-02-07 10:39:39 +01:00
Robert Schmidt
0773229b1a Implement UL HARQ using NR_list_t 2021-02-07 10:39:39 +01:00
Robert Schmidt
a0d47c504c Create lists for UL HARQ management 2021-02-07 10:39:39 +01:00
Robert Schmidt
4ddd45f813 Implement DL HARQ using NR_list_t 2021-02-07 10:39:39 +01:00
Robert Schmidt
42710ee7ba Create lists for DL HARQ management 2021-02-07 10:39:39 +01:00
Raymond Knopp
a3867df5f3 cleanup after removing harq state in L0 2021-02-07 10:39:39 +01:00
Raymond Knopp
ee2ce7670d made L1 DLSCH encoding stateless. harq_pid/round information are not kept in PHY. Full channel encoding is performed for each transmission of a transport block.
Still to be done: test, then cleanup data structures and fix unitary simulations.
2021-02-07 10:39:39 +01:00
Robert Schmidt
d7f46a2ff2 Set RRC nrofHARQ_ProcessesForPDSCH to 16 2021-02-07 10:39:39 +01:00
Robert Schmidt
c9de1c70c0 Set secondaryCellGroup + default values in add_new_nr_ue() 2021-02-07 10:39:39 +01:00
Robert Schmidt
74cb9bf367 Refactor add_new_nr_ue() and mac_remove_nr_ue()
mac_remove_nr_ue(): no need to memset sched_ctrl, since it is done on
connection of a UE
2021-02-07 10:39:39 +01:00
Robert Schmidt
4a0efd6f48 mac_top_init_gNB(): do not init per-UE HARQ
the whole UE_sched_ctrl is initialized in add_new_nr_ue(), which will
also init the per-UE HARQ.
2021-02-07 10:39:39 +01:00
Robert Schmidt
77c7fe5b87 Create more generic NR_list_t with helper functions 2021-02-07 10:39:39 +01:00
Robert Schmidt
338d8debae Bugfix OAI UE: reset slot_for_feedback_ack to initial value 2021-02-07 10:39:39 +01:00
Robert Schmidt
e328a6ccf7 Make multiple passes over RLC to get all data 2021-02-07 10:39:39 +01:00
Robert Schmidt
76d154f07c Do not count down TBS 2021-02-07 10:39:39 +01:00
Robert Schmidt
a18ed9d92d Reorder DLSCH MAC PDU logic
Before this commit, the DLSCH scheduler would construct the MAC PDU by
reading RLC data into a memory on the stack, and then construct the PDU
with CEs first. There are at least two problems:
- we need to keep track of the exact number of bytes of CEs (cumbersome)
  to calculate the number of MAC SDUs to include
- we needlessly copy data around.

This commit does the following instead:
- write all CEs first (no need of keeping track of this in DLSCH and a
  separate function)
- then read MAC SDUs directly into nFAPI as much as possible or
  necessary, without recopying
2021-02-07 10:39:39 +01:00
Robert Schmidt
96e1f3597b Group PDCCH PDU per CC/BWP/CORESET in RA, and reuse in DLSCH 2021-02-07 10:39:39 +01:00
Robert Schmidt
c71412882d nr_schedule_ulsch(): only one PDCCH PDU per BWP and CORESET 2021-02-07 10:39:39 +01:00
Robert Schmidt
a26404c17f nr_schedule_ue_spec(): link TX_data/PDSCH PDU with common PDU index 2021-02-07 10:39:39 +01:00
Robert Schmidt
a6348e8567 nr_generate_Msg2(): link TX_data/PDSCH PDU with common PDU index 2021-02-07 10:39:39 +01:00
Robert Schmidt
28b78ee09c nr_schedule_ue_spec(): only one PDCCH PDU per BWP and CORESET 2021-02-07 10:39:39 +01:00
Robert Schmidt
55c6ce1598 Add small notice that we assume no concurrent RA 2021-02-07 10:39:39 +01:00
Robert Schmidt
089f821dd2 Separate nFAPI PDCCH allocation from nFAPI DCI allocation
According to SCF222, a single PDCCH allocation groups DCIs that are
within the same BWP and CORESET. Therefore, if we want to allocate
multiple DCIs, we need to decouple PDCCH allocation and DCI (previously
jointly done in nr_configure_pdcch()), especially to be forward
compatible.

***Note that as of this commit, we would still allocate different PDCCH
PDUs for multiple UEs (which we do not support yet, anyway)***

nr_configure_pdcch(): simply take out DCI allocation.

nr_generate_Msg2(): separately allocate dci_pdu in common RA SS, and
rename DCI payload variable. Also, reorganize the function so that it is
first checked for CCE allocation and messages nFAPI messages are
allocated afterwards.

nr_schedule_ue_spec(): separately allocate dci_pdu in UE-specific SS.
Rename DCI payload variable.

nr_schedule_ulsch(): separately allocate dci_pdu in UE-specific SS.
Rename DCI payload variable.

nr_fill_nfapi_dl_sib1_pdu(): separately allocate dci_pdu in common SS.
2021-02-07 10:39:39 +01:00
Robert Schmidt
0655cc481d No DCI PDU array in nr_fill_nfapi_dl_sib1_pdu() 2021-02-07 10:39:39 +01:00
Robert Schmidt
080b776097 No DCI PDU array in nr_schedule_ue_spec() 2021-02-07 10:39:39 +01:00
Robert Schmidt
86b1c0035d No DCI PDU array in nr_generate_Msg2() 2021-02-07 10:39:39 +01:00
Robert Schmidt
db792632c9 Refactor config_uldci() 2021-02-07 10:39:39 +01:00
Robert Schmidt
52ba0e277d Simplify config_uldci(): handle only one DCI 2021-02-07 10:39:39 +01:00
Robert Schmidt
1bf58a4482 Deleted commented code 2021-02-07 10:39:39 +01:00
Robert Schmidt
ccaa5abc55 Reformat fill_dci_pdu_rel15() 2021-02-07 10:39:39 +01:00
Robert Schmidt
0473074acf fill_dci_pdu_rel15(): handle one DCI at a time 2021-02-07 10:39:39 +01:00
Robert Schmidt
0d90ecfd62 Make dci_pdu in PDCCH PDU an array
SCF222 says that dci_pdu in PDCCH PDU
(nfapi_nr_dl_tti_pdcch_pdu_rel15_t) should be an array, and not its
members.
2021-02-07 10:39:39 +01:00
Robert Schmidt
83f7c4be5f Make passed secondaryCellGroup pointer const in prepare_dci() 2021-02-07 10:39:39 +01:00
Robert Schmidt
dc04e8cced Make passed pointers const in nr_dci_size() and get_transformPrecoding() 2021-02-07 10:39:39 +01:00
Robert Schmidt
d0ae11783a Integrate nr_fill_nfapi_dl_pdu() back into nr_schedule_ue_spec()
Initially, filling the PDCCH and PDSCH nFAPI messages was split into a
separate function (in an attempt to keep the code structure similar to
LTE). However, this proved as not helpful: the nr_fill_nfapi_dl_pdu()
just filled the messages, with a parameter list almost size as long as
the actual messages (because most parameters are kind of independent).
This made no sense, so we put it back.

Also, from an understanding POV, they just fill a message as specified
in SCF222, so it should not be a problem.
2021-02-07 10:39:39 +01:00
Robert Schmidt
71e297de9d Lower UE log level 2021-02-07 10:39:39 +01:00
Robert Schmidt
8f399a1c9e Disable logging of PUCCH 2021-02-07 10:39:39 +01:00
Robert Schmidt
a69ec6669a Assert on maximum number of used PUCCH resources 2021-02-07 10:39:39 +01:00
ChiehChun
62c58bd722 Use correct pucch_index_used 2021-02-07 10:39:39 +01:00
Robert Schmidt
943d55717e Scheduler: introduce BIT() macro 2021-02-07 10:39:39 +01:00
Robert Schmidt
614b2c1951 DLSCH: do not check for slot number 2021-02-07 10:39:39 +01:00
Robert Schmidt
aa948f707a Deallocate CCE if PUCCH allocation fails 2021-02-07 10:39:39 +01:00
Robert Schmidt
ac5ac8dd25 Clarify assumptions in nr_acknack_scheduling() 2021-02-07 10:39:39 +01:00
Robert Schmidt
1c75496ffa nr_schedule_pucch() for multiple UEs 2021-02-07 10:39:39 +01:00
Robert Schmidt
7879e6ad32 Remove (unnecessary) num_slots_per_tdd in DLSCH sched 2021-02-07 10:39:39 +01:00
Robert Schmidt
2225cd26fe Handle multiple TDD periods 2021-02-07 10:39:39 +01:00
Robert Schmidt
551b08c315 Skip CSI if present 2021-02-07 10:39:39 +01:00
Robert Schmidt
75f8591b9b Handle PUCCH frame/period wrap around 2021-02-07 10:39:39 +01:00
Robert Schmidt
d281e41a50 Assert on TDD period "wrap around" 2021-02-07 10:39:39 +01:00
Robert Schmidt
91fd4ddf7e rewrite nr_acknack_scheduling() 2021-02-07 10:39:39 +01:00
Robert Schmidt
c5968599b2 Add nr_fill_nfapi_pucch(): allocate PUCCH nFAPI message 2021-02-07 10:39:39 +01:00
Robert Schmidt
7a9ad3dbf7 Keep track of used PUCCH resources 2021-02-07 10:39:39 +01:00
Robert Schmidt
94d8147ece nr_csi_meas_reporting() for multiple UEs 2021-02-07 10:39:39 +01:00
Raymond Knopp
edff477050 reduced 5G memory limits for CI 2021-02-07 09:40:22 +01:00
Robert Schmidt
5a2caa5475 Refactor nr_csi_meas_reporting(): check only in slot 0 2021-02-06 20:50:28 +01:00
Robert Schmidt
b6ebdc2fab Refactor nr_get_csi_bitlen() 2021-02-06 20:50:28 +01:00
Robert Schmidt
49c7dbf214 Use three fields 2021-02-06 20:50:28 +01:00
Robert Schmidt
171f7842bc Rewrite PUCCH allocation (simplified, restricted)
- No dynamic allocation of PUCCH structures
- Use first PUCCH for HARQ (can only allocate for up to two slots in
  single PUCCH, simplistic nr_acknack_scheduling!)
- Use second PUCCH for CSI, do not multiplex!
2021-02-06 20:50:28 +01:00
Robert Schmidt
4e91f44839 Rename NR_sched_pucch to NR_sched_pucch_t 2021-02-06 20:50:28 +01:00
Robert Schmidt
a19a15cfb7 Enable logging of PUCCH 2021-02-06 20:50:28 +01:00
Francesco Mani
868f55513f rnti in pucch 0 indication 2021-02-06 20:50:28 +01:00
Raphael Defosseux
403db5f66e CI: adding conditional stages in the parent pipeline based on labels in Merge Requests
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-02-06 19:03:15 +01:00
Raymond Knopp
addd891a2f testing on outdoor network 2021-02-06 14:55:13 +01:00
Raphael Defosseux
0aff489c75 * MR 1027: SIB1 update
Update in SIB1 implementation to solve REG to CCE mapping issues and also correction in pdcch RE extraction when BWP_start>0.

* MR 1031: LTE/NR X2AP: fix content of SgNBAdditionRequest
Wireshark (version 3.3.2) was not happy. https://asn1.io/asn1playground/ was not happy.

* MR 1036: LTE ULSCH bugfix
Minor fix in the UL scheduler

* MR 1008: NR SA ITTI sim update for core connectivity
Updates for connections to 5G core node using ITTI sim. Usage documentation have also been added.

* MR 1025: Cleanup NR RA procedure - mostly UE
2021-02-06 14:25:07 +01:00
Cedric Roux
b7ea4e0f6d benetel 5g: support for two antennas 2021-02-05 16:48:30 +01:00
hardy
23134fba77 adding test update + conf file for RA FR2 2021-02-05 15:39:20 +01:00
Raphael Defosseux
2a45e3199b CI: adding FDD mode to 5G RF sim test
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-02-05 13:58:24 +01:00
hardy
663dd1251c Merge remote-tracking branch 'origin/NR_RA_cleanup' into integration_2021_wk05 2021-02-05 12:00:38 +01:00
hardy
5d832308c6 Merge remote-tracking branch 'origin/NR_SA_itti_sim_wk48' into integration_2021_wk05 2021-02-05 11:43:54 +01:00
Mahesh
a169d46415 L2-nfapi error fix 2021-02-05 14:17:36 +05:30
Xue Song
4cc81b0025 fix the problem that DL failed after merge 'master' branch 2021-02-05 11:59:54 +09:00
Thomas Schlichter
9c4714fd25 NR_UE: re-introduce mcs check for DCI format 0_0 and 0_1 2021-02-04 19:51:58 +01:00
Thomas Schlichter
ea0d24b935 NR_UE: discard DCI with bwp_indicator != 1
Even stricter check/hack for BWP ID.
Drop every DCI where this value is not '1'.
2021-02-04 19:27:56 +01:00
Raphael Defosseux
b3341ed1ca CI: fix false negative in HTML report
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-02-04 15:19:02 +01:00
Raphael Defosseux
b81b6181e0 CI: migrating to oairu target on RRU machines
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-02-04 14:59:08 +01:00
Xue Song
52edf0c123 Merge branch 'master' into develop_SA_rfsim_for_F1
Conflicts:
	openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
	openair2/F1AP/f1ap_cu_interface_management.c
	openair2/F1AP/f1ap_cu_rrc_message_transfer.c
	openair2/F1AP/f1ap_cu_task.c
	openair2/F1AP/f1ap_du_interface_management.c
	openair2/F1AP/f1ap_du_task.c
	openair2/GNB_APP/gnb_app.c
	openair2/GNB_APP/gnb_config.c
	openair2/LAYER2/NR_MAC_UE/main_ue_nr.c
	openair2/RRC/NR/L2_nr_interface.c
	openair2/RRC/NR/MESSAGES/asn1_msg.c
	openair2/RRC/NR/rrc_gNB.c
	openair2/RRC/NR/rrc_gNB_NGAP.c
	openair2/RRC/NR_UE/L2_interface_ue.c
	openair2/RRC/NR_UE/rrc_UE.c
	openair3/NGAP/ngap_gNB.c
2021-02-04 18:16:37 +09:00
francescomani
4d2c80e418 fix dlsim compilation 2021-02-04 09:59:09 +01:00
francescomani
28cb2c6c77 Merge remote-tracking branch 'origin/develop' into NR_FAPI_beamindex_SSB_RO 2021-02-04 08:26:32 +01:00
Xue Song
1dd6b3b2a0 fix some warnings 2021-02-04 11:30:44 +09:00
Cedric Roux
a9f57407c7 benetel 4g: support two antennas 2021-02-03 17:07:18 +01:00
masayuki.harada
4f73692eb1 Merge remote-tracking branch 'remotes/origin/develop_SA_L3' into NR_SA_itti_sim_wk48 2021-02-03 22:37:25 +09:00
Thomas Schlichter
8b00361f56 fix warnings identified by CI 2021-02-03 10:50:38 +01:00
Thomas Schlichter
6add9968a8 Merge branch 'develop' into 'nasmesh_kernel_5.8'
# Conflicts:
#   openair2/NETWORK_DRIVER/MESH/device.c
2021-02-03 09:42:54 +01:00
Mahesh
1953e891ab L2-nFAPI config error resolved 2021-02-03 12:32:33 +05:30
Xue Song
6a3b7b40a5 Merge branch 'master' into develop_SA_L3
Conflicts:
	openair2/GNB_APP/gnb_config.c
	openair2/RRC/NR/rrc_gNB.c
	openair2/RRC/NR/rrc_gNB_NGAP.c
	openair2/RRC/NR_UE/rrc_UE.c
2021-02-03 14:58:07 +09:00
Raymond Knopp
2e59e05b66 set eNB->use_DTX=1, TM2 now works again. Need to fix this option when multiple TX antenna ports are used 2021-02-02 23:20:20 +01:00
Raymond Knopp
4a4636d202 more minor changes 2021-02-02 20:58:29 +01:00
Raymond Knopp
6ae26ee6dc minor changes after merge 2021-02-02 20:45:46 +01:00
rmagueta
c4ccc66169 Log SIB1 decoded 2021-02-02 18:12:11 +00:00
rmagueta
f7649fb472 Merge remote-tracking branch 'origin/develop-sib1-update-ue' into develop-SA-RA
# Conflicts:
#	openair2/RRC/NR_UE/rrc_UE.c
2021-02-02 17:57:55 +00:00
rmagueta
9b24e1fbfa Merge branch 'develop' into develop-SA-RA 2021-02-02 17:40:22 +00:00
rmagueta
b654e282dd Minor code clean up 2021-02-02 15:10:51 +00:00
rmagueta
1717c1c6ab PDCCH add support for search space candidate_idx > 0 2021-02-02 14:48:18 +00:00
hardy
c00b44028b Merge remote-tracking branch 'origin/develop-sib1-update' into integration_2021_wk05 2021-02-02 15:40:22 +01:00
hardy
1d6eea64a4 Merge remote-tracking branch 'origin/bugfix-x2-SgNBAdditionRequest' into integration_2021_wk05 2021-02-02 15:39:38 +01:00
hardy
320b43c462 Merge remote-tracking branch 'origin/lte-ulsch-bugfix' into integration_2021_wk05 2021-02-02 15:38:54 +01:00
dir
82d40a654c Transform precoding related changes 2021-02-02 13:19:42 +01:00
rmagueta
76b974508b Merge branch 'develop' into develop-sib1-update-ue
# Conflicts:
#	cmake_targets/CMakeLists.txt
2021-02-02 12:10:12 +00:00
Raymond Knopp
4e9afb30b0 Merge remote-tracking branch 'origin/develop' into oairu 2021-02-02 12:09:56 +01:00
Raymond Knopp
3cb6892987 CU/DU tested with phoenix + B38 RRU (CU and DU via lo) 2021-02-02 11:15:13 +01:00
Khodr Saaifan
283a060497 Allow gNB to read pusch_AntennPorts from config file 2021-02-02 09:02:19 +01:00
Mahesh
a8248b2386 Config file changes reverted 2021-02-02 12:21:53 +05:30
Mahesh
ae422aca1f Merge conficts resolved 2021-02-02 09:36:49 +05:30
luis_pereira87
7700e61861 Fix Tables 7.4.1.1.2-1/2 from 38.211 2021-02-01 21:04:14 +00:00
luis_pereira87
6885668273 Fix AssertFatal in replay_node when file size is not a multiple of block size 2021-02-01 20:55:58 +00:00
cig
682f868c94 Reduced output logging in UE RF configuration for unused channels 2021-02-01 16:52:53 +01:00
cig
aecf2dfa13 Hack to make FDD compatible with current UL scheduling design
- temporary solution since scheduler does not support FDD
- modified is_NR_UL_slot to return always 1 when is FDD mode
- this is necessary because currently the scheduler assumes that is TDD
  and tdd_UL_DL_ConfigurationCommon is always initialied
2021-02-01 16:52:53 +01:00
Sakthivel Velumani
c9dcff3d7e Merge branch 'develop' into ue-fixes 2021-02-01 16:07:58 +01:00
Sakthivel Velumani
f44dc35bfd Reducing RX gain at gNB
1. Changed rx gain at gNB from 75 to 50. PUCCH works again with OAI-UE.
2. Disabling MAC layer retransmission logs.
2021-02-01 16:00:33 +01:00
Laurent Thomas
7eda2b7409 remainign bug after merge develop 2021-02-01 15:35:17 +01:00
Thomas Schlichter
ad2b04c1d1 fix compile warning by removing unused variable 'nb_antenna_ports' 2021-02-01 15:00:46 +01:00
Khodr Saaifan
d7facef8a4 Back to SISO mode 2021-02-01 15:00:23 +01:00
Khodr Saaifan
88f293d3ba clean up nr_dlsch_demodulation, solve bug in nr_rb_extract to consider data/dmrs multiplexing/no data, and remove ra_pdsch hack in phy_procedures_nr_ue 2021-02-01 14:59:56 +01:00
Khodr Saaifan
3fdb550909 reconfigure dmrs_type 1 for RA and phy_test mode 2021-02-01 14:59:56 +01:00
Khodr Saaifan
dfe4bf4a30 Remove dependency of pdsch_Antennports and gNB num_rx_antenna (hardcoded in this commit) 2021-02-01 14:59:56 +01:00
Khodr Saaifan
9e8f0055ef Bug in PUSH when config.num_rx_antis equal to config.num_tx_ant 2021-02-01 14:59:56 +01:00
Khodr Saaifan
fd8cf7769c Modify and fix nr_dlsim to support 4*4 MIMO with 1 layer 2021-02-01 14:59:56 +01:00
Khodr Saaifan
e4370cc30b remove printf in nr_zero_forcing receiver 2021-02-01 14:59:56 +01:00
Khodr Saaifan
53046a9289 add zero forcing receiver for 2 tx layers and 2 or 4 rx antennas for PDSCH 2021-02-01 14:59:56 +01:00
Khodr Saaifan
812dc116f7 MIMO 4x4 with 1 layer test commit 2021-02-01 14:58:59 +01:00
Khodr Saaifan
0f55139dc6 Extend nr_dlsch demoulation to support multiple Rx antennas with MRC 2021-02-01 14:47:31 +01:00
Khodr Saaifan
b962cc94ce Add rb extract to support multiple tx layers feature for MIMO mode 2021-02-01 14:47:31 +01:00
Khodr Saaifan
4b541b444d Extend the UE side to support 4 Rx antennas 2021-02-01 14:46:51 +01:00
Sakthivel Velumani
d973db9273 Fix for dlsch issue on caracal
1. Reducing rx gain at UE. Existing gain seems to saturate the receiver with full bw allocaiton.
2. Setting different dlsch bitmap for phytest mode.
2021-02-01 13:47:45 +01:00
Sakthivel Velumani
a25309363a Enabling a log for CI purpose 2021-02-01 13:41:53 +01:00
yoshio.inoue
7772e5c3b2 Merge remote-tracking branch 'fjt_dev/develop_SA_L3' into NR_SA_itti_sim_wk48 2021-02-01 21:38:25 +09:00
yoshio.inoue
c49220610d add TODO comments 2021-02-01 21:19:04 +09:00
Parminder Singh
58b36aa222 Added PTRS RRC config validation for DL/UL-SIM uni tests 2021-02-01 13:02:25 +01:00
Cedric Roux
94dad700c4 lte/nr x2ap: fix content of SgNBAdditionRequest
Wireshark (version 3.3.2) was not happy.
https://asn1.io/asn1playground/ was not happy.

Let's make them happy.

So then everyone is happy.
2021-02-01 11:48:44 +01:00
Florian Kaltenberger
857f9179f3 shifting also the TX 4 bits to the left to exploit dynamic range. adapted ssb_block_power but proper calibration still necessary. 2021-02-01 10:24:22 +01:00
Florian Kaltenberger
a5b5d6f9b0 fixing RRC power levels at 5G side to avoid saturation 2021-02-01 10:24:22 +01:00
Florian Kaltenberger
0f57529b48 fixing benetel4g driver by setting ru->has_ctrl_prt =1 and thus starting the RU control thread, which is required for the 4G RRU. In the future we should revisit this and harmonize with the 5G version. 2021-02-01 10:24:22 +01:00
Khodr Saaifan
d4bd15f5ad increase CirSize to avoid overflow in the case of multi-transmit antennas for gNB 2021-02-01 10:12:38 +01:00
Khodr Saaifan
0ae83fac6d Fix dl PDSCH channel estimation to support multi-port channel estimation 2021-02-01 10:12:38 +01:00
Khodr Saaifan
bd31209f79 remove dependency of PDSCH antenna number from PUSCH Rx antenna number 2021-02-01 10:09:30 +01:00
Khodr Saaifan
74009a7200 Enable dmrsConfigType2 for pdsch 2021-02-01 10:09:30 +01:00
Khodr Saaifan
03803a12f2 Debug: add more VCD functions to trace UE timing 2021-02-01 10:09:30 +01:00
Khodr Saaifan
58f4f155cc Enable beamforming for 2 tx antenna ports and fix corresponding segmentation error 2021-02-01 10:06:08 +01:00
Khodr Saaifan
e72d0483b4 Add PDSCH precoder functions, fix pusch_rx for 2 rx antennas, fix nr_dlsim for 2x1 MIMO simulation 2021-02-01 10:06:08 +01:00
Laurent Thomas
6b37681854 merge develop, minor code addition 2021-02-01 09:02:57 +01:00
Wu.Jing
37f0198944 Revert "remove the commented code from rrc_gNB.c"
This reverts commit 15caed4d54.
2021-02-01 16:02:47 +09:00
Wu.Jing
c20fae1dea Merge branch 'develop_SA_SIM' into develop_SA_L3 2021-02-01 14:58:51 +09:00
Xue Song
1721e82ed0 add F1AP Rel16 asn file 2021-02-01 14:12:18 +09:00
He Shanyun
150221536c change output format for ran ue ngap id 2021-02-01 14:08:19 +09:00
Xue Song
a85f261b54 add license text
fix some problems
2021-02-01 13:59:56 +09:00
yincong
15caed4d54 remove the commented code from rrc_gNB.c 2021-02-01 12:27:37 +09:00
Raymond Knopp
849c5e0c86 F1_SETUP tested 2021-01-31 21:46:58 +01:00
Sakthivel Velumani
a241df5006 Fixed compile warnings 2021-01-31 17:35:08 +01:00
Raymond Knopp
9a71d5550e build of eNB/gNB/UE/nrUE 2021-01-30 23:27:25 +01:00
Raymond Knopp
579a573b90 unitary simulations build 2021-01-30 22:34:16 +01:00
Thomas Schlichter
bca9f74e66 Merge remote-tracking branch 'develop' into NR_RA_cleanup 2021-01-29 18:52:37 +01:00
Remi Hardy
3b2d50374a Integration 2021 wk04
MR1006 : itti enhancement
-new feature: creates itti queue during runtime 
-modified itti message instance

MR1012 : 5G NR: UL transform precoding (SC-FDMA)

MR1022 : Wireshark t hack ueid

MR997 : LTE uplink improvement
-LTE update about uplink performance improvement and some bug fixes from Fujitsu.
-Fix uplink calculation error in SCD and PHY layer.
-Add interference calculation for PUSCH.
-Update TPC control.
-Fix nFAPI hang-up
-Fix DRB is non active after Re-establishment.
-Msg3 PHICH problem.
-Add statistical logs.


MR1030 : CI RHEL container update
-CI adaptation to build the shared and target images on asterix and obelix Python framework

MR1023 : ci ue parallel
-Enables OAI UE parallelization in CI tests (where applicable)
2021-01-29 16:39:29 +01:00
Sakthivel Velumani
0eb2e06725 Moved pusch thread parameter to L1 in config file 2021-01-29 13:14:14 +01:00
cig
5a9014e960 Review of MR 1025
- bugfix in nr_ue_dci_configuration
- cleanup of irrelevant RA-related data structure members in UE
- moved msg1 init condition to MAC
- minor fixes concerning init_ra function
2021-01-29 12:44:28 +01:00
francescomani
8af407250d Merge remote-tracking branch 'origin/develop' into NR_10MHz 2021-01-29 12:16:43 +01:00
Parminder Singh
87ada84106 created a new conf file for PTRS testing
- removed default PTRS values from default conf file.
2021-01-29 10:50:48 +01:00
Robert Schmidt
f1cb44a005 Bugfix: decrease actual MCS value 2021-01-29 09:31:56 +01:00
hardy
099d40527a Merge remote-tracking branch 'origin/rh_ci_ue_parallel' into integration_2021_wk04_b 2021-01-29 07:42:43 +01:00
hardy
044f665730 Merge remote-tracking branch 'origin/ci-deploy-asterix' into integration_2021_wk04_b 2021-01-29 07:42:15 +01:00
hardy
5db5657df7 Merge remote-tracking branch 'origin/lte_uplink_improvement' into integration_2021_wk04_b 2021-01-29 07:41:47 +01:00
hardy
4a263eb69d Merge remote-tracking branch 'origin/wireshark-T-hack-ueid' into integration_2021_wk04_b 2021-01-29 07:41:11 +01:00
hardy
6e12f8f8d3 Merge remote-tracking branch 'origin/nr_ul_scfdma' into integration_2021_wk04_b 2021-01-29 07:40:42 +01:00
hardy
9c810b311d Merge remote-tracking branch 'origin/itti-enhancement' into integration_2021_wk04_b 2021-01-29 07:40:07 +01:00
hardy
62aec337bf Merge remote-tracking branch 'origin/flexran-repair-mme-mgmt' into integration_2021_wk04_b 2021-01-29 07:39:49 +01:00
Raymond Knopp
78f14bc9a4 fixed build for oairu executable. tested with sirius/phoenix 2021-01-28 21:53:24 +01:00
rmagueta
62bc47c820 Minor update in SIB1 contents. do_SIB1_NR() only if SA. 2021-01-28 16:04:41 +00:00
Thomas Schlichter
92cb99b201 NR_UE: Add some more LOG_W() in case of ignoring DCI. 2021-01-28 10:14:44 +01:00
Thomas Schlichter
ac1bc7025b NR_UE: discard DCI with bwp_indicator == 0
Recently we stared using the BWP_indicator signalled in DCI, before we always assumed BWP_Id == 1.
Now "fake-DCI" with bandwidth_indicator == 0 lead to segmentation faults, so we discard these.
Note: There are still several placed where we assume BWP_Id == 1!
2021-01-28 09:36:00 +01:00
Thomas Schlichter
60471dd179 NR_UE: change message when RA succeeded, so CI recognizes it again 2021-01-28 09:33:47 +01:00
Xue Song
cf3694be28 modify the f1 establishment process 2021-01-28 16:35:10 +09:00
Xue Song
36487515c4 fix double definition in rrc_gNB_NGAP.c and nr_ngap_gnb.c 2021-01-28 14:20:35 +09:00
Raymond Knopp
616eb6700f NR RSRP/RSRQ conversion routines 2021-01-27 23:40:34 +01:00
Raymond Knopp
89657f20e6 testing with N310 4x4 eNB 20 MHz 2021-01-27 21:03:47 +01:00
Robert Schmidt
28cd23887e Update NR Measurements periodically, remove rsrq typo 2021-01-27 15:43:48 +01:00
laurent
4b345f1589 tested with one UE, better intergration with legacy gtpu 2021-01-27 15:09:00 +01:00
Thomas Schlichter
3eb04ffcf7 move unreachable LOG_D() in NR_IF_Module.c
Code between a 'switch' statement and its first 'case' statement is not reachable!
So move the LOG_D() statement just before the 'switch' statement.
2021-01-27 12:05:34 +01:00
Raymond Knopp
184f095384 bugfix in EN-DC measurement reporting trace collection 2021-01-27 11:56:11 +01:00
Mahesh
ca74163cdd OCP build errors resolved. 2021-01-27 11:34:52 +05:30
Raphael Defosseux
e16f769174 CI: try to optimize the file system usage when building in the CI VM env. Increased the VM memory of one to allow linking
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-01-26 15:33:22 +01:00
Raymond Knopp
f04846cf4f 2 and 4 antenna testing with ulsim functional. >=3 dB gains from 2 to 4 antennas on SCM channels 2021-01-26 13:25:07 +01:00
Xue Song
874246b3f9 fix the problem of f1ap setup response message encoding error 2021-01-26 18:07:13 +09:00
Raphael Defosseux
747695e476 CI: fix string formatting for python3.5
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-01-26 09:51:59 +01:00
rmagueta
6e917c539f Fill SIB1 with more contents 2021-01-25 23:18:35 +00:00
francescomani
a05cf8c8e8 Merge branch 'NR_FAPI_beamindex_SSB_RO' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_FAPI_beamindex_SSB_RO 2021-01-25 18:14:27 +01:00
francescomani
30b41ba107 fix in TA update at gNB 2021-01-25 18:13:58 +01:00
Sakthivel Velumani
e913e2ebc8 disabling logs 2021-01-25 17:05:16 +01:00
Francesco Mani
0c61ee543e Update gnb.band257.tm1.32PRB.usrpn300.conf 2021-01-25 14:37:47 +01:00
Thomas Schlichter
f32297fefa fix cppcheck warnings 2021-01-25 14:32:32 +01:00
Thomas Schlichter
729adbcd4e fix nr_prachsim phy-simulator 2021-01-25 14:28:50 +01:00
Thomas Schlichter
aafe94c556 move definitions from defs_nr_UE.h back to nr-ue.c to fix compilation of LTE UE 2021-01-25 13:59:21 +01:00
Laurent Thomas
954b0f559d new gtp before tests 2021-01-25 12:59:38 +01:00
francescomani
bf028e8867 fix in a config file for RA 2021-01-25 12:33:37 +01:00
Mohammed Ismail
c9e08d030b CI: html tab extention to add more details on built shared and target images
fix ssh connection when remote server has public key

Signed-off-by: Mohammed Ismail <mohammed.ismail@eurecom.fr>
2021-01-25 11:06:22 +01:00
Sakthivel Velumani
f6a502ada2 fixes
some more fixes that are missed out in previous commits
2021-01-25 11:03:37 +01:00
Raymond Knopp
bbe6db03dd removed some cppcheck errors 2021-01-25 10:36:54 +01:00
francescomani
0451854429 bugfix 2021-01-25 10:30:45 +01:00
Raymond Knopp
9f52fd4ae7 removed warnings on lte-softmodem compilation 2021-01-25 10:02:15 +01:00
Xue Song
d9934436c3 fix some cppcheck errors 2021-01-25 14:26:39 +09:00
Raymond Knopp
86cab23b74 fixed build with --mu 2021-01-24 22:23:33 +01:00
Raymond Knopp
e82ef88e72 builds are succesful (eNB,UE,gNB,nrUE,physim) 2021-01-24 13:27:10 +01:00
luis_pereira87
583d2cc0d4 Fix for NR_MAX_PDCCH_AGG_LEVEL 2021-01-24 12:14:48 +00:00
rmagueta
73b34936be Update MAX_DCI_CORESET to 16 as in 3GPP Rel 15 2021-01-23 20:16:05 +00:00
rmagueta
094f21a165 Fix REG to CCE mapping at UE 2021-01-23 18:40:30 +00:00
rmagueta
e2df86be88 Fix PDCCH extract RBs 2021-01-23 15:54:16 +00:00
Raymond Knopp
5294bc4fe3 warnings and unitary simulation bulding 2021-01-23 15:04:11 +01:00
Raymond Knopp
ef1fb827b5 Merge remote-tracking branch 'origin/develop' into oairu 2021-01-23 09:17:37 +01:00
Sakthivel Velumani
fd3333a27b Flaging that HARQ feedback has been sent
so that in the next frame when the same harq is not used the UE won't send feedback (this was a bug)
2021-01-23 09:00:05 +01:00
rmagueta
70938bb907 Fix REG to CCE mapping at gNB 2021-01-22 17:18:37 +00:00
Sakthivel Velumani
3a1de4c879 Flaging that HARQ feedback has been sent
so that in the next frame when the same harq is not used the UE won't send feedback (this was a bug)
2021-01-22 15:50:44 +01:00
Sakthivel Velumani
3858af320f Write to USRP only when needed in TDD 2021-01-22 15:48:34 +01:00
hardy
d7220cee37 parameters typo in xml 2021-01-22 15:25:43 +01:00
Mohammed Ismail
15ee2bf2c4 [CI] adapted to build the image on asterix and obelix
Signed-off-by: Mohammed Ismail <mohammed.ismail@eurecom.fr>
2021-01-22 13:57:41 +01:00
Thomas Schlichter
df06b67d1e reduce logging output 2021-01-22 12:26:59 +01:00
Thomas Schlichter
a9bfdb2d6e NR_UE: use 'do_ra' instead of 'mac_enabled' to enable RA procedure 2021-01-22 12:09:04 +01:00
Thomas Schlichter
220c5b2ddf make sure MAC is enabled in nr-uesoftmodem 2021-01-22 12:06:41 +01:00
Xue Song
84d3cfb12f fix some warnings 2021-01-22 18:24:28 +09:00
Xue Song
76cb132f2d u-plane is ok 2021-01-22 15:44:18 +09:00
Raymond Knopp
c15f67c7f2 mutex unlock after cond_signal 2021-01-22 07:26:13 +01:00
rmagueta
9e9a032f6b Fix in the msg3 transmission for the RA 2021-01-21 20:10:23 +00:00
herlesupreeth
c59a99ceea NASMESH: support for kernel version >= 5.6.0 2021-01-21 19:18:35 +01:00
Thomas Schlichter
1cb657accc mention support for SC-FDMA in FEATURE_SET.md 2021-01-21 18:51:26 +01:00
Thomas Schlichter
c107b9b756 Merge remote-tracking branch 'develop' 2021-01-21 18:28:33 +01:00
Sakthivel Velumani
51e77fd00f Added pucch stats along with ulsch one 2021-01-21 16:33:10 +01:00
Laurent Thomas
06366787ae Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into new-gtpu 2021-01-21 15:51:34 +01:00
Laurent Thomas
75ad3da9d9 start new gtpu 2021-01-21 15:51:30 +01:00
Sakthivel Velumani
6b5f8ff2fa Diabled more logs in UE 2021-01-21 15:36:51 +01:00
hardy
9ea9a9bc02 adding ue parallelization to get rid of real time errors 2021-01-21 13:47:47 +01:00
Laurent Thomas
eddebae1e4 fix after code review 2021-01-21 13:47:18 +01:00
Raymond Knopp
ed10f077cf bug in uci stats handling 2021-01-21 13:45:33 +01:00
Raymond Knopp
f8aa85644f bugfix in UCI statistics 2021-01-21 11:51:40 +01:00
Cedric Roux
40f985a957 macpdu2wireshark: add UE id into scheduling request logging
Same logic as previous commit, same caveats.
2021-01-21 11:44:28 +01:00
Cedric Roux
23b24a3c8a T tracer macpdu2wireshark: add UE id
There was a problem with several UEs in the wireshark log. It seems that
wireshark needs the UE id otherwise it gets confused and sees retransmissions
where it's just another UE connecting and doing the same as a previous
UE.

Let's put kind of a UE id. Each RNTI seen by macpdu2wireshark gets an UE id
assigned the first time it's seen in a trace.

This is a bit hackish but seems to be fine.

We could have added UE_id in all the traces, that is change the T() calls
in the softmodem. It was less work to do it as it is, ie. only touch
macpdu2wireshark.c.

The RAR uses the same UE id all the time, may be a problem. To be refined
if needed.
2021-01-21 11:29:29 +01:00
Cedric Roux
4344b9108e macpdu2wireshark: trace scheduling requests
You need a recent version of wireshark for this to work properly.
Successfully tested with 3.3.2.
2021-01-21 11:26:02 +01:00
Raymond Knopp
1ed284add5 bugfix in UECapability parsin 2021-01-21 10:03:48 +01:00
Raymond Knopp
ea59a774fe gtwave traces 2021-01-21 09:31:20 +01:00
francescomani
a4243b6e90 Merge branch 'NR_FAPI_beamindex_SSB_RO' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_FAPI_beamindex_SSB_RO 2021-01-21 08:52:58 +01:00
francescomani
b42b884d77 fix in do SIB1 for FR2 2021-01-21 08:52:54 +01:00
Xue Song
4c1e47405f update F1AP to R16.3.1 2021-01-21 14:56:22 +09:00
rmagueta
ee3f939692 Fill msg3 for the RA 2021-01-20 23:57:31 +00:00
Thomas Schlichter
f1653c5f73 fix build of phy_simulators 2021-01-20 18:04:28 +01:00
Sakthivel Velumani
a406f320f2 Disabled some log messages 2021-01-20 15:24:45 +01:00
cig
e8989b2015 Moved UE UL scheduling functions to new MAC file
- this commit was necessary because the location of the MAC UE
  functions does not reflect the context in which they are used
- therefore all UL scheduling-related functions have been moved
  to a new nr_ue_scheduler.c file
- and the irrelevant file rar_tools_nrUE.c has been deleted
  (nr_ue_process_rar moved to nr_ue_procedures)
- the new locations are supposed to make the file and functions
  organisations more structured and cleaner
2021-01-20 14:59:52 +01:00
cig
9f6a8da0ac UE UL scheduling review
- new data structure RAR_grant_t to handle RAR grant
- new common ul scheduler function
- new common ul pdu configuration function handling ul grants
- new function to fill ul_config_request
- moved pdu configuration code from process dci function
- merged procedures for Msg3 and PUSCH together in nr_ue_scheduler
- the same functions are now handling both PUSCH and Msg3
- relying on ul_config (no more RA Msg3 frame and slot storage)
- done some cleanup and logging in the process
2021-01-20 14:18:04 +01:00
Sakthivel Velumani
69373e22d5 Reverted last commit and fixed merge
Reverted commit e0b1f61235
removed a merge conflict error
2021-01-20 12:35:58 +01:00
yoshio.inoue
6bd2aab1f5 Merge remote-tracking branch 'fjt_dev/develop_SA_L3' into NR_SA_itti_sim_wk48 2021-01-20 10:36:15 +00:00
Xue Song
73ff5dec81 modify INITIAL_UL_RRC_MESSAGE_TRANSFER
fix build errors about nrUE
c-plane is ok
2021-01-20 15:13:49 +09:00
He Shanyun
e4ff0d5b31 Merge remote-tracking branch 'remotes/origin/master' into develop_SA_L3 2021-01-20 01:51:32 +00:00
Sakthivel Velumani
b8795d3824 Merge branch 'develop' into NR_FAPI_beamindex_SSB_RO
Fixed merge conflicts.
2021-01-19 20:58:10 +01:00
Sakthivel Velumani
af4242b508 UE writes to USRP only on tx slots
Removed the hardcoding of fixed tdd and replaced with tdd config from mac configuration
2021-01-19 16:20:50 +01:00
Sakthivel Velumani
e0b1f61235 Removing RX_NB_TH from odd places
I removed this from places where I felt it shouldn't be. Not sure why was it there in the first place.
To be reviewed.
2021-01-19 14:28:37 +01:00
Raymond Knopp
241726e343 minor changes for logging 2021-01-19 14:14:57 +01:00
Xue Song
4ea8b38d37 c-plane is ok 2021-01-19 18:19:59 +09:00
Mahesh
35692639d7 Code cleanup 2021-01-19 10:45:19 +05:30
rmagueta
681706b6da Define RA_trigger 2021-01-18 20:11:51 +00:00
rmagueta
f93413e132 Define trigger_RA_List 2021-01-18 16:08:30 +00:00
rmagueta
9c71e941dd Trigger RA after SIB1 reception 2021-01-18 12:41:09 +00:00
Raymond Knopp
1b23148ea2 bugfix in RRC stats file creation 2021-01-18 12:08:24 +01:00
Mahesh
b1a760a61d Addressed some minor issues 2021-01-18 15:42:53 +05:30
Raymond Knopp
ce71c40903 added RRC stats 2021-01-18 09:56:26 +01:00
masayuki.harada
1d414412a0 Merge remote-tracking branch 'remotes/origin/develop_SA_L3' into NR_SA_itti_sim_wk48 2021-01-18 14:29:12 +09:00
Xue Song
133ecd52fa msg1/2/3/4/5 is ok 2021-01-16 18:00:03 +09:00
He Shanyun
b425e6f495 fix cppcheck error and warning 2021-01-16 12:04:00 +09:00
Thomas Schlichter
e3ac0404a7 fix printf() formats for unsigned integers in nr_ulsim 2021-01-15 17:09:28 +01:00
cig
35c4f94e1d Introduced a new function to retrieve the transformPrecoding status
- this return whether the transform precoder is enabled or not
- redundant configuration code has been migrated to the new function
- get_transformPrecoding is a common MAC function used already
  @ UE side, can be adopted by gNB too
2021-01-15 16:53:15 +01:00
cig
c99c04314d Moved code to retrieve RNTI type to a new function @ UE
- this will be later be necessary in DCI procedures which are dependent on
  the RNTI type
2021-01-15 16:53:15 +01:00
cig
fcd77ea1da Review Msg3 tranmission
- now transmitting resetting Msg3 slot and frame to -1 after transmission
- cleanup in Msg3 scheduling
- checked Msg3 pdu configuration against the 3GPP specs
2021-01-15 16:53:15 +01:00
cig
70028ba492 Fixed inconsistencies in the type of dci_format @ NR UE 2021-01-15 16:53:15 +01:00
cig
7946a0bdf1 Fixed warnings related to unused variables @ NR UE 2021-01-15 16:53:15 +01:00
cig
0f809dd4a2 Migration of UE MAC RA-related members to a new data struct
- new data struct is RA_config_t
- all RA-related members have been moved to the new struct
- static variables have been migrated too
2021-01-15 16:53:15 +01:00
cig
73fbbf50ed Cleanup MAC header files
- sorted out according to recurring logic that wants function
  prototypes in separate files from data struct and constants
  definitions, variables in separate .c files with inclusion
  of "extern" header files
- moved function prototypes to resective header files
- moved data structures and constants to respective header files
- merged unnecessary mac.h file into mac_defs.h @ MAC UE
- moved const variables suchs as tables to respective .c files
- moved extern references to respective extern.h files
2021-01-15 16:53:15 +01:00
cig
f09ee3e526 Cleanup and review of RA procedure after Msg3 transmission
- related to section 5 of 3GPP TS 38.321 specs
- handling of RA failure
- handling of RA completion
- first implementation of contention-based RA procedures
- minor fixes related to ue_get_rach and init_ra functions
2021-01-15 16:53:15 +01:00
cig
2e8e9b7dcf UE power measurements fixes
- RA preamble power computation review
- RSRP review
- PCmax computation
- Pathloss computation
- cleanup of reference to LTE
- minor fixes
2021-01-15 16:53:06 +01:00
Mahesh
868e40e19b Resolved errors due to merge 2021-01-15 19:30:41 +05:30
Thomas Schlichter
7e93eef40c fix unsigned/signed warning regarding nr_(i)dft 2021-01-15 14:55:38 +01:00
Thomas Schlichter
691ad0bba0 Merge remote-tracking branch 'develop' into nr_ul_scfdma
Conflicts:
	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
2021-01-15 14:54:37 +01:00
Mahesh
185fcbf7fe Merged latest commit(MR957) 2021-01-15 18:53:02 +05:30
Xue Song
02e8add383 Merge branch 'develop_SA_rfsim_for_F1' of http://10.37.193.133:8000/gitlab/vran/OAI-5GNR into develop_SA_rfsim_for_F1 2021-01-15 19:58:31 +09:00
Xue Song
01a87a1fba split gNB into CU and DU 2021-01-15 19:57:26 +09:00
Remi Hardy
951fdfef7e MR957 : rlc v2: implement SOstart/SOend in NACK reporting
If we NACK without SOstart/SOend then the other end of the RLC channel will consider all the bytes as NACKed and will have to resend them all. 
If another status is then reported before all the bytes are sent, and because we don't use SOstart/SOend this status will NACK all the bytes again, then all the bytes are to be sent again. 
And the cycle repeats. It will end with a max retx reached (which triggers RLF, Radio Link Failure).

MR1010 : NR UE: Fix for error message - no active DLSCH
- Fixes for the following error message at UE: [PHY] [UE][FATAL] nr_slot_rx 1: no active DLSCH

MR994 : Cleanup softmodem main
- Introduces --dlsch-parallel command line option to set the number of threads for dlsch decoding. If set to 0 (default) no parallelization. 
- Some cleanup in tracing and in nr-uesoftmodem.c data.

MR999 : NR FR2 RA
- Temporary Fix of RA procedure for FR2 (both gNB and UE)
- Fixes in gold sequence initialization at UE
- Moves 2nd downlink to slot 3 instead of 2 to avoid clash with UL DCI (only 1 candidate per slot in FR2 currently)

MR988 : SIB1
Initial implementation of SIB1
2021-01-15 10:29:53 +01:00
Raymond Knopp
a7ac979a57 stats adjustment 2021-01-14 23:32:52 +01:00
Raymond Knopp
db90feea53 PDCP throughput statistics in log 2021-01-14 23:16:14 +01:00
Raymond Knopp
c3a9d018a8 PDCP statistics logs, ulsim updates after recent changes 2021-01-14 14:19:25 +01:00
hardy
213c948d84 Merge remote-tracking branch 'origin/develop-sib1' into integration_2021_wk02_wMR988
Conflicts:
	openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
	openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
2021-01-14 13:17:19 +01:00
shono.takafumi
45305763b1 split gNB into CU and DU 2021-01-14 16:46:06 +09:00
Mahesh
d7ccdbe6b0 Resolved build warnings(25+) and 5G nFAPI downlink errors(future_ul_tti_request) 2021-01-14 12:28:45 +05:30
Wang
5e8a48fcc7 Update nr_gold_ue.c 2021-01-13 11:06:16 +01:00
francescomani
dcc1a46286 pdusize type to accomodate new beamforming and precoding structures 2021-01-13 11:03:55 +01:00
Raymond Knopp
cef18a8f1c :Merge remote-tracking branch 'origin/develop' into oairu 2021-01-12 22:45:28 +01:00
Raymond Knopp
50c70bc316 writing L1/L2 stats to files rather than screen 2021-01-12 13:51:04 +01:00
Xue Song
28168f1369 fix build errors 2021-01-12 07:14:19 +00:00
Xue Song
d923011ec8 change NR_RRC_DCCH_DATA_REQ in nr_rrc_data_req to RRC_DCCH_DATA_REQ 2021-01-12 05:59:01 +00:00
Xue Song
e0419baeb3 Merge branch 'ngap-wf-1120-srb' into develop_SA_rfsim_for_F1
Conflicts:
        cmake_targets/CMakeLists.txt
        openair1/PHY/NR_UE_ESTIMATION/nr_ue_measurements.c
        openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
        openair1/SCHED_NR/phy_procedures_nr_gNB.c
        openair2/RRC/NR/rrc_gNB.c
        openair2/RRC/NR_UE/rrc_UE.c
        openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
        openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
        openair2/LAYER2/NR_MAC_UE/main_ue_nr.c
        openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
        openair2/LAYER2/NR_MAC_gNB/main.c
        openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
        openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
        openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
        openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
        openair2/LAYER2/nr_pdcp/nr_pdcp_entity_drb_am.c
2021-01-12 05:37:09 +00:00
Shweta Shrivastava
f9e2d12e1c Fix phy sim build errors 2021-01-11 15:16:29 -06:00
cig
cd36314de9 Cleanup MAC UE of unused struct members 2021-01-11 18:36:43 +01:00
cig
ad230dcc31 UE Msg2 reception review
- enhancement of DL indication flow for Msg2 (RAR)
- merging interface procedures to handle DLSCH and RAR together
- better separation of MAC and PHY functionalities
- cleanup of double ambiguous functions to process RAR
- merging functions to process TA command into the ue_ta_procedures function
- enhancement of logging and formatting in the process
2021-01-11 18:36:43 +01:00
cig
b7e9a1b1c3 Cleanup of long-time unused nr_ue_process_dlsch 2021-01-11 18:36:43 +01:00
cig
3e893b0dfe Review of UE DL indication
- moved fill_dl_indication to phy procedures
- introduced a new function to fill the RX indication
- replaced redundant configuration code with the fill functions
- extended the function to fill the rx indication
- handling different dl pdus types
- cleanup of redundant code
2021-01-11 18:36:37 +01:00
hardy
e5aabd88c2 Merge remote-tracking branch 'origin/cleanup_softmodem_main' into integration_2021_wk02 2021-01-11 14:54:04 +01:00
hardy
fe7a5a2dbd Merge remote-tracking branch 'origin/NR_FR2_RA' into integration_2021_wk02 2021-01-11 14:53:36 +01:00
hardy
1cff771937 Merge remote-tracking branch 'origin/NR_UE_dlsch_bugfix' into integration_2021_wk02 2021-01-11 14:52:40 +01:00
hardy
df88b0493e Merge remote-tracking branch 'origin/rlc-v2-bugfix-status-reporting' into integration_2021_wk02 2021-01-11 14:51:18 +01:00
Laurent
3b0c43c04b fix memory allocation error 2021-01-10 21:41:22 +01:00
Laurent
0dab0871c5 Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into itti-enhancement 2021-01-10 12:33:10 +01:00
Raymond Knopp
672ae1e3a2 added nr/eutra-nr request to first UECapabilityEnquiry message 2021-01-10 11:40:22 +01:00
francescomani
50aa4607d7 Merge branch 'NR_FR2_RA' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_FR2_RA 2021-01-09 17:07:03 +01:00
francescomani
6995eef871 moving initialization of msg3 frame and slot 2021-01-09 17:06:59 +01:00
rmagueta
ab107c98dd Fix RA BWP at UE 2021-01-09 15:58:54 +00:00
Raymond Knopp
630b609db9 level shifting on RX for X300/N300, reduced to give ~25 dB noise level in eNB RX
2 ANT TX/RX for USRP, updates
2021-01-09 10:32:02 +01:00
Raymond Knopp
2368633642 testing of LTE with 2x2 20 MHz TDD on N310. Modifications in pipelined threading 2021-01-09 07:13:13 +01:00
Shweta Shrivastava
9601c7a77c Further changes to resolve merge conflict 2021-01-08 13:49:21 -06:00
Shweta Shrivastava
1cfb528374 Resolve merge conflicts 2021-01-08 13:21:14 -06:00
frtabu
a81f429c1f Merge branch 'cleanup_softmodem_main' of https://gitlab.eurecom.fr/oai/openairinterface5g into cleanup_softmodem_main 2021-01-08 18:26:23 +01:00
Shweta Shrivastava
729182f57e Use PTRS params from RRC at MAC; remove hardcoding 2021-01-08 11:19:29 -06:00
frtabu
6ec065fe2a add tpool thread name parameter, review fixes 2021-01-08 18:19:29 +01:00
Thomas Schlichter
41f319b02a add test cases for UL transform precoding (SC-FDMA) 2021-01-08 17:26:38 +01:00
Wang
b403567074 Update nr_gold_ue.c 2021-01-08 10:50:56 +01:00
frtabu
cbdfc1c933 add tpool thread name parameter, fi init 2021-01-08 01:22:23 +01:00
rmagueta
8bd539025b Minor correction 2021-01-07 23:00:07 +00:00
Shweta Shrivastava
41c55be847 Fix for error message - no active DLSCH 2021-01-07 13:40:22 -06:00
rmagueta
9544a181ea Merge remote-tracking branch 'origin/develop' into develop-sib1 2021-01-07 18:29:04 +00:00
rmagueta
223c8b9ad9 Fix REG mapping type for coreset0 2021-01-07 18:28:17 +00:00
Thomas Schlichter
d99099f316 Merge remote-tracking branch 'develop' into NR_FR2_RA
Conflicts:
	openair1/PHY/NR_REFSIG/nr_gold_ue.c
2021-01-07 17:00:13 +01:00
yoshio.inoue
a011f33251 Merge remote-tracking branch 'fjt_dev/develop_SA_L3' into NR_SA_itti_sim_wk48 2021-01-07 10:03:27 +00:00
Xue Song
bc2b462ea4 fix eNB compile error 2021-01-07 18:48:53 +09:00
Wu.Jing
e2d26d2a44 Merge branch 'master' into develop_SA_F1 2021-01-07 13:56:32 +09:00
Wu.Jing
f22a779881 Merge branch 'master' into develop_SA_L3 2021-01-07 13:55:40 +09:00
rmagueta
a6a56d23cb Fix in coreset0 transmission slot calculation 2021-01-06 14:39:09 +00:00
masayuki.harada
674339237f Add handling of error case. 2021-01-06 20:20:22 +09:00
masayuki.harada
27413fc4fc Fix merge miss. 2021-01-06 20:13:02 +09:00
Haruki NAOI
cf41c788d6 fix s1ap stack overflow.
(cherry picked from commit f6b51079021347c19d528200f04d7cdba1dde0e5)

# Conflicts:
#	openair3/S1AP/s1ap_eNB.c
2021-01-06 19:53:32 +09:00
Wu Jing
4a14c4c706 fix build waning
(cherry picked from commit 624fe21f52117959940066a6cfc5f8beac70e462)

# Conflicts:
#	openair2/LAYER2/MAC/eNB_scheduler_RA.c
#	openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
#	openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
#	openair3/S1AP/s1ap_eNB.c

# Conflicts:
#	openair3/S1AP/s1ap_eNB.c
2021-01-06 19:52:37 +09:00
Cai Yang
52acfc75de Fix s1ap_eNB_timer.c warnings
(cherry picked from commit 39850dcfadb37e24ccfe41e0a85a9f2136eeff4a)
2021-01-06 19:52:02 +09:00
Wu.Jing
4c75866a54 Fix cppcheck warning
(cherry picked from commit aaa4d390fdefc4e8071b80edc90a580907c9dec3)
2021-01-06 19:51:46 +09:00
Wu.Jing
8c607fe85b Fix build error in --UE because of s1ap_eNB.c
(cherry picked from commit 519e6628d572c9b6cf8031632d4e22e2f8dc5b93)
2021-01-06 19:51:34 +09:00
Haruki NAOI
46407ca42b Add S1down auto recovery.
(cherry picked from commit 2339972ceaeb75fe18c0b2ae9ea69216dd919668)
2021-01-06 19:51:11 +09:00
Ding Yumei
7631a1dc1d fix s1ap StreamID issue 2021-01-06 19:35:32 +09:00
Wu Jing
cead17f2d8 Fix openair3/NAS/UE cppcheck error 2021-01-06 19:33:04 +09:00
Haruki NAOI
f006866c74 Fix: Drop paging message on sctp stream zero.
(cherry picked from commit 2d45f940be267e013781d6baba5b2ab665e64c88)
2021-01-06 19:32:14 +09:00
Wu Jing
df17a8dd4f merge NNSF feature based on v1.0.2
(cherry picked from commit b9e93a16379cf261502d9451b60bd787c07da64e)
2021-01-06 19:31:35 +09:00
He Shanyun
63a5c693b4 modify decode error about supportedCodecList in NAS message 2021-01-06 19:08:41 +09:00
Raymond Knopp
6b5e4e924d added usrp-tx-thread to lte modem 2021-01-06 11:07:54 +01:00
Raymond Knopp
09a63cb998 logging and unitary compilations 2021-01-05 22:46:41 +01:00
Raphael Defosseux
228be9225b Merge branch 'ci-fix-flexran-rtc-build-xenial' into 'develop'
CI: fix flexran-rtc build Xenial

See merge request oai/openairinterface5g!1007
2021-01-05 18:51:24 +01:00
Raphael Defosseux
7d5081f72a CI: patching pistache build in flexran-rtc for xenial VM build
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-01-05 13:57:19 +01:00
Florian Kaltenberger
a597412edd Merge remote-tracking branch 'origin/NR_FR2_RA' into NR_FAPI_beamindex_SSB_RO 2021-01-04 14:05:07 +01:00
Raymond Knopp
7cbf24d36c updates for tracing 2021-01-03 12:28:24 +01:00
Laurent
ebccfe5117 add raw capture from UHD examples and fix a rfsim bug 2021-01-02 18:58:13 +01:00
Raymond Knopp
1b95baaf4c update F1AP to R16.3.1. testing with OTA eNB 2021-01-01 21:45:23 +01:00
Laurent
c4a91bcc62 scope, dirty replay 2020-12-29 19:00:51 +01:00
Raymond Knopp
d00b966d14 finishing mere with constant_power branch. Testing OTA. 2020-12-29 08:15:36 +01:00
Laurent
014b35bca3 to relaunch CI (aborted) 2020-12-28 10:07:08 +01:00
cig
f4b8e780b4 RAR reception review @ UE
- fixes to backoff counter procedure
- updated received target power computation (TS 38.321 R16)
2020-12-27 19:38:03 +01:00
cig
a30c8075a2 Cleanup RA procedure @ UE
- review/cleanup of commented out descriptions
- logging
- indentation
- spacing
- typos
- cleanup of unused RA_tx_frame, RA_tx_slot members
2020-12-27 19:37:34 +01:00
cig
9aa7b5b432 RA initialization review according to 5.1.1 of TS 38.321 v16.2.1
- moved init code to new function init_RA
- moved relevant variables from MAC to prach_resources
- cleanup of unused struct members
- other minor fixes
2020-12-27 19:37:18 +01:00
cig
833d2ae47e Moved RA-RNTI computation to new function @ MAC UE 2020-12-27 19:37:06 +01:00
cig
b9a49238e6 Configuration of msg3_deltaPreamble @ UE
- according to clause 7.1.1. of TS 38.213
2020-12-27 19:36:33 +01:00
cig
9788aff8b7 AssertFatal cleanup @ UE
- focus: RA procedures, PHY procedures
2020-12-27 19:36:18 +01:00
cig
2bd1ab8732 UE get PRACH resources review @ MAC
- Moved code for SSB to RACH mapping config to new function
- Moved RA preambles configuration routine to new function
- Removed irrelevant arguments to nr_get_prach_resources
- turned some struct members and local vars into global vars
- added checks on the RA Type as per TS 38.321 clause 5.1.1
- minor cleanups
- currently only 4-step RA is available
2020-12-27 19:36:01 +01:00
cig
8eea13f782 Defined common MAX_BWP_SIZE @ MAC
- as defined by clause 12 "BWP Operation" TS 38.213
- cleaned up hardcoded usage
2020-12-27 19:35:25 +01:00
cig
4386f724dc Fixes for UE BWP Operation 3GPP TS 38.213 version 16.3.0 Release 16
- fetching configuration from RRC
- removed hardcoded params (e.g. bwp_id)
- added BWP Id members to MAC instance
- introduced offsetToCarrier
2020-12-27 19:29:28 +01:00
cig
ef1deccef8 Introduced RA type @ UE
- whether it is 2-step or 4-step RA
- added checks on CFRA and 2-step RA pointer members
- introduced enum and PRACH resources struct member
2020-12-27 19:28:47 +01:00
cig
1d2d96f34e Cleanup RA procedure
- removed irrelevant prach_config_enabled parameter
- cleanup of commented out code
- minor fixes
- enhancement of logging
2020-12-27 19:28:30 +01:00
cig
895d97d0e8 Cleanup UE mac_enabled conditions
- skipping RA procedures when MAC is disabled
- added mac_enabled flag that allows to disable RA and TA at UE from CL
2020-12-27 19:28:13 +01:00
cig
a21e858f4f Cleanup runmode @ UE side
- removed unused arguments to phy functions
- removed irrelevant conditions on UE run mode
- replaced hardcoded param with PHY UE stored value
2020-12-27 19:27:51 +01:00
cig
1c24adeef9 Cleanup NR UE
- focus: defs_nr_UE.h, nr-ue.c, phy_procedures_nr_ue.c, nr_init_ue.c
- removed long-time commented out code
- replaced hardcoded params
- removed unnecessary header inclusions
2020-12-27 19:26:18 +01:00
cig
a9cc183cf6 Moved definitions and extern variables in nr-ue.c to .h files
- extern vars to phy_extern_nr_ue.c
- def/undef to defs_nr_ue.h
2020-12-27 19:24:36 +01:00
cig
eea30e7250 Moved dl indication config code to fill_dl_indication function 2020-12-27 19:24:17 +01:00
cig
605f1e90e7 Replaced hardcoded Max PDSCH TBS value with globally defined parameter 2020-12-27 19:23:29 +01:00
cig
33dc5772e8 Cleaning up references to LTE in some NR UE functions
- replaced eNB naming with gNB
2020-12-27 19:23:01 +01:00
masayuki.harada
bbaef50932 Fix est buffer. 2020-12-27 20:19:33 +09:00
Laurent
d253301c1a intptr_t instead of int64_t for instance_t 2020-12-27 12:09:20 +01:00
Raymond Knopp
49efcebeec Merge remote-tracking branch 'origin/constant_power' into oairu 2020-12-26 13:11:20 +01:00
Laurent
79d51ce645 reallocarray() doesn't exist in old Ubuntu 2020-12-26 11:05:42 +01:00
Raymond Knopp
b596e2abd2 added definition of usrp_tx_thread in oairu exectuable 2020-12-25 16:55:29 +01:00
Raymond Knopp
8d3e20cab7 Merge branch 'oairu' of https://gitlab.eurecom.fr/oai/openairinterface5g into oairu 2020-12-25 16:19:57 +01:00
Raymond Knopp
7620fe9b2d minor changes for oairu executabl 2020-12-25 16:19:41 +01:00
Raymond Knopp
881ac5491c merge with develop 2020-12-25 16:18:24 +01:00
Raymond Knopp
79d0f7774f added missing files 2020-12-24 16:14:56 +01:00
Raymond Knopp
7185b95591 debugging with AW2S RRU. Added statistics for ULSCH/UCI in PHY and MAC. 2020-12-24 16:10:03 +01:00
Raymond Knopp
9edd67b216 Merge remote-tracking branch 'origin/develop' into oairu 2020-12-24 14:53:58 +01:00
Xue Song
b0a76fd662 add du handle f1ap setup response 2020-12-24 02:58:29 +00:00
frtabu
58309dd730 simplify nrue command line parameter processing 2020-12-23 18:43:03 +01:00
Laurent
a432feda3e add external visibility for itti_create_queue 2020-12-23 14:29:40 +01:00
Laurent
42a110338c itti dynamic queue creation, and 64 bits instance id 2020-12-23 13:56:01 +01:00
Xue Song
1fcd879f97 modify F1 Setup Response
add rrc_gNB_process_f1_setup_req
2020-12-23 10:03:04 +00:00
Xue Song
1cc09da83f Merge branch 'develop_SA_L3' into develop_SA_F1
Conflicts:
	openair2/GNB_APP/gnb_config.c
	openair2/RRC/NR/rrc_gNB.c
2020-12-23 15:11:17 +09:00
Xue Song
cb0d7c3dd5 modify F1 Setup Request 2020-12-23 01:58:17 +00:00
frtabu
d3919b6af4 Merge branch 'develop' into cleanup_softmodem_main 2020-12-22 23:07:54 +01:00
Xue Song
f09c6fbd0d Add RCconfig_NR_DU_F1
Initialize F1AP
2020-12-22 01:29:23 +00:00
Mahesh
402c05eb6b nr_ulsim and nr_dlsim working 2020-12-21 23:18:27 +05:30
dir
c5bce98b48 RRC, MAC changes to enable RFSIM testing of feature transform precoding.
- Enable -Z option to test Transform precoding on ULSIM.
- Set msg3_transformPrecoder to 0 in uplinkcommonconfig params in conf file to test on RFSIM.
2020-12-21 16:10:27 +02:00
dir
a17f00784c NR_SC_FDMA changes
- CDM groups used, multiple DMRS locations tested
- REMOVED compiler define NR_SC_FDMA
- enabled -Z option in ulsim for testing NR SC-FDMA
- Gnb UL Processing of LLRS even if last symbol allocated has no data
- transform precoding Enumerations used
2020-12-21 14:01:59 +02:00
dir
6b8ffb43c1 fix DFT bug identified by Laurent Thomas 2020-12-21 14:01:59 +02:00
He Shanyun
c6cd8f3731 fix build error of phy_sim 2020-12-21 08:05:24 +00:00
Xue Song
8d5f99d088 fix the problem of ittiSIM compilation error 2020-12-21 16:12:58 +09:00
yaojie
d5696baf71 Fix merge conflict 2020-12-21 12:25:36 +09:00
Xue Song
d0be64cbd0 add DU_handle_F1_SETUP_FAILURE 2020-12-21 01:50:28 +00:00
Xue Song
08511b8207 fix some warnings
modify some issues
add f1ap ue context procedure
2020-12-20 08:59:50 +00:00
Mahesh
024849983a Merge develop(w51 2) to nfapi_nr
Setting of nFAPI mode in NR yet to be updated
2020-12-18 23:26:21 +05:30
Florian Kaltenberger
568885ec4f harmonizing config files 2020-12-18 16:51:13 +01:00
rmagueta
0f3629ae92 Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-sib1
 Conflicts:
	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
2020-12-18 13:43:48 +00:00
Florian Kaltenberger
2f30ed68ba UE only calls trx_write in UL slots when used with USRP. This improves real-time performance and is necessary for controlling the external switch. However, we still need to take the proper TDD config into account (tbd). 2020-12-18 13:31:23 +01:00
Xue Song
ec29831e16 modify F1AP_DL_RRC_MESSAGE in RRC
add DU_handle_DL_NR_RRC_MESSAGE_TRANSFER
2020-12-18 11:17:12 +00:00
Remi Hardy
d23a7e83f6 Integration 2020 wk51 2
MR991: Remove hack in LTE PDCP for noS1 mode  
- Removes a hack which was used when LTE PDCP was used for NR in noS1 mode

MR993: UL and DL fixes LDPC short codewords 
- Fix UL & DL LDPC decoding for short LDPC code, e.g. Z_c is not multiple of 8
- Fix DLSCH data transmission with multiple DMRS symbols per slot
- small TA fixes on OAI 5G NR UE
- Implemented CQI measurement at NR UE
- NR UE cleanup 

MR1000: doc: fix build directory in BASIC_SIM.md
2020-12-18 12:06:35 +01:00
Wu.Jing
37d52bdf60 Merge branch 'develop_SA_SIM' into develop_SA_L3
Conflicts:
	openair2/RRC/NR/nr_rrc_proto.h
	openair2/RRC/NR/rrc_gNB.c
	openair2/RRC/NR_UE/rrc_UE.c
	openair2/RRC/NR_UE/rrc_defs.h
	openair3/NGAP/ngap_gNB_nas_procedures.c
2020-12-18 17:38:07 +09:00
Xue Song
7b859b7238 add F1AP_DL_RRC_MESSAGE in NR RRC 2020-12-18 03:06:08 +00:00
Wu.Jing
19118c13d1 Merge branch 'master' into develop_SA_L3 2020-12-18 11:52:59 +09:00
Francesco Mani
70e87bfd13 moving initialization of gold for pdcch to nr_init_ue 2020-12-17 14:18:19 +01:00
Francesco Mani
b1e2c99b93 moving initialization of gold for pdsch to nr_init_ue 2020-12-17 13:09:32 +01:00
Xue Song
5936c80b0b RRCSetup docking with F1AP 2020-12-17 08:35:24 +00:00
Xue Song
45ec62f963 read config about f1 2020-12-17 05:50:57 +00:00
Xue Song
a53d6795c8 fix some errors about rrcReestablishment 2020-12-17 12:21:06 +09:00
rmagueta
dc4dd10d1a RA BWP fix at UE 2020-12-16 18:02:24 +00:00
Francesco Mani
53140df8d3 rnti in pucch 0 indication 2020-12-16 15:05:03 +01:00
Mahesh
79e792443f L2 nfapi test(noS1) working 2020-12-16 16:17:32 +05:30
hardy
fb14836f0d Merge remote-tracking branch 'origin/minor-fix-doc-basic-sim' into integration_2020_wk51_2 2020-12-16 11:10:05 +01:00
hardy
69cc0767c0 Merge remote-tracking branch 'origin/ldpc_short_codeword_fixes' into integration_2020_wk51_2 2020-12-16 11:09:56 +01:00
hardy
4d76288211 Merge remote-tracking branch 'origin/remove_nos1_hack_pdcp' into integration_2020_wk51_2 2020-12-16 11:09:31 +01:00
Francesco Mani
55ef82cc9a another workaround to make the UE transmit MSG3 2020-12-15 16:51:04 +01:00
Francesco Mani
f67dd8eb04 controlling availability of beam for msg3 2020-12-15 16:02:42 +01:00
Francesco Mani
627f4f88d7 Merge remote-tracking branch 'origin/develop' into NR_FAPI_beamindex_SSB_RO 2020-12-15 12:11:51 +01:00
Francesco Mani
4b021014da scheduling msg2 in fr2 according to beam 2020-12-15 11:31:04 +01:00
Francesco Mani
48ad90bc33 correction in ssb beam association at mac 2020-12-15 11:30:13 +01:00
Thomas Schlichter
4626d507bd NR UE: fix compile error with UE_TIMING_TRACE enabled 2020-12-15 11:17:24 +01:00
masayuki.harada
50146dec06 Merge remote-tracking branch 'remotes/oai/develop' into lte_uplink_improvement
# Conflicts:
#	openair1/SCHED/phy_procedures_lte_eNb.c
#	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
2020-12-15 19:01:43 +09:00
masayuki.harada
b125b93e9e Fix log and minor bugs. 2020-12-15 18:19:22 +09:00
Remi Hardy
e37c844b17 Integration 2020 wk51
MR960: 256 QAM demodulation routines  
- Added functions for demodulation of 256 QAM signals.
- Added a command line flag to enable mcs table entry in PDSCH-Config in RRC to use 2nd MCS table for PDSCH.
- Added an option for using 256 QAM mcs table in nr_dlsim.

MR989: Docker and Deployment improvements (CI)  
- Image generation for eNB --> template for configuration files and dedicated entrypoint in Ubuntu
- Docker-compose-based EPC deploy
- Traffic test fully validated using the `trf-gen` container
- Flexran-rtc support when deployed in a container (Not fully done for the X2 Handover part)
- Added docker-compose-based eNB deployment
- Retrieve logs for such eNB deploymnent 
- Functional and log  update of nsa fr1 test but valid for gNB terminate also (enhanced ping stats and gNB markers)

MR992: Fix data transmission in "do-ra" mode
- UL and DL Traffic works now in do-ra mode, but there are still some PUCCH issues remaining. These issues are harming the acknowledgement of DL packets, and thus leading to unnecessary retransmissions.
The relevant warnings at UE are:
`PUCCH Invalid pucch resource indicator: at line 1082 in function select_pucch_resource of file openair1/SCHED_NR_UE/pucch_uci_ue_nr.c`
and
`PUCCH Error for number of bits for acknowledgment : at line 909 in function get_downlink_ack of file openair1/SCHED_NR_UE/pucch_uci_ue_nr.c`
Note: UE needs rbconfig.raw and reconfig.raw files from the *currently* running gNB, as the C-RNTI is random and different for each run.
2020-12-15 09:41:05 +01:00
Francesco Mani
9b6c7ba46d correction in ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR 2020-12-15 08:43:26 +01:00
yaojie
96cf622e9e fix errors and add RRCReestablishmentComplete of UE 2020-12-15 14:23:39 +09:00
Raphael Defosseux
88ac8ec267 CI: fix auto-terminate methods
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-12-14 17:16:37 +01:00
Francesco Mani
78c5cd5a62 beam tdd association for ssb 2020-12-14 15:39:41 +01:00
hardy
02bb4ac913 Merge remote-tracking branch 'origin/fix_do_ra_data' into integration_2020_wk51 2020-12-14 13:33:38 +01:00
hardy
4e0e95aa49 Merge remote-tracking branch 'origin/ci-deploy-docker-compose' into integration_2020_wk51 2020-12-14 13:33:05 +01:00
hardy
3bccd95755 Merge remote-tracking branch 'origin/256_QAM_demod' into integration_2020_wk51 2020-12-14 13:32:29 +01:00
Francesco Mani
10a98de7ef fix for ssb vrb map in fr2 2020-12-14 13:13:38 +01:00
Thomas Schlichter
fda514b3ba rfsimulator: do not show "gap in reception" messages if complete slots are skipped (e.g. NR DL: gNB transmission, UE reception) 2020-12-14 12:06:11 +01:00
Thomas Schlichter
f905b29364 NR UE: decrease number of LOG_I() logging messages 2020-12-14 12:06:11 +01:00
Thomas Schlichter
5e0e07b6e2 NR UE: do not hardcode the UL harq_pid to 0 in phy_procedures_nrUE_TX() 2020-12-14 12:06:11 +01:00
Thomas Schlichter
a269ad840a NR UE: modify nr_gold_pdsch() to only generate gold sequence for current slot 2020-12-14 12:06:11 +01:00
Remi Hardy
ff21934860 adding more ping statistics 2020-12-14 11:55:03 +01:00
Xue Song
40e3c0ce95 modify rrcReestablishmentRequest 2020-12-14 18:50:12 +09:00
Francesco Mani
9fae23b625 quick fix for nb of rb allocated in phytest for ul 2020-12-11 18:14:06 +01:00
Francesco Mani
f87c979465 new mac array for tdd-beam association in FR2 2020-12-11 17:48:33 +01:00
Cedric Roux
42dca06ae0 doc: fix build directory in BASIC_SIM.md 2020-12-11 11:11:27 +01:00
yaojie
7fa06a3a2b Add RRCReestablishment 2020-12-11 17:31:06 +09:00
He Shanyun
65bad0f5a8 fix cppcheck warning 2020-12-11 16:42:58 +09:00
He Shanyun
8c9753ca3c fix issue about error locking mutex_rxtx of L2 sim 2020-12-11 16:28:03 +09:00
Xue Song
9dce92eafe implement rrcReestablishmentRequest 2020-12-11 14:59:34 +09:00
He Shanyun
ec48bb8913 implement rrcReestablishmentComplete 2020-12-11 09:54:43 +09:00
rmagueta
58d2aafb5f Minor updates in documentation 2020-12-10 17:24:56 +00:00
rmagueta
06cb91d795 Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-sib1
 Conflicts:
	openair2/LAYER2/NR_MAC_UE/mac_defs.h
	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
	openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
2020-12-10 16:24:28 +00:00
rmagueta
205d98bdb9 Fix for TBS = 84 2020-12-10 16:13:42 +00:00
Francesco Mani
30dc2e094d Merge remote-tracking branch 'origin/develop' into NR_FR2_RA 2020-12-10 16:00:36 +01:00
Florian Kaltenberger
908c8999ec Merge remote-tracking branch 'origin/NR_FR2_RA' into NR_FAPI_beamindex_SSB_RO 2020-12-10 14:51:43 +01:00
Florian Kaltenberger
373cd5fc1d Merge remote-tracking branch 'origin/develop' into NR_FAPI_beamindex_SSB_RO 2020-12-10 14:50:23 +01:00
Thomas Schlichter
ac73df698d Merge branch 'develop' into 'fix_do_ra_data'
# Conflicts:
#   openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
#   openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
2020-12-10 13:40:08 +01:00
Remi Hardy
b9b2f28911 Integration 2020 wk50
MR969: Develop oriecpriupdates  
Makes IF5 functionality compatible with ECPRI user-plane. 
Control-plane functionality for supporting third-party RRUs : provides an interface converting OAI-native RF parameters, a subset of LTE framing parameters, and RF streaming activation/deactivation to a wrapper (libthirdparty_transpro.so) which uses the proprietary interface of the RRU. 
This branch was tested with a commercial eCPRI RRU from AW2S.

MR980: Nr ul scheduler basis 
- cleanup of UL scheduler, and add interface preprocessor-postprocessor (in `NR_UE_sched_ctrl_t`)
- Postprocessor can (almost) handle multiple UEs. Preprocessor will follow soon (proportional fair scheduler)
- Preprocessor for phytest (always schedule 50 RBs due to OAI UE limitations) and real UE (as many resources as possible)
- Internal structures have been updated: the `UL_tti_req` structure became an array (as `UL_tti_req_ahead`) so that we can schedule in advance and mark resources as used. Before, we would keep the corresponding nfapi message structure per UE, which could get messy when we have many UEs.

There are no functional changes (UL/DL performance is the same). 

MR987: Nr phy mac if multi ue  
- Handles multiple UEs in `NR_IF_interface.c`
- Some minor clean up

MR979: Pusch decoder threads parameter  
- Added a config file parameter for specifying the number of threads to be used for PUSCH decoding.

MR982: nr pdcp: use pdcp config
-There was a problem with SN size. It was hardcoded to 12 bits (so max sn = 4095) but we configure the UE with 18 bits. 
Get the correct value from pdcp_Config.
- Store also discard_timer and t_reordering that will be used later by a proper NR PDCP layer 

MR984: NR FR2 SSB
- several fixes mainly concerning FR2 synchronization and RA both at gNB and UE
- SSB RRC signaling for FR2
- Coreset RRC for FR2
- SSB detection in FR2 for SSB index > 15
- Adjust sync function issue
- Fix for scheduling of MSG2 (issue with sl_ahead)
2020-12-10 13:22:12 +01:00
masayuki.harada
519ab68b21 Fix some merge miss. 2020-12-10 20:27:55 +09:00
Francesco Mani
ee54e20ed9 change assertion to error if no CCE is found 2020-12-10 10:30:23 +01:00
Francesco Mani
06d7664167 schedule 2nd DL slot in 3 instead of 2 2020-12-10 09:51:23 +01:00
rmagueta
8380136c3a SIB1 with dmrs-AdditionalPosition = pos2 2020-12-10 01:12:03 +00:00
Raphael Defosseux
22e90c7aa7 [CI] fix on the thark capture port number for S1AP
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-12-09 17:17:42 +01:00
Remi Hardy
a5475d3051 updating nsa fr1 test files 2020-12-09 16:29:41 +01:00
rmagueta
4eed33b082 Added documentation. Minor source code format fixes. 2020-12-09 14:59:55 +00:00
Francesco Mani
7a2786c323 Merge remote-tracking branch 'origin/develop' into NR_FR2_RA 2020-12-09 14:30:01 +01:00
Francesco Mani
f9e00c5168 bugfix in msg3 freq allocation at UE 2020-12-09 14:24:55 +01:00
Remi Hardy
98fd8279bf Merge remote-tracking branch 'origin/develop-oriecpriupdates' into rh_wk50_debug 2020-12-09 14:16:19 +01:00
Remi Hardy
3d8be663a0 Merge remote-tracking branch 'origin/NR_FR2_RRC_SSB' into rh_wk50_debug
Conflicts:
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
2020-12-09 13:16:41 +01:00
Remi Hardy
e9cf51f58d Merge remote-tracking branch 'origin/bugfix-nr-pdcp-sn-size' into rh_wk50_debug 2020-12-09 13:11:02 +01:00
Thomas Schlichter
4f98a626ce warning fixes 2020-12-09 11:40:00 +01:00
Francesco Mani
3bae6a046d workaround for UE to transmit msg3 2020-12-09 10:46:19 +01:00
Remi Hardy
68009c1cf7 [CI]: add missing PUSCH threads configuration for the CI-used gNB conf 2020-12-09 10:04:24 +01:00
Remi Hardy
ff0a2ca97c removing external sync clock 2020-12-09 10:00:19 +01:00
Remi Hardy
bc43ecd17f fix variable name after merge of MR980 and MR987 2020-12-09 09:55:50 +01:00
Remi Hardy
4a66c750ec Merge remote-tracking branch 'origin/pusch-mthread-scaling-fix' into rh_wk50_debug 2020-12-09 09:49:48 +01:00
Remi Hardy
ec94adaef5 Merge remote-tracking branch 'origin/NR-PHY-MAC-IF-multi-UE' into rh_wk50_debug 2020-12-09 09:48:40 +01:00
Remi Hardy
c04a2ff497 Merge remote-tracking branch 'origin/NR_UL_scheduler' into rh_wk50_debug 2020-12-09 09:47:16 +01:00
Remi Hardy
39d1774a11 fixing dependency issue for gNB build 2020-12-09 09:45:10 +01:00
Thomas Schlichter
1b2c8b3c56 Merge remote-tracking branch 'origin/develop' 2020-12-09 09:39:44 +01:00
cig
440e820f6d Moved code for timing alignment procedures to PHY UE procedures
- new function called ue_ta_procedures
- this makes the code more easier to read
- small cleanup was also done
2020-12-09 09:35:41 +01:00
cig
da9dde5bb7 Replaced redundant code for BW scaling computation
- using the get_bw_scaling function
- made it generic for DL/UL computations
2020-12-09 09:35:41 +01:00
cig
427d2d3977 Cleanup nr-uesoftmodem
- moved configuration of UE parameters to set_options function
- removed redundant loop over CCs
2020-12-09 09:35:41 +01:00
cig
f833d1d9c7 Debug code for USRP Noise Figure in nr_ue_rrc_measurements 2020-12-09 09:35:41 +01:00
cig
fb4248fe40 Cleanup and fixes definitions measurements structs gNB and UE
- set the proper platform variables definitions
- cleaned up commented out code
2020-12-09 09:35:41 +01:00
cig
52cb041693 Updated usage of channel model simulation in RFSIM 2020-12-09 09:35:41 +01:00
cig
3986d5764d Implemented CQI measurement at NR UE
- fixes for nr_ue_measurement function
- Introduced nr_rrc_measurement function
- removed unused params
- replaced hardcoded params
- code cleanup

temp
2020-12-09 09:35:40 +01:00
cig
5d16593b6b NR UE Code cleanup
- removed long time commented-out and unused code
- minor logging fixes
2020-12-09 09:35:40 +01:00
Thomas Schlichter
18bf5b5522 CI: add automatic tests for multiple DMRS positions to nr_dlsim 2020-12-09 09:08:43 +01:00
masayuki.harada
1de8776c43 Fix compile error 2020-12-09 13:59:49 +09:00
Shweta Shrivastava
61d3f3465a Make PTRS configuration optional 2020-12-08 22:57:50 -06:00
Hongzhi Wang
1bd84bf1fd update nr ue gold to simplified version 2020-12-08 16:02:04 +01:00
Rahul Gottipati
243190c038 Revert AMP_SHIFT value 2020-12-08 19:47:57 +05:30
Francesco Mani
e7edc37b5d k2 for msg3 in fr2 2020-12-08 15:03:08 +01:00
Francesco Mani
711a997fdb dynamic allocation of dl gold sequences at ue 2020-12-08 15:02:19 +01:00
Raphael Defosseux
268aa87c81 [CI] fix typo and few tunings
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-12-08 12:37:38 +01:00
He Shanyun
547d7b01b8 change the sleep location for the ittisim 2020-12-08 17:13:09 +09:00
Mahesh
7eb016675d Resolved errors in building phy-simulator 2020-12-08 12:28:16 +05:30
frtabu
4338d5365b cancel thread pool modif 2020-12-07 23:46:14 +01:00
rmagueta
4be7f10efe nr_rrc_ue_decode_NR_SIB1_Message call was deleted from the PHY. It was used the UE FAPI interface to signal this to the MAC, who was send it to the RRC. 2020-12-07 19:30:45 +00:00
Raphael Defosseux
adb29da804 [CI] python code clean
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-12-07 17:50:50 +01:00
rmagueta
da77bf33b9 Fix for DMRS symbol without data 2020-12-07 16:36:50 +00:00
rmagueta
62d481f316 nr_dlsim and nr_ulsim segmentation fault issue solved 2020-12-07 12:25:23 +00:00
masayuki.harada
0555b108db Merge remote-tracking branch 'remotes/oai/develop' into lte_uplink_improvement 2020-12-07 21:17:59 +09:00
masayuki.harada
b0f5a37fba Fix indentation, merge miss and remove unnecessary comment. 2020-12-07 20:08:03 +09:00
frtabu
6d168eca61 Merge branch 'cleanup_softmodem_main' of https://gitlab.eurecom.fr/oai/openairinterface5g into cleanup_softmodem_main 2020-12-07 10:41:34 +01:00
frtabu
81da4ffce3 remove threadoffset option, doesn't seem to be defined in the develop code?? 2020-12-07 10:39:08 +01:00
Francesco Mani
50b629c6c2 fix for nb of slots in ue gold 2020-12-07 10:27:12 +01:00
frtabu
e97edafd3f remove threadoffset option, doesn't seem to be defined in the develop code?? 2020-12-07 01:02:23 +01:00
Shweta Shrivastava
a0306a92a0 Use dedicated serving cell config from config file to fill secondaryCellGroup 2020-12-05 15:15:58 -06:00
Shweta Shrivastava
c71e136aa0 Code cleanup and comments 2020-12-05 14:04:27 -06:00
Shweta Shrivastava
f9b87d84ab Add dedicated config to RRC config request from GNB APP -> RRC 2020-12-05 13:45:38 -06:00
Shweta Shrivastava
fba68e9a5f Fix dedicated configuration after reading config file 2020-12-05 13:00:51 -06:00
Shweta Shrivastava
784f4de159 Read dedicated servingCellConfig, PTRS params from config file 2020-12-05 12:48:12 -06:00
Francesco Mani
756c20c009 tentative fix for delayed RA procedure at UE 2020-12-04 16:49:19 +01:00
Francesco Mani
29a56fe527 tentative fix for delayed RA procedure at UE 2020-12-04 16:21:45 +01:00
Sakthivel Velumani
e5cd573ecb Added a local variable instead of global 2020-12-04 15:10:58 +01:00
hardy
bfeae0a0a4 fixing RA test iteration when failing 2020-12-04 13:05:42 +01:00
Robert Schmidt
13f0571a65 Fix log message: add newline, format 2020-12-04 11:07:18 +01:00
Robert Schmidt
3ae4744679 Single definition and declaration of nr_slots_per_frame 2020-12-04 11:07:18 +01:00
Robert Schmidt
1d7065c29c Remove DLSCH_pdu as it is not needed anymore 2020-12-04 11:07:18 +01:00
Robert Schmidt
89fc1e6e54 handle_nr_ulsch() for multiple UEs 2020-12-04 11:07:18 +01:00
Raphael Defosseux
a371f5580e Merge branch 'ci-deploy-docker-compose' of gitlab.eurecom.fr:oai/openairinterface5g into ci-deploy-docker-compose 2020-12-04 10:09:31 +01:00
Raphael Defosseux
e0731d54a0 Merge remote-tracking branch 'origin/develop' into ci-deploy-docker-compose 2020-12-04 10:08:40 +01:00
Remi Hardy
97249354c3 Update BUILD.md 2020-12-04 10:08:37 +01:00
Robert Schmidt
35e723d090 handle_nr_uci() for multiple UEs 2020-12-04 09:41:34 +01:00
Robert Schmidt
d9c7243ac1 Remove LTE/FlexRAN-related headers from NR MAC 2020-12-04 09:41:34 +01:00
Robert Schmidt
c71772e325 Remove LTE-related headers from NR PHY-MAC IF 2020-12-04 09:41:34 +01:00
frtabu
fdc1049a70 Fix phy simulators compilation, number of threads for dlsch configurable 2020-12-03 23:22:07 +01:00
Remi Hardy
9ea7df9210 func + log update of fr1 nsa test 2020-12-03 22:12:54 +01:00
Raphael Defosseux
ef49960a8a [CI][Docker] able to deploy/undeploy a monolithic eNB with a compose file:
-- The compose file still keeps a few template fields to be replaced
  -- initial scenario has a full UE attach / traffic test

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-12-03 18:40:05 +01:00
Raymond Knopp
f659694eab Merge remote-tracking branch 'origin/develop-oriecpriupdates' into constant_power 2020-12-03 16:22:36 +01:00
Cedric Roux
d262d152ec rlc v2: implement SOstart/SOend in NACK reporting
The necessity of SOstart/SOend was understood after email exchanges with
David Breaux <davidbreaux67@gmail.com>.

See openair2/LAYER2/rlc_v2/tests/test46.h for some details.

Basically if we NACK without SOstart/SOend then the other end of the RLC
channel will consider all the bytes as NACKed and will have to resend them
all. If another status is then reported before all the bytes are sent,
and because we don't use SOstart/SOend this status will NACK all the bytes
again, then all the bytes are to be sent again. And the cycle repeats.
It will end with a max retx reached (which triggers RLF, Radio Link Failure).

The function put_bit in openair2/LAYER2/rlc_v2/rlc_pdu.c has been changed
too, maybe introducing some performance issues.
2020-12-03 16:17:24 +01:00
matzakos
d64bc67b0c Add TDD configuration in ENDC X2 setup response message sent from eNB 2020-12-03 15:39:30 +01:00
Raymond Knopp
4f57de4e53 added example configuration for if5 eCPRI for AW2S RRU (with X2) 2020-12-03 15:00:36 +01:00
Raymond Knopp
0571020666 minor modifications in T_defs.h and for constant power (i.e. no DTX in TX subframes for TDD) 2020-12-03 10:44:12 +01:00
Raphael Defosseux
87b03d0000 [CI] moved image build into a separate class
also first docker-compose for a monolithic eNB

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-12-03 10:01:21 +01:00
Robert Schmidt
589ff862dc Improve retransmission messages in UL&DL 2020-12-03 09:52:41 +01:00
Robert Schmidt
f821a333d7 Fix nr_dlsim: remove current_harq_pid, selected in DL scheduler 2020-12-03 09:42:22 +01:00
matzakos
103fc806b3 Remove hack in LTE PDCP for noS1 mode 2020-12-03 00:31:23 +01:00
Raymond Knopp
895f54a938 added no_DTX function to eNB. This fills the TX subframes which have no PDSCH with a fake pdsch. It avoids switching between TX/RX in TDD systems during the DL periods. 2020-12-02 20:15:38 +01:00
Robert Schmidt
5bb9a57ae9 Update SW_archi.md description 2020-12-02 18:42:47 +01:00
rmagueta
61a0e4f7b2 Fix creation of rbconfig.raw and reconfig.raw files in standalone mode 2020-12-02 17:28:02 +00:00
Robert Schmidt
12c6cd4481 Remove unused variable 2020-12-02 18:08:51 +01:00
Robert Schmidt
c110ad7dc6 Take out DL phytest slot limitation 2020-12-02 18:08:51 +01:00
Robert Schmidt
ec10d48b24 Reformat schedule_nr_prach() 2020-12-02 18:08:51 +01:00
Robert Schmidt
0e936a09ba Remove current_harq_pid: it is not needed 2020-12-02 18:08:51 +01:00
Robert Schmidt
3a37202beb Remove current_slot: it is not needed 2020-12-02 18:08:51 +01:00
Robert Schmidt
e99d3635db ULSCH: warn when retransmission, basic debug logging 2020-12-02 18:08:51 +01:00
Robert Schmidt
0c730d7aa1 Mark PRACH in vrb_map_UL 2020-12-02 18:08:51 +01:00
Robert Schmidt
70c3915d81 Schedule PRACH (internally) one frame in advance 2020-12-02 18:08:51 +01:00
Robert Schmidt
7a7c1bcc98 Calculate TBS in pre-processor and use the results in post-proc 2020-12-02 18:08:51 +01:00
Robert Schmidt
d8cecde925 Recalculate PUSCH saved params struct in Pre-processor 2020-12-02 18:08:51 +01:00
Robert Schmidt
8cb2317915 Create PUSCH saved params struct to avoid recomputation 2020-12-02 18:08:51 +01:00
Robert Schmidt
0d860454b0 ULSCH: Reorganize PUSCH PDU filling 2020-12-02 18:08:51 +01:00
Robert Schmidt
5762c943db Isolate TBS calculation in ULSCH, calculate some statistics 2020-12-02 18:08:51 +01:00
Robert Schmidt
644c364a4a Isolate DMRS N_PRB_DMRS in ULSCH 2020-12-02 18:08:51 +01:00
Robert Schmidt
fc0f0cd7e7 Isolate DMRS ul_dmrs_symb_pos and dmrs_cdm_grps_no_data in ULSCH 2020-12-02 18:08:51 +01:00
Robert Schmidt
85843b3e0e Isolate DMRS additional_pos, l_prime_mask in ULSCH 2020-12-02 18:08:51 +01:00
Robert Schmidt
0d2435460c Isolate DMRS config type in ULSCH 2020-12-02 18:08:51 +01:00
Robert Schmidt
c821dd0c94 Do not check for UE active state before ULSCH and DLSCH scheduler 2020-12-02 18:08:51 +01:00
Robert Schmidt
e4bbde77ef Isolate R&Qm in ULSCH 2020-12-02 18:08:51 +01:00
Robert Schmidt
a5cb42e773 Use variable sched_pusch 2020-12-02 18:08:51 +01:00
Robert Schmidt
f1a6a7e7a5 Isolate mcs_table in ULSCH 2020-12-02 18:08:51 +01:00
Robert Schmidt
a200beb585 Isolate HARQ in ULSCH 2020-12-02 18:08:51 +01:00
Robert Schmidt
b20954f6c0 Isolate TDA in ULSCH 2020-12-02 18:08:51 +01:00
Robert Schmidt
2599c68fa8 Isolate transform_precoding in ULSCH 2020-12-02 18:08:51 +01:00
Robert Schmidt
2958689fa4 config_uldci(): no rnti_types 2020-12-02 18:08:51 +01:00
Robert Schmidt
6df6cb9c9c UL_tti_req as pointer over multiple CCs 2020-12-02 18:08:51 +01:00
Robert Schmidt
0affd907b5 No dynamically alloced PUSCH, remove internal PDU 2020-12-02 18:08:51 +01:00
Robert Schmidt
a6a7c7a328 Move config_uldci() to primitives 2020-12-02 18:08:50 +01:00
Robert Schmidt
d2ac57088b Fix filling of DCI 0_0 in config_uldci() 2020-12-02 18:08:50 +01:00
Robert Schmidt
9ca626b37a Avoid copy from UL_tti_req_ahead into Ul_tti_req 2020-12-02 18:08:50 +01:00
Robert Schmidt
c219edfed3 Fix dlsim: Use UL_tti_req_ahead 2020-12-02 18:08:50 +01:00
Robert Schmidt
e6435cf7a2 Create separate phytest UL preprocessor 2020-12-02 18:08:50 +01:00
Robert Schmidt
cfc6044a6e Use function pointer to call UL pre-processor 2020-12-02 18:08:50 +01:00
Robert Schmidt
9ccc76474a PUCCH scheduling: allocate in UL_tti_req_ahead 2020-12-02 18:08:50 +01:00
Robert Schmidt
b202ab7d3d RA Msg3 allocation: check in vrb_map_UL, allocate in UL_tti_req_ahead 2020-12-02 18:08:50 +01:00
Robert Schmidt
e300b072c0 Use vrb_map_UL for PUSCH 2020-12-02 18:08:50 +01:00
Robert Schmidt
a232482b47 vrb_map_UL for every slot 2020-12-02 18:08:50 +01:00
Robert Schmidt
2b1a01c012 UL Post-processor: enable multi-UE handling 2020-12-02 18:08:50 +01:00
Robert Schmidt
327e3e706d Perform UL slot check in pre-processor 2020-12-02 18:08:50 +01:00
Robert Schmidt
2e53fdea9c Rename NR_sched_pusch_t and use for Freq Alloc + MCS 2020-12-02 18:08:50 +01:00
Robert Schmidt
ee6cdc1359 Create UL preprocessor, allocate CCE, re-use DL structures 2020-12-02 18:08:50 +01:00
Robert Schmidt
415a843ac4 Add active_ubwp to NR_UE_sched_ctrl_t 2020-12-02 18:08:50 +01:00
Robert Schmidt
3eceba5062 Use UE's active DL BWP in UL sched 2020-12-02 18:08:50 +01:00
Robert Schmidt
f3b00ff144 UL_tti_req_ahead: pre-set slot and frame 2020-12-02 18:08:50 +01:00
Robert Schmidt
f45e8bbe0e UL_tti_req_ahead: Create PUSCH PDU directly within nr_fill_nfapi_ul_pdu()
Use a "future" UL_tti_req structure to save in between scheduling and
reception slots. Should also work for FDD.
2020-12-02 18:08:50 +01:00
rmagueta
104b8ab21a Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-sib1 2020-12-02 16:28:38 +00:00
rmagueta
f4b20822d4 Fix build warnings 2020-12-02 16:27:20 +00:00
Gokul Srinivasan
4131d7e587 Merge branch 'develop_merge' into 'nfapi_nr_develop'
Merge develop w49 to nfapi_nr_develop

See merge request oai/openairinterface5g!990
2020-12-02 12:20:43 +01:00
Mahesh
e174ebdc30 Resolved merge conflicts with nfapi_nr_develop 2020-12-02 16:28:18 +05:30
Hongzhi Wang
aa3317a009 set less dlsch thread by default 2020-12-02 11:36:57 +01:00
Raphael Defosseux
68e193c6cc [DOCKER] finalize RRU templates
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-12-02 11:25:06 +01:00
Robert Schmidt
ee9268feee Remove second clear_nr_nfapi_information call 2020-12-01 19:36:50 +01:00
Robert Schmidt
1cd46f4dfc Clean up nr_schedule_ulsch() 2020-12-01 19:36:50 +01:00
Robert Schmidt
c0e5a180bc Separate CCE allocation, MCS, RB Alloc in UL sched 2020-12-01 19:36:50 +01:00
Robert Schmidt
5244da263e Clean up select_ul_harq_pid() and nr_schedule_ulsch() 2020-12-01 19:36:50 +01:00
Robert Schmidt
53d8fbf487 Remove schedule_fapi_ul_pdu() 2020-12-01 19:36:50 +01:00
Robert Schmidt
c8e607a18c Create separate nr_schedule_ulsch(), move helper functions 2020-12-01 19:36:50 +01:00
Robert Schmidt
2481075122 Add debug output for nr_rate_matching_ldpc() asserts 2020-12-01 19:36:50 +01:00
Robert Schmidt
75a1562d7f Remove unused (commented) copy_nr_ulreq() 2020-12-01 19:36:50 +01:00
Remi Hardy
dfb110bf80 Integration 2020 wk49
MR968: Bugfix nr ldpc size typo
- fix the copy of the decoded data bytes at the end of the processing of an LDPC segment 
 
MR962: Remove x2 gnb hardcoding
- Removes hardcoding of some x2 configuration parameters used in ENDC setup request message at gNB side  

MR949: rlc v2: change time keeping
- RLC has timers. We need to keep track of time. 
We introduce rlc_tick() and call it in eNB_dlsch_ulsch_scheduler, which is called every subframe, both in FDD and TDD.
2020-12-01 19:35:15 +01:00
Raymond Knopp
d9b7d43ec6 rebase and fix non paralellized errors 2020-12-01 18:26:07 +01:00
Francesco Mani
ecdd7a7f62 taking aggregation level and nr of candidates from config at ue 2020-12-01 16:19:59 +01:00
cig
05d4b9205b Do configuration of DRB UM in RA mode
- do DRB preconfiguration for deafult C-RNTI if !do_ra
- moved redundant configuration code at RLC layer to new RLC functions
2020-12-01 15:10:04 +01:00
cig
76a2a7559c Removed exit call in PDCP PDU handling functions 2020-12-01 15:10:04 +01:00
cig
1a78bd8b1a Replaced information message with assertion in nr_l2_init_ue 2020-12-01 15:10:04 +01:00
cig
8f7b041d7c Cleanup of hardcoded C-RNTI
- Giving C-RNTI as an input to DRB preconfiguration
- Set C-RNTI from UE configuration for higher layer function calls
2020-12-01 15:10:04 +01:00
cig
33bab5ba4a Changes to support DL IP traffic and timing adjustments in do-ra mode:
- enabled procedures that were already called for phy-test mode
- enabled setup of DRB for the current C-RNTI
- enhanced information, debugging and warning logging at MAC/RLC/PDCP level
2020-12-01 15:09:57 +01:00
Raphael Defosseux
2d6fea51b3 Merge remote-tracking branch 'origin/oc-docker-october-improvements' into ci-deploy-docker-compose 2020-12-01 10:09:02 +01:00
yaojie
dfba9dd767 add temporary data for PDUSessionResourceReleaseResponseTransfer 2020-12-01 17:30:47 +09:00
Raphael Defosseux
b29b88380c [CI]: flexran-rtc support when deployed in a container.
-- Not completed for X2 Handover case

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-11-30 22:27:15 +01:00
rmagueta
c8dfaf8eb9 Improvements to decode SIB1 in 3rd party implementations and OAI UE with the same gNB configurations 2020-11-30 19:11:01 +00:00
hardy
92b8b12208 OAI UE Build : use --ninja and change timeout to 1200 2020-11-30 14:04:53 +01:00
Mahesh
190fe54306 Warnings in gNB build resolved 2020-11-30 18:21:19 +05:30
rmagueta
46de16b6e1 Minor updates in LOGs 2020-11-30 12:26:12 +00:00
Francesco Mani
1acf4a68f2 mib ssb in mac structure, prach scheduled accordingly 2020-11-30 12:56:10 +01:00
Sakthivel Velumani
24bf54b2af fixed one more build error 2020-11-30 11:44:31 +01:00
zhenghuangkun
88699deb81 Merge branch fujitsu_lte_contribution into lte_uplink_improvement 2020-11-30 18:56:26 +09:00
hardy
923c5f9d31 Merge remote-tracking branch 'origin/rlc-v2-tick' into integration_2020_wk49 2020-11-30 10:35:24 +01:00
hardy
279a721d23 Merge remote-tracking branch 'origin/remove_x2_gnb_hardcoding' into integration_2020_wk49 2020-11-30 10:34:52 +01:00
hardy
cfdd0b2220 Merge remote-tracking branch 'origin/bugfix-nr-ldpc-size-typo' into integration_2020_wk49 2020-11-30 10:34:27 +01:00
masayuki.harada
20f1d347ac Fix DCI0 aggregation and call ulsch scheduling. 2020-11-30 12:00:23 +09:00
Ding Yumei
a332423d97 fix segmentation fault(mac head error) 2020-11-30 11:30:58 +09:00
Ding Yumei
67da5c7cf3 fix segmentation fault(ccch/dcch length eror) 2020-11-30 11:30:46 +09:00
Ding Yumei
0dd16fb6f5 fix segmentation fault(ul error) 2020-11-30 11:30:32 +09:00
Ding Yumei
1568055310 fix segmentation fault(ul dtch length error) 2020-11-30 11:30:18 +09:00
zhenghuangkun
e64593246b Fix: rfsim abnormal CCCH reception. 2020-11-30 11:29:58 +09:00
zhenghuangkun
6d0ef37c8e Modify DRB_active array size to NB_RB_MAX -2 2020-11-30 11:13:53 +09:00
Haruki NAOI
5db6e75bb1 fix warning. 2020-11-30 11:12:45 +09:00
Haruki NAOI
18becc60fc Fix: rfsim abnormal CCCH reception. 2020-11-30 11:04:03 +09:00
Haruki NAOI
fc595236b3 add logs. 2020-11-30 10:55:39 +09:00
Haruki NAOI
1a320bc6d4 Fix: SNR feedback to PUSCH TPC and PUCCH TPC of default scheduler. 2020-11-30 10:55:19 +09:00
Haruki NAOI
de568b2d88 Change default value of pusch signal power threshold. 2020-11-30 10:45:50 +09:00
masayuki.harada
b54c32b70d Change UL DCI aggregation level by DL cqi.
(cherry picked from commit 175c59ae3aedf612777cd1c8c88b6d6f254b9334)
2020-11-30 10:45:34 +09:00
Raymond Knopp
687d151bfd removal of a warning 2020-11-29 19:42:03 +01:00
Raymond Knopp
4a2a81f311 fixed missing parenthesis in ul_cqi computation 2020-11-29 08:24:35 +01:00
Cedric Roux
f36a1ef93f nr pdcp: use pdcp config
There was a problem with SN size. It was hardcoded to 12 bits (so max
sn = 4095) but we configure the UE with 18 bits. After a while, iperf
didn't work anymore because of this (what a surprise!).

So let's get the correct value from pdcp_Config.

And while we're at it, let's store also discard_timer and t_reordering
that will be used later by a proper NR PDCP layer (which is currently
work in progress).
2020-11-29 07:41:26 +01:00
Raphael Defosseux
329a823d5d CI: fix image build log collection
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-11-28 22:40:29 +01:00
Raphael Defosseux
858a1dc090 [DOCKER] remove log folder (contains the install logs)
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-11-28 22:35:47 +01:00
Raphael Defosseux
4639a59a51 [CI][Docker]: Finalize docker-compose-based EPC deployment
- Fix pcap capture commands
  - added support for FlexRan-RTC and Traffic-Generator

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-11-28 21:24:10 +01:00
rmagueta
548015929e Minor correction 2020-11-28 01:49:00 +00:00
rmagueta
a365bde8da Minor correction: y cannot be zero 2020-11-28 01:32:31 +00:00
Raymond Knopp
0477e881b5 removed most new warnings 2020-11-28 00:11:13 +01:00
Raymond Knopp
18756c35eb demotion of LOG_W to LOG_D 2020-11-27 21:46:22 +01:00
Raymond Knopp
223ed810b2 Merge remote-tracking branch 'origin/develop' into develop-oriecpriupdates 2020-11-27 19:11:05 +01:00
Raymond Knopp
2303a9bcf6 CPPcheck errors + some warnings 2020-11-27 18:54:09 +01:00
rmagueta
a3b633d26c Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-sib1
 Conflicts:
	openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c
	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
2020-11-27 17:37:15 +00:00
Hongzhi Wang
9ef0107a6e bug fix ue parallelization 2020-11-27 17:46:07 +01:00
frtabu
0dcf4ef8f8 remove L2L1 task, parallelisation as config option 2020-11-27 17:37:45 +01:00
Francesco Mani
45da2fd17e fix printf k in csirs 2020-11-27 17:23:32 +01:00
Rahul Gottipati
9ec1bea7b2 Add option for 256 qam mcs table in nr_dlsim 2020-11-27 20:41:27 +05:30
Khodr Saaifan
1488750db1 Fix LDPC ULSCH decoding (CRC NOK) for short LDPC code, e.g. Z_c is not multiple of 8 2020-11-27 15:56:15 +01:00
Parminder Singh
334bf336b7 Updated TBS calculation for multiple DMRS positions in a slot
- TBS calculation was done wothout considering mulilple DMRS symbols in
  a slot, which is corrected now.
2020-11-27 15:56:15 +01:00
Thomas Schlichter
d7d2faa0bf fix cppcheck warning in rrc_gNB_internode.c 2020-11-27 15:56:15 +01:00
Thomas Schlichter
fe89c40052 NR UE: initialize ul_time_alignment structure 2020-11-27 15:56:14 +01:00
Thomas Schlichter
010321e582 NR UE: fix USRP write timestamp when applying new timing_advance value 2020-11-27 15:56:14 +01:00
Raphael Defosseux
6aa126485f [CI][Docker] Building docker images in python framework
- only on Ubuntu and Docker
- No back ground computing to paralellize RHEL/Ubuntu
- No image clean up

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-11-27 15:53:55 +01:00
Khodr Saaifan
4b1d496923 Fix false CRC NOK in LDPC decoding for PDSCH for short code word, e.g. Z_c is not multiple of 8 2020-11-27 15:42:58 +01:00
yoshio.inoue
11000594a9 Correction of description 2020-11-27 22:56:39 +09:00
Sakthivel Velumani
437d893ee5 resolved build error 2020-11-27 14:48:11 +01:00
yoshio.inoue
420396e855 Add documentation on how to use the ITTI simulator 2020-11-27 22:46:18 +09:00
Francesco Mani
8a9e242856 Merge remote-tracking branch 'origin/develop' into NR_FR2_RRC_SSB 2020-11-27 11:33:52 +01:00
Rahul Gottipati
a7229204a9 Added 256 QAM demodulation routines for PDSCH 2020-11-27 14:58:41 +05:30
Robert Schmidt
ed0c12ba19 Avoid useless loop 2020-11-27 10:25:02 +01:00
Robert Schmidt
53b197fd16 Fix: when adding an MME through FlexRAN, set port 2020-11-27 10:25:02 +01:00
Haruki NAOI
39b9ffd69b Add DC removing to signal power measurement. 2020-11-27 17:27:00 +09:00
masayuki.harada
cb927c7f9a Add statistics logs.
(cherry picked from commit cf8f14edf4a261e1df72579423786d39ba6d97f9)
2020-11-27 17:06:11 +09:00
Haruki NAOI
7243b6d67a Avoid Segfault with abnormal MAC header.
(cherry picked from commit 04c5431468c9102dd625a73d9e5219b40b638fe3)
(cherry picked from commit 17880778c848406e562f98c20f7b7a6428502279)
(cherry picked from commit a26f44c197e854dd4261267a3695932392f09265)
2020-11-27 16:26:11 +09:00
Haruki NAOI
deeded689d Fix: guard multiple UL scheduling for same UE.
(cherry picked from commit 57caca9ba87fda3f73aa30d86f4af01a6062224c)
2020-11-27 15:24:26 +09:00
masayuki.harada
6c99c9a255 Fix receive pucch 1a and power adjustment of pucch.
(cherry picked from commit 6d5a40bd826de160ddf55599f61d1359cfba3fa4)
2020-11-27 15:24:07 +09:00
masayuki.harada
7eea980827 Fix sr detection.
(cherry picked from commit 5482843b9a9dfd25abe74afb04a40c117da3bac4)
2020-11-27 15:03:19 +09:00
masayuki.harada
1f54b131b5 Fix pucch functions.
(cherry picked from commit 3bed7dc69db8dc43b28b62553f12834efbca349b)
2020-11-27 14:54:10 +09:00
masayuki.harada
ad4a22fa0f Fix PUCCH noise estimation.
(cherry picked from commit 51634853671e07ef3013bc44ec79fc38c0646147)
2020-11-27 14:45:27 +09:00
masayuki.harada
174069e26e Fix calculation of pucch interference power.
(cherry picked from commit 0622f7d40523e39334708ce4b9b0ee68e8fb2bf1)
2020-11-27 14:33:41 +09:00
masayuki.harada
029c08b9d5 Replace from dB_fixed_times10 function to dB_fixed_x10.
(cherry picked from commit de93d8f0aa9e6d7380bd159901a41aa36f257298)
2020-11-27 14:21:22 +09:00
masayuki.harada
9ad810bab4 Fix ul_cqi and tpc filtering.
(cherry picked from commit 120ea0950e1f52c1c5dd1d0dd4f7080e66d7ee93)
2020-11-27 12:37:09 +09:00
masayuki.harada
fbd0156a8f Add pusch signal threshold to config file.
(cherry picked from commit 6f3d14e74663e75f2eaf3cd1c1348d5d028e3379)
2020-11-27 11:14:09 +09:00
Ding Yumei
548eaae610 fix Msg3 PHICH issue and C-RNTI DRB active issue 2020-11-27 11:12:31 +09:00
zhenghuangkun
df5e22efee Modify CQI timer to 64 subframe 2020-11-27 11:09:56 +09:00
zhenghuangkun
d00297aeb9 Modify UL timer and CQI timer to 64 subframe 2020-11-27 11:04:20 +09:00
Haruki NAOI
6103d9ec55 Fix: calculate signal_power and interference_power per symbol from DMRS. 2020-11-27 10:55:52 +09:00
Haruki NAOI
76998f7d75 Fix: signal_power and interference_power issue from DRS.
SHA-1: 9bb7664a234535b01518977440b3c4f3d14a8ee3
SHA-1: c299d006d833e8ffc6c01039feaeda2e7b1598cc
2020-11-27 10:55:36 +09:00
Kuroiwa Kenichi
80f83843f0 Initialize scheduled_ul_bytes
(cherry picked from commit 4a18e26f8c1dfb80a5af2fac4104b06b648a598c)
2020-11-27 10:55:16 +09:00
Haruki NAOI
7a89100a9f fix compilation. 2020-11-27 10:54:02 +09:00
Kuroiwa Kenichi
934cc715f8 Initialize scheduled_ul_bytes
(cherry picked from commit b0d6c5150db520bd7840d1604c3f82a0b59bc218)
2020-11-27 10:22:48 +09:00
masayuki.harada
4cce76382a Fix assertion in ulsch dem
(cherry picked from commit dcd188e961422194c9c85636ea7c74ca0cc5101d)
2020-11-27 10:10:06 +09:00
Haruki NAOI
179775b72c Temporary: change tpc filter.
(cherry picked from commit d82fc4805ef9032c9bfd9705fef702a6e130f7b2)

# Conflicts:
#	openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
2020-11-27 10:08:27 +09:00
Haruki NAOI
52dfba49cd Fix: smooth ULSCH AMC and TPC control.
(cherry picked from commit 56720c68864f6b04409deb00676e59a41c8f050b)
2020-11-27 10:07:56 +09:00
Haruki NAOI
b573fd4dbd Fix: The remaining UL buffer size is incorrectly calculated and UL scheduling does not occur. (scheduled_ul_bytes is not subtracted correctly when receiving NACK rarely.)
(cherry picked from commit 2fb4823b57320c4c4e4d800ae9bb0570f18ad353)
2020-11-27 09:44:39 +09:00
masayuki.harada
05eb88f068 Fix scheduled_ul_bytes size remain when no crc report has come from L1.
(cherry picked from commit ce10221c2761fb3058ccb77b73ba87f97d5e2cd2)
2020-11-27 09:41:56 +09:00
Raphael Defosseux
9af06d7ec5 [DOCKER] fix in dockerfile, cannot have comment in same line
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-11-26 20:31:36 +01:00
Raphael Defosseux
df33499980 [CI] Added support for docker-compose based deployment for EPC
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-11-26 18:38:38 +01:00
Remi Hardy
6b8eb372c5 Integration 2020 wk48 2
MR945 : nr prach fr2
- Introduction of the PRACH frontend for FR2 (120kHz SCS, 32 and 66 PRB). 
- Tested with nr_prachsim and testcases added to test_case_list.xml also included some fixes for FR1, 
when prach occasion > 0 (small difference in Ncp)

MR950 : DL and UL PTRS for 5G NR

MR971 : Correct NDI + Minor MAC subPDU handling improvements
Fixes the issue : Ping in develop was unusually high (70+ms). The issue was that TA was scheduled in the second slot (of the two we currently schedule), but NDI was toggled for the first one. 
Other improvements:
- Correctly put padding MAC subPDU
- Only use subPDU DLSCH long header if length >= 256B
- Calculate TBS in DL pre-processor considering header and TA CE overhead.
- Improve some of the logging (LOG_D)
- re-enable TA

MR970 : uci gnb mac functions file
- Moved gNB MAC UCI related functions in a new file

MR972 : Bugfix nr rate matching assertion
- Fixes the assertion happening in rate matching of pdsch during iperf test.

MR975 : File openning in rrc_gNB_internal
- Only allow file opening in rrc_gNB-internal.c in phytest mode

MR977 : NR UE DCI sanity checks and fixes
These changes resolve a few stability issues and errors in NR UE
- Added sanity check for pucch_resource_indicator received in DL DCI, which resolves SEGV in select_pucch_resource() and check_pucch_format()
- Additional sanity checks included to catch false or erroneous DCI received
- Wrong MCS table calculation and error in accessing ul_config_request at UE resolved
2020-11-26 17:44:48 +01:00
rmagueta
39ac342cfa Flag --sa added in the softmodem-common to indicate the standalone mode 2020-11-26 16:44:26 +00:00
Francesco Mani
66f957fb48 fix TA scaling at ue 2020-11-26 17:17:27 +01:00
rmagueta
2d5ad4d0b1 Minor updates in the SIB1 content 2020-11-26 16:05:07 +00:00
Raphael Defosseux
f3a6746042 Merge remote-tracking branch 'origin/ci-ul-iperf-from-trf-container' into rh_ci_fix_autoterminate 2020-11-26 12:04:08 +01:00
Raphael Defosseux
29618c5e7a CI: fix autoterminate with multiple servers
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-11-26 12:03:25 +01:00
Cedric Roux
6f9fe2681c rlc v2: add tick for UE 2020-11-26 11:53:22 +01:00
Cedric Roux
2c9d1b9d84 HACK: let the gNB compile again
This is messy, sorry. I don't have time to cleanup
cmake_targets/CMakeLists.txt.
2020-11-26 11:53:22 +01:00
Cedric Roux
25ab3a5ed3 rlc v2: change time keeping
RLC has timers. We need to keep track of time. We chose to not use
realtime but 'processing time'. That is we send a tick to RLC for every
subframe when it is processed by the softmodem. Before this commit we
used to increase time in the function mac_rlc_status_ind which may not be
called every subframe (especially in TDD mode). So we need another way
to keep track of time.

We introduce rlc_tick() and call it in eNB_dlsch_ulsch_scheduler, which
is called every subframe, both in FDD and TDD.

We also call rlc_tick() in the function ru_thread_synch() because
pdcp_run() and rrc_rx_tx() are called there too.

It may not be the best solution. To be revised if needed.

Note: the UE has not been touched. Some modification is needed for the UE
too, most probably.
2020-11-26 11:53:22 +01:00
Remi Hardy
43da900710 extending nsa fr1 test 2020-11-26 11:50:36 +01:00
Haruki NAOI
ffdc67daa4 Add: PUSCH AMC using average BLER.
(cherry picked from commit 1ab0a979fdbcc933ae249838841dc7f61c0e5aba)
2020-11-26 18:44:44 +09:00
Haruki NAOI
55207a5062 Fix: add SNR filter for ULSCH AMC. 2020-11-26 18:28:56 +09:00
Haruki NAOI
66f99a9020 Fix: ULSCH AMC by instantaneous SINR value. 2020-11-26 18:21:13 +09:00
Xue Song
ce3a97080a Modify RRCReconfiguration message 2020-11-26 18:19:59 +09:00
Haruki NAOI
1b61e10af6 fix compilation. 2020-11-26 18:07:21 +09:00
masayuki.harada
04d6de7d58 add variables TPC command interval and forgetting filter of UL SNR. 2020-11-26 18:04:14 +09:00
Haruki NAOI
dbb8a8924e Fix: TPC control with average SNR value.
(cherry picked from commit 243c90f647a1f97dc3a1486502dc6263b5705e39)
2020-11-26 17:57:41 +09:00
Haruki NAOI
2edcf2647c Fix: freq_offset_estimation overflow.
(cherry picked from commit 5e7eb7c94857f5765bb7f18afc7f4c748acb048b)
2020-11-26 17:43:06 +09:00
Haruki NAOI
ce405789d3 Fix: interference power measurement on DRS. 2020-11-26 17:38:56 +09:00
yaojie
59c2b9eb06 fixed warnings and add ie for PDUSessionResourceReleaseCommandTransfer 2020-11-26 15:56:39 +09:00
rmagueta
81d64b3dec Minor corrections 2020-11-26 03:12:59 +00:00
rmagueta
9bbe4f7cd8 Minor corrections 2020-11-25 22:21:24 +00:00
rmagueta
1d8a61f9e5 Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-sib1
 Conflicts:
	openair1/PHY/NR_TRANSPORT/nr_dlsch.c
	openair1/PHY/NR_UE_ESTIMATION/nr_dl_channel_estimation.c
	openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c
	openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
	openair2/RRC/NR/L2_nr_interface.c
	openair2/RRC/NR_UE/rrc_UE.c
	openair2/RRC/NR_UE/rrc_defs.h
2020-11-25 18:17:39 +00:00
hardy
b16d7b2eed Merge remote-tracking branch 'origin/NR_mac_uci_functions_rework' into integration_2020_wk48_2 2020-11-25 18:15:43 +01:00
Francesco Mani
ba40f3c758 fix in sync position at UE and other minor issues 2020-11-25 18:11:33 +01:00
rmagueta
e9109ee9e1 New folder for gNB NR-5GC config files 2020-11-25 16:16:54 +00:00
rmagueta
301fd47406 SIB1: Added more parameters to the message 2020-11-25 16:08:57 +00:00
hardy
2855970763 Merge remote-tracking branch 'origin/NR_UE_stability_fixes' into integration_2020_wk48_2 2020-11-25 12:25:45 +01:00
hardy
08b30babdc Merge remote-tracking branch 'origin/rrc-enb-phy-testmode' into integration_2020_wk48_2 2020-11-25 12:25:08 +01:00
hardy
40085ad064 Merge remote-tracking branch 'origin/nr_dl_ul_ptrs' into integration_2020_wk48_2 2020-11-25 12:23:55 +01:00
Sakthivel Velumani
f9c3ff3ca3 Updated the config files 2020-11-25 11:12:32 +01:00
Xue Song
6e2f63bf1f Add rrc_gNB_process_NGAP_PDUSESSION_RELEASE_COMMAND and rrc_gNB_send_NGAP_PDUSESSION_RELEASE_RESPONSE 2020-11-25 18:55:59 +09:00
yaojie
7034159e8e add sleep between RRCReconfigurationComplete and RegistrationComplete 2020-11-25 10:52:06 +09:00
Shweta Shrivastava
e8b7dc8454 Fix error 2020-11-24 15:23:34 -06:00
Shweta Shrivastava
17b8ff50f8 Minor edits for consistency and clarity 2020-11-24 14:53:08 -06:00
Thomas Schlichter
6803e78ceb Merge remote-tracking branch 'develop'
Conflicts:
	openair1/PHY/NR_TRANSPORT/nr_dlsch.c
	openair1/PHY/NR_UE_ESTIMATION/nr_dl_channel_estimation.c
	openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c
	openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
	openair2/RRC/NR/nr_rrc_proto.h
2020-11-24 16:58:58 +01:00
hardy
25391056c4 Merge remote-tracking branch 'origin/bugfix-nr-rate-matching-assertion' into integration_2020_wk48_2 2020-11-24 15:28:03 +01:00
hardy
11eeafd328 Merge remote-tracking branch 'origin/repair-TA' into integration_2020_wk48_2 2020-11-24 15:27:21 +01:00
hardy
865888b3d8 Merge remote-tracking branch 'origin/nr_prach_fr2' into integration_2020_wk48_2 2020-11-24 15:26:59 +01:00
Sakthivel Velumani
80ea03931c Added no of thread to config file
The thread count would me minimum of (no of cores in the machine) or (parameter mentioned in config file)
2020-11-24 15:07:07 +01:00
Navid Nikaein
a1d901277e Check if the file is openned first 2020-11-24 14:28:17 +01:00
Mahesh
bec8fad14c resolved build errors after merge 2020-11-24 18:56:20 +05:30
Mahesh
56db8f4915 RESOLVED build errors 2020-11-24 18:49:41 +05:30
wu.jing
0fdc671177 fix merge problems in ittisim 2020-11-24 10:44:09 +00:00
wu.jing
c994c2ad8f Merge branch 'develop_SA_SIM' into develop_SA_L3
Conflicts:
	common/utils/ocp_itti/intertask_interface.h
	openair2/COMMON/gtpv1_u_messages_types.h
	openair2/GNB_APP/gnb_config.c
	openair2/RRC/NR/MESSAGES/asn1_msg.c
	openair2/RRC/NR/nr_rrc_proto.h
	openair2/RRC/NR/rrc_gNB.c
	openair2/RRC/NR/rrc_gNB_NGAP.c
	openair2/RRC/NR_UE/rrc_UE.c
	openair3/NAS/NR_UE/nr_nas_msg_sim.h
	openair3/NGAP/ngap_gNB_nas_procedures.c
2020-11-24 09:15:52 +00:00
Francesco Mani
d5af323ab2 taking into account sl_ahead when scheduling msg2 2020-11-24 09:08:20 +01:00
yaojie
716e16151a fixed the problem of pdu-session replace e-rab 2020-11-24 16:56:47 +09:00
Shweta Shrivastava
06f55552fe Fix small error 2020-11-24 01:04:46 -06:00
Shweta Shrivastava
a6e15d4436 Fix TransformPrecoding values to be consistent with FAPI spec 2020-11-24 00:59:08 -06:00
Shweta Shrivastava
683ff6eb39 DCI sanity checks for MCS and frequency domain assignment 2020-11-24 00:53:25 -06:00
Shweta Shrivastava
9ff55751ee DCI sanity check for pucch_resource_indicator value 2020-11-24 00:42:14 -06:00
wu.jing
2473722717 fix ittisim build error after merge 2020-11-24 14:06:51 +08:00
wu.jing
f3d51a58fb Merge branch 'develop_SA_RRC' into develop_SA_SIM
Conflicts:
	common/utils/ocp_itti/intertask_interface.h
	openair2/RRC/NR/rrc_gNB.c
	openair2/RRC/NR/rrc_gNB_NGAP.c
	openair2/RRC/NR_UE/rrc_UE.c
	openair2/RRC/NR_UE/rrc_defs.h
	openair3/NGAP/ngap_gNB_nas_procedures.c
2020-11-24 05:15:06 +00:00
wu.jing
d987c0919f Merge branch 'master' into develop_SA_L3 2020-11-24 04:57:19 +00:00
Xue Song
598eeb79d4 Derive keys from kgnb 2020-11-24 11:58:33 +09:00
rmagueta
c02287171a File configuration for the SA. 2020-11-23 23:39:18 +00:00
Remi Hardy
2529c20bff Integration 2020 wk48
MR932 : Nr sa ngap rrc wk42 
- Initial implementation of NGAP and RRC extensions for SA
 
MR956 : Correct use of ssb_position bitmaps  

MR958 : 5G NR Downlink DMRS Type 2
- Implementation of 5G NR Downlink DMRS type 2 (generation on gNB side, channel estimation with linear interpolation in frequency domain on UE side), needed for MIMO
  
MR961 : 5G NR UE TTI cleanup  
- Remove current_thread_id array, nr_tti_rx, nr_tti_tx, subframe_rx and subframe_tx

MR965 : fix a segdev
2020-11-23 22:12:10 +01:00
Francesco Mani
a5d45a2c19 indentation in gNB MAC rach functions 2020-11-23 19:19:48 +01:00
Francesco Mani
9e7c66d2c8 indentation in phy_procedures ue 2020-11-23 18:17:53 +01:00
Francesco Mani
31bcd10cea Merge branch 'NR_FR2_RRC_SSB' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_FR2_RRC_SSB 2020-11-23 18:16:41 +01:00
Francesco Mani
3e1959c8dd increase size of RA window definition for fr2 2020-11-23 18:16:34 +01:00
Francesco Mani
0075aefe31 fix in mac ue mib procedures 2020-11-23 17:58:56 +01:00
Hongzhi Wang
ee949c97f4 timing drift fix for FR2 2020-11-23 17:57:24 +01:00
Sakthivel Velumani
f55a4dd8e0 Remove hard-coding of no of threads
Script added to set the no of threads according to run-time conditions of the machine.
2020-11-23 16:45:59 +01:00
Raphael Defosseux
e9b6d0705d [docker] adding entrypoint and template generation to dockerfile for u18
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-11-23 16:31:45 +01:00
Francesco Mani
c5b7a3a441 fix scheduling msg2 2020-11-23 16:08:01 +01:00
yaojie
ac9028110d add NGAP_UERadioCapabilityInfoIndication 2020-11-23 17:40:42 +09:00
Florian Kaltenberger
9d71921859 fixing in UE processing of coreset_freq_dom 2020-11-23 08:55:26 +01:00
yaojie
2ed816d98c fix the task name of itti_alloc_new_message 2020-11-23 14:37:59 +09:00
Florian Kaltenberger
bf62f2bcce fixing FR2 arfcn 2020-11-22 21:40:36 +01:00
Raymond Knopp
7955cb4f8e tested IF4p5 on asterix/obelix (100 PRB via 1 Gbit/s) 2020-11-22 10:10:12 +01:00
Raymond Knopp
f0320ea0e2 testing of RCC 2020-11-21 14:06:24 +01:00
Eurecom
7a538b09d5 testing legacy RRU 2020-11-21 11:34:25 +01:00
Francesco Mani
fbdcba9fa4 bugfix in dci_nr 2020-11-21 11:12:11 +01:00
Francesco Mani
3efb077357 24 RB option in uesoftmodem 2020-11-21 11:11:28 +01:00
rmagueta
93d93c81dd Minor correction in the fill_dmrs_mask() function 2020-11-20 19:19:20 +00:00
Florian Kaltenberger
d1809c05d7 changing SSB bitmap to not transmit SSB in slot 1 where it conflicts with PDSCH 2020-11-20 16:52:44 +01:00
Florian Kaltenberger
18e6a4a8fc changing PUCCH RB allocation 2020-11-20 16:52:06 +01:00
Florian Kaltenberger
0816a98dfd fixing a small bug 2020-11-20 16:51:48 +01:00
Francesco Mani
1ebc9a64e0 uci mac functions in a new file 2020-11-20 15:29:37 +01:00
Eurecom
f7811624b3 regular eNB with usrp seems ok 2020-11-20 14:32:24 +01:00
Florian Kaltenberger
e3b3fa82b8 Merge branch 'NR_FR2_RRC_SSB' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_FR2_RRC_SSB 2020-11-20 14:13:54 +01:00
Raymond Knopp
a627d9c2a3 preparing merge, fixing issues inflicted on usrp radios after IF5 modifications 2020-11-20 14:02:51 +01:00
Sakthivel Velumani
0aa14f183e Editing an error message 2020-11-20 13:39:54 +01:00
Sakthivel Velumani
70e4bfda18 Storing Z inside harq_process structure
The LDPC lifting size has to be stored for each harq_process as its only assigned in the first round.
2020-11-20 13:37:34 +01:00
hardy
708f34eeec fixing auto-terminate function to kill all RAN nodes 2020-11-20 11:59:40 +01:00
Francesco Mani
82c4380a4e uci mac functions in a new file 2020-11-20 10:22:10 +01:00
Robert Schmidt
d116c60831 Improve DLSCH MAC scheduling logging 2020-11-20 09:54:38 +01:00
Robert Schmidt
e6bb685b5d re-enable TA 2020-11-20 09:54:34 +01:00
Robert Schmidt
bc088c975b Account for OH in preprocessor 2020-11-20 09:54:34 +01:00
Robert Schmidt
d89716541f Fix: Always place padding subPDU if space permits 2020-11-20 09:54:37 +01:00
Robert Schmidt
d245f7b958 Fix: Use DL-SCH long subheader when L >= 256 2020-11-20 09:54:34 +01:00
Robert Schmidt
3ff26c8f84 Fix: Reset HARQ feedback slot
If we schedule in a second slot, this ensures that the correct HARQ
process' NDI is toggled.
2020-11-20 09:52:42 +01:00
Florian Kaltenberger
fd9dbad966 Merge branch 'develop' into 'nr_prach_fr2' 2020-11-20 08:47:34 +01:00
yaojie
9d579b7a47 fix errors and warnings 2020-11-20 14:39:45 +09:00
Thomas Schlichter
291c94d34c Merge remote-tracking branch 'origin/nr_ue_tti_cleanup' into integration_2020_wk48
Conflicts:
	openair1/PHY/NR_UE_TRANSPORT/dci_nr.c
	openair1/PHY/NR_UE_TRANSPORT/nr_transport_proto_ue.h
	openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
2020-11-19 18:42:30 +01:00
Raymond Knopp
47a7186621 Merge remote-tracking branch 'origin/develop' into develop-oriecpriupdates 2020-11-19 18:35:52 +01:00
Mahesh
87105d77cf Merged latest develop to nfapi 2020-11-19 22:33:39 +05:30
Mahesh K
556d0045c8 Merge branch 'fork_develop_new' into 'nfapi_nr_merge'
Fork develop new

See merge request Aniq/openairinterface5g!6
2020-11-19 17:59:15 +01:00
Francesco Mani
6213307061 fix indentation in nr_prach 2020-11-19 17:11:54 +01:00
Florian Kaltenberger
53d5189073 Merge remote-tracking branch 'origin/develop' into NR_FAPI_beamindex_SSB_RO 2020-11-19 16:26:42 +01:00
Florian Kaltenberger
4b82bbf346 Update nr_prach.c 2020-11-19 16:15:11 +01:00
Florian Kaltenberger
f99643a67b Update prachsim.c 2020-11-19 16:13:09 +01:00
Aniq Ur Rahman
c391b6b16b Update .gitignore, CONTRIBUTING.md, ci-scripts/args_parse.py, ci-scripts/.gitignore, NOTICE.md, ci-scripts/Jenkinsfile-gitlab, ci-scripts/checkCodingFormattingRules.sh, ci-scripts/checkAddedWarnings.sh files 2020-11-19 16:10:36 +01:00
Florian Kaltenberger
ad2e0ebe2d Update test_case_list.xml 2020-11-19 16:10:16 +01:00
Aniq Ur Rahman
7c110d7745 Update .gitignore 2020-11-19 16:01:39 +01:00
Cedric Roux
3889336f98 fix a nasty typo 2020-11-19 15:59:47 +01:00
Florian Kaltenberger
bba103dc2d some fixes - prachsim working now for FR2 - added testcases 2020-11-19 15:57:09 +01:00
Florian Kaltenberger
8ac98d553f first version of PRACH for FR2. to be tested 2020-11-19 15:56:56 +01:00
Hongzhi Wang
8ab6b41a27 Merge branch 'NR_FR2_RRC_SSB' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_FR2_RRC_SSB 2020-11-19 15:36:07 +01:00
Hongzhi Wang
88a6a92c31 bug fix adjust sync 2020-11-19 15:34:48 +01:00
Francesco Mani
de6650f023 modifications in RRC for lower number of RBs 2020-11-19 15:25:31 +01:00
rmagueta
f86437c519 Minor correction of rnti_type in the fapi_nr_ue_l1 2020-11-19 14:16:22 +00:00
hardy
4c3ee5f0e0 Merge remote-tracking branch 'origin/fix-itti-segv' into integration_2020_wk48 2020-11-19 14:59:39 +01:00
hardy
e097bec73e Merge remote-tracking branch 'origin/nr_dl_dmrs_type2' into integration_2020_wk48 2020-11-19 14:58:54 +01:00
hardy
b57ef17b1c Merge remote-tracking branch 'origin/bch-fixes-bitmap' into integration_2020_wk48 2020-11-19 14:58:02 +01:00
hardy
a0d58f224c Merge remote-tracking branch 'origin/NR_SA_NGAP_RRC_wk42' into integration_2020_wk48 2020-11-19 14:57:08 +01:00
Remi Hardy
40141270e3 Integration 2020 wk47
MR939 : Nr rlc am bugfix w44 
- bugfix

MR948 : nr: rlc: hotfix - forgot to store frame and subfram  
- minor bugfix

MR942 : Feature/make s1 mme port configurable 
- This patch adds an optional "port" option to set another sctp port than 36412 

MR959 : minor: remove a CPPCHECK error for NR RLC
- remove a CPPCHECK error (not a real error) for NR RLC
2020-11-19 13:13:03 +01:00
rmagueta
479019a70f Minor correction in the gNB_scheduler 2020-11-19 11:06:54 +00:00
rmagueta
252a9151cd Merge branch 'develop-sib1' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-sib1
 Conflicts:
	ci-scripts/conf_files/gnb.band78.tm1.106PRB.usrpn300.conf
	openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
	openair2/LAYER2/NR_MAC_gNB/mac_proto.h
	openair2/RRC/NR/rrc_gNB_reconfig.c
	openair2/RRC/NR_UE/rrc_defs.h
2020-11-19 10:55:17 +00:00
rmagueta
4d290f71cf Minor correction in the gNB_scheduler 2020-11-19 10:53:08 +00:00
rmagueta
3b9bdfc7d4 Minor corrections 2020-11-19 10:18:09 +00:00
rmagueta
749d6af42e Merge develop-sib1 into this branch 2020-11-19 02:22:47 +00:00
Francesco Mani
0e298d8777 variable name change in nr_dlsch 2020-11-18 18:08:41 +01:00
Francesco Mani
78e0af5893 adding 10MHz option (values to be verified) 2020-11-18 17:45:05 +01:00
Francesco Mani
6a0ec688c9 modifications in RRC for lower number of RBs 2020-11-18 17:29:24 +01:00
Francesco Mani
450f98228a 10 MHz USRP n300 config file 2020-11-18 17:21:30 +01:00
rmagueta
b97e1b578b Merge develop into this branch 2020-11-18 13:06:08 +00:00
rmagueta
f184239f10 Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-sib1
 Conflicts:
	openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
	openair2/LAYER2/NR_MAC_gNB/mac_proto.h
	openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
	openair2/RRC/NR/L2_nr_interface.c
	openair2/RRC/NR/MESSAGES/asn1_msg.c
	openair2/RRC/NR/rrc_gNB.c
2020-11-18 11:57:46 +00:00
rmagueta
ee516a07c8 Add TDDIndex 4 in config file. 2020-11-18 11:28:37 +00:00
Mahesh
41438a1968 PDSCH decoded at UE 2020-11-18 16:13:42 +05:30
Raymond Knopp
98a96115c7 testing with AW2S RRU. 2020-11-18 10:50:03 +01:00
Thomas Schlichter
f41502cd19 fix compile warnings introduced by merge with develop 2020-11-18 10:38:15 +01:00
Thomas Schlichter
b06c7af345 NR UE: fix tti issues introduced by merge with develop 2020-11-18 10:38:04 +01:00
Thomas Schlichter
e059eeabc8 Merge remote-tracking branch 'develop' 2020-11-18 10:37:20 +01:00
yaojie
f8f489ec22 add NGAP UE CONTEXT RELEASE MESSAGE 2020-11-18 18:33:58 +09:00
Laurent
a592d0eb6f fix warnings 2020-11-18 08:53:02 +01:00
yaojie
959681424c fix some errors and warnings. 2020-11-18 03:12:59 +00:00
Laurent
7dd1d45626 Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into fix-itti-segv 2020-11-17 15:46:47 +01:00
Laurent
614152b1b3 fix a segv 2020-11-17 15:44:11 +01:00
Francesco Mani
fa35662044 10 MHz config file 2020-11-17 14:10:10 +01:00
masayuki.harada
be31d514b4 Fix warning and compile error. 2020-11-17 22:09:41 +09:00
Florian Kaltenberger
e595ec0d8d Merge remote-tracking branch 'origin/develop' into NR_FR2_RRC_SSB 2020-11-17 13:57:51 +01:00
hardy
d9c0a13fc5 Merge remote-tracking branch 'origin/hotfix-minor-remove-nr-rlc-cppcheck-error' into integration_2020_wk47 2020-11-17 13:54:30 +01:00
hardy
fcd00c2af0 Merge remote-tracking branch 'origin/hotfix-nr-rlc-tick' into integration_2020_wk47 2020-11-17 13:53:44 +01:00
hardy
02594fea3b Merge remote-tracking branch 'origin/feature/make-s1-mme-port-configurable' into integration_2020_wk47 2020-11-17 13:53:10 +01:00
hardy
9d58ead40f Merge remote-tracking branch 'origin/nr-rlc-am-bugfix-w44' into integration_2020_wk47 2020-11-17 13:51:46 +01:00
Xue Song
e524cd9482 Add rrc_gNB_process_NGAP_PDUSESSION_SETUP_REQ
Add rrc_gNB_send_NGAP_PDUSESSION_SETUP_RESP
Fix some problems about pdu session setup
2020-11-17 19:03:55 +09:00
zhenghuangkun
5cbffcc3c4 Fix ITTI build error 2020-11-17 09:03:06 +00:00
Remi Hardy
8f03a80a36 Integration 2020 wk46 2
MR890 : moving the OFDM phase rotation from RU to DU  
Moves the recently introduced phase rotations from RU to DU. 
This is important for setups that do not use the monolithic mode (like Benetel RRU).

MR944 : fix pdsch low prb 
Fix for DLSCH decoding for low TBS and for ULSCH. 
In the UE, DLSCH decoding stats are printed periodically for every 64 frames. 
DLSCH decoding is skipped if UE receives retransmission for successfully decoded CW.
 
MR946 : S1ap bugfix rab setup  
Fix a bug in S1AP

MR951 : CI NSA FR1 logging and reporting update  
Enhancement of gNB html + log report showing (RAPROC PUSCH check, dlsch and ulsch statistics)

M954 : Mac fixes wk45 2
Hotfix: preserves "low" delay (20-30ms) and correct HARQ retransmissions by disabling timing advance (TA)
Reduces log level, compiler warning, correct TA condition
2020-11-17 09:14:05 +01:00
matzakos
d36879e4ce Add support for more nrNRB configurations in X2 ENDC setup request message 2020-11-16 15:19:39 +01:00
matzakos
f26f096f5e Remove redundant debugging logs 2020-11-16 15:19:39 +01:00
matzakos
0a60085d87 Increase size of array storing PDCP PDU to be aligned with the expected size 2020-11-16 15:19:39 +01:00
matzakos
39f057f11c Remove non-mandatory SULFreqBandItem from X2 ENDC Setup Request message 2020-11-16 15:19:39 +01:00
matzakos
648ef92ac7 Remove hardcoding of x2 configuration parameters used in ENDC setup request message at gNB side 2020-11-16 15:19:39 +01:00
Francesco Mani
b05bfa04db fix segmentation fault in csi-rs 2020-11-16 14:18:43 +01:00
Thomas Schlichter
c4448a2f24 fix warnings and indentation 2020-11-16 13:40:45 +01:00
Raphael Defosseux
152f73458d [DOCKER] fixes after review
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-11-16 13:32:44 +01:00
Mohammed Ismail
da5a034e2b updated
Signed-off-by: Mohammed Ismail <mohammed.ismail@eurecom.fr>
2020-11-16 13:32:44 +01:00
Mohammed Ismail
a9a334f294 updated: Python scripts to generate eNB's templates for container images
Signed-off-by: Mohammed Ismail <mohammed.ismail@eurecom.fr>
2020-11-16 13:32:44 +01:00
Raphael Defosseux
abf2693b38 [OC][docker][build] support for new RHEL8.3 version
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-11-16 13:32:44 +01:00
Mohammed Ismail
af1495f124 script for config files generation
Signed-off-by: Mohammed Ismail <mohammed.ismail@eurecom.fr>
2020-11-16 13:32:44 +01:00
Raphael Defosseux
524354aebc OC: fix typos
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-11-16 13:32:44 +01:00
Mohammed Ismail
d4d0776774 sctp_event_subscribe updated
Signed-off-by: Mohammed Ismail <mohammed.ismail@eurecom.fr>
2020-11-16 13:32:44 +01:00
Raphael Defosseux
86c1ba3c19 CI: fix UL iperf from TRF container
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-11-16 13:11:37 +01:00
Cedric Roux
7b48f89496 minor: remove a CPPCHECK error for NR RLC
This "error" is not a real error.
openair2/LAYER2/nr_rlc/tests/test.c includes testXX.h to define the array
int test[] and by design test[2] always exists.

Let's simply suppress the reporting of this error.
2020-11-16 10:25:58 +01:00
Parminder Singh
6c2fbb361d Merge remote-tracking branch 'origin/develop' into fhg_shp_phase_noise_est 2020-11-16 09:47:46 +01:00
Thomas Schlichter
9f841634b5 Merge remote-tracking branch 'develop' 2020-11-16 09:40:06 +01:00
masayuki.harada
e3d3c6e418 Merge branch 'NR_SA_NGAP_RRC_wk42' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_SA_NGAP_RRC_wk42 2020-11-16 13:59:33 +09:00
rmagueta
2177e83ca7 Coreset0 / SIB1 configured using the computed BWP considering the 3GPP. 2020-11-14 23:53:23 +00:00
rmagueta
461406ab01 Coreset0 / SIB1 configured using the configuration file. 2020-11-14 14:51:32 +00:00
rmagueta
aa676235a3 Minor fixes on used BWP of coreset0. 2020-11-13 18:56:32 +00:00
Thomas Schlichter
47ce347d7e NR UE cleanup: remove current_thread_id array, nr_tti_rx, nr_tti_tx, subframe_rx and subframe_tx 2020-11-13 17:29:02 +01:00
hardy
63277ad3de Merge remote-tracking branch 'origin/mac-fixes-wk45_2' into integration_2020_wk46_2 2020-11-13 13:26:15 +01:00
hardy
1bb68b6f66 Merge remote-tracking branch 'origin/rh_ci_fr1_update' into integration_2020_wk46_2 2020-11-13 13:25:40 +01:00
hardy
f267efbe5a Merge remote-tracking branch 'origin/s1ap-bugfix-rab_setup' into integration_2020_wk46_2 2020-11-13 13:23:18 +01:00
hardy
12e0f738b7 Merge remote-tracking branch 'origin/fix_pdsch_low_prb' into integration_2020_wk46_2 2020-11-13 13:22:39 +01:00
hardy
4b3a67b3a7 Merge remote-tracking branch 'origin/benetel_phase_rotation' into integration_2020_wk46_2 2020-11-13 13:21:42 +01:00
rmagueta
17312d685f Minor fixes on used BWP. 2020-11-13 12:07:53 +00:00
Sakthivel Velumani
cc2cc95f02 Merge branch 'develop' into fix_pdsch_low_prb 2020-11-13 11:56:36 +01:00
Remi Hardy
b452218383 Integration 2020 wk46
MR936: nr_fdd_if_fix
- Add support for 5G NR FDD bands and introduce configurable IF frequencies (esp. on nrUE) with configurable UL-DL-frequency offset. 
 
MR940: dongzhanyi-zte-develop2  
- Solved the problem that UE UL LDPC code can only process data within 8 code blocks (the UE UL LDPC code could only process data within 8 code blocks. If there were more than 8 code blocks, an error would occur)

MR943: NR_UE_MAC_scheduler
- Dynamic calculation of slot for PUSCH transmission based on slot offset k2. PUSCH slot is no longer hard-coded to 8.
- Support for multiple UL allocations in a frame by supporting a ul_config_request per UL slot.
- Support for multiple PDUs per slot
- Fixes for a few UE crashes/assertion failures due to invalid DCI received
- UE scheduler code clean-up
2020-11-13 11:12:30 +01:00
yincong
c208bffa3a add OAI license 2020-11-13 16:11:41 +08:00
zhenghuangkun@cn.fujitsu.com
f64bba177a Modify SA source code 2020-11-13 07:37:22 +00:00
Parminder Singh
4fe5986845 Corrected conditional statement wrt OAI Formatting Rules 2020-11-12 19:29:10 +01:00
Florian Kaltenberger
ec060cbc62 fixing the filling of the ssb_mask_list (hopefully) for long bitmap (FR2) 2020-11-12 19:02:14 +01:00
Florian Kaltenberger
4e9c155464 Merge branch 'NR_FR2_RRC_SSB' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_FR2_RRC_SSB 2020-11-12 14:31:28 +01:00
rmagueta
1daaa7c6a3 BWP fixes 2020-11-12 09:59:37 +00:00
Robert Schmidt
65c7ab092a Correct use of ssb_position bitmaps 2020-11-12 10:45:13 +01:00
Remi Hardy
0ea4378bd8 fixing reporting appearance 2020-11-12 10:40:16 +01:00
Francesco Mani
471c8eb8e1 bugfix for long ssb bitmap in fix scc 2020-11-12 10:20:49 +01:00
hardy
e7b2c47348 Merge remote-tracking branch 'origin/nr_fdd_if_fix' into integration_2020_wk46 2020-11-12 09:27:00 +01:00
He Shanyun
d1a055ff70 implement pdusession establishment request 2020-11-12 03:06:10 +00:00
Florian Kaltenberger
87a8a94ae9 temporarily enabling beamforming also for FR1 + some logs (revert this commit before MR) 2020-11-11 22:07:06 +01:00
Florian Kaltenberger
4c6a9fa82e some fixes 2020-11-11 22:06:45 +01:00
Robert Schmidt
fe6f7244df Fix compiler warning: %ld in printf 2020-11-11 16:48:53 +01:00
Robert Schmidt
308de3b68d Lower PHY/HARQ log level 2020-11-11 16:48:40 +01:00
Robert Schmidt
67d6311143 Hotfix: disable TA to keep RTT low + HARQ retx intact 2020-11-11 16:47:18 +01:00
Robert Schmidt
434186fd9f Correct TA timer condition
- wrap around 1024 (frame number is 0-1023)
- check for equality of frames with high numbers will trigger every 10ms
2020-11-11 16:45:54 +01:00
Florian Kaltenberger
781ec26cf2 also fixing PRACH issue in UE + config files 2020-11-11 15:38:21 +01:00
Francesco Mani
ef486e8f59 bugfix in csi meas reporting 2020-11-11 14:21:53 +01:00
Francesco Mani
39e33016c9 Merge branch 'NR_FR2_RRC_SSB' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_FR2_RRC_SSB 2020-11-11 14:21:27 +01:00
Florian Kaltenberger
7109841f07 Merge remote-tracking branch 'origin/nr_prach_fr2' into NR_FR2_RRC_SSB 2020-11-11 14:06:51 +01:00
Mahesh
e6bf90e2dd LTE and NR NFAPI integration 2020-11-11 15:10:32 +05:30
Khodr Saaifan
89b102c8cc Enable dmrs config1 for pdsch and clean the code 2020-11-11 10:29:48 +01:00
Khodr Saaifan
1ca324e595 Enable DMRS config2 for PDSCH and fix bug in the UE phy_procedures_nr_ue 2020-11-11 09:36:59 +01:00
Francesco Mani
671167572e Merge remote-tracking branch 'origin/nr_prach_fr2' into NR_FR2_RRC_SSB 2020-11-11 07:31:37 +01:00
rmagueta
11cb336dcc Correction of the offset and number of RBs of coreset0. Using the interleaver. 2020-11-11 04:49:19 +00:00
Florian Kaltenberger
ed97e21649 fixing prach config for FR2 2020-11-10 21:53:02 +01:00
Florian Kaltenberger
174372ede0 Merge remote-tracking branch 'origin/develop' into NR_FAPI_beamindex_SSB_RO 2020-11-10 21:46:52 +01:00
Thomas Schlichter
f2502eebab fix some compile warnings 2020-11-10 21:10:55 +01:00
Frédéric Leroy
06aefa589f fix(build_helper): fix superfluous $ in protobuf extraction command 2020-11-10 20:39:21 +01:00
Thomas Schlichter
55717204dc cleanup: remove TTI related parameters from NR_DL_FRAME_PARMS 2020-11-10 19:19:51 +01:00
Francesco Mani
b1bffcee81 extend bitmap for SSB in RRC to FR2 2020-11-10 19:03:29 +01:00
hardy
536125c356 Merge remote-tracking branch 'origin/dongzhanyi-zte-develop2' into integration_2020_wk46 2020-11-10 17:24:40 +01:00
hardy
e9fff748c6 Merge remote-tracking branch 'origin/NR_UE_MAC_scheduler' into integration_2020_wk46 2020-11-10 17:23:36 +01:00
Remi Hardy
a452f74f0d bug fix 2020-11-10 17:14:57 +01:00
Remi Hardy
4353880dbd gNB html + log update for nsa fr1 ok 2020-11-10 16:53:01 +01:00
Francesco Mani
f7827a1d2b fix for dword length in csi rs 2020-11-10 16:39:41 +01:00
Thomas Schlichter
b402026aef Add DL PTRS test cases to CI 2020-11-10 14:30:42 +01:00
Francesco Mani
ef4adce1e5 using cell id as scrambling id for csi-rs 2020-11-10 14:14:44 +01:00
cig
122e18d088 Common function to check the frequency channel raster 2020-11-10 10:52:44 +01:00
Parminder Singh
841ddaf9f8 Corrected data type for printf to remove warning in nr-softmodem
- In gNB_scheduler int is updated to long int to avoid warnings for
printf
2020-11-10 10:50:27 +01:00
cig
7e1ac1fa49 Merge remote-tracking branch 'origin/develop' into fhg-fdd-custom-if 2020-11-10 10:41:10 +01:00
Sakthivel Velumani
f36f724b04 The same BG related updates are added to UL 2020-11-09 23:44:55 +01:00
Sakthivel Velumani
4c8ec44678 Updated the stats message 2020-11-09 23:39:09 +01:00
Francesco Mani
e7a3cb295e uint in corr for pucch rx 2020-11-09 18:13:35 +01:00
Remi Hardy
789e48fcd2 debug 2020-11-09 17:50:34 +01:00
Parminder Singh
b0ee3bb206 Correction for first OFDM symbol estimation and compensation
- Direct multiply with the conjugate of the estimation for compensation
2020-11-09 17:25:00 +01:00
hardy
9d3304059a for debug 2020-11-09 16:51:58 +01:00
matzakos
7772a51c07 Merge remote-tracking branch 'origin/develop' into NR_SA_NGAP_RRC_wk42
Conflicts:
	openair2/RRC/NR/MESSAGES/asn1_msg.c
	openair2/RRC/NR/nr_rrc_proto.h
	targets/COMMON/create_nr_tasks.c
2020-11-09 15:52:52 +01:00
hardy
e8aeccad9f fix typo 2020-11-09 15:45:09 +01:00
Frédéric Leroy
89f7132685 fix(config): set S1AP_PORT_NUMBER as default value for mme port 2020-11-09 15:43:01 +01:00
Frédéric Leroy
78fa6df3a4 feat: add "port" parameter on configuration files
Use default port 36412 for S1
2020-11-09 15:15:46 +01:00
hardy
7ce5aaa136 adding dlsch and ulsch statistics 2020-11-09 15:13:56 +01:00
Frédéric Leroy
6338831315 feat(build_helper): use 'id' command instead $USER variable
When $USER is not set (Yes we did !), extracting protobuf fails.
Wh avoid this by using the 'id' command both to get user and group ids.
2020-11-09 14:55:02 +01:00
hardy
7878e102e0 improving markers for NSA FR1 test 2020-11-09 14:33:59 +01:00
Florian Kaltenberger
6e1ad6e93b Merge remote-tracking branch 'origin/develop' into benetel_phase_rotation 2020-11-09 13:58:41 +01:00
Sakthivel Velumani
c61b47dc96 Revert "Enabled ACK/NACK logs for CI"
This reverts commit 199ce5d953ed90e052a69f520b30b7253b163250.
2020-11-09 12:24:10 +01:00
Sakthivel Velumani
a57136697f Skip decoding for false retransmission
If UE receives retransmission for already decoded PDSCH, it skips decoding and sets ACK directly.
And adding PDSCH decoding stats and printing then every 64 frames for CI purpose
2020-11-09 12:24:10 +01:00
Sakthivel Velumani
2f76924671 Enabled ACK/NACK logs for CI 2020-11-09 12:19:41 +01:00
Sakthivel Velumani
66323e0b1d BG selection bug fix
The BG was set to its default for rounds > 0. This is now fixed by adding it to harq structure.
Also a fix for wrong I_lbrm set in dlsch decoding.
2020-11-09 12:19:41 +01:00
Xue Song
9bba3c795a Fix GTPU's IP setting error 2020-11-09 18:04:56 +09:00
Xue Song
04897ab64f Fix GTPU's IP setting error 2020-11-09 08:32:57 +00:00
Parminder Singh
443f1817e5 Merge remote-tracking branch 'origin/develop' into fhg_shp_phase_noise_est 2020-11-08 18:47:29 +01:00
Florian Kaltenberger
6056de78b3 fixing dependency in CMakeLists.txt 2020-11-08 17:02:40 +01:00
Mahesh
643fc632d6 PBCH working 2020-11-06 19:48:34 +05:30
Parminder Singh
910c1860f0 DMRS estimation default value is moved outside slot processing
- in PTRS processing the default value for DMRS is set outside slot
   processing.
2020-11-06 14:26:25 +01:00
Parminder Singh
03db617c38 Remove TX-GAIN multiplication with transmitted signal in ULSIM
- Removed tx_gain calculations and multiplication with tx signal
- Updated sigma value calculations and removed unused variables
- Re-indent the related code for better readability
2020-11-06 12:12:43 +01:00
Cedric Roux
8fee453c8e nr: rlc: hotfix - forgot to store frame and subframe... 2020-11-06 11:36:57 +01:00
yaojie
bce573e64e fix process NGAP_INITIAL_CONTEXT_SETUP_REQ 2020-11-06 10:36:56 +00:00
Remi Hardy
3d60e95387 Merge branch 'integration_2020_wk45_2' into 'develop'
Integration 2020 wk45 (2) comprising:

MR937:Nr dl sched fixes  
-restore old phytest scheduler behavior
-correct TA scheduling
-correct SSB
-shorten interface of `nr_fill_nfapi_dl_pdu()`
-Track RB allocation on symbol basis (bitmap)
-add a `remove_nr_ue_list()`, could be used instead of MR !934

MR910:5G SA NAS messages 
- 5G SA nass messages and a simple unitary test code
 
MR927:Nr rrc configuration fr2
- introduces some bug fixes for FR2 that might also have an impact on FR1.
2020-11-06 11:29:03 +01:00
Raphael Defosseux
7f70174cf8 CI: added missing build artifacts in one of the pipeline; fix RA test
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-11-06 11:15:23 +01:00
He Shanyun
3d75f3c199 deal with Registration Accept 2020-11-06 08:21:01 +00:00
zhenghuangkun
d395831a54 Fix error registration complete 2020-11-06 07:44:58 +00:00
zhenghuangkun
86a3bfc0d6 Modify registration complete 2020-11-06 07:20:12 +00:00
zhenghuangkun
4041f14d1f Modify registration complete 2020-11-06 07:17:23 +00:00
zhenghuangkun
0e2e5f4c7e add nas message for registration complete 2020-11-06 05:30:11 +00:00
hardy
3917b1ae0f Merge remote-tracking branch 'origin/NR_RRCConfiguration_FR2' into integration_2020_wk45_2 2020-11-05 16:53:13 +01:00
hardy
802e8218ad Merge remote-tracking branch 'origin/noCore' into integration_2020_wk45_2
Conflicts:
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
2020-11-05 16:49:21 +01:00
Parminder Singh
13645b1b5e Updated the sin cos table condition check
- Sin cos table quadrant condition checks are updated
- function are indented properly
- Debug prints are updated for double data type
2020-11-05 16:31:16 +01:00
Parminder Singh
c16e5831d1 Added debug prints in ULSIM for PTRS RE calculations
- Added PTRS Symbols in a slot and Resource elements count in debug print
2020-11-05 14:08:02 +01:00
Parminder Singh
c9523b88a7 Updated UL ptrs processing wrt DL
- Most DL code is reused for Ul also to reduce code duplication
- Common CPE calculation function is used for error estimation
- Common slot processing function is used for inter/extrapolation
- Removed old implementation dedicated to UL
2020-11-05 14:00:01 +01:00
Parminder Singh
f0c843faf9 Sin cos table initialization for ULSIM also
- As new sin cos table is used in phase noise function it shall be
  initialized for ULSIM also
2020-11-05 13:36:44 +01:00
Thomas Schlichter
53edb35eb7 Fix whitespace changes 2020-11-05 12:25:57 +01:00
yaojie
56b1d24ff4 fix error InitialContextSetupResponse 2020-11-05 10:10:29 +00:00
Parminder Singh
41d3bcac85 Fix - Issue with uninitialized structure in NR_ULSCH_CODING.c
- Initialized variable to remove the valgrind issue.
2020-11-05 10:35:09 +01:00
Khodr Saaifan
97a9dfd83a UE: implement pdsch channel estimation for dmrs_config type2 2020-11-05 10:19:22 +01:00
Xue Song
7bef73bfa8 set nas message container for security mode complete 2020-11-05 07:57:05 +00:00
Khodr Saaifan
1de69e8e27 PHY: link dmrs_config to higher layers 2020-11-05 03:22:30 +01:00
He Shanyun
1a9fd6028f set authentication code for security mode complete 2020-11-05 01:20:46 +00:00
Shweta Shrivastava
46219d8c61 Fixed ulsim compilation error 2020-11-04 10:47:02 -06:00
Parminder Singh
0ce350d1cf Merge remote-tracking branch 'origin/develop' into fhg-shp-dl-ptrs 2020-11-04 16:20:50 +01:00
Eugene Bogush
3c3593c6a6 fix for proc: e_rab_setup_resp 2020-11-04 15:26:54 +01:00
rmagueta
976c2b2e84 Fill SIB1 with configuration values 2020-11-04 11:52:55 +00:00
Parminder Singh
209785551a Review Comments are updated
- updated return function value to -1
- removed static variable for dmrs symbol selection for channel
- Updated sin cos quadrant check conditions
- removed casting from PTRS slope and related calculations
2020-11-04 11:29:35 +01:00
Thomas Schlichter
e38679e6da Merge remote-tracking branch 'develop' 2020-11-04 10:22:11 +01:00
rmagueta
578b17dec6 First baseline implementation of SIB1 2020-11-04 00:00:24 +00:00
Laurent
39bb839d7c Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into noCore 2020-11-03 23:21:47 +01:00
rmagueta
45911fb8f0 Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-sib1
 Conflicts:
	openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
	openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c
	openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.h
	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
	openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
2020-11-03 19:41:52 +00:00
Robert Schmidt
2e03cbe7bf Track RBs in vrb_map as binary 2020-11-03 20:02:48 +01:00
rmagueta
6e0b0049ea Coreset0 frequency allocation update 2020-11-03 18:58:56 +00:00
Florian Kaltenberger
0d30561ecd Merge remote-tracking branch 'origin/develop' into NR_RRCConfiguration_FR2 2020-11-03 16:55:20 +01:00
Florian Kaltenberger
d17e075f78 Merge remote-tracking branch 'origin/develop' into nr_prach_fr2 2020-11-03 16:08:17 +01:00
Florian Kaltenberger
6f28d0e38b some fixes - prachsim working now for FR2 - added testcases 2020-11-03 16:01:58 +01:00
Raymond Knopp
f920962b9b tracing in IF5_tools.c for fronthaul error debugging 2020-11-03 15:21:36 +01:00
Thomas Schlichter
5903467849 Merge remote-tracking branch 'develop' into nr_fdd_if_fix
Conflicts:
	ci-scripts/conf_files/gnb.band78.tm1.106PRB.usrpn300.conf
	openair2/LAYER2/NR_MAC_UE/config_ue.c
	openair2/LAYER2/NR_MAC_gNB/config.c
2020-11-03 14:27:16 +01:00
Robert Schmidt
c4f8ff1561 Assert on condition UE not found in UE_list 2020-11-03 14:23:50 +01:00
Robert Schmidt
ad0424cbba Check all RA procs in nr_rx_sdu() if unknown RNTI 2020-11-03 14:23:50 +01:00
Robert Schmidt
d94b1cd1a5 Track RB allocation in vrb_map{,_UL} on per-symbol basis 2020-11-03 14:23:50 +01:00
Robert Schmidt
40175d244a Format schedule_nr_mib() 2020-11-03 14:23:50 +01:00
Francesco Mani
2bdcbe6c18 Fix for filling vrb_map for ssb
The SSB nFAPI message is only sent every 8 frames, and automatically
repeated by the PHY layer in between. This commit sets the vrb_map
structure in those frames in between nFAPI so that the scheduler does
not schedule on such resources.
2020-11-03 14:23:50 +01:00
Robert Schmidt
a94da10dee Remove UE from UE_list on disconnect 2020-11-03 14:23:50 +01:00
Robert Schmidt
9125fc8d22 Refactor/shorten interface of nr_fill_nfapi_dl_pdu() 2020-11-03 14:23:50 +01:00
Robert Schmidt
8651b7fd14 Remove commented/unused code in DLSCH/phytest scheduler 2020-11-03 14:23:50 +01:00
Robert Schmidt
0deb5d291d Use special dlsim preprocessor 2020-11-03 14:23:50 +01:00
Robert Schmidt
b389e43eea Add phytest preprocessor
The phytest preprocessor schedules only one UE, as many RBs as possible
(largest continuous RB region), with a fixed MCS and time domain
allocation.
2020-11-03 14:22:28 +01:00
Robert Schmidt
fd9f5d2d2c Use function pointer to call pre-processor 2020-11-03 14:22:27 +01:00
Robert Schmidt
14f15d7e77 Fix: postprocessor resets UE scheduling condition 2020-11-03 14:22:27 +01:00
Francesco Mani
8363849c3f Modification of TA update procedure 2020-11-03 14:22:27 +01:00
Robert Schmidt
fd3d49bbe7 Correctly check and apply the TA in DLSCH scheduler 2020-11-03 14:21:37 +01:00
Remi Hardy
adcf9e9f86 Merge branch 'integration_2020_wk45' into 'develop'
MR902 Nr mac ssb ro ue idcc
- Construction of SSB-RO mapping table on the UE
- RO selection based on SSB index
- RACH preamble selection based on SSB index in a selected RO
- RA-RNTI calculation
  

MR928 nr: add MAC PDU traces for wireshark
- The T tracer macpdu2wireshark has been modified to handle the new traces. The usage is the same as for LTE.  

MR929 RA fixes for NR UE  

MR938 CI: Parse UE TUN interface correctly in S1 mode
- The TUN interface configuration is changed to use program "ip" only. 
- The CI script parsing is changed accordingly: the pipeline will recognize the attempt to bring up the interface of the first UE.

MR933 nr rlc: bugfix 
- ret.next was not set in a particular case
2020-11-03 12:45:06 +01:00
Parminder Singh
741a5b98e7 Added sin cos table implementation for dlsim
- Sin and Cos values are obtained from a table with a resolution of
  100.
- dlsim is updated to use this table for phase noise.
2020-11-03 11:26:37 +01:00
Xue Song
89eae04132 Add NAS Security Mode Complete 2020-11-03 09:58:23 +00:00
Francesco Mani
74f8337fe1 cherry-picking changes for cri-rsrp bitlen from TCI_UCI branch 2020-11-03 10:33:18 +01:00
Raymond Knopp
8b92c53141 modifications for eCPRI radio units, increased averaging in eNodeB subband I0 measurements 2020-11-03 06:01:42 +01:00
rmagueta
23f5277d29 Decoding and xer_fprint of SIB1 at UE 2020-11-03 02:31:46 +00:00
Shweta Shrivastava
93e34b7fd7 Fixes for a few UE failures due to invalid DCI received 2020-11-02 19:02:34 -06:00
Francesco Mani
e8d4d6a138 change in RRC for csi rsrp 2020-11-02 19:10:17 +01:00
Frédéric Leroy
1426ee5ed6 feat: add optional parameter port for mme connection 2020-11-02 17:16:29 +01:00
Florian Kaltenberger
4ab9c75578 first version of PRACH for FR2. to be tested 2020-11-02 14:19:14 +01:00
hardy
caa31696c3 Merge remote-tracking branch 'origin/nr-rlc-bugfix-w44' into integration_2020_wk45 2020-11-02 14:13:12 +01:00
hardy
58b91359e1 Merge remote-tracking branch 'origin/fix-ci-tun' into integration_2020_wk45 2020-11-02 14:12:22 +01:00
hardy
cb7e2c11e3 Merge remote-tracking branch 'origin/NR_UE_RA_fixes' into integration_2020_wk45 2020-11-02 14:11:44 +01:00
hardy
628c2b7486 Merge remote-tracking branch 'origin/nr-mac-pdu-wireshark' into integration_2020_wk45 2020-11-02 14:11:13 +01:00
rmagueta
d07e2ecc3b Minor correction: removing mac header 2020-11-02 12:44:00 +00:00
Frédéric Leroy
cad824099e fix(build_helper): use SUDO when we are a regular user
root user is not tied to a container.
Let the possibility to build when we run as a regular user in a
container.
2020-11-02 10:54:17 +01:00
He Shanyun
947194a271 implement authentication response 2020-11-02 09:51:03 +00:00
rmagueta
290d9691f7 SIB1 PDSCH implementation 2020-10-31 19:56:04 +00:00
Parminder Singh
65fb8a84b8 Fixed Channel compensation for dlsim for multiple DMRS
- fixed channel compensation by choosing most recent DMRS symbol ina
  slot
- Removed code to find nearest DMRS symbol for channle compensation
- Updated TBS calculation in DLSIM
- Added debug prints in PTRS CPE estimation for DMRS symbol
2020-10-31 14:36:05 +01:00
dongzhanyi
ed2eb95c4a solved the problem that UE UL LDPC code can only process data within 8 code blocks 2020-10-31 07:13:07 +08:00
rmagueta
ac0dc9d3aa Transmission of SIB1 2020-10-30 17:01:51 +00:00
Eurecom
c355a26aa6 fixing RA test iteration to 10 times to have a chance (unstable in CI env) 2020-10-30 15:26:57 +01:00
Thomas Schlichter
1020292984 fix CPPCHECK warning regarding "cfg" in openair1/PHY/INIT/nr_parms.c 2020-10-30 13:17:04 +01:00
Florian Kaltenberger
0609742e21 Merge remote-tracking branch 'origin/benetel_5g_prach_fix' into benetel_phase_rotation 2020-10-30 12:30:25 +01:00
He Shanyun
63795a6c94 implement identityresponse 2020-10-30 08:34:52 +00:00
Shweta Shrivastava
16b80425b8 Small fix 2020-10-29 21:32:51 -05:00
Laurent
7d603191db merge develop 2020-10-29 16:29:32 +01:00
Laurent
136d9ccb67 add documentation and code review comments 2020-10-29 16:14:55 +01:00
Cedric Roux
aec21aa234 nr rlc: add a test 2020-10-29 15:48:01 +01:00
Cedric Roux
f433c90efe nr rlc: fix a bug
The count was wrong.
2020-10-29 15:47:50 +01:00
cig
1daebfbd86 Fixed CPPCHECK warning about potential null pointer dereference of cfg 2020-10-29 13:53:47 +01:00
cig
a47f31a44a Added configuration files for FDD band 66 2020-10-29 13:53:47 +01:00
Parminder Singh
1e9720ef88 Added -U command line parameter to update DMRS configuration for DLSIM
- -U 2 0 [0-2], can be used to update DMRS configurations
- update check for additional position 3 in dlsch decoding
2020-10-29 13:49:03 +01:00
cig
e37fb2ae05 Updated doc files with IF / FDD features 2020-10-29 10:01:02 +01:00
Xue Song
9fddd09dc3 Fix build warning
Modify SecurityModeFailure
2020-10-29 07:31:26 +00:00
zhenghuangkun
881a6d4afc add nas message for registration complete 2020-10-29 05:43:59 +00:00
yaojie
c2c84a9318 Add Downlink(NAS Identity Request)/Uplink(NAS Identity Response) 2020-10-29 14:24:32 +09:00
Shweta Shrivastava
c0d123b9f7 Support for multiple PDUs in a UL slot 2020-10-28 20:54:18 -05:00
matzakos
87c83aaf21 Merge remote-tracking branch 'origin/develop' into NR_SA_NGAP_RRC_wk42
Conflicts:
	cmake_targets/CMakeLists.txt
	docker/Dockerfile.enb.rhel7.oc4-4
	openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
2020-10-29 00:19:49 +01:00
rmagueta
4f525854d0 Update nr_extract_dci_info() for the NR_RNTI_SI case. 2020-10-28 16:39:09 +00:00
Robert Schmidt
9d2651d080 CI: Parse UE TUN interface correctly in S1 mode
See also commit 8c5976e279

Above commit changed the TUN interface configuration to use program "ip"
only. This commit changes the CI script parsing correspondingly: the
pipeline will recognize the attempt to bring up the interface of the
first UE.
2020-10-28 17:10:21 +01:00
hardy
b18c361125 improved CI RA checks 2020-10-28 17:07:19 +01:00
Raymond Knopp
e880e66b65 Merge branch 'NR_RRCConfiguration_FR2' of http://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRCConfiguration_FR2 2020-10-28 16:40:11 +01:00
Raymond Knopp
77b152ade5 adding config file for band 13 2020-10-28 16:39:47 +01:00
Parminder Singh
327ba9d398 PTRS DL extraction, estimation and compensation
- Added PTRS extraction and estimation for DL
- Added processing for whole slot wrt PTRS estimates
- DLSIM is updated to used -T flag to enable PTRS
- DMRS compensated signal is further compensated with PTRS estimation
2020-10-28 15:39:03 +01:00
Thomas Schlichter
4cac02e014 Merge remote-tracking branch 'eurecom/develop' into fhg-fdd-custom-if 2020-10-28 14:08:23 +01:00
Florian Kaltenberger
8ba0d28ace hardcoding measurement frequency to 3.6GHz. 2020-10-28 13:58:38 +01:00
Thomas Schlichter
eaf43790a0 synchronize gnb.band78.tm1.106PRB.usrpx300.conf for USRP X300 with main version for URSP N310 2020-10-28 13:52:01 +01:00
Mario Hudon
bddd86b77a Merge remote-tracking branch 'oai-eurecom/develop' into NR_MAC_SSB_RO_UE_IDCC 2020-10-28 08:23:29 -04:00
Florian Kaltenberger
ba6edde825 updating 4g config file 2020-10-28 13:08:05 +01:00
Florian Kaltenberger
a129f121cc dpdk changes for 18.11 2020-10-28 13:07:41 +01:00
Florian Kaltenberger
638b5de1d2 updating config file for gNB 2020-10-28 11:28:00 +01:00
Florian Kaltenberger
144e267541 fixing PRACH bug in benetel_5g driver 2020-10-28 11:08:26 +01:00
Florian Kaltenberger
f4f9d3b4d7 hardcoding ra_rnti in case of long prach for benetel 2020-10-28 11:06:35 +01:00
Xue Song
b6e038e044 add NAS up/downlink 2020-10-28 09:54:03 +00:00
hardy
3578426082 fixed UE log file name 2020-10-28 10:07:25 +01:00
Thomas Schlichter
41f4ed9eaf synchronize gnb.band78.tm1.106PRB.usrpn300.conf file in ci-scripts and target directory 2020-10-28 09:53:38 +01:00
He Shanyun
f2bb26a91b add decode and encode for registration accept 2020-10-28 05:59:58 +00:00
Xue Song
ca4e85553f Add ITTI_SIM in rrc_gNB_generate_RRCRelease 2020-10-28 05:34:46 +00:00
Xue Song
456329b527 modify RRCRelease 2020-10-28 02:56:55 +00:00
He Shanyun
4843f90716 fix build error of phy simulator 2020-10-28 02:49:10 +00:00
Xue Song
90fbe805bb modify RRCRelease 2020-10-28 02:05:01 +00:00
He Shanyun
52f92b7ce0 set mnc 2020-10-28 01:44:18 +00:00
yaojie
58b390c7e0 fix error: Initialize NGAP_CONF_MODE for ittiSIM 2020-10-28 01:17:09 +00:00
Raymond Knopp
36bbd2a068 adapting config file for band 261 2020-10-27 21:07:13 +01:00
masayuki.harada
483f4b2d1b Fix merge miss. 2020-10-28 04:21:41 +09:00
masayuki.harada
dc288b7bc8 Merge branch 'develop_SA_L3' into NR_SA_NGAP_RRC_wk42
# Conflicts:
#	openair2/GNB_APP/gnb_paramdef.h
#	openair2/RRC/NR/rrc_gNB.c
2020-10-28 03:57:14 +09:00
Shweta Shrivastava
661dd53186 Minor changes + UL scheduler code restructure 2020-10-27 13:36:45 -05:00
masayuki.harada
8cff73dc39 Fix merge error. 2020-10-28 03:19:41 +09:00
Remi Hardy
68619cae68 Merge branch 'integration_2020_wk44' into 'develop'
Integration 2020 wk44

MR923 : Fixes tun  
TUN-interface related changes

MR925 : bugfix: fix frequencies in nr_bandtable    
The array nr_bandtable has then been reviewed fully and all the values that were wrong have been changed.   The check of correctness was done using the website https://www.sqimway.com/nr_band.php  
  
MR931 : Finalize oaicn integration (CI)  
In addition, the "known unstable scenarios" are highlighted in the CI HTML reports.

MR917 : NR CSI reporting
This is a new feature
2020-10-27 18:35:34 +01:00
Eurecom
31f1a4b137 fixed RA check marker 2020-10-27 18:23:14 +01:00
Mario Hudon
818694acaa -Code review: Use FAPI PRACH PDU instead of PRACH vars in nr_ue_get_rach/nr_get_prach_resources 2020-10-27 11:26:16 -04:00
masayuki.harada
5c49c67f98 Merge remote-tracking branch 'remotes/origin/develop_SA_RRC' into develop_SA_L3
# Conflicts:
#	openair2/RRC/NR_UE/rrc_UE.c
#	openair2/RRC/NR_UE/rrc_defs.h
2020-10-27 20:47:03 +09:00
masayuki.harada
1956fd3b72 Merge commit 'b67badef1b2fd390d801e20644b08df0d5880583' into develop_SA_L3
# Conflicts:
#	common/utils/ocp_itti/intertask_interface.h
#	openair2/RRC/NR/rrc_gNB.c
#	openair3/NGAP/ngap_gNB_nas_procedures.c
2020-10-27 20:25:16 +09:00
He Shanyun
90a10cd051 set amf setid and regionid for registration request 2020-10-27 11:06:23 +00:00
masayuki.harada
4649f0f615 Merge remote-tracking branch 'remotes/origin/develop_SA_SIM' into develop_SA_L3 2020-10-27 19:47:49 +09:00
cig
ae86b727e2 Update the time channel statistics "dl_ch_estimates" in nr_pbch_channel_estimation
- it shall be updated at every last PBCH symbol
- this fixes stability issues with the FDD mode
2020-10-27 11:09:26 +01:00
cig
6862affdf4 Cleanup RF HW configuration at UE side
- removed redundant initialisation of variables
- introduced two "RF helpers" function that are replacing shared code in the sync routines
- added a new .c file and updated the cmakelists and .h files
2020-10-27 11:09:17 +01:00
Francesco Mani
23164bd8ae bugfixes in handling csirs in fapi functions 2020-10-27 10:58:22 +01:00
Francesco Mani
a83dc45c68 changes in logging for CSI RS and cleaning some other logging 2020-10-27 10:48:22 +01:00
cig
95bd55d8b6 Cleanup redundant setting of duplex mode after sync 2020-10-27 10:43:24 +01:00
cig
a9096bc9ef Moved downlink and uplink frequencies global variables to the relevant .h file 2020-10-27 10:43:24 +01:00
cig
3939406141 Logging fixes at UE and gNB 2020-10-27 10:43:24 +01:00
cig
8e7d69989b Cleanup initialisation frame params UE and command line options
- got rid of global variable fp
- code cleanup, removed redundant and unused code
- removed unused command line options and variables
- grouped command line setting in set_options function
2020-10-27 10:43:24 +01:00
cig
eb3c6538ee Moved N_TA offset setting to init function 2020-10-27 10:43:24 +01:00
cig
8ee8b81043 Cleaned up unused UE variables, members, commented out code 2020-10-27 10:43:24 +01:00
cig
c961e81ce9 Broken down get_band into two functions to get duplex offset and frame type
- the band is coming from the SI, therefore a function to get the band is not
  necessary
- this solves also the limitations of the get_band algorithm with the NR bands
  overlapping in the NR operating bands table (e.g. band 78 and band 48)
2020-10-27 10:43:24 +01:00
cig
7e45f8be7a Fix for scan carrier to make it compatible with custom DL/UL IF implementation 2020-10-27 10:41:59 +01:00
cig
fa07a48456 Set downlink carrier and uplink CO @ UE through command line
- this reflects the implementation of IF and IF offset in the gNB RU
- the RF frequencies are set at HW level while the target frequencies are
  stored in fp, therefore the values stored in fp should not be changed
  after sync as only the tx/rx freq is updated
- removed overwritten dl/ul carrier frequencies in fp after sync
- removed redundant set of tx/rx freq in ue_synch (done in init_openair0)
- removed irrelevant set of dl/ul carrier freq in get_options
2020-10-27 10:41:59 +01:00
cig
63e93528b9 Bypass the tdd_table in FDD mode
- tdd_table is filled in only in TDD mode and should not be used in FDD mode
2020-10-27 10:41:59 +01:00
cig
1bacb91add Bugfix: set freq_offet to static to avoid re-initialisation in frequency scanner 2020-10-27 10:41:59 +01:00
cig
60d81f231a Configuration changes to support FDD
- adapted the get_band function: the algorithm is now taking into account
  also the UL frequency in order to fetch the proper band (this was failing
  before as some NR bands have the same DL band, e.g. band 65 and 66)
- added new bands to the NR table as per TS 38.101 V16.4.0 (2020)
- made the from_nrarfcn function compatible with UL FDD (this function,
  used for both DL and UL  was previously working with TDD only as it
  did not compute properly the frequency for the UL FDD, throwing asserts)
- introduced common functions to get the NR table idx and the duplex mode,
  removing repeated code in the process
- removed the unused function to get the uldl offset
- improved some logging
- other minor fixes to the relevant code
2020-10-27 10:41:59 +01:00
cig
609844a379 Small code cleanup gNB
- removed long-time commented out and unused code
- fixed logging
2020-10-27 10:39:43 +01:00
cig
29f7a5082a Introduced configuration of RU IF offset from configuration file
- the RU now supports IF equipment with custom FR1 TX/RX frequencies
- this configuration parameter together with the if_freq parameter allows
  to set a custom IF RX frequency for the gNB
- if the IF offset is not specified, legacy code applies
2020-10-27 10:39:43 +01:00
He Shanyun
5880c1f8c7 add nas message for registration request 2020-10-27 09:28:47 +00:00
Xue Song
356a4d83e9 fix nrUE build error 2020-10-27 07:41:53 +00:00
yaojie
a5343618cf Added the judgment of the NGAP field in the configuration file 2020-10-27 07:40:09 +00:00
Laurent
7ec149cc35 merge develop 2020-10-27 08:23:59 +01:00
He Shanyun
b67badef1b fix build error of phy simulator 2020-10-27 02:59:52 +00:00
Xue Song
41d3892c64 Merge branch 'develop_SA_NGAP' into develop_SA_RRC 2020-10-27 02:51:57 +00:00
Xue Song
62292f892e modify ngap_gNB_handle_nas_first_req 2020-10-27 01:56:41 +00:00
rmagueta
807b3e90b8 RNTI_SI: update to 0xFFFF 2020-10-27 00:30:03 +00:00
Raymond Knopp
6c414a80d4 wqMerge remote-tracking branch 'origin/develop' into develop-oriecpriupdates 2020-10-26 19:58:25 +01:00
hardy
779362dcb7 Merge remote-tracking branch 'origin/NR_CSI_reporting' into integration_2020_wk44 2020-10-26 17:30:17 +01:00
hardy
b0797c0899 Merge remote-tracking branch 'origin/finalize-oaicn-integration' into integration_2020_wk44 2020-10-26 17:29:28 +01:00
hardy
97d284bea3 Merge remote-tracking branch 'origin/bugfix-nr-bands' into integration_2020_wk44 2020-10-26 17:28:58 +01:00
hardy
89d7353ddf Merge remote-tracking branch 'origin/fixes-tun' into integration_2020_wk44 2020-10-26 17:28:11 +01:00
Parminder Singh
42e9c655be Moved LLR calculations inside a static function
- LLR calculations are moved inside a static function and done for a
  slot in last symbol processing
2020-10-26 15:01:43 +01:00
Cedric Roux
3826ea13ac nr rlc: bugfix - ret.next was not set in a particular case
The function next_missing needs a rewrite...
2020-10-26 11:01:44 +01:00
Parminder Singh
cf3780c04d Added PTRS related definitions and variables for DL processing in UE
- Added PTRS variables in transport UE header file
- Added DMRS inline symbol check function in refsig.h
- Added PTRS estimation and other related structures in defs_nr_UE.h file
2020-10-26 10:29:39 +01:00
Parminder Singh
8d496bdcf8 Adding PTRS symbol from gNB in DL
- Based upon ptrs bitmap, ptrs symbols are added in DL
- Mac ptrs validation condition is updated
2020-10-26 10:28:02 +01:00
Parminder Singh
22cd1885bc DMRS Specific changes from fhg-dl-dmrs branch 2020-10-26 10:23:52 +01:00
Parminder Singh
54c89ccdbc MAC layer changes to process PTRS RRC values and validation
- Get RRC values from dedicated bandwidth part and process it
- Validate all settings in MAC layer and enable PTRS processing in PHY
2020-10-26 10:15:19 +01:00
Parminder Singh
3651107f81 Added PTRS parameters in UE nFAPI interface
- PTRSPortIndex, PTRSTimeDensity, PTRSFreqDensity, PTRSReOffset, nEpreRatioOfPDSCHToPTRS
- mcs_table : to calculate MCS table in MAC layer and pass tp PHY
- pduBitmap : same as used in DL FAPI interface, to enable or disable PTRS processing
2020-10-26 10:06:33 +01:00
Wu.Jing
66bc0bac1e Merge branch 'master' into develop_SA_L3 2020-10-26 09:04:03 +00:00
Wu.Jing
08e775559b Merge branch 'develop_SA_SIM' into develop_SA_L3 2020-10-26 09:02:18 +00:00
Parminder Singh
a7982741aa RRC sub-function to add PTRS configuration for DL
- Added a function to add PTRS values in RRC context.
- This function can be used to overwrite the PTRS values also.
- When RRC config file contains PTRS values then this function can be used
respectively in RRC context.
2020-10-26 10:01:15 +01:00
Raphael Defosseux
41d059794c Merge remote-tracking branch 'origin/oc-docker-october-improvements' into finalize-oaicn-integration 2020-10-26 09:49:44 +01:00
Raphael Defosseux
457734988c CI: lock mechanism around the VM usage
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-10-26 09:49:33 +01:00
Raphael Defosseux
61989549e1 CI: better handling of the case when no UE is connected to ADB server
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-10-26 09:49:33 +01:00
Raphael Defosseux
0a4cfc2173 CI: scenarios that are known as unstable won't be seen as failures
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-10-26 09:49:33 +01:00
Raphael Defosseux
fb957484af CI: intermediate commit
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-10-26 09:49:33 +01:00
Francesco Mani
1a1ee59d39 Merge remote-tracking branch 'origin/develop' into NR_CSI_reporting 2020-10-26 09:27:52 +01:00
Francesco Mani
c41566ac6a fix compilation error 2020-10-26 09:27:40 +01:00
Khodr Saaifan
c93147ee43 gNB: allow more than 2 antenna ports at the Tx side 2020-10-26 08:44:16 +01:00
Wu.Jing
a9b76b5341 Merge branch 'develop_SA_RRC' into develop_SA_SIM
Conflicts:
	openair2/RRC/NR/MESSAGES/asn1_msg.c
	openair2/RRC/NR/rrc_gNB.c
2020-10-26 07:30:18 +00:00
Wu.Jing
92ba7dc249 Merge branch 'develop_SA_NGAP' into develop_SA_RRC 2020-10-26 06:20:02 +00:00
masayuki.harada
1ce1e8f82b Merge branch 'oai_develop'
# Conflicts:
#	ci-scripts/Jenkinsfile-gitlab
2020-10-26 15:03:58 +09:00
Remi Hardy
97ae4300f7 Merge branch 'integration_2020_wk42_2' into 'develop'
Integration 2020 wk42 (2)

MR921 : Hotfix for DL DCI issue in UE  
Fixing a bug from last MR.  
Fix in nr_dlsim that prevents reporting false 'PDSCH ok' message

MR915 : Fix to avoid RRC->X2AP ticking every msec when x2ap task is not enabled  
The aim of itti RRC_SUBFRAME_PROCESS message (MAC->RRC) is to trigger an itti X2AP_SUBFRAME_PROCESS message (RRC->X2AP)  
This change avoids creating RRC_SUBFRAME_PROCESS message if x2ap task is not enabled
2020-10-25 15:50:41 +01:00
rmagueta
cdf72e6d3e Creation of fill_default_coresetZero() and fill_default_searchSpaceZero(). Resource allocation and transmission of the DCI of SIB1. Partial implementation of the reception of the DCI of SIB1. 2020-10-24 22:45:19 +01:00
Hongzhi WANG
0109c7b1fb remove ue warnings 2020-10-23 18:09:13 +02:00
Raphael Defosseux
d240e85c21 docker: removing obsolete file
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-10-23 17:08:29 +02:00
Francesco Mani
5de83e0bb8 fixing a couple of warnings 2020-10-23 16:49:58 +02:00
Raymond Knopp
c737ea2f8f fixing issue with PRACH0 and multiple PRACH occasions 2020-10-23 16:06:04 +02:00
Florian Kaltenberger
3b56994113 fixing warnings 2020-10-23 14:18:12 +02:00
Florian Kaltenberger
32c8c86730 fixing benetel drivers after introduction of multiple PRACH occastions 2020-10-23 13:28:48 +02:00
Xue Song
d5f95c6c79 fix some error 2020-10-23 08:00:21 +00:00
Xue Song
ce85677762 modify some issues 2020-10-23 03:42:06 +00:00
Mario Hudon
dd573e891d Changed for the original file in develop 2020-10-22 18:55:05 -04:00
Mario Hudon
e23219d53b Removed changes in fix_scc to avoid impact on the actual value of ssb_PositionsInBurst_Bitmap in the archived configuration files 2020-10-22 18:39:25 -04:00
Mario Hudon
a9169c0234 -Updated for a clean merge 2020-10-22 17:55:23 -04:00
Khodr Saaifan
0f538755c7 Fix DMRS RE allocation: 1- allowed_xlsch_re_in_dmrs_symbol 2- Double DMRS 3- w_t and w_f 2020-10-22 23:10:58 +02:00
Florian Kaltenberger
085dff3e1e Merge remote-tracking branch 'origin/develop' into benetel_phase_rotation 2020-10-22 21:37:23 +02:00
Florian Kaltenberger
c3f1029bdf fixing bug for WORKER_ENABLE 2020-10-22 21:34:00 +02:00
Laurent
c8111292e9 fix warnings from merge 2020-10-22 21:06:35 +02:00
Mario Hudon
31fb92b802 Moved UE SSB/RO handling code from nr_mac_common to nr_ue_procedures 2020-10-22 13:45:33 -04:00
hardy
8d65628052 re-enabling RA test 2020-10-22 17:58:00 +02:00
Raphael Defosseux
4899c55101 [docker] adding some tools and missing USIM generation config file
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-10-22 17:05:08 +02:00
Raphael Defosseux
0519e31575 [docker] add CMD w/ 'sleep infinity' for remaining target images
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-10-22 16:56:04 +02:00
hardy
bebc0d98d7 Merge remote-tracking branch 'origin/UE_DL_DCI_hotfix' into integration_2020_wk42_2 2020-10-22 16:23:34 +02:00
hardy
0a8bc5cdb5 Merge remote-tracking branch 'origin/fix_rrc_x2_ticking' into integration_2020_wk42_2 2020-10-22 16:23:05 +02:00
matzakos
e904cf3a00 Add comments for dummy function definitions in nr phy simulators 2020-10-22 16:16:10 +02:00
masayuki.harada
a21ba6c7dc Merge remote-tracking branch 'remotes/origin/develop_SA_L3' into NR_SA_NGAP_RRC_wk42 2020-10-22 19:59:13 +09:00
Thomas Schlichter
bc810d1d04 Merge branch 'develop' into NR_UE_RA_fixes 2020-10-22 12:31:59 +02:00
zhanghuiqin
f3c922b1c1 fix RRCReject 2020-10-22 09:19:27 +00:00
Francesco Mani
cea71b473c fixes for csi-rs amplitude 2020-10-22 10:46:04 +02:00
Thomas Schlichter
7c5677fd1f fix message 1 frame number calculation on NR UE
UE initiates the RA procedure with sending message 1 via PRACH 150 frames after synchronizing with the gNB.
As the frame numbers wrap at 1024, we have to calculate the frame number for message 1 using modulo calculation.
2020-10-22 10:25:48 +02:00
Francesco Mani
76abeaf30e Merge remote-tracking branch 'origin/develop' into NR_CSI_reporting 2020-10-22 09:26:51 +02:00
He Shanyun
028be9e486 fix build error of phy simulator 2020-10-22 05:55:51 +00:00
Mario Hudon
b61b591e42 Merge remote-tracking branch 'oai-eurecom/develop' into NR_MAC_SSB_RO_UE_IDCC 2020-10-21 18:51:03 -04:00
Mario Hudon
3874e934d8 Added support of PRACH on start symbol != 0 on the UE 2020-10-21 15:45:08 -04:00
Cedric Roux
ae8c0ef448 nr: add MAC PDU traces for wireshark
The T tracer macpdu2wireshark has been modified to handle the new traces.
The usage is the same as for LTE.

In NR the RACH is logged as an LTE RACH. Maybe we'll change that in the
future. Looking at the source code of wireshark, I could not find any
way to report NR RACH. Maybe they forgot it. Or I did not search correctly...
2020-10-21 18:09:15 +02:00
Francesco Mani
dde3e87938 handling csirs and calling the phy function 2020-10-21 17:28:12 +02:00
Mohammed Ismail
7cc5765848 docker file updates on gnb and lteue
Signed-off-by: Mohammed Ismail <mohammed.ismail@eurecom.fr>
2020-10-21 16:35:34 +02:00
cig
1ef9a7ceb6 Enter PRACH procedures only after UE sync 2020-10-21 16:02:47 +02:00
Raphael Defosseux
0e1a56c766 DOC: 1st draft for OC build / deployment
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-10-21 15:59:27 +02:00
Raphael Defosseux
1bed270326 DOC: adding table of content
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-10-21 15:14:00 +02:00
Raphael Defosseux
81785c1d91 DOC: initial draft for docker/openshift
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-10-21 15:14:00 +02:00
Raphael Defosseux
ddfeaf8119 [docker] adding a CMD for eNB dockerfiles
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-10-21 15:14:00 +02:00
Thomas Schlichter
fb7a098a47 fix execution of nr_ue_pdsch_procedures() only once per slot for SI_PDSCH, P_PDSCH and RA_PDSCH 2020-10-21 14:56:44 +02:00
Laurent
5c69510f17 merge develop, improve doc 2020-10-21 14:38:17 +02:00
Raphael Defosseux
b70671777c Merge branch 'integration_2020_wk42' into 'develop'
Develop Integration Branch: 2020 wk42

The following Merge Requests were included:

* MR 913 : Flexran Base Station Apps  
* MR 875 : Nr mac ssb ro global edge  
* MR 897 : python framework cleanup (CI)  
* MR 924 : C-RNTI as TC-RNTI  
* MR 911 : Cce indexing fix  
* MR 922 : fixes mac sched nfapi
2020-10-21 13:39:04 +02:00
Francesco Mani
1894cf1ea4 including vrb map in csi function 2020-10-21 11:44:52 +02:00
Francesco Mani
40d637938d MAC function to schedule CSI-RS 2020-10-21 10:19:36 +02:00
masayuki.harada
a6a39d9951 Merge branch 'develop_SA_L3' into NR_SA_NGAP_RRC_wk42
# Conflicts:
#	openair2/RRC/NR/rrc_gNB.c
2020-10-21 16:41:09 +09:00
yaojie
bfd2c35c35 fix warning/error 2020-10-21 07:30:20 +00:00
masayuki.harada
72cc6b16bf Merge branch 'develop_SA_L3' into 'master'
develop_SA_L3_20201021

See merge request !2
2020-10-21 14:25:37 +09:00
Shweta Shrivastava
7344ca7e3b Support for PUSCH config requests for multiple UL slots 2020-10-20 22:34:10 -05:00
Xue Song
592642cb28 modify RRC messages 2020-10-21 02:46:40 +00:00
cig
4589d86018 Set init_msg1 at the start of the nr_ue_prach_procedures 2020-10-20 18:07:17 +02:00
Thomas Schlichter
97e88dae06 Merge remote-tracking branch 'UE_DL_DCI_hotfix' 2020-10-20 17:47:35 +02:00
Khodr Saaifan
e01279805d gNB: fix Resource mapping to support multiple layers DMRS generation 2020-10-20 14:09:59 +02:00
Thomas Schlichter
65962b4881 fix compilation of telnetsrv_proccmd.c with deadline scheduler disabled 2020-10-20 13:35:46 +02:00
Thomas Schlichter
d9a3009f10 fix some cppcheck warnings 2020-10-20 13:35:46 +02:00
Thomas Schlichter
7428723c87 Synchronize gnb.band78.tm1.106PRB.usrpn300.conf files in ci-scripts and targets directory 2020-10-20 13:35:46 +02:00
He Shanyun
e15f0b2813 add struct for registration request message 2020-10-20 11:30:06 +00:00
Francesco Mani
0768dda232 first rrc config of CSI_RS resource 2020-10-20 10:53:35 +02:00
zhanghuiqin
fad30fff8a fix UECapabilityEnquiry & UECapabilityInformation 2020-10-20 08:41:41 +00:00
Florian Kaltenberger
288df1af6d remove hardcoding of FR2 parameters 2020-10-20 07:59:04 +02:00
Florian Kaltenberger
9e69c0e35d Merge remote-tracking branch 'origin/develop' into NR_RRCConfiguration_FR2 2020-10-20 07:38:07 +02:00
Florian Kaltenberger
6103c758d1 handling beamforming also for PDSCH 2020-10-20 07:22:55 +02:00
Raphael Defosseux
01c8e3e63f [OC]: point to proper namespace and branch
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-10-19 17:24:26 +02:00
Florian Kaltenberger
8e6e814d35 adapting msg2&3 scheduling to FR2 beamforming constraints 2020-10-19 13:57:56 +02:00
Florian Kaltenberger
60062cecfb adding beamforming support to FAPI: MAC fills ssb_beam_id_list in ssb config. PHY uses this info to fill new beam_id field. This is further copied to RU and applied there. Nothing is tested so far. 2020-10-19 13:36:00 +02:00
Raphael Defosseux
50fbb1f111 CI: increased time-outs on last few VM creations
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-10-19 13:16:26 +02:00
Francesco Mani
914b8da916 fix after integration 2020-10-19 12:46:55 +02:00
matzakos
8e3ec3e5a8 Merge remote-tracking branch 'origin/develop' into fix_rrc_x2_ticking 2020-10-19 11:49:43 +02:00
Raphael Defosseux
1da61458ba DOC: adding docker readme skeleton
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-10-19 11:32:32 +02:00
hardy
ae6af7ed8c Merge remote-tracking branch 'origin/rh_ci_py' into integration_2020_wk42
Conflicts:
	ci-scripts/reportTestLocally.sh

Kept new RA test disabled
2020-10-19 11:24:12 +02:00
hardy
03e5b461a3 Merge remote-tracking branch 'origin/NR_MAC_SSB_RO_GlobalEdge' into integration_2020_wk42
Solved Conflicts in:
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
	openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
2020-10-19 11:18:30 +02:00
hardy
8eb9d0b4a6 Merge remote-tracking branch 'origin/fixes-mac-sched-nfapi' into integration_2020_wk42 2020-10-19 10:52:37 +02:00
hardy
4d14cc63b9 Merge remote-tracking branch 'origin/cce_indexing_fix' into integration_2020_wk42 2020-10-19 10:51:46 +02:00
hardy
d94fc12887 Merge remote-tracking branch 'origin/NR_RA_updates' into integration_2020_wk42 2020-10-19 10:50:56 +02:00
hardy
639d957e30 Merge remote-tracking branch 'origin/flexran-apps' into integration_2020_wk42 2020-10-19 10:49:44 +02:00
zhanghuiqin
49487217bf add UECapabitlityEnquiry(ue) 2020-10-19 08:22:15 +00:00
Xue Song
4766f3a629 fix RRCReconfiguration/RRCReconfigurationComplete 2020-10-19 07:58:10 +00:00
Qiu DeZhi
4421bc5665 modify rrcRelease 2020-10-19 06:55:53 +00:00
Qiu DeZhi
1605266440 Add RRCrelease 2020-10-19 04:59:29 +00:00
Shweta Shrivastava
f85559abf1 Removed hard-coded PUSCH slot at UE; use dynamic grant 2020-10-18 23:51:48 -05:00
Florian Kaltenberger
d4c1e25079 fixing beamforming in FAPI. Adding beam_id to FAPI in SSB and msg2 scheduling. 2020-10-18 21:22:33 +02:00
Raphael Defosseux
13cf8284fd Merge branch 'integration_2020_wk41' into 'develop'
develop integration branch : 2020 week 41

* MR909 small-bugfixes-wk40 (Cedric Roux)
* MR919 docker and openshift initial support
2020-10-18 21:21:59 +02:00
rmagueta
9100b28b47 Get type0_PDCCH_CSS_config parameters at the gNB. SIB1 initialization has been added at SI initialization. SIB1 was transmitted with static parameters. 2020-10-18 00:25:31 +01:00
Raphael Defosseux
591184c4ba CI: proper disabling of 5g RF sim RA-TEST
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-10-17 22:07:03 +02:00
Raphael Defosseux
3f2da854ef CI: increase time-out for RF Sim tests
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-10-17 21:18:00 +02:00
Florian Kaltenberger
63ddc9ac10 fixing a cppcheck warning 2020-10-16 14:21:44 +02:00
hardy
930c147b18 removing useless debug comments 2020-10-16 14:13:31 +02:00
hardy
118575d7d2 aligning ci-scripts/runTestOnVM.sh with integration_2020_wk41 2020-10-16 14:11:06 +02:00
Laurent
6b7eb07224 remove gtp work 2020-10-16 12:01:20 +02:00
Laurent
dd43752bbe add thread pool init 2020-10-16 11:41:14 +02:00
matzakos
dc63cab2b0 Merge remote-tracking branch 'origin/develop' into fix_rrc_x2_ticking 2020-10-16 11:35:54 +02:00
yaojie
6030a75a65 fix securityModeCommand/securityModeComplete 2020-10-16 09:15:53 +00:00
Xue Song
dfa50d975b Modify RRCSetupComplete 2020-10-16 08:42:28 +00:00
Xue Song
5697057f0b Unblock ITTI SIM process 2020-10-16 05:06:19 +00:00
Xue Song
a76ef07a69 Merge branch 'develop_SA_RRC' into develop_SA_SIM 2020-10-16 01:48:23 +00:00
Xue Song
43ef53cbcf Add pucchresset->maxPayloadMinus1 to be compatible with Rel15 2020-10-16 01:46:15 +00:00
Francesco Mani
10c196b64a Merge branch 'NR_CSI_reporting' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_CSI_reporting 2020-10-15 14:52:39 +02:00
Hongzhi Wang
8ff485fca4 sending csi reporting in scheduled slot from rrc config 2020-10-15 14:47:56 +02:00
rmagueta
ddb538a30e MIB NR: pdcch_ConfigSIB1 selection and fill using the configuration file, and using a dynamic method. 2020-10-15 11:55:28 +01:00
Qiu DeZhi
46bbb6a943 Modify RRCSetupComplete 2020-10-15 10:34:19 +00:00
Cedric Roux
f3a27d6ae3 bugfix: fix frequencies in nr_bandtable
A test with band 79 was not working. It turns out that the computation
of the frequency from the NR-ARFCN was giving a wrong value.

After fixing band 79 as found in this commit, the frequency was correct.

The array nr_bandtable has then been reviewed fully and all the values
that were wrong have been changed. The check of correctness was done
using the website https://www.sqimway.com/nr_band.php
2020-10-15 11:50:11 +02:00
Florian Kaltenberger
0d555854e9 Merge branch 'NR_MAC_SSB_RO_GlobalEdge' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_MAC_SSB_RO_GlobalEdge 2020-10-15 11:27:10 +02:00
Francesco Mani
757a01d2d9 k2 = 6 in rfsim config file 2020-10-15 11:26:51 +02:00
Remi Hardy
4f2f1cc744 Update TESTING_GNB_W_COTS_UE.md 2020-10-15 11:16:00 +02:00
Wu.Jing
0312db24b4 comment nnsf that it hasnot be test 2020-10-15 08:57:28 +00:00
Wu.Jing
b2722225ab Merge branch 'master' into develop_SA_L3 2020-10-15 08:26:42 +00:00
Francesco Mani
62dbda5c83 Merge remote-tracking branch 'origin/develop' into NR_RA_updates 2020-10-15 10:18:16 +02:00
Raphael Defosseux
c69a30fe5d CI: disabling RA test check for the moment. 5G RF SIM normal phy-test should be passing now
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-10-15 10:14:56 +02:00
kn.raju
2cad2b936e modified mapping of SSB index to UE_id 2020-10-15 13:00:04 +05:30
Francesco Mani
5f1fe21c7c Revert "Fix to avoid RRC->X2AP ticking every msec when x2ap task is not enabled"
This reverts commit 1a5874d40f.
2020-10-15 08:54:31 +02:00
masayuki.harada
fa8e7d9f71 Merge remote-tracking branch 'remotes/origin/develop_SA_SIM' into develop_SA_L3 2020-10-15 15:43:46 +09:00
masayuki.harada
d626d4b27f Merge remote-tracking branch 'remotes/origin/develop_SA_RRC' into develop_SA_L3 2020-10-15 15:42:34 +09:00
masayuki.harada
bdc83aaac6 Merge remote-tracking branch 'remotes/origin/develop_SA_NGAP' into develop_SA_L3
# Conflicts:
#	openair2/GNB_APP/gnb_paramdef.h
#	openair3/NGAP/ngap_gNB_nas_procedures.c
2020-10-15 15:39:46 +09:00
masayuki.harada
af35e37c74 Merge branch 'oai_develop'
# Conflicts:
#	openair2/RRC/NR/rrc_gNB.c
2020-10-15 15:25:04 +09:00
yaojie
1fd1853ce7 add nr_decode_SI/SIB2/SIB3 2020-10-15 05:46:32 +00:00
yaojie
f00e5deb14 fix about nnfs,make it TODO 2020-10-14 08:34:41 +00:00
Qiu DeZhi
b4fad9c589 Merge branch 'develop_SA_SIM' of http://10.37.143.24:8000/gitlab/vran/OAI-5GNR into develop_SA_SIM 2020-10-14 08:02:27 +00:00
yaojie
e981df3cd8 add nr_decode_SIB1 2020-10-14 05:27:38 +00:00
He Shanyun
e6ddb5379c add process for itti simulator 2020-10-14 03:22:55 +00:00
Florian Kaltenberger
18ae5acc98 Merge remote-tracking branch 'origin/develop' into NR_MAC_SSB_RO_GlobalEdge 2020-10-13 21:47:21 +02:00
Francesco Mani
37b8995e9e fix merge bug at ue 2020-10-13 14:18:09 +02:00
Xue Song
878b483746 Merge branch 'develop_SA_RRC' into develop_SA_SIM 2020-10-13 11:37:45 +00:00
Xue Song
9812545c61 modify rrc_gNB_generate_RRCSetup 2020-10-13 11:36:52 +00:00
Xue Song
38516da2dc Merge branch 'develop_SA_RRC' into develop_SA_SIM 2020-10-13 10:48:46 +00:00
Xue Song
0f378cf3da modify RRCSetup 2020-10-13 10:48:01 +00:00
Sakthivel Velumani
2581428808 changing k2 to 6 to support oai-ue
this shouldn't affect the testing with cots ue
2020-10-13 11:49:21 +02:00
Xue Song
db410e41a6 Merge branch 'develop_SA_RRC' into develop_SA_SIM 2020-10-13 09:31:16 +00:00
Xue Song
8c421698c4 modify do_RRCSetup 2020-10-13 09:07:19 +00:00
Qiu DeZhi
f9d8c922e4 add rrcRelease 2020-10-13 07:26:54 +00:00
yaojie
602424f616 handle bcch message in rrc_nrue_task 2020-10-13 07:13:42 +00:00
Robert Schmidt
a6126a39a5 Remove MAX_NUMBER_NETIF and use num UE 2020-10-13 09:07:46 +02:00
Robert Schmidt
8c5976e279 Use "ip add" to add IP addresses
This then only uses the "modern" ip tool instead of ifconfig, and the
command is more "homogeneous".
2020-10-13 09:07:46 +02:00
Robert Schmidt
298956509f Delete double UE IP config setup 2020-10-13 09:07:46 +02:00
Robert Schmidt
4c7035e6e3 Remove UESIM_EXPANSION
This completely removes the UESIM_EXPANSION define: it does not compile
at the moment. Its function was to multiplex multiple UEs on the same
TUN interface. However, this functionality is not needed since it is
possible to allocate many TUN devices (i.e., >= 32).
2020-10-13 09:07:46 +02:00
Francesco Mani
4df83dd00e Merge remote-tracking branch 'origin/fix_rrc_x2_ticking' into NR_CSI_reporting 2020-10-13 08:51:13 +02:00
Robert Schmidt
ff48c369c5 Lower nFAPI eNB log level 2020-10-13 08:49:30 +02:00
Robert Schmidt
ac4bb8bc55 Prevent deadlocks in nFAPI when no free index 2020-10-13 08:49:30 +02:00
Robert Schmidt
9882460607 Remove Mutexes in phy_stub_UE.c
Various mutexes are present in the phy_stub_UE.c file. However, it will
only be run in a single thread; the multiple-thread implementation also
runs the higher layers concurrently, which leads to races and segfaults.
Therefore, remove these mutexes, as we don't need them.
2020-10-13 08:49:30 +02:00
Robert Schmidt
581de8b2d8 Limit UE UL RBs to 48 2020-10-13 08:49:30 +02:00
Robert Schmidt
41a440fad2 Do not schedule static slices if 0 RB(G)s 2020-10-13 08:49:29 +02:00
Robert Schmidt
ca1b0e2bbc Bugfix RR algo: if a UE cannot be allocated, skip it 2020-10-13 08:49:29 +02:00
abdeljel
8aa270a7c0 Refactor HARQ retx in try_allocate_harq_retransmission() 2020-10-13 08:49:29 +02:00
yincong
e344a7bd4a add Sidelink redioresource 2020-10-13 06:14:16 +00:00
Xue Song
f6d5e5f95d handle dcch message in rrc_nrue_task 2020-10-13 02:11:39 +00:00
Sakthivel Velumani
c9c1df0bff fixed dlsim build error
also added a log message for DCI generation in MAC
2020-10-12 18:59:15 +02:00
Sakthivel Velumani
f7cef6b132 fixed return value inconsistancy
changed uint8_t to void as return is not used in the calling function
2020-10-12 18:59:14 +02:00
Sakthivel Velumani
de4a370c39 changing k2 to 6 to support oai-ue
this shouldn't affect the testing with cots ue
2020-10-12 18:59:14 +02:00
Sakthivel Velumani
3a7079228e scheduling slot 2 aslo 2020-10-12 18:59:14 +02:00
Robert Schmidt
72556206e9 Simplify set_Y() 2020-10-12 18:59:14 +02:00
Sakthivel Velumani
e75108d312 fixing dlsim 2020-10-12 18:59:14 +02:00
Sakthivel Velumani
5307eed845 fixing warnings 2020-10-12 18:59:14 +02:00
Sakthivel Velumani
8a1be8aa2f increased the number of pdcch candidates in ue 2020-10-12 18:59:14 +02:00
Sakthivel Velumani
62562c32e9 fixing bug in pucch 2020-10-12 18:59:14 +02:00
Sakthivel Velumani
6b3ddcc799 fixed cce indexing to allow multiple pdcch on single coreset 2020-10-12 18:59:14 +02:00
Mahesh K
6f4e894318 Merge branch 'fork_develop' into 'develop_nfapi'
Fork develop

See merge request Aniq/openairinterface5g!5
2020-10-12 18:56:41 +02:00
Mahesh K
66a6d550a6 benetel: driver for Benetel's 4G and 5G RRUs
This commit contains work done by Eurecom and by Benetel.
2020-10-12 18:56:41 +02:00
Laurent
910a130eb2 Merge branch 'noCore' of https://gitlab.eurecom.fr/oai/openairinterface5g into noCore 2020-10-12 18:25:19 +02:00
Laurent
4f2d8ebfcd merge develop, use Linux crypto library 2020-10-12 18:24:08 +02:00
hardy
fd571e9014 Merge remote-tracking branch 'origin/small-bugfixes-w40' into integration_2020_wk41 2020-10-12 18:08:16 +02:00
hardy
e801d03836 Merge remote-tracking branch 'origin/rh_ci_oc' into integration_2020_wk41 2020-10-12 18:07:27 +02:00
Sakthivel Velumani
4074db8515 Hotfix for DL DCI issue in UE
Created two dci_pdu's to hold dci configuration for UL and DL DCI.
This wasn't a problem before as only one DCI was scheduled.
2020-10-12 18:07:24 +02:00
matzakos
cb7b924950 Create dummy x2 function where needed in the nr phy simulators
-To avoid including the whole x2 libraries for the corresponding executables
2020-10-12 17:53:40 +02:00
Raphael Defosseux
221e43bbb9 NASMESH: support for latest kernel version on RHEL
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-10-12 17:29:04 +02:00
Raphael Defosseux
357748dfff BUILD: fix check when not in a container
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-10-12 17:29:04 +02:00
Raphael Defosseux
00926c5b7d [DOCKER][Ubuntu18]: adding Ubuntu18 support
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-10-12 17:29:04 +02:00
Raphael Defosseux
b6d0f22c13 [OC][RHEL8]: updating dockerfiles w/ proper library management on target images + support for USRP build
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-10-12 17:28:41 +02:00
Raphael Defosseux
49e1add19f [DOCKER][RHEl8]:
* Standalone support on RHEL8.2 (without OpenShift build-config system)
* few ports for RHEL8.2 standalone podman/docker usage
* Supports eNB/gNB/LTE-UE/NR-UE

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-10-12 17:25:46 +02:00
Raphael Defosseux
4aae87ca5e BUILD: remove ue_ip is container-based build
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-10-12 17:25:46 +02:00
Raphael Defosseux
45dfec4671 [OC][RHEL8]: copy/pasta error on build options
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-10-12 17:25:23 +02:00
Raphael Defosseux
8c41a241ee [OC][RHEL8]: finalizing lte/nr UE image builds on RHEL8
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-10-12 17:24:37 +02:00
Raphael Defosseux
40ff24661e [DOCKER]: fix files to copy
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-10-12 17:24:18 +02:00
Raphael Defosseux
0100b26686 [OC]: added support for RHEL8.2
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-10-12 17:23:30 +02:00
hardy
e598df840e [OC][Docker][RHEL8] Initial Support 2020-10-12 17:17:16 +02:00
Francesco Mani
b7d71d58ad Merge remote-tracking branch 'origin/fix_rrc_x2_ticking' into NR_CSI_reporting 2020-10-12 17:14:55 +02:00
Francesco Mani
d0bcde029a Merge remote-tracking branch 'origin/develop' into NR_CSI_reporting 2020-10-12 17:08:04 +02:00
Mahesh
062d00fb85 PBCH and PDCCH constellation obtained for downlink. 2020-10-12 19:02:11 +05:30
rmagueta
f2d5bce803 MIB NR: pdcch_ConfigSIB1 selection and fill 2020-10-12 12:11:19 +01:00
rmagueta
413ab9bc57 MIB NR: pdcch_ConfigSIB1 selection and fill 2020-10-12 11:59:04 +01:00
yaojie
5db27b9305 Add RRCSetup 2020-10-12 09:29:56 +00:00
Laurent
489fc7c0fe trial 2020-10-12 10:52:46 +02:00
Xue Song
f4f8db4373 Merge branch 'develop_SA_RRC' into develop_SA_SIM
Modify RRCReconfiguration
2020-10-12 04:59:49 +00:00
Xue Song
994229963b Modify RRCReconfiguration 2020-10-12 02:59:22 +00:00
Wu.Jing
ac6262e82b fix gNB build error 2020-10-10 06:57:57 +00:00
yaojie
3b6f720125 RM3977 2020-10-10 06:25:29 +00:00
Xue Song
fefb6148e6 Modify some warnings
Add nr_rrc_pdcp_config_security
Delete ENABLE_SECURITY
2020-10-10 06:18:40 +00:00
zhenghuangkun
84579c5dc0 Modify MME_MODE_ENABLED to AMF_MODE_ENABLED
Modify kenb to kgnb
Modify some warnings
2020-10-10 06:16:49 +00:00
He Shanyun
90dc22aea6 add rrc_nrue_task 2020-10-10 05:15:46 +00:00
Xue Song
aa8e695d59 Fix compiling error 2020-10-10 03:24:06 +00:00
Wu.Jing
079157eb55 cherry-pick 3efc7538ac 2020-10-10 11:26:40 +09:00
zhenghuangkun
6ca5753555 Add author and email 2020-10-10 10:56:14 +09:00
He Shanyun
c180323de4 fix compile issue about build ngap asn file 2020-10-10 10:55:49 +09:00
He Shanyun
9e428fe6c2 dummy define for some fields 2020-10-10 10:55:31 +09:00
zhenghuangkun
45e5be9c44 Add ErrorIndication
Add Paging
Add PDUSessionResourceModifyRequest
2020-10-10 10:55:01 +09:00
zhenghuangkun
57b28d0732 Add PDUSessionResourceReleaseCommand 2020-10-10 10:53:08 +09:00
zhenghuangkun
22ac1b9486 Add PDUSessionResourceModifyResponse
Add PDUSessionResourceReleaseResponse
Add NASNonDeliveryIndication
2020-10-10 10:52:08 +09:00
yincong
55495f68bc modify PDUSessionResourceSetupRequest 2020-10-10 10:51:51 +09:00
yincong
b84880a1fe PDUSessionResourceSetupRequest
PDUSessionResourceSetupResponse
2020-10-10 10:51:20 +09:00
zhenghuangkun
655b7d64f9 Add UERadioCapabilityInfoIndication 2020-10-10 10:51:10 +09:00
He Shanyun
fbea1eff2b modify type of tac 2020-10-10 10:50:57 +09:00
zhenghuangkun
c6d6a42484 Add UEContextReleaseComplete
Add UEContextReleaseRequest
2020-10-10 10:50:43 +09:00
zhenghuangkun
5217b76448 Add DownlinkNASTransport Message
Add UEContextReleaseCommand Message
Modify NGSetup Message Encode failed
2020-10-10 10:50:19 +09:00
Thomas Schlichter
5d4bc9d72a fix compilation of telnetsrv_proccmd.c with deadline scheduler disabled 2020-10-09 18:18:23 +02:00
Thomas Schlichter
986bd80c4e fix some cppcheck warnings 2020-10-09 17:45:48 +02:00
Thomas Schlichter
2d99d9ab8d Synchronize gnb.band78.tm1.106PRB.usrpn300.conf files in ci-scripts and targets directory 2020-10-09 17:23:48 +02:00
Francesco Mani
74b2aec212 fix for rach pdus 2020-10-09 13:46:38 +02:00
Remi Hardy
0fe3e5fde2 Merged branch 'integration_2020_wk40' into 'develop'
Integration 2020 wk40 comprises the following udpates:

MR893 ULSCH decode mthread: 
- Enabled parallelization of ULSCH segments decoding, deinterleaving and rx rate matching.
  
MR896 Nsa remove band hardcodings:
- A missing commit from wk39, just a log change   

MR901 NR UE DCI improvements:
- Handling of DCI formats 0_0 and 0_1, including removing hard-coding and scheduling PUSCH with DCI parameters
- Blind decoding of DCIs based on size and format indicator
- Fix for segmentation fault during ULSCH encoding

MR895 support of RA procedure by implementing Msg3 on UE

MR908 NR DL scheduler improvements:
Preliminary work on the DL scheduler
- cleanup of DL scheduler, add interface preprocessor-postprocessor (`NR_UE_sched_ctrl_t`)
- postprocessor can handle multiple UEs. Preprocessor will follow soon (proportional fair scheduler)
- No MAC UE Context creation before end of RA (Msg 3)
These updates do not change anything performance wise (no additional scheduled slots, etc). 
This MR also reduces gNB log.
2020-10-09 11:26:09 +02:00
yaojie
457423fe25 RM3977 2020-10-09 08:03:48 +00:00
Robert Schmidt
8cb530d25c Address review in !913: rename functions 2020-10-09 09:02:59 +02:00
Francesco Mani
f28d7ce8ff bugfix in dlsim and ulsim 2020-10-08 17:33:17 +02:00
matzakos
9aba4bcf8c Include X2 libraries in nr phy simulators to avoid linking errors
-Also change the place of the check on whether x2ap is enabled to trigger the ITTI tick message from RRC to X2AP.
2020-10-08 15:34:35 +02:00
Raphael Defosseux
43c76e868f CI: adding waiver on License Banner check for milenage.h file
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-10-08 13:44:56 +02:00
Qiu Dezhi
ad1f8a372e Add RrcSetupComplete 2020-10-08 14:22:23 +09:00
Thomas Schlichter
2a4153eb29 fixup previous merge with develop branch 2020-10-07 17:54:39 +02:00
Robert Schmidt
a389e6f5e9 Fixup: reserve space for TA command 2020-10-07 17:54:39 +02:00
Francesco Mani
dec42f3385 rearrangement of handle_uci function for acknack 2020-10-07 17:38:37 +02:00
matzakos
1a5874d40f Fix to avoid RRC->X2AP ticking every msec when x2ap task is not enabled
-Since the aim of itti RRC_SUBFRAME_PROCESS message (MAC->RRC) is to trigger an itti X2AP_SUBFRAME_PROCESS message (RRC->X2AP), avoid creating
RRC_SUBFRAME_PROCESS message if x2ap task is not enabled. Not sure if this is the best solution. We could also avoid only sending the second itti X2AP_SUBFRAME_PROCESS message.
2020-10-07 14:37:02 +02:00
Mahesh
ff64d6ac10 Resolved UE building error and updated packing of P7 messages 2020-10-07 15:01:40 +05:30
Francesco Mani
3af7ab3ff8 Merge remote-tracking branch 'origin/develop' into NR_CSI_reporting 2020-10-07 11:20:32 +02:00
Xue Song
97dd024c1d Fix some issues 2020-10-07 08:57:30 +00:00
Raphael Defosseux
5411461582 Merge remote-tracking branch 'origin/develop' into integration_2020_wk40 2020-10-07 10:53:36 +02:00
matzakos
c6aae3140e Merge develop branch into NR_SA_NGAP_RRC 2020-10-07 10:38:58 +02:00
zhanghuiqin
8f2c96e6e2 add RRCReconfigurationComplete 2020-10-07 12:20:19 +08:00
Dong Anyuan
d82d881463 create CPPCheck Jenkins Job for OAI-5GNG/develop_SA_L3 2020-10-07 12:07:35 +09:00
Shweta Shrivastava
2305470a75 Fix for using K2 offset other than 2 2020-10-06 13:26:45 -05:00
Robert Schmidt
f146b640d5 FlexRAN agent app: trigger UE-slice assoc through IMSI regex 2020-10-06 19:47:33 +02:00
matzakos
824c504b11 Fix to avoid RRC->X2AP ticking every msec when x2ap task is not enabled
-Since the aim of itti RRC_SUBFRAME_PROCESS message (MAC->RRC) is to trigger an itti X2AP_SUBFRAME_PROCESS message (RRC->X2AP), avoid creating
RRC_SUBFRAME_PROCESS message if x2ap task is not enabled. Not sure if this is the best solution. We could also avoid only sending the second itti X2AP_SUBFRAME_PROCESS message.
2020-10-06 18:31:31 +02:00
Robert Schmidt
e569577944 FlexRAN: send loaded apps/macObjects to RTC 2020-10-06 17:45:50 +02:00
Robert Schmidt
28c47996e4 When preparing slice update/search also loaded libraries 2020-10-06 17:45:50 +02:00
Robert Schmidt
38ace905aa Check for shared objects beforing setting scheduler 2020-10-06 17:45:50 +02:00
Robert Schmidt
21dcd834cc Save list of SOs used in user plane 2020-10-06 17:45:50 +02:00
Robert Schmidt
65e52fcf11 Inform MAC of control delegation and load in user plane 2020-10-06 17:44:16 +02:00
Robert Schmidt
0f641b7d9c If unknown scheduler, save message and contact controller 2020-10-06 17:44:16 +02:00
Robert Schmidt
9de83a047a FlexRAN: Add control_delegation_request protobuf message 2020-10-06 17:44:16 +02:00
Robert Schmidt
c500babe8b FlexRAN fixup: FLPT_DELEGATE_REQUEST and corresp. destroy() 2020-10-06 17:44:16 +02:00
Robert Schmidt
865348b047 FlexRAN agent app: Add sample FlexRAN app 2020-10-06 17:44:16 +02:00
Robert Schmidt
fde3127823 FlexRAN Agent reconfiguration: call flexran_agent_handle_apps() 2020-10-06 17:44:16 +02:00
Robert Schmidt
8772856fd4 FlexRAN: Add app loader/CM 2020-10-06 17:44:16 +02:00
Robert Schmidt
9e4320864f FlexRAN control delegation: write/remove depending if payload present 2020-10-06 17:44:09 +02:00
Robert Schmidt
6e2c8d847a FlexRAN: new agent reconfiguration syntax, instead of YAML 2020-10-06 17:44:09 +02:00
Robert Schmidt
1c5a4eb645 FlexRAN: add control app delegation type in protobuf 2020-10-06 17:44:09 +02:00
Robert Schmidt
61344db9dd FlexRAN delegation: mapper function to return path name 2020-10-06 17:44:08 +02:00
Robert Schmidt
f63cf65919 FlexRAN: Improve handling of received shared objects 2020-10-06 17:44:08 +02:00
Robert Schmidt
5d9c61ea2a FlexRAN timers: Fix segfault timer no associated message 2020-10-06 17:27:12 +02:00
Robert Schmidt
33b73193e8 FlexRAN timers: enable timer add/remove within timer event
A lock help during executing a timer event prevented such event from
creating/removing new timers due to a dead lock. This commit changes the
logic of the timing loop and adding/removing code such that this dead
lock does not happen.
2020-10-06 17:27:12 +02:00
Robert Schmidt
7bdf807bab FlexRAN timers: Remove destroy_timers() 2020-10-06 17:27:12 +02:00
Robert Schmidt
db933da183 FlexRAN bugfix: first timer expiry after period 2020-10-06 17:27:12 +02:00
Francesco Mani
87b02489b0 using crnti as tcrnti 2020-10-06 14:12:29 +02:00
Laurent
6b676d1605 Fix compilation issues 2020-10-06 13:54:30 +02:00
hardy
d61f45ecb9 Merge remote-tracking branch 'origin/ulsch_decode_mthread' into integration_2020_wk40 2020-10-06 11:00:09 +02:00
hardy
8f9ba5553d Merge remote-tracking branch 'origin/nsa_remove_band_hardcodings' into integration_2020_wk40 2020-10-06 09:30:04 +02:00
Francesco Mani
8d6e0a43d1 adding cfra flag 2020-10-05 18:04:20 +02:00
Francesco Mani
3ac23f80f9 Merge remote-tracking branch 'origin/NR_DL_scheduler' into nr_ue_msg3 2020-10-05 14:56:18 +02:00
Francesco Mani
8e4a2f82c4 bugfix in crc6 2020-10-05 14:48:58 +02:00
Robert Schmidt
2904367165 Fixup: reserve space for TA command 2020-10-05 13:14:58 +02:00
Robert Schmidt
2e41782a12 Add configurable UE as param for nr_generate_dlsch_pdu() 2020-10-05 13:14:58 +02:00
Robert Schmidt
eb263af39e Remove statistics from nr_generate_dlsch_pdu() 2020-10-05 13:14:58 +02:00
Robert Schmidt
4ecb236df6 nr_fill_nfapi_dl_pdu(): pdu index and nPDUs counting 2020-10-05 13:14:58 +02:00
Robert Schmidt
cbd6250fdf Directly construct tx_req nFAPI message in DL postprocessor 2020-10-05 13:14:58 +02:00
Robert Schmidt
22cb1567d4 allocate only necessary amount of RBs 2020-10-05 13:14:58 +02:00
Robert Schmidt
d145d8d662 Consider retransmissions in the preprocessor 2020-10-05 13:14:58 +02:00
Robert Schmidt
0ef332ef75 DL Post processor: distinguish tx/retx 2020-10-05 13:14:58 +02:00
Robert Schmidt
acffd17d6f Store retx Info 2020-10-05 13:14:58 +02:00
Robert Schmidt
8a004df0c9 Create UE MAC Context after successful RA 2020-10-05 13:14:58 +02:00
Robert Schmidt
ee850206e4 fixup: throughput correct only if first TDD slot 2020-10-05 13:14:58 +02:00
Robert Schmidt
f80ab8797a Use vrb_map in in DL for NSA mode 2020-10-05 13:14:58 +02:00
Robert Schmidt
d7d21efcf5 Post-processor: enable multi-UE handling 2020-10-05 13:14:58 +02:00
Robert Schmidt
059f585e06 Preprocessor: check for number of UEs 2020-10-05 13:14:58 +02:00
Robert Schmidt
abd608b6cb Mark active in add_new_nr_ue() only if phytest 2020-10-05 13:14:58 +02:00
Robert Schmidt
d921581922 Remove fiveG_connected and use active 2020-10-05 13:14:58 +02:00
Robert Schmidt
793cbda97e Simplify allocate_rn_CCEs() 2020-10-05 13:14:58 +02:00
Robert Schmidt
1a73ea6c6d Make UE_info.active C99 bool 2020-10-05 13:14:58 +02:00
Robert Schmidt
0032bcc905 add_nr_ue_list() 2020-10-05 13:14:58 +02:00
Robert Schmidt
d0667d9ea4 Add NR_UE_list_t type 2020-10-05 13:14:58 +02:00
Robert Schmidt
e956c17bf8 Rename NR_UE_list_t to NR_UE_info_t
The name NR_UE_list_t is misleading: beyond being a simple "list", this
structure carries all/most UE-related MAC information. If at all, it is
a container for multiple lists. The next commit introduces a
NR_UE_list_t structure that organizes UEs in lists such that it is
easier to go through the UEs.
2020-10-05 13:14:58 +02:00
Thomas Schlichter
97354f1e2f Merge remote-tracking branch 'NR_UE_UL_DCI_improvements' into integration_2020_wk40
Conflicts:
	openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c
	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
	openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c
2020-10-05 12:15:59 +02:00
Thomas Schlichter
8b4d1a0f0f Merge remote-tracking branch 'NR_DL_scheduler' into integration_2020_wk40 2020-10-05 12:13:13 +02:00
hardy
51311c6c1c adding RA test to CI 2020-10-05 11:25:52 +02:00
Francesco Mani
91bfb290f1 Merge branch 'NR_CSI_reporting' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_CSI_reporting 2020-10-05 11:24:49 +02:00
Francesco Mani
9301bca035 fix for pucch rx reading rxdataF 2020-10-05 11:24:32 +02:00
Robert Schmidt
f28679b360 PreProc IF: save MCS-info per UE 2020-10-05 10:29:45 +02:00
Robert Schmidt
f9dd8292f8 PreProc IF: Freq domain allocation per UE 2020-10-05 10:29:45 +02:00
Robert Schmidt
6c7ff44cd9 PreProc IF: save Time domain assignment info per UE 2020-10-05 10:29:45 +02:00
Robert Schmidt
112b30d79a PreProc IF: save PUCCH info per UE 2020-10-05 10:29:45 +02:00
Robert Schmidt
34a31a20b7 PreProc IF: save CCE info per UE 2020-10-05 10:29:45 +02:00
Robert Schmidt
dcdee083ac PreProc IF: RLC status per UE 2020-10-05 10:29:45 +02:00
Robert Schmidt
d12180b25b Start PreProc interface, add UE active BWP 2020-10-05 10:29:45 +02:00
Robert Schmidt
f86e4305f6 Reduce log DLSCH scheduler 2020-10-05 10:29:45 +02:00
Robert Schmidt
1b5558537f Move HARQ calculations out of nr_fill_nfapi_dl_pdu() 2020-10-05 10:29:45 +02:00
Robert Schmidt
4cebd0dd92 Only send random data if phytest 2020-10-05 10:29:45 +02:00
Robert Schmidt
7f51eca9d3 Remove UE-specific ulsch bitmap, special phy test slot
when in phy test, only schedule UE to be in slot 8
2020-10-05 10:29:45 +02:00
Robert Schmidt
14613222f3 clean up gNB_dlsch_ulsch_scheduler(), remove UE-specific DL bitmap 2020-10-05 10:29:45 +02:00
Robert Schmidt
de2cf2393b Do not allocate CCE in nr_configure_pdcch()
nr_configure_pdcch() allocates the CCE, but this is not wanted, e.g., in
multi-user scheduling, since it might not be possible to allocate the
CCEs for these UEs. This commit makes the following changes:

- remove CCE allocation in nr_configure_pdcch()
- remove coreset search in nr_configure_pdcch()
- add functions get_coreset() and get_searchspace() to retrieve coresets
  and search spaces easily
- in nr_fill_nfapi_dl_pdu(), add extra parameters for aggregation level
  and CCE indices and the searchspace and coreset of a UE, which might
  be different for each UE
- allocate CCEs manually in phytest, RA, and DLSCH schedulers
2020-10-05 10:29:45 +02:00
Robert Schmidt
43f177e7df Restructure nr_schedule_ue_spec() 2020-10-05 10:29:44 +02:00
Robert Schmidt
3de6b619be Move TBS calculation out of nr_fill_nfapi_dl_pdu 2020-10-05 10:29:44 +02:00
Robert Schmidt
685c540353 nr_fill_nfapi_dl_pdu(): MCS + other params configurable 2020-10-05 10:29:44 +02:00
Robert Schmidt
041bb7a755 Inline nr_get_tbs_dl() 2020-10-05 10:29:44 +02:00
Robert Schmidt
7a0650c40c nr_fill_nfapi_dl_pdu(): Parameters by value, not pointers 2020-10-05 10:29:44 +02:00
Robert Schmidt
77f5d59691 Create separate nr_fill_nfapi_dl_pdu() 2020-10-05 10:29:44 +02:00
Robert Schmidt
e259111f77 Create NR DLSCH nr_schedule_ue_spec() 2020-10-05 10:29:44 +02:00
Robert Schmidt
7cf7a0e8b1 Reduce log nr-softmodem 2020-10-05 10:24:41 +02:00
hardy
eb3f34aad5 fixed egrep to match pass test 2020-10-05 10:14:10 +02:00
hardy
538be9155c finalized RFsim RA check test 2020-10-04 21:34:30 +02:00
Florian Kaltenberger
c2889d3b49 Merge remote-tracking branch 'origin/develop' into NR_MAC_SSB_RO_GlobalEdge 2020-10-04 20:54:40 +02:00
Florian Kaltenberger
39615e8210 fixing ocp targets as well 2020-10-04 20:54:27 +02:00
Laurent
4772f7f6e4 for push to OSA git 2020-10-04 19:35:41 +02:00
Laurent
4dacef8bb7 merge develop and test 2020-10-04 19:22:33 +02:00
hardy
0004490f58 rfsim RA check : check html formatting 2020-10-04 15:52:18 +02:00
hardy
15005cfd28 still working on rfsim RA test 2020-10-04 14:46:41 +02:00
Sakthivel Velumani
eebc233abd reducing ulsch decoding cores for CI segfault 2020-10-02 15:18:04 +02:00
Sakthivel Velumani
53f3874032 updating ulsim to take samples from exernal source 2020-10-02 15:11:28 +02:00
Sakthivel Velumani
3367b0f199 fixing compile warnings 2020-10-02 14:30:42 +02:00
laurent
5cb8e9e14d Reduce difference with OSA develop branch for merge 2020-10-02 11:26:46 +02:00
Cedric Roux
0ec02eaf5d T tracer: bugfix: properly log the MIB
Bytes of the MIB were logged in reverse.

Bug reported by David Breaux <davidbreaux67@gmail.com>.
2020-10-01 18:18:25 +02:00
Cedric Roux
35a0a4e1c7 rrc enb: small fix to avoid wrong code execution
dedicated_DRB was not set properly when the NSA UE sends
ReconfigurationComplete so the wrong code was executed below
(we had dedicated_DRB == 0). Let's put a value that does
nothing (-1 seems fine).
2020-10-01 18:18:25 +02:00
Cedric Roux
3c85a88081 s1ap encoding: return -1 on error 2020-10-01 18:18:25 +02:00
Remi Hardy
bc73585d31 Merge branch 'integration_2020_wk39' into 'develop', comprising :
MR 896 : Nsa remove band hardcodings  
Removes hardcodings of EUTRA and NR bands in UE_Capability_Enquiry and NR_UE Capability_Enquiry messages, providing them from the eNB config file and gNB over X2 respectively. Moreover, the SSB Absolute frequency of the gNB is now provided by the eNB configuration file (instead of being hardcoded at rrc_eNB.c)  

MR903 : pusch ta update  
Update of PUSCH Timing advance  

MR 900 : improve x2/rrc for ENDC  
This MR introduces several enhancements in X2AP and RRC to deal with ENDC. 
The main goal is to deal with UE's on/off and with various errors.
Includes :
- DC prep and DC overall X2 timers
- X2 messages for UE release and DC timers' timeout
2020-10-01 18:16:53 +02:00
Rakesh
5f7c30fb8c fix for get_slot_from_timestamp 2020-10-01 17:47:17 +02:00
laurent
6b50cbcae2 continue 5G SA 2020-10-01 16:13:03 +02:00
Hongzhi Wang
0ea9c3f711 ue changing csi length function name 2020-10-01 13:12:02 +02:00
Florian Kaltenberger
e68d09404c fixing compiler warnings and hopefully if4.5 CI tests 2020-10-01 07:40:49 +02:00
Sakthivel Velumani
13b016de53 doing nr_segmentation in all rounds
because round 0 could be skipped if no pusch signal detected
2020-09-30 16:24:40 +02:00
Robert Schmidt
a2bf8f478a Add configurable UE as param for nr_generate_dlsch_pdu() 2020-09-30 14:52:59 +02:00
Robert Schmidt
f97c4f8ae6 Remove statistics from nr_generate_dlsch_pdu() 2020-09-30 14:52:59 +02:00
Robert Schmidt
574f47d014 nr_fill_nfapi_dl_pdu(): pdu index and nPDUs counting 2020-09-30 14:52:59 +02:00
Robert Schmidt
ea9aacd664 Directly construct tx_req nFAPI message in DL postprocessor 2020-09-30 14:52:59 +02:00
Robert Schmidt
b7b32fbe77 allocate only necessary amount of RBs 2020-09-30 14:52:59 +02:00
Robert Schmidt
0c61983196 Consider retransmissions in the preprocessor 2020-09-30 14:52:59 +02:00
Robert Schmidt
2209b999a0 DL Post processor: distinguish tx/retx 2020-09-30 14:52:59 +02:00
Robert Schmidt
09d85a052a Store retx Info 2020-09-30 14:52:59 +02:00
Robert Schmidt
b4d8e41a00 Create UE MAC Context after successful RA 2020-09-30 14:52:59 +02:00
Robert Schmidt
a2b1fa5d57 fixup: throughput correct only if first TDD slot 2020-09-30 14:52:59 +02:00
Robert Schmidt
b9eb6c9843 Use vrb_map in in DL for NSA mode 2020-09-30 14:52:59 +02:00
Robert Schmidt
ce2dd17ed5 Post-processor: enable multi-UE handling 2020-09-30 14:52:59 +02:00
Robert Schmidt
fdb4c69221 Preprocessor: check for number of UEs 2020-09-30 14:52:59 +02:00
Robert Schmidt
f13c97db02 Mark active in add_new_nr_ue() only if phytest 2020-09-30 14:52:59 +02:00
Robert Schmidt
738d61a173 Remove fiveG_connected and use active 2020-09-30 14:52:59 +02:00
Robert Schmidt
77e2a5aab8 Simplify allocate_rn_CCEs() 2020-09-30 14:52:59 +02:00
Robert Schmidt
5efe475120 Make UE_info.active C99 bool 2020-09-30 14:52:59 +02:00
Robert Schmidt
34f61ce396 add_nr_ue_list() 2020-09-30 14:52:59 +02:00
Robert Schmidt
ccb83d16e1 Add NR_UE_list_t type 2020-09-30 14:52:59 +02:00
Robert Schmidt
adcd2949fe Rename NR_UE_list_t to NR_UE_info_t
The name NR_UE_list_t is misleading: beyond being a simple "list", this
structure carries all/most UE-related MAC information. If at all, it is
a container for multiple lists. The next commit introduces a
NR_UE_list_t structure that organizes UEs in lists such that it is
easier to go through the UEs.
2020-09-30 14:52:59 +02:00
Robert Schmidt
476c7177f9 PreProc IF: save MCS-info per UE 2020-09-30 14:52:59 +02:00
Robert Schmidt
9ad94aad82 PreProc IF: Freq domain allocation per UE 2020-09-30 14:52:59 +02:00
Robert Schmidt
123a4e9ada PreProc IF: save Time domain assignment info per UE 2020-09-30 14:52:59 +02:00
Robert Schmidt
ad4da1b068 PreProc IF: save PUCCH info per UE 2020-09-30 14:52:59 +02:00
Robert Schmidt
020405686c PreProc IF: save CCE info per UE 2020-09-30 14:52:59 +02:00
Robert Schmidt
5e5abe420e PreProc IF: RLC status per UE 2020-09-30 14:52:59 +02:00
Robert Schmidt
77a814fe27 Start PreProc interface, add UE active BWP 2020-09-30 14:52:59 +02:00
Robert Schmidt
a403ca0398 Reduce log DLSCH scheduler 2020-09-30 14:52:59 +02:00
Robert Schmidt
b516e26a66 Move HARQ calculations out of nr_fill_nfapi_dl_pdu() 2020-09-30 14:52:59 +02:00
Robert Schmidt
8dd212c0d1 Only send random data if phytest 2020-09-30 14:52:59 +02:00
Robert Schmidt
439095bc84 Remove UE-specific ulsch bitmap, special phy test slot
when in phy test, only schedule UE to be in slot 8
2020-09-30 14:52:59 +02:00
Robert Schmidt
4ffc4fdad8 clean up gNB_dlsch_ulsch_scheduler(), remove UE-specific DL bitmap 2020-09-30 14:52:59 +02:00
Robert Schmidt
5578aeb4a5 Do not allocate CCE in nr_configure_pdcch()
nr_configure_pdcch() allocates the CCE, but this is not wanted, e.g., in
multi-user scheduling, since it might not be possible to allocate the
CCEs for these UEs. This commit makes the following changes:

- remove CCE allocation in nr_configure_pdcch()
- remove coreset search in nr_configure_pdcch()
- add functions get_coreset() and get_searchspace() to retrieve coresets
  and search spaces easily
- in nr_fill_nfapi_dl_pdu(), add extra parameters for aggregation level
  and CCE indices and the searchspace and coreset of a UE, which might
  be different for each UE
- allocate CCEs manually in phytest, RA, and DLSCH schedulers
2020-09-30 14:52:59 +02:00
Robert Schmidt
67a081772d Restructure nr_schedule_ue_spec() 2020-09-30 14:52:59 +02:00
Robert Schmidt
f0533b9ec4 Move TBS calculation out of nr_fill_nfapi_dl_pdu 2020-09-30 14:52:59 +02:00
Robert Schmidt
71bfadf192 nr_fill_nfapi_dl_pdu(): MCS + other params configurable 2020-09-30 14:52:59 +02:00
Robert Schmidt
fc179f396c Inline nr_get_tbs_dl() 2020-09-30 14:52:59 +02:00
Robert Schmidt
9b2be0a1f6 nr_fill_nfapi_dl_pdu(): Parameters by value, not pointers 2020-09-30 14:52:59 +02:00
Robert Schmidt
192da32734 Create separate nr_fill_nfapi_dl_pdu() 2020-09-30 14:52:59 +02:00
Robert Schmidt
566bc95bc0 Create NR DLSCH nr_schedule_ue_spec() 2020-09-30 14:52:59 +02:00
Robert Schmidt
5b9658f005 Reduce log nr-softmodem 2020-09-30 14:52:59 +02:00
hardy
f69824c998 Merge remote-tracking branch 'origin/PUSCH_TA_update' into integration_2020_wk39 2020-09-30 14:38:43 +02:00
hardy
70135e1c74 Merge remote-tracking branch 'origin/nsa_remove_band_hardcodings' into integration_2020_wk39 2020-09-30 14:36:24 +02:00
kn.raju
66b20f1ac3 Fixed improper UE_id 2020-09-30 15:23:09 +05:30
Xue Song
b331fc9af6 Add rrc_ue_process_rrcReconfiguration
->nr_rrc_ue_process_measConfig
    ->nr_rrc_ue_process_radioBearerConfig
Modify RRCReconfiguration message (gnb->ue)
2020-09-30 08:15:22 +00:00
hardy
ed0d35dcc3 dummy push 2020-09-30 09:22:04 +02:00
Shweta Shrivastava
659b8e32e4 Removed hard-coding for mcs_table 2020-09-30 01:05:29 -05:00
matzakos
410c18ecd8 Change log message 2020-09-29 19:49:18 +02:00
hardy
b9f91a62da updated the RFsim RA check (not final) 2020-09-29 18:05:18 +02:00
Francesco Mani
a53f195bb4 Merge remote-tracking branch 'origin/develop' into NR_CSI_reporting 2020-09-29 17:04:03 +02:00
Hongzhi Wang
73281a4302 ue computing csi bit length from rrc 2020-09-29 11:28:17 +02:00
Xue Song
118ac391ad Modify some warnings
Add nr_rrc_pdcp_config_security
Delete ENABLE_SECURITY
2020-09-29 06:11:02 +00:00
yincong
685837f8de Merge branch 'master' into develop_SA_L3 2020-09-29 03:08:58 +00:00
zhenghuangkun
3efc7538ac Modify MME_MODE_ENABLED to AMF_MODE_ENABLED
Modify kenb to kgnb
Modify some warnings
2020-09-29 02:56:21 +00:00
masayuki.harada
c264b2650d Merge remote-tracking branch 'remotes/origin/oai_develop' 2020-09-29 10:44:46 +09:00
Francesco Mani
1340e00fec mcs table for pusch from rrc config 2020-09-28 19:05:23 -05:00
Hongzhi Wang
8676ceea7e initializing nr ue dlsch harq status 2020-09-28 18:06:18 -05:00
hardy
544df8cbdb fixing another typo 2020-09-28 23:10:29 +02:00
masayuki.harada
c948fefec2 Revert some changes to avoid setup failure. 2020-09-28 19:55:31 +09:00
masayuki.harada
67b91fec27 Merge commit '5372a3478ad3047b80c65828862742ba4dd8b77b' into candidate_20200928 2020-09-28 19:51:43 +09:00
Francesco Mani
4b4304b5c3 modifications in pucch scheduling to avoid conflicts between acknacks and csi 2020-09-28 12:22:01 +02:00
masayuki.harada
d797dacaaa Merge branch 'candidate_20200928' into 'master'
Candidate 20200928

See merge request !1
2020-09-28 18:25:29 +09:00
zhanghuiqin
f86fb5df56 add RRCSetupRequest(ue→gnb) 2020-09-28 08:44:23 +00:00
Francesco Mani
0b1f0f8693 function to compute nr of prbs for pucch 2020-09-28 10:35:37 +02:00
yincong
b46abe7bcb add nr_rrc_ue_process_securityModeCommand
add pdcp_config_set_security
2020-09-28 07:22:52 +00:00
zhenghuangkun
ad44cbdc94 Add author and email 2020-09-28 06:03:39 +00:00
hardy
2498bc8bc0 fixed 1 typo ; 1 cut error (part of code missing) 2020-09-27 12:54:41 +02:00
hardy
175c98af0e Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into rh_ci_py 2020-09-27 12:30:56 +02:00
Guido Casati
f8796fb71f Update doc/RUNMODEM.md with the RA setup 2020-09-25 13:50:08 +02:00
Xue Song
b5f58b7d22 Add RRCReconfigurationComplete message
Modify compilation warning
2020-09-25 10:27:27 +00:00
hardy
670ca6877e logging debug data from initializeUE 2020-09-25 11:32:08 +02:00
Francesco Mani
df369e0cae mcs table for pusch from rrc config 2020-09-25 10:13:26 +02:00
He Shanyun
9c462934d4 fix compile issue about build ngap asn file 2020-09-25 07:55:58 +00:00
Francesco Mani
a0ec575b3c initialization of ta variables 2020-09-25 07:50:57 +02:00
Francesco Mani
17051b86d8 changes in ta procedure at gnb, to be tested with the phone 2020-09-25 07:50:45 +02:00
Shweta Shrivastava
06313dc616 Introduced UE Assertion if value of K2 is less than DURATION_RX_TO_TX 2020-09-24 23:53:07 -05:00
Shweta Shrivastava
911092f574 Fixed values of slot offset K2 in gNB config file 2020-09-24 23:48:46 -05:00
hardy
8ccf320813 terminateOAIUE was still missing an arg 2020-09-24 23:17:56 +02:00
Francesco Mani
b69920b9f6 fix for reference point for k in pucch2 dmrs 2020-09-24 18:50:06 +02:00
hardy
2fe140ffa6 Merge branch 'rh_ci_py' of https://gitlab.eurecom.fr/oai/openairinterface5g into rh_ci_py 2020-09-24 17:29:44 +02:00
hardy
09052083d2 working on RA test for 5G Rfsim 2020-09-24 17:27:22 +02:00
He Shanyun
1aac22879c dummy define for some fields 2020-09-24 11:56:06 +00:00
laurent
ffd4c20e58 fix L2 tracing in wireshark, start security mode comman 2020-09-24 11:55:43 +02:00
Hongzhi Wang
4cb1193ba2 initializing nr ue dlsch harq status 2020-09-24 09:27:32 +02:00
matzakos
72b53688b8 Merge branch 'nsa_remove_band_hardcodings' of https://gitlab.eurecom.fr/oai/openairinterface5g into nsa_remove_band_hardcodings 2020-09-24 08:11:30 +02:00
matzakos
7c8019da9f Merge develop into nsa_remove_band_hardcodings branch 2020-09-24 08:10:55 +02:00
kn.raju
f07ef48249 solved nr_dlsim issue 2020-09-24 11:26:56 +05:30
zhanghuiqin
7dac9ba9a0 add UECapabilityEnquiry 2020-09-24 14:08:43 +09:00
Xue Song
caff16a6d1 Add RRCReconfiguration message 2020-09-24 03:00:43 +00:00
He Shanyun
966569c119 implement RRC release 2020-09-24 01:33:53 +00:00
Qiu Dezhi
49eb710850 add UeCapabilityInformation message 2020-09-24 10:14:27 +09:00
hardy
c74e1b2c04 reverted some changes that are no longer needed (and lead to improper execution) 2020-09-24 00:03:44 +02:00
Remi Hardy
f66b79fffb added nr_scg_ssb_freq param in enb conf file used by CI 2020-09-23 17:48:35 +02:00
hardy
a0c30944a4 added 5g rfsim RA check procedure 2020-09-23 16:44:37 +02:00
hardy
812b2384fc fixed SSH issue / fixed functions arguments 2020-09-23 15:01:59 +02:00
zhanghuiqin
06578d2d2b add UECapabilityEnquiry 2020-09-23 19:28:34 +09:00
zhenghuangkun
79632d2f91 Add ErrorIndication
Add Paging
Add PDUSessionResourceModifyRequest
2020-09-23 05:45:33 +00:00
Florian Kaltenberger
a06a2ef700 moving find_SSB_and_RO_available to MAC 2020-09-22 22:48:50 +02:00
Laurent
3024f57805 Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into noCore 2020-09-22 17:57:27 +02:00
Cedric Roux
1d583c14a8 nr: fix compilation of physical simulators
Maybe not the right way to do.
To be checked.
2020-09-22 17:42:30 +02:00
Francesco Mani
03b97dd45e using signal_energy_nodc 2020-09-22 17:35:27 +02:00
Laurent
19c6229049 merge develop, compile ok 2020-09-22 16:24:49 +02:00
Florian Kaltenberger
79bf2b3fb0 Merge remote-tracking branch 'origin/develop' into NR_MAC_SSB_RO_GlobalEdge 2020-09-22 15:26:57 +02:00
hardy
b9d98b0029 fixed SSH call without instanciation (temp : by passing obj as parameter) 2020-09-22 14:29:28 +02:00
Florian Kaltenberger
f11bf8dc47 reducing logs 2020-09-22 14:00:26 +02:00
Cedric Roux
6cc7e22132 nr: bugfix: set ul_valid_re_per_slot properly
After the UE disconnects, the next connection fails
because the gNB cannot decode Msg3. The root cause
seems to be this ul_valid_re_per_slot not set to 0.
Setting it before the test fixes the problem and
does not seem to impact anything else.
2020-09-22 12:44:51 +02:00
Cedric Roux
00e6a13764 nr: hack to remove UE data in gNB's PHY
Some data remains in the PHY of the gNB after UE removal by
upper layers. After some connection/deconnection/reconnection
the gNB will exit because there is no free space in PHY.

This commit adds some global variables shared by MAC and PHY.
The function mac_remove_nr_ue puts UEs to be removed in it
and the function rxtx removes what needs to be removed.

This is a hack. It will be removed at some point in time.

The real way to remove in the PHY should be to release
data after some time of inactivity in the PHY, which would
mean the UE has been removed in upper layers. Kind of
timer-based thing. There should be no communication between
PHY and MAC.
2020-09-22 12:35:44 +02:00
Cedric Roux
4236ff2b3e nr: improve x2/rrc for ENDC
This commit introduces several enhancements in X2AP and RRC to deal
with ENDC. The main goal is to deal with UE's on/off and with various
errors.

The following work is included:

    - DC prep and DC overall X2 timers
    - X2 messages for UE release and DC timers' timeout

Open problems:

    - what to do when the UE sends an scg Failure? This commit removes
      the UE. And this removal may not be correctly done
    - UE removal in the gNB's PHY layer (a next commit is coming,
      but it is hackish and will need a rework)
2020-09-22 11:57:31 +02:00
Shweta Shrivastava
8cd05eac17 Fix for handling same length DCIs 2020-09-21 22:06:55 -05:00
Shweta Shrivastava
6c6e29faf8 Merge branch 'develop' into NR_UE_UL_DCI_improvements 2020-09-21 19:19:11 -05:00
Shweta Shrivastava
590a9d41ea Fix for segfault in nrLDPC_encoder 2020-09-21 18:57:27 -05:00
Mario Hudon
b0b5825c6a -Re-added a missing function for the gNB build 2020-09-21 16:53:03 -04:00
Florian Kaltenberger
221973bffc PRACH duration to be calculated based on PRACH format.
PRACH_PDU.prach_format now interpreted according to last version (March 2020) of 5G FAPI specs
fixing nr_prachsim
2020-09-21 22:17:28 +02:00
Mario Hudon
479cacbf38 Merge remote-tracking branch 'oai-eurecom/develop' into NR_MAC_SSB_RO_UE_IDCC 2020-09-21 14:28:02 -04:00
Remi Hardy
5372a3478a Merge branch 'integration_2020_wk38' into 'develop'
Integration 2020 wk38

See merge request oai/openairinterface5g!899
2020-09-21 17:27:37 +02:00
Laurent
93550b1cb0 add test code, finished authentication 2020-09-21 15:11:02 +02:00
hardy
098409adb2 Merge remote-tracking branch 'origin/rh_ci_doc' into integration_2020_wk38 2020-09-21 14:58:12 +02:00
hardy
e95e5ac7d9 fixed python typo 2020-09-21 14:56:48 +02:00
hardy
ac970cca5f ssh fix + additional debug info 2020-09-21 11:38:54 +02:00
He Shanyun
58bab3f202 fix compiler error of UE when rrc is rel16 2020-09-21 03:29:59 +00:00
zhenghuangkun
bc70da119d Fix merge build error 2020-09-21 02:54:09 +00:00
zhenghuangkun
0f3d53e1b9 Merge remote-tracking branch 'remotes/origin/master' into develop_SA_L3 2020-09-21 02:20:35 +00:00
Mario Hudon
282823d9a7 Merge remote-tracking branch 'origin/develop' into NR_MAC_SSB_RO_UE_IDCC 2020-09-18 16:32:24 -04:00
Mario Hudon
7996582729 - Added support for random RO selection for a given SSB index in a slot (as per 38.321)
- Fixed random preamble selection in contention-based RA
- Cleaned-up comments and commented code
2020-09-18 15:00:59 -04:00
Francesco Mani
ccae34e647 taking into account pucch2 acknack for mac 2020-09-18 18:59:59 +02:00
hardy
56b551fde4 Merge remote-tracking branch 'origin/fix-0509-crash-RRCConnectionReconfiguration' into integration_2020_wk38 2020-09-18 17:20:30 +02:00
hardy
76c0c6beea Merge remote-tracking branch 'origin/2020-09-ci-updates' into integration_2020_wk38 2020-09-18 17:19:26 +02:00
hardy
d25722b251 Merge remote-tracking branch 'origin/nr-rlc-time-handling' into integration_2020_wk38 2020-09-18 17:18:13 +02:00
hardy
b9a48b3560 fixed parameters list in functions 2020-09-18 17:06:14 +02:00
Raphael Defosseux
f9ca09fbf4 CI: typo in MR case
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-09-18 16:41:18 +02:00
hardy
2bb5032f18 fixing SSH object instanciation issue 2020-09-18 10:12:49 +02:00
zhenghuangkun
ec988428ac Add PDUSessionResourceReleaseCommand 2020-09-18 06:49:09 +00:00
He Shanyun
bb73d64186 implement securityCommandComplete 2020-09-18 05:07:20 +00:00
Shweta Shrivastava
c91d689d8c Imrpovements for extracting UL DCI, remove hardcoding, blind decoding of DCI 2020-09-17 22:31:32 -05:00
hardy
8c99b7ba13 dummy push 2020-09-17 18:30:01 +02:00
Francesco Mani
d3843b7214 initialization of ta variables 2020-09-17 17:53:37 +02:00
Rakesh
2cac29b5c6 fix for modulation rotataion to support all numerlogies 2020-09-17 17:46:50 +02:00
Sakthivel Velumani
6ff951be08 wait before abandoning next trx processing 2020-09-17 17:09:15 +02:00
Francesco Mani
e8be11da21 changes in ta procedure at gnb, to be tested with the phone 2020-09-17 11:48:45 +02:00
Cedric Roux
f87b93e639 nr: fix check in nr_find_pucch 2020-09-17 10:55:48 +02:00
hardy
28936a10a0 fixed a few issues / typo 2020-09-17 10:17:16 +02:00
Xue Song
e5216cdba3 Handle NGAP Initial Context Setup Request message from NGAP task 2020-09-17 07:55:05 +00:00
zhenghuangkun
5689cf906a Add PDUSessionResourceModifyResponse
Add PDUSessionResourceReleaseResponse
Add NASNonDeliveryIndication
2020-09-17 07:37:09 +00:00
Xue Song
679b6be9be Modify RRCSetupRequest message
Add RRCSetupComplete message
2020-09-17 03:18:56 +00:00
yincong
b0c79092fa modify PDUSessionResourceSetupRequest 2020-09-17 10:33:12 +09:00
He Shanyun
a02b0b4054 implement SecurityModeCommand 2020-09-17 01:19:50 +00:00
Francesco Mani
4776e13c5f bugfix in scheduling acknack 2020-09-16 18:48:40 +02:00
Sakthivel Velumani
db5011922d ulschsim works 2020-09-16 17:59:49 +02:00
hardy
b5377042c8 removed SSH lib shortcut 2020-09-16 16:31:04 +02:00
Sakthivel Velumani
c65c6a401f Merge branch 'ulsch_decode_mthread' of https://gitlab.eurecom.fr/oai/openairinterface5g into ulsch_decode_mthread 2020-09-16 16:25:08 +02:00
Sakthivel Velumani
76d841ff89 fixed ulschsim 2020-09-16 16:24:58 +02:00
hardy
5aa8368577 added local SSH obj instanciation inside the methods 2020-09-16 16:21:23 +02:00
Remi Hardy
0677e03aa8 adding missing libs 2020-09-16 12:30:09 +02:00
Rakesh
8ab1c0b9d4 Merge remote-tracking branch 'origin/develop' into NR_RRCConfiguration_FR2 2020-09-16 11:56:07 +02:00
hardy
15dfc7fc73 tentative to move oaicitest class to a separate module 2020-09-16 11:50:16 +02:00
matzakos
db33ee5ec2 Add NR_RRC_LIB in lte-uesoftmodem
- To avoid linking error due to dependency from NR_RRC FreqBandList type
2020-09-16 11:14:34 +02:00
Thomas Schlichter
30f1f947c6 fix some CPPCHECK errors and compile warnings
use snprintf() instead of sprintf() to avoid writes outside buffer limits
2020-09-16 10:08:10 +02:00
Thomas Schlichter
659cd82c21 Merge remote-tracking branch 'develop' 2020-09-15 16:00:23 +02:00
Xue Song
a81b655c3f Add RRC Setup message 2020-09-15 10:33:30 +00:00
yincong
b77ecaf2d8 PDUSessionResourceSetupRequest
PDUSessionResourceSetupResponse
2020-09-15 19:19:36 +09:00
Raphael Defosseux
4a873b4d43 CI: optmimizations on VM-based framework
also correction for Circular Dependency Protection on header files
    also correction on the banner check

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-09-15 12:18:26 +02:00
Francesco Mani
6998d303fc using different resource (with different symbol) in case 2 pucch in a slot 2020-09-15 11:12:05 +02:00
Sakthivel Velumani
005e5f85df Merge branch 'develop' into ulsch_decode_mthread 2020-09-15 11:09:37 +02:00
Florian Kaltenberger
5bb1893f3d forgot to account for prachStartSymbol in rx_nr_prach_ru 2020-09-15 09:59:28 +02:00
zhenghuangkun
15cd202d5f Add UERadioCapabilityInfoIndication 2020-09-15 07:54:03 +00:00
Sergey Aranovskiy
3a2e3ff316 Fix formatting style
Signed-off-by: Sergey Aranovskiy <aranovskiy@mwnts.ru>
2020-09-15 09:57:28 +03:00
He Shanyun
ef508433d2 modify type of tac 2020-09-15 15:24:44 +09:00
zhenghuangkun
4a7ca735da Add UEContextReleaseComplete
Add UEContextReleaseRequest
2020-09-15 00:57:40 +00:00
matzakos
161d788fea Add absolute SSB frequency of nr cell as configuration parameter in the eNB configuration file instead of hardcoding it at rrc_eNB for NSA scenario 2020-09-14 14:47:10 +02:00
Florian Kaltenberger
a98cf88735 fixing a mistake in the computation of the prach_start_symbol 2020-09-14 13:38:30 +02:00
Francesco Mani
cb5362ea53 allowing 2 different pucch occasions in a slot 2020-09-14 12:08:25 +02:00
hardy
123666b730 completing the fr1 doc (with python script) 2020-09-14 11:11:39 +02:00
hardy
0c30b3a1e7 added CI integration of FR1 test section 2020-09-14 10:47:01 +02:00
hardy
0acd1e0974 fixing the CN doc path on an other line as well 2020-09-14 10:30:58 +02:00
hardy
a2b14d9cbc fixing the path to CN doc in FR1 doc 2020-09-14 10:16:09 +02:00
zhenghuangkun
b2f4b9828b Add DownlinkNASTransport Message
Add UEContextReleaseCommand Message
Modify NGSetup Message Encode failed
2020-09-14 06:51:14 +00:00
Cedric Roux
5b0efd5b83 NR: fix time keeping in RLC for gNB
RLC has timers. We need to keep track of time. We chose to not use
realtime but 'processing time'. That is we send a tick to RLC for every
subframe when it is processed by the softmodem. Before this commit we
used to increase time in the function mac_rlc_status_ind which is called
for every subframe in the eNB, but not in the gNB (at least not in the
current gNB). So we need another way to keep track of time.

The function gNB_dlsch_ulsch_scheduler is called for every slot. It seems
to be the perfect candidate to send a tick to RLC for every subframe. We
take care of subcarrier spacing to send every subframe (one subframe is
always 1ms), not every slot (slot duration depends on subcarrier spacing).

It may not be the best solution. To be revised if needed.

Note: the UE has not been fixed. Some modification is needed for the UE
too, most probably.
2020-09-12 14:54:09 +02:00
Xue Song
3f02d18f86 NR RRC ASN1 version upgrade release 16
Add RRCSetupRequest message
Add RRCReject message
2020-09-12 10:23:31 +00:00
He Shanyun
3c84c4d887 fix issues about sending ngap message by sctp 2020-09-12 08:36:31 +00:00
Sergey Aranovskiy
4bcf0a407d Fix crash when sending RRCConnectionReestablishmentReject
Create a temporary rrc_eNB_ue_context_t when it can't be obtained from
current RRC state:
- if UE was not attached to current eNB
- when RRCConnectionReestablishmentRequest has a wrong encoding
- in all other cases when ue_context_p can't be obtained.

Signed-off-by: Sergey Aranovskiy <aranovskiy@mwnts.ru>
2020-09-11 23:18:14 +03:00
matzakos
86a0210f50 Merge remote-tracking branch 'origin/develop' into nsa_remove_band_hardcodings 2020-09-11 18:19:08 +02:00
matzakos
f9aaa4336d Merge remote-tracking branch 'origin/develop' into nsa_remove_band_hardcodings 2020-09-11 17:54:49 +02:00
Mario Hudon
da355a395f Merge remote-tracking branch 'origin/develop' into NR_MAC_SSB_RO_UE_IDCC 2020-09-11 11:12:58 -04:00
Florian Kaltenberger
fecf27e223 updating FAPI interface with PRACH configuration index
NR PHY should now be able to handle multiple PRACH occasions
2020-09-11 17:00:44 +02:00
Raphael Defosseux
3a7ac9821e Merge branch 'integration_2020_wk37' into 'develop'
Develop integration 2020 week 37

The following Merge Requests have been included:

* MR [878] : CI framework update for 5G NSA FR1 setup
* MR [885] : PTRS-based UL phase compensation
2020-09-11 16:49:52 +02:00
matzakos
3671692656 More corrections wrt Band Information in NR UE Capability message 2020-09-11 16:05:35 +02:00
Sakthivel Velumani
34ae102229 Merge branch 'develop' into ulsch_decode_mthread 2020-09-11 15:01:19 +02:00
matzakos
67db56d873 Corrections to properly fill the Band Information list at UE Capability Enquiry message 2020-09-11 14:39:49 +02:00
zhenghuangkun
7e327ae84a Add UplinkNASTransport Message 2020-09-11 10:11:25 +00:00
Guido Casati
b95ea59421 ulsim fix: missing qam_mod_order in UL PUSCH PDU 2020-09-11 11:43:57 +02:00
zhenghuangkun
05033b0bf4 Add InitialContextSetupResponse Message 2020-09-11 09:23:39 +00:00
Francesco Mani
461990a155 changes in pucch2 indication 2020-09-11 11:04:05 +02:00
He Shanyun
3b3452dcce fix issue about load config error of gnb 2020-09-11 06:09:24 +00:00
kn.raju
f9db898155 modified num of FAPI PRACH pdu 2020-09-11 11:38:41 +05:30
zhenghuangkun
2b22daa445 Fix Warning 2020-09-11 05:38:30 +00:00
zhenghuangkun
5dc6712cec Add InitialUEMessage And InitialContextSetupRequest Message 2020-09-11 03:01:55 +00:00
Sakthivel Velumani
77dc7daf0a fixed bugs 2020-09-10 20:28:38 +02:00
Francesco Mani
ae0c02b261 some rearrangements in function to schedule csi reporting 2020-09-10 18:19:25 +02:00
Thomas Schlichter
8e5ec076ae Merge remote-tracking branch 'ptrs_ul_phase_compensation'
Conflicts:
	openair1/PHY/INIT/nr_init.c
	openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c
	openair1/SIMULATION/NR_PHY/ulsim.c
2020-09-10 16:52:42 +02:00
Florian Kaltenberger
6931fd7d37 moving the OFDM phase rotation from RU to DU 2020-09-10 15:57:40 +02:00
hardy
ebd7f50992 Merge remote-tracking branch 'origin/rh_ci_fr1' into integration_2020_wk37 2020-09-10 15:30:27 +02:00
hardy
53922c13cf Merge remote-tracking branch 'origin/ptrs_ul_phase_compensation' into integration_2020_wk37 2020-09-10 15:23:53 +02:00
Francesco Mani
0113d9927f rnti from UE_list in pucch pdu 2020-09-10 14:21:35 +02:00
hardy
e1927aa46b Merge branch 'rh_ci_fr1' of https://gitlab.eurecom.fr/oai/openairinterface5g into rh_ci_fr1 2020-09-10 14:16:23 +02:00
hardy
6039cda5a9 remove oc files as they were developed in an other branch 2020-09-10 14:15:15 +02:00
He Shanyun
c8b67cb1a1 compile NGAP_GNB lib 2020-09-10 11:34:02 +00:00
Hongzhi Wang
99d220c3e1 set rnti at gnb and remove uci crc length at ue 2020-09-10 12:51:58 +02:00
Hongzhi Wang
54ba635cf7 update csi report 2020-09-10 12:34:49 +02:00
Hongzhi Wang
4d4843e7b1 adding rsrp measurement and csi report 2020-09-10 12:34:29 +02:00
zhenghuangkun
46f1dc9614 Modify NGAP Message 2020-09-10 09:19:49 +00:00
Remi Hardy
0d9fc95063 Update TESTING_GNB_W_COTS_UE.md 2020-09-10 10:36:08 +02:00
Xue Song
bdd31eb852 fix the problem that nr-rrc-16.1.0.asn1 cannot generate C files 2020-09-10 08:23:28 +00:00
He Shanyun
8f3adc8bc8 fix gNB build error 2020-09-10 07:05:01 +00:00
Remi Hardy
894fd8c40c Merge branch 'rh_ci_fr1' of https://gitlab.eurecom.fr/oai/openairinterface5g into rh_ci_fr1 2020-09-09 17:59:51 +02:00
Remi Hardy
2ab1b9697d fixed cls_cots_ue.py packages ; fixed terminate_ue_flag copy-paste error 2020-09-09 17:58:16 +02:00
Thomas Schlichter
8f58d1ec7f Fix nr_ulsim to transmit actual random data instead of uninitialized PDU 2020-09-09 16:50:32 +02:00
matzakos
8670269d69 Remove hardcodings of eutra and nr bands in UE Capability Enquiry messages 2020-09-09 16:21:55 +02:00
Raphael Defosseux
128887b9bc DOC: replace obsolete links w/ correct ones
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-09-09 16:18:14 +02:00
Rakesh
960ab93183 changing UL PRB for FR2 32 PRB testing 2020-09-09 16:11:01 +02:00
Rakesh
8022252513 Function to check for ssb from rrc configuration 2020-09-09 16:08:54 +02:00
Rakesh
ec51d54f89 fix for number of slots per tdd period calculation 2020-09-09 16:00:39 +02:00
Rakesh
26fb2905f5 adding prb 32 for timing advance calculation 2020-09-09 15:59:03 +02:00
Rakesh
948dc6b1d9 bug fix in channel estimation 2020-09-09 15:53:13 +02:00
Rakesh
0b7573484c overiting centre frequency for FR2 testing 2020-09-09 15:49:40 +02:00
Rakesh
39f84c3a62 FR2 testing 2020-09-09 15:46:25 +02:00
hardy
4ec420271f fixed how to retrieve the cots ue file location 2020-09-09 15:14:18 +02:00
zhenghuangkun
85fe26bd80 Modify NGAP Messages 2020-09-09 18:55:14 +09:00
matzakos
05f49e5b1e Preliminary work to remove hardcodings of nr frequency bands for the NSA setup
- Create itti message to tranfer to RRC the information received at eNB through X2 ENDC Setup Request message
2020-09-09 11:52:07 +02:00
Parminder Singh
2281436b66 Fix - Issue with uninitialized structure in ULSIM
- Changed malloc to calloc to set all values to zero to remove the
  valgrind issue with uninitialized structure values in RC.gNB structure
2020-09-09 11:11:24 +02:00
hardy
1c77b36ae9 reverted eNB auto terminate fix (not working) 2020-09-09 10:26:58 +02:00
Rakesh
42fe39ece5 moving gpio control to the rx 2020-09-08 22:43:42 +02:00
Thomas Schlichter
9e52db7538 Merge remote-tracking branch 'develop'
Conflicts:
	openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_coding.c
	openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c
	openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
	openair1/SIMULATION/NR_PHY/dlsim.c
	openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c
2020-09-08 17:42:52 +02:00
Francesco Mani
692215752b adapting GES commit 532fdbb4 to compute CSI meas report bilen (only for SSB) 2020-09-08 17:33:35 +02:00
Remi Hardy
ef04e7e90d replaced if if ... by if elif ... in GetPAramtersFromXML function 2020-09-08 17:24:18 +02:00
Mario Hudon
c48e96e93a -UE RACH updates
- Added support for FR1 in RO selection
  -RACH preamble selected according to the chosen RO
2020-09-08 11:18:42 -04:00
Remi Hardy
de6a4b81ae fixed eNB auto termination ; cleaned cots_ue_airplane action (no longer needed) 2020-09-08 16:58:06 +02:00
Sakthivel Velumani
e686da4e48 fixed tbslbrm 2020-09-08 16:08:30 +02:00
cig
6ac5a6e74a N_RB configuration for DCI extraction according to 7.3.1.0 of TS 38.212
- replacing ambiguous configuration of N_RB for extraction of DCI 1_0
2020-09-08 14:09:05 +02:00
cig
7c3377d515 Minor fixes to RA procedures
- added some text descriptions
- replaced active BWP with initial BWP in Msg3 scheduling (8.3 TS 38.213)
- fixed logging
- disabled Msg3 repetitions after first transmission (disabled RA @ MAC)
2020-09-08 14:09:05 +02:00
cig
81398971ff Set tb_size in bytes and A in bits @ UE
- now is consistent for both UE and gNB
2020-09-08 14:09:05 +02:00
cig
9ac6dfee09 Minor fixes UE
- added some descriptions to the code
- fixed hardcoded factors
- removed commented out and unused code
- phy_procedures_nrUE_RX: removed unused do_pdcch_flag
- updated LTE naming to 5G
2020-09-08 14:09:05 +02:00
cig
7ab4abacb1 Retrieve N_PRB Overhead from PUSCH-ServingCellConfig 2020-09-08 14:09:05 +02:00
cig
e72ef27e66 Moved nr_compute_tbs_common file to common MAC folder
- updated cmakelists file
- fixed formatting, tabs and white spaces in the function
2020-09-08 14:09:05 +02:00
cig
66b117dcd5 NR UE PUSCH procedures fixes
- moved remaining PUSCH PDU configuration from ULSCH
  procedures entirely to MAC
- introduced a function for DMRS RE configuration
- cleaned up redundant code in ULSCH procedures
- fixed TBS computation for Msg3
2020-09-08 14:08:56 +02:00
Remi Hardy
2541e8cf27 adding a more challenging ping in the FR1 testcase 2020-09-08 13:22:31 +02:00
Remi Hardy
a3a05075f3 adding a more challenging ping in the FR1 testcase 2020-09-08 13:20:52 +02:00
Thomas Schlichter
73f5851690 Merge remote-tracking branch 'develop'
Conflicts:
	openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c
	openair1/PHY/NR_TRANSPORT/pucch_rx.c
	openair1/SIMULATION/NR_PHY/ulsim.c
2020-09-08 12:01:37 +02:00
Sakthivel Velumani
9751fa052b bugfix in tx rate matching 2020-09-08 10:52:15 +02:00
Raphael Defosseux
bdc1fa4edf Merge branch 'develop_integration_2020_w36' into 'develop'
Develop integration 2020 week 36

The following Merge Requests have been included:

* MR [877] : update conf2uedata
* MR [879] : Nr ul scheduling
* MR [880] : Cleanup usage of txdata array in NR UE threads
* MR [882] : Fixes for handling NR UE DCI decoding errors
* MR [884] : benetel: driver for Benetel's 4G and 5G RRUs
* MR [886] : NR UE fix get_Qm_dl and nr_get_code_rate_dl
* MR [887] : Usrp fix adc shift and pps sync
2020-09-08 10:38:29 +02:00
Remi Hardy
c4428f67ae Merge branch 'rh_ci_fr1' of https://gitlab.eurecom.fr/oai/openairinterface5g into rh_ci_fr1 2020-09-08 10:13:49 +02:00
Remi Hardy
20ee6ca67c fixing logging and html rendering 2020-09-08 10:10:27 +02:00
Sakthivel Velumani
be522f5c44 changed ul resources to full bwp 2020-09-07 16:31:38 +02:00
Raymond Knopp
d38af248db fixing a stupid mistake introduced in da3dd6b8 2020-09-07 16:21:13 +02:00
Sakthivel Velumani
915854447b fixed merge 2020-09-07 16:10:15 +02:00
Sakthivel Velumani
9b9295f5b2 Merge branch 'NR_UL_scheduling' into ulsch_decode_mthread 2020-09-07 15:13:08 +02:00
Francesco Mani
f80bcef3dc back to 16 PRBs and 1 nrofreportedRS 2020-09-07 13:56:16 +02:00
Remi Hardy
a19ce58978 Update TESTBenches.md 2020-09-07 11:49:38 +02:00
Remi Hardy
cd73b71037 Update TESTBenches.md 2020-09-07 11:47:30 +02:00
Remi Hardy
a511d9043a Update TESTBenches.md 2020-09-07 11:47:06 +02:00
hardy
bc8543c55c updating testbenches doc resources 2020-09-07 11:47:10 +02:00
Raphael Defosseux
e5bbc0f1e4 BUILD: fix compilation warning and circular dependency protection on header files
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-09-07 10:54:49 +02:00
Raphael Defosseux
0b4716d739 Merge remote-tracking branch 'origin/NR_UL_scheduling' into develop_integration_2020_w36 2020-09-07 10:33:24 +02:00
Raymond Knopp
5e10e26668 PUCCH2 3-11 bits with > 2 PRB. Will work for even number of PRBs up to 16 2020-09-07 09:13:32 +02:00
zhenghuangkun
170a8f1702 Add NGAP Config 2020-09-07 12:53:24 +09:00
Raymond Knopp
1a8e531436 PUCCH2 3-11 bits with > 2 PRB. Will work for even number of PRBs up to 16 2020-09-05 15:12:31 +02:00
Sakthivel Velumani
21f5956f72 fixed dlsch_errors stats 2020-09-04 17:36:34 +02:00
Raphael Defosseux
88b3d0af5e CI: adding new rx gain for NR-UE
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-09-04 16:20:38 +02:00
Thomas Schlichter
6868a3db0d Fix merge conflict in openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
I had to remove the Msg2 transmission in phytest mode, which was present in branch 'benetel_integration'.
This caused following assertion:

Assertion (Foffset <= Ncb) failed!
In nr_rate_matching_ldpc() /home/sli/sudas-demonstrator/openair1/PHY/CODING/nr_rate_matching.c:411
Foffset 6492 > Ncb 924
2020-09-04 16:14:28 +02:00
Remi Hardy
7c92b90444 Update TESTING_GNB_W_COTS_UE.md 2020-09-04 15:28:42 +02:00
cig
e837c3b1b5 Msg3 PDU configuration cleanup
- fetching resource allocation from higher layer
- sorting out config for the remaining parameters
2020-09-04 14:45:15 +02:00
cig
88e6fb9d36 Fixed warnings 2020-09-04 14:45:15 +02:00
cig
e81b195917 Replaced malloc with local variable for ptrs_ports_list 2020-09-04 14:45:15 +02:00
cig
1f684f79c1 Introduced a function to fill the scheduled_response
- redundant code for the configuration of the scheduled_response was removed
- scheduled response is not needed to be stored in the NR_UE_MAC_INST struct as it passed to the function right away
2020-09-04 14:45:15 +02:00
cig
8694e5ee80 Removed tx_request from the NR_UE_MAC_INST struct
- tx_request is filled in the nr_scheduled_response upon the presence tx data
2020-09-04 14:45:15 +02:00
cig
ab4f9de25c Code cleanup UE 2020-09-04 14:45:15 +02:00
cig
539bc784b4 Changes to number of PDUs logic @ UE
- calling nr_ue_scheduled_response after pdu preparation
- increasing the number_pdus before response scheduling
- resetting after dl/ul config pdu handling
2020-09-04 14:44:22 +02:00
cig
28eb835533 Enter ULSCH procedures for Msg3 transmission 2020-09-04 14:44:22 +02:00
cig
83979a8758 Code cleanup, logging, formatting
- removed superfluos code
- formatting
- fixed logging
- removed redundant nr_get_dci_size (replaced by nr_dci_size)
- removed unused and long-time commented out functions @ UE side
2020-09-04 14:44:22 +02:00
cig
0fafb2ba64 Set DMRS offset to 0 when transform precoding is enabled 2020-09-04 14:44:22 +02:00
cig
4715308bd2 Msg3 implementation
- extraction of resource allocation from Msg2
- configuration of Msg3 PDU
- Msg3 scheduling
- MAC/PHY interface adaptations
2020-09-04 14:44:22 +02:00
Thomas Schlichter
ac5f5d7899 add missing init_symbol_rotation() to nr-uesoftmodem.c 2020-09-04 14:15:58 +02:00
Thomas Schlichter
966cc20766 fix compile warning in rfsimulator 2020-09-04 14:05:26 +02:00
Thomas Schlichter
6f1d37d1d7 enable OFDM symbol rotation in PUSCH transmission 2020-09-04 14:03:58 +02:00
Remi Hardy
63394891ee Update TESTING_GNB_W_COTS_UE.md 2020-09-04 13:43:29 +02:00
Raphael Defosseux
9675f34854 CPPCHECK: few fixes
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-09-04 12:37:15 +02:00
Raphael Defosseux
f7ad3f1e4d Merge remote-tracking branch 'origin/NR_UL_scheduling' into develop_integration_2020_w36 2020-09-04 12:07:46 +02:00
Raphael Defosseux
8b77c68f28 fix nr_dlsim build
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-09-04 11:59:24 +02:00
Sakthivel Velumani
7820a57bf8 fixed ul harq assertion 2020-09-04 11:59:23 +02:00
Francesco Mani
5c19d13cae SSB resource set, 2 PRBs and 11 bits 2020-09-04 11:54:30 +02:00
Raphael Defosseux
4c779ba466 Merge remote-tracking branch 'origin/NR_UL_scheduling' into develop_integration_2020_w36 2020-09-04 11:48:45 +02:00
Raphael Defosseux
e3301fa62d Merge remote-tracking branch 'origin/usrp_fix_adc_shift_and_pps_sync' into develop_integration_2020_w36 2020-09-04 11:45:52 +02:00
Florian Kaltenberger
111cf1e3d9 changing rx gain to max in all n310 config files 2020-09-04 11:31:20 +02:00
Thomas Schlichter
db77516652 fix some compile warnings for nr_dlsim and nr_ulsim 2020-09-04 11:16:21 +02:00
zhenghuangkun
fe4b3c0a21 Create ngap files 2020-09-04 18:00:03 +09:00
Thomas Schlichter
3faeff23c1 fixing compile errors and some warnings 2020-09-04 09:47:17 +02:00
Remi Hardy
e3264917ce small fixes 2020-09-04 09:28:29 +02:00
Raymond Knopp
7394e4dc9c changes to DLSCH/ULSCH statistics in PHY 2020-09-03 22:20:44 +02:00
Raymond Knopp
42f96710f2 Merge branch 'NR_UL_scheduling' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_UL_scheduling
Conflicts:
	openair2/NR_PHY_INTERFACE/NR_IF_Module.c
2020-09-03 20:59:58 +02:00
Raymond Knopp
66b4c74f36 added MAC statistics (Transport and logical channel interfaces) 2020-09-03 18:58:30 +02:00
Raphael Defosseux
0e96ad6a57 CI: updating also ci conf file
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-09-03 16:51:54 +02:00
Raphael Defosseux
59ab6f3628 Merge remote-tracking branch 'origin/usrp_fix_adc_shift_and_pps_sync' into develop_integration_2020_w36 2020-09-03 16:50:21 +02:00
Raphael Defosseux
746fb82839 Merge remote-tracking branch 'origin/NR_UE_get_Qm_dl_fix' into develop_integration_2020_w36 2020-09-03 16:49:58 +02:00
Raphael Defosseux
2dcf50a5bc Merge remote-tracking branch 'origin/benetel_integration' into develop_integration_2020_w36 2020-09-03 16:47:39 +02:00
Raphael Defosseux
869f0e989c Merge remote-tracking branch 'origin/NR_UE_DCI_decode_fix' into develop_integration_2020_w36 2020-09-03 16:45:56 +02:00
Raphael Defosseux
a05f7e1448 Merge remote-tracking branch 'origin/nr_ue_txdata_cleanup' into develop_integration_2020_w36 2020-09-03 16:41:25 +02:00
Raphael Defosseux
ec1a7cadff Merge remote-tracking branch 'origin/NR_UL_scheduling' into develop_integration_2020_w36 2020-09-03 16:35:03 +02:00
Raphael Defosseux
3970424b29 Merge remote-tracking branch 'origin/docs/fix-small-error' into develop_integration_2020_w36 2020-09-03 16:34:42 +02:00
Florian Kaltenberger
a44a32af28 Merge remote-tracking branch 'origin/develop' into benetel_integration 2020-09-03 15:28:52 +02:00
Florian Kaltenberger
8ba3ba91ef updating conf file for CI 2020-09-03 15:27:56 +02:00
Florian Kaltenberger
2c7968cc04 changing rx gain to max in all n310 config files 2020-09-03 13:59:53 +02:00
Florian Kaltenberger
5d5aea13b9 adding config file for n310 2020-09-03 13:50:07 +02:00
Florian Kaltenberger
627da47786 fixing adc inpput shift and gain table for N310. adding pps sync. 2020-09-03 13:49:41 +02:00
Sakthivel Velumani
1ffa59c9f2 moved dl & ul harq handlers to MAC 2020-09-03 13:33:43 +02:00
Mahesh
0531e27c7a Added send_mac_slot_indications() and updated timing info procedure 2020-09-03 16:17:09 +05:30
Remi Hardy
cb650a1a6e v0.2 integrating the new cots control procedure into the existing framework 2020-09-03 11:54:18 +02:00
Sakthivel Velumani
9026652468 Merge branch 'NR_UL_scheduling' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_UL_scheduling 2020-09-03 11:03:03 +02:00
Sakthivel Velumani
0c1c2edd65 small fix 2020-09-03 11:02:41 +02:00
masyuki.harada
0a375bc044 Create asn1 file 2020-09-03 17:17:47 +09:00
Thomas Schlichter
15a376fab2 Harden nr_get_Qm() and nr_get_code_rate_dl() functions
Check the provided MCS index according to the specified table.
Some tables go up to MCS index 27, others up to MCS index 28.
If the MCS index exceeds the allowed limit, assume max. MCS.
2020-09-03 09:10:51 +02:00
yaojie
760acd0856 Create directory structure 2020-09-03 15:27:32 +09:00
Raymond Knopp
37dcdeb338 Merge branch 'NR_UL_scheduling' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_UL_scheduling 2020-09-02 22:11:44 +02:00
Raymond Knopp
142249d84b added ulsch statistics 2020-09-02 22:11:04 +02:00
Remi Hardy
430496d59f v0.1 (temporary) running fr1 2020-09-02 17:52:18 +02:00
Francesco Mani
1025fd850c trying to fix some cppcheck errors 2020-09-02 16:44:40 +02:00
Raphael Defosseux
5a9ed93032 CPPCHECK: does not understand the different lengths of arrays
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-09-02 16:38:06 +02:00
Raphael Defosseux
1c457bf1fa BUILD: missing dependency on T_TRACER for L2_LTE_NR sub-lib
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-09-02 16:13:22 +02:00
Raymond Knopp
73c7bee040 added basic analytics for PDSCH measurements 2020-09-02 16:12:16 +02:00
Francesco Mani
4d2a8cc8d0 completed scheduling of csi meas report reception (to be tested) 2020-09-02 14:55:37 +02:00
Parminder Singh
b6792b3487 Fixed Warning issue due to wrong data type in ULSIM 2020-09-02 10:59:28 +02:00
Parminder Singh
88a14fc4cc Set the previous PTRS estimates to 0 for each slot
- The memory shall be reset for each slot to avoid interpolation error.
2020-09-02 10:10:10 +02:00
Parminder Singh
6ce38ac960 Fix Phase noise addition in ULSIM
- moved the noise function gNB variable
2020-09-02 09:53:45 +02:00
Parminder Singh
f7ed592ef5 Fixed available_bits calculation for PTRS in -n option in ulsim 2020-09-02 09:51:04 +02:00
Remi Hardy
237fdf5bd0 xml files update 2020-09-01 18:50:54 +02:00
Thomas Schlichter
0cff460e0e Fix alignment of mod_ptrs array in nr_ulsch_ue.c 2020-09-01 17:45:04 +02:00
Thomas Schlichter
600dd0e913 Add nr_ulsim testcases for UL DMRS and PTRS configurations 2020-09-01 17:39:21 +02:00
Remi Hardy
574c5944de file cleaning 2020-09-01 16:53:40 +02:00
Remi Hardy
78c7fb9f9b bug fixing + completing fr1 automation 2020-09-01 16:52:41 +02:00
Remi Hardy
d50e523d0e reworking check of xml_class_list location 2020-09-01 13:29:36 +02:00
Parminder Singh
92fc259592 Merge remote-tracking branch 'origin/develop' into fhg_shp_phase_noise_est 2020-09-01 12:55:50 +02:00
Parminder Singh
8cf32ed2ad Modify DMRS configuration with command line in ULSIM
- To modify DMRS use -U flag followed by 3 integers
- Example: ./nr_ulsim -U 2 1 0
- 1st Value is the list of arguments     -> e.g. 2
- 2nd Value is for TYPE{0=A,1=B}         -> e.g. 1
- 3rd Value is for ADD_POS{0,1,2,3}      -> e.g. 0
2020-09-01 12:22:12 +02:00
Sakthivel Velumani
0a3941fd17 dl harq handle update 2020-09-01 12:07:06 +02:00
Sakthivel Velumani
9e7ae9ce5f ul harq numbering fix 2020-09-01 11:35:08 +02:00
Remi Hardy
c3e2df6639 adding new xml files for fr1 setup 2020-09-01 10:24:40 +02:00
Francesco Mani
47a3ee095b first version of function to prepare scheduling of csi meas reporting 2020-09-01 10:12:41 +02:00
Sakthivel Velumani
892dffec3b dlsim perf print fix 2020-09-01 10:07:18 +02:00
kn.raju
86dee25800 Reverted multi RACH process 2020-08-31 22:31:14 +05:30
Parminder Singh
14096886e8 Enable PTRS with command line in ULSIM
- To enable PTRS use -T flag followed by 3 integers
- Example: ./nr_ulsim -T 2 0 2
- 1st Value is the list of arguments -> e.g. 2
- 2nd Value is for L_PTRS{0,1,2}     -> e.g. 0
- 3rd Value is for K_PTRS{2,4}       -> e.g. 2
2020-08-31 17:51:56 +02:00
hardy
c86fac47b9 fixing typo to make it work 2020-08-31 15:36:24 +02:00
hardy
88f9d88a44 Merge branch 'rh_ci_fr1' of https://gitlab.eurecom.fr/oai/openairinterface5g into rh_ci_fr1 2020-08-31 15:26:46 +02:00
hardy
b67d4bd183 fixing typo in searching path ci-scripts 2020-08-31 15:24:45 +02:00
Raymond Knopp
d443d9e915 added multi-antenna support for gNB RX (tested in ulsim) 2020-08-31 13:43:16 +02:00
Remi Hardy
9f772f36fd checking issues 2020-08-31 11:44:09 +02:00
Francesco Mani
d34bef816f first commit to schedule reception of csi measrep 2020-08-31 11:20:53 +02:00
Raymond Knopp
dbdae54c6d removed AssertFatal in nr_ue_mac_procedures.c for nr_dlsim HARQ tests. For some unknown reason there are occasion 0 SDUs sent up to MAC which causes failure. 2020-08-29 21:51:10 +02:00
Laurent
693364ddc5 merge develop 2020-08-29 09:37:15 +02:00
Laurent
a3367e58ea Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into main5G 2020-08-29 09:35:47 +02:00
Shweta Shrivastava
f8b130a8ee Fix for build warnings 2020-08-28 16:15:13 -05:00
Raymond Knopp
cbeccf9868 Merge branch 'NR_UL_scheduling' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_UL_scheduling 2020-08-28 17:35:18 +02:00
Raymond Knopp
99774b2afb bugfix in nr_dlsch_decoding.c 2020-08-28 17:34:47 +02:00
Francesco Mani
6a801ab562 Merge branch 'NR_UL_scheduling' into NR_CSI_reporting 2020-08-28 16:19:19 +02:00
Francesco Mani
4e8fa97d7d getting rid of frame_rx and slot_rx in gnb scheduler 2020-08-28 15:42:14 +02:00
Thomas Schlichter
8f09cc6c75 fix UE UL DMRS generation if start_rb != 0 in nr_ue_ulsch_procedures()
also do some code cleanup while at it...
2020-08-28 14:27:20 +02:00
Parminder Singh
ec0aea2374 Removed separate LLR calculation for PTRS
- New Data Structure to store PTRS RE's is removed
- LLR's are calculated at the end symbol for whole slot
2020-08-28 12:14:13 +02:00
Thomas Schlichter
a14dd04e1b Fix memory allocation of gNB channel estimation arrays 2020-08-28 10:03:38 +02:00
Sakthi
1fc73ba77f fixing nr-softmodem 2020-08-27 21:50:35 +02:00
Mario Hudon
597ddf7574 Merged in some FR2 fixes from Rakesh 2020-08-27 15:23:59 -04:00
Sakthivel Velumani
57dec19ac8 fixed thread init; ulsim runs fine 2020-08-27 18:23:29 +02:00
Francesco Mani
96f78feec7 moving init_symbol_rotation in uesoftmodem 2020-08-27 14:52:58 +02:00
Sakthivel Velumani
478c7352b3 fixes 2020-08-27 13:06:48 +02:00
Sakthivel Velumani
3e3af2c11b bugfixes 2020-08-27 12:42:25 +02:00
Parminder Singh
b288eafd1e Common Phase error estimation and compensation in uplink.
FEATURE STATEMENT:
- Introduce linear phase error noise model in Uplink at UE
- Perform common phase error (CPE) estimation and compensation at gNB

SOLUTION:
- A linear phase shift model is introduced in simulation.
- PTRS symbols are used to perform estimation of CPE from DMRS compensated signal
- The estimated values are interpolated in time domain and signal is compensated for the CPE.
- PTRS processing is done in Frequency Domain for each symbol in a slot and
  LLR's are calculated for each symbol accordingly.

IMPLEMENTATION:
* sim.h/channle_sim.c
- Linear Phase Noise Generation model definition.
* nr_ul_channel_estimation.c/nr_ul_estimation.h
- CPE estimation from PTRS and DMRS compensated signal.
* nr_dmrs_rx.c/nr_refsig.h
- Regenerate PTRS symbols at gNB.
* nr_ulsch_demodulation.c
- Removed old PTRS processing code and move to a common PTRS processing function
* defs_gNB.h/init.c
- New PTRS variables definition and initialization
* nr_ulsch_ue.c
- Corrected PTRS parameter to get new PTRS symbols for each OFDM symbol

TESTING
* ulsim.c
- Added Phase noise, Enable PTRS signal and verified the output.

VERIFICATION
- The LLR are rotated back with estimated CPE and no error is observed in scrambling/decoding
2020-08-27 11:55:06 +02:00
Francesco Mani
4cc5bf586e fix for pucchsim with sr 2020-08-27 10:35:05 +02:00
Raymond Knopp
260a9e58a0 nr_pbchsim modifications for carrier phase rotation procedure 2020-08-27 05:49:46 +02:00
Sakthi
9dc149e0f0 added postDecode; ulsim compiles 2020-08-27 00:42:21 +02:00
Shweta Shrivastava
3a999254c9 Fixes for handling NR UE DCI decoding errors 2020-08-26 15:01:00 -05:00
Mario Hudon
384fc315c8 Fixed initialization of SSB to RO mapping tables 2020-08-26 13:24:04 -04:00
Mario Hudon
638d8f8d0d Fix endianness handling of the ssb_PositionsInBurst 2020-08-26 13:14:50 -04:00
Sakthivel Velumani
e6804be968 created worker threads 2020-08-26 18:01:38 +02:00
Raphael Defosseux
e31349256f hotfix for eNB-OCP build
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-08-26 17:24:45 +02:00
Cedric Roux
d7bdf4937a nr: use RLC AM instead of RLC UM 2020-08-26 17:15:43 +02:00
Cedric Roux
01da43a00d nr rlc: remove hardcoded values 2020-08-26 16:54:03 +02:00
Thomas Schlichter
070ee365e3 Fixup dlsch harq if() conditions in nr_dlsch_demodulation.c 2020-08-26 16:46:48 +02:00
Thomas Schlichter
a8fc7ebd38 Merge remote-tracking branch 'develop' into nr_ue_txdata_cleanup 2020-08-26 16:45:48 +02:00
Francesco Mani
28b280a657 Merge remote-tracking branch 'origin/develop' into NR_UL_scheduling 2020-08-26 13:49:30 +02:00
Raphael Defosseux
ab025ab026 Merge branch 'develop_integration_2020_w34' into 'develop'
Develop integration 2020 week 34

The following merge requests have been included:

* MR [859] : Fixed the bug not sending MSG3
* MR [860] : FeMBMS eNB / UE End-to-End chain
* MR [866] : Improved modulation speed
* MR [872] : Improvement on CUDA GPU ldpc latency
2020-08-26 12:00:24 +02:00
Remi Hardy
eb78f3b9ea Merge branch 'rh_ci_fr1' of https://gitlab.eurecom.fr/oai/openairinterface5g into rh_ci_fr1 2020-08-26 11:27:19 +02:00
Francesco Mani
a3466a4966 calling pucch format 2 decoding in gnb rx procedures 2020-08-26 09:35:38 +02:00
Francesco Mani
6042df1ab5 to make lte-uesoftmodem compile 2020-08-26 07:06:28 +02:00
Francesco Mani
d219341905 to make simulators compile 2020-08-25 19:02:13 +02:00
Raymond Knopp
12a75c60e2 Merge branch 'NR_UL_scheduling' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_UL_scheduling 2020-08-25 15:03:06 +02:00
Raymond Knopp
632803289c fixed initialization of rotation for symbol 0 2020-08-25 15:02:41 +02:00
Francesco Mani
1b06523c86 Merge branch 'NR_UL_scheduling' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_UL_scheduling 2020-08-25 14:44:24 +02:00
Francesco Mani
0130518529 rssi dBFS based on 16 bits 2020-08-25 14:44:08 +02:00
hardy
e2b19083e5 fixing the xml action list yaml file location search 2020-08-25 10:55:43 +02:00
Raymond Knopp
b58ea80990 debug trace 2020-08-25 10:47:48 +02:00
Raymond Knopp
0bb99458c3 bugfix for TX slot processing 2020-08-25 10:06:02 +02:00
Raymond Knopp
2124343889 Merge branch 'NR_UL_scheduling' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_UL_scheduling 2020-08-25 01:50:43 +02:00
Raymond Knopp
cc0ff7422e implementation of missing symbol-based rotation for NR modulation/demodulation (Section 5.3 38.211). Tested with unitary simulators (ulsim/dlsim).
To be tested with gNB testbench and rfsimlator
2020-08-25 01:48:55 +02:00
Thomas Schlichter
cec42dc330 Some more UE timing fixes
- Check for timing_advance update _after_ RX (and TX) processing
- Update writeBlockSize when timing_advance value changes (for USRP)
- ignore timestamp when pre-reading the first OFDM symbol of a frame (for rfsimulator)
- do not busy wait for a finished RX-TX thread, use blocking wait instead
2020-08-24 20:01:56 +02:00
Francesco Mani
664ac4facc bugfix on last commit 2020-08-24 17:59:30 +02:00
Francesco Mani
c127a5a2f8 Merge branch 'NR_UL_scheduling' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_UL_scheduling 2020-08-24 16:10:16 +02:00
Francesco Mani
c1b775394f tpc update for pusch only if there is signal 2020-08-24 16:10:13 +02:00
Mahesh
c97bb9630c error in pnf_p7_slot_ind() resolved 2020-08-24 19:29:23 +05:30
matzakos
0e02dcf620 Modify LCID value for RLC DRB preconfiguration in noS1 mode 2020-08-24 15:01:18 +02:00
Raphael Defosseux
f0fb73f673 CI: less verbose when running MBMS on UE side
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-08-24 14:19:51 +02:00
Raphael Defosseux
9b58b2c872 CI: uniqueness in references
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-08-24 14:19:14 +02:00
Raymond Knopp
50dda0e4fe Remove redundant log 2020-08-24 13:02:19 +02:00
Raymond Knopp
e471d8b898 Merge remote-tracking branch 'origin/NR_RRC_PDCP' into NR_UL_scheduling 2020-08-24 11:19:42 +02:00
Julio Renner
e3e84ca282 update conf2uedata 2020-08-24 02:21:03 +02:00
Thomas Schlichter
4049eb4f53 clean TX buffer on UE side after transmitting it via USRP 2020-08-22 11:08:47 +02:00
Thomas Schlichter
f51611b108 remove unused variable "pdsch_vars_flp" and type "LTE_UE_PDSCH_FLP" 2020-08-22 10:21:39 +02:00
Thomas Schlichter
32b9f74067 remove "pdsch_vars_flp", "pdsch_vars_SI", "pdsch_vars_ra", "pdsch_vars_p" and "pdsch_vars_MCH", use per thread "pdsch_vars" instead 2020-08-22 10:21:39 +02:00
Thomas Schlichter
f8cb47d447 fix uePcchLLR() in nr_phy_scope.c to plot the PDCCH LLRs 2020-08-22 10:21:39 +02:00
Thomas Schlichter
b0903e2079 change timing advance to only affect the TX timestamp, not the position in the "txdata" buffer 2020-08-22 10:21:36 +02:00
Thomas Schlichter
1ca238dc19 remove unused function ulsch_common_procedures() from phy_procedures_nr_ue.c 2020-08-22 10:19:15 +02:00
Thomas Schlichter
1f57bd9bd2 Transmit data to USRP after finishing the producing thread 2020-08-22 10:18:30 +02:00
Francesco Mani
2f65453508 improved threshold for pucch0 detection 2020-08-21 18:28:44 +02:00
hardy
b5e17fb2d1 preparation for oc enb 2020-08-21 17:38:48 +02:00
Raphael Defosseux
f36a1b42cb Merge remote-tracking branch 'origin/NCTU_OpinConnect_LDPC' into develop_integration_2020_w34 2020-08-21 16:13:47 +02:00
Raphael Defosseux
a8ea336cfd Merge remote-tracking branch 'origin/improve_nr_modulation' into develop_integration_2020_w34 2020-08-21 16:13:27 +02:00
Raphael Defosseux
34a2945abf Merge remote-tracking branch 'origin/fembms-enb-ue' into develop_integration_2020_w34 2020-08-21 16:13:08 +02:00
hardy
8b3eb61f1c fixing typos + more in-code comments 2020-08-21 16:04:32 +02:00
Laurent
038a80b2ff fixes after merge 2020-08-21 15:50:27 +02:00
Rakesh
98aefe94fb Merge remote-tracking branch 'origin/NR_UL_scheduling' into NR_RRCConfiguration_FR2 2020-08-21 15:12:45 +02:00
Francesco Mani
09344667c3 fix for unresolved conflict 2020-08-21 15:08:26 +02:00
Laurent
38f01abd77 merge develop, compile ok, no test 2020-08-21 14:26:06 +02:00
Rakesh
e1c6130187 Merge remote-tracking branch 'origin/NR_UL_scheduling' into NR_RRCConfiguration_FR2 2020-08-21 13:52:51 +02:00
Laurent
c05bc1a3e9 5G SA authentication: authentication request, partial authentication response 2020-08-21 13:48:26 +02:00
Cedric Roux
da3dd6b8b0 benetel: driver for Benetel's 4G and 5G RRUs
This commit contains work done by Eurecom and by Benetel.
2020-08-21 10:24:35 +02:00
Sakthivel Velumani
579f9f969b included check for mod_order 2020-08-20 16:59:02 +02:00
kn.raju
eeb20f23a2 Resolved temp-rnti issue 2020-08-20 18:59:14 +05:30
hardy
2724f9c198 updated control sequence of cots ue for CI bench 2020-08-20 15:26:23 +02:00
Francesco Mani
0be0b4e0e3 Merge branch 'NR_UL_scheduling' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_UL_scheduling 2020-08-20 12:38:14 +02:00
Francesco Mani
fd003dd786 Merge remote-tracking branch 'origin/develop' into NR_UL_scheduling 2020-08-20 12:37:21 +02:00
Raymond Knopp
2dffbb75e7 fixing a bug in the prach sequency initialization 2020-08-20 12:28:11 +02:00
Francesco Mani
35c298d708 remove unnecessary declarations 2020-08-20 11:26:10 +02:00
Florian Kaltenberger
54f7019e19 Merge branch 'develop' into 'dongzhanyi-zte-develop'
# Conflicts:
#   openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c
2020-08-20 10:24:24 +02:00
Raphael Defosseux
7f28f8d10d Merge branch 'develop_integration_2020_w33' into 'develop'
Develop integration: 2020 week 33

The following Merge Requests are included:

* MR [849] : Implement Message2 (RAR) reception for NR-UE
* MR [870] : Fix softmodem restart
* MR [871] : Fix support for MIMO in rf-simulator
* MR [873] : BUILD: fix for new API on load_softscope
2020-08-20 07:47:55 +02:00
Laurent
0ee578f4bd add authentication request 2020-08-19 19:30:53 +02:00
Francesco Mani
9245f22d43 Merge branch 'NR_UL_scheduling' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_UL_scheduling 2020-08-19 17:23:49 +02:00
hardy
cc1e2c59cf adding resources and page for testbenches doc 2020-08-19 17:05:30 +02:00
matzakos
e5d317a4d2 Change DURATION_RX_TO_TX to 6 slots instead of 4 at nrUE
- Ensure that tx slot processing is done by the time trx_write_func() gets called
2020-08-19 16:56:04 +02:00
Sakthivel Velumani
8a10323d2a more mem alignment for dmrs 2020-08-19 15:52:16 +02:00
Sakthivel Velumani
44ac0ec190 fixing a log message 2020-08-19 15:39:21 +02:00
Sakthivel Velumani
403956d6c2 avoiding race condition for PDSCH tx 2020-08-19 14:52:16 +02:00
NCTU OpinConnect Terng-Yin Hsu/WEI-YING,LIN
d4603636d3 fix compile problem in non-CUDA environment 2020-08-19 20:37:29 +08:00
hardy
28e37684f4 adding runtime stats to console and HTML when Terminate_UE 2020-08-19 14:27:15 +02:00
Francesco Mani
4d0d54a98d power target from config file functional 2020-08-19 14:25:03 +02:00
matzakos
53f0ab6405 Merge remote-tracking branch 'origin/develop' into dongzhanyi-zte-develop 2020-08-19 11:10:09 +02:00
Sakthivel Velumani
e4755f9c31 init mod tables fo ue 2020-08-19 10:27:59 +02:00
Raymond Knopp
f8c510e061 Merge branch 'NR_UL_scheduling' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_UL_scheduling 2020-08-19 10:03:21 +02:00
Raymond Knopp
68fd55b21e added PDCCH lists to L1 processing to remove race condition between FAPI and L1 threads 2020-08-19 10:01:29 +02:00
hardy
eddf218d8d updating python to read ue commands dictionary 2020-08-18 22:18:31 +02:00
Francesco Mani
8999b51c1f bugifix 2020-08-18 17:36:52 +02:00
Sakthivel Velumani
f42291a4f7 Merge branch 'develop' into improve_nr_modulation 2020-08-18 17:20:46 +02:00
kn.raju
2be7cc59bf Addition of multi-user rach 2020-08-18 19:26:07 +05:30
Rakesh
76346c450d Tdd configuration and a small fix for get_band() for FR2 2020-08-18 15:50:38 +02:00
Francesco Mani
3952ad7729 Merge branch 'NR_UL_scheduling' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_UL_scheduling 2020-08-18 15:47:52 +02:00
Francesco Mani
edf903f776 pucch power control and handling of missed reception using confidence level 2020-08-18 15:47:48 +02:00
Sakthivel Velumani
923070e6c1 mem alignment for dmrs symbs 2020-08-18 15:16:23 +02:00
Raymond Knopp
21b25fcefb Remove some heavy PRACH logs 2020-08-18 15:14:32 +02:00
Laurent
59964b0f84 Identity response encoding 2020-08-18 14:07:56 +02:00
Raymond Knopp
3e767faeeb fixed channel model initialization in rfsimulator for added parameter (to be added to bridge structure still) 2020-08-18 08:38:15 +02:00
Raymond Knopp
e68cfaf70e added AVX2 optimization for 64QAM LLR computation in NR ULSCH 2020-08-18 07:45:07 +02:00
Sakthivel Velumani
dc2d948bad memory bugfix and other minor fixes 2020-08-17 13:55:13 +02:00
Francesco Mani
ffae55f62c n0 measurement in pucchsim 2020-08-17 12:30:36 +02:00
Raymond Knopp
37c1219e79 AVX2 optimization of 16QAM NR ULSCH LLR 2020-08-16 23:07:04 +02:00
Raymond Knopp
fc21364fa0 optimization of ldpc deinterleaving and llr computation 2020-08-16 15:04:27 +02:00
Raymond Knopp
80cc29acd9 optimization of RE extraction for NR ULSCH. Addition of faster memcpy to utils 2020-08-16 12:10:42 +02:00
Raymond Knopp
b16b2f7d99 optimization of NR ULSCH unscrambling 2020-08-15 09:42:05 +02:00
Sakthivel Velumani
92595bb2af further fixes 2020-08-14 18:03:04 +02:00
Sakthivel Velumani
12feffcc1c bugfix 2020-08-14 17:29:51 +02:00
Sakthivel Velumani
9c01cc66ea diabling avx2 for qpsk 2020-08-14 16:31:37 +02:00
Sakthivel Velumani
8aa88999fc fixes 2020-08-14 11:43:54 +02:00
Parminder Singh
f4631f2186 Bug-fix in Up-link with respect to PUSCH RE calculation when PTRS is enabled.
Problem STATEMENT:
- When enabling PTRS flag in ulsim, there are multiple scrambling and decoding errors
  are observed even with high SNR values
  SNR 60dB   errors_scrambling 5546/13800
  Channel BLER 1.000000e+00, Channel BER 4.018841e-01

ANALYSIS:
- While extracting PTRS RE's, the PUSCH RE count was not updated accordingly for PTRS symbols.
- This results in 0 value LLR's on same positions which cause offset issue in later processing.

IMPLEMENTATION:
* nr_ulsch_demodulation.c
- In case of PTRS symbol, respective total number of PTRS RE's are subtracted from available
  PUSCH RE's in each PUSCH Symbol processing.

TESTING
* ulsim.c
- PTRS are enabled for testing and are not enabled by default by this commit.
- Available bit count is adjusted if PTRS is enabled.

VERIFICATION
- Total Scrambling errors after gNb processing shall be only 250 bits (in K=2)
  which were replaced with PTRS at UE side while transmission.
  SNR 60.000000 errors_scrambling 250/13800
  Channel BLER 0.000000e+00, Channel BER 1.811594e-02
- After adjusting available bits in ulsim.c for error calculation
  SNR 60.000000: n_errors errors_scrambling 0/13550
  Channel BLER 0.000000e+00, Channel BER 0.000000e+00

EXTRA
- Removed white-spaces from all above mentioned files
- Added Global/vim tags to .gitignore file
2020-08-14 10:20:36 +02:00
Rakesh
e4088f7f7f bug fix in dft memory allignment and get_band() for FR2 2020-08-14 09:55:22 +02:00
Rakesh
2da9710958 Merge remote-tracking branch 'origin/develop' into NR_RRCConfiguration_FR2 2020-08-14 09:54:04 +02:00
Francesco Mani
9f72b81df6 tci and csi on ssb depending on ssb bitmap 2020-08-14 08:47:20 +02:00
Raymond Knopp
9b138dec72 LLR scaling adjustment (log2_maxh computation) for NR ULSCH receiver. 2020-08-14 08:12:18 +02:00
Raphael Defosseux
140c70373e Merge remote-tracking branch 'origin/hotfix-ocp-executable' into develop_integration_2020_w33 2020-08-13 22:08:07 +02:00
Raphael Defosseux
3c3c94efa5 Merge remote-tracking branch 'origin/fix_rfsim_mimo' into develop_integration_2020_w33 2020-08-13 22:07:37 +02:00
Raphael Defosseux
4c6c4954e2 Merge remote-tracking branch 'origin/fix-softmodem-restart' into develop_integration_2020_w33 2020-08-13 22:07:02 +02:00
Raphael Defosseux
4ff959fe34 Merge remote-tracking branch 'origin/nrue_msg2_reception' into develop_integration_2020_w33 2020-08-13 22:06:25 +02:00
Thomas Schlichter
819ee74123 move up assertions in config_ue.c to satisfy cppcheck 2020-08-13 17:42:13 +02:00
Rakesh
b07f3739c4 fix for ue tx freq and gnb if_frequency 2020-08-13 11:45:48 +02:00
kn.raju
c68c26e5b0 added debug in logs in rx_nr_prach 2020-08-13 14:35:58 +05:30
NCTU OpinConnect Terng-Yin Hsu/WEI-YING,LIN
bc1c69fead fix compile issue 2020-08-13 16:32:09 +08:00
Raymond Knopp
49a14c4f9f fixes for TDL channel models in nr_ulsim 2020-08-13 09:43:50 +02:00
NCTU OpinConnect Terng-Yin Hsu/WEI-YING,LIN
1fa6e0c6a1 Merge remote-tracking branch 'origin/develop' into NCTU_OpinConnect_LDPC 2020-08-13 14:22:55 +08:00
NCTU OpinConnect Terng-Yin Hsu/WEI-YING,LIN
10d52466a8 Fix CUDA diff with develop 2020-08-13 14:15:54 +08:00
Francesco Mani
fa105bd4d9 reworking rrc config for csi meas report on ssb 2020-08-12 17:33:43 +02:00
kn.raju
7af14dd7c1 Added Debug logs for RACH issue with ssb id other than 0 2020-08-12 20:18:50 +05:30
Raymond Knopp
ae4f3320c7 Merge branch 'NR_UL_scheduling' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_UL_scheduling 2020-08-12 16:23:54 +02:00
Raymond Knopp
13d1be0782 added TDL channel models and use them in nr_ulsim 2020-08-12 16:23:14 +02:00
Raphael Defosseux
4e67434570 BUILD: fix for new API on load_softscope
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-08-12 14:55:59 +02:00
matzakos
e0e0ed0cf9 Merge remote-tracking branch 'origin/NR_UL_scheduling' into NR_RRC_PDCP 2020-08-12 14:27:05 +02:00
Sakthivel Velumani
42ba1047ac changed pusch debug trace 2020-08-12 14:03:44 +02:00
Francesco Mani
5607a10dbc fixing compilation errors 2020-08-12 13:30:57 +02:00
Francesco Mani
d151e9fd6c making csi function compile again 2020-08-12 12:25:16 +02:00
Francesco Mani
5390811cac including first carrier offset in csi mapping 2020-08-12 12:24:54 +02:00
Francesco Mani
5117f0110f bug fixes and adding debug 2020-08-12 12:24:32 +02:00
Francesco Mani
d986d8bf2c csi-rs resource mapping (to be debugged and tested) 2020-08-12 12:24:02 +02:00
Francesco Mani
f8f97a21f5 implementation of table 7.4.1.5.3-1 2020-08-12 12:14:54 +02:00
Francesco Mani
2a3306a181 adding csi rs file, function still empty 2020-08-12 12:14:01 +02:00
Francesco Mani
76f360c112 generation of csi-rs sequence 2020-08-12 12:09:40 +02:00
laurent
5729f15363 merge develop 2020-08-12 11:43:33 +02:00
Thomas Schlichter
18b9edff09 Merge remote-tracking branch 'develop' into fix_rfsim_mimo
Conflicts:
	targets/ARCH/rfsimulator/simulator.c
2020-08-12 09:44:39 +02:00
Raphael Defosseux
05f052cc04 Merge branch 'develop_integration_2020_w31' into 'develop'
See merge request oai/openairinterface5g!869

Develop Integration Branch : 2020 week 31

The following Merge Requests have been included:

* MR [861] : Fixes for buffer overrun when L1 information is cleared upon UE removal in
* MR [863] : Small fixes
* MR [864] : Fixed the bug no supporting CellId more than 256
* MR [865] : Fix to have the sony 5g connect in NSA mode
* MR [867] : CI improvements for OCP-enb testing and NSA FR1 testing
* MR [868] : Add chansimuparams
2020-08-11 17:45:58 +02:00
Francesco Mani
b2e54e091c fixing an issue in n0 measurements 2020-08-11 13:57:02 +02:00
Raphael Defosseux
f445bdd324 CI: fixed typo in the list of allowed methods
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-08-11 11:29:05 +02:00
Thomas Schlichter
9bcec8a628 hotfix UE configuration for DCI format 1_1
Set n_dmrs_cdm_groups = 1 for now.
Should be fixed accordingly to TS 38.214 section 5.1.6.2
using tables 7.3.1.2.2-1, 7.3.1.2.2-2, 7.3.1.2.2-3, 7.3.1.2.2-4 of TS 38.212
2020-08-10 20:11:05 +02:00
Thomas Schlichter
a75d6088ea fix dlschsim by correctly setting dmrsConfigType 2020-08-10 20:05:40 +02:00
Sakthi
76f7840961 bug fixes 2020-08-10 19:22:53 +02:00
Sakthi
5e7ce26c10 more additions 2020-08-10 19:14:14 +02:00
laurent
7d1d8744e6 continue 5G SA NAS messages 2020-08-10 17:46:10 +02:00
Raphael Defosseux
470ecad248 Merge remote-tracking branch 'origin/add_chansimuparams' into develop_integration_2020_w31 2020-08-10 16:56:23 +02:00
Raphael Defosseux
e83acab6ca Merge remote-tracking branch 'origin/rh_ci_next' into develop_integration_2020_w31 2020-08-10 16:54:26 +02:00
Raphael Defosseux
e1ba785a94 Merge remote-tracking branch 'origin/fix-for-sony-5g-phone' into develop_integration_2020_w31 2020-08-10 16:54:14 +02:00
Raphael Defosseux
81f8af65a2 Merge remote-tracking branch 'origin/dongzhanyi-zte-develop1' into develop_integration_2020_w31 2020-08-10 16:53:58 +02:00
Raphael Defosseux
03a2d3e1ff Merge remote-tracking branch 'origin/bug-rfsim-and-warnings' into develop_integration_2020_w31 2020-08-10 16:53:37 +02:00
Raphael Defosseux
1aa7d4b9d5 Merge remote-tracking branch 'origin/hotfix-ue-release' into develop_integration_2020_w31 2020-08-10 16:53:12 +02:00
Sakthivel Velumani
e2afb8662e new table generator 2020-08-10 15:21:59 +02:00
Sakthivel Velumani
82df0e51b9 updated tables and 64qam mod 2020-08-10 15:19:53 +02:00
Aniq
a3156f54c0 Added the handle messages for P7 DL messages at PNF 2020-08-08 11:46:12 +05:30
kn.raju
81f7ef4dac Fixed initial prach_id frame&slot number 2020-08-07 21:02:42 +05:30
Francesco Mani
7989afbb78 bugfix in measurements 2020-08-07 17:05:58 +02:00
Cedric Roux
c95e5deb42 add back ssb_perRACH_Occasion, sony phone complains 2020-08-07 10:33:26 +02:00
kn.raju
8ad840cbf0 Fixed issue in finding prach_id 2020-08-07 13:01:37 +05:30
Francesco Mani
7d46e43334 using the right structures for n0 measurements 2020-08-07 09:19:37 +02:00
Francesco Mani
e7ca1619b8 Merge branch 'NR_UL_scheduling' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_UL_scheduling 2020-08-06 18:03:37 +02:00
Francesco Mani
d8d2739c2b bugfixes 2020-08-06 17:46:16 +02:00
Sakthivel Velumani
566570899c Handle case where all harq are busy 2020-08-06 15:49:44 +02:00
Sakthivel Velumani
107167d100 Fixed a bug in PDCCH sched 2020-08-06 15:40:45 +02:00
matzakos
cbb321d7a2 Merge branch 'NR_RRC_PDCP' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRC_PDCP 2020-08-06 14:42:01 +02:00
matzakos
5ab8e0079b Merge remote-tracking branch 'origin/NR_UL_scheduling' into NR_RRC_PDCP 2020-08-06 14:27:54 +02:00
Cedric Roux
cccb56e571 nr rlc: bug fixes, cleanup
- bad values in asn1_utils.c (copy/paste from 4g)
- remove hardcoded values (t_reassembly, sn_field_length)
- some cleanup
2020-08-06 11:46:39 +02:00
laurent
9a72b0c52e partial code for NR SIB1, existing bugs fix, merge develop 2020-08-06 11:44:48 +02:00
kn.raju
5d4acc2ea3 added debug logs for phy issue 2020-08-06 14:37:46 +05:30
NCTU OpinConnect Terng-Yin Hsu/WEI-YING,LIN
96023eeb93 Fix CUDA latency 2020-08-06 16:13:18 +08:00
NCTU OpinConnect Terng-Yin Hsu/WEI-YING,LIN
61bdea7584 fix build_oai and CUDA latency 2020-08-06 15:40:57 +08:00
NCTU OpinConnect Terng-Yin Hsu/WEI-YING,LIN
b64b6e85c4 fix build_oai and CUDA latency 2020-08-06 15:39:15 +08:00
NCTU OpinConnect Terng-Yin Hsu/WEI-YING,LIN
0e5d4fe268 fix CUDA latency 2020-08-06 15:32:30 +08:00
Thomas Schlichter
9dadad8298 fix enabling of PTRS
to set a flag in a bitmap, use "bitmap |= flag", to clear a flag in a bitmap use "bitmap &= ~flag".
2020-08-06 09:10:20 +02:00
Thomas Schlichter
3514caddc2 minor warning fixes 2020-08-06 09:06:37 +02:00
Khodr Saaifan
16ab5979e2 Extend rfsim to enable muti transmit antennas for gNB+solve beamforming ssb_index 0 when nb_tx>1 2020-08-05 19:15:00 +02:00
matzakos
431ed8bd73 Add GTPU tunnel data request at PDCP to deliver Uplink traffic over S1-U 2020-08-05 18:42:47 +02:00
Raphael Defosseux
cf23c58681 CI: fix typo for RAN HTML reporting
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-08-05 18:04:16 +02:00
Thomas Schlichter
00d9af7a15 Merge remote-tracking branch 'eurecom/develop' into fhg-ra2
Conflicts:
	openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c
	openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
2020-08-05 17:16:42 +02:00
Francesco Mani
ee2bd11e6e to remove some logs 2020-08-05 16:35:09 +02:00
matzakos
e6f20804b9 Remove dependency from noS1 mode to forward received UL traffic from MAC to RLC 2020-08-05 15:45:39 +02:00
Francesco Mani
ff7ac327cd first version of pusch power control 2020-08-05 12:30:25 +02:00
Francesco Mani
61a2842da8 Merge remote-tracking branch 'origin/ul_harq' into NR_UL_scheduling 2020-08-05 12:22:33 +02:00
Robert Schmidt
e761819e28 Fix in other functions 2020-08-05 10:10:50 +02:00
Robert Schmidt
a4a7de5ffe Make restart work again: do not free/copy ru frame_parms 2020-08-05 08:57:05 +02:00
matzakos
1326f6daf7 NR_RRC_PDCP: Bring back Downlink data scheduling in every opportunity
-Schedule IP traffic when it is available and random data when there is no IP traffic
2020-08-04 14:59:05 +02:00
kn.raju
dfdca4a251 fixed floating point exception error 2020-08-04 11:20:31 +05:30
Aniq
9a4a1f602e Added UL_DCI packing and unpacking fns 2020-08-04 10:45:55 +05:30
Aniq
2ccabd548e UL_DCI Request Completed 2020-08-04 00:53:16 +05:30
Aniq
fe7c416e61 TX_DATA_REQUEST COMPLETED 2020-08-03 21:10:03 +05:30
Sakthivel Velumani
f8675c258d Fixed linking errors 2020-08-03 14:11:52 +02:00
Raphael Defosseux
a385ad5244 Putting back SIGINT detection for lte-softmodem and initial skeleton to retrieve runtime stats from eNB/gNB
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-08-03 14:03:20 +02:00
Raphael Defosseux
7daa4a2a10 CI: update on FR1 scenarios
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-08-03 14:02:12 +02:00
kn.raju
a5580844b8 added for assoc period more than 1 2020-08-03 17:11:16 +05:30
matzakos
d013302c42 Merge remote-tracking branch 'origin/NR_UL_scheduling' into NR_RRC_PDCP
Conflicts:
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
2020-08-03 12:36:19 +02:00
Sakthivel Velumani
18a3747e82 added the changed octave script 2020-08-03 11:46:33 +02:00
Aniq
5406c16722 Packing fns for tx_data_request added 2020-08-03 15:09:42 +05:30
Sakthivel Velumani
fbd4df014c Further improvements
additional 50% speed improvement with SIMD vectors
2020-08-03 11:22:34 +02:00
Raphael Defosseux
613d603278 CI: few fixes and improvements
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-08-03 11:15:06 +02:00
laurent
571d094715 Merge branch 'rh_ci_next' of https://gitlab.eurecom.fr/oai/openairinterface5g into rh_ci_next 2020-08-03 09:20:49 +02:00
laurent
381fa7234a remove need to set /data/opencells-ran/../oaiCloneFapi before calling cmake 2020-08-03 09:20:25 +02:00
kn.raju
e56a085ada Fixed msg2 error and added CFRA config 2020-08-02 15:57:29 +05:30
kn.raju
18695f070e added logs for debug 2020-07-31 20:17:55 +05:30
Raphael Defosseux
0e06277360 CI: enabling 3/4 sampling rate when running gNB on B210
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-07-31 16:14:34 +02:00
Remi Hardy
de64484fe5 Update TESTING_GNB_W_COTS_UE.md 2020-07-31 16:11:13 +02:00
laurent
2b5c6a1e40 Merge branch 'rh_ci_next' of https://gitlab.eurecom.fr/oai/openairinterface5g into rh_ci_next 2020-07-31 16:04:47 +02:00
laurent
b829d3c9f7 add exit trace and fix a gcc warning 2020-07-31 16:04:24 +02:00
Remi Hardy
def42f92d8 Update TESTING_GNB_W_COTS_UE.md 2020-07-31 15:07:26 +02:00
Raphael Defosseux
a12266b94f DOC: point now to CI-used conf files
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-07-31 14:43:05 +02:00
Raphael Defosseux
3ec2a46fd3 CI: fix clock management in FR1 conf files
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-07-31 14:40:52 +02:00
kn.raju
201ab3eb11 Resolving ra-rnti miss-match 2020-07-31 17:19:45 +05:30
Sakthivel Velumani
414cc0ee83 fixed bug 2020-07-31 12:48:44 +02:00
Sakthivel Velumani
ea8ad2d6ca handle harq if pusch not detected 2020-07-31 12:35:57 +02:00
Raphael Defosseux
a6cd5b2d34 CI: no more usage of 'daemon' for launch soft-modem executables
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-07-31 11:54:29 +02:00
Raphael Defosseux
f00ddc7972 CI: add OCP pipeline trigger to master pipeline
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-07-31 10:20:38 +02:00
Raphael Defosseux
765ba2eba3 CI: last typo
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-07-31 09:51:01 +02:00
Francesco Mani
c810300e48 tpc = 1 for pusch 2020-07-30 17:54:44 +02:00
Francesco Mani
27cdb8116d debug message for pusch not received 2020-07-30 17:53:35 +02:00
Sakthivel Velumani
82be36533b Included special case for 64qam 2020-07-30 17:31:28 +02:00
Raphael Defosseux
e55f2aea0c CI: adding support for FR1 run of both eNB and gNB
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-07-30 16:21:51 +02:00
Anes Rose Rigiel Antony
ccc143d6f6 Merge branch 'NR_MAC_SSB_RO_GlobalEdge' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_MAC_SSB_RO_GlobalEdge 2020-07-30 18:13:28 +05:30
kn.raju
7c9bd5b321 Added debug logs 2020-07-30 17:40:17 +05:30
kn.raju
312ff2f85f fixed run time issue 2020-07-30 17:40:17 +05:30
kn.raju
6acb8d909a rrc configuration changes reverted 2020-07-30 17:40:17 +05:30
kn.raju
df5ce819c6 fixed run time error 2020-07-30 17:40:17 +05:30
kn.raju
46dcf9406a Debug logs added 2020-07-30 17:40:17 +05:30
kn.raju
991e5ad49a Scheduling and handling of SSB-RO 2020-07-30 17:40:17 +05:30
Raphael Defosseux
5e62d39c9d CI: fix the air_interface support on RAN and OAI-UE sides -- separate member now.
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-07-30 14:06:31 +02:00
Raphael Defosseux
2612f2639d CI: fix a few remaining getters
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-07-30 10:38:36 +02:00
frtabu
d4bd2cdc63 implement modifying channel model algo while running, complete function freeing a model 2020-07-29 20:27:04 +02:00
laurent
81eb393000 add preeliminary support for ubuntu 20 or debian 11, add file for 5G SA 2020-07-29 18:28:29 +02:00
laurent
e52948a0a5 merge develop 2020-07-29 18:21:25 +02:00
Sakthivel Velumani
db90088c5b Fixed bug in ul harq handler 2020-07-29 17:08:20 +02:00
Sakthivel Velumani
420aaf371e Added print messages for debugging 2020-07-29 17:01:04 +02:00
Francesco Mani
8bebabc151 initialization of hrq_id 2020-07-29 16:04:30 +02:00
Raphael Defosseux
7dc726f8f5 Merge remote-tracking branch 'origin/develop' into rh_ci_next 2020-07-29 16:01:40 +02:00
Francesco Mani
1043320676 Merge remote-tracking branch 'origin/NR_UL_scheduling' into ul_harq 2020-07-29 15:32:08 +02:00
Cedric Roux
503b46cd53 fix to have the sony 5g connect in NSA mode
c_SRS was 61, which does not fit for 106 PRBs as it seems. Value 0 works.
Maybe not the right thing to do though (see 38.211 6.4.1.4.3,
table 6.4.1.4.3-1).

Also it seems necessary to pass desired LTE/NR bands when requesting
LTE UE capabilities. Today this is hardcoded, to be done better at
some point. We should get the bands from the eNB configuration and
the eNB/gNB X2 exchanges.
2020-07-29 14:55:40 +02:00
Francesco Mani
1dab506b78 minor changes 2020-07-29 14:50:07 +02:00
Sakthivel Velumani
7bcf468e1b Added the changed octave script 2020-07-29 13:11:31 +02:00
Sakthivel Velumani
5fa775580c Removed unwanted loop and if
Reordered mod_table to support new changes in the function
2020-07-29 13:01:09 +02:00
Cedric Roux
9c2696e5e2 fix to have the sony 5g connect in NSA mode
c_SRS was 61, which does not fit for 106 PRBs as it seems. Value 0 works.
Maybe not the right thing to do though (see 38.211 6.4.1.4.3,
table 6.4.1.4.3-1).

Also it seems necessary to pass desired LTE/NR bands when requesting
LTE UE capabilities. Today this is hardcoded, to be done better at
some point. We should get the bands from the eNB configuration and
the eNB/gNB X2 exchanges.
2020-07-29 11:11:04 +02:00
Javier Morgade
a8e2a8d4b0 Merge remote-tracking branch 'origin/develop' into fembms-enb-ue 2020-07-29 10:54:38 +02:00
Raphael Defosseux
f7dc17ec20 Merge branch 'integration_2020_wk30' into 'develop'
Integration branch 2020 week 30  

- MR 854 : NR_DCI_01  
- MR 857 : improve_ue_stability  
- MR 839 : mac-flexran-improvements
2020-07-29 09:20:42 +02:00
frtabu
f5d1dbb731 add telnet command to rfsimulator 2020-07-29 01:34:52 +02:00
frtabu
f61f9520db implement queued commands in telnet server 2020-07-28 20:08:48 +02:00
Raphael Defosseux
71c66ec583 CI: fix HTML tab name
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-07-28 17:08:09 +02:00
Remi Hardy
ca21ad8b36 cleaned-removed commented-out legacy code 2020-07-28 17:02:28 +02:00
Francesco Mani
86250f682a bugfix in ul estimation and other minor changes 2020-07-28 16:35:12 +02:00
Raphael Defosseux
5c2df00101 CI: fix terminate
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-07-28 16:28:36 +02:00
Raphael Defosseux
b8edd71244 CI: adding retries on OCP test
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-07-28 16:03:28 +02:00
Raphael Defosseux
5dd3e3353d CI: using ninja for OCP build
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-07-28 15:25:00 +02:00
Raphael Defosseux
31a0d28ad9 CI: fix a few typos
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-07-28 15:22:46 +02:00
Remi Hardy
d3b415d6ed commented out printing of object attributes (debug) 2020-07-28 14:22:46 +02:00
Remi Hardy
8c9501b6a6 fixing args_parse function arguments list 2020-07-28 14:17:27 +02:00
Sakthivel Velumani
012db77f15 One more fix to pucch tx 2020-07-28 12:04:30 +02:00
Remi Hardy
eceb1ed21f fixed air_interface variable for ocp-enb option 2020-07-28 10:40:15 +02:00
dong.zhanyi
828bab2fd6 fixed the bug no supporting CellId more than 256 2020-07-28 07:34:05 +08:00
frtabu
7eb2ab66c5 add telnet commands to show and modify channel simulation parameters 2020-07-28 01:33:16 +02:00
dong.zhanyi
5c0a149946 fixed the bug no supporting the CellId more than 256 2020-07-28 07:00:56 +08:00
Sakthivel Velumani
c868c345e3 Fixed dl ack tx in pucch 0 2020-07-28 00:30:44 +02:00
Laurent
384aec0d03 coding 5G SA, add documentation 2020-07-27 20:35:10 +02:00
Aniq
524b9e8b19 UL_TTI [DONE] 2020-07-27 20:52:25 +05:30
Laurent
427b223136 small fiwes 2020-07-27 16:08:31 +02:00
Aniq
ac1d74cb05 Completed pack_ul_tti_request_pusch_pdu() 2020-07-27 18:38:21 +05:30
Javier Morgade
a061c8acc5 fembms: CI/CD fallback to original MBMS settings
Signed-off-by: Javier Morgade <javier.morgade@ieee.org>
2020-07-27 14:17:58 +02:00
hardy
d81f8b9120 fixed CONST. missing in front of constant, leading to execution error 2020-07-27 14:08:21 +02:00
hardy
292addf8d6 Merge remote-tracking branch 'origin/NR_DCI_01' into integration_2020_wk30 2020-07-27 13:47:22 +02:00
hardy
0b58e7a6f5 Merge remote-tracking branch 'origin/mac-flexran-improvements' into integration_2020_wk30 2020-07-27 13:47:00 +02:00
hardy
45ef34737c Merge remote-tracking branch 'origin/NR_DCI_01' into integration_2020_wk30 2020-07-27 11:49:46 +02:00
hardy
607ebabbfe Merge remote-tracking branch 'origin/improve_ue_stability' into integration_2020_wk30 2020-07-27 11:48:15 +02:00
Aniq
69ca893bbd Added pack fn for ul_tti_pdus 2020-07-27 14:35:06 +05:30
Javier Morgade
73dd471594 fembms: CI/CD using MBMS config to lauch FeMBMS test
Signed-off-by: Javier Morgade <javier.morgade@ieee.org>
2020-07-27 10:34:43 +02:00
Francesco Mani
3648ac46ce fix in ulsch ch estimation debug message 2020-07-27 09:29:43 +02:00
Javier Morgade
e10b0646e4 fembms: CI/CD fallback USRP tests
Signed-off-by: Javier Morgade <javier.morgade@ieee.org>
2020-07-26 08:41:42 +02:00
Aniq
f67a5aa08c linked the new unpack message fns in check_unpack_length() 2020-07-25 21:36:24 +05:30
Javier Morgade
0c31b449ca fembms: CI/CD fixing USRP Test
Signed-off-by: Javier Morgade <javier.morgade@ieee.org>
2020-07-25 15:48:05 +02:00
Javier Morgade
1d4bd3358a fembms: CI/CD fixing USRP Test
Signed-off-by: Javier Morgade <javier.morgade@ieee.org>
2020-07-25 11:42:23 +02:00
cig
90dc9e9555 Set RA succeeded and UE mode to PUSCH after correct decoding of Msg2 2020-07-25 11:38:29 +02:00
cig
457c1b725a Small fixes @ UE 2020-07-25 11:38:22 +02:00
Javier Morgade
7f9dbdd3f4 fembms: CI/CD Test
Signed-off-by: Javier Morgade <javier.morgade@ieee.org>
2020-07-25 08:06:04 +02:00
Sakthivel Velumani
5fd040d645 Added HARQ stats to ulsim 2020-07-25 00:36:53 +02:00
Mario Hudon
8ea4897ff9 Renaming of variables after code review 2020-07-24 15:22:01 -04:00
hardy
017e4339bb brought cde line arg parsing out of main.py, into a separated module 2020-07-24 18:03:22 +02:00
Javier Morgade
8e9a989aa5 fembms: FIX filename typo
Signed-off-by: Javier Morgade <javier.morgade@ieee.org>
2020-07-24 17:48:51 +02:00
Javier Morgade
c681e800ba fembms: CI/CD Adding USRP coverage tests for FeMBMS
Signed-off-by: Javier Morgade <javier.morgade@ieee.org>
2020-07-24 14:45:28 +02:00
Mario Hudon
8735920b5a Modified a comment 2020-07-24 08:17:59 -04:00
Sakthivel Velumani
0db13a3801 Added UL harq handling
Also fixed bugs in ulsim and dlsim harq tests
2020-07-24 14:00:55 +02:00
laurent
d04b4c0eeb fix ont bug in DFT and some performance improvements 2020-07-24 11:29:49 +02:00
Francesco Mani
d94f4cdae0 fixing again pusch ok when no data 2020-07-24 11:03:31 +02:00
Javier Morgade
6e54a81fa5 Merge branch 'fembms-enb-ue' of https://gitlab.eurecom.fr/oai/openairinterface5g into fembms-enb-ue 2020-07-24 09:46:52 +02:00
Javier Morgade
27b9fa6935 fembms: CI/DC adding missing commit
Signed-off-by: Javier Morgade <javier.morgade@ieee.org>
2020-07-24 09:46:02 +02:00
Javier Morgade
63ed400e28 fembms: CI/CD Adding FeMBMS RFSIM coverage test
Signed-off-by: Javier Morgade <javier.morgade@ieee.org>
2020-07-24 09:44:13 +02:00
Mario Hudon
f967ba1756 Added some comments and cleaned up code 2020-07-23 17:14:46 -04:00
Raymond Knopp
d8bbfdbdda bugfix in eNB_scheduler.c. Code still to be moved to L1. 2020-07-23 22:24:55 +02:00
Aniq
3d401150ba p5 config request [hardcoding removed] 2020-07-23 22:44:15 +05:30
Mario Hudon
7ecba96f42 Fixed compilation errors and warnings 2020-07-23 09:52:38 -04:00
Francesco Mani
1f74524d0d fix for prepare dci 0_1 2020-07-23 11:48:25 +02:00
Francesco Mani
483b601c54 Merge branch 'NR_UL_scheduling' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_UL_scheduling 2020-07-23 10:10:51 +02:00
Francesco Mani
05e6ebe24b fix for prepare dci 0_1 2020-07-23 10:10:19 +02:00
cig
bc243cee47 Bugfix in DMRS configuration at UE side:
- DM-RS type {1,2} was wrongly assigned to {1,2} instead of {0,1}
- Num DM-RS CDM groups without data is now taken into account in mthread
  decoding function
- number of DM-RS CDM groups without data for format 1_0 according to 5.1.6.2
  3GPP TS 38.214 version 15.9.0 Release 15:
-- the UE shall assume the number of DM-RS CDM groups without data is:
-- 1 (CDM group 0) for the case of PDSCH with allocation duration of 2 symb
-- 2 (CDM group {0,1}) for all other cases.
2020-07-22 23:52:16 +02:00
cig
ea86120c4b Restructured UE DCI configuration function:
- moved RRC structs checks and mac configuration to config_ue.c
- new implementation of DCI configuration according to 3GPP TS 38.331
  version 15.9.0 Release 15 and 3GPP TS 38.213 version 15.9.0 Release 15
2020-07-22 23:52:08 +02:00
Sakthivel Velumani
5f80474114 Merge branch 'ul_harq' into NR_UL_scheduling 2020-07-22 18:21:54 +02:00
Sakthivel Velumani
2cd3c0b7bb harq put in ulsim 2020-07-22 18:08:27 +02:00
Raymond Knopp
3d8e5e11ef fixes for buffer overrun when L1 information is cleared upon UE removal in RRC. This is a temporary fix to solve a stability issue for Benetel pending more significant changes along the same lines in several places. 2020-07-22 17:56:51 +02:00
Remi Hardy
220445f157 wip : fr1 set up automation / fixing issues from recent changes 2020-07-22 17:53:28 +02:00
Aniq
3a5b5ffe55 Added unpack_dl_tti_req 2020-07-22 21:04:40 +05:30
Dr.-Ing. Javier Morgade
5a68767d6a Update enb.band17.tm1.mbms.25PRB.usrpb210.conf 2020-07-22 16:57:51 +02:00
Francesco Mani
390c648a81 bugfix in time domain assigment 2020-07-22 15:15:50 +02:00
Francesco Mani
39b22f17b3 calloc for dci_pdu 2020-07-22 15:11:17 +02:00
Francesco Mani
5331189c8b bugfixes 2020-07-22 15:07:04 +02:00
Francesco Mani
ac6aae9dde fix in allocation of segments 2020-07-22 14:53:16 +02:00
kn.raju
203e715365 Added debug logs 2020-07-22 17:42:58 +05:30
Francesco Mani
c949170a28 calloc for dci_pdu in ul 2020-07-22 14:01:47 +02:00
Javier Morgade
df58e251d8 fembms: -FIX phy_simulators compiling error
- adding missing dummy functions

Signed-off-by: Javier Morgade <javier.morgade@ieee.org>
2020-07-22 10:35:22 +02:00
Francesco Mani
9bd139246b bugfix in time domain assigment 2020-07-22 09:13:04 +02:00
Javier Morgade
543457f377 fembms: removing debug log
Signed-off-by: Javier Morgade <javier.morgade@ieee.org>
2020-07-22 08:09:51 +02:00
Javier Morgade
dc857e8d76 Merge remote-tracking branch 'origin/develop' into fembms-enb-ue 2020-07-22 07:42:44 +02:00
Javier Morgade
8f8b16a84e embms: Experimental MBMS Couting support added / 3GPP TS 36.44 (*)
(*) The MBMS Counting function allows the MCE to request the eNB(s) to count and
	  report per MBSFN area for one or more MBMS services the number of connected UEs
	  receiving the MBMS Service or interested in receiving it.

Signed-off-by: Javier Morgade <javier.morgade@ieee.org>
2020-07-22 07:40:32 +02:00
Javier Morgade
9e789c84be fembms: - added suppor for FeMBMS RRC sublayer / l2 interface
- added primitives to build asn1 messages for FeMBMS eNB

Signed-off-by: Javier Morgade <javier.morgade@ieee.org>
2020-07-22 07:34:09 +02:00
dong.zhanyi
7233e99143 Fixed the bug that can not send MSG3 2020-07-22 06:59:01 +08:00
hardy
4b48e457ba WIP : yaml config files for multiple eNB or gNB nodes 2020-07-21 23:55:20 +02:00
Javier Morgade
6db9fca1b7 fembms: code cleanup
Signed-off-by: Javier Morgade <javier.morgade@ieee.org>
2020-07-21 21:07:42 +02:00
laurent
afc93b0f68 add SA messages defintion 2020-07-21 18:50:25 +02:00
Javier Morgade
3aaa152e4e fembms: new FeMBMS/eMBMS MCH eNB/UE scheduler implemented
- MBMS scheduler re-worked to enable dedicated MBMS serving cells
	- added support for multiple eMBMS MCH sessions
	- added support for multiple FeMBMS MCH sessions

Signed-off-by: Javier Morgade <javier.morgade@ieee.org>
2020-07-21 18:16:46 +02:00
Javier Morgade
9b37dcecdb fembms: handle MBMS in new RLC
Signed-off-by: Javier Morgade <javier.morgade@ieee.org>
2020-07-21 18:14:44 +02:00
Javier Morgade
e3cf9bcf1f fembms: handle L2 eNB/UE config
Signed-off-by: Javier Morgade <javier.morgade@ieee.org>
2020-07-21 18:11:51 +02:00
Javier Morgade
1f034ab404 fembms: prototype overload (legacy code for F1AP)
Signed-off-by: Javier Morgade <javier.morgade@ieee.org>
2020-07-21 18:10:25 +02:00
Javier Morgade
f1d51cc0be fembms: handle L2 eNB config in softmodem
Signed-off-by: Javier Morgade <javier.morgade@ieee.org>
2020-07-21 18:08:41 +02:00
Remi Hardy
3d365b0d8e WIP fr1 set up 2020-07-21 17:04:23 +02:00
Francesco Mani
e76593f73f bugfixes 2020-07-21 16:25:19 +02:00
Javier Morgade
220ba2ebc8 fembms: new mbmssim target (TOCHECK)
Signed-off-by: Javier Morgade <javier.morgade@ieee.org>
2020-07-21 15:20:10 +02:00
Javier Morgade
0bef84d0a5 fembms: - FeMBMS 36.213 eNB procedures v14.2
- FeMBMS 36.213 UE procedures v14.2
	- Implementation of OFDM encoding for FeMBMS/eNB v14.2

Signed-off-by: Javier Morgade <javier.morgade@ieee.org>
2020-07-21 15:16:49 +02:00
Javier Morgade
5eb6dac7db fembms: routines for decoding the UE FeMBMS/PMCH physical/multicast/transport channel 3GPP TS 36.211 version 14.2.0
Signed-off-by: Javier Morgade <javier.morgade@ieee.org>
2020-07-21 15:09:38 +02:00
Javier Morgade
8eac27b83b fembms: Added support for FeMBMS UE Channel Estimation Procedures for 10 and 20 MHz BWs @ FeMBMS 1.25KHz Carrier Spacing
Signed-off-by: Javier Morgade <javier.morgade@ieee.org>
2020-07-21 15:07:05 +02:00
Aniq
a7feca124b added pack_dl_tti component functions [DUMMY TAG] 2020-07-21 17:46:02 +05:30
laurent
e01a98f074 Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into main5G 2020-07-21 12:10:02 +02:00
kn.raju
6392059732 fixed run time issue 2020-07-21 15:18:13 +05:30
Remi Hardy
2d1b7f78ad Merge branch 'oai_integration_week29' into 'develop'
Oai integration week29

See merge request oai/openairinterface5g!858
2020-07-21 11:38:00 +02:00
kn.raju
3daaad1385 rrc configuration changes reverted 2020-07-21 14:52:31 +05:30
Francesco Mani
ce846e6f7f fix in fapi function in dci for ul 2020-07-21 10:38:39 +02:00
kn.raju
c036940db7 fixed run time error 2020-07-21 10:47:49 +05:30
hardy
d244ea4b99 slight reformatiing of main.py ; introducing yaml for xml class definition 2020-07-20 22:45:24 +02:00
Francesco Mani
60b82248a1 first version of reworking scheduling function, including UL scheduling 2020-07-20 18:07:54 +02:00
Remi Hardy
dfe6278ee1 fixing issues for CI integration 2020-07-20 18:06:02 +02:00
hardy
87dccea43f integrating cots ue control into CI 2020-07-20 16:44:51 +02:00
Aniq
1c0fbee268 adding pack_dl_tti_request function 2020-07-20 20:07:18 +05:30
Francesco Mani
0f0ede038d removing a printf in pusch scheduling 2020-07-20 16:25:04 +02:00
Remi Hardy
331c74af2a fixing execution issues following recent changes 2020-07-20 14:21:11 +02:00
Aniq
f050e02a90 added plan for vnf p7 2020-07-20 15:43:03 +05:30
Javier Morgade
58bd55b9b3 fembms:
-Increase buffer size in PHY_ofdm_mod to accomodate FeMBMS sizes
	-New FFT sizes added (IDFT_12288, IDFT_24576) to enable support for FeMBMS 10MHz and 20MHz channels BWs

Signed-off-by: Javier Morgade <javier.morgade@ieee.org>
2020-07-20 11:02:18 +02:00
Javier Morgade
459eff02d1 fembms: Top-level routines for generating DL mbsfn reference signals for FeMBMS (eNB)
Signed-off-by: Javier Morgade <javier.morgade@ieee.org>
2020-07-20 10:58:57 +02:00
Javier Morgade
3fca8304a4 fembms: FeMBMS top-level routines for generating and decoding the PBCH/BCH physical/transport channel
Signed-off-by: Javier Morgade <javier.morgade@ieee.org>
2020-07-20 10:54:01 +02:00
Javier Morgade
3d11b3d65d fembms: FeMBMS (eNB) Top-level routines for generating the PDSCH physical channel from 36-211 V14.1
Signed-off-by: Javier Morgade <javier.morgade@ieee.org>
2020-07-20 10:51:51 +02:00
Javier Morgade
4923ba301a fembms: Addapting top-level routines for implementing Turbo-coded (DLSCH) transport channels from 36-212 with FeMBMS support
Signed-off-by: Javier Morgade <javier.morgade@ieee.org>
2020-07-20 10:49:58 +02:00
Javier Morgade
da5ae9c8d1 fembms: L1 prototypes for FeMBMS eNB procedures
Signed-off-by: Javier Morgade <javier.morgade@ieee.org>
2020-07-20 10:48:26 +02:00
Javier Morgade
c5799e1cca fembms: missing protype added 2020-07-20 10:42:47 +02:00
Javier Morgade
eb0dacc443 fembms: L1 prototypes and params added 2020-07-20 10:41:56 +02:00
Javier Morgade
43dc75f92f fembms: reference config files re-arranged 2020-07-20 10:39:12 +02:00
Robert Schmidt
6eb00a0895 Enable multi-module support in pdcp_fifo_flush_sdus() 2020-07-20 09:33:35 +02:00
Robert Schmidt
33b860f1b4 FlexRAN: use lock-free ringbuffers for slice conf
Use LFDS 7.0.0 Ringbuffer implementation to handle
* Slice Configuration
* UE slice association
which is then uploaded through MAC scheduling thread
2020-07-20 09:13:19 +02:00
Robert Schmidt
07313fd96d FlexRAN Bugfix: Free Ringbuffer on exit 2020-07-20 09:13:19 +02:00
Robert Schmidt
4901daf759 FlexRAN: New protobuf slice structure + Static Slice handling 2020-07-20 09:13:19 +02:00
Robert Schmidt
872cfc03fe Implement Static Slicing 2020-07-20 09:13:19 +02:00
Robert Schmidt
9956b96049 Use fptr for preproc and align UL PP definition 2020-07-20 09:13:19 +02:00
Robert Schmidt
2b4e529068 Simplify add_ue_list(), remove_ue_list(); add init_ue_list() 2020-07-20 09:13:19 +02:00
Robert Schmidt
a74f4c1238 Delete old protobuf slice types flex_slice_{dl,ul} 2020-07-20 09:13:19 +02:00
Robert Schmidt
714a2df097 Remove any slice-related information from OAI 2020-07-20 09:13:19 +02:00
Robert Schmidt
da09d63acd Default pre-processor: efficiently build UE list 2020-07-20 09:13:19 +02:00
Robert Schmidt
6fcc4f5970 Format to dynamically handle UL SCHED 2020-07-20 09:13:19 +02:00
Robert Schmidt
af89a6b780 Configurable Default Scheduler DL Algo 2020-07-20 09:13:19 +02:00
Robert Schmidt
fe7236d9c4 Add Maximum Throughput scheduler, wbCqi
Selects the UE with the highest CQI. If two UEs have the same CQI,
choses the one with highest number of bytes in RLC queue. Allocates as
many RBGs as possible, and potentially continues with the next UE.
2020-07-20 09:13:19 +02:00
Robert Schmidt
2de57fbc36 Add Proportional Fair scheduler, wbCqi
Selects UE with highest coefficient. Allocates until there are no more
RBGs to allocate, or UE has no more data. In the latter case, continues
with the next UE (second-highest coefficient).
2020-07-20 09:13:19 +02:00
Robert Schmidt
18a6961fcd Format to dynamically handle default DL SCHED algo 2020-07-20 09:13:19 +02:00
Robert Schmidt
8c7d94133f Bugfix RR DL: a retx UE might not be allocated again 2020-07-20 09:13:19 +02:00
Robert Schmidt
864fa84ba8 Default SCHED RR algo: optimize algo and defer RB calc.
- Loop only to next UE instead of jumping multiple

- mark used RBGs in rbg_mask

- Only calculate number of RBs based on CQI when UE is selected, instead
of calculating for all UEs which might be unnecessary.

- When looping the list of UEs for RB allocation, remove UEs that have
no data anymore instead of skipping them.
2020-07-20 09:13:19 +02:00
Robert Schmidt
82194319cf Bugfix DLSCH: only warn when retx with less RB
The preprocessor pre-allocates a CCE. Thus, when arriving at the check
for the number of RBs for retransmission, it is too late to skip the UE.
Therefore, only print a warning.

The default schedulers allocate a correct amount of RBs for
retransmissions, therefore it is ok.
2020-07-20 09:13:19 +02:00
Robert Schmidt
d0baab6ed3 DLSCH: limit LC bytes according to preprocessor 2020-07-20 09:13:19 +02:00
Robert Schmidt
a96c3761cc Log TBS in every window 2020-07-20 09:13:19 +02:00
Robert Schmidt
19c2856bbe UE: Set correct selected PLMN Identity 2020-07-20 09:13:19 +02:00
Robert Schmidt
332dec605a UE: Print all SIB1 decoded PLMNs 2020-07-20 09:13:19 +02:00
Robert Schmidt
a1f77198f7 FlexRAN: Manage PLMNs 2020-07-20 09:13:18 +02:00
Robert Schmidt
e4eea33de6 FlexRAN: Enable MME adding/removing 2020-07-20 09:13:18 +02:00
Robert Schmidt
d47c539dda S1AP: Only register MME if we do not know it yet 2020-07-20 09:13:18 +02:00
Robert Schmidt
64f0b7e0e5 Do not check for register_enb_pending
The test seemingly ensures that this code block is hit only once.
However, if we enable later activation of MMEs, it will be hit a second
(and third, ...) time. The only thing in guards against, though, is an
INIT message to the L1L2 thread, when register_enb_pending == 0, which
should only be sent once.  Therefore, functionality won't be changed if
register_enb_pending becomes negative, and the assert can be removed.
2020-07-20 09:13:18 +02:00
Robert Schmidt
40fdd53adc Correctly decode IMSI also when not integrity protected 2020-07-20 09:13:18 +02:00
Robert Schmidt
bbca88ad78 Bugfix FlexRAN: if a UE is in RRC but not S1AP, treat as no bug 2020-07-20 09:13:18 +02:00
hardy
dc9211ae20 removed all Getters and Setters from EPC, HTML classes (as all attributes are public) 2020-07-19 17:56:00 +02:00
Aniq
383daaf71e Added slot_indication on VNF side 2020-07-17 20:42:46 +05:30
hardy
d0805bd8ab Merge remote-tracking branch 'origin/bugfix-minor-remove-wrong-log' into oai_integration_week29 2020-07-17 16:00:20 +02:00
frtabu
8b4498cd11 nr scope as a dynamically loaded shared lib 2020-07-17 15:59:38 +02:00
Remi Hardy
d273ae84f3 added a class function to check adb returned values from a list 2020-07-17 15:28:34 +02:00
laurent
cf18c0d7e0 ocp-gnb regression fixed on rfsimulator 2020-07-17 15:12:20 +02:00
laurent
3772d7e56a merge develop, other modifs, not working 2020-07-17 13:57:56 +02:00
kn.raju
907860a228 Debug logs added 2020-07-17 11:23:21 +05:30
cig
fe724b555d Cleanup RA procedure 2020-07-16 18:03:22 +02:00
cig
68391d7243 Bugfix in RA window computation 2020-07-16 17:55:52 +02:00
kn.raju
7588dc50fa Scheduling and handling of SSB-RO 2020-07-16 16:26:00 +05:30
Sakthivel Velumani
e325d007a6 Merge branch 'develop' into improve_ue_stability 2020-07-15 15:00:02 +02:00
Cedric Roux
0b8d5a8fd2 Merge remote-tracking branch 'origin/develop' into NR_RRC_PDCP
Conflicts:
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
2020-07-15 12:06:41 +02:00
Aniq
02141b8bc1 Added pnf_phy_ul_dci_req (DONE) 2020-07-15 14:43:52 +05:30
Aniq
30e71f6b75 pnf_phy_ul_tti_req DONE (incomplete) 2020-07-15 13:03:16 +05:30
Aniq
959c87e6d7 Added pnf_phy_dl_tti_req function 2020-07-13 20:55:08 +05:30
hardy
2e5d0db742 removed getter/setter from RAM class 2020-07-13 16:45:32 +02:00
Remi Hardy
91480dccce support for ocp enb build and test (unit test ok) 2020-07-13 15:17:54 +02:00
Thomas Schlichter
c8a23e2d74 Merge remote-tracking branch 'develop' 2020-07-13 11:45:47 +02:00
Thomas Schlichter
e736b9410a Apply rx_offset in rfsimulator, too 2020-07-13 11:39:32 +02:00
magounak
1698f9e20f isolation of RU (no use of RC.xxx) 2020-07-13 08:00:59 +02:00
Aniq
399b93346d pnf_p7_slot_ind function COMPLETED 2020-07-11 16:39:49 +05:30
laurent
5e4d1f61ff small bug 2020-07-11 11:52:49 +02:00
Francesco Mani
079456d07a Merge remote-tracking branch 'origin/develop' into NR_DCI_01 2020-07-10 16:57:35 +02:00
Raphael Defosseux
2bf5758418 Merge branch 'develop_integration_2020_w27' into 'develop'
Develop integration 2020 weeks 27/28

The following Merge Requests have been included:

* MR 842 : NR RRC HARQ hacks
* MR 843 : hack for RLC AM ACK reporting
* MR 844 : gcc warnings
* MR 846 : nr-rlc: small bugfix
* MR 848 : NR VCD
* MR 852 : bugfix: uplink ACK/NACK reporting through T was gone
* Documentation update
* Some CI improvements
2020-07-10 16:49:26 +02:00
Cedric Roux
96b5380b02 minor: remove a LOG_E that should not be here anymore
When running the softmodem, we get the error:

    fill_ulsch UE_id 0 nb_rb = 0

The code has changed some time ago and this log was left but is not
meaningful anymore.
2020-07-10 12:44:59 +02:00
Thomas Schlichter
91149a7bf5 Merge remote-tracking branch 'NR_ue_dlsch_dmrs_cdm' 2020-07-10 11:55:17 +02:00
Francesco Mani
5caf5a4d1c dlsch ue n_dmrs_cdm_groups 2020-07-10 11:46:52 +02:00
Raphael Defosseux
c38e542f89 Merge remote-tracking branch 'origin/bugfix-T-uplink-ack-nack' into develop_integration_2020_w27 2020-07-10 09:35:17 +02:00
Raphael Defosseux
d7ffd70bbd Merge remote-tracking branch 'origin/nr_vcd' into develop_integration_2020_w27 2020-07-10 09:34:16 +02:00
Remi Hardy
42ab797a2d Merge branch 'rh_ci_next' of https://gitlab.eurecom.fr/oai/openairinterface5g into rh_ci_next 2020-07-10 09:31:00 +02:00
Raphael Defosseux
91104cb648 Merge remote-tracking branch 'origin/nr-rlc-bugfix-2020-w28' into develop_integration_2020_w27 2020-07-10 09:30:14 +02:00
Raphael Defosseux
4ddebabe7f Merge remote-tracking branch 'origin/gcc-warnings-20200702' into develop_integration_2020_w27 2020-07-10 09:29:47 +02:00
Raphael Defosseux
da4f395a04 Merge remote-tracking branch 'origin/NR_RRC_harq_hacks' into develop_integration_2020_w27 2020-07-10 09:29:18 +02:00
Francesco Mani
e9f370ed02 Merge remote-tracking branch 'origin/NR_RRC_harq_hacks' into NR_DCI_01 2020-07-10 09:16:28 +02:00
Francesco Mani
5651b9073c pusch config in mac gnb from rrc 2020-07-10 09:16:11 +02:00
Francesco Mani
d66aea3fe6 bugfixes in dci size 2020-07-09 17:57:39 +02:00
Sakthivel Velumani
b0b03700ca bugfix in pucch tx 2020-07-09 16:16:44 +02:00
Cedric Roux
d32b45dd1a bugfix: uplink ACK/NACK reporting through T was gone
Let's get it back!
2020-07-09 15:50:14 +02:00
Raphael Defosseux
f157d41e2f BUILD: missing dependency for NR_GTPV1U lib
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-07-09 15:40:11 +02:00
hardy
8d75cb61bc to support OCP eNB build and test 2020-07-09 14:37:18 +02:00
Raphael Defosseux
f6999282f2 DOC: update on the 5G Rf simulator
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-07-09 13:36:47 +02:00
Raphael Defosseux
7921071518 CI: fix when retrieving the DL Carrier Frequency in UE Run log
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-07-09 12:32:21 +02:00
Francesco Mani
0f9519925d fill dci pdu 2020-07-09 11:58:15 +02:00
Thomas Schlichter
c5357e6a59 Merge remote-tracking branch 'NR_RRC_harq_hacks' 2020-07-09 11:43:16 +02:00
Sakthivel Velumani
b22b71536a Merge branch 'NR_RRC_harq_hacks' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRC_harq_hacks 2020-07-09 11:37:29 +02:00
Sakthivel Velumani
94905c0f43 fixing warnings 2020-07-09 11:37:03 +02:00
Francesco Mani
d474f4a1b8 fix some warnings 2020-07-09 10:55:41 +02:00
Cedric Roux
1fa7a61b2b nr: fix compilation warning 2020-07-09 10:50:17 +02:00
Thomas Schlichter
aea3bc2d42 Merge remote-tracking branch 'NR_RRC_harq_hacks'
Conflicts:
	openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c
	openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
	openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c
2020-07-09 10:27:27 +02:00
Florian Kaltenberger
e0231398ca update from Walter Maguire 2020-07-08 21:02:33 +02:00
Francesco Mani
5fc3a991c9 dci size for 0_1 and some other modifications 2020-07-08 18:44:34 +02:00
Raymond Knopp
614af99745 Remove hardcoding of DRB id to be added for NSA 2020-07-07 18:36:58 +02:00
Rakesh
24bdbde2a1 bugfix 2020-07-07 16:53:13 +02:00
Rakesh
e6713b7467 Merge remote-tracking branch 'origin/develop' into nr_vcd 2020-07-07 15:29:30 +02:00
Raymond Knopp
cc7c66feea Introduce new UE context status state at the eNB for the NSA procedure
- UE context status enters RRC_NR_NSA_RECONFIGURED state, after the eNB receives an RRCConnectionReconfigurationComplete message including the
scg_ConfigResponseNR_r15 container.
- Use this state to avoid triggering sGNB Addition Request multiple times
2020-07-07 15:22:01 +02:00
laurent
46adeaa7c4 merge branch NR_RRC_harq_hacks 2020-07-07 12:56:37 +02:00
laurent
4bc36627be fix some used but not initialized variables 2020-07-07 12:53:04 +02:00
MaheshK1995
553844204c slot indication changes 2020-07-06 20:42:42 +05:30
Raymond Knopp
027853ba8e Merge branch 'NR_RRC_harq_hacks' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRC_harq_hacks 2020-07-06 16:26:38 +02:00
Raymond Knopp
9a662fbcb3 fixed ulsim performance issues 2020-07-06 15:36:20 +02:00
Francesco Mani
64e9629b8c patch for pucch in ulsim 2020-07-06 14:37:31 +02:00
laurent
4d6e647aaa fixes pushed also in develop 2020-07-06 14:07:46 +02:00
Cedric Roux
62df572aed nr-rlc: small bugfix 2020-07-06 11:24:55 +02:00
Raymond Knopp
4761cbdc3d Modifications wrt the NR LCIDs used for DTCH 2020-07-06 10:48:41 +02:00
Francesco Mani
1fee40a590 fix in pucchsim 2020-07-06 10:38:36 +02:00
Raymond Knopp
bea3385f28 changes for ulsim to get functionality back. simulation behaviour for PUSCH is not good (BLER waterfall is way too steep even if SNR threshold is ok). Note develop does more or less the same thing but SNR threshold is lower. 2020-07-06 01:53:46 +02:00
Raymond Knopp
afb95b106f Merge branch 'NR_RRC_harq_hacks' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRC_harq_hacks 2020-07-04 12:59:40 +02:00
Raymond Knopp
2ca4137c1c forgot one line in autotest xml file 2020-07-04 12:59:08 +02:00
Raymond Knopp
3f38b447c6 prachsim functional for format A2 and 0. added format 0 test to CI autotests 2020-07-04 12:58:18 +02:00
matzakos
895cf14973 Merge NR_RRC_harq_hacks branch into NR_RRC_PDCP 2020-07-03 17:10:40 +02:00
Raphael Defosseux
f5b81b4eb0 CI: fix html tab name
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-07-03 15:06:31 +02:00
laurent
cabff5b73b fix itti issue in memory management 2020-07-03 14:57:27 +02:00
Francesco Mani
12354bb6c6 bugfixes in dlschsim 2020-07-03 13:57:46 +02:00
Sakthivel Velumani
d11cbab95b Merge branch 'NR_RRC_harq_hacks' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRC_harq_hacks 2020-07-03 13:45:00 +02:00
Sakthivel Velumani
a7dae03d73 set txdataF to 0 at beginning of slots 2020-07-03 13:43:43 +02:00
Sakthivel Velumani
f13398e17b fixed pucch config in ue 2020-07-03 13:42:10 +02:00
Francesco Mani
67a8f8dab4 minor fixes 2020-07-03 11:10:56 +02:00
Raphael Defosseux
a1e293a164 Merge remote-tracking branch 'origin/ci-rd-july-improvements' into develop_integration_2020_w27 2020-07-03 10:37:34 +02:00
Raphael Defosseux
c5d1228143 Merge remote-tracking branch 'origin/rh_doc_update_3' into develop_integration_2020_w27 2020-07-03 10:36:58 +02:00
laurent
9205b4d004 fix gaussain noise seed in rfsimulator 2020-07-02 22:29:44 +02:00
Raphael Defosseux
b0d65fd6cb CI: adding test on caracal with TX Write Thread enabled
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-07-02 17:06:43 +02:00
MaheshK1995
0bfdeebd75 p7 function flow created 2020-07-02 20:28:49 +05:30
laurent
4b58b9d38a gcc warnings 2020-07-02 16:32:07 +02:00
cig
52e49fd8ec Fixed some warnings + cleanup
- replaced nr_slot_t with int as it was barely used in the code (also is defined after an lte struct)
- removed use of phy_frame_config_nr from the UE (another file was created in SCHED_NR_UE, still the
  gNB file is used in some tests file at UE side)
2020-07-02 12:44:48 +02:00
cig
e054b5e247 RA Msg2 reception according to 8.2 of TS 38.213
- Msg2 scheduler used for testing purposes was removed
- Now the UE tries to DCI 1_0 scrambled with RA_RNTI in the RA window
- If no RAPID is found within the RA window, instructs PHY to TX PRACH
2020-07-02 12:44:48 +02:00
cig
6737d27346 PUSCH data filling from PHY to MAC:
- IP data were fetched and passed to MAC directly at the PHY layer
- random data was generated whenever there's no upcoming data.
- Therefore these functionalities are now moved to MAC and FAPI interfaces
- are used instead.
2020-07-02 12:44:38 +02:00
cig
8e271ce945 Fixes for reception of Msg2:
- ceiling computation num of segments (cod/dec)
- fixes demodulation
- initialisation CW for PDSCH RA
- memcpy dl_ch_estimates to pdsch_vars_ra (hotfix)
- correct N_RB for DCI 1_0 and RNTI_RA
2020-07-02 12:32:33 +02:00
cig
79a655d47e Use MCS 9 for Msg2 to avoid issues with the LDPC decoder
- LDPC decoder does not support lower MCS, therefore MCS 9 has been selected
  for the Msg2 configuration.
- This is done only in do-ra mode, in order to prevent any fallout on the
  current the configuration used for the operation with the commercial UE
2020-07-02 12:30:57 +02:00
laurent
35bf936351 merge develop, phy-test mode in 5G testing ok 2020-07-02 12:02:21 +02:00
Francesco Mani
7176bb4607 Merge branch 'NR_RRC_harq_hacks' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRC_harq_hacks 2020-07-02 11:01:34 +02:00
Florian Kaltenberger
f73ecda995 nr_prachsim -F now reads full subframe 2020-07-02 10:49:18 +02:00
matzakos
e7d2b8eeb1 Resolve remaining conflicts after merge of develop into NR_RRC_harq_hacks 2020-07-02 10:17:47 +02:00
Francesco Mani
cd61f38eca Merge remote-tracking branch 'origin/develop' into NR_RRC_harq_hacks 2020-07-02 10:16:57 +02:00
Francesco Mani
20635bb00a Merge branch 'NR_RRC_harq_hacks' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRC_harq_hacks 2020-07-02 10:02:17 +02:00
Cedric Roux
71f75a3d88 hack for RLC AM ACK reporting
hack: in schedule_ue_spec, 3 bytes are "reserved" (this should be
done better). An RLC AM entity may ask for only 2 bytes for
ACKing and get a TBS of 32 bits and due to these 3 reserved bytes we may
end up with only 1 byte left for RLC, which is not enough. This hack
prevents the problem. To be done better at some point. If the function
schedule_ue_spec is (has been) reworked, this hack can be removed.
Dig for "TBS - ta_len - header_length_total - sdu_length_total - 3"
in schedule_ue_spec.

This should be done better at some point.
2020-07-02 09:13:45 +02:00
laurent
0f032447c0 fix bugs in main OAI, begining of PRACH test+fxi 2020-07-01 17:44:36 +02:00
Florian Kaltenberger
fa5213dfed removing some of the s1ap and x2ap xer prints 2020-07-01 14:43:44 +02:00
Francesco Mani
548e8f8797 fix ulsim compilation 2020-07-01 10:16:48 +02:00
Robert Schmidt
dcd43c1526 FlexRAN: use lock-free ringbuffers for slice conf
Use LFDS 7.0.0 Ringbuffer implementation to handle
* Slice Configuration
* UE slice association
which is then uploaded through MAC scheduling thread
2020-07-01 10:10:48 +02:00
Robert Schmidt
05c10662da FlexRAN Bugfix: Free Ringbuffer on exit 2020-07-01 10:10:48 +02:00
Robert Schmidt
d926a9a9c8 FlexRAN: New protobuf slice structure + Static Slice handling 2020-07-01 10:10:48 +02:00
Robert Schmidt
d2fe5af67a Implement Static Slicing 2020-07-01 10:10:48 +02:00
Robert Schmidt
115c1f38f6 Use fptr for preproc and align UL PP definition 2020-07-01 10:10:48 +02:00
Robert Schmidt
a21e9aa6ef Simplify add_ue_list(), remove_ue_list(); add init_ue_list() 2020-07-01 10:10:48 +02:00
Robert Schmidt
8c76d6ab57 Delete old protobuf slice types flex_slice_{dl,ul} 2020-07-01 10:10:48 +02:00
Robert Schmidt
198822aa17 Remove any slice-related information from OAI 2020-07-01 10:10:48 +02:00
Robert Schmidt
9f26028ded Default pre-processor: efficiently build UE list 2020-07-01 10:10:48 +02:00
Robert Schmidt
41de51b187 Format to dynamically handle UL SCHED 2020-07-01 10:10:48 +02:00
Robert Schmidt
5d1d2bcd1c Configurable Default Scheduler DL Algo 2020-07-01 10:10:48 +02:00
Robert Schmidt
36cd697b62 Add Maximum Throughput scheduler, wbCqi
Selects the UE with the highest CQI. If two UEs have the same CQI,
choses the one with highest number of bytes in RLC queue. Allocates as
many RBGs as possible, and potentially continues with the next UE.
2020-07-01 10:10:48 +02:00
Robert Schmidt
a0b331415f Add Proportional Fair scheduler, wbCqi
Selects UE with highest coefficient. Allocates until there are no more
RBGs to allocate, or UE has no more data. In the latter case, continues
with the next UE (second-highest coefficient).
2020-07-01 10:10:48 +02:00
Robert Schmidt
dc5357ca13 Format to dynamically handle default DL SCHED algo 2020-07-01 10:10:48 +02:00
Robert Schmidt
31ad66e146 Bugfix RR DL: a retx UE might not be allocated again 2020-07-01 10:10:48 +02:00
Robert Schmidt
1401d21081 Default SCHED RR algo: optimize algo and defer RB calc.
- Loop only to next UE instead of jumping multiple

- mark used RBGs in rbg_mask

- Only calculate number of RBs based on CQI when UE is selected, instead
of calculating for all UEs which might be unnecessary.

- When looping the list of UEs for RB allocation, remove UEs that have
no data anymore instead of skipping them.
2020-07-01 10:10:48 +02:00
Robert Schmidt
b06dadbdb0 Bugfix DLSCH: only warn when retx with less RB
The preprocessor pre-allocates a CCE. Thus, when arriving at the check
for the number of RBs for retransmission, it is too late to skip the UE.
Therefore, only print a warning.

The default schedulers allocate a correct amount of RBs for
retransmissions, therefore it is ok.
2020-07-01 10:10:48 +02:00
Robert Schmidt
71647eb4ef DLSCH: limit LC bytes according to preprocessor 2020-07-01 10:10:48 +02:00
Robert Schmidt
476d58a8de Log TBS in every window 2020-07-01 10:10:48 +02:00
Robert Schmidt
9d5a46dcfa UE: Set correct selected PLMN Identity 2020-07-01 10:10:48 +02:00
Robert Schmidt
d2cc43b4e7 UE: Print all SIB1 decoded PLMNs 2020-07-01 10:10:48 +02:00
Robert Schmidt
f895a28645 FlexRAN: Manage PLMNs 2020-07-01 10:10:48 +02:00
Robert Schmidt
df3f7e1ecf FlexRAN: Enable MME adding/removing 2020-07-01 10:10:48 +02:00
Robert Schmidt
1363a53dd0 S1AP: Only register MME if we do not know it yet 2020-07-01 10:10:48 +02:00
Robert Schmidt
b01d63ba4e Do not check for register_enb_pending
The test seemingly ensures that this code block is hit only once.
However, if we enable later activation of MMEs, it will be hit a second
(and third, ...) time. The only thing in guards against, though, is an
INIT message to the L1L2 thread, when register_enb_pending == 0, which
should only be sent once.  Therefore, functionality won't be changed if
register_enb_pending becomes negative, and the assert can be removed.
2020-07-01 10:10:48 +02:00
Robert Schmidt
9072101a1a Correctly decode IMSI also when not integrity protected 2020-07-01 10:10:48 +02:00
Robert Schmidt
c5fdcd85cc Bugfix FlexRAN: if a UE is in RRC but not S1AP, treat as no bug 2020-07-01 10:10:48 +02:00
Raphael Defosseux
12e5fe3399 Merge branch 'develop_integration_2020_w26' into 'develop'
Develop integration 2020 week 26

See merge request oai/openairinterface5g!841
2020-07-01 07:34:38 +02:00
Raphael Defosseux
6edff47db2 CI: fix cppcheck error
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-06-30 21:45:53 +02:00
Francesco Mani
406ae17d11 Merge branch 'NR_RRC_harq_hacks' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRC_harq_hacks 2020-06-30 18:05:04 +02:00
Francesco Mani
a40f119a80 revert to dl only in slot 1 before merge 2020-06-30 18:04:32 +02:00
Raymond Knopp
c301b62d8a Add printing contents of NR scgFailureInformation message at rrc eNB 2020-06-30 16:58:38 +02:00
Raymond Knopp
7ddfa636f8 Add detection of NR scgFailureInformation message at rrc eNB 2020-06-30 16:58:18 +02:00
MaheshK1995
1faeb991c1 PNF running in RFSIM through VSCODE 2020-06-30 18:50:15 +05:30
Sakthivel Velumani
b5cce24e83 fixed rv in phy-test mode 2020-06-30 15:07:43 +02:00
Remi Hardy
56f8827bde Update TESTING_GNB_W_COTS_UE.md 2020-06-30 14:42:22 +02:00
MaheshK1995
315288de44 Hard-coded SLOT_CONFIG reception at PNF 2020-06-30 18:05:56 +05:30
Raphael Defosseux
0516a452c1 BUILD: explicitely stop build when compilation/linking issues
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-06-30 12:37:00 +02:00
Raphael Defosseux
dde8ba2d51 Merge remote-tracking branch 'origin/trx_thread_param' into develop_integration_2020_w26 2020-06-30 09:57:51 +02:00
Raymond Knopp
26da5a6286 Merge branch 'oairu' of https://gitlab.eurecom.fr/oai/openairinterface5g into oairu 2020-06-30 08:11:11 +02:00
Raymond Knopp
c21df3b6f3 small fix for threadPool initialization when we use the full pipelining mode (RU_L1_TRX_SPLIT) 2020-06-30 08:08:33 +02:00
Francesco Mani
f4ccaf0dc0 Merge remote-tracking branch 'origin/develop' into NR_RRC_harq_hacks 2020-06-29 19:27:33 +02:00
WANG Tsu-Han
099169831e adding parameter in nr uesoftmodem for usrp trx thread 2020-06-29 16:23:10 +02:00
Remi Hardy
e7ab8f83c6 Update TESTING_GNB_W_COTS_UE.md 2020-06-29 13:57:23 +02:00
hardy
fa66f18c75 uploading conf and log example files 2020-06-29 13:53:41 +02:00
Remi Hardy
e5ab435173 Update TESTING_GNB_W_COTS_UE.md 2020-06-29 12:21:55 +02:00
Thomas Schlichter
a5a1d7b918 Improve stability by replacing AssertFatal() with LOG_E() in nr_rx_pdsch() 2020-06-29 12:13:27 +02:00
Raphael Defosseux
8d2f7a5491 Merge remote-tracking branch 'origin/NR_MAC_CE_GlobalEdge' into develop_integration_2020_w26 2020-06-29 12:09:52 +02:00
Raphael Defosseux
42057bccde Merge remote-tracking branch 'origin/NR_RRC_X2AP_RemoveHardcodings_GlobalEdge' into develop_integration_2020_w26 2020-06-29 12:09:33 +02:00
Thomas Schlichter
b90e57549c ignore inconsistent DCI instead of exiting 2020-06-29 12:04:34 +02:00
Francesco Mani
d8b7637981 Merge branch 'NR_RRC_harq_hacks' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRC_harq_hacks 2020-06-29 10:37:18 +02:00
WANG Tsu-Han
5884838ad5 Merge branch 'develop' into trx_thread_param 2020-06-29 10:30:55 +02:00
WANG Tsu-Han
3f461d680d adding parameter in uesoftmodem for uhd trx thread 2020-06-29 10:29:40 +02:00
Sakthivel Velumani
150ef017f2 fixed rv for phy-test mode 2020-06-29 10:17:52 +02:00
MaheshK1995
f17fc6dafd VNF/PNF mode set using --vnf --pnf options 2020-06-27 17:24:19 +05:30
Raphael Defosseux
5a8fe59c68 Merge remote-tracking branch 'origin/nfapi-bugfix' into develop_integration_2020_w26 2020-06-26 17:19:25 +02:00
Raphael Defosseux
0af8f618cd Merge remote-tracking branch 'origin/enable_ta_for_phytest' into develop_integration_2020_w26 2020-06-26 17:03:32 +02:00
Raphael Defosseux
233f51957c CI: add phy-sim runs to eNB logCollector. this is temporary
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-06-26 17:01:59 +02:00
Raphael Defosseux
e1888940b6 CI: retry on typical unstable scenarios
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-06-26 16:59:05 +02:00
Raphael Defosseux
27080aa607 DOC: remove obsolete pipeline reference
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-06-26 16:55:47 +02:00
Raphael Defosseux
bc6f6a6067 CI: no workspace clean when running phy-sim
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-06-26 16:54:56 +02:00
Raphael Defosseux
de0f46466c Merge remote-tracking branch 'origin/ci_update' into develop_integration_2020_w26 2020-06-26 16:54:21 +02:00
Remi Hardy
0d914eecae Update CONTRIBUTING.md 2020-06-26 11:43:04 +02:00
Remi Hardy
c3ccb6cc1d Update TESTING_GNB_W_COTS_UE.md 2020-06-26 11:32:43 +02:00
Remi Hardy
f9a2829b44 Update TESTING_GNB_W_COTS_UE.md 2020-06-26 11:17:36 +02:00
hardy
c84e8a2b3a Merge branch 'rh_doc_update_3' of https://gitlab.eurecom.fr/oai/openairinterface5g into rh_doc_update_3 2020-06-26 10:07:08 +02:00
hardy
9ef54616fe upload signaling scheme 2020-06-26 10:05:45 +02:00
Remi Hardy
02dadedb47 Update TESTING_GNB_W_COTS_UE.md 2020-06-26 10:03:28 +02:00
hardy
e42cf3db9c Merge branch 'rh_doc_update_3' of https://gitlab.eurecom.fr/oai/openairinterface5g into rh_doc_update_3 2020-06-26 09:07:23 +02:00
hardy
0bb67fffd1 setup visio sheme update 2020-06-26 09:06:24 +02:00
Raymond Knopp
7c116c7981 small bugfix in pullarray8 in nfapi.c 2020-06-26 04:23:24 +02:00
matzakos
0553332b26 Bring back default RB configuration as it is required for phytest mode 2020-06-25 18:47:10 +02:00
MaheshK1995
abefe1a095 Added custom error codes for p5 2020-06-25 18:02:05 +05:30
Remi Hardy
55828cbbab Update TESTING_GNB_W_COTS_UE.md 2020-06-25 12:16:48 +02:00
hardy
8048f6b838 update 2020-06-25 12:15:54 +02:00
Remi Hardy
ff111e0797 Update TESTING_GNB_W_COTS_UE.md 2020-06-25 12:13:51 +02:00
hardy
ca91b8da3c qMerge branch 'rh_doc_update_3' of https://gitlab.eurecom.fr/oai/openairinterface5g into rh_doc_update_3 2020-06-25 10:03:34 +02:00
hardy
f79f6351d8 uploading fr1 setup lab photo 2020-06-25 09:58:08 +02:00
laurent
ada39bb238 scope round 2, merge develop branch 2020-06-24 17:04:46 +02:00
Remi Hardy
03d9bca101 Update TESTING_GNB_W_COTS_UE.md 2020-06-24 16:45:08 +02:00
Thomas Schlichter
72aa2963ea Merge branch 'develop' into enable_ta_for_phytest
Conflicts:
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
2020-06-24 12:16:03 +02:00
Remi Hardy
ebbff46cde update 3 after review 2020-06-24 11:58:41 +02:00
laurent
aad868d8fa 5G scope cleaning round 2 2020-06-24 09:48:35 +02:00
Remi Hardy
03ff1ef304 update 2 after review 2020-06-23 22:29:23 +02:00
matzakos
c06e734eb5 Merge remote-tracking branch 'origin/develop' into NR_RRC_X2AP_RemoveHardcodings_GlobalEdge 2020-06-23 17:15:43 +02:00
Remi Hardy
16d9e27d5d Update TESTING_GNB_W_COTS_UE.md 2020-06-23 10:43:53 +02:00
Remi Hardy
b33993f542 Update TESTING_GNB_W_COTS_UE.md 2020-06-23 10:42:43 +02:00
hardy
ec7d26d30d scheme fix 2020-06-23 09:51:54 +02:00
Raphael Defosseux
e68e72cd74 Merge branch 'develop_integration_2020_w25' into 'develop'
Develop integration 2020 week 25

The following Merge Requests have been included:

* MR 799 : NR RRC PRACH procedures
* MR 831 : NR PUCCH2 polar implementation
* MR 832 : coarse scope cleanup
* MR 835 : fix NR UE transport on PBCH
* MR 836 : NR fix phytest packet corruption DLSCH
2020-06-23 09:47:59 +02:00
Raphael Defosseux
5503073f9b Merge remote-tracking branch 'origin/NR_RRC_PRACH_procedures' into develop_integration_2020_w25 2020-06-23 09:43:14 +02:00
Remi Hardy
9833c0a123 Delete oppo.jpg 2020-06-22 23:38:47 +02:00
Remi Hardy
3a8d361b7c Update TESTING_GNB_W_COTS_UE.md 2020-06-22 23:35:20 +02:00
hardy
779b7537cc uploading fr1 setup scheme 2020-06-22 23:34:34 +02:00
Remi Hardy
dbbe79ad85 Update TESTING_GNB_W_COTS_UE.md 2020-06-22 21:35:38 +02:00
Florian Kaltenberger
b31861bac3 Update RUNMODEM.md 2020-06-22 17:08:32 +02:00
Florian Kaltenberger
8517f1314a Update RUNMODEM.md 2020-06-22 17:07:59 +02:00
Remi Hardy
497c611080 update 1 after review 2020-06-22 16:59:15 +02:00
Remi Hardy
2e3e862c6a Update TESTING_GNB_W_COTS_UE.md 2020-06-22 15:49:21 +02:00
hardy
6cb01bd58d folder for .md resources 2020-06-22 15:21:03 +02:00
hardy
bc9ee1071c creation, empty file 2020-06-22 15:20:50 +02:00
hardy
6d65930fd0 initial push to make branch visible 2020-06-22 15:20:38 +02:00
laurent
a456054d9b continue scope 2020-06-22 12:02:58 +02:00
Raphael Defosseux
75b271a809 CI: adding more error messages to HTML report
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-06-22 11:56:55 +02:00
Raphael Defosseux
ce06872722 Merge remote-tracking branch 'origin/nr_fix_phytest_packet_corruption_dlsch' into develop_integration_2020_w25 2020-06-22 11:54:54 +02:00
Raphael Defosseux
96034a3dca Merge remote-tracking branch 'origin/nr_ue_fix_pbch' into develop_integration_2020_w25 2020-06-22 11:54:46 +02:00
Raphael Defosseux
41fcabc69b Merge remote-tracking branch 'origin/rework-5G-scope' into develop_integration_2020_w25 2020-06-22 11:54:41 +02:00
laurent
e4b2689e29 continue scope rebuild 2020-06-19 20:35:32 +02:00
matzakos
860742a134 Fix DLSCH PDU corruption issue for phytest mode (random traffic generation)
- Payload was filled with zeros instead of random bytes
2020-06-19 18:19:34 +02:00
Francesco Mani
94fa9c5f1f fix in function to check data in dmrs symbol 2020-06-19 18:16:53 +02:00
Francesco Mani
0ce23beef8 Merge branch 'NR_RRC_harq_hacks' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRC_harq_hacks 2020-06-19 17:36:40 +02:00
Sakthivel Velumani
2e9cd58d48 nb_re_dmrs fixed in one more place
this fixed dlsch crc fails
2020-06-19 17:18:15 +02:00
Raymond Knopp
fbb6ba16c3 Merge branch 'NR_fix_nrarfcn' into NR_RRCConfiguration_FR2 2020-06-19 16:41:07 +02:00
Florian Kaltenberger
2634d57282 changing RRC measurement config to FR2 2020-06-19 16:39:56 +02:00
Florian Kaltenberger
794f9dac71 fixing NR_arfcn calculation 2020-06-19 16:24:50 +02:00
Florian Kaltenberger
8a3feeb5f6 fix from Walter Maguire 2020-06-19 16:11:19 +02:00
Francesco Mani
e189e06a16 Yet another bugfix in nr_ulsch_ue.c 2020-06-19 15:25:28 +02:00
MaheshK1995
e3a05b9af7 [no USRP found] error resolved 2020-06-19 18:35:52 +05:30
Florian Kaltenberger
9411438dd0 small fix 2020-06-19 15:00:00 +02:00
Francesco Mani
0354a7399b bugfix nr_ulsch_ue.c 2020-06-19 14:32:26 +02:00
matzakos
7e33d11c3d Change NR PDCP SN field to 18 instead of 12 bits length
-Required because the 12 bits SN is not accepted from the phone
2020-06-19 14:19:12 +02:00
Raphael Defosseux
a9dbcf6b93 added in-code comments and changed attr to private 2020-06-19 14:18:13 +02:00
Raymond Knopp
c3e871257b Add printing contents of NR scgFailureInformation message at rrc eNB 2020-06-19 14:00:34 +02:00
hardy
dcadc24ad6 complete and working version supporting phy-simulators 2020-06-19 13:38:17 +02:00
matzakos
9c4bb6bf4b Fix DLSCH PDU corruption issue for phytest mode (random traffic generation)
- Payload was filled with zeros instead of random bytes
2020-06-19 13:01:50 +02:00
Raphael Defosseux
1ff1f3dda9 fix a bunch of compilation warnings 2020-06-19 11:41:36 +02:00
Raphael Defosseux
efb7bd8417 CPPCHECK: fixes
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-06-19 11:41:03 +02:00
Thomas Schlichter
f47dcb199a enable TA update in phy-test mode 2020-06-19 11:28:29 +02:00
Thomas Schlichter
2029cb93c9 update configuration file gnb.band78.tm1.106PRB.usrpx300.conf based on gnb.band78.tm1.106PRB.usrpn300.conf 2020-06-19 11:27:07 +02:00
Raymond Knopp
72e57baa09 worker acivation 2020-06-18 23:53:48 +02:00
Raymond Knopp
b675c0c7b1 Merge branch 'oairu' of https://gitlab.eurecom.fr/oai/openairinterface5g into oairu 2020-06-18 19:31:17 +02:00
Raymond Knopp
b3489a7e0a testing oairu (RCC side) 2020-06-18 19:30:36 +02:00
magounak
ec11548526 Merge branch 'oairu' of https://gitlab.eurecom.fr/oai/openairinterface5g into oairu 2020-06-18 19:29:46 +02:00
magounak
a93deb3813 testing of standlone oairu 2020-06-18 19:26:06 +02:00
WANG Tsu-Han
3217b51256 simulation fix 2020-06-18 16:55:02 +02:00
laurent
2eb799c3b6 fix pdcp race condition 2020-06-18 15:52:54 +02:00
laurent
bc480ad9bf Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into main5G 2020-06-18 15:41:47 +02:00
laurent
36fab59e1c fix pdcp race condition 2020-06-18 15:41:10 +02:00
k.ramya
0cbe7e40db fixed merge conflicts 2020-06-18 18:32:43 +05:30
Rangaswami
8642d3e779 Corrected indentation and removed GES macro 2020-06-18 18:27:47 +05:30
vr.devendra
06fa1f8e0f GlobalEdge: CSI and TCI related MAC CE intial commit 2020-06-18 18:26:06 +05:30
Rangaswami
e08878ed1c Corrected indentation and removed GES macro 2020-06-18 18:01:13 +05:30
Francesco Mani
2b1f3891de Merge remote-tracking branch 'origin/develop' into NR_RRC_harq_hacks 2020-06-18 14:25:00 +02:00
vr.devendra
8533610e2a GlobalEdge: CSI and TCI related MAC CE intial commit 2020-06-18 17:51:44 +05:30
MaheshK1995
a6d105d2d1 P5 messages DONE [bypassed a bug] 2020-06-18 17:24:03 +05:30
Francesco Mani
c5f82f6d9f Merge remote-tracking branch 'origin/NR_RRC_PRACH_procedures' into NR_RRC_harq_hacks 2020-06-18 12:31:07 +02:00
Francesco Mani
338c0dbd63 Merge branch 'NR_RRC_harq_hacks' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRC_harq_hacks 2020-06-18 12:30:01 +02:00
Francesco Mani
795b6e02c4 fix for pusch num_dmrs_cdm_grps_no_data 2020-06-18 12:29:36 +02:00
Raphael Defosseux
4747f287d1 Merge remote-tracking branch 'origin/nr_pucch2_polar' into develop_integration_2020_w25 2020-06-18 11:35:12 +02:00
Raphael Defosseux
cc16b290b9 Merge remote-tracking branch 'origin/rework-5G-scope' into develop_integration_2020_w25 2020-06-18 11:33:12 +02:00
Raphael Defosseux
3f897adfb6 Merge remote-tracking branch 'origin/NR_RRC_PRACH_procedures' into develop_integration_2020_w25 2020-06-18 11:30:24 +02:00
laurent
d21a40066d scope for 5G 2020-06-18 10:19:52 +02:00
Raphael Defosseux
196ba803aa fix typos and compilation errors
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-06-18 10:17:06 +02:00
Raphael Defosseux
5df0326946 Merge branch 'develop_integration_2020_w24' into 'develop'
Develop integration 2020 week 24

The following Merge Requests are included:

* MR 822 : GPU implementation in `ldpctest` unitary test (NCTU)
* A few CI python fixes and to enable back parallel build on RRU
* Documentation update on the supported feature list
2020-06-17 21:17:50 +02:00
Raymond Knopp
f33278ac52 activated ru_threads 2020-06-17 20:52:39 +02:00
Raymond Knopp
e109f83bb9 Merge branch 'oairu' of https://gitlab.eurecom.fr/oai/openairinterface5g into oairu 2020-06-17 20:39:44 +02:00
Raymond Knopp
187561a1c2 commit before merge 2020-06-17 20:39:29 +02:00
magounak
d1a4911428 bug fixes in main 2020-06-17 20:36:16 +02:00
Raymond Knopp
695cb5f0cd configuration fix 2020-06-17 19:03:28 +02:00
Raymond Knopp
e97122f5ea added configuration file parsing to oairu 2020-06-17 17:52:46 +02:00
Raphael Defosseux
3bce9a7b85 CI: increase gNB VM RAM size; display memory usage during modems runs
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-06-17 14:19:40 +02:00
Raymond Knopp
e99ad54b66 added missing file 2020-06-17 12:49:56 +02:00
Raphael Defosseux
c540dd6120 Merge remote-tracking branch 'origin/rh_doc_update' into develop_integration_2020_w24 2020-06-17 10:14:03 +02:00
Raphael Defosseux
ebb225dc6e CI: adding ping operations in HTML report for 5G RF Sim Test
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-06-17 10:13:30 +02:00
Raymond Knopp
103168a047 standalone RRU executable initial testing version 2020-06-17 09:55:26 +02:00
matzakos
65b5a48ed1 Minor logs modifications at gNB ulsch scheduler 2020-06-16 17:41:34 +02:00
matzakos
456e6c9207 Change return type of nr_generate_ulsch_pdu() to avoid overflow on the offset variable 2020-06-16 17:40:03 +02:00
Sakthivel Velumani
eb7e15dd69 Merge branch 'NR_RRC_harq_hacks' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRC_harq_hacks 2020-06-16 17:05:41 +02:00
Sakthivel Velumani
2bee4f4974 partial fix for pdsch dmrs issue
decoding performance degraded. still some issue to be solved.
2020-06-16 17:03:47 +02:00
Raphael Defosseux
f4274b2b2c Merge remote-tracking branch 'origin/NCTU_GPU_ldpctest' into develop_integration_2020_w24 2020-06-16 13:03:08 +02:00
WANG Tsu-Han
c68c6153ed code clean up 2020-06-16 11:02:15 +02:00
Francesco Mani
619f82cbb7 external clock in config files and padding lcid 2020-06-16 10:32:12 +02:00
Francesco Mani
fd1388b61e power values in testing gnb file 2020-06-16 10:18:36 +02:00
MaheshK1995
164397b013 resolved pack/unpack issue 2020-06-16 13:23:14 +05:30
Florian Kaltenberger
377cfc6f0c fixing an issue with libconfig 2020-06-16 09:11:19 +02:00
Raymond Knopp
a0f8e5ac25 removed LOG functions from nr_polar_init, they make polartest segfault. polartest to be fixed ... 2020-06-15 21:20:03 +02:00
WANG Tsu-Han
98353b37d1 code cleanup 2020-06-15 17:14:11 +02:00
WANG Tsu-Han
37bb310a36 redefine conflict resolve 2020-06-15 16:51:04 +02:00
Thomas Schlichter
45ed1e8066 revert the number of DRB from 4 back to 5 2020-06-15 14:44:32 +02:00
laurent
1f95ec0888 coarse scope cleanup 2020-06-15 14:14:38 +02:00
Raphael Defosseux
527c3bcdd5 FORMAT: fix circular-depencendy-protection check on include files
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-06-15 14:02:18 +02:00
Raymond Knopp
09efbc0272 Merge remote-tracking branch 'origin/develop' into nr_pucch2_polar
Conflicts:
	openair1/PHY/NR_TRANSPORT/pucch_rx.c
2020-06-15 11:30:07 +02:00
matzakos
9a177fd368 Bring back mapping check between drb_id and channel_id 2020-06-15 10:42:04 +02:00
laurent
a9ba117ac7 first version scope reworked 2020-06-15 10:32:14 +02:00
Sakthivel Velumani
9add099c2b Merge branch 'NR_RRC_harq_hacks' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRC_harq_hacks 2020-06-15 10:23:21 +02:00
Raymond Knopp
417bc7e567 added tests to CI for PUCCH2 with polar code 2020-06-14 23:35:01 +02:00
Raymond Knopp
0e3d87b44c format 2 up to 64 bits tested for 8 and 16 PRBs PUCCH format 2020-06-14 23:10:12 +02:00
Rigiel Antony
a44d5fdcb9 fixed mergee conflicts 2020-06-14 16:57:07 +05:30
Rangaswami
7964fed747 Corrected indentation and removed GES macro 2020-06-14 16:40:37 +05:30
vr.devendra
f9b49d1a24 GlobalEdge: CSI and TCI related MAC CE intial commit 2020-06-14 16:37:28 +05:30
MaheshK1995
3343d93d2e investigating pack/unpack 2020-06-13 16:06:49 +05:30
Raymond Knopp
a2f448aa1c Merge branch 'NR_RRC_harq_hacks' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRC_harq_hacks 2020-06-13 11:49:36 +02:00
Raymond Knopp
14a0b772f3 fix for 36864 size dfts (missing initialization) 2020-06-13 11:48:50 +02:00
Raymond Knopp
2381bd91d2 Add detection of NR scgFailureInformation message at rrc eNB 2020-06-12 19:30:17 +02:00
Francesco Mani
2b976aa711 Merge branch 'NR_RRC_PRACH_procedures' into NR_RRC_harq_hacks 2020-06-12 19:14:25 +02:00
WANG Tsu-Han
860d406974 debug print remove 2020-06-12 15:58:56 +02:00
WANG Tsu-Han
89bb495799 fixes for emulate-rf in lte-softmodem 2020-06-12 15:18:43 +02:00
matzakos
45daaedbda Merge branch 'NR_RRC_PRACH_procedures' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRC_PRACH_procedures 2020-06-12 14:46:20 +02:00
matzakos
928c189ef0 Modify starting LCID for DTCH to start from 4 instead of 3 for both UL and DL
- Make required adaptations in RLC and default DRB configuration
2020-06-12 14:44:52 +02:00
WANG Tsu-Han
702192148e fixes for PARALLEL_RU_L1_TRX_SPLIT from Laurent 2020-06-12 14:42:51 +02:00
matzakos
1552be348c Fix ULSCH slot scheduling inconsistency between nrUE and gNB 2020-06-12 14:33:08 +02:00
Sakthivel Velumani
186dde7073 changes to dlsim 2020-06-12 14:07:15 +02:00
Raphael Defosseux
128aa79773 CI: no need for daemon install/usage in EPC VM
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-06-12 13:52:26 +02:00
Raphael Defosseux
938aa0f645 FORMAT: fix circular-depencendy-protection check on include files
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-06-12 13:51:50 +02:00
Florian Kaltenberger
b9f9d69bfd doc update 2020-06-12 11:31:00 +02:00
Remi Hardy
981d35a778 restructuring the 5G part
update of the 5G feature set (gNB and UE)
ref : Florian K ppt
2020-06-12 11:28:17 +02:00
Remi Hardy
e40835f96d Update:
eNB RRC version
eNB X2AP section
2020-06-12 11:28:17 +02:00
hardy
9be3e9f451 4G scheduler update 2020-06-12 11:28:17 +02:00
Florian Kaltenberger
f46e3d4c76 fixing an issue with libconfig 2020-06-12 11:13:18 +02:00
Sakthivel Velumani
28da25f420 more dummy functions for physims 2020-06-12 10:50:06 +02:00
Florian Kaltenberger
21a775817d Update RUNMODEM.md 2020-06-12 10:41:35 +02:00
Francesco Mani
cec29bb240 bugfix nr_initial_sync.c 2020-06-12 09:57:23 +02:00
Francesco Mani
5f87b73451 small fixes 2020-06-12 08:43:17 +02:00
WANG Tsu-Han
68366cb686 adding executional option for usrp trx thread and adding null device function for device other than usrp 2020-06-11 18:03:05 +02:00
Raphael Defosseux
edca3646c0 CI: fix typo
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-06-11 16:33:11 +02:00
Remi Hardy
24598a64d0 restructuring the 5G part
update of the 5G feature set (gNB and UE)
ref : Florian K ppt
2020-06-11 16:29:06 +02:00
Raphael Defosseux
90c8dfd76b Merge remote-tracking branch 'origin/ci_june_improvements' into develop_integration_2020_w24 2020-06-11 16:25:53 +02:00
Raphael Defosseux
d685023344 Merge remote-tracking branch 'origin/NCTU_GPU_ldpctest' into develop_integration_2020_w24 2020-06-11 16:25:41 +02:00
Raphael Defosseux
4893729e58 CI: re-enabling multi-RRU build w/ ninja build
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-06-11 16:22:54 +02:00
Raphael Defosseux
efee127a99 CI: added error output if in MBMS-case, the UE does not show MBMS messages
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-06-11 16:20:36 +02:00
Remi Hardy
8b0d4e15d7 Update:
eNB RRC version
eNB X2AP section
2020-06-11 14:43:34 +02:00
hardy
2c8e2a30f9 4G scheduler update 2020-06-11 14:24:12 +02:00
Raymond Knopp
613d1e8cf0 intermediate commit 2020-06-11 14:24:03 +02:00
WANG Tsu-Han
cdc60bd9ae fixes for compilation error in CUDA machine 2020-06-11 11:53:26 +02:00
Sakthivel Velumani
a4fb2e21c9 linking error fix in pbchsim 2020-06-11 09:53:10 +02:00
Sakthivel Velumani
3e47e26cd1 bugfix in dl harq ue 2020-06-10 17:12:36 +02:00
Anes Rose Rigiel Antony
3ac51d2115 Removed the compilation error 2020-06-10 19:47:32 +05:30
Francesco Mani
ae00c77c5c Merge branch 'NR_RRC_harq_hacks' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRC_harq_hacks 2020-06-09 20:33:21 +02:00
Francesco Mani
bedb295dfd Merge branch 'develop' into NR_RRC_harq_hacks 2020-06-09 20:32:35 +02:00
Ahmed Hussein
dae91c60b8 Fixing ulsim and rf simulator
- no_data_in_dmrs was being used at gNB side, and not handled at UE side
- nr_schedule_response wasn't being called in ulsim
2020-06-09 15:49:53 +02:00
Sakthivel Velumani
132b48ea36 Fixed bugs in pucch UE
UE now sends ack/nack in format0
2020-06-09 15:44:09 +02:00
Rigiel
e4335ef412 After rebasing the NR RRC PRACH procedure 2020-06-09 18:58:53 +05:45
s.rampalli
b4651f2449 modified the rrc_add_nsa_user api 2020-06-09 18:50:04 +05:45
s.rampalli
9cbe078ed0 indentations fixed 2020-06-09 18:50:04 +05:45
s.rampalli
defea03ab9 Required changes/modifications are done at both eNB and gNB side 2020-06-09 18:50:04 +05:45
Raymond Knopp
c7a8c6f60a Merge branch 'NR_RRC_PDCP' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRC_PDCP 2020-06-09 15:03:16 +02:00
s.rampalli
2f48b92501 compilation done need to verify with GES endc setup 2020-06-09 17:47:08 +05:45
s.rampalli
63bc9a9ba3 coding done need to verify testing part 2020-06-09 17:47:08 +05:45
s.rampalli
9747773f16 changed the encoded buffer size to 4096 2020-06-09 17:47:08 +05:45
s.rampalli
38a39ec0be fixed rrc x2ap runtime issues 2020-06-09 17:47:08 +05:45
s.rampalli
e7c20bc081 mistake 2020-06-09 17:47:08 +05:45
s.rampalli
a07cfa3dd3 rrc changes 2020-06-09 17:47:08 +05:45
s.rampalli
69455512c8 fixed rrc issues 2020-06-09 17:47:08 +05:45
s.rampalli
eac285d405 rrc runtime errors fixed 2020-06-09 17:47:08 +05:45
s.rampalli
b8e43ff2da fixed encoding failed issue 2020-06-09 17:47:08 +05:45
s.rampalli
d988eb82fc Removed temporary values in x2ap and rrc 2020-06-09 17:47:08 +05:45
cig
f4d47b1ea7 Checking in dl_indication if scheduling is needed or any DL PDU was received:
- scheduling is needed only when whe it doesn´t fall in dci_ind or rx_ind cases
- cleaned up some old commented out code
2020-06-09 13:53:27 +02:00
Thomas Schlichter
36f5e80ea3 cleaning up the UE MAC/PHY interface 2020-06-09 13:53:27 +02:00
Thomas Schlichter
614083f03f Merge branch 'develop' into NR_RRC_PRACH_procedures
Conflicts:
	cmake_targets/CMakeLists.txt
	openair2/GNB_APP/gnb_app.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
	openair2/RRC/NR/rrc_gNB_nsa.c
2020-06-09 13:03:28 +02:00
Thomas Schlichter
96dc4a888d fix broken merge from develop in ulsim 2020-06-09 12:38:54 +02:00
laurent
64e3e97158 more cleanup, start scope vizualisation rework 2020-06-09 09:00:03 +02:00
Raymond Knopp
6a9d606255 Temporarily consider single LCID for DL traffic scheduling 2020-06-08 19:09:03 +02:00
Francesco Mani
2e8092540f moving function to prepare pucch scheduling inside dlsch_phytest 2020-06-08 16:31:30 +02:00
Raphael Defosseux
90b102687f Merge branch 'develop_integration_2020_w23' into 'develop'
Develop Integration 2020 week 23

The following merge requests have been included:

* MR 823 : NR-UE Init sync bugfix
* MR 824 : code cleanup
2020-06-08 15:17:34 +02:00
Raymond Knopp
072836d7b9 NR-IP traffic: Make fapi dl pdu configuration be triggered only when there is data from the upper layers to be scheduled
- To be used for NSA and noS1 modes
2020-06-08 14:38:54 +02:00
Raymond Knopp
ad1e47f7f4 Merge branch NR_RRC_harq_hacks into NR_RRC_PDCP 2020-06-08 14:30:38 +02:00
Raphael Defosseux
d0ca8f12e8 CI: handling of new compilation warnings
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-06-08 11:04:27 +02:00
Raphael Defosseux
5cb573fcab Merge remote-tracking branch 'origin/cleanup-20200604' into develop_integration_2020_w23 2020-06-08 10:34:21 +02:00
Florian Kaltenberger
0124e5378c adding possibility to read rx signal from file 2020-06-06 22:55:13 +02:00
laurent
1ff806d519 fix shared lib dependency error 2020-06-05 18:26:47 +02:00
Sakthivel Velumani
06ee95f40e UE sync fix 2020-06-05 17:35:46 +02:00
Sakthivel Velumani
91fd14bf99 UE harq bugfixes 2020-06-05 17:35:25 +02:00
Thomas Schlichter
84dfeff40a fix broken merge from develop in phy_procedures_gNB_common_RX() 2020-06-05 10:09:57 +02:00
MaheshK1995
fd51a5bdcb PARAM message exchange DONE 2020-06-04 19:09:37 +05:30
Raphael Defosseux
89acc09420 CI: fix the RAW files usage by NR-UE
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-06-04 14:32:41 +02:00
MaheshK1995
776a74401d LTE to NR conversions 2020-06-04 15:00:09 +05:30
laurent
d1e8c23529 cleanup 2020-06-04 10:48:29 +02:00
Rangaswami
884cbc7c8c Corrected indentation and removed GES macro 2020-06-04 11:04:43 +05:30
Thomas Schlichter
1a91c25d07 Merge branch 'init_sync_bugfix' into NR_RRC_PRACH_procedures
Conflicts:
	executables/nr-ue.c
2020-06-03 21:50:01 +02:00
Thomas Schlichter
225a500b3e Merge branch 'develop' into NR_RRC_PRACH_procedures
Conflicts:
	executables/nr-ue.c
	openair1/PHY/NR_REFSIG/dmrs_nr.c
	openair1/PHY/NR_TRANSPORT/nr_prach.c
	openair1/PHY/NR_TRANSPORT/nr_transport_common_proto.h
	openair1/PHY/NR_TRANSPORT/nr_transport_proto_common.h
	openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c
	openair1/PHY/NR_UE_TRANSPORT/nr_transport_ue.h
	openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c
	openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
	openair1/SIMULATION/NR_PHY/prachsim.c
	openair1/SIMULATION/NR_PHY/ulsim.c
	openair2/LAYER2/NR_MAC_COMMON/nr_mac_extern.h
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
2020-06-03 19:50:54 +02:00
Raymond Knopp
376baa3247 fixes for machine without CUDA 2020-06-03 17:02:03 +02:00
Francesco Mani
7948d26f8c Revert "scheduling dl in both half frames"
This reverts commit cf5bc231ec.
2020-06-03 15:45:00 +02:00
Francesco Mani
62b154e8d6 Merge branch 'NR_RRC_harq_hacks' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRC_harq_hacks 2020-06-03 15:42:31 +02:00
Raphael Defosseux
a2ffa29f3b Making CUDA additions conditional on CUDA installation
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-06-03 15:32:51 +02:00
Sakthivel Velumani
5bfbb00d2c bugfix for UE init sync 2020-06-03 14:49:26 +02:00
Florian Kaltenberger
f6b83fd925 adding frequency offset to prachsim 2020-06-03 11:52:20 +02:00
WANG Tsu-Han
79899c8a6f adding CUDA in LDPC test 2020-06-03 09:55:33 +02:00
Francesco Mani
c359a05351 Revert "separation of dl and ul clear fapi information"
This reverts commit 17a1a554b7.
2020-06-02 18:31:09 +02:00
Francesco Mani
17a1a554b7 separation of dl and ul clear fapi information 2020-06-02 16:14:49 +02:00
MaheshK1995
017517986c Debugging 2020-06-02 16:07:02 +05:30
MaheshK1995
1e377d584f updated gitignore 2020-06-02 15:35:58 +05:30
laurent
0169c05c74 merge develop, some tests in 5g: no regression 2020-06-02 11:26:11 +02:00
laurent
62f9e7b5e7 remove all usage of RC.ru global var in ocp-gnb and nr-uesoftmodem 2020-06-02 10:35:17 +02:00
Raymond Knopp
e6d03868cb Merge remote-tracking branch 'origin/NR_RRC_harq_hacks' into NR_RRC_PDCP 2020-06-02 10:17:26 +02:00
NCTU OpinConnect Terng-Yin Hsu/WEI-YING,LIN
579cfad82d git add for merge 2020-06-01 19:51:25 +08:00
NCTU OpinConnect Terng-Yin Hsu/WEI-YING,LIN
03d354efce merge to develop 2020-06-01 19:27:44 +08:00
Raymond Knopp
65cf9da7d2 Merge branch NR_RRC_harq_hacks into NR_RRC_PDCP 2020-05-29 16:57:34 +02:00
Francesco Mani
cf5bc231ec scheduling dl in both half frames 2020-05-29 16:44:26 +02:00
Raphael Defosseux
362da7c920 Merge branch 'develop_integration_2020_w22' into 'develop'
Develop Integration Branch : 2020 week 22

The following Merge Requests are been included:

* MR 796 : Nr rrc configuration trx thread
* MR 807 : Use SCF FAPI for DMRS and PTRS also on UE side
* MR 817 : Fixing errored/missing circular dependency protection
* MR 819 : cleanup branch and initial ninja build support
* MR 820 : CI: Add OAI-CN-In-Docker support
2020-05-29 15:50:58 +02:00
Raphael Defosseux
8cdba4ff2d CI: fix a few cppcheck errors
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-05-29 11:59:40 +02:00
Raphael Defosseux
534525eada CI: fix typo in inria pipeline
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-05-29 11:58:28 +02:00
s.rampalli
19a44bd092 modified the rrc_add_nsa_user api 2020-05-29 12:57:29 +05:30
Francesco Mani
4e12c39471 static bitmap to schedule dl slots (also to test phone) 2020-05-28 17:56:42 +02:00
Raphael Defosseux
77492a09ce Merge remote-tracking branch 'origin/cleanup-may-2020' into develop_integration_2020_w22 2020-05-28 14:27:45 +02:00
Raphael Defosseux
f63920dc7c CI: taking care of the case if R2LAB is not available
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-05-28 14:27:06 +02:00
Raphael Defosseux
6a0e50c8a8 CI: trying on inria setup w/o threading specific option
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-05-28 14:26:54 +02:00
Raphael Defosseux
29b2922758 CI: increase timeout for building OAI UE
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-05-28 14:23:09 +02:00
laurent
19690332af fix one T dependency 2020-05-28 13:41:04 +02:00
Raphael Defosseux
4ce8275ffb Merge remote-tracking branch 'origin/add_oai_cn_docker_support_to_ci' into develop_integration_2020_w22 2020-05-28 12:59:08 +02:00
Raphael Defosseux
768b4e0f24 Merge remote-tracking branch 'origin/cleanup-may-2020' into develop_integration_2020_w22 2020-05-28 12:58:42 +02:00
Raphael Defosseux
a0ab138a5e Merge remote-tracking branch 'origin/fix-circular-dependency-protection' into develop_integration_2020_w22 2020-05-28 12:56:05 +02:00
Raphael Defosseux
e5eca66ad5 Merge remote-tracking branch 'origin/fapi_for_dmrs_and_ptrs' into develop_integration_2020_w22 2020-05-28 12:55:48 +02:00
laurent
9b06211056 remove test ninja 2020-05-27 17:58:01 +02:00
laurent
c02b12f15b test ninja 2020-05-27 17:19:11 +02:00
WANG Tsu-Han
82bbde7dbb fix for rf simulation 2020-05-27 10:48:26 +02:00
Raymond Knopp
dad2d8bce7 Merge branch 'NR_RRC_harq_hacks' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRC_harq_hacks
Conflicts:
	openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c
2020-05-26 16:39:50 +02:00
WANG Tsu-Han
a5cffd8240 device funtion call initalization fix 2020-05-26 16:21:20 +02:00
Raymond Knopp
0a45909bd1 minor changes 2020-05-26 15:37:10 +02:00
Raymond Knopp
c042f7c26a fixed issue related to scheduing of PRACH for long sequence (only gets done in last slot of subframe now, not both) and start point of DFT in RU processing for long-sequence. Removes fatal segfault. 2020-05-26 11:40:54 +02:00
Raphael Defosseux
9097867cd8 CI: check the NR-UE cell-synchronization during launch not and just in post-mortem diagnosis
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-05-26 10:53:58 +02:00
Raphael Defosseux
9142c684df CI: adding support for docker-based OAI-CN-CUPS deployment
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

Conflicts:
	ci-scripts/epc.py
2020-05-26 10:53:38 +02:00
Sakthivel Velumani
d37f077082 handling failed ack/nack reception 2020-05-26 00:22:48 +02:00
Raymond Knopp
539ff7bf85 Merge branch 'NR_RRC_harq_hacks' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRC_harq_hacks 2020-05-26 00:05:40 +02:00
Raymond Knopp
fe5cd3d28d fixed bug for long PRACH sequence configuration, flipped HARQ bits for 2-bit PUCCH0 UCI report 2020-05-26 00:04:49 +02:00
Raymond Knopp
69b4211aba Change default NR DRB configuration to RLC UM 2020-05-25 21:13:19 +02:00
Raymond Knopp
72f1b2cb09 Remove hack restriction for single time DL scheduling 2020-05-25 20:55:12 +02:00
Raymond Knopp
fd5f7bec0d Merge branch NR_PDCP_noS1 back to NR_RRC_PDCP 2020-05-25 20:13:22 +02:00
matzakos
47713f2a08 NR RB configuration: Remove dependencies from LTE structures
-Remaining LTE dependency in RLC add_srb function (not used for NSA setup)
-Rename function for DRB static preconfiguration used in noS1 mode
2020-05-25 15:46:00 +02:00
Raymond Knopp
d0e6e847e1 assertion removal 2020-05-25 14:36:37 +02:00
vr.devendra
02be147d17 GlobalEdge: CSI and TCI related MAC CE intial commit 2020-05-22 20:15:12 +05:30
Francesco Mani
6fa5a6cf89 bugfix 2020-05-22 15:35:31 +02:00
Francesco Mani
03b38ca871 Merge branch 'NR_RRC_harq_hacks' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRC_harq_hacks 2020-05-22 15:02:03 +02:00
Francesco Mani
17e52131d3 scheduling continuous dl transmission in first half frame 2020-05-22 15:00:37 +02:00
Sakthivel Velumani
94b88cf2cf bug fixes 2020-05-22 13:16:30 +02:00
Sakthivel Velumani
453e257d8d Merge branch 'NR_RRC_harq_hacks' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRC_harq_hacks 2020-05-22 12:47:03 +02:00
Sakthivel Velumani
eb5a7a9ab1 added harq handling in gnb mac 2020-05-22 12:41:28 +02:00
Raymond Knopp
8f8894d764 suppressed some LOG_M that were killing real-time. 2020-05-21 23:02:08 +02:00
Thomas Schlichter
ce105df4e7 Merge branch 'develop' into NR_RRC_PRACH_procedures
Conflicts:
	openair1/PHY/NR_TRANSPORT/nr_transport.h
	openair1/PHY/NR_TRANSPORT/nr_transport_common_proto.h
	openair1/PHY/NR_TRANSPORT/nr_transport_proto_common.h
	openair1/SCHED_NR/phy_procedures_nr_gNB.c
	openair1/SIMULATION/NR_PHY/prachsim.c
	openair2/GNB_APP/RRC_nr_paramsvalues.h
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
	openair2/LAYER2/NR_MAC_gNB/mac_proto.h
	openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
2020-05-20 19:26:16 +02:00
Francesco Mani
2f4f90ba24 bugfix 2020-05-20 15:49:43 +02:00
laurent
bdee45878a cleanup branch 2020-05-20 15:44:20 +02:00
Francesco Mani
3284e42e51 Merge branch 'NR_RRC_harq_hacks' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRC_harq_hacks 2020-05-20 15:06:03 +02:00
Francesco Mani
b0ff2cef54 rearranged function to prepare pucch scheduling 2020-05-20 15:05:33 +02:00
cig
928dd902e3 Code cleanup 2020-05-20 12:41:06 +02:00
cig
783470905d Bugfix: missing deactivation dlsch after processing is done:
- the issue popped up with the new rx/tx implementation  at the UE
- this was causing false processing of DLSCH PDU and reception of false
  TA commands
2020-05-20 12:41:05 +02:00
s.rampalli
04e903a39b indentations fixed 2020-05-20 15:47:03 +05:30
s.rampalli
729890a133 Required changes/modifications are done at both eNB and gNB side 2020-05-20 15:26:37 +05:30
WANG Tsu-Han
a85a39048d Merge branch 'develop' into NR_RRCConfiguration_trx_thread 2020-05-20 09:50:05 +02:00
Raymond Knopp
6fb195867b Merge branch 'NR_RRC_harq_hacks' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRC_harq_hacks 2020-05-19 23:59:31 +02:00
Raymond Knopp
dd8cb98443 added support in gNB and UE for long PRACH sequences. Tested format 0 with unitary simulation only. 2020-05-19 23:58:28 +02:00
laurent
cbd801b6e5 some cleanup and checks 2020-05-19 21:29:13 +02:00
Francesco Mani
49991e100b bugfix for 2 acknacks in pucch0 2020-05-19 19:09:29 +02:00
matzakos
58bc9e5395 Fix ULSCH slot scheduling mismatch between gNB and OAI UE 2020-05-19 15:27:08 +02:00
matzakos
0c287d9f51 Adaptation at DLSCH scheduling function to support EPC mode 2020-05-19 15:23:12 +02:00
matzakos
c2e65b0639 Correct pseudo-subheader byte of random ULSCH PDU (phytest) to an appropriate value 2020-05-19 15:08:02 +02:00
matzakos
9e8e9c8ff0 noS1: Introduce NR DRB preconfiguration and PDCP RLC configuration triggering 2020-05-19 14:57:38 +02:00
laurent
9112ee01f5 Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into main5G 2020-05-18 22:17:16 +02:00
laurent
026924244a merge develop, ocp-gnb working on rf sim and phy-test mode: DL and UL user traffic 2020-05-18 22:16:54 +02:00
Francesco Mani
03ce05571a Merge branch 'NR_RRC_harq_b' into NR_RRC_harq_hacks 2020-05-18 19:00:58 +02:00
Sakthivel Velumani
5a5f503997 Merge branch 'develop' into NR_RRC_harq_b 2020-05-18 12:57:51 +02:00
Sakthivel Velumani
54ca9ea5ab fixed pucch procedures to use rrc struct in UE 2020-05-18 12:57:24 +02:00
matzakos
6d71096637 Change pseudo-subheader byte of random ULSCH PDU (phytest) to an appropriate value
- Apply a value which cannot be interpreted as any valid LCID at the MAC layer of the receiver gNB (as per 38.321 Table 6.2.1-2),
to avoid forwarding the random PDU to the upper layers in noS1 mode.
2020-05-17 13:03:24 +02:00
Raymond Knopp
4e50e36ede intermediate commit, pucch2 RX with polar still not complete 2020-05-17 10:43:15 +02:00
Francesco Mani
b5b78125c9 test scheduling of pucch reception 2020-05-15 18:47:06 +02:00
Francesco Mani
d268c320ca Merge branch 'develop' into NR_RRC_harq_hacks 2020-05-15 16:26:33 +02:00
Raphael Defosseux
11783e755a Fixing errored/missing circular dependency protection
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-05-15 15:39:11 +02:00
Francesco Mani
0add4fdb55 bugfix in pucch timing indicator selection 2020-05-15 09:14:30 +02:00
Thomas Schlichter
7fc9ab7720 use NR_UE_sched_ctrl_t instead of UE_sched_ctrl_t in gNB_scheduler 2020-05-14 18:38:08 +02:00
Thomas Schlichter
95833dde60 Merge branch 'develop' 2020-05-14 18:36:59 +02:00
Ahmed Hussein
566de5670b Bug fixes regarding ping issues 2020-05-14 16:18:53 +02:00
s.rampalli
2792f8ce4a compilation done need to verify with GES endc setup 2020-05-14 15:36:45 +05:30
s.rampalli
62bb979b49 coding done need to verify testing part 2020-05-14 12:22:44 +05:30
Raymond Knopp
f043c63a34 added 2 UCI tests to CI for polartest 2020-05-14 00:45:58 +02:00
Raymond Knopp
100f75ba45 polar coding for UCI (PUCCH) integrated into polartest for lengths 12...64 2020-05-14 00:41:15 +02:00
Francesco Mani
1c7ee3caba using num_dmrs_cdm_grps_no_data for PUSCH in PHY 2020-05-13 18:05:15 +02:00
NCTU OpinConnect Terng-Yin Hsu/WEI-YING,LIN
a102405896 LDPC cuda support BG1 all length 2020-05-13 22:31:30 +08:00
NCTU OpinConnect Terng-Yin Hsu/WEI-YING,LIN
02dc4ba8ce configured LDPC on CPU and GPU 2020-05-13 22:27:36 +08:00
NCTU OpinConnect Terng-Yin Hsu/WEI-YING,LIN
da62b92f6e Merge remote-tracking branch 'origin/develop' into NCTU_OpinConnect_LDPC 2020-05-13 22:24:40 +08:00
Francesco Mani
6f0e4fe149 using numDmrsCdmGrpsNoData for PDSCH in PHY 2020-05-13 16:22:05 +02:00
NCTU OpinConnect Terng-Yin Hsu/WEI-YING,LIN
5c7e4c21db LDPC implementation on Quadro p5000 by NCTU OpinCommect 2020-05-13 22:21:49 +08:00
matzakos
97d1f98f67 Merge remote-tracking branch 'origin/NR_RRC_harq_hacks' into NR_RRC_PDCP 2020-05-13 13:56:18 +02:00
cig
268a35419e Hotfix scrambling rnti
- this is needed because in the current implementation of the gNB
  the scrambling rnti is 0 for the RA and dci rnti otherwise
2020-05-12 17:38:47 +02:00
cig
4522cd4eb9 Changes to RA procedures:
- monitoring RA window
- taking RA_offset into account
- workaround to generate PRACH only when the RAR has not been received yet (RA is idle)
2020-05-12 17:33:28 +02:00
cig
66395ff7b7 Set RA offset at UE to compensate for 2 frames offset introduced by gNB 2020-05-12 17:28:35 +02:00
cig
8394ee82f5 More dynamic DCI configuration 2020-05-12 17:28:11 +02:00
cig
08b6211956 Scheduling of Msg2 2020-05-12 17:23:50 +02:00
cig
12b585a190 Fixes to RA procedure 2020-05-12 17:19:10 +02:00
cig
58dbf7d4b9 New design UE scheduler 2020-05-12 17:19:00 +02:00
Raymond Knopp
704e167b86 Merge branch 'NR_RRC_PDCP' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRC_PDCP 2020-05-12 15:31:12 +02:00
Raymond Knopp
06d4ef6177 Modification of an input parameter type for nr_rrc_rlc_config_asn1_req 2020-05-12 14:58:44 +02:00
Francesco Mani
ad246f961b reset rnti and harq_mask in dlsch structure 2020-05-12 14:14:41 +02:00
Raphael Defosseux
e376241a82 Merge branch 'develop_integration_2020_w19' into 'develop'
Develop Integration Branch -- 2020 week 19

The following Merge Requests were included:

* MR [810] : NR PUCCH
* MR [812] : fix 20 compilation warnings
* MR [815] : rlc v2 -- coverity scan fixes
* MR [816] : hotfix: fix compilation of UE with --musim

Also add fixes for CI
2020-05-11 21:10:34 +02:00
Raphael Defosseux
f9403e9a2e Merge remote-tracking branch 'origin/hotfix-ue-musim-compilation' into develop_integration_2020_w19 2020-05-11 11:22:48 +02:00
Raphael Defosseux
ab7ec85342 Merge remote-tracking branch 'origin/rlc_v2_coverity_fixes' into develop_integration_2020_w19 2020-05-11 11:22:34 +02:00
cig
96b5755753 Cleanup NR UE DCI configuration 2020-05-11 11:09:36 +02:00
cig
785ffa4def Minor fixes 2020-05-11 11:09:36 +02:00
cig
4dc0e7f235 Enabled UE to process RX and TX in every DL or UL (or mixed) slot respectivey
- the commit fixes also the selection of the thread_id in TX procedures
- DCI configuration is currently limited to slot 1 and 7
2020-05-11 11:09:36 +02:00
cig
e3ba90b055 Fixes for polar and scrambling RNTI at UE
- including temporary hotfix for the polar rnti
2020-05-11 11:09:36 +02:00
Francesco Mani
cdead06962 fix for scrambling rnti and dci format 2020-05-11 11:09:36 +02:00
Cedric Roux
301ea42482 hotfix: fix compilation of UE with --musim
The following was failing:
./build_oai --UE --musim

Not sure this fix is correct, but it seems consistent with
the rest of platform_constants.h.
2020-05-09 10:12:38 +02:00
Francesco Mani
88e5203dfa bugfix in dci1_1 size 2020-05-08 17:19:31 +02:00
Francesco Mani
185477dc9f fix for ULSCH ok when PRBs are empty 2020-05-08 15:29:28 +02:00
Francesco Mani
927d97fa3f Merge branch 'NR_RRC_harq_hacks' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRC_harq_hacks 2020-05-08 15:27:10 +02:00
Raymond Knopp
160fef9a2d fix after merge 2020-05-08 10:25:06 +02:00
Raymond Knopp
afa7ef9afe Merge branch 'NR_RRC_harq_hacks' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRC_harq_hacks 2020-05-08 10:17:18 +02:00
Raymond Knopp
70dff719e2 pusch dmrs rx fix, added comp file dump to ulsim 2020-05-08 10:16:30 +02:00
Cedric Roux
21a2a8c6e1 rlc v2: some fixes for 'bugs' found by coverity scan
Minor fixes, doesn't change anything. Not sure these are 'bugs' either,
but let's be polite with coverity scan...

One thing was not changed.
Coverity scan says:
*** CID 357991:  Memory - illegal accesses  (USE_AFTER_FREE)
/home/carabe/raphael/openairinterface5g/openair2/LAYER2/rlc_v2/rlc_entity_am.c: 507 in tx_list_remove_sn()
501         } else {
502           prev = cur;
503           cur = cur->next;
504         }
505       }
506
>>>     CID 357991:  Memory - illegal accesses  (USE_AFTER_FREE)
>>>     Using freed pointer "head.next".
507       return head.next;
508     }
509
510     void cleanup_sdu_list(rlc_entity_am_t *entity)
511     {
512       rlc_sdu_t head;

But as far as I understand, there is no problem. We don't access
head.next at all if it has been freed. Or is there some aliasing
going on there (pointer aliasing)? I doubt it. False positive?
2020-05-07 18:05:05 +02:00
Raphael Defosseux
bca9ecfd3c add missing circular dependency protection
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-05-07 16:38:00 +02:00
Raphael Defosseux
2a8dacc009 CI: better code guideline analysis
-- check if C file has a GNU GPL license
-- check if C file has s suspect license
-- check if C header is having correct circular dependency protection (with Laurent Thomas's help)

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-05-07 16:35:28 +02:00
Raphael Defosseux
454139ac63 CI: fix a few typos in python framework
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-05-07 16:34:53 +02:00
Ahmed Hussein
6a32e60a4f Fixed bug regarding TBS calculation and G calculation
- The number of nb_dmrs_re at gNB side was set to 6, but here it is assumed
    that there will be no data allocation in OFDM symbols that carry DMRS
  - nb_dmrs_re that is being given as an input to the TBS calculation,
    should be multiplied by the number of DMRS symbols in order to get the total
    number of DMRS REs per RB
  - In the calculation of G, only the number of DMRS per RB in 1 OFDM symbol should
    be given as an input, because inside the function of the G calculation, this
    number is being multiplied by the number of OFDM symbols that carry DMRS
2020-05-07 14:41:19 +02:00
Ahmed Hussein
589801f620 Fixed bug related to N_TA_offset not being applied at UE
- By default this value is equal to 0 at gNB in case of ulsim, but
    has a value in case of RF simulator
  - The N_TA_offset was calculated but not used at UE side
2020-05-07 14:39:28 +02:00
Thomas Schlichter
25c4cea36f remove now unnecessary frame_gap completely 2020-05-07 10:02:11 +02:00
Thomas Schlichter
aa7e10c405 also use the high 6 bits from MIB when calculating decoded_frame_rx after the initial synchronization 2020-05-07 10:02:11 +02:00
Thomas Schlichter
fa18a88fdb fix updating UE->frame_gap and calculation if proc->frame_rx > dcireq.dl_config_req.sfn 2020-05-07 10:02:11 +02:00
Francesco Mani
d4929cc21e bugfix in dmrs offset for pusch 2020-05-07 09:52:48 +02:00
Francesco Mani
014e045ba6 bugfix in dmrs offset for pusch 2020-05-07 09:44:07 +02:00
s.rampalli
cf844cef14 changed the encoded buffer size to 4096 2020-05-06 22:31:08 +05:30
Ahmed Hussein
1ffa9eed64 Bug fix regarding the uplink dmrs symbol position bitmask 2020-05-06 16:15:30 +02:00
Sakthivel Velumani
87ecb91885 updated cmakelist 2020-05-06 13:45:14 +02:00
Raphael Defosseux
ae5a1e4131 CI: fix unresolved merge conflicts
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-05-06 12:08:53 +02:00
Raphael Defosseux
29f984a60a CI: fix missing class member for EPC
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-05-06 12:08:53 +02:00
Raphael Defosseux
0113a9b978 Merge remote-tracking branch 'origin/nr_pucch2' into develop_integration_2020_w19 2020-05-06 12:08:41 +02:00
Raymond Knopp
bd1c4dd00b Add default NR RLC UM bearer configuration 2020-05-05 20:30:19 +02:00
s.rampalli
37dcfb1a9d fixed rrc x2ap runtime issues 2020-05-05 21:36:07 +05:30
Sakthivel Velumani
7746421192 Merge branch 'develop' into NR_RRC_harq_b 2020-05-05 16:32:37 +02:00
s.rampalli
cfd402a03a mistake 2020-05-05 19:53:13 +05:30
s.rampalli
509fb16705 rrc changes 2020-05-05 17:22:17 +05:30
s.rampalli
c52c9b7ba4 fixed rrc issues 2020-05-05 14:03:05 +05:30
s.rampalli
85cfa10961 rrc runtime errors fixed 2020-05-05 13:55:49 +05:30
s.rampalli
bdc7943b8f fixed encoding failed issue 2020-05-05 09:09:27 +05:30
Raymond Knopp
632ef048c8 Introduce triggering of PDCP and RLC configuration for the list of added DRBs
-Upon reception of SgNB Addition Request from the eNB, the gNB configures pdcp and rlc entities for the list of DRBs provided from the eNB
2020-05-04 18:12:20 +02:00
Raymond Knopp
017a6ef141 Introduce NR RRC->RLC configuration
-Create nr_rrc_rlc_config_asn1_req function
-Update RLC DRB addition functions with NR structures instead of LTE
2020-05-04 17:58:36 +02:00
Raymond Knopp
eb51e39f39 Introduce NR RRC->PDCP configuration
-Create nr_rrc_pdcp_config_asn1_req function
-Update PDCP DRB addition functions with NR structures instead of LTE
2020-05-04 17:48:18 +02:00
Sakthivel Velumani
64808859b9 updated CI test list with harq test 2020-05-04 15:42:15 +02:00
Raymond Knopp
042aac3d4f reverted handling of transform_precoding variable in NR FAPI. Added correct handling of this in ulsim.c 2020-05-04 09:49:18 +02:00
Sakthivel Velumani
7655123997 included throughput print 2020-05-04 09:29:36 +02:00
Raymond Knopp
2f9bf0d84c added file reading for ulsim 2020-05-04 08:19:48 +02:00
laurent
7aa9a7bd49 work in progress, re-merge before continuing 2020-05-03 18:30:26 +02:00
laurent
da54778c4a fix warnings 2020-05-03 18:27:07 +02:00
Thomas Schlichter
79471f2f6d Merge branch 'develop' into NR_RRC_PRACH_procedures
Conflicts:
	executables/nr-ue.c
	openair1/PHY/NR_TRANSPORT/nr_dci_tools.c
	openair1/PHY/NR_UE_TRANSPORT/nr_prach.c
	openair1/PHY/defs_RU.h
	openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
	openair2/RRC/NR/rrc_gNB_nsa.c
	openair2/X2AP/x2ap_eNB_handler.c
2020-04-30 18:54:37 +02:00
Raymond Knopp
84b1df4b87 Merge remote-tracking branch 'origin/develop' into nr_pucch2 2020-04-30 16:12:18 +02:00
Raymond Knopp
4210c41179 removal of a massive number of warnings 2020-04-30 15:48:37 +02:00
Raphael Defosseux
cd82d94cb2 Merge branch 'develop_integration_2020_w17' into 'develop'
Develop Integration Branch -- 2020 week 17

See merge request oai/openairinterface5g!809
2020-04-30 14:37:31 +02:00
Raphael Defosseux
9f09885dbf Merge remote-tracking branch 'origin/split73' into develop_integration_2020_w17 2020-04-30 10:37:22 +02:00
Raymond Knopp
7caf3d9cd9 Merge remote-tracking branch 'origin/develop' into nr_pucch2
Conflicts:
	cmake_targets/autotests/test_case_list.xml
	executables/nr-gnb.c
	openair1/PHY/INIT/nr_init.c
	openair1/PHY/TOOLS/tools_defs.h
	openair1/PHY/defs_gNB.h
	openair1/SCHED_NR/phy_procedures_nr_gNB.c
2020-04-30 09:48:13 +02:00
Raymond Knopp
cd3f5ad001 added parameters to generate_pucch2 in ue pucch procedures 2020-04-30 09:18:54 +02:00
Raphael Defosseux
7ad752232d Merge remote-tracking branch 'origin/new_rlc_2020' into develop_integration_2020_w17 2020-04-29 18:50:32 +02:00
Cedric Roux
e5ea8a5a03 rlc v2: fix cmake file 2020-04-29 16:15:59 +02:00
Francesco Mani
86bc794518 bugfix in dmrs reception for pusch 2020-04-29 14:00:32 +02:00
Ahmed Hussein
fcf6439040 Fixed bug related to N_TA_offset not being applied at UE
- By default this value is equal to 0 at gNB in case of ulsim, but
    has a value in case of RF simulator
  - The N_TA_offset was calculated but not used at UE side
2020-04-29 12:08:22 +02:00
laurent
9ac5f6015d update license text 2020-04-29 11:31:00 +02:00
Raphael Defosseux
8007758efe Merge remote-tracking branch 'origin/split73' into develop_integration_2020_w17 2020-04-29 10:31:14 +02:00
Raphael Defosseux
c47daed70c LIC: wrong license banner on proto-agent files
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-04-29 10:30:09 +02:00
Sakthivel Velumani
4eb78faaa1 added harq stats in dlsim 2020-04-28 21:59:34 +02:00
Ahmed Hussein
eeef6da2aa Fixed bug regarding TBS calculation and G calculation
- The number of nb_dmrs_re at gNB side was set to 6, but here it is assumed
    that there will be no data allocation in OFDM symbols that carry DMRS
  - nb_dmrs_re that is being given as an input to the TBS calculation,
    should be multiplied by the number of DMRS symbols in order to get the total
    number of DMRS REs per RB
  - In the calculation of G, only the number of DMRS per RB in 1 OFDM symbol should
    be given as an input, because inside the function of the G calculation, this
    number is being multiplied by the number of OFDM symbols that carry DMRS
2020-04-28 18:05:14 +02:00
laurent
9480293cda include dir 2020-04-28 16:33:50 +02:00
laurent
744fe92859 set back rrc as a separate thread, lead to create back race conditions 2020-04-28 15:39:50 +02:00
laurent
60845819a2 Merge branch 'develop' of gitlab.eurecom.fr:oai/openairinterface5g into split73 2020-04-28 14:32:38 +02:00
laurent
b1da29427c justone log line 2020-04-28 14:32:31 +02:00
Francesco Mani
5cbb380efb almost empty function to handle uci indication 2020-04-28 14:08:19 +02:00
Raymond Knopp
dc5149e854 Merge remote-tracking branch 'origin/NR_RRC_harq_hacks' into NR_RRC_PDCP 2020-04-27 19:28:39 +02:00
Raymond Knopp
2723d095b6 Merge remote-tracking branch 'origin/NR_RRC_harq_hacks' into NR_RRC_PDCP 2020-04-27 19:26:53 +02:00
Francesco Mani
46a7b6c742 bugfix in dci size for RA 2020-04-24 18:59:59 +02:00
cig
bfe580bd41 UE RA procedures changes to preamble selection:
- get preamble from rach_ConfigDedicated in contention free mode
- do preamble selection only in prach slot
2020-04-24 13:31:52 +02:00
laurent
07c8d00011 Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into main5G 2020-04-24 11:45:29 +02:00
laurent
151bde05c8 merge develop, compile only 2020-04-24 11:45:22 +02:00
Francesco Mani
111ea68f63 fix for scrambling rnti and dci format 2020-04-24 11:42:50 +02:00
Sakthivel Velumani
fd50f1b5bd fixed round update in UE 2020-04-24 01:44:47 +02:00
Raymond Knopp
7689b9394a added missing file 2020-04-23 22:49:33 +02:00
Raymond Knopp
d7d196c280 CI tests for nr_pucchsim : added PUCCH format 2 tests 2020-04-23 22:27:28 +02:00
Sakthivel Velumani
93e745b8ec updated dlsim to test harq 2020-04-23 19:45:00 +02:00
Sakthivel Velumani
6b307e8123 bugfix in ratematching for higher rv 2020-04-23 19:44:04 +02:00
Raphael Defosseux
f6383343fc Merge remote-tracking branch 'origin/new_rlc_2020' into develop_integration_2020_w17 2020-04-23 18:19:00 +02:00
Raphael Defosseux
ddf9471002 DOC: license for all LFDS versions updated
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-04-23 16:40:52 +02:00
Raphael Defosseux
e957d9cb49 DOC: put correct license
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-04-23 16:37:11 +02:00
Javier Morgade
591b45d29f Configure right lcid range at MBMS config file
Now is aligned with RMSIMULATOR config file (this should solve CI issues with monolithic tests)
2020-04-23 11:45:07 +02:00
Raphael Defosseux
ab5e767c0d Merge remote-tracking branch 'origin/doc-nfapi-l2-update' into develop_integration_2020_w17 2020-04-23 11:44:08 +02:00
Raphael Defosseux
381f44843d DOC: fix some formatting issues
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-04-23 11:43:40 +02:00
Raphael Defosseux
4da101fd7f Merge remote-tracking branch 'origin/split73' into develop_integration_2020_w17 2020-04-23 11:31:51 +02:00
Raphael Defosseux
fde5af0ecc Merge remote-tracking branch 'origin/ue_nfapi_mch' into develop_integration_2020_w17 2020-04-23 11:31:46 +02:00
Raphael Defosseux
0d1edf6c47 CI: add missing import
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-04-23 11:30:48 +02:00
Raphael Defosseux
6258755d14 Merge remote-tracking branch 'origin/develop_integration_2020_w15' into develop_integration_2020_w17 2020-04-23 11:29:33 +02:00
cig
5eacaddd0e Code cleanup 2020-04-23 09:55:04 +02:00
cig
32af60bcf5 UE RA procedures changes to preamble selection:
- get preamble from rach_ConfigDedicated in contention free mode
- do preamble selection only in prach slot
2020-04-23 09:55:04 +02:00
cig
f276494317 Completed dlsch demodulation for RA PDSCH 2020-04-23 09:55:04 +02:00
cig
c56854afe4 Set proper polar rnti and scrambling rnti for the phy-test and do-ra running modes:
- in phy-test both rnti are set to same rnti
- in do-ra the scrambling rnti is set to 0 while the polar rnti is the RA_rnti (computed as per
  TS 38.321)
2020-04-23 09:55:04 +02:00
cig
acfad36f1a Code cleanup:
- restructured nr_pdcch_unscrambling function
- minor cleanups
- formatting
2020-04-23 09:55:04 +02:00
cig
220685e320 UE RAR DCI reception
- NR UE scheduled response for RA PDSCH case
- UE processing of RAR DCI
- some cleanup and formatting
2020-04-23 09:54:34 +02:00
Francesco Mani
b6ba07af14 fix in dlsim 2020-04-23 09:43:25 +02:00
Raymond Knopp
6d8aa8d6b9 added 3-bit payload for pucch0 to nr_pucchsim, fixed SNR scaling for pucch2 2020-04-23 01:17:11 +02:00
Raymond Knopp
35b04083b1 Merge remote-tracking branch 'origin/nr_pucch' into nr_pucch2 2020-04-22 20:43:21 +02:00
cig
0546bcea94 Doing phy procedures RX in slot 7 for RAR DCI 2020-04-22 17:57:24 +02:00
Raphael Defosseux
a0cf407742 CI: final fixes on help functions
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-04-22 17:26:34 +02:00
Raphael Defosseux
009609f1f3 DOC: update L2 nFAPI simulator
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-04-22 16:46:42 +02:00
Raphael Defosseux
1e6e780a71 CI: final fixes for noS1 ping operations and LTE-M
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-04-22 12:04:51 +02:00
Francesco Mani
a66f6907de bufix in calling phy pucch function 2020-04-22 11:11:22 +02:00
Francesco Mani
80571bb81e fapi functions for pucch 2020-04-22 09:54:56 +02:00
Raymond Knopp
93ba34b027 testing for pucch format 2, 3-11 bits. Configuration works for 2 PRBs, 1 symbol only. Assertion in gNB RX otherwise. 2020-04-21 23:44:06 +02:00
Raphael Defosseux
6eb5d8c9c7 CI: fix a few more things
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-04-21 22:25:16 +02:00
Raphael Defosseux
39a5ddf551 CI: cleanup
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-04-21 20:15:57 +02:00
Raphael Defosseux
9758abf9b9 CI: cleanup
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-04-21 16:47:44 +02:00
Raphael Defosseux
ea376b1eb2 CI: fix eNB log analysis
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-04-21 16:36:43 +02:00
Raphael Defosseux
e120cabda0 CI: fix HTML footer generation
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-04-21 16:03:13 +02:00
matzakos
6b79403767 NR pdcp: Rebase initial implementation
Initially targeting ENDC setup with commercial UE
- Missing nr_rrc_pdcp and nr_rrc_rlc configuration wrt the established DRB
- Remaining to test with user plane data traffic (Downlink and Uplink)
2020-04-21 15:20:22 +02:00
Raphael Defosseux
8e8e9d67f8 CI: fix html generation in EPC functions
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-04-21 14:51:32 +02:00
Raphael Defosseux
92ce0e8df4 CI: fix merge request case
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-04-21 14:34:21 +02:00
Francesco Mani
48325d58e5 some logs for phytest scheduling DL with phone 2020-04-21 09:58:53 +02:00
Cedric Roux
456e90e25d rlc v2: bugfixes for mbms 2020-04-20 16:28:20 +02:00
Francesco Mani
3c5b6368f1 bugfix for numdldci for RA 2020-04-20 13:19:10 +02:00
s.rampalli
939a28ba07 Removed temporary values in x2ap and rrc 2020-04-20 11:27:56 +05:30
Cedric Roux
baa9cd0140 rlc v2: mbms support 2020-04-19 13:44:15 +02:00
Francesco Mani
4b0ddb81d5 scheduling one pdcch+pdsch after RA procedure 2020-04-18 10:52:49 +02:00
Francesco Mani
ddf4ca87d2 [gNB] taking into account preamble set at RRC and finalization of RA procedures 2020-04-17 19:07:47 +02:00
Javier Morgade
72cba28436 Add UE MCH NFAPI 2020-04-17 18:50:55 +02:00
Thomas Schlichter
0cc5a12e77 Merge branch 'develop' 2020-04-17 16:01:51 +02:00
Thomas Schlichter
42413bc565 disable PUSCH PTRS even in ulsim
PTRS leads to code shortening, and the current LDPC implementation has issues with that for higher code rate.
Because of this, we have to disable PTRS by default, as we test MCS 28 in CI.
2020-04-17 15:59:05 +02:00
laurent
3c4cafa1cd fix L2 sim issue (bad manual merge) 2020-04-17 12:58:46 +02:00
Francesco Mani
b51beff901 Merge branch 'NR_gNB_SCF_Indication' into NR_RRC_harq_hacks 2020-04-17 11:13:27 +02:00
Cedric Roux
3089dc0d45 rlc v2: update to latest develop
All previous commits for rlc v2 are proably
not functional or even compiling.
2020-04-17 10:41:21 +02:00
Cedric Roux
123745118c rlc v2: hotfix: remove some AssertFatal
Not sure if the problem is in the MAC layer or in the RLC v2 layer.
Maybe the buffer status reporting in RLC v2 is not good. Let's remove
two AssertFatal in the MAC for the time being.
2020-04-17 10:40:05 +02:00
Cedric Roux
4b6f5cea52 rlc v2: have the L2 simulator functional
Not very clean, but will do the job for the time being.
2020-04-17 10:40:05 +02:00
Cedric Roux
fbd69663b1 rlc v2: fix for CU/DU split
Limitation: this fix only works if there is only one eNB,
because we force module_id = 0 in the function deliver_sdu where
(as the code is today) we have no way to know which module_id is
concerned. More generally, the rlc v2 does not work with more than
1 eNB.
2020-04-17 10:40:05 +02:00
Cedric Roux
8ca42918d6 hotfix: remove an AssertFatal
The UE code to compute BSR is too complex, has to be reworked/simplified.
This commit just removes the assert, does not solve anything.
2020-04-17 10:40:05 +02:00
Cedric Roux
9b9654a8e8 rlc v2: initial UE support 2020-04-17 10:40:05 +02:00
Cedric Roux
eebf2cb938 rlc v2: improve buffer status reporting
The old method was wrong.
The new method is better, but not accurate, especially when the
TX buffer contains SDU of size > 2047 bytes.

Plus it's probably too slow.

To be refined at some point.
2020-04-17 10:40:05 +02:00
Cedric Roux
d860ca510e rlc v2: bugfix 2020-04-17 10:40:04 +02:00
Cedric Roux
fd61774f26 rlc v2: fix: remove #define RRC_DEFAULT_RAB_IS_AM 1 in rrc_eNB.c 2020-04-17 10:40:04 +02:00
Cedric Roux
6698759a60 rlc v2: fix crash deliver_sdu: ERROR: pdcp_data_ind failed
simply ignore the error

maybe not the best solution
2020-04-17 10:40:04 +02:00
Cedric Roux
90e05a2702 rlc v2: fix cppcheck error (disable it) 2020-04-17 10:40:04 +02:00
Cedric Roux
3310f5c6b0 alternative RLC implementation
This commit introduces an alternative RLC implementation
based on 36.322 version 8. AM and UM done, TM not done.

See openair2/LAYER2/rlc_v2/TODO for missing parts.
2020-04-17 10:40:04 +02:00
Thomas Schlichter
2a0bfde4a0 use "PUSCH_PDU_BITMAP_PUSCH_PTRS" when setting, clearing or checking pdu_bit_map 2020-04-17 10:20:09 +02:00
Ahmed Hussein
68ba04abf8 Adding an extra condition for L_ptrs
- if L_ptrs is >= number of pusch symbols, then no ptrs will be scheduled
2020-04-16 21:48:27 +02:00
Ahmed Hussein
728a903369 Making "is_ptrs_symbol" as a static inline function 2020-04-16 19:30:52 +02:00
Ahmed Hussein
9b52bf29ca Separating "is_ptrs_subcarrier" from "is_ptrs_symbol" 2020-04-16 19:21:35 +02:00
Francesco Mani
9deb0ed08c Merge branch 'develop' into NR_RRC_PRACH_procedures 2020-04-16 18:58:53 +02:00
Raphael Defosseux
c918f1d86c Merge branch 'NR_fix_Downlink_IP' into 'develop'
NR fix downlink IP

See merge request oai/openairinterface5g!806
2020-04-16 18:45:08 +02:00
Ahmed Hussein
f8c0de63cd Using "ptrs_re_offset" at UE side instead of using the function "get_kRE_ref" (TEMP implementation) 2020-04-16 18:02:59 +02:00
Ahmed Hussein
eae301e5d8 Fix regarding PTRS frequeny domain allocation 2020-04-16 16:49:44 +02:00
Ahmed Hussein
6adc40bbd1 Removed "ptrs_configured" and using "pusch_pdu->pdu_bit_map" instead at UE side 2020-04-16 15:58:50 +02:00
Francesco Mani
c4e284a3e1 fix in CCEs function 2020-04-16 15:54:27 +02:00
Ahmed Hussein
870845fc9d Minor fixes and modifications for get_K_ptrs 2020-04-16 14:50:11 +02:00
Ahmed Hussein
b0611cf49d Modifying get_L_ptrs and minor fixes 2020-04-16 14:34:40 +02:00
Ahmed Hussein
15629f126c Moving get_L_ptrs and get_K_ptrs from PHY to MAC 2020-04-16 13:49:52 +02:00
Francesco Mani
2ae14a66d8 adding conf file to test with phone 2020-04-16 12:54:00 +02:00
Francesco Mani
fd237596cf uncommenting in cce function 2020-04-16 12:08:16 +02:00
laurent
71cbb7e894 dirty workaround if4p5 bug 2020-04-16 10:40:33 +02:00
Ahmed Hussein
b8f77a9c60 Fixed PTRS frequency domain allocation
- The bug occurs when the PUSCH allocation contains the central RB of the whole UL BW
2020-04-15 19:14:14 +02:00
Ahmed Hussein
e9dd51a746 Minor clean-ups regarding PTRS 2020-04-15 18:48:03 +02:00
Cedric Roux
7f196b11f6 5g nsa: hacks for eurecom testing 2020-04-15 17:06:59 +02:00
cig
6f87d474b7 Fixed wrong printing in nr_process_timing_advance 2020-04-15 16:59:09 +02:00
Ahmed Hussein
c878bbcc78 Fixing ptrs time domain allocation in set_ptrs_symb_idx 2020-04-15 16:11:56 +02:00
Raphael Defosseux
e9b8c72b7c CI: adding ping operations to 5G-RF sim; try loop on failures
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-04-15 15:55:47 +02:00
matzakos
e1b968db8b Small Fix for NR Downlink IP traffic issue after last updates in develop branch 2020-04-15 10:17:12 +02:00
laurent
497595ba0c merge again develop 2020-04-14 21:16:23 +02:00
laurent
b0b5a1012a cosmetic 2020-04-14 19:53:43 +02:00
laurent
8a58359a1b rereremerge 2020-04-14 19:51:00 +02:00
laurent
b3c06eae1c reremerge 2020-04-14 18:06:25 +02:00
laurent
dfafa90037 big merge with develop 2020-04-14 18:02:45 +02:00
Sakthivel Velumani
ccb7d693f4 Merge branch 'NR_RRC_harq' of remote into NR_RRC_harq 2020-04-14 15:03:52 +02:00
cig
ec422f7050 Introduced a delay after a completed sync before starting msg1 generation:
- this was necessary because as soon as the gNB starts, it tries detecting
  the prach preambles and it mesaures the background noise. However, there is
  a delay of several dozens of frames before it considers the preables as
  detected.
- the solution at the UE consists in avoiding sending preamble as soon as the
  UE syncs by introducing an offset, this keeps the power measurements low at
  gNB side as long as the preamble detection counter is under threshold
2020-04-14 14:28:01 +02:00
cig
19530c5ab9 Cleanup nr transport header file 2020-04-14 14:28:01 +02:00
cig
8dd88bcb0e Deleted duplicated transport common proto header file 2020-04-14 14:28:01 +02:00
cig
c0029473dc Fixed some warnings 2020-04-14 14:28:01 +02:00
cig
3e70405b58 Cleanup transport_proto header 2020-04-14 14:28:00 +02:00
Francesco Mani
3dc9ad0567 Merge branch 'develop' into NR_RRC_PRACH_procedures 2020-04-14 14:17:34 +02:00
laurent
58e973409a small compilation details 2020-04-14 11:25:59 +02:00
Ahmed Hussein
672937b4d7 Using SCF structs for DMRS at UE side instead of dmrs_UplinkConfig 2020-04-14 08:38:13 +02:00
Sakthivel Velumani
745d8a3876 setting dmrs type for 1_1 dci 2020-04-14 01:30:35 +02:00
Raphael Defosseux
1bf529be68 Merge remote-tracking branch 'origin/develop' into split73 2020-04-13 22:14:44 +02:00
Raphael Defosseux
238c83f400 Merge remote-tracking branch 'origin/feature-4g-sched' into develop 2020-04-13 22:08:41 +02:00
Raphael Defosseux
69869810a1 Merge branch 'develop_integration_2020_w15_bis' into 'develop'
See merge request oai/openairinterface5g!804

Develop Integration Branch : 2020 week 15

The following Merge Requests have been included :

* MR 789 : fix sync source configuration for eNB and B200-mini
* MR 795 : dft/fft in shared lib
* MR 795 : NR gNB SCF indication
* MR 798 : Improvements on the "default" LTE-4G scheduler
2020-04-13 22:00:47 +02:00
laurent
861caa735d merge develop 2020-04-13 18:04:18 +02:00
Francesco Mani
478a3f73e2 bugfix for coreset id 2020-04-13 15:29:40 +02:00
Francesco Mani
ecb81ef995 Merge branch 'NR_RRC_PRACH_procedures' into NR_RRC_harq 2020-04-13 15:15:48 +02:00
Francesco Mani
042e4e5c77 reworking of nr_configure_pdcch 2020-04-13 09:18:48 +02:00
laurent
a9ec7a1d7c merge develop, updates related 2020-04-10 20:55:50 +02:00
laurent
b90e8ea7db merge, compile ok, regular exe ok, ocp-gnb not 2020-04-10 18:21:37 +02:00
Sakthivel Velumani
181e59db96 fixing bugs in 1_1 dci 2020-04-10 17:54:23 +02:00
Florian Kaltenberger
6ae7548291 updating doc/RUNMODEM.md 2020-04-10 14:21:03 +02:00
Florian Kaltenberger
e197824e20 updating targets/ARCH/rfsimulator/README.md 2020-04-10 14:16:15 +02:00
Raymond Knopp
b6ce8ed962 ENDC S1-U gNB support: Separate some GTP functions between eNB and gNB. Downlink traffic from SGW arrives properly at gNB now after path switch 2020-04-10 12:15:52 +02:00
Raphael Defosseux
10b484279c Merge remote-tracking branch 'origin/feature-4g-sched' into develop_integration_2020_w15_bis 2020-04-10 12:11:58 +02:00
Raphael Defosseux
d367260214 Merge remote-tracking branch 'origin/NR_gNB_SCF_Indication' into develop_integration_2020_w15_bis 2020-04-10 12:11:31 +02:00
Raphael Defosseux
149454ed4c Merge remote-tracking branch 'origin/extend_sharedlibusage2' into develop_integration_2020_w15_bis 2020-04-10 12:11:07 +02:00
Raphael Defosseux
b00ef27355 Merge remote-tracking branch 'origin/NR_RRCConfiguration_sync_source' into develop_integration_2020_w15_bis 2020-04-10 12:10:44 +02:00
Francesco Mani
221e152653 one file left behind 2020-04-10 10:43:44 +02:00
Francesco Mani
ffc0dc377e Merge branch 'NR_RRC_harq' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRC_harq 2020-04-10 10:02:38 +02:00
Francesco Mani
6237ba3735 Merge branch 'nr_pucch' into NR_RRC_harq 2020-04-10 10:02:21 +02:00
Robert Schmidt
0e4ff0ecb4 L2 sim: space RA in time 2020-04-10 00:09:36 +02:00
Robert Schmidt
23fb00a248 Fix: telnet use right variable names 2020-04-10 00:09:36 +02:00
Robert Schmidt
a56be93e80 Reduce CPU load in PHY stub UE (L2 sim)
Instead of looping over UEs and all DL config Req/HI DCI0, loop first
over all DL config Req/HI DCI0, and for each, match UE.  Lowers CPU
traffic for high traffic situations.
2020-04-10 00:09:36 +02:00
Robert Schmidt
4df3157a7a L2: do not overwrite FAPI message, correct check 2020-04-10 00:09:36 +02:00
Robert Schmidt
0bef57e2d4 L2 sim: fix PDU_index test 2020-04-10 00:09:36 +02:00
Robert Schmidt
382b815fa4 Remove AssertFatal from UCI handlers 2020-04-10 00:09:36 +02:00
Robert Schmidt
8f450f0e51 DL PP: consider the last RBG might be smaller 2020-04-10 00:09:36 +02:00
Raymond Knopp
b568d5b01a removed faulty entries in ci unitary simulators and SNR starting point for nr_ulsim tests 2020-04-09 22:25:02 +02:00
Sakthivel Velumani
1c3c5c772f allocating memory to UL_INFO pdus 2020-04-09 19:22:26 +02:00
Francesco Mani
9296949906 fix for dlschsim for no data in dmrs symbol 2020-04-09 17:25:24 +02:00
Raymond Knopp
786be88101 fixed unitary simulation issue for nr_ulsim and removed broken pucch1 tests 2020-04-09 15:52:19 +02:00
Raphael Defosseux
46b386f0db Merge branch 'develop_inria_ci_deployment_gp' into develop_integration_2020_w15 2020-04-09 12:16:22 +02:00
Raphael Defosseux
64fcb6daa1 Merge branch 'develop_inria_ci_deployment_gp' of gitlab.eurecom.fr:oai/openairinterface5g into develop_inria_ci_deployment_gp 2020-04-09 12:11:20 +02:00
Gabriele Perrone
8a1118abac operations: 1) creation of develop_integration_2020_w15 (=develop) 2) merge of develop_inria_ci_deployment_gp 3) main.py conflicts resolution and now: commit of new main.py, epc.py, ran.py etc. 2020-04-09 11:03:49 +02:00
Sakthivel Velumani
9e8e7de10a using same dci_pdu_rel15 for UE also 2020-04-08 22:24:08 +02:00
Sakthivel Velumani
e0acce65c4 dci 1_1 bit decoding 2020-04-08 22:22:52 +02:00
Francesco Mani
def0450b4a Merge branch 'NR_RRC_PRACH_procedures' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRC_PRACH_procedures 2020-04-08 17:57:45 +02:00
Francesco Mani
b9d80576aa patch for no data in dmrs symbol for pusch tx 2020-04-08 17:32:19 +02:00
Raymond Knopp
c8ac5d56bf compilation of NR executables with MAC 2020-04-08 12:47:34 +02:00
matzakos
732081dd22 ENDC testing: Remove some remaining modifications used only for testing 2020-04-08 11:17:44 +02:00
Francesco Mani
2de42fcf0c increasing snr in ulsim mcs9 2020-04-08 09:02:32 +02:00
Francesco Mani
17e3f2857c possible fix for ghost dlsim in ci? 2020-04-08 09:02:19 +02:00
Raymond Knopp
1c16705355 pucch receiver for format 0 reworked without floating point and no generation of sequences for each decoding attempt, SR detection integrated 2020-04-08 00:03:44 +02:00
Thomas Schlichter
c128e82291 use nfapi_nr_ue_pusch_pdu_t instead of fapi_nr_ul_config_pusch_pdu for pusch_config_pdu 2020-04-07 21:18:28 +02:00
Gabriele Perrone
d15d86cf0c Update README.md 2020-04-07 19:20:30 +02:00
Sakthivel Velumani
6f3934acc0 moved dci_pdu_rel15_t to mac_common 2020-04-07 18:09:07 +02:00
Sakthivel Velumani
3053f37dec added NR_CellGroupConfig to mac in UE 2020-04-07 18:08:22 +02:00
Francesco Mani
ac2d1d79d7 minor fixes 2020-04-07 17:38:31 +02:00
Francesco Mani
20f5e27e50 filling dci pdu 2020-04-07 17:24:55 +02:00
Gabriele Perrone
be9d4e1b55 after full run of enb_usrp210_band7_test_05mhz_tm1.xml commit the latest changes; then I will create an integration branch to run CI 2020-04-07 16:10:58 +02:00
Ahmed Hussein
b9148d636f Migrating members from NR_UL_UE_HARQ_t to the new added NFAPI structs 2020-04-07 15:02:04 +02:00
Thomas Schlichter
690176821d make mac_sdus an array instead of a pointer 2020-04-07 13:31:14 +02:00
Raphael Defosseux
8bef0d1d61 CI: adding some try/catches and more debug to see what is going on --> failure to load images since 2 weeks
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-04-07 12:24:08 +02:00
Raymond Knopp
ea951f0db9 Merge remote-tracking branch 'origin/develop' into nr_pucch 2020-04-07 12:17:06 +02:00
Raymond Knopp
dcf7678fef Merge remote-tracking branch 'origin/develop' into nr_pucch
Conflicts:
	cmake_targets/CMakeLists.txt
	openair1/SCHED_NR/phy_procedures_nr_gNB.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
	openair2/LAYER2/NR_MAC_gNB/mac_proto.h
2020-04-07 12:11:48 +02:00
WANG Tsu-Han
f0116d6bba fixes for return value for not using usrp write thread 2020-04-07 11:55:27 +02:00
cig
1e63219bbf Fixed bugs in UE RA procedures:
- number or RA preambles unitialised
- power ramp counter not incrementing
- segmentation fault due to wrong pointer initialisation
2020-04-07 11:07:41 +02:00
matzakos
c8f2b4e035 Merge branch 'NR_RRC_PRACH_procedures' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRC_PRACH_procedures 2020-04-06 19:07:12 +02:00
matzakos
3b6b6d0671 Fix ULSCH traffic generation at UE side. Still not received at gNB 2020-04-06 19:06:58 +02:00
Raphael Defosseux
9a13669552 CI: adding a few checks before loading images in R2LAB
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-04-06 16:33:40 +02:00
Francesco Mani
b29d270708 Merge branch 'NR_RRC_harq_newdcipdu' into NR_RRC_harq 2020-04-06 15:30:10 +02:00
Gabriele Perrone
564db9c398 debugging 2020-04-06 15:20:02 +02:00
Gabriele Perrone
eff978af5d debugging 2020-04-06 14:54:13 +02:00
Robert Schmidt
1372e02206 Check for CCE allocation in UL PP 2020-04-06 13:56:59 +02:00
Robert Schmidt
36ebfe04f6 Use CCE_try_allocate_ulsch() in ULSCH 2020-04-06 13:56:59 +02:00
Robert Schmidt
c76af0a142 Check for CCE allocation in DL PP 2020-04-06 13:56:56 +02:00
Robert Schmidt
ed6e5ce832 Use CCE_try_allocate_dlsch() 2020-04-06 13:56:31 +02:00
Robert Schmidt
6b3b0b0b8b Final CCE allocation check: print message on fail 2020-04-06 13:56:31 +02:00
Robert Schmidt
88d156478f CCE_allocation_infeasible(): log only debug 2020-04-06 13:56:31 +02:00
Robert Schmidt
5443c7a792 fill_nfapi_dlsch_config() takes index for filling 2020-04-06 13:56:31 +02:00
Robert Schmidt
0f46f17c1c UL PP can change retx freq allocation 2020-04-06 13:56:31 +02:00
Robert Schmidt
24fb5e9c80 add adaptive HARQ UL 2020-04-06 13:56:31 +02:00
Robert Schmidt
9256a9e813 Clean up schedule_ulsch_rnti() 2020-04-06 13:56:31 +02:00
Robert Schmidt
c9a921504c TEST: TPC + TA cleaned up in DLSCH 2020-04-06 13:56:31 +02:00
Robert Schmidt
fd2e5fee96 Clean up schedule_dlsch() 2020-04-06 13:56:31 +02:00
Robert Schmidt
2f32448707 Correctly handle 2ms Sched. Reqs 2020-04-06 13:56:31 +02:00
Robert Schmidt
a3bbbd0630 Lock PRACH region through vrb_map_UL 2020-04-06 13:56:31 +02:00
Robert Schmidt
abc65b1d86 Reimplement UL PP 2020-04-06 13:56:31 +02:00
Robert Schmidt
8bf7a13ffa Remove first_rb from ULSCH scheduler 2020-04-06 13:56:31 +02:00
Robert Schmidt
8a84e2d92e Rewrite assign_max_mcs_min_rb() more concisely 2020-04-06 13:56:31 +02:00
Robert Schmidt
10bd164ad4 UL PP: Remove UE sorting and slicing 2020-04-06 13:56:31 +02:00
Robert Schmidt
9b4725ad0b Shortened UL-PP, remove CC and slicing 2020-04-06 13:56:31 +02:00
Robert Schmidt
4250f8eaec ULSCH: remove CC loop, remove variables or limit scope 2020-04-06 13:56:31 +02:00
Robert Schmidt
1670b4521e Reimplement the DLSCH preprocessor
This refactors the preprocessor. The new preprocessor implements the
same scheduling strategy (Modified Round-Robin: give resources according
to round-robin, then group) but should be fairer by changing every time
the RR start UE (i.e., 1st TTI UE 0 starts, 2nd TTI UE 1, etc) when the
UE number is not a divisor/multiple of the RBG size (and the last RBG is
often smaller). This also removes all unneeded code of the preprocessor
such as allocate(), positioning(), etc.
2020-04-06 13:56:27 +02:00
Robert Schmidt
eb0af3a5e0 Simplify DLSCH code
* do not check rlc_ind()
* Simplify retransmission part and remove nb_rb_available var
* Simplify new transmission code
* Simplify fill_DLSCH_dci(), avoid unnecessary copies
* fix: first check No. RBs, then check CCE alloc
2020-04-06 13:43:52 +02:00
Robert Schmidt
eeaa5a99d0 RLC: _req() accepts max TB size, _ind() not
Previously, the various rlc_*_ind() functions had a parameter to enable
the MAC to specify the max TB size that a subsequent call to the
corresponding rlc_*_req() (!) function would return. This patch removes
this parameter from the rlc_*_ind() functions and makes the parameter
working that is already in the rlc_*_req() functions.
2020-04-06 13:43:52 +02:00
Robert Schmidt
5c153ca0d2 Move release and RA control to own function, call once for every UE 2020-04-06 13:43:52 +02:00
Robert Schmidt
97a1bd105c store_dlsch_buffer() works per CC, checks only active LCs
store_dlsch_buffer() puts the RLC buffer status results in the
UE_TEMPLATE, which is per-CC. Since the DLSCH scheduler works per-CC,
too, we pass the right CC. However, this is not strictly necessary, as
we could do this once before every CC, and it might be updated.
2020-04-06 13:43:52 +02:00
Robert Schmidt
2e9f391a0a Store active LCs in MAC, remove unneeded headers 2020-04-06 13:43:52 +02:00
Thomas Schlichter
40bd00aa4b Add nr_prachsim to CI 2020-04-06 12:47:37 +02:00
Gabriele Perrone
2ea0070d4d further cleanup 2020-04-06 12:04:07 +02:00
Francesco Mani
bfaa037e83 Merge branch 'NR_RRC_PRACH_procedures' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRC_PRACH_procedures 2020-04-06 11:05:27 +02:00
Francesco Mani
614c4ab6bd adding do_ra flag into new statement 2020-04-06 10:53:48 +02:00
Ahmed Hussein
d3cbf14694 Using ul_dmrs_symb_pos at UE side instead of assuming that DMRS is only present at 1st symbol of PUSCH 2020-04-06 10:37:17 +02:00
Francesco Mani
c9d1fe85fe Merge branch 'NR_RRC_PRACH_procedures_todevelop' into NR_RRC_PRACH_procedures 2020-04-06 09:21:01 +02:00
matzakos
374610dbe2 ENDC path switch procedures: Small correction 2020-04-06 09:20:25 +02:00
Gabriele Perrone
9eab72b2bf aligning remote repository with local on starsky 2020-04-06 09:18:42 +02:00
Ahmed Hussein
76f937d8f2 Removing nb_re_dmrs and length_dmrs from NR_UE_ULSCH_t 2020-04-06 09:12:33 +02:00
Ahmed Hussein
1104cf0414 Removing DMRS parameters from "nr_ulsch_encoding" 2020-04-06 08:51:35 +02:00
matzakos
cd843860a8 Fix RFSIMULATOR issues (gNB side) after merge of NR_test_S1U_RRC_PRACH_procedures into NR_RRC_PRACH_procedures 2020-04-04 11:56:06 +02:00
Francesco Mani
8892d00693 flag do_ra alternative to phy_test to perform RA procedures 2020-04-04 10:32:07 +02:00
Sakthivel Velumani
7846132e1c updated dci_pdu_rel15_t
moved nr_dci_size out of scheduler_phytest
2020-04-03 19:12:06 +02:00
Gabriele Perrone
b36d40d4a5 Update README.md 2020-04-03 18:38:42 +02:00
Francesco Mani
f72259de8e reactivating phytest schedulers 2020-04-03 16:58:08 +02:00
Francesco Mani
f73dd0742e Revert "ENDC path switch S1-U: Bugfixes at eNB side. Problem at S1AP E-RAB-Modification-Indication message encoding to be resolved"
This reverts commit f895c4d929.
2020-04-03 14:19:28 +02:00
Francesco Mani
448cae257d Revert "ENDC path switch S1-U: Bugfixes at gNB side"
This reverts commit 1462f0e659.
2020-04-03 13:41:23 +02:00
Francesco Mani
b651cae0ee increasing snr in ulsim mcs9 2020-04-03 09:15:10 +02:00
Francesco Mani
98a9af4f47 possible fix for ghost dlsim in ci? 2020-04-02 19:38:41 +02:00
Francesco Mani
fbf74bc395 setting type 1 dl freq resource allocation in rrc 2020-04-02 18:48:02 +02:00
Raymond Knopp
f9fc712a9b Merge branch 'NR_RRC_PRACH_procedures' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRC_PRACH_procedures 2020-04-02 17:44:08 +02:00
cig
6e404180f7 Fixed compilation warnings 2020-04-02 17:24:33 +02:00
cig
0366be797f Prach_start adjustment for both HW and simulation 2020-04-02 16:09:15 +02:00
cig
cf47f059eb Restored preamble index configuration in PRACH UE 2020-04-02 16:09:15 +02:00
cig
8c68f37450 Prachsim compilation and NR PRACH UE fixes 2020-04-02 16:09:07 +02:00
Raphael Defosseux
657a42fec3 CI: during VM builds, we often have connection issues. Adding retry options to wget
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-04-02 14:33:37 +02:00
WANG Tsu-Han
76eec2d1ee Merge branch 'develop' into NR_RRCConfiguration_trx_thread 2020-04-02 13:03:25 +02:00
WANG Tsu-Han
a6e1b2a9f8 Merge branch 'develop' into NR_RRCConfiguration_trx_thread
Conflicts:
	targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
2020-04-02 13:02:31 +02:00
frtabu
0518ced81f dft/idft in shared lib 2020-04-02 12:11:21 +02:00
Ahmed Hussein
9a857e4486 Adopting the dynamic implementation of DMRS at the gNB side
- Using the implemented DMRS functionalities at the MAC layer at the gNB side
  - Removing is_dmrs_symbol function
  - Temporary implemetation at the UE side considering DMRS symbol is at the 1st PUSCH symbol,
    until the nFAPI structs for DMRS is adopted at the UE side
2020-04-02 10:05:54 +02:00
adk
5f194af906 optimization and fixing PUSCH PTRS generation 2020-04-02 10:05:54 +02:00
adk
5e7d52d279 fix indentation 2020-04-02 10:05:54 +02:00
Sakthivel Velumani
684dec16c1 Merge branch 'NR_RRC_harq' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRC_harq 2020-04-02 03:00:12 +02:00
Sakthivel Velumani
bf819df6e3 changed dci_pdu_rel15 struct to hold bitwidth for each dci field 2020-04-02 02:54:29 +02:00
Sakthivel Velumani
b4d273d63b added remaining fields in 1_1 DCI pdu fill 2020-04-01 21:30:34 +02:00
Gabriele Perrone
236b17ce81 cleanup of main*.py names and push of minor changes on main.py and html.py 2020-04-01 18:27:34 +02:00
Francesco Mani
cff21926e8 Merge branch 'nr_pucch' into NR_RRC_harq 2020-04-01 17:22:44 +02:00
Raymond Knopp
72d76c7585 dft-based pucch0 receiver 2020-04-01 16:52:56 +02:00
Gabriele Perrone
36bf56d410 Update README.md 2020-04-01 14:59:09 +02:00
Gabriele Perrone
1cb14c3d9c Update README.md 2020-04-01 13:26:26 +02:00
Robert Schmidt
5420e74032 Efficient RB estimation through binary search 2020-04-01 11:13:58 +02:00
Robert Schmidt
8ffe5b4920 Rename UE_list_t to UE_info_t, UE_list_t separate struct
UE_list_t is now used as a separate list. It can be e.g. used in the
scheduler to mark groups of users. The original UE_list_t is renamed to
UE_info_t to reflect that it is a container for information about UEs.
2020-04-01 10:47:02 +02:00
Robert Schmidt
7c92456338 Remove DL Slicing-related variables 2020-04-01 10:38:47 +02:00
Robert Schmidt
fd6618dc1c Simplify preprocessor, retain functionality
* Simplify store_dlsch_buffer()
* Simplify assign_rbs_required()
* Simplify dlsch_scheduler_pre_processor_partitioning()
* Simplify dlsch_scheduler_pre_processor_accounting() and dlsch_scheduler_pre_processor_accounting_allocate()
* Simplify allocation printing

The original functions used in the fairRR scheduler have been moved to
eNB_scheduler_fairRR
2020-04-01 08:49:26 +02:00
Robert Schmidt
4462e2d710 Remove unused/broken code in preprocessor
* Remove MIMO_mode_indicator: it is simply not used ATM
* Remove min_rb_unit as parameter: function auto-detects
* Remove commented code
* Remove slice sharing/multiplexing: it is broken
* Remove UE sorting, add UE with add_new_ue() in MAC
  - UE sorting is useless overhead on every iteration, instead it should
    be governed by a scheduling algorithm (e.g., RR or PF)
  - The MAC keeps a UE list and automatically adds a UE
  - UE_list empty, set head to -1
* Remove slice_positioning: the slicing functionality is broken
* Remove unused/untested code
2020-04-01 08:49:26 +02:00
Robert Schmidt
8d3fa4dc22 Simplify dlsch_scheduler_pre_processor_reset()
The original reset() function used in fairRR has been moved to
eNB_scheduler_fairRR.c
2020-04-01 08:49:26 +02:00
Robert Schmidt
ff766786a8 Remove mbsfn_flag from schedule_ue_spec(), simplify pre_processor interface 2020-04-01 08:49:26 +02:00
Robert Schmidt
8e72b1364a Remove sf0 DC limitation 2020-04-01 08:49:26 +02:00
Robert Schmidt
cd480271af Remove everything related to TM5 in pre_processor 2020-04-01 08:49:26 +02:00
Robert Schmidt
99301f438f Call schedule_ue_spec() once for each CC 2020-04-01 08:49:26 +02:00
Robert Schmidt
81fb7628c5 get_min_rb_unit(): all channel bandwidths 2020-04-01 08:49:26 +02:00
Robert Schmidt
ffc4f464f5 Remove useless mac_proto.h include
When a header is changed, all including files need to be recompiled,
too. Thus, including a header needlessly all over the place drives
compile times up without any reason.
2020-04-01 08:49:26 +02:00
Robert Schmidt
1efd2b428b Remove useless MAC/defs.h file 2020-04-01 08:49:26 +02:00
Robert Schmidt
5e0d6253b8 Fix: search UE in ULSCH when handling UCI 2020-04-01 08:49:26 +02:00
Sakthivel Velumani
bb3883bff0 1_1 DCI encoding - added checks from RRC IEs 2020-04-01 01:26:02 +02:00
Sakthivel Velumani
f404f29e2f added some fields in 1_1 DCI bit encoder 2020-03-31 15:27:41 +02:00
Raymond Knopp
e9ff6bad2e Merge with branch NR_RRC_PRACH_procedures 2020-03-31 15:25:42 +02:00
Francesco Mani
1ada5382c8 ulsch rx measurements in dlsim 2020-03-31 12:31:06 +02:00
frtabu
4649034b26 create dft shared lib 2020-03-31 12:10:48 +02:00
frtabu
296494ea4c create dft shared lib 2020-03-30 18:23:32 +02:00
Gabriele Perrone
f7c1a954b1 Merge branch 'develop_inria_ci_deployment_gp' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop_inria_ci_deployment_gp 2020-03-30 17:56:57 +02:00
Gabriele Perrone
ddfaa9af5e editorial on html.py 2020-03-30 17:47:08 +02:00
Gabriele Perrone
34694363e2 clean up the HSS termination procedure using the screen command 2020-03-30 17:34:23 +02:00
Raymond Knopp
2378b73b1e ENDC path switch procedures: E-RAB Modification Confirm message successfully received at the eNB from the MME now 2020-03-30 14:38:42 +02:00
cig
7f00dbc53c Const prachfmt in nr_mac_common 2020-03-30 12:03:31 +02:00
Francesco Mani
6f001d3e5b adapting handle rach function 2020-03-30 11:38:07 +02:00
Francesco Mani
0ca708d55b making ulsim compile 2020-03-28 10:53:44 +01:00
Francesco Mani
88aad7cbf2 num_cb in indication taken from pusch pdu 2020-03-28 10:05:25 +01:00
Francesco Mani
aad29b208a first version of gNB indication structures from SCF 2020-03-27 18:27:49 +01:00
cig
2b3446ed15 Hardcoded PRACH tx_amp to AMP 2020-03-27 17:09:50 +01:00
cig
cca28a0abd Moved PRACH PDU struct to NR_UE_PRACH in PHY_VARS_NR_UE:
- now the FAPI interface copies the struct directly to NR_UE_PRACH
- NR_PRACH_CONFIG_COMMON and NR_PRACH_CONFIG_INFO have been removed from FP
2020-03-27 17:09:50 +01:00
cig
6d413e2c57 Bugfix returning null pointer to prach resources 2020-03-27 17:09:50 +01:00
cig
3bb1407e54 NR PRACH generation fixes for correct reception of msg1 2020-03-27 17:09:43 +01:00
cig
6982e6f443 Code cleanup and formatting 2020-03-26 18:54:58 +01:00
cig
2c6e49c0da Enabled timing offset compensation in RFSIM 2020-03-26 18:54:58 +01:00
cig
453d574433 Temporary set condition on slot 19 to enter PHY PRACH procedures 2020-03-26 18:54:57 +01:00
cig
ae5f30ec8d Set flag to generate PRACH only on PRACH slot 2020-03-26 18:54:57 +01:00
cig
3bb82a02ee UE: N_TA_offset configuration depending on SCS and N_RB_DL 2020-03-26 18:54:57 +01:00
cig
04a9c72de3 Bugfix in selection of dual format A3/B3 2020-03-26 18:54:57 +01:00
cig
01b3038d77 Check on dlsch0_harq to avoid segmentation fault 2020-03-26 18:54:57 +01:00
cig
63d6b59f9d Enabled check on UE mode to start either ULSCH and PRACH procedures:
- ULSCH is temporary disabled
2020-03-26 18:54:50 +01:00
cig
d6f597cefe Commented out code for contention resolution at UE side 2020-03-26 18:27:13 +01:00
cig
eb7f3193aa Enabled compute_nr_prach_seq to be used at both gNB and UE side:
- now the function gets more input arguments but can be used from both UE and gNB
- this change was needed because the prach fapi of UE differs from the gNB one
2020-03-26 18:27:13 +01:00
cig
4e38ea2367 Set UE mode to NOT_SYNCHED by default 2020-03-26 18:27:13 +01:00
cig
ae9303bd52 Implemented dft/idft 36864 2020-03-26 18:27:13 +01:00
cig
924d361ded Enabled NR UE PRACH scheduler 2020-03-26 18:27:13 +01:00
Raymond Knopp
fa3f461783 ENDC path switch procedures: Remove some IEs from E-RAB Modification Indication message which finally appear to be not mandatory 2020-03-26 18:20:05 +01:00
Francesco Mani
076e7c8e53 Merge branch 'NR_RRC_PRACH_procedures' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRC_PRACH_procedures 2020-03-26 12:50:46 +01:00
Francesco Mani
666adcc37e Merge branch 'NR_RRC_PRACH_procedures' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRC_PRACH_procedures 2020-03-26 12:50:17 +01:00
Francesco Mani
4c30e6d3a5 new file for prach dummy functions to avoid compilation failures on physim 2020-03-26 12:29:20 +01:00
Thomas Schlichter
ce923e59ed fix critical "assignment from incompatible pointer type" warnings 2020-03-26 09:55:22 +01:00
Francesco Mani
e451ff54ef fixing compilation errors and one file left behind 2020-03-26 09:34:07 +01:00
Francesco Mani
d320fa13b3 Merge branch 'develop' into NR_RRC_PRACH_procedures 2020-03-25 18:45:00 +01:00
Raymond Knopp
48a61ab598 ENDC path switch procedures: Small modification at generation of E-RAB Modification Indication message 2020-03-25 16:03:43 +01:00
Raphael Defosseux
b630a983ec Merge branch 'NR_RRCConfiguration' into 'develop'
Nr rrc configuration

See merge request oai/openairinterface5g!738
2020-03-25 09:43:34 +01:00
laurent
6bbf9011ba compilation ok 2020-03-24 19:16:13 +01:00
laurent
82e71acee6 merge develop 2020-03-24 18:58:53 +01:00
Robert Schmidt
8a47fa484c Handle residual MAC PDU < 0 gracefully 2020-03-24 17:54:08 +01:00
Robert Schmidt
daefb67c82 Fix: correct check for dummy-traffic 2020-03-24 17:54:08 +01:00
Robert Schmidt
69c16efe07 Fix: check that UE RRC config files are found 2020-03-24 17:54:08 +01:00
Robert Schmidt
2c21e8229c Fix: correctly set context before calling pdcp_run() 2020-03-24 17:54:08 +01:00
Francesco Mani
817afd999b fixing reference point for k in pusch dmrs 2020-03-24 16:00:52 +01:00
Robert Schmidt
8a589f5b08 Fix: rx_indication length is in bytes 2020-03-24 15:54:45 +01:00
Robert Schmidt
df0bc30e28 Make function static inline, not inline
inline alone does only define a function without a corresponding
declaration. static solves this problem
2020-03-24 15:41:54 +01:00
WANG Tsu-Han
669cc161f0 adding second_addr in config file 2020-03-24 11:22:17 +01:00
Florian Kaltenberger
c6d8d934c1 Merge remote-tracking branch 'origin/NR_RRCConfiguration' into NR_RRCConfiguration_sync_source 2020-03-23 22:07:05 +01:00
Cedric Roux
d6ce3a5a31 fix compilation of ldpc libraries - T must be processed before 2020-03-23 17:47:43 +01:00
Florian Kaltenberger
897ca561f5 adding time_source command line parameter and removing duplications of clock_source
ignoring command line paramters clock_source and time_source in lte-softmodem and harmonizing it with nr-softmodem
time_source and clock_source handled separately in usrp_lib.cpp
2020-03-23 17:45:48 +01:00
Florian Kaltenberger
e21d6efaf5 CI: adding --phy-test command line option to gNB real-time test 2020-03-23 16:33:35 +01:00
Sakthivel Velumani
d90f8da364 avoiding code duplication 2020-03-21 18:43:50 +01:00
Raymond Knopp
39ab08b6b3 Merge branch 'NR_test_S1U_RRC_PRACH_procedures' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_test_S1U_RRC_PRACH_procedures 2020-03-20 22:55:22 +01:00
Raymond Knopp
1462f0e659 ENDC path switch S1-U: Bugfixes at gNB side 2020-03-20 22:55:17 +01:00
Raymond Knopp
f895c4d929 ENDC path switch S1-U: Bugfixes at eNB side. Problem at S1AP E-RAB-Modification-Indication message encoding to be resolved 2020-03-20 22:48:09 +01:00
Sakthivel Velumani
c71edc21db Fixed the assertion in ulsch pdu header
rfsim works
2020-03-20 17:08:30 +01:00
Francesco Mani
f508f310cc fix in rbs extract for dmrs 2020-03-20 14:24:40 +01:00
OAI Jenkins
e9c6872bb9 minor modifications during a lease on inria fit14 to keep on debugging main, html, ran.py etc. 2020-03-20 14:09:51 +01:00
Sakthivel Velumani
1c2f9bb618 Fixed some bug in pusch dmrs
an assertion fails in gnb (need to be fixed)
2020-03-20 13:59:40 +01:00
Francesco Mani
447c470626 Merge branch 'NR_RRCConfiguration' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRCConfiguration 2020-03-20 11:16:59 +01:00
Francesco Mani
b904161f87 removing is_dmrs_symbol function from pusch in gNB 2020-03-20 11:15:43 +01:00
Cedric Roux
ad1a102f08 fix for CU/DU split 2020-03-20 11:13:51 +01:00
Francesco Mani
6d058d306a SCF FAPI structures for PUSCH at gNB 2020-03-19 18:07:12 +01:00
Francesco Mani
57c993ce26 fix for some warnings 2020-03-18 10:03:41 +01:00
Sakthivel Velumani
07a48f87e4 loading LDPC libs for UE 2020-03-17 19:06:22 +01:00
Francesco Mani
5ef2af1cce minor changes 2020-03-17 16:27:08 +01:00
Gabriele Perrone
6aa64bd286 to switch to develop 2020-03-17 08:24:13 +01:00
matzakos
cbba3da30b ENDC path switch S1-U: Remove warnings 2020-03-16 21:20:00 +01:00
Cedric Roux
9bbb12f7ae nr-gnb: configure contention-free random access for the UE 2020-03-16 09:37:40 +01:00
Raymond Knopp
1ddd729044 bring back recent changes in ldpc encoder after merge with dynamic library implementation 2020-03-16 09:32:50 +01:00
Raymond Knopp
e9fad18540 temporary changes for nr_ulsim. To be removed when new branch with SCF NR FAPI for PUSCH is merged in. 2020-03-16 01:26:12 +01:00
Raymond Knopp
93b4211d02 merge conflict removal 2020-03-15 19:16:30 +01:00
Raymond Knopp
7491e23dbd Merge remote-tracking branch 'origin/develop' into NR_RRCConfiguration 2020-03-15 18:13:11 +01:00
Raymond Knopp
6dff674302 testing after merge with develo 2020-03-15 18:03:42 +01:00
matzakos
cb0b736993 ENDC path switch S1-U: Modifications to avoid linking errors for lte-softmodem 2020-03-15 16:23:18 +01:00
Gabriele Perrone
82e97fce59 Merge branch 'develop_integration_w11' into 'develop'
Develop integration 2020 week 11

See merge request oai/openairinterface5g!787
2020-03-15 12:10:33 +01:00
Raymond Knopp
fc54cbf4d2 Merge branch 'NR_RRCConfiguration' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRCConfiguration 2020-03-14 13:50:37 +01:00
Raymond Knopp
9cf9ea7c99 remainder of merge 2020-03-14 13:50:07 +01:00
Raymond Knopp
914e17b57b Merge remote-tracking branch 'origin/develop' into NR_RRCConfiguration
Conflicts:
	executables/nr-softmodem.c
	executables/nr-ue.c
	executables/softmodem-common.c
	openair1/PHY/NR_TRANSPORT/nr_ulsch_decoding.c
	openair1/SCHED_NR/phy_procedures_nr_gNB.c
	openair1/SIMULATION/NR_PHY/dlsim.c
	openair1/SIMULATION/NR_PHY/ulsim.c
	openair2/LAYER2/NR_MAC_UE/mac_proto.h
	openair2/NR_PHY_INTERFACE/NR_IF_Module.c
	openair2/RRC/NR/MESSAGES/asn1_msg.c
	openair2/RRC/NR/MESSAGES/asn1_msg.h
	openair2/RRC/NR/nr_rrc_config.c
	openair2/RRC/NR/nr_rrc_defs.h
	openair2/RRC/NR/nr_rrc_proto.h
	openair2/RRC/NR/rrc_gNB.c
2020-03-14 12:45:02 +01:00
Francesco Mani
abddce1dc7 bugfix in computation of B 2020-03-13 18:23:27 +01:00
matzakos
7408ddb2c3 ENDC path switch S1-U: Adding GTP-U tunnel related functionality at gNB 2020-03-13 12:55:49 +01:00
magounak
7b9be8744d bug fix ue dlsch thread 2020-03-13 10:46:40 +01:00
Hongzhi Wang
d4a81bcc0f update dlsch multi thread 2020-03-13 10:41:50 +01:00
Francesco Mani
ab39b74ca1 bugfix in pusch dmrs reception 2020-03-13 10:19:24 +01:00
matzakos
c56075928a ENDC path switch S1-U: Bugfixes 2020-03-12 19:56:15 +01:00
Gabriele Perrone
73ac675869 Merge remote-tracking branch 'origin/extend_sharedlibusage' into develop_integration_w11 2020-03-12 18:32:39 +01:00
Gabriele Perrone
a653034fbc Merge remote-tracking branch 'origin/generate_push_ptrs' into develop_integration_w11 2020-03-12 18:31:23 +01:00
Gabriele Perrone
4e5234853f Merge branch 'dreibh/device-load-fix-develop-branch' into 'develop'
Fix for Issue #494: check and handle return value of openair0_device_load()  (develop branch)

See merge request oai/openairinterface5g!780
2020-03-12 15:22:50 +01:00
Gabriele Perrone
a1b9bebf72 Merge branch 'fix-l2-sim' into 'develop'
Fix l2 sim

See merge request oai/openairinterface5g!781
2020-03-12 15:20:56 +01:00
Cedric Roux
143fd5ea5a bugfix 2020-03-12 14:50:02 +01:00
Cedric Roux
86dc600cd9 bugfix 2020-03-12 14:33:47 +01:00
Francesco Mani
18c8a4a4e6 taking into account n_ta_offset in slot fep ul 2020-03-12 14:09:41 +01:00
frtabu
4ce46e7488 Add LDPC shared lib doc 2020-03-11 18:18:19 +01:00
frtabu
3b3d232214 move ldpc coder/decoder into a shared lib dymically loaded. Also fix a record player bug 2020-03-11 17:41:38 +01:00
frtabu
8928cfe57d move ldpc coder/decoder into a shared lib dymically loaded. Also fix a record player bug 2020-03-11 17:32:13 +01:00
matzakos
b7524052e8 Merge branch 'NR_test_S1U_RRC_PRACH_procedures' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_test_S1U_RRC_PRACH_procedures 2020-03-11 16:08:19 +01:00
matzakos
0564357e33 ENDC path switch S1-U: Minor correction 2020-03-11 16:07:02 +01:00
adk
c15fb8c7a4 PUSCH DMRS mapping type B start symbol fix 2020-03-11 14:45:14 +01:00
NCTU CS ISIP
689426e8c1 LDPC implement on Quadro p5000 2020-03-11 20:02:20 +08:00
Raymond Knopp
de34a2ff28 Update gNB configuration file used for ENDC 2020-03-11 12:02:55 +01:00
matzakos
07a2a095d3 ENDC path switch S1-U: Integrated S1AP E-RAB-Modification indication message at eNB, interfacing with RRC and X2AP to get proper configuration of E-RABs to be modified and GTP-U configuration at gNB 2020-03-11 10:37:48 +01:00
Robert Schmidt
0de3c73475 Place MBMS tun fd into single int 2020-03-10 17:38:24 +01:00
Sakthivel Velumani
c6182d3ee2 updated frame_idx in UE 2020-03-10 12:26:00 +01:00
Raymond Knopp
e7c5bc55c4 Merge branch 'NR_RRC_PRACH_procedures' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRC_PRACH_procedures
Conflicts:
	openair1/SCHED_NR/phy_procedures_nr_gNB.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
2020-03-10 08:24:45 +01:00
Raymond Knopp
47e0d056be Merge branch 'NR_RRCConfiguration' into NR_RRC_PRACH_procedures
Conflicts:
	openair1/PHY/NR_TRANSPORT/nr_dci.c
	openair1/PHY/NR_TRANSPORT/nr_prach.c
	openair1/PHY/NR_UE_TRANSPORT/nr_prach.c
	openair1/PHY/defs_nr_common.h
	openair1/SIMULATION/NR_PHY/nr_unitary_defs.h
	openair1/SIMULATION/NR_PHY/prachsim.c
	openair2/LAYER2/NR_MAC_UE/main_ue_nr.c
	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
2020-03-09 21:14:32 +01:00
Francesco Mani
2ada0eddc5 fix for no data in dmrs in ulsch procedures 2020-03-09 17:35:30 +01:00
Francesco Mani
f9ca54e9a1 crc and tbs fixes in ulsch 2020-03-09 12:05:45 +01:00
Francesco Mani
631d345df8 fix indentation and removing an if in scheduler 2020-03-09 10:03:54 +01:00
Raphael Defosseux
3f803ae7f9 CI: adding back more testing (ping and iperf) to L2 simulator
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-03-08 20:34:20 +01:00
Robert Schmidt
84482489e4 Reformat phy_stub_UE.c with clang-format 2020-03-08 20:34:20 +01:00
Robert Schmidt
fa7ace4b1d Reimplement dl_config_req_UE_MAC() more concisely 2020-03-08 18:34:00 +01:00
Robert Schmidt
34e7952944 CI: Multi. UEs handled by 1 thread (no races) in l2sim 2020-03-08 18:33:34 +01:00
Robert Schmidt
719667895c Prevent memory leak in L2 sim due to NFAPI 2020-03-08 18:33:34 +01:00
Robert Schmidt
6ec6c8b261 Request CQI in all NFAPI modes (i.e., also for L2 sim) 2020-03-08 18:33:34 +01:00
Robert Schmidt
6866be7175 Trigger ULSCH CQI ind only when instructed 2020-03-08 18:33:34 +01:00
Robert Schmidt
943f907ae1 Send correct ULSCH CQI indication message in L2 sim 2020-03-08 18:33:34 +01:00
Raymond Knopp
2b944d175a commit before merge 2020-03-07 15:24:51 +01:00
laurent
99729391a3 merge develop, first version of 5g simple main() 2020-03-06 21:45:26 +01:00
Francesco Mani
98714f3138 using SCF fapi structure for PUSCH and initialization of pusch dmrs sequences at nr_init 2020-03-06 18:05:12 +01:00
Raymond Knopp
fcb211b014 Fixing FO compensation in UE
Actually there was a bug in FO compensation which I overlooked in last commit.
2020-03-06 17:15:28 +01:00
Sakthivel Velumani
c85d0878c1 Reverting the changes made in fo calculation
While fixing bug in PSS index calculation in 334519d16a, I made changes in FO calculation as well. This is not nedeed and caused the FO to misbehave. Hence, reverting it.
2020-03-06 13:40:03 +01:00
NCTU CS ISIP
1f6dbb20fe LDPC implementation on GPU
Signed-off-by: NCTU CS ISIP <tyhsu@cs.nctu.edu.tw>
2020-03-06 19:12:31 +08:00
NCTU CS ISIP
fb30fc6aa5 GPU branch
Signed-off-by: NCTU CS ISIP <tyhsu@cs.nctu.edu.tw>
2020-03-06 18:36:33 +08:00
NCTU CS ISIP
0f011679c0 NCTU_CS_ISIP
Signed-off-by: NCTU CS ISIP <tyhsu@cs.nctu.edu.tw>
2020-03-06 17:42:52 +08:00
WANG Tsu-Han
5cdfcc4cb5 bugfix after merge 2020-03-05 19:24:40 +01:00
WANG Tsu-Han
e08b5c1c38 Merge branch 'trx_write_thread' into NR_RRCConfiguration_trx_thread
Conflicts:
	executables/nr-ru.c
	targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
2020-03-05 18:31:21 +01:00
WANG Tsu-Han
cc4a0c742e adding debug message 2020-03-05 17:38:47 +01:00
Robert Schmidt
b34a0e2f54 Increase (fixed) PHR for UE phy stub mode (L2 sim) 2020-03-05 16:06:02 +01:00
Robert Schmidt
8af8836c4b Call oai_nfapi_cqi_indication() to send cqi_indications 2020-03-05 16:04:44 +01:00
Robert Schmidt
15a2767562 Don't call fill_ulsch_cqi_indication_UE_MAC()
This functions fills the ULSCH CQI indication message incorrectly. Also,
it should only be triggered when the eNB requests CSI. We disable it
here and a subsequent commit enables it again.
2020-03-05 16:04:44 +01:00
Robert Schmidt
c321f9b5a3 Make UE mem alloc for UL_INFO only once in PHY stub mode 2020-03-05 16:04:44 +01:00
Robert Schmidt
5f851d45b3 Fill UE RX Indication Rel9 to prevent error message 2020-03-05 16:04:44 +01:00
Francesco Mani
e33dea5f38 fix prb mapping according to bwps 2020-03-05 12:19:15 +01:00
Cedric Roux
0ecc3149ba bugfix: ul grant is 27 bits, does not fit into uint16_t 2020-03-05 11:16:46 +01:00
Thomas Schlichter
8fbdfa39ec disable PUSCH PTRS for now
As adding PTRS leads to shortening of the coded data, redudandency is removed and the performance decreases on a pure AWGN channel.
So PTRS should only be enabled if phase noise is present.
2020-03-05 10:27:35 +01:00
Sakthivel Velumani
f2bc346ab7 Fixed bad array length for thread ID 2020-03-05 10:14:46 +01:00
Francesco Mani
f62d94c76f correct scheduling of msg3 reception 2020-03-05 09:59:59 +01:00
Francesco Mani
94b7d132c5 fix for tpc command 2020-03-04 17:56:37 +01:00
Francesco Mani
444442d3e3 mac scheduling of msg3 at gnb 2020-03-04 16:58:49 +01:00
Gabriele Perrone
9afdaf0244 pushing for debugging 2020-03-04 15:13:07 +01:00
adk
00ff5e8a5c PUSCH PTRS extraction and fixing nr_ulsim 2020-03-04 14:45:05 +01:00
adk
505d06e945 PUSCH PTRS generation 2020-03-04 14:45:05 +01:00
adk
e72e1d87f2 added PUSCH PTRS structs (UE + gNB) and parameters initialization 2020-03-04 14:37:05 +01:00
Robert Schmidt
05577be422 Reduce logging verbosity and levels 2020-03-04 13:38:04 +01:00
Robert Schmidt
a51dc94e8b Set correct UE ID in Kenb Refresh Req
NAS triggered the Kenb Refresh Req always for (hardcoded) UE 0. This
fixes this by setting the correct UE ID.

An effect of this was that the Kenb would always be set for UE 0,
regardless for which UE it was actually intended. This led for integrity
check failures for every UE with ID > 0.
2020-03-04 13:38:04 +01:00
laurent
756ac05e4d merge develop,fix basic sim and warnings 2020-03-04 13:32:03 +01:00
Sakthivel Velumani
fbe0695b21 some rfsim fixes 2020-03-04 12:41:56 +01:00
Sakthivel Velumani
df8e9ddbb3 update to the fix for initial sync 2020-03-04 11:21:14 +01:00
Raphael Defosseux
6c8938d584 Merge branch 'develop_integration_w08' into 'develop'
Develop integration 2020 week 08

The following Merge Requests have been included :

* MR771: Nr IP uplink traffic in noS1 mode
* MR772: Tools 5 gadapt
* MR773: Using "--allow-unauthenticated" with apt-get disables package verification,...
* MR776: Docupdate( MR 772)
2020-03-04 07:13:47 +01:00
Francesco Mani
cbbfbca5fb another fix in RE computation for no data in dmrs symbol in phy 2020-03-03 15:22:03 +01:00
Francesco Mani
595e9c6f74 RE computation for no data in dmrs symbol in phy fixed 2020-03-03 14:28:45 +01:00
Thomas Dreibholz
34c118c03e Error should create a log entry, not use printf(). 2020-03-03 11:33:10 +01:00
Thomas Dreibholz
04789ff9f5 Made error message more informative. 2020-03-03 11:33:10 +01:00
Thomas Dreibholz
a07a830a0f Check result of openair0_device_load() and exit when loading the device fails. 2020-03-03 11:33:10 +01:00
laurent
44167f0119 Fix phy simulators 2020-03-02 19:15:44 +01:00
Sakthivel Velumani
52fa969730 fixing wrong writeBlockSize in UE 2020-03-02 18:29:52 +01:00
Sakthivel Velumani
66555e18c7 setting sf_ahead depending on slots duration 2020-03-02 18:29:05 +01:00
laurent
7ad4efb37a fix warnings, reduce formating differences with develop branch 2020-03-02 17:39:44 +01:00
laurent
53db39b8a0 split 7.3 ready for merge 2020-03-02 15:41:21 +01:00
Francesco Mani
e21900bb0a no data in dmrs symbol (hardcoded) 2020-03-02 15:31:30 +01:00
Raphael Defosseux
795f25bb17 CI: new new method to run simulated HSS
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-03-02 14:38:26 +01:00
Raymond Knopp
7994fc2703 compilation errors after merge resolved 2020-03-01 19:46:27 +01:00
Raymond Knopp
02c9e83108 Merge remote-tracking branch 'origin/develop' into develop-oriecpriupdates
Conflicts:
	openair1/PHY/LTE_TRANSPORT/if5_tools.c
	openair1/PHY/LTE_TRANSPORT/prach.c
	openair1/PHY/defs_eNB.h
	targets/ARCH/COMMON/common_lib.c
	targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c
	targets/RT/USER/lte-ru.c
2020-03-01 16:14:58 +01:00
Sakthivel Velumani
bc1e62dd7e Merge branch 'NR_RRCConfiguration' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRCConfiguration 2020-02-28 18:23:27 +01:00
Sakthivel Velumani
b4f46144fe Fixed bugs in frame sync for UE
UE is a bit more stable now
2020-02-28 18:23:15 +01:00
Francesco Mani
19a1affc68 some change in pdsch configuration for msg2 2020-02-28 17:49:00 +01:00
Raphael Defosseux
bf3621c5a8 CI: needs to append CI workspace path to UE RRC conf files
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-02-28 11:53:25 +01:00
Gabriele Perrone
acced8faf1 Merge branch 'develop_integration_w08' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop_integration_w08 2020-02-28 10:30:07 +01:00
Gabriele Perrone
99c113e402 Merge remote-tracking branch 'origin/docupdate_tools' into develop_integration_w08 2020-02-28 10:11:08 +01:00
Gabriele Perrone
abf4d82586 Merge remote-tracking branch 'origin/dreibh/apt-auth-fix' into develop_integration_w08 2020-02-28 10:09:50 +01:00
Florian Kaltenberger
5c041cc153 removing deprecated nr-uesoftmodem command line parameters from CI test 2020-02-27 18:06:10 +01:00
Sakthivel Velumani
172cd2b981 Merge branch 'NR_RRCConfiguration' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRCConfiguration 2020-02-27 17:32:47 +01:00
Raymond Knopp
e417fdfe20 Merge branch 'NR_RRCConfiguration' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRCConfiguration 2020-02-27 17:10:21 +01:00
Raymond Knopp
f54175c9a0 fix for test_case_list.xml file w.r.t. nr_dlsim tests. Still a few tests failing, but .xml syntax errors are fixed 2020-02-27 17:09:24 +01:00
Raphael Defosseux
4bfcef6e16 CI: fixing the infinite loop w/ UE crashes before "got sync" message
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-02-27 16:46:41 +01:00
Sakthivel Velumani
a8301b9aac More fixes for FR2 2020-02-27 15:50:53 +01:00
cig
22d43925e0 Changes to the logic in nr_ue_dl_indication and nr_ue_prach_scheduler 2020-02-27 15:23:40 +01:00
cig
0d6e8ea0fb Interface MAC-PHY for RA: passing FAPI PRACH PDU params to PHY 2020-02-27 15:23:40 +01:00
cig
8ed99c28cf Fixes UE RA procedures:
- using NR RACH config common from scc
- fixed return type RA preamble target power functions
- retrieving PRACH format from PRACH resources
2020-02-27 15:23:40 +01:00
cig
b5bb01d4a6 Cleanup and formatting nr_ue_scheduled_response 2020-02-27 15:23:39 +01:00
cig
3c16ad5643 NR UE PRACH scheduler to fill up UL config request with PRACH PDU
- takes in input configuration index and TS 38.211 PRACH tables (6.3.3.2.x)
- using FAPI NR UL config request struct, derived from SCF standard for gNB
2020-02-27 15:23:39 +01:00
cig
f1e6a34f76 Add common mac functions declarations to nr_mac_common.h 2020-02-27 15:23:39 +01:00
Francesco Mani
80d286b637 removing 6db power boost of pdcch dmrs 2020-02-27 10:19:34 +01:00
Sakthivel Velumani
f59f8032f5 Removed DEFAULT_DLF from UE 2020-02-26 15:43:47 +01:00
WANG Tsu-Han
bd672c5f0f renaming of variable 2020-02-26 14:47:24 +01:00
Francesco Mani
5a9329d1d9 bugfix in filling dci for rar 2020-02-26 14:10:57 +01:00
Sakthivel Velumani
334519d16a Fixed several bugs in UE initial sync procedures
Now UE gets sync all time in rfsimulator. Yet to be tested with hardware.
2020-02-26 12:52:40 +01:00
WANG Tsu-Han
d30a28c368 adding check for overflow, removing prints and parameter setting fix 2020-02-25 16:49:39 +01:00
Francois TABURET
dd7e48ca69 Fixes typo discovered when reviewing from gitlab 2020-02-25 16:06:37 +01:00
WANG Tsu-Han
c2b3867f8a fix for not using pointer to stash 2020-02-25 15:16:18 +01:00
WANG Tsu-Han
61a24472db assertion removal and debuging message adding 2020-02-25 14:07:01 +01:00
frtabu
2c35740122 telnet server and iq record player documentation update 2020-02-25 11:31:40 +01:00
Francesco Mani
63cf2ffa9a fixing the fix 2020-02-24 17:51:33 +01:00
Francesco Mani
d113daeb3a scrambling rnti fix in nr_dci 2020-02-24 17:46:19 +01:00
Raphael Defosseux
e454e59f61 CI: fixing the report on 5G NR RF simulation
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-02-24 15:21:37 +01:00
Raymond Knopp
e2ee13e9ce modifications for DCI size of format 1_0 for RAR and filling of FAPI for RAR according to special RAR-related configuration 2020-02-24 11:25:07 +01:00
Raymond Knopp
eb9d37f6a3 Merge branch 'NR_RRCConfiguration' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRCConfiguration 2020-02-22 15:06:28 +01:00
Raymond Knopp
b232be94ed dlsim/ulsim updated to generate configuration without need for external pre-generated file. 2020-02-22 15:01:55 +01:00
laurent
3d15918c14 merge again with develop, compiles only 2020-02-22 14:19:18 +01:00
Francesco Mani
edeb9ea77c Merge branch 'NR_RRC_PRACH_procedures' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRC_PRACH_procedures 2020-02-21 16:40:37 +01:00
Francesco Mani
6ff42815eb scheduling of msg2 and filling of fapi structures 2020-02-21 16:40:15 +01:00
WANG Tsu-Han
d83c935e42 add trx write thread 2020-02-21 16:19:43 +01:00
Cedric Roux
85176d7203 remove compilation warnings 2020-02-21 11:09:28 +01:00
Cedric Roux
f829970085 improve NR UE capabilities request
Seems like the UEs in the CI don't like when asked to report NR UE
capabilities. So let's first ask for eutra capabilities and then
dig into them to check for en-dc support and only then ask for
NR capabilities. We chose to ask for NR capabilities after receiving
RRCConnectionReconfigurationComplete. That may not be the best thing
to do.

Today, we do nothing with those capabilities. We could completely skip
asking them to the UE, but since the code is there and since it may be
useful in the future, let's do it. Hopefully, it should not hurt too much.
2020-02-20 15:18:50 +01:00
Cedric Roux
eb18a90b7f bugfix: correct X_u computation for both 839 and 139 cases 2020-02-19 14:37:07 +01:00
Cedric Roux
669ba2fafe minor typo fix 2020-02-19 14:29:42 +01:00
Sakthivel Velumani
a3f9a72092 pbchsim works for FR2 2020-02-19 14:07:22 +01:00
Gabriele Perrone
5ef412ec8a Merge remote-tracking branch 'origin/tools_5Gadapt' into develop_integration_w08 2020-02-19 13:24:31 +01:00
Florian Kaltenberger
d59d2fe2bd CI: adding rrc_config_path to nr-uesofrmodem run on caracal 2020-02-19 11:59:46 +01:00
Sakthivel Velumani
6ea69740ba added 50KHz FR2 sample rate in UE 2020-02-19 10:00:36 +01:00
Raymond Knopp
3520166644 Merge branch 'NR_RRC_PRACH_procedures' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRC_PRACH_procedures 2020-02-19 08:35:52 +01:00
Raymond Knopp
dd2cefa457 added longer prefix in PRACH symbol zero period for 15/30 kHz SCS. Both gNB and UE processing is modified. prachsim is functional again with new FAPI interfaces. 2020-02-19 08:34:03 +01:00
Raymond Knopp
27266ddc9a adding config file for band n261 2020-02-18 16:55:44 +01:00
cig
398a5e9063 Bugfix in RAR MAC PDU: set correct fields order for little endian machine 2020-02-18 16:13:56 +01:00
cig
6cd7e61163 UL grant tx and rx in RAR PDU. TS 38.213 ch 8.2, TS 38.321 ch 6.2.3 2020-02-18 15:17:50 +01:00
Francesco Mani
7bd76fda53 prach config common in UE 2020-02-18 14:57:14 +01:00
Florian Kaltenberger
a3d1a70925 Merge branch 'NR_RRCConfiguration' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRCConfiguration 2020-02-18 14:28:01 +01:00
Florian Kaltenberger
99cd73cd0d previously comitted reconfig.raw was wrong (not sure why).
fixing test_case_list.xml
2020-02-18 14:26:40 +01:00
Sakthivel Velumani
04cd9ee3d3 Merge branch 'NR_RRCConfiguration' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRCConfiguration 2020-02-18 12:24:43 +01:00
Sakthivel Velumani
04b64f84a1 set ue dl carrier from cmdline 2020-02-18 12:21:44 +01:00
Francesco Mani
e2178b3339 Merge branch 'NR_RRCConfiguration' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRCConfiguration 2020-02-18 11:00:20 +01:00
Francesco Mani
37bbfc0945 fixes for polartest and ulschsim 2020-02-18 11:00:02 +01:00
Cedric Roux
ac28136a78 fix: use dftlen instead of N_ZC 2020-02-18 10:26:51 +01:00
Florian Kaltenberger
ad99f473f4 CI: fix 5G NR rfsimulator synch check 2020-02-18 09:40:31 +01:00
Florian Kaltenberger
1b1bbd2849 config files update for rfsimulator CI 2020-02-18 09:25:56 +01:00
Florian Kaltenberger
c691f9b601 a few fixes for FR2.
fixing beam to boresight for testing
2020-02-18 09:23:23 +01:00
Raymond Knopp
46c2c11952 Merge branch 'NR_RRC_PRACH_procedures' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRC_PRACH_procedures 2020-02-17 18:10:40 +01:00
Raymond Knopp
5fa07571ec N_ZC -> dftlen in nr_prach.c:nr_rx_prach_ru() 2020-02-17 18:09:47 +01:00
Cedric Roux
c46615dc8d fix: add cast to int32_t before mul for prach_ifft_tmp 2020-02-17 17:47:10 +01:00
Raymond Knopp
87a019a114 bug fixing in nr_rx_prach_ru 2020-02-17 16:09:41 +01:00
Francesco Mani
1ff025a4a1 fix for pbchsim that works also for -I 2020-02-17 15:20:50 +01:00
Francesco Mani
8dac1f134d fix for pbchsim 2020-02-17 14:31:11 +01:00
Raymond Knopp
fe20c53ee1 Merge branch 'NR_RRC_PRACH_procedures' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRC_PRACH_procedures 2020-02-17 14:20:49 +01:00
Raymond Knopp
844da79531 added handling for N_TA_OFFSET computation and changed some use of FAPI configuration in RU (used ru->config instead of ru->gNB_list[0]->config) 2020-02-17 14:19:42 +01:00
Cedric Roux
b12ca2eba1 fix prach2 value 2020-02-17 12:43:11 +01:00
Cedric Roux
bb3bee9f23 fix dftlen computation 2020-02-17 12:22:19 +01:00
Cedric Roux
fd81b1ec89 fix 2020-02-17 12:02:28 +01:00
Sakthivel Velumani
f3f3dff1be fixed physim compile errors 2020-02-17 11:33:03 +01:00
Francesco Mani
3c4ac034a5 small fixes 2020-02-17 09:24:25 +01:00
Raymond Knopp
456d1f9df9 added scheduling of PRACH RX procedures in gNB and RU entities. Initialization of prach sequences added to nr_init.c 2020-02-16 22:48:53 +01:00
Francesco Mani
a248c44d31 computation nb of root sequences in mac (plus some clean up in prach_common.c 2020-02-14 18:57:04 +01:00
Florian Kaltenberger
47d4d0b7ec Merge remote-tracking branch 'origin/develop' into NR_RRCConfiguration 2020-02-14 17:08:23 +01:00
Florian Kaltenberger
0f46f7ee9c Merge branch 'NR_RRCConfiguration_merge_develop' into NR_RRCConfiguration 2020-02-14 17:07:58 +01:00
frtabu
e0fd2de76d replacing phy_test local variable from nr_dlsim.c and nr_ulsim.c with get_softmodem_params()->phy_test 2020-02-14 16:50:09 +01:00
Raphael Defosseux
0d6fabb9b6 CI: fixed the iperf analysis in 5G-RF-SIM now that we have UL
also added the UL test for 5G-RF-SIM

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-02-14 15:46:40 +01:00
Sakthivel Velumani
b7b29aed18 Merge branch 'NR_RRCConfiguration' into NR_RRC_CP_bugfix 2020-02-14 11:52:29 +01:00
Sakthivel Velumani
cc9d513649 fixed txslot issue in realtime 2020-02-14 11:51:19 +01:00
Raymond Knopp
5eeb25e290 integration of remaining FAPI PRACH interfaces in L1 along with list handling for PRACH RX requests 2020-02-14 09:58:36 +01:00
Raymond Knopp
7c9372d761 Merge branch 'NR_RRC_PRACH_procedures' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRC_PRACH_procedures
Conflicts:
	openair1/PHY/NR_TRANSPORT/nr_transport_proto.h
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
2020-02-14 05:49:06 +01:00
Raymond Knopp
e8834e9620 added FAPI interfaces int gNB prach receiver functions (rx_nr_prach,rx_nr_prach_ru) and in indication to MAC. 2020-02-14 05:44:12 +01:00
Francesco Mani
0a2e033253 max ack bits in mac_proto.h 2020-02-13 17:18:20 +01:00
frtabu
b3334dbc2e A fix proposal for phy simulators compilation Pb. 2020-02-13 15:53:54 +01:00
Gabriele Perrone
ee7300f102 experiment of export of enb classes from main.py to enb.py 2020-02-13 15:11:48 +01:00
Francesco Mani
f8523b6c87 Merge branch 'NR_RRC_PRACH_procedures' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRC_PRACH_procedures 2020-02-13 14:24:33 +01:00
Francesco Mani
a7ab50e874 scheduling PRACH and filling fapi PRACH PDU 2020-02-13 13:50:44 +01:00
matzakos
9f1350805c nr-ip-ul-nos1: Resolve some dependency issues to make the phy simulators compile 2020-02-13 13:25:23 +01:00
Thomas Dreibholz
1e38ef5fde Using "--allow-unauthenticated" with apt-get disables package verification, allowing to install untrusted/modified packages into the development system. Fixed calls to apt-get to make sure that packages are verified. 2020-02-13 11:33:46 +01:00
Francesco Mani
eda3a76e13 fix in function to read prach tables 2020-02-13 09:12:02 +01:00
frtabu
ff4829284b --amend 2020-02-12 20:29:51 +01:00
frtabu
e091f94ae7 fix T_IDs.h build problem 2020-02-12 19:29:53 +01:00
frtabu
6014ca42ac ENABLE_ITTI macro removal, modified telnet server to support all executables, modified record player to finalize switch to run-time option and allow usage with any device 2020-02-12 19:05:44 +01:00
Francesco Mani
f7611d12a2 prach tables in mac_common and function to read them 2020-02-12 18:06:30 +01:00
matzakos
295923d540 nr-ip-ul-nos1: Logs cleanup and some code rearrangement 2020-02-12 17:58:06 +01:00
cig
fdaf4ff92c Fixed warnings gNB compilation 2020-02-12 17:32:08 +01:00
cig
3341846d4c Handled uninitialised return value in get_tx_amp_prach 2020-02-12 17:32:08 +01:00
matzakos
4e51e1ea10 nr-ip-ul-nos1: Merge with develop 2020-02-12 16:45:22 +01:00
Cedric Roux
9a91fe96c3 update configuration file for gnb band 78 106 PRBs 2020-02-12 10:12:58 +01:00
Francesco
f086c07cfe Merge remote-tracking branch 'origin/NR_RRCConfiguration' into NR_RRC_CP_bugfix 2020-02-12 09:58:59 +01:00
Francesco Mani
57a612c52d update of pucch scheduler 2020-02-12 09:34:07 +01:00
matzakos
9e6b6ef965 nr-ip-ul-nos1: Remove warnings 2020-02-11 18:45:35 +01:00
Raphael Defosseux
f8037ab61e DOC: added link to feature list in README
align folder structure in README w/ 5G-NR new folders

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-02-11 16:59:43 +01:00
cig
498ce5fede Fixed wanrnings nrUE compilation 2020-02-11 16:41:59 +01:00
Sakthivel Velumani
ef0aad0de7 fixed bug from provious commits 2020-02-11 16:37:31 +01:00
cig
794348e0b9 Removed unnecessary return in gnb phytest scheduler (was followed by assert on same condition) 2020-02-11 14:50:22 +01:00
cig
9c79e7e353 Fixed compilation after rebase 2020-02-11 14:45:44 +01:00
Thomas Dreibholz
0b4726751e Added missing file targets/DOCS/openair_header.tex. 2020-02-11 11:52:05 +01:00
Raphael Defosseux
3a10c5ca65 DOC: adding contributor and separate readme/changelog
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-02-11 11:51:40 +01:00
Sakthivel Velumani
9a7daded2e Updated ofdm fep in gNB 2020-02-11 10:56:15 +01:00
Raymond Knopp
9c75cda863 Merge branch 'NR_RRCConfiguration' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRCConfiguration 2020-02-10 23:18:58 +01:00
Raymond Knopp
064b7f23aa generation of CCEIndex > 0 in gNodeB and modification of unscrambling procedure for PDCCH in UE RX. 2020-02-10 23:17:27 +01:00
cig
7e25d85f5c Cleanup code, comments 2020-02-10 20:02:16 +01:00
cig
98480e7102 RA, Updated nr_ue_get_rach:
- using LTE function mac_rrc_nr_data_req_ue in noS1 mode
- cleanup code, comments
- fixes RA procedure
- Processing UL MAC PDU according to TS 38.321 ch 6.1:
- introduced function for gNB side UL PDU processing
- fixed bug in nr_ue_process_mac_pdu
2020-02-10 20:02:16 +01:00
cig
6c61fef362 Added RA_SUCCEEDED to RA_state_t 2020-02-10 20:01:39 +01:00
cig
99256c24ce MAC CE contention resolution reception 2020-02-10 20:01:39 +01:00
cig
bbc0d1deeb Adapted get_nr_PL to be used in RA MAC procedures 2020-02-10 20:01:39 +01:00
cig
9653b954d3 Contention resolution TS 38.321 ch 5.1.5 2020-02-10 20:01:39 +01:00
cig
6149d825e2 Msg3 transmitted, flush Msg3 buffer when RA is not active 2020-02-10 20:01:39 +01:00
cig
a70fa82ad8 Removed phy vars members from ue mac inst struct 2020-02-10 20:01:39 +01:00
cig
156defcd0b Fixes RAR generation, reception 2020-02-10 20:01:39 +01:00
cig
986b5fb247 Integrated nfapi_nr_dl_dci_pdu_t in DL DCI 2020-02-10 20:01:39 +01:00
cig
ffa5911dc1 RA fixes 2020-02-10 20:01:39 +01:00
cig
903a1ec6a8 Cleanup code, removed gNB headers in UE files 2020-02-10 20:01:39 +01:00
cig
36195ec31a RA fixes and additions:
- RA resource selection and transmission
- MAC header structs for RA
- RA procedure msg1 fixes
- code cleanup
2020-02-10 20:01:39 +01:00
cig
e01dd43b7b Cleanup comments, removed UE files from gNB MAC library 2020-02-10 19:59:36 +01:00
cig
083234133a Hardcoded prach config common parameters 2020-02-10 19:59:36 +01:00
Guido Casati
e0e8bbcfdb RACH MAC procedure (RA initiation and Preamble selection)
- Updated PRACH procedures and general code formatting
- gNB msg1 handling and RAR generation
- general bug fixing
- formatting
- missing headers
- RAR handling.
2020-02-10 19:59:36 +01:00
Bo Zhao
5aec9ab505 Solve the uninitialized conditional jump and invalid read/write errors from the valgrind log 2020-02-10 19:56:39 +01:00
Bo Zhao
7ea608720f Extend the length of the channel processing to 32 bits 2020-02-10 19:56:39 +01:00
Bo Zhao
ac12245252 Bugfix: 1. fix the initial memory allocation; 2. correct the generation of the prach signal according to specs 2020-02-10 19:53:29 +01:00
Bo Zhao
f2eb214156 1. assertion relax for preamble format 3; 2. memset bugfix for RB=106; 3. repetition bugfix for format A3 and B3 2020-02-10 19:53:29 +01:00
Bo Zhao
2cd49c3e24 Bug fix: remove the hardcoded tx preamble index 2020-02-10 19:53:29 +01:00
Bo Zhao
0ae6685dbb Bug fix: use NR prach table init function 2020-02-10 19:53:29 +01:00
Bo Zhao
42c698fd93 Bug fix: preamble energy and delay used in the peak detection should be scalar instead of array 2020-02-10 19:50:23 +01:00
Bo Zhao
21bb011b7a Conversion from the peak detection to the TA value, considering the numerology, N_RB and the sampling rate 2020-02-10 19:50:23 +01:00
Bo Zhao
1996bdaa34 Fix for DFT of different preamble formats according to specifications 2020-02-10 19:50:23 +01:00
Francesco Mani
795ed9a814 fix in pucch configuration 2020-02-10 16:39:50 +01:00
Sakthivel Velumani
5c0a817f23 FR1 works fine in rfsimulator
Initial sync not happening fot FR2
2020-02-10 15:45:00 +01:00
Sakthivel Velumani
e1647ac620 fixed the issue with wrong PDSCH slots 2020-02-10 15:34:11 +01:00
Raphael Defosseux
f1a8620515 CI: fixes in python framework
-- fromdos was to be called from python executor and not from ADB server
 -- doing a power-cycle on CAT-M module at start of test

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-02-10 13:29:32 +01:00
Raymond Knopp
69721198af nr MAC uplink: aDD identification of MAC uplink PDU CEs at gNB (receiver) side 2020-02-10 12:54:00 +01:00
Francesco Mani
3e5682d8bb including uci indication 2020-02-10 10:11:45 +01:00
Florian Kaltenberger
87d4443c0b adding support for beamforming (control of GPIO) for FR2 2020-02-10 09:23:24 +01:00
frtabu
2520a92211 modify telnet serveur build to support all exec's 2020-02-10 09:00:38 +01:00
Florian Kaltenberger
a01e93be0c Merge remote-tracking branch 'origin/develop' into NR_RRCConfiguration 2020-02-09 21:38:04 +01:00
matzakos
626daecfa5 nr-ip-UL-nos1: Fix packet corruption issue appearing with larger packet sizes based on iperf testing for the uplink 2020-02-07 19:51:19 +01:00
Sakthivel Velumani
be09a9b0ba applying laurent's patch for rfsim. Missed in the RRC_FR2 branch
2 issues at this point:
1.rfsim for FR1 works sometimes. other times 100 consec PBCH errors.(this commit)
2.PDCCH and PDSCH are not transmitted in correct slots. problem might be with sf_ahead.
2020-02-07 18:22:32 +01:00
Raphael Defosseux
f761479e40 Develop integration 2020 week 06
See merge request oai/openairinterface5g!769

The following Merge Requests have been included :

* MR 767: fix compilation error for Lime driver
* MR 768: Softmodem cleanup
2020-02-07 17:14:26 +01:00
Florian Kaltenberger
12b38431dc PUSCH start symbol should be 0 2020-02-07 16:58:31 +01:00
Francesco Mani
7134468cde adapting FR2 absolutefrequencySSB to new code 2020-02-07 15:46:32 +01:00
Francesco Mani
5f3b997789 added assertion for absolutefrequencySSB 2020-02-07 14:42:26 +01:00
Sakthivel Velumani
7f4b6a2986 updated slot fep for numerology 0
fixed a bug in UE
2020-02-07 12:41:45 +01:00
Florian Kaltenberger
b6a063a77b fixing a typo 2020-02-07 10:55:18 +01:00
matzakos
93ac6bd426 nr-ip-UL-nos1: Substitute LTE macros in new NR functions and data structures + logs cleanup 2020-02-06 18:21:12 +01:00
Gabriele Perrone
f543244e7f Merge remote-tracking branch 'origin/softmodem_cleanup' into limedrv-sftmdmclean
Merge softmodem_cleanup (MR768) and  fix-limeSDR-compile (MR767) into a third branch before creating a new MR (limedrv-sftmdmclean to develop)
2020-02-06 18:10:25 +01:00
Florian Kaltenberger
86670eccb4 forcing rnti to 4660 in nr_dlsim, as otherwise CCE allocation does not work (to be fixed) 2020-02-06 15:49:33 +01:00
Florian Kaltenberger
239c30d92a updating gNB config file for CI 2020-02-06 15:49:33 +01:00
Francesco Mani
c5f05b3a21 Merge branch 'NR_RRCConfiguration' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRCConfiguration 2020-02-06 14:59:15 +01:00
Florian Kaltenberger
debe10c296 fixing a bad merge, removing a log, resetting MAX_LDPC_ITERATIONS=5 2020-02-06 14:57:16 +01:00
Francesco Mani
d22c0f720d fix for ssb bitmap endian (to be checked with FSW) 2020-02-06 14:33:38 +01:00
laurent
943802f2a1 Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into merged4g5g 2020-02-06 11:02:07 +01:00
laurent
255d32389c real time ok in monolithic cases, phy test tools fixed 2020-02-06 11:01:54 +01:00
Florian Kaltenberger
e4d8dd1e66 ulsim working again. added error count and adapted test_case_list 2020-02-05 22:57:24 +01:00
matzakos
bb7a788809 nr-ip-UL-nos1: Integrate NR MAC PDU structures for the Uplink. Currently supporting only data SDUs, Control Elements to be added. 2020-02-05 18:47:02 +01:00
Sakthivel Velumani
4d33b341c2 updated phy simulators 2020-02-05 18:13:11 +01:00
Francesco Mani
5320469402 scheduling of PUCCH on MAC, passing PUCCH FAPI down to PHY (to be finished), filling DCI structures according to PUCCH (to be finished) 2020-02-05 18:05:18 +01:00
Florian Kaltenberger
16d8248c8b removing logs 2020-02-05 15:09:32 +01:00
Florian Kaltenberger
fcecbff7d4 Merge branch 'NR_RRCConfiguration' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRCConfiguration 2020-02-05 15:03:22 +01:00
Florian Kaltenberger
1905611d25 making ulsim run again, nr_dlsim should run again in CI 2020-02-05 15:02:05 +01:00
Sakthivel Velumani
30750781f1 Merge branch 'NR_RRCConfiguration' into NR_RRC_CP_bugfix 2020-02-05 12:38:56 +01:00
Sakthivel Velumani
da71b97908 updated to slot_fep 2020-02-05 11:51:55 +01:00
Francesco Mani
607f561efa changes for no coreset0 k_ssb (ssb_SubcarrierOffset from config file not working) 2020-02-05 10:28:35 +01:00
Sakthivel Velumani
d8ee1189d6 More updates
gNB and UE runs without crashing; PBCH not decoding though
2020-02-04 18:17:43 +01:00
frtabu
64e4826c81 add softmodem-common.c and common error handler 2020-02-04 17:39:36 +01:00
Florian Kaltenberger
8f14c0fe17 Merge remote-tracking branch 'origin/develop' into NR_RRCConfiguration
Conflicts:
	executables/nr-gnb.c
	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
2020-02-04 15:38:33 +01:00
Francesco Mani
b1d259663e configuration of pucch0 rx from fapi structure 2020-02-04 15:36:47 +01:00
Florian Kaltenberger
2027942710 Merge remote-tracking branch 'origin/NR_RRC_TA' into NR_RRCConfiguration 2020-02-04 15:33:57 +01:00
Sakthivel Velumani
460a75dbdf Merge branch 'NR_RRCConfiguration' into NR_RRC_CP_bugfix 2020-02-04 14:33:56 +01:00
Raphael Defosseux
cae94677f8 CI: adding a EPC lockable resource to pipeline
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-02-04 14:17:32 +01:00
matzakos
9367bad1a4 Disable X2AP at gNB 217 PRBs config file to prevent segfault when there is no X2 link 2020-02-04 13:38:07 +01:00
matzakos
fa09fbcf12 Small fix to be able to parse ue capabilities and add NSA user when running in phytest mode 2020-02-04 13:21:02 +01:00
Francesco Mani
59fc607c4e mac function to configure fapi for pucch updated (not yet called) 2020-02-04 12:33:54 +01:00
Sakthivel Velumani
9ea4ebdc5f more updates on samples_per_slot 2020-02-04 11:09:19 +01:00
cig
980407a1df Fixed conflicts after merge 2020-02-03 17:13:05 +01:00
laurent
10b046f5b8 merge continue: take develop latest commits, fix compilation for test tools 2020-02-03 15:25:50 +01:00
laurent
cd20e9083a fix compilation error for Lime driver 2020-02-03 13:48:17 +01:00
Francesco Mani
1b8e18e05b absoluteFrequencySSB is the center of SSB (correction of 10 RB in ref to point A needed) 2020-02-03 12:30:45 +01:00
Francesco Mani
c36636be95 function to configure scf fapi for pucch (not yet called) 2020-02-03 11:53:05 +01:00
cig
7344d87567 Merge branch 'fhg-ta' into fhg-ra 2020-02-03 10:45:29 +01:00
frtabu
101a55e332 commit before rebasing onto develop 2020-02-03 10:37:46 +01:00
laurent
4abaa55949 Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into merged4g5g 2020-02-01 18:06:18 +01:00
Sakthivel Velumani
bc38ec6b29 Updated samples per slot as per specs.
gNB runs fine. UE yet to be tested.
2020-01-31 18:16:17 +01:00
Sakthivel Velumani
0bb1bcc0bb Updated CP length as per spec for FR2 2020-01-31 18:15:32 +01:00
Francesco Mani
06e700a048 bitmap for scheduling dlsch and ulsch in UE list 2020-01-31 16:32:49 +01:00
Francesco Mani
cef2ed8dda bugfix in nr_dlsch_encoding 2020-01-31 09:07:56 +01:00
Raphael Defosseux
aa8f04e3b1 Merge branch 'develop_integration_2020_w05' into 'develop'
Develop Integration Branch : 2020 week 05

The following Merge Requests have been included :

* MR[702] : Add PUSCH-based TA updates (5G-NR)
* MR[764] : fix segv in drs_modulation.c (4G-LTE-UE)
* CI Python Framework improvement (X2 OpenAirCn Handover)
* Some Compilation warnings fixed
2020-01-30 20:27:59 +01:00
laurent
8d9d80ee37 very big merge with merged develop, basic test done 2020-01-30 17:10:36 +01:00
Raphael Defosseux
5e9b64c0d3 Proper patch on the waitret for warning compilation 2020-01-30 17:08:26 +01:00
Francesco Mani
84bed899cb bitmap for scheduling dlsch and ulsch in phytest and a bugfix in dlsch coding 2020-01-30 16:49:13 +01:00
Raphael Defosseux
f8a8f054b9 Merge remote-tracking branch 'origin/develop_inria_ci_deployment' into develop_integration_2020_w05 2020-01-30 15:14:28 +01:00
Raphael Defosseux
9331d38d85 CI: fixing a few compilation warnings
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-01-30 15:10:35 +01:00
Raphael Defosseux
71ff9f8bb7 Merge remote-tracking branch 'origin/ue-segv-drs_modulation.c' into develop_integration_2020_w05 2020-01-30 11:51:23 +01:00
Florian Kaltenberger
5006aa0291 harmonizing TDD configuration for 106 with the one for 217 PRB 2020-01-29 22:06:28 +01:00
Florian Kaltenberger
538e08d0a5 Revert "adding support for beam selection in usrp_lib"
This reverts commit 615f365b37.
2020-01-29 22:05:54 +01:00
laurent
0f77c961b5 fix segv in drs_modulation.c 2020-01-29 18:56:20 +01:00
Thomas Schlichter
cfced70bda Merge remote-tracking branch 'develop' 2020-01-29 13:15:42 +01:00
Francesco Mani
51f5a5b30c scs parameters from BW not from RB 2020-01-29 12:25:37 +01:00
cig
e21b00adab Bugfix - missing call to mac_rlc_data_ind in the noS1 mode:
- now the UE is passing again data to the upper layers in noS1 mode
- minor cleanups
2020-01-28 17:47:15 +01:00
Francesco Mani
cdde88302c completing previous fix 2020-01-28 16:38:02 +01:00
Francesco Mani
0e550ff2f5 fix for pucch0 resource allocation 2020-01-28 16:13:46 +01:00
Cedric Roux
9e1c94835c fix for lte UE compilation 2020-01-28 14:39:50 +01:00
Francesco Mani
b2765ac23a some changes in pucchsim 2020-01-28 13:41:59 +01:00
Cedric Roux
1c026a0b32 Merge remote-tracking branch 'origin/nr-dual-connectivity' into NR_RRCConfiguration 2020-01-28 12:28:26 +01:00
Cedric Roux
f594ae8b82 release DRB1 on LTE side of things to configure UE for endc 2020-01-28 12:24:48 +01:00
Cedric Roux
6970bea679 fix value in fill_default_secondaryCellGroup 2020-01-28 12:20:08 +01:00
Gabriele Perrone
9281156872 rework of the help from embedded Usage() function to external helpreadme.py file 2020-01-27 11:45:03 +01:00
Florian Kaltenberger
615f365b37 adding support for beam selection in usrp_lib 2020-01-27 11:13:06 +01:00
Cedric Roux
1d4d8d685f add drb 1 with nea0
phone was not happy with other settings
2020-01-27 10:13:16 +01:00
Raphael Defosseux
4eaadf8d82 CI: fixing slave pipelines
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-01-26 13:41:36 +01:00
Raphael Defosseux
893e19fa16 Merge branch 'develop_integration_2020_w04' into 'develop'
Develop integration 2020 week 04

See merge request oai/openairinterface5g!763

The following MRs have been included:

* MR [726] : Flexran improvements
* MR [756] : remove uhd_set_thread_priority function
* MR [757] : HOTFIX: After develop/develop-nr merge UE was crashing with MBMS U-Plane traffic running
* MR [758] : Improve build after nr lte merge
* MR [759] : Doc update after 5g lte merge and latest build procedure modifications
* MR [761] : fixes for mutex lock for wake up signal
* MR [761] : CI: count ULSCH received ok messages
2020-01-26 00:20:19 +01:00
matzakos
8a6f346ec4 nr-ip-ul nos1: Small modification to be able to block the random traffic (which is generated when there is no Uplink IP traffic at the UE) at the MAC layer of the gNB 2020-01-24 20:04:00 +01:00
Raphael Defosseux
44cfdab5b7 CI: fix the missing 5G-NR UE build report
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-01-24 17:53:18 +01:00
Raphael Defosseux
9078a01e35 CI: adding FDD-10MHz to RFSIM
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-01-24 16:03:42 +01:00
Florian Kaltenberger
8dac3a46c9 Merge remote-tracking branch 'origin/NR_RRCConfiguration' into NR_RRC_PUSCH 2020-01-24 15:22:14 +01:00
Florian Kaltenberger
9624fb0183 reactivating phy scope gNB 2020-01-24 15:08:32 +01:00
Raphael Defosseux
fd865ea06d CI: doing the check only in NR
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-01-24 12:05:58 +01:00
Raphael Defosseux
9ca17fd3e7 Merge remote-tracking branch 'origin/ci-scripts-cleanup' into develop_integration_2020_w04 2020-01-24 12:02:59 +01:00
Raphael Defosseux
8c6ac1092e Merge remote-tracking branch 'origin/ci_check_ulsch' into develop_integration_2020_w04 2020-01-24 12:02:45 +01:00
Raphael Defosseux
7a6b857953 Merge remote-tracking branch 'origin/mutex_fix' into develop_integration_2020_w04 2020-01-24 12:02:31 +01:00
Raphael Defosseux
01470da96b Merge remote-tracking branch 'origin/doc_update_5GLTE' into develop_integration_2020_w04 2020-01-24 12:01:05 +01:00
Raphael Defosseux
5c80ef080c Merge remote-tracking branch 'origin/improve_build_nr_lte_merge' into develop_integration_2020_w04 2020-01-24 12:00:49 +01:00
Raphael Defosseux
7d26df6ecf Merge remote-tracking branch 'origin/mbms-fix-develop-nr' into develop_integration_2020_w04 2020-01-24 12:00:31 +01:00
Raphael Defosseux
0b75b75132 Merge remote-tracking branch 'origin/uhd_priority_set_cleanup' into develop_integration_2020_w04 2020-01-24 12:00:16 +01:00
Raphael Defosseux
5162f0c4ef CI: fix the missing 5G-NR UE build report
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-01-24 11:22:14 +01:00
Raphael Defosseux
855752f4d2 Fix a few warnings
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-01-24 11:20:10 +01:00
Cedric Roux
74762762db Merge remote-tracking branch 'origin/NR_RRCConfiguration' into nr-dual-connectivity 2020-01-24 11:10:55 +01:00
Cedric Roux
1ce8540d6d fix lte softmodem compilation 2020-01-24 11:09:30 +01:00
Cedric Roux
49d27bdf11 Merge remote-tracking branch 'origin/NR_RRCConfiguration' into nr-dual-connectivity 2020-01-23 16:37:21 +01:00
Francesco Mani
6a356e3b69 few warnings 2020-01-23 16:36:23 +01:00
Cedric Roux
51ab31a3b9 trigger NR activation based on RRC measurements
An NR-capable UE will transmit some NR measurements.
Once received, the whole process on nr-cell addition is started.
It will fail quickly.

Many things are still missing.

What is not handled properly with this commit:
- in x2ap_eNB_handle_sgNB_add_req we hardcode the gNB ID
- nr triggering is done if we receive a measurement but this measurement is
  not analyzed at all
- no timers (T_dc_overall, T_dc_prep) and as is the code fails and then the
  next triggering after UE reconnection will not work (x2 ID are not well
  handled here and there in the code)

Note also that the gNB part has not been looked at all for this commit.

This is work in progress...
2020-01-23 16:10:29 +01:00
Thomas Schlichter
d3b19823f0 CI: count ULSCH received ok messages 2020-01-23 15:54:19 +01:00
Francesco Mani
cf51fff79f another fix for transmitting SSB with shorter TDD periodicity 2020-01-23 14:55:33 +01:00
WANG Tsu-Han
b7a027f905 fixes for mutex lock for wake up signal 2020-01-23 14:52:30 +01:00
Francesco Mani
9ca3f75464 fix for 5ms SSB periodicity 2020-01-23 13:48:54 +01:00
Raymond Knopp
0a136997d3 nr-ip-UL noS1: Merge with develop branch 2020-01-23 12:35:01 +01:00
Florian Kaltenberger
932b4e0d71 Merge remote-tracking branch 'origin/NR_RRCConfiguration' into NR_RRC_PUSCH
Conflicts:
	executables/nr-ue.c
2020-01-23 12:09:56 +01:00
Florian Kaltenberger
00f0e0ccb8 UL is now being scheduled but not decoded ok yet 2020-01-23 12:07:47 +01:00
Raphael Defosseux
4a2abc03b5 CI: splitting build xml files into build and epc-start XML files
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-01-23 11:05:08 +01:00
Gabriele Perrone
3f546cb48a minor changes to epc.py, helpreadme.py, main.py to complete the export of EPC functions from main 2020-01-23 10:41:49 +01:00
Francesco Mani
82ab85ec51 bugfix for MIB 2020-01-23 09:58:53 +01:00
Raphael Defosseux
9b920255b3 DOC: added kernel headers install guidelines for CentOS / RHEL
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-01-22 22:53:34 +01:00
Raphael Defosseux
009c75d60b CI: removed obsolete python obsolete options
split the RRC inactivity scenarios

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-01-22 22:43:38 +01:00
Raphael Defosseux
b723418c33 CI: fix RF simulator hyperlinks in HTML report
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-01-22 21:36:58 +01:00
Javier Morgade
fb57ef2fd4 patch from Robert Schmidt <robert.schmidt@eurecom.fr>
-BUGFIX: CD/DU F1 split
2020-01-22 20:18:51 +01:00
Raphael Defosseux
b85731f4a9 CI: Add LTE RF Simulator test (normal and with MBMS)
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-01-22 17:59:21 +01:00
Francesco Mani
e29d1789df fix for long SSB bitmap in config file 2020-01-22 17:38:34 +01:00
Raymond Knopp
2ebc75b9a2 fixes for the thread blocking problem 2020-01-22 15:09:32 +01:00
matzakos
99fce8a359 nr-ip noS1 uplink: Uplink IP traffic successfully received at the IP TUN interface of the gNB now. Logs cleanup. 2020-01-22 13:05:10 +01:00
Francesco Mani
63866165ee fixing some warnings 2020-01-22 09:50:57 +01:00
frtabu
22e45b8adf update doc/BUILD.md and doc/RUNMODEM.md to reflect develop/develop-nr merge and latest merge requests affecting the build procedure 2020-01-21 18:01:50 +01:00
Francesco Mani
a82300d78a some modifications in nr_parms 2020-01-21 17:45:36 +01:00
Gabriele Perrone
5e8af1ade9 Merge remote-tracking branch 'origin/develop' into develop_inria_ci_deployment_gp 2020-01-21 14:24:32 +01:00
Gabriele Perrone
0235b8c0e7 CI: first draft of separating EPC functions
Signed-off-by: Gabriele Perrone <gabriele.perrone@openairinterface.org>
2020-01-21 13:50:44 +01:00
Sakthivel Velumani
908ef67eeb fixed PRB 66 bug 2020-01-21 12:33:58 +01:00
Francesco Mani
624aa3c2fd option for 50MHz FR2 in dlsim 2020-01-21 11:19:54 +01:00
frtabu
6cdac7e12f fix config lib and config sources usage in CmakeList.txt 2020-01-20 19:45:21 +01:00
frtabu
61f6af80ad build improvements: allow build mode selection (-g -G options) allow all exec build in one pass, remove remaining USE_MME macros in nr code 2020-01-20 19:06:15 +01:00
matzakos
5b5a25a932 nr-ip noS1 uplink integration (testing with RFSIMULATOR only): Uplink IP packets received at the gNB and reaching at pdcp layer. Asserion error at pdcp_fifo_flush_sdus when trying to write on the nas socket 2020-01-20 17:55:16 +01:00
Thomas Schlichter
50cfaf7fff Merge remote-tracking branch 'develop' 2020-01-20 15:34:12 +01:00
Sakthivel Velumani
b9e66e19d0 Merge branch 'NR_RRCConfiguragion_FR2' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRCConfiguragion_FR2 2020-01-20 15:26:41 +01:00
Sakthivel Velumani
f0b8dbd7ad small update in fep 2020-01-20 15:25:56 +01:00
Francesco Mani
7674317ea1 fix compilation errors in phy simulators 2020-01-20 14:40:19 +01:00
Sakthivel Velumani
29a725fe3b Merge branch 'NR_RRCConfiguragion_FR2' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRCConfiguragion_FR2 2020-01-20 14:30:18 +01:00
Sakthivel Velumani
5ab4044613 included numerology as cmdline parm 2020-01-20 14:29:12 +01:00
Robert Schmidt
dabe2ae7ab FlexRAN: remove unused import in protocol def 2020-01-20 14:05:05 +01:00
Robert Schmidt
1c8c839f65 FlexRAN: Reformat code for X2 HO NetControl activation 2020-01-20 14:05:05 +01:00
Robert Schmidt
e33be3ccd3 FlexRAN: Re-enable the soft-restart, it works 2020-01-20 14:05:05 +01:00
Robert Schmidt
c6e389ed4c FlexRAN: assert if out of memory 2020-01-20 14:05:05 +01:00
Robert Schmidt
a87220d376 Add S1AP control module for FlexRAN with status monitoring support 2020-01-20 14:05:05 +01:00
cig
ef0a45325b Split configure_fapi_dl_tx function into two functions:
- configure_fapi_dl_pdu is handling the nfapi_nr_dl_config_request_pdu
 - while configure_fapi_dl_Tx is now handling the nfapi_tx_request_pdu

this was necessary because the computation of the TBS size is needed in the phytest scheduler
before even knowing if there is any data to transmit. The tx_request_pdu must be handled instead
only when there is data to transmit.
2020-01-20 12:57:41 +01:00
Robert Schmidt
44fdb23f15 FlexRAN: fix RRC protobuf definition 2020-01-20 11:35:35 +01:00
Robert Schmidt
6a581d903b Add FlexRAN protobuf definition for S1AP 2020-01-20 11:35:35 +01:00
Robert Schmidt
d2b1e6aa9a FlexRAN: report employed splits to controller 2020-01-20 11:35:35 +01:00
Robert Schmidt
a8b4a62b82 Read RU config before FlexRAN to allow split identification 2020-01-20 11:35:35 +01:00
Robert Schmidt
f87c1cbb92 FlexRAN refactor+format MAC stats function 2020-01-20 11:35:35 +01:00
Robert Schmidt
b6d466d772 FlexRAN: reimplement timers without ITTI
The timer code used to trigger periodic statistics message sending used
ITTI. Together with a high frequency reporting (e.g. 1ms), this resulted
in high CPU usage. This commit reimplements this:
* using a thread that is synchronized to the RU (if there is no MAC, we
  assume there is no RU generating a tick so we create the tick source
  ourselves)
* no RB trees but plain arrays
* smaller interface for users
* slight user interface changes
* remove stopped timer state: such timer might be simply removed
* remove one-shot timers
2020-01-20 11:35:35 +01:00
Robert Schmidt
233affc9dd FlexRAN: include header, not C file 2020-01-20 11:34:54 +01:00
Robert Schmidt
5c4aa309eb FlexRAN: helper function to get No. UEs 2020-01-20 11:34:54 +01:00
Robert Schmidt
7415d08138 FlexRAN: Simplify stats request handling
* only set up timer for sending requests
* simplify interface for timer setup
* on timer expiry, do not pass through stats request function but
  directly send the reply
* Remove whatever report structure and use stats request directly for
  inferring the data to send
2020-01-20 11:34:54 +01:00
Robert Schmidt
a21c1b1f73 Remove unused sleep function() 2020-01-20 11:33:32 +01:00
Francesco Mani
ec416c88b0 option for FR2 and 50MHz 2020-01-20 11:02:53 +01:00
Javier Morgade
dff766ae15 *HOTFIX: After develop/develop-nr merge UE was crashing with MBMS U-Plane traffic running
-New MAC SDU integrity check in ue_procedures .c introduced for MCH channels.
	-This SDU behavior didn’t show up with former develop
	-TOCHECK whether NFAPI was properly merged on the eNB side.
	-eNB_scheduler_mch has been slightly rearranged.

	*BUGFIX:
	-In dlsch_demodulation.c  “ rxF_comp_d.m” was continuously being written to disk

	*New reference config file added (lte-fdd-mbms-basic-sim.conf) for rfsim environment
2020-01-20 10:34:41 +01:00
Raphael Defosseux
979fa3a659 DOC: added hyper links to new sections
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-01-17 21:42:14 +01:00
Dr.-Ing. Javier Morgade
954c9d4173 Update FEATURE_SET.md with MBMS features 2020-01-17 21:41:08 +01:00
Dr.-Ing. Javier Morgade
0ec5db48d3 Update README.txt with MBMS features 2020-01-17 21:41:00 +01:00
Raphael Defosseux
c383b5e696 CI: prepare release notes for release 1.2.0
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-01-17 21:40:49 +01:00
Raphael Defosseux
f2d90e79e3 CI: fix the git clone extension when creating the UE workspace
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-01-17 21:39:34 +01:00
Raphael Defosseux
0e3401829f Merge branch 'integration-develop-nr-2020w03' into 'develop-nr'
Integration develop-nr 2020 week 03

See merge request oai/openairinterface5g!755

This integration branch includes the following MRs:

- MR 745 : Add support for different PUSCH DMRS modes
- MR 748 : Nr dlsch multi threading
- MR 752 : Merging develop tag 2019.w51 to develop-nr
- MR 753 : RedHat Entreprise 7.7 build support

IMPORTANT: This should be the last integration branch to develop-nr as the result of this MR will become develop
2020-01-17 21:37:28 +01:00
Francesco Mani
98c66bab40 config file also for x300 2020-01-17 18:11:17 +01:00
Francesco Mani
8e7b12257c first version of config file for FR2 (I changed only few parameters) 2020-01-17 18:09:51 +01:00
Cedric Roux
ad5706c88d activate NR measurements for NR capable UEs
many things hardcoded, to be refined
2020-01-17 16:56:57 +01:00
Francesco Mani
dc6b0b15f7 option to have an IF frequency set from config file for FR2 2020-01-17 16:30:15 +01:00
Raymond Knopp
41b739ebff ENDC X2AP: Add handling of sGNB Reconfiguration Complete message at gNB side 2020-01-17 13:09:07 +01:00
Raymond Knopp
1493b7cb55 Merge branch 'nr-dual-connectivity' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr-dual-connectivity 2020-01-17 12:52:24 +01:00
matzakos
e52f8b7ad7 Merge branch 'nr-dual-connectivity' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr-dual-connectivity 2020-01-17 12:43:29 +01:00
matzakos
2865eb95a6 ENDC X2AP: Add generation of X2 sGNB Reconfiguration Complete message 2020-01-17 12:43:07 +01:00
Francesco Mani
24740eb2f2 Merge branch 'NR_RRCConfiguration' into NR_RRCConfiguragion_FR2 2020-01-17 12:12:31 +01:00
Cedric Roux
5930acaca6 harmonize calloc parameters
use:
     type *x = calloc(1, sizeof(*x));
everywhere to avoid bad types inside the sizeof.
2020-01-17 12:08:41 +01:00
Cedric Roux
1f92529452 harmonize calloc parameters
use:
     type *x = calloc(1, sizeof(*x));
everywhere to avoid bad types inside the sizeof.
2020-01-17 12:05:25 +01:00
Francesco Mani
40c06a843e taking into account raster step size in nrarfcn functions 2020-01-17 11:24:52 +01:00
Francesco Mani
9901cd4266 adding all NR FR2 bands in table 2020-01-16 18:15:06 +01:00
Francesco Mani
7769d19449 compilation errors solved 2020-01-16 18:00:42 +01:00
Francesco Mani
0c6b51015f merge between FR2 and RRC branches 2020-01-16 17:20:56 +01:00
cig
e41204899c Cleanup commented code and old lte code 2020-01-16 14:04:36 +01:00
WANG Tsu-Han
92c100bb5a remove uhd_set_thread_priority function 2020-01-16 11:30:27 +01:00
Raymond Knopp
18d717ea26 removal of several warnings. Still lots left. dlsim functional after some recent modifications broke it. New memory leak in dlsch decoding for low mcs high TBS fixed. 2020-01-15 22:58:46 +01:00
cig
17090f22c1 Fixed sdu initialization: this was causing assertion failure at UE side 2020-01-15 15:56:21 +01:00
Francesco Mani
6906d8a33f Merge branch 'NR_RRCConfiguration' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRCConfiguration 2020-01-15 14:20:25 +01:00
Francesco Mani
06fa8e3699 frame number synchronization at UE 2020-01-15 14:19:17 +01:00
Raymond Knopp
7d9a839e61 Merge branch 'nr-dual-connectivity' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr-dual-connectivity 2020-01-14 15:49:47 +01:00
matzakos
3552b8e4d3 Fix conflict on platform_constants 2020-01-14 15:47:24 +01:00
matzakos
4472e6d041 ENDC: Modifications at the gNB slave conf. file used for ENDC 2020-01-14 15:33:40 +01:00
Gabriele Perrone
b104c26212 overwriting config file mnc with the proper mnc (93) 2020-01-14 15:25:21 +01:00
Gabriele Perrone
295dc07cb6 Merge remote-tracking branch 'origin/develop_inria_ci_deployment' into develop_inria_ci_deployment_gp 2020-01-14 15:13:05 +01:00
Cedric Roux
fb9db399ae hotfix: fix value of MAX_MOBILES_PER_ENB
set MAX_MOBILES_PER_ENB to 4, to be same value as NUMBER_OF_UE_MAX.
Maybe we should set NUMBER_OF_UE_MAX to 16 instead?
2020-01-14 15:11:26 +01:00
Raymond Knopp
3a52199351 Merge remote-tracking branch 'origin/NR_RRCConfiguration' into nr-dual-connectivity 2020-01-14 14:57:10 +01:00
Gabriele Perrone
5d1f16c3e9 fix gitignore file 2020-01-14 14:54:53 +01:00
Gabriele Perrone
ec258105f6 Removed the old ssh commands from orignal implementaion location
FIx missing replacement
2020-01-14 14:52:57 +01:00
matzakos
198ac105f1 Merge remote-tracking branch 'origin/NR_RRCConfiguration' into nr-dual-connectivity 2020-01-14 14:36:06 +01:00
matzakos
8f46241522 ENDC: Merge NR_RRCConfiguration into nr-dual-connectivity branch 2020-01-14 12:57:35 +01:00
Florian Kaltenberger
2605e3f18a Merge branch 'NR_RRCConfiguration' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRCConfiguration 2020-01-14 10:13:42 +01:00
Florian Kaltenberger
400dc82191 initializing missing frame parmameter 2020-01-14 10:13:01 +01:00
Francesco Mani
bbfa23e9cc fix for carrier frequency (now according to number of PRBs 2020-01-14 10:07:36 +01:00
Florian Kaltenberger
d25a13fadd fixing a typo 2020-01-14 09:27:09 +01:00
Florian Kaltenberger
d576dd4ac3 Merge branch 'NR_RRCConfiguration' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRCConfiguration 2020-01-13 22:21:29 +01:00
Florian Kaltenberger
db0901f421 initializing mod_id and cc_id 2020-01-13 22:21:01 +01:00
Francesco Mani
ade0db6424 some fixes in config files 2020-01-13 17:44:56 +01:00
Francesco Mani
c5282fb2bb Merge branch 'NR_RRCConfiguration' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRCConfiguration 2020-01-13 15:43:16 +01:00
Francesco Mani
c1d62a3006 some fixes including for ssb periodicity (decoded frame still wrongly taken from proc) 2020-01-13 15:42:12 +01:00
Gabriele Perrone
ba9786dfea review of modified main.py and sshconnection.py 2020-01-13 15:12:33 +01:00
Cedric Roux
e2db89de9c fix config file 2020-01-13 10:46:49 +01:00
Francesco Mani
afd578a094 Merge branch 'NR_RRCConfiguration' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRCConfiguration 2020-01-13 10:31:39 +01:00
Francesco Mani
e640af84ca UE PHY parameters configured from fapi config req (UE is running, to be verified with gNB) 2020-01-13 10:29:56 +01:00
Raymond Knopp
c90c6ffa02 added new configuration file for 40 MHz band 78. Some parameters to be checked. 2020-01-10 17:12:36 +01:00
Gabriele Perrone
8f476a9904 creating a file sshconnection.py with class SSHConnection (methods: open, command, close, copyin, copyout); and modifying main.py to import this file and call the SSHConnection class from the new file 2020-01-10 14:14:08 +01:00
Francesco Mani
2c108cf8f4 Merge branch 'NR_RRCConfiguration' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRCConfiguration 2020-01-10 10:35:53 +01:00
Francesco Mani
1fb763264f removing pbch_config structure 2020-01-10 10:35:47 +01:00
Florian Kaltenberger
911319fac6 completing merge 2020-01-10 09:49:08 +01:00
Florian Kaltenberger
84428359a0 Merge branch 'NR_RRCConfiguration' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRCConfiguration 2020-01-10 09:28:59 +01:00
Francesco Mani
f7778f8f4a Merge branch 'NR_RRCConfiguration' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRCConfiguration 2020-01-10 09:27:39 +01:00
Florian Kaltenberger
6b792001ed preparing l2_init_ue and l3_init_ue to make sure parameters are passed down. To be merged with Francesco's changes and tested. 2020-01-10 09:26:45 +01:00
Raymond Knopp
b8c7dc8eb1 Merge remote-tracking branch 'origin/develop-nr' into NR_RRCConfiguration
Conflicts:
	openair1/PHY/NR_TRANSPORT/nr_dlsch.h
	openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
	openair1/PHY/NR_UE_TRANSPORT/dci_nr.c
	openair1/PHY/NR_UE_TRANSPORT/nr_transport_proto_ue.h
	openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_coding.c
	openair1/SIMULATION/NR_PHY/dlschsim.c
	openair1/SIMULATION/NR_PHY/dlsim.c
	openair2/COMMON/platform_constants.h
	openair2/LAYER2/NR_MAC_UE/mac_defs.h
	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
2020-01-09 20:30:56 +01:00
matzakos
c134529484 ENDC: Code cleanup and logs rearrangements 2020-01-09 18:08:46 +01:00
Raymond Knopp
74eabdb02e logging removal/modification 2020-01-09 16:37:44 +01:00
Francesco Mani
8d26807648 definition of config request fapi structures in UE and acquisition from rrc of config data (work in progress) 2020-01-09 14:58:42 +01:00
Raymond Knopp
7639d9a1c2 Merge branch 'NR_RRCConfiguration' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRCConfiguration 2020-01-08 15:50:50 +01:00
Raymond Knopp
cf4df7266c fix rate-matching receiver and mappings in nr_dlsch_decoding.c and nr_ulsch_decoding.c. Performance with dlschsim and ulschsim seem correct. Code written for all RV_IDX but only rv_idx=0 tested. ulschsim performance seems a bit too good. 2020-01-08 15:48:46 +01:00
Raphael Defosseux
34c9aec59e CI: simplification of the X2 HO scenario. But sill failing!
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-01-08 14:31:54 +01:00
Florian Kaltenberger
886d742325 transmitting dummy samples even in UL slots for use with rfsimulator 2020-01-07 22:17:11 +01:00
Gabriele Perrone
4d57f1bda8 class name changed from SSH to CiTestObj 2020-01-07 14:43:49 +01:00
Raymond Knopp
d401b50fd3 Merge branch 'NR_RRCConfiguration' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRCConfiguration 2020-01-07 13:26:32 +01:00
Raymond Knopp
273c45fdcf RNTI for phy_test in rrc_gNB_reconfig.c. parametrization in dlschsim 2020-01-07 13:25:36 +01:00
Raymond Knopp
c94d7632e0 debugging of nr_dlschsim, rate matching optimization 2020-01-06 23:04:52 +01:00
Francesco Mani
ab3b6c88fa Merge branch 'nr_segmentation_fixes' into NR_RRCConfiguration 2020-01-06 10:59:37 +01:00
Florian Kaltenberger
d27a8f0778 Merge branch 'NR_RRCConfiguration' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRCConfiguration 2020-01-03 22:19:44 +01:00
Florian Kaltenberger
6c30c04eec adding rcc config files to rfsimulator UE for CI 2020-01-03 22:18:37 +01:00
Florian Kaltenberger
f774034039 increasing nb expected files for physim to 13 (for prachsim) 2020-01-03 22:17:53 +01:00
Florian Kaltenberger
5ef27f4c21 adding --rrc_config_path command line option to UE 2020-01-03 21:40:27 +01:00
Francesco Mani
7dbda3a470 a couple of bugfixes in physical simulators 2020-01-03 17:52:18 +01:00
Raymond Knopp
2efa277990 added missing file 2020-01-03 15:10:02 +01:00
Raymond Knopp
603b4f5f10 fill FAPI antenna parameters for unitary simulators 2020-01-03 13:38:49 +01:00
Raymond Knopp
a4d0e5e779 small modification in pucchsim to pass the basic test 2020-01-03 12:53:23 +01:00
Raymond Knopp
7e560fbd95 modifications for nr-uesoftmodem with RRC configuration 2020-01-03 10:36:14 +01:00
Raymond Knopp
303bdc804f testing nr-softmodem with 1 antenna port configuration 2020-01-03 01:37:07 +01:00
Raymond Knopp
c956d0516d added logical antenna port parameter to configuration file (RRC section) 2020-01-03 00:23:29 +01:00
Raymond Knopp
20484b5cd7 NR PDCSH scrambling optimization (factor 10 reduction) 2020-01-02 17:47:30 +01:00
Francesco Mani
ebcbad62d2 Merge branch 'develop-nr' into nr_segmentation_fixes 2020-01-02 11:05:32 +01:00
Raymond Knopp
1a83cc2f3b fixes for full-bandwidth testing in dlsim 2020-01-02 10:10:09 +01:00
Raymond Knopp
0da351e017 added missing file 2020-01-01 21:36:57 +01:00
Raymond Knopp
fae5a3ab9c added default NR Serving Cell Configuration 2020-01-01 21:23:38 +01:00
Raymond Knopp
ad2667fbd5 Testing of NR PDCCH/PDSCH with RRC Configuration. added RRC configuration to NR UE. Updates to UE DCI procedures (moved to MAC) and updates to FAPI interfaces for UE. nr_dlsim is functional, added profiling information for gNB TX. 2020-01-01 21:16:56 +01:00
laurent
c8d28f5254 fix LimeSDR board API, merge develop 2019-12-23 15:38:36 +01:00
Raphael Defosseux
45aa72f2be CI: improvements
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-12-23 13:49:16 +01:00
Raphael Defosseux
e88dc61965 CI: some fixes
Signed-off-by: Raphael Defosseux <rapahel.defosseux@openairinterface.org>
2019-12-23 13:49:16 +01:00
Raphael Defosseux
11f4d2ae01 CI: finalizing offline the X2 handover scenario at inria --> to be tested
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-12-23 13:49:16 +01:00
Raphael Defosseux
3775404a6b CI: add initial support to do X2 HO at Inria
Signed-off-by: Raphael Defosseux <raphael.defosseux@openairinterface.org>
2019-12-23 13:49:16 +01:00
Raphael Defosseux
1813af8beb CI: fix UL iperf in distributed env
Signed-off-by: Raphael Defosseux <raphael.defosseux@openairinterface.org>
2019-12-23 13:49:16 +01:00
Raphael Defosseux
68dc0d00a1 CI: fix in looping attach / ping / detach
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-12-23 13:49:16 +01:00
Raphael Defosseux
45f71211c0 CI: looping on attach/ping/detach sequences
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-12-23 13:49:16 +01:00
Raphael Defosseux
02f16d5530 CI: increasing the repeat count since the 1st try will always fail
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-12-23 13:49:16 +01:00
Raymond Knopp
6bf81627e0 Merge branch 'NR_RRCConfiguration' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRCConfiguration 2019-12-21 06:50:59 +01:00
Raymond Knopp
a712940898 debugging with dlsim 2019-12-21 06:50:20 +01:00
Francesco Mani
6f242bc061 Merge branch 'develop-nr' into NR_RRCConfiguration 2019-12-20 14:31:37 +01:00
Francesco Mani
3a514bd499 bugfix for ghost mixed slot 2019-12-20 10:19:51 +01:00
Raymond Knopp
8911335fc3 Merge remote-tracking branch 'origin/develop-nr' into NR_RRCConfiguration 2019-12-20 02:01:39 +01:00
Raymond Knopp
05f68321ec Merge branch 'NR_RRCConfiguration' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRCConfiguration
Conflicts:
	openair1/SCHED_NR/phy_frame_config_nr.c
2019-12-20 02:01:22 +01:00
Raymond Knopp
98e15dc5fa debugging for nr_dlsim 2019-12-20 02:00:05 +01:00
Francesco Mani
9662363db1 allowing no mixed slot and astyle of phy_frame_config_nr.c 2019-12-19 14:39:28 +01:00
Florian Kaltenberger
9f0be015a9 Merge remote-tracking branch 'origin/develop-nr' into 459-pusch-based-ta-updates 2019-12-19 13:33:41 +01:00
Florian Kaltenberger
db6eeb2773 fixing mac pdu generation. to be checked by fraunhofer 2019-12-19 13:32:53 +01:00
WANG Tsu-Han
b2b5148923 adding txdataF offset for gNB switch buffer 2019-12-19 12:06:35 +01:00
Florian Kaltenberger
b1f224d11e should not use LTE UE list in NR MAC as sizes are different and causes segfaults 2019-12-18 21:51:46 +01:00
Francesco Mani
272140cd5d Merge remote-tracking branch 'origin/ru-parallel-beamforming-fix' into NR_RRCConfiguration 2019-12-18 17:27:42 +01:00
Francesco Mani
971821a5bb minor fixes 2019-12-18 16:21:14 +01:00
Raymond Knopp
d831180c7a Merge branch 'NR_RRCConfiguration' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRCConfiguration 2019-12-17 19:13:01 +01:00
Raymond Knopp
56c6c3ee42 unitary simulators all compile 2019-12-17 19:12:29 +01:00
Francesco Mani
38eddb5dd7 Merge branch 'NR_RRCConfiguration' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRCConfiguration 2019-12-17 11:07:05 +01:00
Francesco Mani
91ff8bc15e bugfix for slot select function 2019-12-17 10:02:50 +01:00
Raymond Knopp
6b8c8a3ba5 small update to pbchsim (ssb_pdu pointer to non-pointer in PHY_VARS_gNB) 2019-12-17 09:30:05 +01:00
Francesco Mani
f88dd725b2 Merge branch 'nr_tdd_configuration' into NR_RRCConfiguration 2019-12-17 09:28:04 +01:00
Francesco Mani
32f4c11b96 adapting to this branch some other config files 2019-12-16 16:34:52 +01:00
Cedric Roux
35fda01e86 nr-rlc: fix some compilation warnings 2019-12-16 16:19:23 +01:00
Cedric Roux
9a4d1e81d7 nr-rlc: add function mac_rlc_get_buffer_occupancy_ind
Fix also value passed to buffer_status in mac_rlc_status_ind
to be aligned with 38.321 (instead of 36.321).
2019-12-16 16:17:35 +01:00
Gabriele Perrone
091be33b62 main.py mods: coloured rows between retries and variable cnt become an object (FailReportCnt) 2019-12-16 15:59:54 +01:00
Rakesh
c53a3f3524 Merge remote-tracking branch 'origin/NR_RRCConfiguration' into nr_tdd_configuration 2019-12-16 15:52:56 +01:00
Rakesh
4510cd5f87 bug fix 2019-12-16 15:51:09 +01:00
Francesco Mani
972b6b8ec7 mib byte reversal ok 2019-12-16 15:30:10 +01:00
Rakesh
5c2decfc0a Merge remote-tracking branch 'origin/NR_RRCConfiguration' into nr_tdd_configuration 2019-12-16 14:02:00 +01:00
Rakesh
40ecb3f72b first test to replicate to transmmit as same as NR_RRCConfiguration branch 2019-12-16 13:07:08 +01:00
Raymond Knopp
c8e37d6ebc memcpy of ssb_pdu to L1 instead of pointer exchange 2019-12-16 12:48:06 +01:00
Rakesh
9c45661215 Merge remote-tracking branch 'origin/NR_RRCConfiguration' into nr_tdd_configuration
resolving merge conflicts
2019-12-16 12:01:36 +01:00
projetstc
ae3a540f40 scope autoscale 2019-12-16 11:37:51 +01:00
Francesco Mani
dfa603c440 segmentation fault and a couple of warnings fixed 2019-12-16 11:06:11 +01:00
Raymond Knopp
52b3fd46b8 Merge branch 'NR_RRCConfiguration' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRCConfiguration 2019-12-15 22:22:52 +01:00
Raymond Knopp
d63b569e61 check if UL_tti_req is non-null in fapi_nr_l1.c 2019-12-15 22:22:01 +01:00
Raymond Knopp
e30ab2d0c6 Merge remote-tracking branch 'origin/develop-nr' into NR_RRCConfiguration
Conflicts:
	cmake_targets/CMakeLists.txt
	executables/nr-ru.c
	executables/nr-softmodem.c
	openair1/PHY/INIT/nr_parms.c
	openair1/PHY/INIT/phy_init.h
	openair1/PHY/NR_TRANSPORT/nr_dlsch.c
	openair1/PHY/NR_UE_ESTIMATION/nr_dl_channel_estimation.c
	openair1/PHY/NR_UE_TRANSPORT/dci_nr.c
	openair1/PHY/NR_UE_TRANSPORT/dci_tools_nr.c
	openair1/SCHED_NR/fapi_nr_l1.c
	openair1/SCHED_NR/nr_ru_procedures.c
	openair1/SCHED_NR/phy_procedures_nr_common.c
	openair1/SCHED_NR/phy_procedures_nr_gNB.c
	openair1/SCHED_NR/sched_nr.h
	openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
	openair1/SIMULATION/NR_PHY/dlsim.c
	openair2/GNB_APP/gnb_config.c
	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
	openair2/LAYER2/NR_MAC_gNB/main.c
	openair2/RRC/NR/MESSAGES/asn1_msg.c
	openair2/RRC/NR/MESSAGES/asn1_msg.h
	openair2/RRC/NR/nr_rrc_defs.h
2019-12-15 22:04:40 +01:00
Rakesh
46431b0701 Merge remote-tracking branch 'origin/NR_RRCConfiguration' into nr_tdd_configuration 2019-12-13 22:28:48 +01:00
Francesco Mani
d1dc15f3c0 SSB correctly demodulated at FSW, CRC passes, but payload is wrong 2019-12-13 18:07:03 +01:00
Raymond Knopp
6637415ba3 Merge branch 'NR_RRCConfiguration' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRCConfiguration 2019-12-13 17:08:12 +01:00
Francesco Mani
ac092841dd some updates on SSB and a couple of fixes on warnings 2019-12-13 17:07:09 +01:00
Raymond Knopp
7580b4b2f5 added simple CCE allocation in MAC scheduler 2019-12-13 07:42:39 +01:00
laurent
f8f344d224 Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into Remove-global 2019-12-12 10:39:10 +01:00
laurent
ed6559ffa9 add CU measurement: whole CPU active time per subframe 2019-12-12 10:37:53 +01:00
Rakesh
b398103be9 Fix for dlulperiodicity 2019-12-11 20:45:44 +01:00
Gabriele Perrone
581e46f1d3 introduced a class object FailRepeatCnt in place of a static counter 2019-12-11 14:28:14 +01:00
Rakesh
088652557d removing unused variable 2019-12-11 14:04:21 +01:00
Rakesh
a4b0c8edd0 Merge remote-tracking branch 'origin/NR_RRCConfiguration' into nr_tdd_configuration
resolving merge conflicts
2019-12-11 13:13:10 +01:00
Rakesh
af471c5c3e reworked as per the new fapi structures 2019-12-11 12:59:38 +01:00
matzakos
b106fb1c21 ENDC LTE-RRC: Add processing of Addition Response information elements, to be used for RRCConnectionReconfiguration 2019-12-10 19:39:47 +01:00
Francesco Mani
decf6ed0e5 pbchsim works again 2019-12-10 14:36:54 +01:00
Gabriele Perrone
28eb2d61bb fixing self.cnt to SSH.cnt mistake 2019-12-09 22:04:22 +01:00
Gabriele Perrone
75642c34c4 add a new main file for test with cnt changed into self.cnt 2019-12-09 15:36:44 +01:00
Gabriele Perrone
a1cb460a01 repeatCounts reading from command line instead than xml file 2019-12-09 14:46:59 +01:00
Gabriele Perrone
9b1846ea76 que beau fichier 2019-12-09 14:20:38 +01:00
matzakos
62fb80e6de ENDC X2AP: Implementation of SgNB Addition Response handler 2019-12-06 19:15:08 +01:00
laurent
8dedd093fb remove a forgotten test trace, re-indentation of modified source files 2019-12-06 18:41:30 +01:00
laurent
47abf562db add FS6 transport time measurement 2019-12-06 16:24:47 +01:00
Raymond Knopp
ad82602e9a ENDC X2AP: Implementation of SgNB Addition Request ACK 2019-12-06 14:16:43 +01:00
Francesco Mani
b61a80baf1 fix on ru procedures for slot select 2019-12-06 12:48:44 +01:00
Thomas Schlichter
7bdff76ff3 Fix autotest tags for nr_dlsim and polartest 2019-12-06 10:46:51 +01:00
Thomas Schlichter
7e738c2c39 Further fix segmentation fault by also initializing the allocated memory 2019-12-06 10:46:51 +01:00
Guido Casati
030fc5a2f5 Bugfix segmentation fault in dlsim for missing memory allocation 2019-12-06 10:46:51 +01:00
Florian Kaltenberger
d34d269d70 reducing the use of rand() which takes too long 2019-12-06 10:46:51 +01:00
cig
361446fda5 Consolidation of TA updates changes in the noS1 mode:
- merged nr-schedule_ue_spec into nr_schedule_uss_dlsch_phytest
- enabled nr_ue_send_sdu for S1 mode
- increased ta_timer to 100
- restored NR_UPLINK_SLOT to 2 (as it was in develop-nr)
- fixed logic for S1 and noS1 modes
- code cleanup and formatting
2019-12-06 10:46:51 +01:00
Guido Casati
98d2caf59f Added compilation option to skip build for already built libraries:
- the new option -k allows to skip the built of shared libraries, rfsimulator
  basicsimulator and transport protocol libraries
- default compilation remains untouched as is still building all libraries
- this option allows to save a massive amount of time when compiling
  repeatedly for debugging purposes
2019-12-06 10:46:51 +01:00
Guido Casati
cfbe18c9ed Adaptation of MAC TA procedures to the design of handle_dlsch
- introduced new parameter in nr_ue_dl_indication for UL time alignment
- moved TA timer logic one level up so that now is executed every slot
- set timer value to 80 slots to cope with the sl_ahead design
- introduced new TA-related members to gNB MAC instance struct
2019-12-06 10:46:51 +01:00
Guido Casati
a0cd44947e Bugfix uninitialised vars and conflicting types in simulators after merge 2019-12-06 10:46:51 +01:00
Guido Casati
0b873bb620 Time Alignment procedure with time adjustment as per TS 38.213 section 4.2
- UE processing capability 1
- Setting the TA update to be applied after the reception of the TA command
- Durations of N1 and N2 symbols corresponding to PDSCH and PUSCH are
  computed according to sections 5.3 and 6.4 of TS 38.214
- Introduced tables 5.3-1, 5.3-2, 6.4-1, 6.4-2 from TS 38.214
2019-12-06 10:46:51 +01:00
Guido Casati
c6855cb8d2 Maintenance of Uplink Time Alignment. Introduced control on TA transmission and TA update application.
- ta_timer at gNB side to control the transmission of TA to the UE. This is now happening every 20 slots.
- when the timer resets gNB is now transmitting the TA whether it is zero or not.
- introduced struct NR_UL_TIME_ALIGNMENT_t to handle configuration of time alignment related parameters.
- UE PHY RX: is now triggered through a flag when to store the TA command, the frame and slot
  when the application should occur.
- UE PHY TX: when the tx frame and slot match the time alignment configuration, it process the TA command and applies the
  TA update
2019-12-06 10:46:51 +01:00
Ahmed Hussein
5ac8b6f34d TA implementation complete and tested in rfsimulator 2019-12-06 10:46:51 +01:00
Guido Casati
0492f7eb7e Fix TBS condition in to schedule ue spec procedures 2019-12-06 10:46:51 +01:00
Guido Casati
825ae3c06d Integration PHY and MAC procedures for Timing Advance updates. Compilation and run is OK. TA updates need further fixes as not working as expected.
- "nr_process_timing_advance": TA to be applied is commented out, need to be uncommented
- with introduced delay of 50 in rx_rf, TA update should be 34 in MAC CE
  but this does not occur when ta is applied at UE side according to standard
- introduced ULSCH scheduler and NR RX SDU functions
- fixes to logic in UL fill RX indication
- added crc indication in UL RX
- temporary hardcoded UE_id to 0, rnti not considered in the logic
2019-12-06 10:46:51 +01:00
Guido Casati
6ec89bec1f Bugfix: header from NR included in LTE UE PHY procedures 2019-12-06 10:46:51 +01:00
Guido Casati
310efee7f2 Implementation of TA procedures at MAC layer for gNB and UE
- Initial gNB DLSCH and UE spec scheduling implentation
- MAC PDU generation (including header as per TS 38.321)
- MAC PDU processing at UE side with extracion of TA updates
- General code cleanup
- Introduced NR MAC COMMON folder, moved common files here
2019-12-06 10:46:51 +01:00
Guido Casati
f0b7debefc Extraction of common NR MAC data structures from NR_MAC_UE/mac.h and definition of MAC CE struct 2019-12-06 10:46:51 +01:00
Francesco Mani
dd789dc7ba make pbchsim compile again 2019-12-05 18:23:53 +01:00
Rakesh
0b3c92207b Merge remote-tracking branch 'origin/NR_RRCConfiguration' into nr_tdd_configuration
resolving merge conflicts
2019-12-05 12:59:54 +01:00
Raymond Knopp
99e41d9730 DL and UL DCI separation in MAC, initial handling of UL DCI in L1. 2019-12-05 01:51:57 +01:00
Raymond Knopp
094d1f5a31 Merge branch 'NR_RRCConfiguration' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRCConfiguration
Conflicts:
	nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface_scf.h
2019-12-04 16:55:16 +01:00
Sakthivel Velumani
5bda11024d Enabling ITTI interactions between RRC and X2AP for the generation of sgb addition request ACK message at the gNB side 2019-12-04 15:30:17 +01:00
Francesco Mani
ab2be445ce ssb offset scs scalling in config.c now 2019-12-04 14:29:12 +01:00
Francesco Mani
598a101860 bugfix (nr-softmodem run again) 2019-12-04 14:06:54 +01:00
Francesco Mani
c6ec207487 adapting config_request to scf nfapi (compiling ok but still not running) 2019-12-04 13:41:13 +01:00
Raymond Knopp
fa7c143b70 nr=softmodem compiles. 2019-12-03 22:32:29 +01:00
Francesco Mani
17c15f5064 bugfix in nr_ru_procedures 2019-12-02 10:10:25 +01:00
Raphael Defosseux
0b8a25ee90 CI: finalizing offline the X2 handover scenario at inria --> to be tested
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-11-29 13:57:42 +01:00
Raphael Defosseux
f7a9226438 CI: add initial support to do X2 HO at Inria
Signed-off-by: Raphael Defosseux <raphael.defosseux@openairinterface.org>
2019-11-29 11:52:01 +01:00
Sakthivel Velumani
2892445095 nr-softmodem compiles (after adding UL DCI) 2019-11-28 18:14:52 +01:00
Sakthivel Velumani
4ff96a45a5 Added UL DCI to gNB MAC 2019-11-28 13:37:30 +01:00
Raymond Knopp
f3a27d762a Merge remote-tracking branch 'origin/develop-nr' into NR_RRCConfiguration
Conflicts:
	cmake_targets/CMakeLists.txt
	executables/nr-gnb.c
	openair1/PHY/defs_gNB.h
	openair1/SCHED_NR/fapi_nr_l1.c
	openair1/SCHED_NR/phy_procedures_nr_common.c
	openair1/SCHED_NR/phy_procedures_nr_gNB.c
	openair1/SIMULATION/NR_PHY/dlsim.c
	openair2/COMMON/platform_constants.h
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
	openair2/LAYER2/NR_MAC_gNB/main.c
	targets/COMMON/openairinterface5g_limits.h
2019-11-28 06:35:31 +01:00
Rakesh
1aea23d35e nr tdd config 2019-11-27 16:31:44 +01:00
Raymond Knopp
ccaf52200c gNB runs with rfsimulator. 2019-11-27 07:54:40 +01:00
Raymond Knopp
d4fe5b504d Added NR FAPI for PDCCH and moved DCI filling to MAC accordingly.
compiles, still needs to be tested gNB alone with rf-simulator / RF bench.
2019-11-26 21:14:46 +01:00
Raymond Knopp
b6246f7717 debugged DCI and PDSCH interfaces based on full RRC configuration
Still need to update PDCCH configuration with NR FAPI specifications
2019-11-21 20:43:00 +01:00
Francesco Mani
053914d502 dynamic allocation also for w vectors at decoding sides 2019-11-20 17:44:43 +01:00
Francesco Mani
94b7762b56 dynamic allocation of e and f vectors 2019-11-20 16:48:48 +01:00
Raymond Knopp
b1573edb7e fixed rnti usage in phytest scheduler 2019-11-20 12:45:49 +01:00
magounak
e8b6932310 initialization of UL_RB in frame parameters 2019-11-20 10:05:36 +01:00
Raymond Knopp
9d5df6c0ac nr-softmodem, nr-uesoftmodem compile 2019-11-20 00:43:09 +01:00
Raymond Knopp
75158a5865 nr_dlsim compiles 2019-11-19 21:44:50 +01:00
Raymond Knopp
bc580bd6be ENDC: Correction at processing Addition request information 2019-11-19 16:45:04 +01:00
Raymond Knopp
96006201b9 ENDC: Minor correction 2019-11-19 15:15:25 +01:00
matzakos
7e1607bcca ENDC X2AP: Small modification at generation of SgNB Addition Request. 2019-11-19 14:22:54 +01:00
Raymond Knopp
50509dfc32 ENDC: Enable transfer and handling of SgNB Addition request elements from X2AP to RRC of gNB. 2019-11-19 14:05:14 +01:00
laurent
08ea618067 fix important bug in CU, merge thread pool improvement and rf simulator improvements made initialy in 5G branch 2019-11-19 13:27:28 +01:00
Francesco Mani
0b066b52e3 bugfix 2019-11-18 17:23:29 +01:00
Francesco Mani
a51fa4f3a7 changing segments and sch bytes allocation in coding/decoding 2019-11-18 17:13:07 +01:00
Raymond Knopp
9133aeddc4 gtkw file 2019-11-12 20:03:21 +01:00
Raphael Defosseux
beda33b8f1 CI: fix UL iperf in distributed env
Signed-off-by: Raphael Defosseux <raphael.defosseux@openairinterface.org>
2019-11-11 20:15:27 +01:00
matzakos
266926307d ENDC X2AP: Implementation of handler function for SgNB addition request message 2019-11-07 17:00:03 +01:00
magounak
5bc28899d3 testing ECPRI receive path (with level adjustment for 12-bit OAI RX dynamic range) 2019-11-06 00:08:34 +01:00
Francesco Mani
0c408e9681 adopting NR values for DLSCH/ULSCH segments 2019-11-05 15:37:06 +01:00
laurent
e8091083b0 restore ue compilation with ocp-softmodem, some RF simulator improvement 2019-11-04 16:11:09 +01:00
Raymond Knopp
930e1fde33 Merge remote-tracking branch 'origin/develop-nr' into NR_RRCConfiguration
Conflicts:
	cmake_targets/CMakeLists.txt
	executables/nr-ru.c
	executables/nr-softmodem.c
	nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h
	openair1/PHY/INIT/nr_init.c
	openair1/PHY/NR_TRANSPORT/nr_dci_tools.c
	openair1/PHY/NR_TRANSPORT/nr_dlsch.c
	openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
	openair1/PHY/NR_TRANSPORT/nr_tbs_tools.c
	openair1/PHY/NR_TRANSPORT/nr_transport_common_proto.h
	openair1/PHY/NR_UE_ESTIMATION/nr_ue_measurements.c
	openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
	openair1/SCHED_NR/nr_ru_procedures.c
	openair1/SCHED_NR/phy_procedures_nr_common.c
	openair1/SCHED_NR/phy_procedures_nr_gNB.c
	openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
	openair1/SIMULATION/NR_PHY/dlsim.c
	openair1/SIMULATION/NR_PHY/pbchsim.c
	openair1/SIMULATION/NR_PHY/ulsim.c
	openair2/COMMON/rrc_messages_types.h
	openair2/GNB_APP/gnb_config.c
	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
	openair2/LAYER2/NR_MAC_gNB/main.c
	openair2/RRC/NR/MESSAGES/asn1_msg.c
	openair2/RRC/NR/MESSAGES/asn1_msg.h
2019-11-02 01:12:15 +01:00
laurent
3ce5d40064 add comments in data structures, gcc warnings fixed 2019-10-31 20:49:42 +01:00
laurent
aa10676e90 parallel UL, split mode 2019-10-31 17:48:31 +01:00
laurent
13122a272e ul in parallel monolithic case, ul in parallel memory leak fix 2019-10-31 17:28:21 +01:00
laurent
f0759d6e61 dl in threadpool ok 2019-10-30 11:10:41 +01:00
laurent
63c023029a du in 2 threads, and fix UL in FS6 split 2019-10-26 11:28:46 +02:00
matzakos
587f9f63d0 ENDC X2AP: Corrections on the generation of x2_sGNB_AdditionRequest message 2019-10-25 19:20:34 +02:00
matzakos
4e64a34ada ENDC: Basic implementation of x2ap_eNB_generate_ENDC_x2_SgNB_addition_request() 2019-10-25 14:13:49 +02:00
matzakos
cc8be29a8d ENDC: Restore X2AP initial configuration after merge with NR_RRCConfiguration branch 2019-10-21 17:29:21 +02:00
laurent
283fed9c4c du RX/Tx in parallel, controled by the thread pool 2019-10-21 14:59:16 +02:00
Laurent
4c646e8d57 try parallel du 2019-10-18 18:04:00 +02:00
matzakos
5cfcc415fc Merge remote-tracking branch 'origin/NR_RRCConfiguration' into nr-dual-connectivity 2019-10-18 17:01:00 +02:00
Raphael Defosseux
b760012adf CI: fix in looping attach / ping / detach
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-10-18 16:48:40 +02:00
Laurent
90b9cbb81d remove global for frame/subframe, noS1 attach+ traffic ok, UE do not compile 2019-10-18 16:35:33 +02:00
Raymond Knopp
868b673915 removed NUMBER_NR_UE_MAX 2019-10-18 09:00:39 +02:00
Raphael Defosseux
6b52ac7d58 CI: looping on attach/ping/detach sequences
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-10-17 16:51:15 +02:00
Laurent
ae25c88372 flush traces 2019-10-17 16:38:08 +02:00
Laurent
03dda0d890 flush traces 2019-10-17 16:30:45 +02:00
Laurent
280e12ba4f flush traces 2019-10-17 16:03:39 +02:00
Laurent
24de1caad6 flush traces 2019-10-17 16:01:30 +02:00
Laurent
63f04fe72c flush traces 2019-10-17 15:52:41 +02:00
Laurent
282a60fd56 reset measurements after print 2019-10-17 15:29:20 +02:00
Laurent
80b89510b7 add cu and full loop measurements 2019-10-17 15:15:19 +02:00
Laurent
61041b4275 add du measurements 2019-10-17 15:04:20 +02:00
Laurent
2e08907513 Move split 6 to do rate matching (puncturing) in CU 2019-10-17 11:14:23 +02:00
Raymond Knopp
71c0224eff configuration of search spaces fixed. 2019-10-16 23:43:32 +02:00
Raphael Defosseux
93f6e2446b CI: increasing the repeat count since the 1st try will always fail
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-10-16 18:01:40 +02:00
magounak
2b59cdf537 modifactions after testing with R+S FSQ 2019-10-15 15:25:37 +02:00
Rakesh
666db5675d build fail fixes for nrUE 2019-10-14 21:02:22 +02:00
Rakesh
ebb86d437d Merge branch 'nr_fapi_for_push' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr_fapi_for_push 2019-10-14 19:26:24 +02:00
Rakesh
da524268c2 Adding VCD traces in gNB 2019-10-14 19:25:35 +02:00
Raymond Knopp
cb399c8858 added coreset and search configuration MAC from CellGroupConfig. 2019-10-14 01:44:02 +02:00
Raymond Knopp
0b4da47131 Merge branch 'NR_RRCConfiguration' of https://gitlab.eurecom.fr/oai/openairinterface4g into NR_RRCConfiguration 2019-10-13 21:34:06 +02:00
Raymond Knopp
b0e97865d5 commit before merge 2019-10-13 21:33:56 +02:00
Raymond Knopp
b273d8ce79 testing on caracal 2019-10-13 21:33:08 +02:00
Raymond Knopp
3433d1b329 Merge branch 'NR_RRCConfiguration' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRCConfiguration 2019-10-13 11:30:34 +02:00
Raymond Knopp
af9fca14f7 added prototypes to new functions in mac_proto.h 2019-10-13 11:30:01 +02:00
Raymond Knopp
57bc468d41 Merge branch 'NR_RRCConfiguration' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRCConfiguration 2019-10-13 11:01:37 +02:00
Raymond Knopp
2b93fddf62 modification in uecap.raw 2019-10-13 11:00:49 +02:00
Raymond Knopp
44d4a705cf Merge branch 'NR_RRCConfiguration' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRCConfiguration 2019-10-13 10:22:34 +02:00
Raymond Knopp
ff508f1d96 added MAC configuration for secondaryCellGroup and addition of UE context in MAC 2019-10-13 10:13:03 +02:00
laurent
708076f6ad documentation, bug in UDP timeout, merge develop 2019-10-11 16:43:50 +02:00
Raymond Knopp
d554707919 Merge remote-tracking branch 'origin/develop-nr' into NR_RRCConfiguration
Conflicts:
	cmake_targets/CMakeLists.txt
	executables/nr-gnb.c
	nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h
	openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_mPass.h
	openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_types.h
	openair1/PHY/INIT/nr_init_ue.c
	openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
	openair1/PHY/NR_UE_TRANSPORT/nr_prach.c
	openair2/COMMON/rrc_messages_types.h
	openair2/GNB_APP/gnb_config.c
	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
	openair2/LAYER2/NR_MAC_gNB/config.c
	openair2/NR_PHY_INTERFACE/NR_IF_Module.c
	openair2/RRC/NR/MESSAGES/asn1_msg.c
	openair2/RRC/NR/nr_rrc_defs.h
	openair2/RRC/NR/rrc_gNB.c
2019-10-10 12:29:20 +02:00
matzakos
7916e17666 ENDC: Add X2AP initial configuration and X2AP task in nr-softmodem. Small issue with parsing NRCCPARAMS_DESC from RCconfig_NR_X2() needs to be resolved 2019-10-08 18:48:39 +02:00
Raymond Knopp
e7233f8a6d eCPRI fronthaul "flushing" prior to streaming. TX path still not included 2019-10-08 15:02:55 +02:00
laurent
2fc6384642 first version with UL and DL traffic good throughput 2019-10-07 17:56:46 +02:00
laurent
18fb589b71 fixes: improves throughput 2019-10-07 13:21:01 +02:00
matzakos
2e8b93ef8b ENDC: Reverse the role of eNB and gNB for the ENDC X2 setup procedure. Currently, gNB: slave sending the setup request, eNB:master. 2019-10-03 18:11:58 +02:00
Cedric Roux
0017316554 Merge remote-tracking branch 'origin/develop-nr' into nr-dual-connectivity
Conflicts:
	openair2/RRC/LTE/MESSAGES/asn1_msg.c
2019-10-03 15:18:44 +02:00
Cedric Roux
dd760540ea hacks for NR
- send RRC Connection Reconfiguration with dummy ENDC data by doing:
  telnet localhost 9001
  and press enter when the ENDC UE is connected to the eNB to send it
2019-10-03 15:14:26 +02:00
laurent
3321a35101 add DL packet compression 2019-10-02 16:22:47 +02:00
laurent
2aafa61712 fix multi blocks transport issue in fs6, and simulators related ul issue for rfsim 2019-09-29 18:00:07 +02:00
Raymond Knopp
db8822a8d8 UE-Capability parsing for NR components. Emulate CG-ConfigInfo generation for phy-test mode. This version is ready for X2 EN-DC integration 2019-09-26 22:17:48 +02:00
laurent
733d1292c6 small fixes 2019-09-25 08:28:02 +02:00
Raymond Knopp
3aec31fddc allocation of null pointers 2019-09-23 16:51:12 +02:00
Raymond Knopp
becbb0a45f added UE reading of configuration files (RRCReconfiguration,RadioBearerConfig) for static NSA without LTE 2019-09-23 15:26:32 +02:00
Raymond Knopp
4b5ad6a9c4 ASN.1 encoding of EN-DC RRC messages functional (run with --phy-test) 2019-09-22 22:28:01 +02:00
Raymond Knopp
287c4c07c6 memory leaks and corrections in ASN.1 encoding of secondaryCellGroupConfig 2019-09-22 18:32:26 +02:00
Raymond Knopp
5d0e54c86b more memory leaks, debugging of ASN.1 encoding of servingCellGroupConfig 2019-09-21 09:01:06 +02:00
Cedric Roux
ff379fe08c get NR UE capabilities (hardcoded bands) 2019-09-20 17:29:54 +02:00
Raymond Knopp
79bd161d41 missing file 2019-09-20 13:43:18 +02:00
Raymond Knopp
25f49631ff more memory leaks 2019-09-20 13:40:46 +02:00
Raymond Knopp
ae726696e4 fixing some memory leaks 2019-09-20 09:25:54 +02:00
Raymond Knopp
686d68a826 initial RRC for NSA 2019-09-20 08:49:04 +02:00
Cedric Roux
6f12c99131 minor: change output directory's name for NR RRC
it was 'NR_Rel15' and now it is 'RRC_NR_Rel15'
2019-09-19 15:44:59 +02:00
Raymond Knopp
0399c14b18 modifications for timestamp interpreation (IF5) 2019-09-17 00:43:10 +02:00
laurent
0e9c068aad merge develop, add example config file 2019-09-16 12:40:54 +02:00
Raymond Knopp
ba24109dae added UDP configuration in ORI data structures 2019-09-14 22:39:24 +02:00
Raymond Knopp
0e419d23d2 modifications for IF5, testing with 3rd party RRU 2019-09-14 11:39:30 +02:00
Raymond Knopp
8722655fdf fixed error in void recv_IF5() 2019-09-13 17:57:55 +02:00
Raymond Knopp
7a60be4dfe modifications for eCPRI framing in IF5 UDP only 2019-09-11 16:47:39 +02:00
Raymond Knopp
b2bdf7eb9a temporary commit 2019-09-11 10:57:31 +02:00
Raymond Knopp
8e86edc352 cleanup callback added to thirdparty fronthaul interface 2019-09-07 10:42:57 +02:00
Raymond Knopp
d4da46a249 added third-party driver support for IF5 interface. 2019-09-05 22:32:32 +02:00
Raymond Knopp
adf76a5f51 Merge remote-tracking branch 'origin/develop-nr' into nr_prach
Conflicts:
	cmake_targets/CMakeLists.txt
	cmake_targets/build_oai
	executables/nr-ru.c
	executables/nr-softmodem.c
	nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h
	openair1/PHY/INIT/nr_init.c
	openair1/PHY/NR_UE_ESTIMATION/nr_ue_measurements.c
	openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
	openair1/PHY/NR_UE_TRANSPORT/nr_transport_proto_ue.h
	openair1/PHY/TOOLS/Makefile
	openair1/PHY/TOOLS/lte_dfts.c
	openair1/PHY/TOOLS/nr_phy_scope.c
	openair1/SCHED_NR/phy_procedures_nr_common.c
	openair1/SCHED_NR/phy_procedures_nr_gNB.c
	openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
	openair1/SIMULATION/NR_PHY/dlschsim.c
	openair1/SIMULATION/NR_PHY/dlsim.c
	openair1/SIMULATION/NR_PHY/pbchsim.c
	openair1/SIMULATION/NR_PHY/pucchsim.c
	openair1/SIMULATION/NR_PHY/ulschsim.c
	openair1/SIMULATION/NR_PHY/ulsim.c
	openair2/COMMON/rrc_messages_types.h
	openair2/GNB_APP/RRC_nr_paramsvalues.h
	openair2/GNB_APP/gnb_config.c
	openair2/GNB_APP/gnb_paramdef.h
	openair2/LAYER2/NR_MAC_gNB/config.c
	openair2/LAYER2/NR_MAC_gNB/mac_proto.h
	openair2/NR_PHY_INTERFACE/NR_IF_Module.c
	openair2/RRC/NR/MESSAGES/asn1_msg.c
	openair2/RRC/NR/MESSAGES/asn1_msg.h
2019-09-05 05:01:26 +02:00
laurent
839a7997d1 UE attach complete, added traces ulsch coding, remove temporary renaming 2019-08-29 19:22:46 +02:00
laurent
f112de54b1 fix -O3 issue; add FS6_REMOTE_IP to set distant CU or DU 2019-08-28 09:35:27 +02:00
laurent
f1b677f849 Remove useless differences with regular OAI, enhance the build to be compatible with regular binaries 2019-08-27 18:47:12 +02:00
Raymond Knopp
c4b2eeb2d4 intermediate commit before merge 2019-08-27 09:43:47 +02:00
laurent
43c07e401d fix SR report from UE->DU->CU, remain later failure in PUSCH allocation 2019-08-26 21:14:25 +02:00
laurent
1fe5ed6f3a changed terminology from/to split 2019-08-25 20:45:13 +02:00
laurent
55660e87ca RACH working, fails later during MME authentication 2019-08-25 20:32:57 +02:00
laurent
cb41822b42 ulsch turbo decode success, fails after now 2019-08-24 18:59:45 +02:00
laurent
d28419cfca usage of setAllfromTS in also monolitic version, RACH detected to the cu, several bugs fixed, still no attach complete 2019-08-24 16:28:55 +02:00
laurent
b907922014 SIB ok for UE, UE send RACH 2019-08-13 21:03:45 +02:00
laurent
9fb9ac5387 UE primary sync ok, DU upper layers disabled, UE DCI decoding nok (partial) 2019-08-12 21:32:46 +02:00
laurent
32e19dbbb7 removed all frame/subframe copies distributed update, replace by a single function 2019-08-09 08:10:36 +02:00
Raymond Knopp
6fed116b33 adding nr_common.c 2019-08-06 08:48:01 +02:00
laurent
88d5739040 continue timestamp 2019-08-05 21:19:27 +02:00
ferrieux
ebb52e388b test mail, qui marche \! 2019-08-03 15:50:50 +02:00
laurent
43c2e779b1 Merge branch 'fs6' of http://open-cells.com/git/laurent/openair-systemx into fs6 2019-08-03 11:51:48 +02:00
laurent
0d58255905 test 2019-08-03 11:51:11 +02:00
ferrieux
9b8e103329 test mail 2019-08-02 21:49:09 +02:00
laurent
02c8b38b18 adding timestamp management 2019-08-02 11:08:09 +02:00
laurent
5a7cbde584 test mail 2019-08-01 12:23:38 +02:00
laurent
cd920b09eb test mail 2019-08-01 10:18:16 +00:00
laurent
75665ad0fc Create DL sub header 2019-08-01 10:45:25 +02:00
Raymond Knopp
56d7f6fcaf Merge remote-tracking branch 'origin/develop-nr' into nr_prach
Conflicts:
	cmake_targets/CMakeLists.txt
	cmake_targets/build_oai
	executables/nr-ue.c
	openair1/PHY/INIT/nr_init.c
	openair1/PHY/NR_TRANSPORT/nr_dlsch.c
	openair1/PHY/NR_TRANSPORT/nr_dlsch.h
	openair1/PHY/NR_TRANSPORT/nr_transport_common_proto.h
	openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
	openair1/PHY/defs_gNB.h
	openair1/SCHED_NR/phy_procedures_nr_gNB.c
	openair1/SCHED_NR_UE/defs.h
	openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
	openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
	openair1/SIMULATION/NR_PHY/dlsim.c
	openair1/SIMULATION/NR_PHY/pucchsim.c
	openair1/SIMULATION/NR_PHY/ulschsim.c
	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
2019-07-29 15:48:26 +02:00
laurent
2af75f48f2 merge develop 2019-07-29 09:12:24 +02:00
laurent
e67081e749 Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into fs6 2019-07-29 08:58:54 +02:00
laurent
9e4f59f8e5 add SystemX documentation 2019-07-29 08:58:40 +02:00
Raymond Knopp
2850def8b7 compilation of all targets ok. 2019-07-28 08:02:49 +02:00
laurent
a9122624a1 progress fs6 uplink 2019-07-26 11:24:51 +02:00
laurent
94831547c7 add prach 2019-07-23 18:24:27 +02:00
laurent
c48609f9af merge develop (split pdsch/dlsch) 2019-07-18 15:10:20 +02:00
laurent
926cf580d4 Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into fs6 2019-07-18 12:24:55 +02:00
laurent
8f3a5d455c continue coding DL 2019-07-16 20:50:31 +02:00
Raymond Knopp
408422ef7b Merge branch 'nr_prach' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr_prach 2019-07-16 06:28:20 +02:00
Raymond Knopp
90e6a90e53 commit prior to merge 2019-07-16 06:28:10 +02:00
laurent
b8005ed09a more code 2019-07-15 20:09:56 +02:00
laurent
740a68bf6f Merge branch 'fs6' of http://open-cells.com/git/laurent/openair-systemx into fs6 2019-07-15 10:51:08 +02:00
laurent
a4300281ba Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into fs6 2019-07-15 10:42:39 +02:00
ferrieux
50aa4dcc58 test commit - just whitespace 2019-07-13 22:06:34 +02:00
laurent
6b662a3ed9 compiles 2019-07-12 17:25:52 +02:00
laurent
24e01ea29d merge develop 2019-07-08 11:48:15 +02:00
laurent
db85b23122 continue ocp-main.c 2019-07-05 16:27:28 +02:00
laurent
92442cece2 progress in main cleanup coding 2019-07-01 16:43:47 +02:00
laurent
217491cbbf progress in main cleanup coding 2019-07-01 15:46:38 +02:00
Francesco Mani
d342e2d12b fix for ssb periodicity 2019-06-28 10:12:00 +02:00
Francesco Mani
62dd59d868 attempt to solve a couple of segmentation faults 2019-06-25 17:28:09 +02:00
laurent
8493071bde merge develop 2019-06-25 13:45:11 +02:00
laurent
0ba0422df7 add simple main 2019-06-24 22:04:14 +02:00
Florian Kaltenberger
bcfa6f2cd4 Merge branch 'nr_ue_prach_procedures' into 'nr_prach'
added PRACH UE Procedures into prachsim

See merge request oai/openairinterface5g!616
2019-06-21 11:11:42 +02:00
Srushti
dcf25f35c7 added PRACH UE Procedures into prachsim 2019-06-21 11:11:42 +02:00
laurent
9371c56934 merge branch origin/channel-simulation-in-rfsimulator 2019-06-18 09:00:05 +02:00
laurent
17d5bcd396 dev continue 2019-06-18 08:57:08 +02:00
Raymond Knopp
5eb919e9fe added handling of time resources for CSS scheduling. 2019-06-14 00:02:59 +02:00
laurent
7653b79f31 Merge remote-tracking branch 'origin/develop' into ocpgit/fs6 2019-06-13 10:51:39 +02:00
Raymond Knopp
07ac703fec removal of mobipass 2019-06-05 08:31:44 +02:00
Raymond Knopp
012c2dc82b fixed residual error in dlschsim.c after change of RAN_context_t structure changed. 2019-06-04 18:46:37 +02:00
Raymond Knopp
0cfb6c232d Merge remote-tracking branch 'origin/develop-nr' into nr_prach 2019-06-04 06:19:19 +02:00
Raymond Knopp
cdb38930ac compilation of unitary FFT tests 2019-06-04 06:11:12 +02:00
Raymond Knopp
83bdc96928 nr-softmodem compilation ok 2019-06-03 15:45:00 +02:00
Raymond Knopp
ace24c8919 unitary simulation compilation and simple testing 2019-06-03 15:31:01 +02:00
Raymond Knopp
34a7bdd3bb finishing merge with develop-nr 2019-06-03 15:05:21 +02:00
Raymond Knopp
97cd210514 Merge remote-tracking branch 'origin/develop-nr' into nr_prach
Conflicts:
	cmake_targets/build_oai
	executables/nr-gnb.c
	openair1/PHY/INIT/nr_init.c
	openair1/PHY/defs_gNB.h
	openair1/SCHED_NR/fapi_nr_l1.c
	openair2/LAYER2/NR_MAC_gNB/config.c
	openair2/LAYER2/NR_MAC_gNB/mac_proto.h
	openair2/RRC/NR/rrc_gNB.c
2019-06-03 14:31:32 +02:00
Raymond Knopp
1f228ee4d1 - reworked configuration file and configuration for gNB (write directly to ASN1 structure from config module instead of passing intermediate structures)
- added prach procedures for gNB with configuration of PRACH L1/L2 parameters
2019-06-02 23:40:57 +02:00
laurent
4bf5f598fb begining functional split 6 2019-06-02 16:59:32 +02:00
Raymond Knopp
a8d8b590c7 added missing files for nr_prach with respect to previous commit. Added nr_prachsim to build_oai. 2019-05-28 13:16:56 +02:00
Raymond Knopp
48c24e5f4d testing successful with 122.88 Ms/s, format A2, NCS 13 2019-05-26 23:05:12 +02:00
Raymond Knopp
ef27c8ce04 initial prach implementation. Splitting of components for RU (FFTs) and L1 (detection). Update of UE to include all formats (for 30 kHz SCS case on initial BWP) 2019-05-26 09:55:54 +02:00
Raymond Knopp
a66c297a84 Merge branch 'develop-nr' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-nr 2019-05-18 12:28:46 +02:00
Raymond Knopp
f71c2e0830 initial commit of gNB prach processing 2019-05-14 11:42:17 +02:00
1699 changed files with 289537 additions and 94280 deletions

8
.dockerignore Normal file
View File

@@ -0,0 +1,8 @@
*.log
cmake_targets/log/
cmake_targets/ran_build/
common/utils/T/T_IDs.h
common/utils/T/T_messages.txt.h
common/utils/T/genids
common/utils/T/genids.o
targets/bin/

6
.gitignore vendored
View File

@@ -12,3 +12,9 @@ targets/bin/
# vscode
.vscode
# Tags for vim/global
GPATH
GRTAGS
GTAGS
tags

2
.vscode/launch.json vendored
View File

@@ -25,4 +25,4 @@
]
}
]
}
}

96
CHANGELOG.md Executable file
View File

@@ -0,0 +1,96 @@
# RELEASE NOTES: #
## [v1.2.1](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tags/v1.2.1) -> February 2020. ##
* Bug fix for mutex lock for wake-up signal
## [v1.2.0](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tags/v1.2.0) -> January 2020. ##
This version adds the following implemented features:
* LTE-M : eNB support for Mode A repetitions
- PUSCH CE - 8 Repetitions
* Improved CDRX implementation for monolithic eNB
* Experimental eMBMS support (now also on eNB side)
* Experimental MCE - Multicast Coordination Entity
* Bug fixes
This version also has an improved code quality:
* Better Test Coverage in Continuous Integration:
- Initial framework to do long-run testing at R2LAB
## [v1.1.1](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tags/v1.1.1) -> November 2019. ##
- Bug fix in the TDD Fair Round-Robin scheduler
## [v1.1.0](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tags/v1.1.0) -> July 2019. ##
This version adds the following implemented features:
* Experimental support of LTE-M
- Single LTE-M UE attachment, legacy-LTE UE attachment is disabled
* X2 interface and handover (also X2-U interface)
- In FDD and TDD
* CU/DU split (F1 interface)
- Tested only in FDD
* CDRX
- Tested only in FDD
* Experimental eMBMS support (only on UE side)
* Experimental multi-RRU support
- Tested only in TDD
This version has an improved code quality:
* Simplification of the Build System
- A single build includes all full-stack simulators, S1/noS1 modes and one HW platform (such as USRP, BladeRF, ...)
* TUN interface is now used as default for the data plane
- for UE, eNB-noS1 and UE-noS1
* Code Cleanup
* Better Static Code Analysis:
- Limited number of errors in cppcheck
- Important Decrease on high Impact errors in CoverityScan
* Better Test Coverage in Continuous Integration:
- TM2, CDRX, IF4.5, F1
- OAI UE is tested in S1 and noS1 modes with USRP board
- Multi-RRU TDD mode
- X2 Handover in FDD mode
## [v1.0.3](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tags/v1.0.3) -> June 2019. ##
- Bug fix for LimeSuite v19.04.0 API
## [v1.0.2](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tags/v1.0.2) -> February 2019. ##
- Full OAI support for 3.13.1 UHD
## [v1.0.1](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tags/v1.0.1) -> February 2019. ##
- Bug fix for the UE L1 simulator.
## [v1.0.0](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tags/v1.0.0) -> January 2019. ##
This version first implements the architectural split described in the following picture.
![Block Diagram](./doc/images/oai_lte_enb_func_split_arch.png)
* Only FAPI, nFAPI and IF4.5 interfaces are implemented.
* Repository tree structure prepares future integrations of features such as LTE-M, nbIOT or 5G-NR.
* Preliminary X2 support has been implemented.
* S1-flex has been introduced.
* New tools: config library, telnet server, ...
* A lot of bugfixes and a proper automated Continuous Integration process validates contributions.
Old Releases:
* v0.6.1 -> Mostly bugfixes. This is the last version without NFAPI.
* v0.6 -> RRH functionality, UE greatly improved, better TDD support, a lot of bugs fixed.
- WARNING: oaisim in PHY abstraction mode does not work, you need to use v0.5.2 for that.
* v0.5.2 -> Last version with old code for oaisim (abstraction mode works)
* v0.5.1 -> Merge of bugfix-137-uplink-fixes. It includes stablity fixes for eNB
* v0.5 -> Merge of enhancement-10-harmony-lts. It includes fixes for Ubuntu 16.04 support
* v0.4 -> Merge of feature-131-new-license. It closes issue#131 and changes the license to OAI Public License V1.0
* v0.3 -> Last stable commit on develop branch before the merge of feature-131-new-license. This is the last commit with GPL License
* v0.2 -> Merge of enhancement-10-harmony to include NGFI RRH + New Interface for RF/BBU
* v0.1 -> Last stable commit on develop branch before enhancement-10-harmony

22
CONTRIBUTING.md Normal file
View File

@@ -0,0 +1,22 @@
# Contributing to OpenAirInterface #
We want to make contributing to this project as easy and transparent as possible.
1. Sign and return a Contributor License Agreement to OAI team.
2. We recommend that you provide us with a professional or student email address
2. Register on [Eurecom GitLab Server](https://gitlab.eurecom.fr/users/sign_in)
3. Provide the OAI team with the **username** of this account to (mailto:contact@openairinterface.org) ; we will give you the developer rights on this repository.
4. The policies are described in these wiki pages: [OAI Policies](https://gitlab.eurecom.fr/oai/openairinterface5g/wikis/oai-policies-home)
- PLEASE DO NOT FORK the OAI repository on your own Eurecom GitLab account. It just eats up space on our servers.
- You can fork onto another hosting system. But we will NOT accept a merge request from a forked repository.
* This decision was made for the license reasons.
* The Continuous Integration will reject your merge request.
- All merge requests SHALL have `develop` branch as target branch.
## Coding Styles ##
There are described [here](https://gitlab.eurecom.fr/oai/openairinterface5g/wikis/guidelines/guidelines-home)
## License ##
By contributing to OpenAirInterface, you agree that your contributions will be licensed under the LICENSE file in the root directory of this source tree.

0
LICENSE Normal file → Executable file
View File

27
NOTICE.md Normal file
View File

@@ -0,0 +1,27 @@
The source code of openairinterface5g is distributed under **OAI Public License V1.1**.
For more details of the license, refer to [LICENSE](LICENSE) file in the same directory.
However, the source code also contains third party software that is acknowledged here for reference.
## Credits for LFDS user space source code located in folder openair2/UTILS/LFDS/ ##
See on [liblfds website](https://liblfds.org/) the license section.
<pre>
"There is no license. You are free to use this software in any way, for any purpose. Go forth and create wealth!
If however for legal reasons a licence is required, the license of your choice will be granted."
</pre>
## Credits for source code common/utils/collection/queue.h: ##
The Regents of the University of California: BSD 3-Clause Licence.
## Credits for source code common/utils/collection/tree.h: ##
Niels Provos <provos@citi.umich.edu>: BSD 2-Clause Licence.
## Credits for source code openair3/GTPV1-U/nw-gtpv1u: ##
Amit Chawre <http://www.amitchawre.net/contact.html>: BSD 2-Clause Licence.

View File

@@ -1,21 +0,0 @@
The source code of openairinterface5g is distributed under OAI Public License V1.0.
For more details of the license, refer to LICENSE file in the same directory.
However, the source code also contains third party software that is acknowledged here for reference.
Credits for LFDS user space source code located in folder openair2/UTILS/LFDS/liblfds6.1.1/
http://liblfds.org/.
Extract from http://liblfds.org/pages/downloads_and_license.html:
"There is no license. You are free to use this software in any way, for any purpose. Go forth and create wealth!
If however for legal reasons a licence is required, the license of your choice will be granted."
Credits for source code common/utils/collection/queue.h:
The Regents of the University of California: BSD 3-Clause Licence.
Credits for source code common/utils/collection/tree.h:
Niels Provos <provos@citi.umich.edu>: BSD 2-Clause Licence.

73
README.md Normal file
View File

@@ -0,0 +1,73 @@
# OpenAirInterface License #
OpenAirInterface is under OpenAirInterface Software Alliance license.
* [OAI License Model](http://www.openairinterface.org/?page_id=101)
* [OAI License v1.1 on our website](http://www.openairinterface.org/?page_id=698)
It is distributed under **OAI Public License V1.1**.
The license information is distributed under [LICENSE](LICENSE) file in the same directory.
Please see [NOTICE](NOTICE.md) file for third party software that is included in the sources.
# Where to Start #
* [The implemented features](./doc/FEATURE_SET.md)
* [How to build](./doc/BUILD.md)
* [How to run the modems](./doc/RUNMODEM.md)
# RAN repository structure #
The OpenAirInterface (OAI) software is composed of the following parts:
<pre>
openairinterface5g
├── ci-scripts : Meta-scripts used by the OSA CI process. Contains also configuration files used day-to-day by CI.
├── cmake_targets : Build utilities to compile (simulation, emulation and real-time platforms), and generated build files.
├── common : Some common OAI utilities, other tools can be found at openair2/UTILS.
├── doc : Contains an up-to-date feature set list and starting tutorials.
├── executables : Top-level executable source files.
├── LICENSE : License file.
├── maketags : Script to generate emacs tags.
├── nfapi : Contains the NFAPI code. A local Readme file provides more details.
├── openair1 : 3GPP LTE Rel-10/12 PHY layer / 3GPP NR Rel-15 layer. A local Readme file provides more details.
│   ├── PHY
│   ├── SCHED
│   ├── SCHED_NBIOT
│   ├── SCHED_NR
│   ├── SCHED_NR_UE
│   ├── SCHED_UE
│   └── SIMULATION : PHY RF simulation.
├── openair2 : 3GPP LTE Rel-10 RLC/MAC/PDCP/RRC/X2AP + LTE Rel-14 M2AP implementation. Also 3GPP NR Rel-15 RLC/MAC/PDCP/RRC/X2AP.
│   ├── COMMON
│   ├── DOCS
│   ├── ENB_APP
│   ├── F1AP
│   ├── GNB_APP
│   ├── LAYER2/RLC/ : with the following subdirectories: UM_v9.3.0, TM_v9.3.0, and AM_v9.3.0.
│   ├── LAYER2/PDCP/PDCP_v10.1.0
│   ├── M2AP
│   ├── MCE_APP
│   ├── NETWORK_DRIVER
│   ├── NR_PHY_INTERFACE
│   ├── NR_UE_PHY_INTERFACE
│   ├── PHY_INTERFACE
│   ├── RRC
│   ├── UTIL
│   └── X2AP
├── openair3 : 3GPP LTE Rel10 for S1AP, NAS GTPV1-U for both ENB and UE.
│   ├── COMMON
│   ├── DOCS
│   ├── GTPV1-U
│   ├── M3AP
│   ├── MME_APP
│   ├── NAS
│   ├── S1AP
│   ├── SCTP
│   ├── SECU
│   ├── TEST
│   ├── UDP
│   └── UTILS
└── targets : Top-level wrappers for unitary simulation for PHY channels, system-level emulation (eNB-UE with and without S1), and realtime eNB and UE and RRH GW.
</pre>

View File

@@ -1,96 +0,0 @@
OpenAirInterface is under OpenAirInterface Software Alliance license.
├── http://www.openairinterface.org/?page_id=101
├── http://www.openairinterface.org/?page_id=698
It is distributed under OAI Public License V1.1.
The license information is distributed under LICENSE file in the same directory.
Please see NOTICE.txt for third party software that is included in the sources.
The OpenAirInterface (OAI) software is composed of the following parts:
openairinterface5g
├── ci-scripts: Meta-scripts used by the OSA CI process. Contains also configuration files used day-to-day by CI.
├── cmake_targets: Build utilities to compile (simulation, emulation and real-time platforms), and generated build files
├── common : Some common OAI utilities, other tools can be found at openair2/UTILS
├── doc : Contains an up-to-date feature set list
├── LICENSE
├── maketags : Script to generate emacs tags
├── nfapi : Contains the NFAPI code. A local Readme file provides more details.
├── openair1 : 3GPP LTE Rel-10/12 PHY layer + PHY RF simulation. A local Readme file provides more details.
├── openair2 : 3GPP LTE Rel-10 RLC/MAC/PDCP/RRC/X2AP implementation.
├── COMMON
├── DOCS
├── ENB_APP
├── LAYER2/RLC/ with the following subdirectories: UM_v9.3.0, TM_v9.3.0, and AM_v9.3.0.
├── LAYER2/PDCP/PDCP_v10.1.0.
├── NETWORK_DRIVER
├── PHY_INTERFACE
├── RRC/LITE
├── UTIL
├── X2AP
├── openair3: 3GPP LTE Rel10 for S1AP, NAS GTPV1-U for both ENB and UE.
├── COMMON
├── DOCS
├── GTPV1-U
├── NAS
├── S1AP
├── SCTP
├── SECU
├── UDP
├── UTILS
└── targets: Top-level wrappers for unitary simulation for PHY channels, system-level emulation (eNB-UE with and without S1), and realtime eNB and UE and RRH GW.
RELEASE NOTES:
v1.1.1 -> November 2019. Bug fix in the TDD Fair Round-Robin scheduler
v1.1.0 -> July 2019. This version adds the following implemented features:
* Experimental support of LTE-M
- Single LTE-M UE attachment, legacy-LTE UE attachment is disabled
* X2 interface and handover (also X2-U interface)
- In FDD and TDD
* CU/DU split (F1 interface)
- Tested only in FDD
* CDRX
- Tested only in FDD
* Experimental eMBMS support (only on UE side)
* Experimental multi-RRU support
- Tested only in TDD
This version has an improved code quality:
* Simplification of the Build System
- A single build includes all full-stack simulators, S1/noS1 modes and one HW platform (such as USRP, BladeRF, ...)
* TUN interface is now used as default for the data plane
- for UE, eNB-noS1 and UE-noS1
* Code Cleanup
* Better Static Code Analysis:
- Limited number of errors in cppcheck
- Important Decrease on high Impact errors in CoverityScan
* Better Test Coverage in Continuous Integration:
- TM2, CDRX, IF4.5, F1
- OAI UE is tested in S1 and noS1 modes with USRP board
- Multi-RRU TDD mode
- X2 Handover in FDD mode
v1.0.3 -> June 2019: Bug fix for LimeSuite v19.04.0 API
v1.0.2 -> February 2019: Full OAI support for 3.13.1 UHD
v1.0.1 -> February 2019: Bug fix for the UE L1 simulator.
v1.0.0 -> January 2019. This version first implements the architectural split described in doc/oai_lte_enb_func_split_arch.png picture.
Only FAPI, nFAPI and IF4.5 interfaces are implemented.
Repository tree structure prepares future integrations of features such as LTE-M, nbIOT or 5G-NR.
Preliminary X2 support has been implemented.
S1-flex has been introduced.
New tools: config library, telnet server, ...
A lot of bugfixes and a proper automated Continuous Integration process validates contributions.
v0.6.1 -> Mostly bugfixes. This is the last version without NFAPI.
v0.6 -> RRH functionality, UE greatly improved, better TDD support,
a lot of bugs fixed. WARNING: oaisim in PHY abstraction mode does not
work, you need to use v0.5.2 for that.
v0.5.2 -> Last version with old code for oaisim (abstraction mode works)
v0.5.1 -> Merge of bugfix-137-uplink-fixes. It includes stablity fixes for eNB
v0.5 -> Merge of enhancement-10-harmony-lts. It includes fixes for Ubuntu 16.04 support
v0.4 -> Merge of feature-131-new-license. It closes issue#131 and changes the license to OAI Public License V1.0
v0.3 -> Last stable commit on develop branch before the merge of feature-131-new-license. This is the last commit with GPL License
v0.2 -> Merge of enhancement-10-harmony to include NGFI RRH + New Interface for RF/BBU
v0.1 -> Last stable commit on develop branch before enhancement-10-harmony

36
charts/physims/Chart.yaml Normal file
View File

@@ -0,0 +1,36 @@
apiVersion: v1
name: oai-physim
description: A Helm chart for physical simulators network function
# A chart can be either an 'application' or a 'library' chart.
#
# Application charts are a collection of templates that can be packaged into versioned archives
# to be deployed.
#
# Library charts provide useful utilities or functions for the chart developer. They're included as
# a dependency of application charts to inject those utilities and functions into the rendering
# pipeline. Library charts do not define any templates and therefore cannot be deployed.
type: application
icon: http://www.openairinterface.org/wp-content/uploads/2015/06/cropped-oai_final_logo.png
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
version: 0.1.1
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application.
appVersion: v1
keywords:
- Physical Simulators
- RAN
- 4G
- 5G
sources:
- https://gitlab.eurecom.fr/oai/openairinterface5g
maintainers:
- name: OPENAIRINTERFACE
email: contact@openairinterface.org

View File

@@ -0,0 +1,36 @@
apiVersion: v1
name: oai-dlsim
description: A Helm subchart for dlsim network function
# A chart can be either an 'application' or a 'library' chart.
#
# Application charts are a collection of templates that can be packaged into versioned archives
# to be deployed.
#
# Library charts provide useful utilities or functions for the chart developer. They're included as
# a dependency of application charts to inject those utilities and functions into the rendering
# pipeline. Library charts do not define any templates and therefore cannot be deployed.
type: application
icon: http://www.openairinterface.org/wp-content/uploads/2015/06/cropped-oai_final_logo.png
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
version: 0.1.1
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application.
appVersion: v1
keywords:
- Physical Simulator
- dlsim
- RAN
- 4G
sources:
- https://gitlab.eurecom.fr/oai/openairinterface5g
maintainers:
- name: OPENAIRINTERFACE
email: contact@openairinterface.org

View File

@@ -0,0 +1,15 @@
1. Get the application URL by running these commands:
{{- if contains "NodePort" .Values.service.type }}
export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "oai-dlsim.fullname" . }})
export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
echo http://$NODE_IP:$NODE_PORT
{{- else if contains "LoadBalancer" .Values.service.type }}
NOTE: It may take a few minutes for the LoadBalancer IP to be available.
You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "oai-dlsim.fullname" . }}'
export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "oai-dlsim.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
echo http://$SERVICE_IP:{{ .Values.service.port }}
{{- else if contains "ClusterIP" .Values.service.type }}
export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "oai-dlsim.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
echo "Visit http://127.0.0.1:8080 to use your application"
kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:80
{{- end }}

View File

@@ -0,0 +1,63 @@
{{/* vim: set filetype=mustache: */}}
{{/*
Expand the name of the chart.
*/}}
{{- define "oai-dlsim.name" -}}
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{/*
Create a default fully qualified app name.
We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
If release name contains chart name it will be used as a full name.
*/}}
{{- define "oai-dlsim.fullname" -}}
{{- if .Values.fullnameOverride -}}
{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
{{- else -}}
{{- $name := default .Chart.Name .Values.nameOverride -}}
{{- if contains $name .Release.Name -}}
{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
{{- else -}}
{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{- end -}}
{{- end -}}
{{/*
Create chart name and version as used by the chart label.
*/}}
{{- define "oai-dlsim.chart" -}}
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{/*
Common labels
*/}}
{{- define "oai-dlsim.labels" -}}
helm.sh/chart: {{ include "oai-dlsim.chart" . }}
{{ include "oai-dlsim.selectorLabels" . }}
{{- if .Chart.AppVersion }}
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
{{- end }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- end -}}
{{/*
Selector labels
*/}}
{{- define "oai-dlsim.selectorLabels" -}}
app.kubernetes.io/name: {{ include "oai-dlsim.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
{{- end -}}
{{/*
Create the name of the service account to use
*/}}
{{- define "oai-dlsim.serviceAccountName" -}}
{{- if .Values.serviceAccount.create -}}
{{ default (include "oai-dlsim.fullname" .) .Values.serviceAccount.name }}
{{- else -}}
{{ default "default" .Values.serviceAccount.name }}
{{- end -}}
{{- end -}}

View File

@@ -0,0 +1,49 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ .Chart.Name }}
labels:
{{- include "oai-dlsim.labels" . | nindent 4 }}
spec:
replicas: {{ .Values.replicaCount }}
selector:
matchLabels:
{{- include "oai-dlsim.selectorLabels" . | nindent 6 }}
strategy:
type: Recreate
template:
metadata:
labels:
{{- include "oai-dlsim.selectorLabels" . | nindent 8 }}
spec:
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
{{- if .Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers:
- name: physim
image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
securityContext:
{{- toYaml .Values.securityContext | nindent 12 }}
ports:
- containerPort: 80
name: oai-dlsim
# volumeMounts:
# - mountPath: /opt/oai-dlsim/certs
# name: certs
command: ["/bin/sh", "-c"]
args:
- >
export OPENAIR_DIR=/opt/oai-physim &&
cd cmake_targets/autotests &&
./run_exec_autotests.bash -g "015100" -q -np -b &&
echo "FINISHED" &&
sleep infinity
dnsPolicy: ClusterFirst
restartPolicy: Always
schedulerName: default-scheduler
serviceAccountName: {{ .Values.global.serviceAccountName }}
terminationGracePeriodSeconds: 30

View File

@@ -0,0 +1,20 @@
apiVersion: v1
kind: Service
metadata:
name: {{ .Chart.Name }}
labels:
{{- include "oai-dlsim.labels" . | nindent 4 }}
spec:
type: {{ .Values.service.type }}
{{- if contains "ClusterIP" .Values.service.type }}
clusterIP: None
{{- end }}
ports:
- name: oai-dlsim
# Port accessible outside cluster
port: {{ .Values.service.port }}
# Port to forward to inside the pod
targetPort: {{ .Values.service.Port }}
protocol: TCP
selector:
{{- include "oai-dlsim.selectorLabels" . | nindent 4 }}

View File

@@ -0,0 +1,63 @@
# Default values for oai-dlsim.
# This is a YAML-formatted file.
# Declare variables to be passed into your templates.
replicaCount: 1
namespace: "oaicicd-ran-tmp"
image:
registry: local
repository: image-registry.openshift-image-registry.svc:5000/oaicicd-ran-tmp/oai-physim
version: temp
# pullPolicy: IfNotPresent or Never or Always
pullPolicy: Always
imagePullSecrets: []
nameOverride: ""
fullnameOverride: ""
serviceAccount:
# Specifies whether a service account should be created
create: true
# Annotations to add to the service account
annotations: {}
# The name of the service account to use.
# If not set and create is true, a name is generated using the fullname template
name: "oai-dlsim-sa"
podSecurityContext:
runAsUser: 0
runAsGroup: 0
securityContext:
privileged: true
# capabilities:
# drop:
# - ALL
# readOnlyRootFilesystem: true
# runAsNonRoot: true
# runAsUser: 1000
service:
type: ClusterIP
port: 80
resources: {}
# We usually recommend not to specify default resources and to leave this as a conscious
# choice for the user. This also increases chances charts run on environments with little
# resources, such as Minikube. If you do want to specify resources, uncomment the following
# lines, adjust them as necessary, and remove the curly braces after 'resources:'.
# limits:
# cpu: 100m
# memory: 128Mi
# requests:
# cpu: 100m
# memory: 128Mi
nodeSelector: {}
tolerations: []
affinity: {}

View File

@@ -0,0 +1,36 @@
apiVersion: v1
name: oai-ldpctest
description: A Helm subchart for ldpctest network function
# A chart can be either an 'application' or a 'library' chart.
#
# Application charts are a collection of templates that can be packaged into versioned archives
# to be deployed.
#
# Library charts provide useful utilities or functions for the chart developer. They're included as
# a dependency of application charts to inject those utilities and functions into the rendering
# pipeline. Library charts do not define any templates and therefore cannot be deployed.
type: application
icon: http://www.openairinterface.org/wp-content/uploads/2015/06/cropped-oai_final_logo.png
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
version: 0.1.1
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application.
appVersion: v1
keywords:
- Physical Simulator
- ldpctest
- RAN
- 5G
sources:
- https://gitlab.eurecom.fr/oai/openairinterface5g
maintainers:
- name: OPENAIRINTERFACE
email: contact@openairinterface.org

View File

@@ -0,0 +1,15 @@
1. Get the application URL by running these commands:
{{- if contains "NodePort" .Values.service.type }}
export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "oai-ldpctest.fullname" . }})
export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
echo http://$NODE_IP:$NODE_PORT
{{- else if contains "LoadBalancer" .Values.service.type }}
NOTE: It may take a few minutes for the LoadBalancer IP to be available.
You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "oai-ldpctest.fullname" . }}'
export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "oai-ldpctest.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
echo http://$SERVICE_IP:{{ .Values.service.port }}
{{- else if contains "ClusterIP" .Values.service.type }}
export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "oai-ldpctest.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
echo "Visit http://127.0.0.1:8080 to use your application"
kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:80
{{- end }}

View File

@@ -0,0 +1,63 @@
{{/* vim: set filetype=mustache: */}}
{{/*
Expand the name of the chart.
*/}}
{{- define "oai-ldpctest.name" -}}
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{/*
Create a default fully qualified app name.
We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
If release name contains chart name it will be used as a full name.
*/}}
{{- define "oai-ldpctest.fullname" -}}
{{- if .Values.fullnameOverride -}}
{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
{{- else -}}
{{- $name := default .Chart.Name .Values.nameOverride -}}
{{- if contains $name .Release.Name -}}
{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
{{- else -}}
{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{- end -}}
{{- end -}}
{{/*
Create chart name and version as used by the chart label.
*/}}
{{- define "oai-ldpctest.chart" -}}
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{/*
Common labels
*/}}
{{- define "oai-ldpctest.labels" -}}
helm.sh/chart: {{ include "oai-ldpctest.chart" . }}
{{ include "oai-ldpctest.selectorLabels" . }}
{{- if .Chart.AppVersion }}
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
{{- end }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- end -}}
{{/*
Selector labels
*/}}
{{- define "oai-ldpctest.selectorLabels" -}}
app.kubernetes.io/name: {{ include "oai-ldpctest.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
{{- end -}}
{{/*
Create the name of the service account to use
*/}}
{{- define "oai-ldpctest.serviceAccountName" -}}
{{- if .Values.serviceAccount.create -}}
{{ default (include "oai-ldpctest.fullname" .) .Values.serviceAccount.name }}
{{- else -}}
{{ default "default" .Values.serviceAccount.name }}
{{- end -}}
{{- end -}}

View File

@@ -0,0 +1,49 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ .Chart.Name }}
labels:
{{- include "oai-ldpctest.labels" . | nindent 4 }}
spec:
replicas: {{ .Values.replicaCount }}
selector:
matchLabels:
{{- include "oai-ldpctest.selectorLabels" . | nindent 6 }}
strategy:
type: Recreate
template:
metadata:
labels:
{{- include "oai-ldpctest.selectorLabels" . | nindent 8 }}
spec:
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
{{- if .Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers:
- name: physim
image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
securityContext:
{{- toYaml .Values.securityContext | nindent 12 }}
ports:
- containerPort: 80
name: oai-ldpctest
# volumeMounts:
# - mountPath: /opt/oai-ldpctest/certs
# name: certs
command: ["/bin/sh", "-c"]
args:
- >
export OPENAIR_DIR=/opt/oai-physim &&
cd cmake_targets/autotests &&
./run_exec_autotests.bash -g "015102" -q -np -b &&
echo "FINISHED" &&
sleep infinity
dnsPolicy: ClusterFirst
restartPolicy: Always
schedulerName: default-scheduler
serviceAccountName: {{ .Values.global.serviceAccountName }}
terminationGracePeriodSeconds: 30

View File

@@ -0,0 +1,20 @@
apiVersion: v1
kind: Service
metadata:
name: {{ .Chart.Name }}
labels:
{{- include "oai-ldpctest.labels" . | nindent 4 }}
spec:
type: {{ .Values.service.type }}
{{- if contains "ClusterIP" .Values.service.type }}
clusterIP: None
{{- end }}
ports:
- name: oai-ldpctest
# Port accessible outside cluster
port: {{ .Values.service.port }}
# Port to forward to inside the pod
targetPort: {{ .Values.service.Port }}
protocol: TCP
selector:
{{- include "oai-ldpctest.selectorLabels" . | nindent 4 }}

View File

@@ -0,0 +1,63 @@
# Default values for oai-ldpctest.
# This is a YAML-formatted file.
# Declare variables to be passed into your templates.
replicaCount: 1
namespace: "oaicicd-ran-tmp"
image:
registry: local
repository: image-registry.openshift-image-registry.svc:5000/oaicicd-ran-tmp/oai-physim
version: temp
# pullPolicy: IfNotPresent or Never or Always
pullPolicy: Always
imagePullSecrets: []
nameOverride: ""
fullnameOverride: ""
serviceAccount:
# Specifies whether a service account should be created
create: true
# Annotations to add to the service account
annotations: {}
# The name of the service account to use.
# If not set and create is true, a name is generated using the fullname template
name: "oai-ldpctest-sa"
podSecurityContext:
runAsUser: 0
runAsGroup: 0
securityContext:
privileged: true
# capabilities:
# drop:
# - ALL
# readOnlyRootFilesystem: true
# runAsNonRoot: true
# runAsUser: 1000
service:
type: ClusterIP
port: 80
resources: {}
# We usually recommend not to specify default resources and to leave this as a conscious
# choice for the user. This also increases chances charts run on environments with little
# resources, such as Minikube. If you do want to specify resources, uncomment the following
# lines, adjust them as necessary, and remove the curly braces after 'resources:'.
# limits:
# cpu: 100m
# memory: 128Mi
# requests:
# cpu: 100m
# memory: 128Mi
nodeSelector: {}
tolerations: []
affinity: {}

View File

@@ -0,0 +1,36 @@
apiVersion: v1
name: oai-nr-dlschsim
description: A Helm subchart for nr-dlschsim network function
# A chart can be either an 'application' or a 'library' chart.
#
# Application charts are a collection of templates that can be packaged into versioned archives
# to be deployed.
#
# Library charts provide useful utilities or functions for the chart developer. They're included as
# a dependency of application charts to inject those utilities and functions into the rendering
# pipeline. Library charts do not define any templates and therefore cannot be deployed.
type: application
icon: http://www.openairinterface.org/wp-content/uploads/2015/06/cropped-oai_final_logo.png
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
version: 0.1.1
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application.
appVersion: v1
keywords:
- Physical Simulator
- nr-dlschsim
- RAN
- 5G
sources:
- https://gitlab.eurecom.fr/oai/openairinterface5g
maintainers:
- name: OPENAIRINTERFACE
email: contact@openairinterface.org

View File

@@ -0,0 +1,15 @@
1. Get the application URL by running these commands:
{{- if contains "NodePort" .Values.service.type }}
export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "oai-nr-dlschsim.fullname" . }})
export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
echo http://$NODE_IP:$NODE_PORT
{{- else if contains "LoadBalancer" .Values.service.type }}
NOTE: It may take a few minutes for the LoadBalancer IP to be available.
You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "oai-nr-dlschsim.fullname" . }}'
export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "oai-nr-dlschsim.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
echo http://$SERVICE_IP:{{ .Values.service.port }}
{{- else if contains "ClusterIP" .Values.service.type }}
export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "oai-nr-dlschsim.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
echo "Visit http://127.0.0.1:8080 to use your application"
kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:80
{{- end }}

View File

@@ -0,0 +1,63 @@
{{/* vim: set filetype=mustache: */}}
{{/*
Expand the name of the chart.
*/}}
{{- define "oai-nr-dlschsim.name" -}}
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{/*
Create a default fully qualified app name.
We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
If release name contains chart name it will be used as a full name.
*/}}
{{- define "oai-nr-dlschsim.fullname" -}}
{{- if .Values.fullnameOverride -}}
{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
{{- else -}}
{{- $name := default .Chart.Name .Values.nameOverride -}}
{{- if contains $name .Release.Name -}}
{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
{{- else -}}
{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{- end -}}
{{- end -}}
{{/*
Create chart name and version as used by the chart label.
*/}}
{{- define "oai-nr-dlschsim.chart" -}}
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{/*
Common labels
*/}}
{{- define "oai-nr-dlschsim.labels" -}}
helm.sh/chart: {{ include "oai-nr-dlschsim.chart" . }}
{{ include "oai-nr-dlschsim.selectorLabels" . }}
{{- if .Chart.AppVersion }}
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
{{- end }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- end -}}
{{/*
Selector labels
*/}}
{{- define "oai-nr-dlschsim.selectorLabels" -}}
app.kubernetes.io/name: {{ include "oai-nr-dlschsim.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
{{- end -}}
{{/*
Create the name of the service account to use
*/}}
{{- define "oai-nr-dlschsim.serviceAccountName" -}}
{{- if .Values.serviceAccount.create -}}
{{ default (include "oai-nr-dlschsim.fullname" .) .Values.serviceAccount.name }}
{{- else -}}
{{ default "default" .Values.serviceAccount.name }}
{{- end -}}
{{- end -}}

View File

@@ -0,0 +1,49 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ .Chart.Name }}
labels:
{{- include "oai-nr-dlschsim.labels" . | nindent 4 }}
spec:
replicas: {{ .Values.replicaCount }}
selector:
matchLabels:
{{- include "oai-nr-dlschsim.selectorLabels" . | nindent 6 }}
strategy:
type: Recreate
template:
metadata:
labels:
{{- include "oai-nr-dlschsim.selectorLabels" . | nindent 8 }}
spec:
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
{{- if .Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers:
- name: physim
image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
securityContext:
{{- toYaml .Values.securityContext | nindent 12 }}
ports:
- containerPort: 80
name: oai-nr-dlschsim
# volumeMounts:
# - mountPath: /opt/oai-nr-dlschsim/certs
# name: certs
command: ["/bin/sh", "-c"]
args:
- >
export OPENAIR_DIR=/opt/oai-physim &&
cd cmake_targets/autotests &&
./run_exec_autotests.bash -g "015106" -q -np -b &&
echo "FINISHED" &&
sleep infinity
dnsPolicy: ClusterFirst
restartPolicy: Always
schedulerName: default-scheduler
serviceAccountName: {{ .Values.global.serviceAccountName }}
terminationGracePeriodSeconds: 30

View File

@@ -0,0 +1,20 @@
apiVersion: v1
kind: Service
metadata:
name: {{ .Chart.Name }}
labels:
{{- include "oai-nr-dlschsim.labels" . | nindent 4 }}
spec:
type: {{ .Values.service.type }}
{{- if contains "ClusterIP" .Values.service.type }}
clusterIP: None
{{- end }}
ports:
- name: oai-nr-dlschsim
# Port accessible outside cluster
port: {{ .Values.service.port }}
# Port to forward to inside the pod
targetPort: {{ .Values.service.Port }}
protocol: TCP
selector:
{{- include "oai-nr-dlschsim.selectorLabels" . | nindent 4 }}

View File

@@ -0,0 +1,63 @@
# Default values for oai-nr-dlschsim.
# This is a YAML-formatted file.
# Declare variables to be passed into your templates.
replicaCount: 1
namespace: "oaicicd-ran-tmp"
image:
registry: local
repository: image-registry.openshift-image-registry.svc:5000/oaicicd-ran-tmp/oai-physim
version: temp
# pullPolicy: IfNotPresent or Never or Always
pullPolicy: Always
imagePullSecrets: []
nameOverride: ""
fullnameOverride: ""
serviceAccount:
# Specifies whether a service account should be created
create: true
# Annotations to add to the service account
annotations: {}
# The name of the service account to use.
# If not set and create is true, a name is generated using the fullname template
name: "oai-nr-dlschsim-sa"
podSecurityContext:
runAsUser: 0
runAsGroup: 0
securityContext:
privileged: true
# capabilities:
# drop:
# - ALL
# readOnlyRootFilesystem: true
# runAsNonRoot: true
# runAsUser: 1000
service:
type: ClusterIP
port: 80
resources: {}
# We usually recommend not to specify default resources and to leave this as a conscious
# choice for the user. This also increases chances charts run on environments with little
# resources, such as Minikube. If you do want to specify resources, uncomment the following
# lines, adjust them as necessary, and remove the curly braces after 'resources:'.
# limits:
# cpu: 100m
# memory: 128Mi
# requests:
# cpu: 100m
# memory: 128Mi
nodeSelector: {}
tolerations: []
affinity: {}

View File

@@ -0,0 +1,36 @@
apiVersion: v1
name: oai-nr-dlsim
description: A Helm subchart for nr-dlsim network function
# A chart can be either an 'application' or a 'library' chart.
#
# Application charts are a collection of templates that can be packaged into versioned archives
# to be deployed.
#
# Library charts provide useful utilities or functions for the chart developer. They're included as
# a dependency of application charts to inject those utilities and functions into the rendering
# pipeline. Library charts do not define any templates and therefore cannot be deployed.
type: application
icon: http://www.openairinterface.org/wp-content/uploads/2015/06/cropped-oai_final_logo.png
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
version: 0.1.1
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application.
appVersion: v1
keywords:
- Physical Simulator
- nr-dlsim
- RAN
- 5G
sources:
- https://gitlab.eurecom.fr/oai/openairinterface5g
maintainers:
- name: OPENAIRINTERFACE
email: contact@openairinterface.org

View File

@@ -0,0 +1,15 @@
1. Get the application URL by running these commands:
{{- if contains "NodePort" .Values.service.type }}
export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "oai-nr-dlsim.fullname" . }})
export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
echo http://$NODE_IP:$NODE_PORT
{{- else if contains "LoadBalancer" .Values.service.type }}
NOTE: It may take a few minutes for the LoadBalancer IP to be available.
You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "oai-nr-dlsim.fullname" . }}'
export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "oai-nr-dlsim.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
echo http://$SERVICE_IP:{{ .Values.service.port }}
{{- else if contains "ClusterIP" .Values.service.type }}
export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "oai-nr-dlsim.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
echo "Visit http://127.0.0.1:8080 to use your application"
kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:80
{{- end }}

View File

@@ -0,0 +1,63 @@
{{/* vim: set filetype=mustache: */}}
{{/*
Expand the name of the chart.
*/}}
{{- define "oai-nr-dlsim.name" -}}
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{/*
Create a default fully qualified app name.
We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
If release name contains chart name it will be used as a full name.
*/}}
{{- define "oai-nr-dlsim.fullname" -}}
{{- if .Values.fullnameOverride -}}
{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
{{- else -}}
{{- $name := default .Chart.Name .Values.nameOverride -}}
{{- if contains $name .Release.Name -}}
{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
{{- else -}}
{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{- end -}}
{{- end -}}
{{/*
Create chart name and version as used by the chart label.
*/}}
{{- define "oai-nr-dlsim.chart" -}}
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{/*
Common labels
*/}}
{{- define "oai-nr-dlsim.labels" -}}
helm.sh/chart: {{ include "oai-nr-dlsim.chart" . }}
{{ include "oai-nr-dlsim.selectorLabels" . }}
{{- if .Chart.AppVersion }}
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
{{- end }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- end -}}
{{/*
Selector labels
*/}}
{{- define "oai-nr-dlsim.selectorLabels" -}}
app.kubernetes.io/name: {{ include "oai-nr-dlsim.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
{{- end -}}
{{/*
Create the name of the service account to use
*/}}
{{- define "oai-nr-dlsim.serviceAccountName" -}}
{{- if .Values.serviceAccount.create -}}
{{ default (include "oai-nr-dlsim.fullname" .) .Values.serviceAccount.name }}
{{- else -}}
{{ default "default" .Values.serviceAccount.name }}
{{- end -}}
{{- end -}}

View File

@@ -0,0 +1,49 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ .Chart.Name }}
labels:
{{- include "oai-nr-dlsim.labels" . | nindent 4 }}
spec:
replicas: {{ .Values.replicaCount }}
selector:
matchLabels:
{{- include "oai-nr-dlsim.selectorLabels" . | nindent 6 }}
strategy:
type: Recreate
template:
metadata:
labels:
{{- include "oai-nr-dlsim.selectorLabels" . | nindent 8 }}
spec:
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
{{- if .Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers:
- name: physim
image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
securityContext:
{{- toYaml .Values.securityContext | nindent 12 }}
ports:
- containerPort: 80
name: oai-nr-dlsim
# volumeMounts:
# - mountPath: /opt/oai-nr-dlsim/certs
# name: certs
command: ["/bin/sh", "-c"]
args:
- >
export OPENAIR_DIR=/opt/oai-physim &&
cd cmake_targets/autotests &&
./run_exec_autotests.bash -g "015105" -q -np -b &&
echo "FINISHED" &&
sleep infinity
dnsPolicy: ClusterFirst
restartPolicy: Always
schedulerName: default-scheduler
serviceAccountName: {{ .Values.global.serviceAccountName }}
terminationGracePeriodSeconds: 30

View File

@@ -0,0 +1,20 @@
apiVersion: v1
kind: Service
metadata:
name: {{ .Chart.Name }}
labels:
{{- include "oai-nr-dlsim.labels" . | nindent 4 }}
spec:
type: {{ .Values.service.type }}
{{- if contains "ClusterIP" .Values.service.type }}
clusterIP: None
{{- end }}
ports:
- name: oai-nr-dlsim
# Port accessible outside cluster
port: {{ .Values.service.port }}
# Port to forward to inside the pod
targetPort: {{ .Values.service.Port }}
protocol: TCP
selector:
{{- include "oai-nr-dlsim.selectorLabels" . | nindent 4 }}

View File

@@ -0,0 +1,63 @@
# Default values for oai-nr-dlsim.
# This is a YAML-formatted file.
# Declare variables to be passed into your templates.
replicaCount: 1
namespace: "oaicicd-ran-tmp"
image:
registry: local
repository: image-registry.openshift-image-registry.svc:5000/oaicicd-ran-tmp/oai-physim
version: temp
# pullPolicy: IfNotPresent or Never or Always
pullPolicy: Always
imagePullSecrets: []
nameOverride: ""
fullnameOverride: ""
serviceAccount:
# Specifies whether a service account should be created
create: true
# Annotations to add to the service account
annotations: {}
# The name of the service account to use.
# If not set and create is true, a name is generated using the fullname template
name: "oai-nr-dlsim-sa"
podSecurityContext:
runAsUser: 0
runAsGroup: 0
securityContext:
privileged: true
# capabilities:
# drop:
# - ALL
# readOnlyRootFilesystem: true
# runAsNonRoot: true
# runAsUser: 1000
service:
type: ClusterIP
port: 80
resources: {}
# We usually recommend not to specify default resources and to leave this as a conscious
# choice for the user. This also increases chances charts run on environments with little
# resources, such as Minikube. If you do want to specify resources, uncomment the following
# lines, adjust them as necessary, and remove the curly braces after 'resources:'.
# limits:
# cpu: 100m
# memory: 128Mi
# requests:
# cpu: 100m
# memory: 128Mi
nodeSelector: {}
tolerations: []
affinity: {}

View File

@@ -0,0 +1,36 @@
apiVersion: v1
name: oai-nr-pbchsim
description: A Helm subchart for nr-pbchsim network function
# A chart can be either an 'application' or a 'library' chart.
#
# Application charts are a collection of templates that can be packaged into versioned archives
# to be deployed.
#
# Library charts provide useful utilities or functions for the chart developer. They're included as
# a dependency of application charts to inject those utilities and functions into the rendering
# pipeline. Library charts do not define any templates and therefore cannot be deployed.
type: application
icon: http://www.openairinterface.org/wp-content/uploads/2015/06/cropped-oai_final_logo.png
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
version: 0.1.1
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application.
appVersion: v1
keywords:
- Physical Simulator
- nr-pbchsim
- RAN
- 5G
sources:
- https://gitlab.eurecom.fr/oai/openairinterface5g
maintainers:
- name: OPENAIRINTERFACE
email: contact@openairinterface.org

View File

@@ -0,0 +1,15 @@
1. Get the application URL by running these commands:
{{- if contains "NodePort" .Values.service.type }}
export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "oai-nr-pbchsim.fullname" . }})
export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
echo http://$NODE_IP:$NODE_PORT
{{- else if contains "LoadBalancer" .Values.service.type }}
NOTE: It may take a few minutes for the LoadBalancer IP to be available.
You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "oai-nr-pbchsim.fullname" . }}'
export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "oai-nr-pbchsim.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
echo http://$SERVICE_IP:{{ .Values.service.port }}
{{- else if contains "ClusterIP" .Values.service.type }}
export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "oai-nr-pbchsim.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
echo "Visit http://127.0.0.1:8080 to use your application"
kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:80
{{- end }}

View File

@@ -0,0 +1,63 @@
{{/* vim: set filetype=mustache: */}}
{{/*
Expand the name of the chart.
*/}}
{{- define "oai-nr-pbchsim.name" -}}
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{/*
Create a default fully qualified app name.
We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
If release name contains chart name it will be used as a full name.
*/}}
{{- define "oai-nr-pbchsim.fullname" -}}
{{- if .Values.fullnameOverride -}}
{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
{{- else -}}
{{- $name := default .Chart.Name .Values.nameOverride -}}
{{- if contains $name .Release.Name -}}
{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
{{- else -}}
{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{- end -}}
{{- end -}}
{{/*
Create chart name and version as used by the chart label.
*/}}
{{- define "oai-nr-pbchsim.chart" -}}
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{/*
Common labels
*/}}
{{- define "oai-nr-pbchsim.labels" -}}
helm.sh/chart: {{ include "oai-nr-pbchsim.chart" . }}
{{ include "oai-nr-pbchsim.selectorLabels" . }}
{{- if .Chart.AppVersion }}
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
{{- end }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- end -}}
{{/*
Selector labels
*/}}
{{- define "oai-nr-pbchsim.selectorLabels" -}}
app.kubernetes.io/name: {{ include "oai-nr-pbchsim.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
{{- end -}}
{{/*
Create the name of the service account to use
*/}}
{{- define "oai-nr-pbchsim.serviceAccountName" -}}
{{- if .Values.serviceAccount.create -}}
{{ default (include "oai-nr-pbchsim.fullname" .) .Values.serviceAccount.name }}
{{- else -}}
{{ default "default" .Values.serviceAccount.name }}
{{- end -}}
{{- end -}}

View File

@@ -0,0 +1,49 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ .Chart.Name }}
labels:
{{- include "oai-nr-pbchsim.labels" . | nindent 4 }}
spec:
replicas: {{ .Values.replicaCount }}
selector:
matchLabels:
{{- include "oai-nr-pbchsim.selectorLabels" . | nindent 6 }}
strategy:
type: Recreate
template:
metadata:
labels:
{{- include "oai-nr-pbchsim.selectorLabels" . | nindent 8 }}
spec:
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
{{- if .Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers:
- name: physim
image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
securityContext:
{{- toYaml .Values.securityContext | nindent 12 }}
ports:
- containerPort: 80
name: oai-nr-pbchsim
# volumeMounts:
# - mountPath: /opt/oai-nr-pbchsim/certs
# name: certs
command: ["/bin/sh", "-c"]
args:
- >
export OPENAIR_DIR=/opt/oai-physim &&
cd cmake_targets/autotests &&
./run_exec_autotests.bash -g "015104" -q -np -b &&
echo "FINISHED" &&
sleep infinity
dnsPolicy: ClusterFirst
restartPolicy: Always
schedulerName: default-scheduler
serviceAccountName: {{ .Values.global.serviceAccountName }}
terminationGracePeriodSeconds: 30

View File

@@ -0,0 +1,20 @@
apiVersion: v1
kind: Service
metadata:
name: {{ .Chart.Name }}
labels:
{{- include "oai-nr-pbchsim.labels" . | nindent 4 }}
spec:
type: {{ .Values.service.type }}
{{- if contains "ClusterIP" .Values.service.type }}
clusterIP: None
{{- end }}
ports:
- name: oai-nr-pbchsim
# Port accessible outside cluster
port: {{ .Values.service.port }}
# Port to forward to inside the pod
targetPort: {{ .Values.service.Port }}
protocol: TCP
selector:
{{- include "oai-nr-pbchsim.selectorLabels" . | nindent 4 }}

View File

@@ -0,0 +1,63 @@
# Default values for oai-nr-pbchsim.
# This is a YAML-formatted file.
# Declare variables to be passed into your templates.
replicaCount: 1
namespace: "oaicicd-ran-tmp"
image:
registry: local
repository: image-registry.openshift-image-registry.svc:5000/oaicicd-ran-tmp/oai-physim
version: temp
# pullPolicy: IfNotPresent or Never or Always
pullPolicy: Always
imagePullSecrets: []
nameOverride: ""
fullnameOverride: ""
serviceAccount:
# Specifies whether a service account should be created
create: true
# Annotations to add to the service account
annotations: {}
# The name of the service account to use.
# If not set and create is true, a name is generated using the fullname template
name: "oai-nr-pbchsim-sa"
podSecurityContext:
runAsUser: 0
runAsGroup: 0
securityContext:
privileged: true
# capabilities:
# drop:
# - ALL
# readOnlyRootFilesystem: true
# runAsNonRoot: true
# runAsUser: 1000
service:
type: ClusterIP
port: 80
resources: {}
# We usually recommend not to specify default resources and to leave this as a conscious
# choice for the user. This also increases chances charts run on environments with little
# resources, such as Minikube. If you do want to specify resources, uncomment the following
# lines, adjust them as necessary, and remove the curly braces after 'resources:'.
# limits:
# cpu: 100m
# memory: 128Mi
# requests:
# cpu: 100m
# memory: 128Mi
nodeSelector: {}
tolerations: []
affinity: {}

View File

@@ -0,0 +1,36 @@
apiVersion: v1
name: oai-nr-prachsim
description: A Helm subchart for nr-prachsim network function
# A chart can be either an 'application' or a 'library' chart.
#
# Application charts are a collection of templates that can be packaged into versioned archives
# to be deployed.
#
# Library charts provide useful utilities or functions for the chart developer. They're included as
# a dependency of application charts to inject those utilities and functions into the rendering
# pipeline. Library charts do not define any templates and therefore cannot be deployed.
type: application
icon: http://www.openairinterface.org/wp-content/uploads/2015/06/cropped-oai_final_logo.png
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
version: 0.1.1
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application.
appVersion: v1
keywords:
- Physical Simulator
- nr-prachsim
- RAN
- 5G
sources:
- https://gitlab.eurecom.fr/oai/openairinterface5g
maintainers:
- name: OPENAIRINTERFACE
email: contact@openairinterface.org

View File

@@ -0,0 +1,15 @@
1. Get the application URL by running these commands:
{{- if contains "NodePort" .Values.service.type }}
export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "oai-nr-prachsim.fullname" . }})
export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
echo http://$NODE_IP:$NODE_PORT
{{- else if contains "LoadBalancer" .Values.service.type }}
NOTE: It may take a few minutes for the LoadBalancer IP to be available.
You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "oai-nr-prachsim.fullname" . }}'
export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "oai-nr-prachsim.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
echo http://$SERVICE_IP:{{ .Values.service.port }}
{{- else if contains "ClusterIP" .Values.service.type }}
export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "oai-nr-prachsim.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
echo "Visit http://127.0.0.1:8080 to use your application"
kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:80
{{- end }}

View File

@@ -0,0 +1,63 @@
{{/* vim: set filetype=mustache: */}}
{{/*
Expand the name of the chart.
*/}}
{{- define "oai-nr-prachsim.name" -}}
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{/*
Create a default fully qualified app name.
We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
If release name contains chart name it will be used as a full name.
*/}}
{{- define "oai-nr-prachsim.fullname" -}}
{{- if .Values.fullnameOverride -}}
{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
{{- else -}}
{{- $name := default .Chart.Name .Values.nameOverride -}}
{{- if contains $name .Release.Name -}}
{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
{{- else -}}
{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{- end -}}
{{- end -}}
{{/*
Create chart name and version as used by the chart label.
*/}}
{{- define "oai-nr-prachsim.chart" -}}
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{/*
Common labels
*/}}
{{- define "oai-nr-prachsim.labels" -}}
helm.sh/chart: {{ include "oai-nr-prachsim.chart" . }}
{{ include "oai-nr-prachsim.selectorLabels" . }}
{{- if .Chart.AppVersion }}
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
{{- end }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- end -}}
{{/*
Selector labels
*/}}
{{- define "oai-nr-prachsim.selectorLabels" -}}
app.kubernetes.io/name: {{ include "oai-nr-prachsim.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
{{- end -}}
{{/*
Create the name of the service account to use
*/}}
{{- define "oai-nr-prachsim.serviceAccountName" -}}
{{- if .Values.serviceAccount.create -}}
{{ default (include "oai-nr-prachsim.fullname" .) .Values.serviceAccount.name }}
{{- else -}}
{{ default "default" .Values.serviceAccount.name }}
{{- end -}}
{{- end -}}

View File

@@ -0,0 +1,49 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ .Chart.Name }}
labels:
{{- include "oai-nr-prachsim.labels" . | nindent 4 }}
spec:
replicas: {{ .Values.replicaCount }}
selector:
matchLabels:
{{- include "oai-nr-prachsim.selectorLabels" . | nindent 6 }}
strategy:
type: Recreate
template:
metadata:
labels:
{{- include "oai-nr-prachsim.selectorLabels" . | nindent 8 }}
spec:
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
{{- if .Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers:
- name: physim
image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
securityContext:
{{- toYaml .Values.securityContext | nindent 12 }}
ports:
- containerPort: 80
name: oai-nr-prachsim
# volumeMounts:
# - mountPath: /opt/oai-nr-prachsim/certs
# name: certs
command: ["/bin/sh", "-c"]
args:
- >
export OPENAIR_DIR=/opt/oai-physim &&
cd cmake_targets/autotests &&
./run_exec_autotests.bash -g "015112" -q -np -b &&
echo "FINISHED" &&
sleep infinity
dnsPolicy: ClusterFirst
restartPolicy: Always
schedulerName: default-scheduler
serviceAccountName: {{ .Values.global.serviceAccountName }}
terminationGracePeriodSeconds: 30

View File

@@ -0,0 +1,20 @@
apiVersion: v1
kind: Service
metadata:
name: {{ .Chart.Name }}
labels:
{{- include "oai-nr-prachsim.labels" . | nindent 4 }}
spec:
type: {{ .Values.service.type }}
{{- if contains "ClusterIP" .Values.service.type }}
clusterIP: None
{{- end }}
ports:
- name: oai-nr-prachsim
# Port accessible outside cluster
port: {{ .Values.service.port }}
# Port to forward to inside the pod
targetPort: {{ .Values.service.Port }}
protocol: TCP
selector:
{{- include "oai-nr-prachsim.selectorLabels" . | nindent 4 }}

View File

@@ -0,0 +1,63 @@
# Default values for oai-nr-prachsim.
# This is a YAML-formatted file.
# Declare variables to be passed into your templates.
replicaCount: 1
namespace: "oaicicd-ran-tmp"
image:
registry: local
repository: image-registry.openshift-image-registry.svc:5000/oaicicd-ran-tmp/oai-physim
version: temp
# pullPolicy: IfNotPresent or Never or Always
pullPolicy: Always
imagePullSecrets: []
nameOverride: ""
fullnameOverride: ""
serviceAccount:
# Specifies whether a service account should be created
create: true
# Annotations to add to the service account
annotations: {}
# The name of the service account to use.
# If not set and create is true, a name is generated using the fullname template
name: "oai-nr-prachsim-sa"
podSecurityContext:
runAsUser: 0
runAsGroup: 0
securityContext:
privileged: true
# capabilities:
# drop:
# - ALL
# readOnlyRootFilesystem: true
# runAsNonRoot: true
# runAsUser: 1000
service:
type: ClusterIP
port: 80
resources: {}
# We usually recommend not to specify default resources and to leave this as a conscious
# choice for the user. This also increases chances charts run on environments with little
# resources, such as Minikube. If you do want to specify resources, uncomment the following
# lines, adjust them as necessary, and remove the curly braces after 'resources:'.
# limits:
# cpu: 100m
# memory: 128Mi
# requests:
# cpu: 100m
# memory: 128Mi
nodeSelector: {}
tolerations: []
affinity: {}

View File

@@ -0,0 +1,36 @@
apiVersion: v1
name: oai-nr-pucchsim
description: A Helm subchart for nr-pucchsim network function
# A chart can be either an 'application' or a 'library' chart.
#
# Application charts are a collection of templates that can be packaged into versioned archives
# to be deployed.
#
# Library charts provide useful utilities or functions for the chart developer. They're included as
# a dependency of application charts to inject those utilities and functions into the rendering
# pipeline. Library charts do not define any templates and therefore cannot be deployed.
type: application
icon: http://www.openairinterface.org/wp-content/uploads/2015/06/cropped-oai_final_logo.png
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
version: 0.1.1
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application.
appVersion: v1
keywords:
- Physical Simulator
- nr-pucchsim
- RAN
- 5G
sources:
- https://gitlab.eurecom.fr/oai/openairinterface5g
maintainers:
- name: OPENAIRINTERFACE
email: contact@openairinterface.org

View File

@@ -0,0 +1,15 @@
1. Get the application URL by running these commands:
{{- if contains "NodePort" .Values.service.type }}
export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "oai-nr-pucchsim.fullname" . }})
export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
echo http://$NODE_IP:$NODE_PORT
{{- else if contains "LoadBalancer" .Values.service.type }}
NOTE: It may take a few minutes for the LoadBalancer IP to be available.
You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "oai-nr-pucchsim.fullname" . }}'
export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "oai-nr-pucchsim.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
echo http://$SERVICE_IP:{{ .Values.service.port }}
{{- else if contains "ClusterIP" .Values.service.type }}
export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "oai-nr-pucchsim.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
echo "Visit http://127.0.0.1:8080 to use your application"
kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:80
{{- end }}

View File

@@ -0,0 +1,63 @@
{{/* vim: set filetype=mustache: */}}
{{/*
Expand the name of the chart.
*/}}
{{- define "oai-nr-pucchsim.name" -}}
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{/*
Create a default fully qualified app name.
We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
If release name contains chart name it will be used as a full name.
*/}}
{{- define "oai-nr-pucchsim.fullname" -}}
{{- if .Values.fullnameOverride -}}
{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
{{- else -}}
{{- $name := default .Chart.Name .Values.nameOverride -}}
{{- if contains $name .Release.Name -}}
{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
{{- else -}}
{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{- end -}}
{{- end -}}
{{/*
Create chart name and version as used by the chart label.
*/}}
{{- define "oai-nr-pucchsim.chart" -}}
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{/*
Common labels
*/}}
{{- define "oai-nr-pucchsim.labels" -}}
helm.sh/chart: {{ include "oai-nr-pucchsim.chart" . }}
{{ include "oai-nr-pucchsim.selectorLabels" . }}
{{- if .Chart.AppVersion }}
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
{{- end }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- end -}}
{{/*
Selector labels
*/}}
{{- define "oai-nr-pucchsim.selectorLabels" -}}
app.kubernetes.io/name: {{ include "oai-nr-pucchsim.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
{{- end -}}
{{/*
Create the name of the service account to use
*/}}
{{- define "oai-nr-pucchsim.serviceAccountName" -}}
{{- if .Values.serviceAccount.create -}}
{{ default (include "oai-nr-pucchsim.fullname" .) .Values.serviceAccount.name }}
{{- else -}}
{{ default "default" .Values.serviceAccount.name }}
{{- end -}}
{{- end -}}

View File

@@ -0,0 +1,49 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ .Chart.Name }}
labels:
{{- include "oai-nr-pucchsim.labels" . | nindent 4 }}
spec:
replicas: {{ .Values.replicaCount }}
selector:
matchLabels:
{{- include "oai-nr-pucchsim.selectorLabels" . | nindent 6 }}
strategy:
type: Recreate
template:
metadata:
labels:
{{- include "oai-nr-pucchsim.selectorLabels" . | nindent 8 }}
spec:
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
{{- if .Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers:
- name: physim
image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
securityContext:
{{- toYaml .Values.securityContext | nindent 12 }}
ports:
- containerPort: 80
name: oai-nr-pucchsim
# volumeMounts:
# - mountPath: /opt/oai-nr-pucchsim/certs
# name: certs
command: ["/bin/sh", "-c"]
args:
- >
export OPENAIR_DIR=/opt/oai-physim &&
cd cmake_targets/autotests &&
./run_exec_autotests.bash -g "015109" -q -np -b &&
echo "FINISHED" &&
sleep infinity
dnsPolicy: ClusterFirst
restartPolicy: Always
schedulerName: default-scheduler
serviceAccountName: {{ .Values.global.serviceAccountName }}
terminationGracePeriodSeconds: 30

View File

@@ -0,0 +1,20 @@
apiVersion: v1
kind: Service
metadata:
name: {{ .Chart.Name }}
labels:
{{- include "oai-nr-pucchsim.labels" . | nindent 4 }}
spec:
type: {{ .Values.service.type }}
{{- if contains "ClusterIP" .Values.service.type }}
clusterIP: None
{{- end }}
ports:
- name: oai-nr-pucchsim
# Port accessible outside cluster
port: {{ .Values.service.port }}
# Port to forward to inside the pod
targetPort: {{ .Values.service.Port }}
protocol: TCP
selector:
{{- include "oai-nr-pucchsim.selectorLabels" . | nindent 4 }}

View File

@@ -0,0 +1,63 @@
# Default values for oai-nr-pucchsim.
# This is a YAML-formatted file.
# Declare variables to be passed into your templates.
replicaCount: 1
namespace: "oaicicd-ran-tmp"
image:
registry: local
repository: image-registry.openshift-image-registry.svc:5000/oaicicd-ran-tmp/oai-physim
version: temp
# pullPolicy: IfNotPresent or Never or Always
pullPolicy: Always
imagePullSecrets: []
nameOverride: ""
fullnameOverride: ""
serviceAccount:
# Specifies whether a service account should be created
create: true
# Annotations to add to the service account
annotations: {}
# The name of the service account to use.
# If not set and create is true, a name is generated using the fullname template
name: "oai-nr-pucchsim-sa"
podSecurityContext:
runAsUser: 0
runAsGroup: 0
securityContext:
privileged: true
# capabilities:
# drop:
# - ALL
# readOnlyRootFilesystem: true
# runAsNonRoot: true
# runAsUser: 1000
service:
type: ClusterIP
port: 80
resources: {}
# We usually recommend not to specify default resources and to leave this as a conscious
# choice for the user. This also increases chances charts run on environments with little
# resources, such as Minikube. If you do want to specify resources, uncomment the following
# lines, adjust them as necessary, and remove the curly braces after 'resources:'.
# limits:
# cpu: 100m
# memory: 128Mi
# requests:
# cpu: 100m
# memory: 128Mi
nodeSelector: {}
tolerations: []
affinity: {}

View File

@@ -0,0 +1,36 @@
apiVersion: v1
name: oai-nr-ulschsim
description: A Helm subchart for nr-ulschsim network function
# A chart can be either an 'application' or a 'library' chart.
#
# Application charts are a collection of templates that can be packaged into versioned archives
# to be deployed.
#
# Library charts provide useful utilities or functions for the chart developer. They're included as
# a dependency of application charts to inject those utilities and functions into the rendering
# pipeline. Library charts do not define any templates and therefore cannot be deployed.
type: application
icon: http://www.openairinterface.org/wp-content/uploads/2015/06/cropped-oai_final_logo.png
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
version: 0.1.1
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application.
appVersion: v1
keywords:
- Physical Simulator
- nr-ulschsim
- RAN
- 5G
sources:
- https://gitlab.eurecom.fr/oai/openairinterface5g
maintainers:
- name: OPENAIRINTERFACE
email: contact@openairinterface.org

View File

@@ -0,0 +1,15 @@
1. Get the application URL by running these commands:
{{- if contains "NodePort" .Values.service.type }}
export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "oai-nr-ulschsim.fullname" . }})
export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
echo http://$NODE_IP:$NODE_PORT
{{- else if contains "LoadBalancer" .Values.service.type }}
NOTE: It may take a few minutes for the LoadBalancer IP to be available.
You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "oai-nr-ulschsim.fullname" . }}'
export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "oai-nr-ulschsim.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
echo http://$SERVICE_IP:{{ .Values.service.port }}
{{- else if contains "ClusterIP" .Values.service.type }}
export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "oai-nr-ulschsim.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
echo "Visit http://127.0.0.1:8080 to use your application"
kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:80
{{- end }}

View File

@@ -0,0 +1,63 @@
{{/* vim: set filetype=mustache: */}}
{{/*
Expand the name of the chart.
*/}}
{{- define "oai-nr-ulschsim.name" -}}
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{/*
Create a default fully qualified app name.
We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
If release name contains chart name it will be used as a full name.
*/}}
{{- define "oai-nr-ulschsim.fullname" -}}
{{- if .Values.fullnameOverride -}}
{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
{{- else -}}
{{- $name := default .Chart.Name .Values.nameOverride -}}
{{- if contains $name .Release.Name -}}
{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
{{- else -}}
{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{- end -}}
{{- end -}}
{{/*
Create chart name and version as used by the chart label.
*/}}
{{- define "oai-nr-ulschsim.chart" -}}
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{/*
Common labels
*/}}
{{- define "oai-nr-ulschsim.labels" -}}
helm.sh/chart: {{ include "oai-nr-ulschsim.chart" . }}
{{ include "oai-nr-ulschsim.selectorLabels" . }}
{{- if .Chart.AppVersion }}
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
{{- end }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- end -}}
{{/*
Selector labels
*/}}
{{- define "oai-nr-ulschsim.selectorLabels" -}}
app.kubernetes.io/name: {{ include "oai-nr-ulschsim.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
{{- end -}}
{{/*
Create the name of the service account to use
*/}}
{{- define "oai-nr-ulschsim.serviceAccountName" -}}
{{- if .Values.serviceAccount.create -}}
{{ default (include "oai-nr-ulschsim.fullname" .) .Values.serviceAccount.name }}
{{- else -}}
{{ default "default" .Values.serviceAccount.name }}
{{- end -}}
{{- end -}}

View File

@@ -0,0 +1,49 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ .Chart.Name }}
labels:
{{- include "oai-nr-ulschsim.labels" . | nindent 4 }}
spec:
replicas: {{ .Values.replicaCount }}
selector:
matchLabels:
{{- include "oai-nr-ulschsim.selectorLabels" . | nindent 6 }}
strategy:
type: Recreate
template:
metadata:
labels:
{{- include "oai-nr-ulschsim.selectorLabels" . | nindent 8 }}
spec:
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
{{- if .Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers:
- name: physim
image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
securityContext:
{{- toYaml .Values.securityContext | nindent 12 }}
ports:
- containerPort: 80
name: oai-nr-ulschsim
# volumeMounts:
# - mountPath: /opt/oai-nr-ulschsim/certs
# name: certs
command: ["/bin/sh", "-c"]
args:
- >
export OPENAIR_DIR=/opt/oai-physim &&
cd cmake_targets/autotests &&
./run_exec_autotests.bash -g "015108" -q -np -b &&
echo "FINISHED" &&
sleep infinity
dnsPolicy: ClusterFirst
restartPolicy: Always
schedulerName: default-scheduler
serviceAccountName: {{ .Values.global.serviceAccountName }}
terminationGracePeriodSeconds: 30

View File

@@ -0,0 +1,20 @@
apiVersion: v1
kind: Service
metadata:
name: {{ .Chart.Name }}
labels:
{{- include "oai-nr-ulschsim.labels" . | nindent 4 }}
spec:
type: {{ .Values.service.type }}
{{- if contains "ClusterIP" .Values.service.type }}
clusterIP: None
{{- end }}
ports:
- name: oai-nr-ulschsim
# Port accessible outside cluster
port: {{ .Values.service.port }}
# Port to forward to inside the pod
targetPort: {{ .Values.service.Port }}
protocol: TCP
selector:
{{- include "oai-nr-ulschsim.selectorLabels" . | nindent 4 }}

View File

@@ -0,0 +1,63 @@
# Default values for oai-nr-ulschsim.
# This is a YAML-formatted file.
# Declare variables to be passed into your templates.
replicaCount: 1
namespace: "oaicicd-ran-tmp"
image:
registry: local
repository: image-registry.openshift-image-registry.svc:5000/oaicicd-ran-tmp/oai-physim
version: temp
# pullPolicy: IfNotPresent or Never or Always
pullPolicy: Always
imagePullSecrets: []
nameOverride: ""
fullnameOverride: ""
serviceAccount:
# Specifies whether a service account should be created
create: true
# Annotations to add to the service account
annotations: {}
# The name of the service account to use.
# If not set and create is true, a name is generated using the fullname template
name: "oai-nr-ulschsim-sa"
podSecurityContext:
runAsUser: 0
runAsGroup: 0
securityContext:
privileged: true
# capabilities:
# drop:
# - ALL
# readOnlyRootFilesystem: true
# runAsNonRoot: true
# runAsUser: 1000
service:
type: ClusterIP
port: 80
resources: {}
# We usually recommend not to specify default resources and to leave this as a conscious
# choice for the user. This also increases chances charts run on environments with little
# resources, such as Minikube. If you do want to specify resources, uncomment the following
# lines, adjust them as necessary, and remove the curly braces after 'resources:'.
# limits:
# cpu: 100m
# memory: 128Mi
# requests:
# cpu: 100m
# memory: 128Mi
nodeSelector: {}
tolerations: []
affinity: {}

View File

@@ -0,0 +1,36 @@
apiVersion: v1
name: oai-nr-ulsim
description: A Helm subchart for nr-ulsim network function
# A chart can be either an 'application' or a 'library' chart.
#
# Application charts are a collection of templates that can be packaged into versioned archives
# to be deployed.
#
# Library charts provide useful utilities or functions for the chart developer. They're included as
# a dependency of application charts to inject those utilities and functions into the rendering
# pipeline. Library charts do not define any templates and therefore cannot be deployed.
type: application
icon: http://www.openairinterface.org/wp-content/uploads/2015/06/cropped-oai_final_logo.png
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
version: 0.1.1
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application.
appVersion: v1
keywords:
- Physical Simulator
- nr-ulsim
- RAN
- 5G
sources:
- https://gitlab.eurecom.fr/oai/openairinterface5g
maintainers:
- name: OPENAIRINTERFACE
email: contact@openairinterface.org

View File

@@ -0,0 +1,15 @@
1. Get the application URL by running these commands:
{{- if contains "NodePort" .Values.service.type }}
export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "oai-nr-ulsim.fullname" . }})
export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
echo http://$NODE_IP:$NODE_PORT
{{- else if contains "LoadBalancer" .Values.service.type }}
NOTE: It may take a few minutes for the LoadBalancer IP to be available.
You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "oai-nr-ulsim.fullname" . }}'
export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "oai-nr-ulsim.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
echo http://$SERVICE_IP:{{ .Values.service.port }}
{{- else if contains "ClusterIP" .Values.service.type }}
export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "oai-nr-ulsim.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
echo "Visit http://127.0.0.1:8080 to use your application"
kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:80
{{- end }}

View File

@@ -0,0 +1,63 @@
{{/* vim: set filetype=mustache: */}}
{{/*
Expand the name of the chart.
*/}}
{{- define "oai-nr-ulsim.name" -}}
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{/*
Create a default fully qualified app name.
We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
If release name contains chart name it will be used as a full name.
*/}}
{{- define "oai-nr-ulsim.fullname" -}}
{{- if .Values.fullnameOverride -}}
{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
{{- else -}}
{{- $name := default .Chart.Name .Values.nameOverride -}}
{{- if contains $name .Release.Name -}}
{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
{{- else -}}
{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{- end -}}
{{- end -}}
{{/*
Create chart name and version as used by the chart label.
*/}}
{{- define "oai-nr-ulsim.chart" -}}
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{/*
Common labels
*/}}
{{- define "oai-nr-ulsim.labels" -}}
helm.sh/chart: {{ include "oai-nr-ulsim.chart" . }}
{{ include "oai-nr-ulsim.selectorLabels" . }}
{{- if .Chart.AppVersion }}
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
{{- end }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- end -}}
{{/*
Selector labels
*/}}
{{- define "oai-nr-ulsim.selectorLabels" -}}
app.kubernetes.io/name: {{ include "oai-nr-ulsim.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
{{- end -}}
{{/*
Create the name of the service account to use
*/}}
{{- define "oai-nr-ulsim.serviceAccountName" -}}
{{- if .Values.serviceAccount.create -}}
{{ default (include "oai-nr-ulsim.fullname" .) .Values.serviceAccount.name }}
{{- else -}}
{{ default "default" .Values.serviceAccount.name }}
{{- end -}}
{{- end -}}

View File

@@ -0,0 +1,49 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ .Chart.Name }}
labels:
{{- include "oai-nr-ulsim.labels" . | nindent 4 }}
spec:
replicas: {{ .Values.replicaCount }}
selector:
matchLabels:
{{- include "oai-nr-ulsim.selectorLabels" . | nindent 6 }}
strategy:
type: Recreate
template:
metadata:
labels:
{{- include "oai-nr-ulsim.selectorLabels" . | nindent 8 }}
spec:
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
{{- if .Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers:
- name: physim
image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
securityContext:
{{- toYaml .Values.securityContext | nindent 12 }}
ports:
- containerPort: 80
name: oai-nr-ulsim
# volumeMounts:
# - mountPath: /opt/oai-nr-ulsim/certs
# name: certs
command: ["/bin/sh", "-c"]
args:
- >
export OPENAIR_DIR=/opt/oai-physim &&
cd cmake_targets/autotests &&
./run_exec_autotests.bash -g "015111" -q -np -b &&
echo "FINISHED" &&
sleep infinity
dnsPolicy: ClusterFirst
restartPolicy: Always
schedulerName: default-scheduler
serviceAccountName: {{ .Values.global.serviceAccountName }}
terminationGracePeriodSeconds: 30

View File

@@ -0,0 +1,20 @@
apiVersion: v1
kind: Service
metadata:
name: {{ .Chart.Name }}
labels:
{{- include "oai-nr-ulsim.labels" . | nindent 4 }}
spec:
type: {{ .Values.service.type }}
{{- if contains "ClusterIP" .Values.service.type }}
clusterIP: None
{{- end }}
ports:
- name: oai-nr-ulsim
# Port accessible outside cluster
port: {{ .Values.service.port }}
# Port to forward to inside the pod
targetPort: {{ .Values.service.Port }}
protocol: TCP
selector:
{{- include "oai-nr-ulsim.selectorLabels" . | nindent 4 }}

View File

@@ -0,0 +1,63 @@
# Default values for oai-nr-ulsim.
# This is a YAML-formatted file.
# Declare variables to be passed into your templates.
replicaCount: 1
namespace: "oaicicd-ran-tmp"
image:
registry: local
repository: image-registry.openshift-image-registry.svc:5000/oaicicd-ran-tmp/oai-physim
version: temp
# pullPolicy: IfNotPresent or Never or Always
pullPolicy: Always
imagePullSecrets: []
nameOverride: ""
fullnameOverride: ""
serviceAccount:
# Specifies whether a service account should be created
create: true
# Annotations to add to the service account
annotations: {}
# The name of the service account to use.
# If not set and create is true, a name is generated using the fullname template
name: "oai-nr-ulsim-sa"
podSecurityContext:
runAsUser: 0
runAsGroup: 0
securityContext:
privileged: true
# capabilities:
# drop:
# - ALL
# readOnlyRootFilesystem: true
# runAsNonRoot: true
# runAsUser: 1000
service:
type: ClusterIP
port: 80
resources: {}
# We usually recommend not to specify default resources and to leave this as a conscious
# choice for the user. This also increases chances charts run on environments with little
# resources, such as Minikube. If you do want to specify resources, uncomment the following
# lines, adjust them as necessary, and remove the curly braces after 'resources:'.
# limits:
# cpu: 100m
# memory: 128Mi
# requests:
# cpu: 100m
# memory: 128Mi
nodeSelector: {}
tolerations: []
affinity: {}

View File

@@ -0,0 +1,36 @@
apiVersion: v1
name: oai-polartest
description: A Helm subchart for polartest network function
# A chart can be either an 'application' or a 'library' chart.
#
# Application charts are a collection of templates that can be packaged into versioned archives
# to be deployed.
#
# Library charts provide useful utilities or functions for the chart developer. They're included as
# a dependency of application charts to inject those utilities and functions into the rendering
# pipeline. Library charts do not define any templates and therefore cannot be deployed.
type: application
icon: http://www.openairinterface.org/wp-content/uploads/2015/06/cropped-oai_final_logo.png
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
version: 0.1.1
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application.
appVersion: v1
keywords:
- Physical Simulator
- polartest
- RAN
- 4G
sources:
- https://gitlab.eurecom.fr/oai/openairinterface5g
maintainers:
- name: OPENAIRINTERFACE
email: contact@openairinterface.org

View File

@@ -0,0 +1,15 @@
1. Get the application URL by running these commands:
{{- if contains "NodePort" .Values.service.type }}
export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "oai-polartest.fullname" . }})
export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
echo http://$NODE_IP:$NODE_PORT
{{- else if contains "LoadBalancer" .Values.service.type }}
NOTE: It may take a few minutes for the LoadBalancer IP to be available.
You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "oai-polartest.fullname" . }}'
export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "oai-polartest.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
echo http://$SERVICE_IP:{{ .Values.service.port }}
{{- else if contains "ClusterIP" .Values.service.type }}
export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "oai-polartest.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
echo "Visit http://127.0.0.1:8080 to use your application"
kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:80
{{- end }}

View File

@@ -0,0 +1,63 @@
{{/* vim: set filetype=mustache: */}}
{{/*
Expand the name of the chart.
*/}}
{{- define "oai-polartest.name" -}}
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{/*
Create a default fully qualified app name.
We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
If release name contains chart name it will be used as a full name.
*/}}
{{- define "oai-polartest.fullname" -}}
{{- if .Values.fullnameOverride -}}
{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
{{- else -}}
{{- $name := default .Chart.Name .Values.nameOverride -}}
{{- if contains $name .Release.Name -}}
{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
{{- else -}}
{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{- end -}}
{{- end -}}
{{/*
Create chart name and version as used by the chart label.
*/}}
{{- define "oai-polartest.chart" -}}
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{/*
Common labels
*/}}
{{- define "oai-polartest.labels" -}}
helm.sh/chart: {{ include "oai-polartest.chart" . }}
{{ include "oai-polartest.selectorLabels" . }}
{{- if .Chart.AppVersion }}
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
{{- end }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- end -}}
{{/*
Selector labels
*/}}
{{- define "oai-polartest.selectorLabels" -}}
app.kubernetes.io/name: {{ include "oai-polartest.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
{{- end -}}
{{/*
Create the name of the service account to use
*/}}
{{- define "oai-polartest.serviceAccountName" -}}
{{- if .Values.serviceAccount.create -}}
{{ default (include "oai-polartest.fullname" .) .Values.serviceAccount.name }}
{{- else -}}
{{ default "default" .Values.serviceAccount.name }}
{{- end -}}
{{- end -}}

View File

@@ -0,0 +1,49 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ .Chart.Name }}
labels:
{{- include "oai-polartest.labels" . | nindent 4 }}
spec:
replicas: {{ .Values.replicaCount }}
selector:
matchLabels:
{{- include "oai-polartest.selectorLabels" . | nindent 6 }}
strategy:
type: Recreate
template:
metadata:
labels:
{{- include "oai-polartest.selectorLabels" . | nindent 8 }}
spec:
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
{{- if .Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers:
- name: physim
image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
securityContext:
{{- toYaml .Values.securityContext | nindent 12 }}
ports:
- containerPort: 80
name: oai-polartest
# volumeMounts:
# - mountPath: /opt/oai-polartest/certs
# name: certs
command: ["/bin/sh", "-c"]
args:
- >
export OPENAIR_DIR=/opt/oai-physim &&
cd cmake_targets/autotests &&
./run_exec_autotests.bash -g "015103" -q -np -b &&
echo "FINISHED" &&
sleep infinity
dnsPolicy: ClusterFirst
restartPolicy: Always
schedulerName: default-scheduler
serviceAccountName: {{ .Values.global.serviceAccountName }}
terminationGracePeriodSeconds: 30

View File

@@ -0,0 +1,20 @@
apiVersion: v1
kind: Service
metadata:
name: {{ .Chart.Name }}
labels:
{{- include "oai-polartest.labels" . | nindent 4 }}
spec:
type: {{ .Values.service.type }}
{{- if contains "ClusterIP" .Values.service.type }}
clusterIP: None
{{- end }}
ports:
- name: oai-polartest
# Port accessible outside cluster
port: {{ .Values.service.port }}
# Port to forward to inside the pod
targetPort: {{ .Values.service.Port }}
protocol: TCP
selector:
{{- include "oai-polartest.selectorLabels" . | nindent 4 }}

View File

@@ -0,0 +1,63 @@
# Default values for oai-polartest.
# This is a YAML-formatted file.
# Declare variables to be passed into your templates.
replicaCount: 1
namespace: "oaicicd-ran-tmp"
image:
registry: local
repository: image-registry.openshift-image-registry.svc:5000/oaicicd-ran-tmp/oai-physim
version: temp
# pullPolicy: IfNotPresent or Never or Always
pullPolicy: Always
imagePullSecrets: []
nameOverride: ""
fullnameOverride: ""
serviceAccount:
# Specifies whether a service account should be created
create: true
# Annotations to add to the service account
annotations: {}
# The name of the service account to use.
# If not set and create is true, a name is generated using the fullname template
name: "oai-polartest-sa"
podSecurityContext:
runAsUser: 0
runAsGroup: 0
securityContext:
privileged: true
# capabilities:
# drop:
# - ALL
# readOnlyRootFilesystem: true
# runAsNonRoot: true
# runAsUser: 1000
service:
type: ClusterIP
port: 80
resources: {}
# We usually recommend not to specify default resources and to leave this as a conscious
# choice for the user. This also increases chances charts run on environments with little
# resources, such as Minikube. If you do want to specify resources, uncomment the following
# lines, adjust them as necessary, and remove the curly braces after 'resources:'.
# limits:
# cpu: 100m
# memory: 128Mi
# requests:
# cpu: 100m
# memory: 128Mi
nodeSelector: {}
tolerations: []
affinity: {}

View File

@@ -0,0 +1,36 @@
apiVersion: v1
name: oai-smallblocktest
description: A Helm subchart for smallblocktest network function
# A chart can be either an 'application' or a 'library' chart.
#
# Application charts are a collection of templates that can be packaged into versioned archives
# to be deployed.
#
# Library charts provide useful utilities or functions for the chart developer. They're included as
# a dependency of application charts to inject those utilities and functions into the rendering
# pipeline. Library charts do not define any templates and therefore cannot be deployed.
type: application
icon: http://www.openairinterface.org/wp-content/uploads/2015/06/cropped-oai_final_logo.png
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
version: 0.1.1
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application.
appVersion: v1
keywords:
- Physical Simulator
- smallblocktest
- RAN
- 4G
sources:
- https://gitlab.eurecom.fr/oai/openairinterface5g
maintainers:
- name: OPENAIRINTERFACE
email: contact@openairinterface.org

View File

@@ -0,0 +1,15 @@
1. Get the application URL by running these commands:
{{- if contains "NodePort" .Values.service.type }}
export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "oai-smallblocktest.fullname" . }})
export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
echo http://$NODE_IP:$NODE_PORT
{{- else if contains "LoadBalancer" .Values.service.type }}
NOTE: It may take a few minutes for the LoadBalancer IP to be available.
You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "oai-smallblocktest.fullname" . }}'
export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "oai-smallblocktest.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
echo http://$SERVICE_IP:{{ .Values.service.port }}
{{- else if contains "ClusterIP" .Values.service.type }}
export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "oai-smallblocktest.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
echo "Visit http://127.0.0.1:8080 to use your application"
kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:80
{{- end }}

View File

@@ -0,0 +1,63 @@
{{/* vim: set filetype=mustache: */}}
{{/*
Expand the name of the chart.
*/}}
{{- define "oai-smallblocktest.name" -}}
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{/*
Create a default fully qualified app name.
We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
If release name contains chart name it will be used as a full name.
*/}}
{{- define "oai-smallblocktest.fullname" -}}
{{- if .Values.fullnameOverride -}}
{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
{{- else -}}
{{- $name := default .Chart.Name .Values.nameOverride -}}
{{- if contains $name .Release.Name -}}
{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
{{- else -}}
{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{- end -}}
{{- end -}}
{{/*
Create chart name and version as used by the chart label.
*/}}
{{- define "oai-smallblocktest.chart" -}}
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{/*
Common labels
*/}}
{{- define "oai-smallblocktest.labels" -}}
helm.sh/chart: {{ include "oai-smallblocktest.chart" . }}
{{ include "oai-smallblocktest.selectorLabels" . }}
{{- if .Chart.AppVersion }}
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
{{- end }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- end -}}
{{/*
Selector labels
*/}}
{{- define "oai-smallblocktest.selectorLabels" -}}
app.kubernetes.io/name: {{ include "oai-smallblocktest.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
{{- end -}}
{{/*
Create the name of the service account to use
*/}}
{{- define "oai-smallblocktest.serviceAccountName" -}}
{{- if .Values.serviceAccount.create -}}
{{ default (include "oai-smallblocktest.fullname" .) .Values.serviceAccount.name }}
{{- else -}}
{{ default "default" .Values.serviceAccount.name }}
{{- end -}}
{{- end -}}

View File

@@ -0,0 +1,49 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ .Chart.Name }}
labels:
{{- include "oai-smallblocktest.labels" . | nindent 4 }}
spec:
replicas: {{ .Values.replicaCount }}
selector:
matchLabels:
{{- include "oai-smallblocktest.selectorLabels" . | nindent 6 }}
strategy:
type: Recreate
template:
metadata:
labels:
{{- include "oai-smallblocktest.selectorLabels" . | nindent 8 }}
spec:
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
{{- if .Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers:
- name: physim
image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
securityContext:
{{- toYaml .Values.securityContext | nindent 12 }}
ports:
- containerPort: 80
name: oai-smallblock
# volumeMounts:
# - mountPath: /opt/oai-smallblocktest/certs
# name: certs
command: ["/bin/sh", "-c"]
args:
- >
export OPENAIR_DIR=/opt/oai-physim &&
cd cmake_targets/autotests &&
./run_exec_autotests.bash -g "015107" -q -np -b &&
echo "FINISHED" &&
sleep infinity
dnsPolicy: ClusterFirst
restartPolicy: Always
schedulerName: default-scheduler
serviceAccountName: {{ .Values.global.serviceAccountName }}
terminationGracePeriodSeconds: 30

View File

@@ -0,0 +1,20 @@
apiVersion: v1
kind: Service
metadata:
name: {{ .Chart.Name }}
labels:
{{- include "oai-smallblocktest.labels" . | nindent 4 }}
spec:
type: {{ .Values.service.type }}
{{- if contains "ClusterIP" .Values.service.type }}
clusterIP: None
{{- end }}
ports:
- name: oai-smallblocktest
# Port accessible outside cluster
port: {{ .Values.service.port }}
# Port to forward to inside the pod
targetPort: {{ .Values.service.Port }}
protocol: TCP
selector:
{{- include "oai-smallblocktest.selectorLabels" . | nindent 4 }}

View File

@@ -0,0 +1,63 @@
# Default values for oai-smallblocktest.
# This is a YAML-formatted file.
# Declare variables to be passed into your templates.
replicaCount: 1
namespace: "oaicicd-ran-tmp"
image:
registry: local
repository: image-registry.openshift-image-registry.svc:5000/oaicicd-ran-tmp/oai-physim
version: temp
# pullPolicy: IfNotPresent or Never or Always
pullPolicy: Always
imagePullSecrets: []
nameOverride: ""
fullnameOverride: ""
serviceAccount:
# Specifies whether a service account should be created
create: true
# Annotations to add to the service account
annotations: {}
# The name of the service account to use.
# If not set and create is true, a name is generated using the fullname template
name: "oai-smallblocktest-sa"
podSecurityContext:
runAsUser: 0
runAsGroup: 0
securityContext:
privileged: true
# capabilities:
# drop:
# - ALL
# readOnlyRootFilesystem: true
# runAsNonRoot: true
# runAsUser: 1000
service:
type: ClusterIP
port: 80
resources: {}
# We usually recommend not to specify default resources and to leave this as a conscious
# choice for the user. This also increases chances charts run on environments with little
# resources, such as Minikube. If you do want to specify resources, uncomment the following
# lines, adjust them as necessary, and remove the curly braces after 'resources:'.
# limits:
# cpu: 100m
# memory: 128Mi
# requests:
# cpu: 100m
# memory: 128Mi
nodeSelector: {}
tolerations: []
affinity: {}

View File

@@ -0,0 +1,36 @@
apiVersion: v1
name: oai-ulsim
description: A Helm subchart for ulsim network function
# A chart can be either an 'application' or a 'library' chart.
#
# Application charts are a collection of templates that can be packaged into versioned archives
# to be deployed.
#
# Library charts provide useful utilities or functions for the chart developer. They're included as
# a dependency of application charts to inject those utilities and functions into the rendering
# pipeline. Library charts do not define any templates and therefore cannot be deployed.
type: application
icon: http://www.openairinterface.org/wp-content/uploads/2015/06/cropped-oai_final_logo.png
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
version: 0.1.1
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application.
appVersion: v1
keywords:
- Physical Simulator
- ulsim
- RAN
- 4G
sources:
- https://gitlab.eurecom.fr/oai/openairinterface5g
maintainers:
- name: OPENAIRINTERFACE
email: contact@openairinterface.org

View File

@@ -0,0 +1,15 @@
1. Get the application URL by running these commands:
{{- if contains "NodePort" .Values.service.type }}
export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "oai-ulsim.fullname" . }})
export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
echo http://$NODE_IP:$NODE_PORT
{{- else if contains "LoadBalancer" .Values.service.type }}
NOTE: It may take a few minutes for the LoadBalancer IP to be available.
You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "oai-ulsim.fullname" . }}'
export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "oai-ulsim.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
echo http://$SERVICE_IP:{{ .Values.service.port }}
{{- else if contains "ClusterIP" .Values.service.type }}
export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "oai-ulsim.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
echo "Visit http://127.0.0.1:8080 to use your application"
kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:80
{{- end }}

View File

@@ -0,0 +1,63 @@
{{/* vim: set filetype=mustache: */}}
{{/*
Expand the name of the chart.
*/}}
{{- define "oai-ulsim.name" -}}
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{/*
Create a default fully qualified app name.
We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
If release name contains chart name it will be used as a full name.
*/}}
{{- define "oai-ulsim.fullname" -}}
{{- if .Values.fullnameOverride -}}
{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
{{- else -}}
{{- $name := default .Chart.Name .Values.nameOverride -}}
{{- if contains $name .Release.Name -}}
{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
{{- else -}}
{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{- end -}}
{{- end -}}
{{/*
Create chart name and version as used by the chart label.
*/}}
{{- define "oai-ulsim.chart" -}}
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{/*
Common labels
*/}}
{{- define "oai-ulsim.labels" -}}
helm.sh/chart: {{ include "oai-ulsim.chart" . }}
{{ include "oai-ulsim.selectorLabels" . }}
{{- if .Chart.AppVersion }}
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
{{- end }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- end -}}
{{/*
Selector labels
*/}}
{{- define "oai-ulsim.selectorLabels" -}}
app.kubernetes.io/name: {{ include "oai-ulsim.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
{{- end -}}
{{/*
Create the name of the service account to use
*/}}
{{- define "oai-ulsim.serviceAccountName" -}}
{{- if .Values.serviceAccount.create -}}
{{ default (include "oai-ulsim.fullname" .) .Values.serviceAccount.name }}
{{- else -}}
{{ default "default" .Values.serviceAccount.name }}
{{- end -}}
{{- end -}}

View File

@@ -0,0 +1,49 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ .Chart.Name }}
labels:
{{- include "oai-ulsim.labels" . | nindent 4 }}
spec:
replicas: {{ .Values.replicaCount }}
selector:
matchLabels:
{{- include "oai-ulsim.selectorLabels" . | nindent 6 }}
strategy:
type: Recreate
template:
metadata:
labels:
{{- include "oai-ulsim.selectorLabels" . | nindent 8 }}
spec:
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
{{- if .Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers:
- name: physim
image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
securityContext:
{{- toYaml .Values.securityContext | nindent 12 }}
ports:
- containerPort: 80
name: oai-ulsim
# volumeMounts:
# - mountPath: /opt/oai-ulsim/certs
# name: certs
command: ["/bin/sh", "-c"]
args:
- >
export OPENAIR_DIR=/opt/oai-physim &&
cd cmake_targets/autotests &&
./run_exec_autotests.bash -g "015101" -q -np -b &&
echo "FINISHED" &&
sleep infinity
dnsPolicy: ClusterFirst
restartPolicy: Always
schedulerName: default-scheduler
serviceAccountName: {{ .Values.global.serviceAccountName }}
terminationGracePeriodSeconds: 30

View File

@@ -0,0 +1,20 @@
apiVersion: v1
kind: Service
metadata:
name: {{ .Chart.Name }}
labels:
{{- include "oai-ulsim.labels" . | nindent 4 }}
spec:
type: {{ .Values.service.type }}
{{- if contains "ClusterIP" .Values.service.type }}
clusterIP: None
{{- end }}
ports:
- name: oai-ulsim
# Port accessible outside cluster
port: {{ .Values.service.port }}
# Port to forward to inside the pod
targetPort: {{ .Values.service.Port }}
protocol: TCP
selector:
{{- include "oai-ulsim.selectorLabels" . | nindent 4 }}

View File

@@ -0,0 +1,63 @@
# Default values for oai-ulsim.
# This is a YAML-formatted file.
# Declare variables to be passed into your templates.
replicaCount: 1
namespace: "oaicicd-ran-tmp"
image:
registry: local
repository: image-registry.openshift-image-registry.svc:5000/oaicicd-ran-tmp/oai-physim
version: temp
# pullPolicy: IfNotPresent or Never or Always
pullPolicy: Always
imagePullSecrets: []
nameOverride: ""
fullnameOverride: ""
serviceAccount:
# Specifies whether a service account should be created
create: true
# Annotations to add to the service account
annotations: {}
# The name of the service account to use.
# If not set and create is true, a name is generated using the fullname template
name: "oai-ulsim-sa"
podSecurityContext:
runAsUser: 0
runAsGroup: 0
securityContext:
privileged: true
# capabilities:
# drop:
# - ALL
# readOnlyRootFilesystem: true
# runAsNonRoot: true
# runAsUser: 1000
service:
type: ClusterIP
port: 80
resources: {}
# We usually recommend not to specify default resources and to leave this as a conscious
# choice for the user. This also increases chances charts run on environments with little
# resources, such as Minikube. If you do want to specify resources, uncomment the following
# lines, adjust them as necessary, and remove the curly braces after 'resources:'.
# limits:
# cpu: 100m
# memory: 128Mi
# requests:
# cpu: 100m
# memory: 128Mi
nodeSelector: {}
tolerations: []
affinity: {}

View File

@@ -0,0 +1,12 @@
apiVersion: rbac.authorization.k8s.io/v1beta1
kind: ClusterRoleBinding
metadata:
name: {{ .Chart.Name }}-{{ .Values.global.namespace }}-rbac
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: cluster-admin
subjects:
- kind: ServiceAccount
name: {{ .Values.global.serviceAccountName }}
namespace: {{ .Values.global.namespace }}

View File

@@ -0,0 +1,4 @@
apiVersion: v1
kind: ServiceAccount
metadata:
name: {{ .Values.global.serviceAccountName }}

View File

@@ -0,0 +1,84 @@
# Default values for oai-physim.
# This is a YAML-formatted file.
# Declare variables to be passed into your templates.
global:
serviceAccountName: oai-physim-sa
namespace: "oaicicd-ran-tmp"
image:
repository: image-registry.openshift-image-registry.svc:5000/oaicicd-ran-tmp/oai-physim
version: TAG
## Declaring values specific to coressponding physim to overwrite
dlsim:
replicaCount: 1
service:
type: ClusterIP
port: 80
ulsim:
replicaCount: 1
service:
type: ClusterIP
port: 80
ldpctest:
replicaCount: 1
service:
type: ClusterIP
port: 80
polartest:
replicaCount: 1
service:
type: ClusterIP
port: 80
nr-pbchsim:
replicaCount: 1
service:
type: ClusterIP
port: 80
nr-dlsim:
replicaCount: 1
service:
type: ClusterIP
port: 80
nr-dlschsim:
replicaCount: 1
service:
type: ClusterIP
port: 80
smallblocktest:
replicaCount: 1
service:
type: ClusterIP
port: 80
nr-ulschsim:
replicaCount: 1
service:
type: ClusterIP
port: 80
nr-pucchsim:
replicaCount: 1
service:
type: ClusterIP
port: 80
nr-ulsim:
replicaCount: 1
service:
type: ClusterIP
port: 80
nr-prachsim:
replicaCount: 1
service:
type: ClusterIP
port: 80

View File

@@ -1,3 +1,4 @@
r*.raw
enb_*.log
ue_*.log
ping_*.*
@@ -5,3 +6,5 @@ iperf_*.*
phones_list.txt
modules_list.txt
test_results*.html
pMain*
__pycache__

View File

@@ -0,0 +1,307 @@
#!/bin/groovy
/*
* Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The OpenAirInterface Software Alliance licenses this file to You under
* the OAI Public License, Version 1.1 (the "License"); you may not use this file
* except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.openairinterface.org/?page_id=698
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*-------------------------------------------------------------------------------
* For more information about the OpenAirInterface (OAI) Software Alliance:
* contact@openairinterface.org
*/
// Location of the executor node
def nodeExecutor = params.nodeExecutor
// Tags to shorten pipeline duration
def doMandatoryTests = false
def doFullTestsuite = false
//
def gitCommitAuthorEmailAddr
pipeline {
agent {
label nodeExecutor
}
options {
disableConcurrentBuilds()
timestamps()
gitLabConnection('OAI GitLab')
ansiColor('xterm')
}
stages {
stage ("Verify Parameters") {
steps {
script {
JOB_TIMESTAMP = sh returnStdout: true, script: 'date --utc --rfc-3339=seconds | sed -e "s#+00:00##"'
JOB_TIMESTAMP = JOB_TIMESTAMP.trim()
echo '\u2705 \u001B[32mVerify Parameters\u001B[0m'
def allParametersPresent = true
echo '\u2705 \u001B[32mVerify Labels\u001B[0m'
if ("MERGE".equals(env.gitlabActionType)) {
LABEL_CHECK = sh returnStdout: true, script: 'ci-scripts/checkGitLabMergeRequestLabels.sh --mr-id ' + env.gitlabMergeRequestIid
LABEL_CHECK = LABEL_CHECK.trim()
if (LABEL_CHECK == 'NONE') {
def message = "OAI " + JOB_NAME + " build (" + BUILD_ID + "): Your merge request has none of the mandatory labels:\n\n"
message += " - BUILD-ONLY\n"
message += " - 4G-LTE\n"
message += " - 5G-NR\n"
message += " - CI\n\n"
message += "Not performing CI due to lack of labels"
addGitLabMRComment comment: message
error('Not performing CI due to lack of labels')
} else if (LABEL_CHECK == 'FULL') {
doMandatoryTests = true
doFullTestsuite = true
} else if (LABEL_CHECK == 'SHORTEN-5G') {
doMandatoryTests = true
} else {
def message = "OAI " + JOB_NAME + " build (" + BUILD_ID + "): We will perform only build stages on your Merge Request"
addGitLabMRComment comment: message
}
} else {
doMandatoryTests = true
doFullTestsuite = true
}
}
}
}
stage ("Verify Guidelines") {
steps {
echo "Git URL is ${GIT_URL}"
echo "GitLab Act is ${env.gitlabActionType}"
script {
if ("MERGE".equals(env.gitlabActionType)) {
// since a bit, in push events, gitlabUserEmail is not populated
gitCommitAuthorEmailAddr = env.gitlabUserEmail
echo "GitLab Usermail is ${gitCommitAuthorEmailAddr}"
// GitLab-Jenkins plugin integration is lacking to perform the merge by itself
// Doing it manually --> it may have merge conflicts
sh "./ci-scripts/doGitLabMerge.sh --src-branch ${env.gitlabSourceBranch} --src-commit ${env.gitlabMergeRequestLastCommit} --target-branch ${env.gitlabTargetBranch} --target-commit ${GIT_COMMIT}"
} else {
echo "Git Branch is ${GIT_BRANCH}"
echo "Git Commit is ${GIT_COMMIT}"
// since a bit, in push events, gitlabUserEmail is not populated
gitCommitAuthorEmailAddr = sh returnStdout: true, script: 'git log -n1 --pretty=format:%ae ${GIT_COMMIT}'
gitCommitAuthorEmailAddr = gitCommitAuthorEmailAddr.trim()
echo "GitLab Usermail is ${gitCommitAuthorEmailAddr}"
sh "git log -n1 --pretty=format:\"%s\" > .git/CI_COMMIT_MSG"
}
}
}
post {
failure {
script {
def message = "OAI " + JOB_NAME + " build (" + BUILD_ID + "): Merge Conflicts -- Cannot perform CI"
addGitLabMRComment comment: message
currentBuild.result = 'FAILURE'
}
}
}
}
// Build Stages are Mandatory
// Later we will add a Ubuntu20 build
stage ("Image Building Processes") {
parallel {
stage ("Ubuntu18 Build") {
steps {
script {
triggerSlaveJob ('RAN-Ubuntu18-Image-Builder', 'Ubuntu18-Images-Build')
}
}
post {
always {
script {
finalizeSlaveJob('RAN-Ubuntu18-Image-Builder')
}
}
failure {
script {
currentBuild.result = 'FAILURE'
}
}
}
}
stage ("RHEL8 Build") {
steps {
script {
triggerSlaveJob ('RAN-RHEL8-Image-Builder', 'RHEL8-Images-Build')
}
}
post {
always {
script {
finalizeSlaveJob('RAN-RHEL8-Image-Builder')
}
}
failure {
script {
currentBuild.result = 'FAILURE'
}
}
}
}
stage ("CppCheck Analysis") {
steps {
script {
triggerSlaveJob ('RAN-cppcheck', 'CppCheck Analysis')
}
}
post {
always {
script {
finalizeSlaveJob('RAN-cppcheck')
}
}
failure {
script {
currentBuild.result = 'FAILURE'
}
}
}
}
}
}
stage ("Image Test Processes") {
parallel {
stage ("Physical Simulators") {
when { expression {doMandatoryTests} }
steps {
script {
triggerSlaveJob ('RAN-PhySim-Cluster', 'Test-Physim-Cluster')
}
}
post {
always {
script {
finalizeSlaveJob('RAN-PhySim-Cluster')
}
}
failure {
script {
currentBuild.result = 'FAILURE'
}
}
}
}
}
}
}
post {
always {
script {
def eSubject = JOB_NAME + ' - Build # ' + BUILD_ID + ' - ' + currentBuild.result + '!'
def eBody = "Hi,\n\n"
eBody += "Here are attached HTML report files for " + JOB_NAME + " - Build # " + BUILD_ID + " - " + currentBuild.result + "!\n\n"
eBody += "Regards,\n"
eBody += "OAI CI Team"
emailext attachmentsPattern: '*results*.html',
body: eBody,
replyTo: 'no-reply@openairinterface.org',
subject: eSubject,
to: gitCommitAuthorEmailAddr
if (fileExists('.git/CI_COMMIT_MSG')) {
sh "rm -f .git/CI_COMMIT_MSG"
}
}
}
success {
script {
def message = "OAI " + JOB_NAME + " build (" + BUILD_ID + "): passed (" + BUILD_URL + ")"
if ("MERGE".equals(env.gitlabActionType)) {
echo "This is a MERGE event"
addGitLabMRComment comment: message
}
}
}
failure {
script {
def message = "OAI " + JOB_NAME + " build (" + BUILD_ID + "): failed (" + BUILD_URL + ")"
if ("MERGE".equals(env.gitlabActionType)) {
echo "This is a MERGE event"
addGitLabMRComment comment: message
}
}
}
}
}
// ---- Slave Job functions
def triggerSlaveJob (jobName, gitlabStatusName) {
// Workaround for the "cancelled" GitLab pipeline notification
// The slave job is triggered with the propagate false so the following commands are executed
// Its status is now PASS/SUCCESS from a stage pipeline point of view
// localStatus variable MUST be analyzed to properly assess the status
localStatus = build job: jobName,
parameters: [
string(name: 'eNB_Repository', value: String.valueOf(GIT_URL)),
string(name: 'eNB_Branch', value: String.valueOf(env.gitlabSourceBranch)),
string(name: 'eNB_CommitID', value: String.valueOf(env.gitlabMergeRequestLastCommit)),
booleanParam(name: 'eNB_mergeRequest', value: "MERGE".equals(env.gitlabActionType)),
string(name: 'eNB_TargetBranch', value: String.valueOf(env.gitlabTargetBranch))
], propagate: false
localResult = localStatus.getResult()
echo "${jobName} Slave Job status is ${localResult}"
gitlabCommitStatus(name: gitlabStatusName) {
if (localStatus.resultIsBetterOrEqualTo('SUCCESS')) {
echo "${jobName} Slave Job is OK"
} else {
echo "${jobName} Slave Job is KO"
sh "ci-scripts/fail.sh"
}
}
}
def triggerSlaveJobNoGitLab (jobName) {
// Workaround for the "cancelled" GitLab pipeline notification
// The slave job is triggered with the propagate false so the following commands are executed
// Its status is now PASS/SUCCESS from a stage pipeline point of view
// localStatus variable MUST be analyzed to properly assess the status
localStatus = build job: jobName,
parameters: [
string(name: 'eNB_Repository', value: String.valueOf(GIT_URL)),
string(name: 'eNB_Branch', value: String.valueOf(env.gitlabSourceBranch)),
string(name: 'eNB_CommitID', value: String.valueOf(env.gitlabMergeRequestLastCommit)),
booleanParam(name: 'eNB_mergeRequest', value: "MERGE".equals(env.gitlabActionType)),
string(name: 'eNB_TargetBranch', value: String.valueOf(env.gitlabTargetBranch))
], propagate: false
localResult = localStatus.getResult()
echo "${jobName} Slave Job status is ${localResult}"
if (localStatus.resultIsBetterOrEqualTo('SUCCESS')) {
echo "${jobName} Slave Job is OK"
} else {
echo "${jobName} Slave Job is KO"
sh "ci-scripts/fail.sh"
}
}
def finalizeSlaveJob(jobName) {
// In case of any non-success, we are retrieving the HTML report of the last completed
// slave job. The only drop-back is that we may retrieve the HTML report of a previous build
fileName = "test_results-${jobName}.html"
if (!fileExists(fileName)) {
copyArtifacts(projectName: jobName,
filter: 'test_results*.html',
selector: lastCompleted())
if (fileExists(fileName)) {
sh "sed -i -e 's#TEMPLATE_BUILD_TIME#${JOB_TIMESTAMP}#' ${fileName}"
archiveArtifacts artifacts: fileName
}
}
}

View File

@@ -0,0 +1,45 @@
#!/bin/groovy
/*
* Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The OpenAirInterface Software Alliance licenses this file to You under
* the OAI Public License, Version 1.1 (the "License"); you may not use this file
* except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.openairinterface.org/?page_id=698
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*-------------------------------------------------------------------------------
* For more information about the OpenAirInterface (OAI) Software Alliance:
* contact@openairinterface.org
*/
// Template Jenkins Declarative Pipeline script to run Test w/ RF HW
// Location of the python executor node shall be in the same subnet as the others servers
def pythonExecutor = params.pythonExecutor
pipeline {
agent {
label pythonExecutor
}
stages {
stage ("gDashboard") {
steps {
script {
//retrieve MR data from gitlab and export to gSheet
sh returnStdout: true, script: 'python3 ci-scripts/ran_dashboard.py'
}
}
}
}
}

View File

@@ -30,12 +30,16 @@ def sendSocialMediaMessage(pipeChannel, pipeColor, pipeMessage) {
}
}
def doRedHatBuild = false
def doFlexranCtrlTest = false
// Location of the executor node
def nodeExecutor = params.nodeExecutor
// VM Lockable resources
def vmResource = params.vmLockableResource
// Tags to shorten pipeline duration
def doMandatoryTests = false
def doFullTestsuite = false
pipeline {
agent {
label nodeExecutor
@@ -44,28 +48,6 @@ pipeline {
disableConcurrentBuilds()
timestamps()
gitLabConnection('OAI GitLab')
gitlabBuilds(builds: [
"Build gNB-USRP",
"Build nr-UE-USRP",
"Build eNB-USRP",
"Build basic-sim",
"Build phy-sim",
"Build eNB-ethernet",
"Build UE-ethernet",
"Analysis with cppcheck",
"Test phy-sim",
"Test basic-sim",
"Test L2-sim",
"Test-Mono-FDD-Band7",
"Test-Mono-TDD-Band40",
"Test-IF4p5-FDD-Band7",
"Test-IF4p5-TDD-Band40",
"Test-Mono-FDD-Band13-LTE-M",
"Test-IF4p5-TDD-Band38-Multi-RRU",
"Test-eNB-OAI-UE-FDD-Band7",
"Test-Mono-FDD-Band13-X2-HO",
"Test-TDD-Band78-gNB-NR-UE"
])
ansiColor('xterm')
}
@@ -82,27 +64,36 @@ pipeline {
echo "Platform is ${env.TESTPLATFORM_OWNER}"
}
if (params.RedHatRemoteServer == null) {
allParametersPresent = false
}
if (params.RedHatRemoteCredentials == null) {
allParametersPresent = false
}
if (params.RedHatWorkingPath == null) {
allParametersPresent = false
}
if (allParametersPresent) {
echo "Performing Red Hat Build"
doRedHatBuild = true
} else {
doRedHatBuild = false
}
if (params.FlexRanRtcGitLabRepository_Credentials != null) {
doFlexranCtrlTest = true
}
if (fileExists("flexran")) {
sh "rm -Rf flexran > /dev/null 2>&1"
}
echo '\u2705 \u001B[32mVerify Labels\u001B[0m'
if ("MERGE".equals(env.gitlabActionType)) {
LABEL_CHECK = sh returnStdout: true, script: 'ci-scripts/checkGitLabMergeRequestLabels.sh --mr-id ' + env.gitlabMergeRequestIid
LABEL_CHECK = LABEL_CHECK.trim()
if (LABEL_CHECK == 'NONE') {
def message = "OAI " + JOB_NAME + " build (" + BUILD_ID + "): Your merge request has none of the mandatory labels:\n\n"
message += " - BUILD-ONLY\n"
message += " - 4G-LTE\n"
message += " - 5G-NR\n"
message += " - CI\n\n"
message += "Not performing CI due to lack of labels"
addGitLabMRComment comment: message
error('Not performing CI due to lack of labels')
} else if (LABEL_CHECK == 'FULL') {
doMandatoryTests = true
doFullTestsuite = true
} else if (LABEL_CHECK == 'SHORTEN-5G') {
doMandatoryTests = true
} else {
def message = "OAI " + JOB_NAME + " build (" + BUILD_ID + "): We will perform only build stages on your Merge Request"
addGitLabMRComment comment: message
}
} else {
doMandatoryTests = true
doFullTestsuite = true
}
}
}
}
@@ -145,15 +136,13 @@ pipeline {
// For the moment, there is no fail criteria. Just a notification of number of files that do not follow
sh "./ci-scripts/checkCodingFormattingRules.sh"
}
if (doFlexranCtrlTest) {
// With Mosaic 5G being part of OSA and making all it's repositories public
// No need to pass credentials to clone flexran-rtc
if (doMandatoryTests) {
sh "mkdir flexran"
dir ('flexran') {
withCredentials([
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.FlexRanRtcGitLabRepository_Credentials}", usernameVariable: 'git_username', passwordVariable: 'git_password']
]) {
sh "git clone https://${git_username}:${git_password}@gitlab.eurecom.fr/flexran/flexran-rtc.git . > ../git_clone.log 2>&1"
sh "git checkout develop >> ../git_clone.log 2>&1"
}
sh "git clone https://gitlab.eurecom.fr/flexran/flexran-rtc.git . > ../git_clone.log 2>&1"
sh "git checkout develop >> ../git_clone.log 2>&1"
sh "zip -r -qq flexran.zip ."
}
}
@@ -172,83 +161,60 @@ pipeline {
stage ("Start VM -- basic-sim") {
steps {
lock (vmResource) {
timeout (time: 5, unit: 'MINUTES') {
sh "./ci-scripts/oai-ci-vm-tool build --workspace $WORKSPACE --variant basic-sim --job-name ${JOB_NAME} --build-id ${BUILD_ID} --daemon"
}
}
}
}
stage ("Start VM -- gnb-usrp") {
steps {
lock (vmResource) {
timeout (time: 5, unit: 'MINUTES') {
sh "./ci-scripts/oai-ci-vm-tool build --workspace $WORKSPACE --variant gnb-usrp --job-name ${JOB_NAME} --build-id ${BUILD_ID} --daemon"
}
}
}
}
stage ("Start VM -- nr-ue-usrp") {
steps {
lock (vmResource) {
timeout (time: 5, unit: 'MINUTES') {
sh "./ci-scripts/oai-ci-vm-tool build --workspace $WORKSPACE --variant nr-ue-usrp --job-name ${JOB_NAME} --build-id ${BUILD_ID} --daemon"
}
}
}
}
stage ("Start VM -- enb-usrp") {
steps {
timeout (time: 5, unit: 'MINUTES') {
sh "./ci-scripts/oai-ci-vm-tool build --workspace $WORKSPACE --variant enb-usrp --job-name ${JOB_NAME} --build-id ${BUILD_ID} --daemon"
}
}
}
stage ("Start VM -- phy-sim") {
steps {
timeout (time: 5, unit: 'MINUTES') {
sh "./ci-scripts/oai-ci-vm-tool build --workspace $WORKSPACE --variant phy-sim --job-name ${JOB_NAME} --build-id ${BUILD_ID} --daemon"
}
}
}
stage ("Start VM -- enb-ethernet") {
steps {
timeout (time: 5, unit: 'MINUTES') {
lock (vmResource) {
timeout (time: 7, unit: 'MINUTES') {
sh "./ci-scripts/oai-ci-vm-tool build --workspace $WORKSPACE --variant enb-ethernet --job-name ${JOB_NAME} --build-id ${BUILD_ID} --daemon"
}
}
}
}
stage ("Start VM -- ue-ethernet") {
steps {
timeout (time: 5, unit: 'MINUTES') {
lock (vmResource) {
timeout (time: 7, unit: 'MINUTES') {
sh "./ci-scripts/oai-ci-vm-tool build --workspace $WORKSPACE --variant ue-ethernet --job-name ${JOB_NAME} --build-id ${BUILD_ID} --daemon"
}
}
}
}
}
stage ("Start VM -- cppcheck") {
steps {
timeout (time: 5, unit: 'MINUTES') {
sh "./ci-scripts/oai-ci-vm-tool build --workspace $WORKSPACE --variant cppcheck --job-name ${JOB_NAME} --build-id ${BUILD_ID} --daemon"
}
}
}
stage ("Variant Builds") {
parallel {
stage ("Analysis with cppcheck") {
steps {
gitlabCommitStatus(name: "Analysis with cppcheck") {
timeout (time: 20, unit: 'MINUTES') {
sh "./ci-scripts/oai-ci-vm-tool wait --workspace $WORKSPACE --variant cppcheck --job-name ${JOB_NAME} --build-id ${BUILD_ID}"
}
}
}
}
stage ("Build basic simulator") {
steps {
gitlabCommitStatus(name: "Build basic-sim") {
timeout (time: 20, unit: 'MINUTES') {
timeout (time: 45, unit: 'MINUTES') {
sh "./ci-scripts/oai-ci-vm-tool wait --workspace $WORKSPACE --variant basic-sim --job-name ${JOB_NAME} --build-id ${BUILD_ID} --keep-vm-alive"
}
}
@@ -257,7 +223,7 @@ pipeline {
stage ("Build 5G gNB-USRP") {
steps {
gitlabCommitStatus(name: "Build gNB-USRP") {
timeout (time: 20, unit: 'MINUTES') {
timeout (time: 45, unit: 'MINUTES') {
sh "./ci-scripts/oai-ci-vm-tool wait --workspace $WORKSPACE --variant gnb-usrp --job-name ${JOB_NAME} --build-id ${BUILD_ID} --keep-vm-alive"
}
}
@@ -266,34 +232,16 @@ pipeline {
stage ("Build 5G NR-UE-USRP") {
steps {
gitlabCommitStatus(name: "Build nr-UE-USRP") {
timeout (time: 20, unit: 'MINUTES') {
timeout (time: 45, unit: 'MINUTES') {
sh "./ci-scripts/oai-ci-vm-tool wait --workspace $WORKSPACE --variant nr-ue-usrp --job-name ${JOB_NAME} --build-id ${BUILD_ID} --keep-vm-alive"
}
}
}
}
stage ("Build eNB-USRP") {
steps {
gitlabCommitStatus(name: "Build eNB-USRP") {
timeout (time: 20, unit: 'MINUTES') {
sh "./ci-scripts/oai-ci-vm-tool wait --workspace $WORKSPACE --variant enb-usrp --job-name ${JOB_NAME} --build-id ${BUILD_ID} --keep-vm-alive"
}
}
}
}
stage ("Build physical simulators") {
steps {
gitlabCommitStatus(name: "Build phy-sim") {
timeout (time: 20, unit: 'MINUTES') {
sh "./ci-scripts/oai-ci-vm-tool wait --workspace $WORKSPACE --variant phy-sim --job-name ${JOB_NAME} --build-id ${BUILD_ID} --keep-vm-alive"
}
}
}
}
stage ("Build eNB-ethernet") {
steps {
gitlabCommitStatus(name: "Build eNB-ethernet") {
timeout (time: 20, unit: 'MINUTES') {
timeout (time: 45, unit: 'MINUTES') {
sh "./ci-scripts/oai-ci-vm-tool wait --workspace $WORKSPACE --variant enb-ethernet --job-name ${JOB_NAME} --build-id ${BUILD_ID} --keep-vm-alive"
}
}
@@ -301,33 +249,14 @@ pipeline {
}
stage ("Build UE-ethernet") {
steps {
// This is typically the last one to finish.
lock (vmResource) {
gitlabCommitStatus(name: "Build UE-ethernet") {
timeout (time: 20, unit: 'MINUTES') {
timeout (time: 45, unit: 'MINUTES') {
sh "./ci-scripts/oai-ci-vm-tool wait --workspace $WORKSPACE --variant ue-ethernet --job-name ${JOB_NAME} --build-id ${BUILD_ID} --keep-vm-alive"
}
}
}
}
stage ("Build eNB-USRP on Red Hat") {
when {
expression {doRedHatBuild}
}
steps {
gitlabCommitStatus(name: "Build eNB-USRP-RHE") {
script {
try {
withCredentials([
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.RedHatRemoteCredentials}", usernameVariable: 'RH_Username', passwordVariable: 'RH_Password']
]) {
timeout (time: 20, unit: 'MINUTES') {
sh "./ci-scripts/buildOnRH.sh --workspace $WORKSPACE --job-name ${JOB_NAME} --build-id ${BUILD_ID} --remote-host ${params.RedHatRemoteServer} --remote-path ${params.RedHatWorkingPath} --remote-user-name ${RH_Username} --remote-password ${RH_Password}"
}
}
} catch (Exception e) {
echo "Red Hat build failed but we could keep running pipeline if all ubuntu-based build passed"
}
}
}
}
}
}
}
@@ -340,23 +269,17 @@ pipeline {
always {
script {
dir ('archives') {
sh "zip -r -qq vm_build_logs.zip basic_sim enb_usrp phy_sim cppcheck enb_eth ue_eth gnb_usrp nrue_usrp red_hat"
if (fileExists('red_hat')) {
sh "zip -r -qq vm_build_logs.zip basic_sim enb_eth ue_eth gnb_usrp nr_ue_usrp red_hat"
} else {
sh "zip -r -qq vm_build_logs.zip basic_sim enb_eth ue_eth gnb_usrp nr_ue_usrp"
}
}
if(fileExists('archives/vm_build_logs.zip')) {
archiveArtifacts artifacts: 'archives/vm_build_logs.zip'
}
if ("MERGE".equals(env.gitlabActionType)) {
sh "./ci-scripts/oai-ci-vm-tool report-build --workspace $WORKSPACE --git-url ${GIT_URL} --job-name ${JOB_NAME} --build-id ${BUILD_ID} --trigger merge-request --src-branch ${env.gitlabSourceBranch} --src-commit ${env.gitlabMergeRequestLastCommit} --target-branch ${env.gitlabTargetBranch} --target-commit ${GIT_COMMIT}"
// If the merge request has introduced more CPPCHECK errors or warnings, notifications in GitLab
if (fileExists('oai_cppcheck_added_errors.txt')) {
def ret=readFile('./oai_cppcheck_added_errors.txt').trim();
if ("0".equals(ret)) {
echo "No added cppcheck warnings/errors in this merge request"
} else {
def message = "OAI " + JOB_NAME + " build (" + BUILD_ID + "): Some modified files in Merge Request MAY have INTRODUCED up to " + ret + " CPPCHECK errors/warnings"
addGitLabMRComment comment: message
}
}
// If the merge request has introduced compilation warnings, notifications in GitLab
sh "./ci-scripts/checkAddedWarnings.sh --src-branch ${env.gitlabSourceBranch} --target-branch ${env.gitlabTargetBranch}"
def res=readFile('./oai_warning_files.txt').trim();
@@ -383,26 +306,12 @@ pipeline {
parallel {
stage ("VM-based tests") {
stages {
stage ("Test physical simulators") {
steps {
script {
timeout (time: 90, unit: 'MINUTES') {
try {
gitlabCommitStatus(name: "Test phy-sim") {
sh "./ci-scripts/oai-ci-vm-tool test --workspace $WORKSPACE --variant phy-sim --job-name ${JOB_NAME} --build-id ${BUILD_ID}"
}
} catch (Exception e) {
currentBuild.result = 'FAILURE'
}
}
}
}
}
stage ("Build Flexran Controller") {
when {
expression {doFlexranCtrlTest}
expression {doMandatoryTests}
}
steps {
lock (vmResource) {
script {
timeout (time: 20, unit: 'MINUTES') {
try {
@@ -412,10 +321,15 @@ pipeline {
}
}
}
}
}
}
stage ("Test basic simulator") {
when {
expression {doMandatoryTests}
}
steps {
lock (vmResource) {
script {
timeout (time: 30, unit: 'MINUTES') {
try {
@@ -427,10 +341,15 @@ pipeline {
}
}
}
}
}
}
stage ("Test L1 simulator") {
when {
expression {doMandatoryTests}
}
steps {
lock (vmResource) {
script {
timeout (time: 30, unit: 'MINUTES') {
try {
@@ -442,12 +361,17 @@ pipeline {
}
}
}
}
}
}
stage ("Test RF simulator") {
when {
expression {doMandatoryTests}
}
steps {
lock (vmResource) {
script {
timeout (time: 30, unit: 'MINUTES') {
timeout (time: 40, unit: 'MINUTES') {
try {
gitlabCommitStatus(name: "Test RF-sim") {
sh "./ci-scripts/oai-ci-vm-tool test --workspace $WORKSPACE --variant rf-sim --job-name ${JOB_NAME} --build-id ${BUILD_ID} --keep-vm-alive"
@@ -457,10 +381,15 @@ pipeline {
}
}
}
}
}
}
stage ("Test L2 simulator") {
when {
expression {doFullTestsuite}
}
steps {
lock (vmResource) {
script {
timeout (time: 30, unit: 'MINUTES') {
try {
@@ -472,16 +401,25 @@ pipeline {
}
}
}
}
}
}
stage ("Destroy all Virtual Machines") {
when {
expression {doMandatoryTests}
}
steps {
lock (vmResource) {
sh "./ci-scripts/oai-ci-vm-tool destroy --job-name ${JOB_NAME} --build-id ${BUILD_ID}"
}
}
}
}
}
stage ("Test MONOLITHIC - FDD - Band 7 - B210") {
when {
expression {doFullTestsuite}
}
steps {
script {
triggerSlaveJob ('eNB-CI-FDD-Band7-B210', 'Test-Mono-FDD-Band7')
@@ -501,6 +439,9 @@ pipeline {
}
}
stage ("Test MONOLITHIC - TDD - Band 40 - B210") {
when {
expression {doFullTestsuite}
}
steps {
script {
triggerSlaveJob ('eNB-CI-TDD-Band40-B210', 'Test-Mono-TDD-Band40')
@@ -520,6 +461,9 @@ pipeline {
}
}
stage ("Test IF4p5 - FDD - Band 7 - B210") {
when {
expression {doFullTestsuite}
}
steps {
script {
sh "sleep 60"
@@ -540,6 +484,9 @@ pipeline {
}
}
stage ("Test IF4p5 - TDD - Band 40 - B210") {
when {
expression {doFullTestsuite}
}
steps {
script {
sh "sleep 60"
@@ -560,6 +507,9 @@ pipeline {
}
}
stage ("Test MONOLITHIC - FDD - Band 13 - B210") {
when {
expression {doFullTestsuite}
}
steps {
script {
sh "sleep 60"
@@ -580,6 +530,9 @@ pipeline {
}
}
stage ("Test X2 Handover - FDD - Band 13 - B210") {
when {
expression {doFullTestsuite}
}
steps {
script {
sh "sleep 60"
@@ -600,6 +553,9 @@ pipeline {
}
}
stage ("Test IF4p5 - TDD - Band 38 - B210 - MultiRRU") {
when {
expression {doFullTestsuite}
}
steps {
script {
triggerSlaveJob ('eNB-CI-IF4p5-TDD-Band38-MultiRRU-B210', 'Test-IF4p5-TDD-Band38-Multi-RRU')
@@ -619,6 +575,9 @@ pipeline {
}
}
stage ("Test OAI UE - FDD - Band 20 - B200") {
when {
expression {doFullTestsuite}
}
steps {
script {
triggerSlaveJobNoGitLab ('UE-CI-FDD-Band20-B200')
@@ -638,6 +597,9 @@ pipeline {
}
}
stage ("Test OAI UE - OAI eNB - FDD - Band 7 - B200") {
when {
expression {doFullTestsuite}
}
steps {
script {
// Delayed trigger on slave job, so it is always the last one to run
@@ -659,6 +621,9 @@ pipeline {
}
}
stage ("Test OAI NR UE - OAI gNB - TDD - Band 78 - N300") {
when {
expression {doMandatoryTests}
}
steps {
script {
triggerSlaveJob ('gNB-nrUE-MONO-TDD-Band78-N300', 'Test-TDD-Band78-gNB-NR-UE')
@@ -677,12 +642,35 @@ pipeline {
}
}
}
stage ("Test OAI OCP-eNB - FDD - Band 7 - B210") {
when {
expression {doFullTestsuite}
}
steps {
script {
triggerSlaveJob ('OCPeNB-FDD-Band7-B210', 'Test-OCP-FDD-Band7')
}
}
post {
always {
script {
finalizeSlaveJob('OCPeNB-FDD-Band7-B210')
}
}
failure {
script {
currentBuild.result = 'FAILURE'
}
}
}
}
}
post {
always {
script {
if (doMandatoryTests) {
dir ('archives') {
sh "if [ -d basic_sim/test ] || [ -d phy_sim/test ] || [ -d l2_sim/test ]; then zip -r -qq vm_tests_logs.zip */test ; fi"
sh "if [ -d basic_sim/test ] || [ -d rf_sim/test ] || [ -d l2_sim/test ]; then zip -r -qq vm_tests_logs.zip */test ; fi"
}
if(fileExists('archives/vm_tests_logs.zip')) {
archiveArtifacts artifacts: 'archives/vm_tests_logs.zip'
@@ -696,6 +684,7 @@ pipeline {
archiveArtifacts artifacts: 'test_simulator_results.html'
}
}
}
}
}
}

View File

@@ -59,6 +59,10 @@ def r2labEPC0IpAddr = r2labBaseIpAddr + r2labEPC0Idx
def r2labUE0Idx = '6'
def r2labUE0 = 'fit0' + r2labUE0Idx
def r2labUE0IpAddr = r2labBaseIpAddr + r2labUE0Idx
def r2labENB1Idx = '16'
def r2labENB1 = 'fit' + r2labENB1Idx
def r2labENB1IpAddr = r2labBaseIpAddr + r2labENB1Idx
def r2labDoAllOff = true
pipeline {
agent {
@@ -131,7 +135,17 @@ pipeline {
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.R2LAB_Credentials}", usernameVariable: 'r2labuser', passwordVariable: 'r2labpassword']
]) {
sh "python3 /home/eurecom/inria-scripts/booking-lease.py --book-lease --from ${BOOK_TIMESTAMP}T${r2labStartTime} --duration ${r2labDuration} --slice inria_oaici ${r2labuser} ${r2labpassword}"
sh "python3 /home/eurecom/inria-scripts/booking-lease.py --get-leases ${r2labuser} ${r2labpassword}"
sh "python3 /home/eurecom/inria-scripts/booking-lease.py --get-leases ${r2labuser} ${r2labpassword} | grep -v nightly"
}
// Adding a tempo after booking leases
sh "sleep 10"
LEASE_STATUS = sh returnStdout: true, script: "ssh -t inria_oaici@faraday.inria.fr 'rleases --check'"
LEASE_STATUS = LEASE_STATUS.trim()
if (LEASE_STATUS ==~ /.*Access currently denied to inria_oaici.*/) {
r2labDoAllOff = false
currentBuild.result = 'ABORTED'
error('Stopping early because R2LAB not available')
}
}
}
@@ -139,25 +153,49 @@ pipeline {
stage ("Load Images") {
steps {
script {
echo '\u2705 \u001B[32mLoad Image for Python Executor\u001B[0m'
sh "ssh -t inria_oaici@faraday.inria.fr 'rload -i oai-ci-cd-u18-lowlatency-enb-ue ${r2labPythonExeIdx} > /dev/null 2>&1'"
sh "ssh -t inria_oaici@faraday.inria.fr 'rwait --silent ${r2labPythonExeIdx}'"
sh "ssh -t inria_oaici@faraday.inria.fr 'all-off'"
sh "sleep 10"
echo '\u2705 \u001B[32mLoad Image for one eNB\u001B[0m'
sh "ssh -t inria_oaici@faraday.inria.fr 'rload -i oai-ci-cd-u18-lowlatency-enb-ue ${r2labENB0Idx} > /dev/null 2>&1'"
sh "ssh -t inria_oaici@faraday.inria.fr 'rwait --silent ${r2labENB0Idx}'"
sh "ssh -t inria_oaici@faraday.inria.fr 'uon ${r2labENB0Idx}'"
echo '\u2705 \u001B[32mLoad Image for Python Executor\u001B[0m'
try {
sh "ssh -t inria_oaici@faraday.inria.fr 'rload -i oai-ci-cd-u18-lowlatency-enb-ue ${r2labPythonExeIdx} > /dev/null 2>&1'"
} catch (Exception e) {
echo "Why is it wrong?"
}
try {
//sh "ssh -t inria_oaici@faraday.inria.fr 'rwait --silent ${r2labPythonExeIdx}'"
sh "ssh -t inria_oaici@faraday.inria.fr 'rwait ${r2labPythonExeIdx}'"
} catch (Exception e) {
echo "Why is it wrong?"
}
echo '\u2705 \u001B[32mLoad Image for two (2) eNBs\u001B[0m'
try {
sh "ssh -t inria_oaici@faraday.inria.fr 'rload -i oai-ci-cd-u18-lowlatency-enb-ue ${r2labENB0Idx},${r2labENB1Idx} > /dev/null 2>&1'"
} catch (Exception e) {
echo "Why is it wrong?"
}
try {
sh "ssh -t inria_oaici@faraday.inria.fr 'rwait --silent ${r2labENB0Idx},${r2labENB1Idx}'"
} catch (Exception e) {
echo "Why is it wrong?"
}
sh "ssh -t inria_oaici@faraday.inria.fr 'uon ${r2labENB0Idx},${r2labENB1Idx}'"
sh "sleep 5"
sh "ssh -t inria_oaici@faraday.inria.fr 'uon ${r2labENB0Idx},${r2labENB1Idx}'"
echo '\u2705 \u001B[32mLoad Image for one OAI UE\u001B[0m'
sh "ssh -t inria_oaici@faraday.inria.fr 'rload -i oai-ci-cd-u18-lowlatency-enb-ue ${r2labUE0Idx} > /dev/null 2>&1'"
sh "ssh -t inria_oaici@faraday.inria.fr 'rwait --silent ${r2labUE0Idx}'"
sh "ssh -t inria_oaici@faraday.inria.fr 'uon ${r2labUE0Idx}'"
sh "sleep 5"
sh "ssh -t inria_oaici@faraday.inria.fr 'uon ${r2labUE0Idx}'"
echo '\u2705 \u001B[32mLoad Image for one EPC\u001B[0m'
sh "ssh -t inria_oaici@faraday.inria.fr 'rload -i oai-ci-cd-u18-lowlatency-epc ${r2labEPC0Idx} > /dev/null 2>&1'"
sh "ssh -t inria_oaici@faraday.inria.fr 'rwait --silent ${r2labEPC0Idx}'"
sh "ssh -t inria_oaici@faraday.inria.fr 'nodes ${r2labUE0Idx},${r2labPythonExeIdx},${r2labEPC0Idx},${r2labENB0Idx} && st'"
sh "ssh -t inria_oaici@faraday.inria.fr 'nodes ${r2labUE0Idx},${r2labPythonExeIdx},${r2labEPC0Idx},${r2labENB0Idx},${r2labENB1Idx} && st'"
}
}
}
@@ -183,7 +221,6 @@ pipeline {
sh "ssh -t inria_oaici@faraday.inria.fr 'ssh -t -b 192.168.3.100 ${fituser}@${r2labEPC0} \"echo ${fitpasswd} | sudo -S ifconfig control:m11 172.16.1.102 up\"'"
sh "ssh -t inria_oaici@faraday.inria.fr 'ssh -t -b 192.168.3.100 ${fituser}@${r2labEPC0} \"echo ${fitpasswd} | sudo -S ifconfig control:m10 192.168.10.110 up\"'"
sh "ssh -t inria_oaici@faraday.inria.fr 'ssh -t -b 192.168.3.100 ${fituser}@${r2labEPC0} \"echo ${fitpasswd} | sudo -S ifconfig control:sxu 172.55.55.102 up\"'"
sh "ssh -t inria_oaici@faraday.inria.fr 'ssh -t -b 192.168.3.100 ${fituser}@${r2labEPC0} \"echo ${fitpasswd} | sudo -S ifconfig control:s1u 192.168.248.159 up\"'"
sh "ssh -t inria_oaici@faraday.inria.fr 'ssh -t -b 192.168.3.100 ${fituser}@${r2labEPC0} \"echo ${fitpasswd} | sudo -S ifconfig control:sxc 172.55.55.101 up\"'"
sh "ssh -t inria_oaici@faraday.inria.fr 'ssh -t -b 192.168.3.100 ${fituser}@${r2labEPC0} \"echo ${fitpasswd} | sudo -S ifconfig control:s5c 172.58.58.102 up\"'"
sh "ssh -t inria_oaici@faraday.inria.fr 'ssh -t -b 192.168.3.100 ${fituser}@${r2labEPC0} \"echo ${fitpasswd} | sudo -S ifconfig control:p5c 172.58.58.101 up\"'"
@@ -195,9 +232,6 @@ pipeline {
sh "ssh -t inria_oaici@faraday.inria.fr 'ssh -t -b 192.168.3.100 ${fituser}@${r2labEPC0} \"echo ${fitpasswd} | sudo -S ip rule add from 12.0.0.0/8 table lte\"'"
sh "ssh -t inria_oaici@faraday.inria.fr 'ssh -t -b 192.168.3.100 ${fituser}@${r2labEPC0} \"echo ${fitpasswd} | sudo -S ip rule add from 12.1.1.0/8 table lte\"'"
// Adding a route on the eNB for the S1U interface
sh "ssh -t inria_oaici@faraday.inria.fr 'ssh -t -b 192.168.3.100 ${fituser}@${r2labENB0} \"echo ${fitpasswd} | sudo -S ip route add 192.168.248.0/24 via ${r2labEPC0IpAddr} dev control\"'"
// For the moment, simple way to route traffic from python executor to any UEs
sh "ssh -t inria_oaici@faraday.inria.fr 'ssh -t -b 192.168.3.100 ${fituser}@${r2labPythonExe} \"echo ${fitpasswd} | sudo -S ip route add 12.1.1.0/24 via ${r2labEPC0IpAddr} dev control\"'"
}
@@ -214,7 +248,7 @@ pipeline {
String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
for (xmlFile in myXmlTestSuite) {
try {
sh "ssh -t -t inria_oaici@faraday.inria.fr 'ssh -t -t -b 192.168.3.100 ${fituser}@${r2labPythonExe} \"cd openairinterface5g/ci-scripts && python3 main.py --mode=TesteNB --ranRepository=https://gitlab.eurecom.fr/oai/openairinterface5g --ranBranch=${ranRepoBranch} --ranCommitID=${GIT_COMMIT_TO_RUN} --ranAllowMerge=false --eNBIPAddress=${r2labENB0IpAddr} --eNBUserName=${fituser} --eNBPassword=${fitpasswd} --eNBSourceCodePath=/home/${fituser}/openairinterface5g --UEIPAddress=${r2labUE0IpAddr} --UEUserName=${fituser} --UEPassword=${fitpasswd} --UESourceCodePath=/home/${fituser}/openairinterface5g --EPCIPAddress=${r2labEPC0IpAddr} --EPCType=OAI-Rel14-CUPS --EPCUserName=${fituser} --EPCPassword=${fitpasswd} --EPCSourceCodePath=/home/${fituser}/openair-cn --ADBIPAddress=${r2labEPC0IpAddr} --ADBUserName=${fituser} --ADBPassword=${fitpasswd} --ADBType=distributed --XMLTestFile=${xmlFile}\"'"
sh "ssh -t -t inria_oaici@faraday.inria.fr 'ssh -t -t -b 192.168.3.100 ${fituser}@${r2labPythonExe} \"cd openairinterface5g/ci-scripts && python3 main.py --mode=TesteNB --ranRepository=https://gitlab.eurecom.fr/oai/openairinterface5g --ranBranch=${ranRepoBranch} --ranCommitID=${GIT_COMMIT_TO_RUN} --ranAllowMerge=false --eNBIPAddress=${r2labENB0IpAddr} --eNBUserName=${fituser} --eNBPassword=${fitpasswd} --eNBSourceCodePath=/home/${fituser}/openairinterface5g --eNB1IPAddress=${r2labENB1IpAddr} --eNB1UserName=${fituser} --eNB1Password=${fitpasswd} --eNB1SourceCodePath=/home/${fituser}/openairinterface5g --UEIPAddress=${r2labUE0IpAddr} --UEUserName=${fituser} --UEPassword=${fitpasswd} --UESourceCodePath=/home/${fituser}/openairinterface5g --EPCIPAddress=${r2labEPC0IpAddr} --EPCType=OAI-Rel14-CUPS --EPCUserName=${fituser} --EPCPassword=${fitpasswd} --EPCSourceCodePath=/home/${fituser}/openair-cn --ADBIPAddress=${r2labEPC0IpAddr} --ADBUserName=${fituser} --ADBPassword=${fitpasswd} --ADBType=distributed --XMLTestFile=${xmlFile}\"'"
} catch (Exception e) {
currentBuild.result = 'FAILURE'
buildStageStatus = false
@@ -412,9 +446,11 @@ pipeline {
post {
always {
script {
echo '\u2705 \u001B[32mShutdown every node\u001B[0m'
sh 'ssh -t inria_oaici@faraday.inria.fr "all-off"'
sh 'ssh -t inria_oaici@faraday.inria.fr "all-off"'
if (r2labDoAllOff) {
echo '\u2705 \u001B[32mShutdown every node\u001B[0m'
sh 'ssh -t inria_oaici@faraday.inria.fr "all-off"'
sh 'ssh -t inria_oaici@faraday.inria.fr "all-off"'
}
}
}
}

View File

@@ -0,0 +1,233 @@
#!/bin/groovy
/*
* Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The OpenAirInterface Software Alliance licenses this file to You under
* the OAI Public License, Version 1.1 (the "License"); you may not use this file
* except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.openairinterface.org/?page_id=698
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*-------------------------------------------------------------------------------
* For more information about the OpenAirInterface (OAI) Software Alliance:
* contact@openairinterface.org
*/
// Location of the executor node
def pythonExecutor = params.pythonExecutor
// Location of the test XML file to be run
def testXMLFile = params.pythonTestXmlFile
def mainPythonAllXmlFiles = ""
def buildStageStatus = true
// Name of the test stage
def testStageName = params.pipelineTestStageName
// Name of the resource
def ciEpcResource = params.epcResource
// Global Parameters. Normally they should be populated when the master job
// triggers the slave job with parameters
def eNB_Repository
def eNB_Branch
def eNB_CommitID
def eNB_AllowMergeRequestProcess = false
def eNB_TargetBranch
// Flags
def scmEvent = false
def upstreamEvent = false
//-------------------------------------------------------------------------------
// Pipeline start
pipeline {
agent {
label pythonExecutor
}
options {
disableConcurrentBuilds()
timestamps()
ansiColor('xterm')
lock(ciEpcResource)
}
stages {
stage ('Verify Parameters') {
steps {
script {
echo '\u2705 \u001B[32mVerify Parameters\u001B[0m'
JOB_TIMESTAMP = sh returnStdout: true, script: 'date --utc --rfc-3339=seconds | sed -e "s#+00:00##"'
JOB_TIMESTAMP = JOB_TIMESTAMP.trim()
def allParametersPresent = true
// It is already to late to check it
if (params.pythonExecutor != null) {
echo "eNB CI executor node : ${pythonExecutor}"
}
// If not present picking a default Stage Name
if (params.pipelineTestStageName == null) {
// picking default
testStageName = 'Template Test Stage'
}
if (params.smartphonesResource == null) {
allParametersPresent = false
}
if (params.eNB_IPAddress == null) {
allParametersPresent = false
}
if (params.eNB_SourceCodePath == null) {
allParametersPresent = false
}
if (params.eNB_Credentials == null) {
allParametersPresent = false
}
// the following 4 parameters should be pushed by the master trigger
// if not present, take the job GIT variables (used for developing)
if (params.eNB_Repository == null) {
eNB_Repository = env.GIT_URL
} else {
eNB_Repository = params.eNB_Repository
}
echo "eNB_Repository : ${eNB_Repository}"
if (params.eNB_Branch == null) {
eNB_Branch = env.GIT_BRANCH
} else {
eNB_Branch = params.eNB_Branch
}
echo "eNB_Branch : ${eNB_Branch}"
if (params.eNB_CommitID == null) {
eNB_CommitID = env.GIT_COMMIT
} else {
eNB_CommitID = params.eNB_CommitID
}
echo "eNB_CommitID : ${eNB_CommitID}"
if (params.eNB_mergeRequest != null) {
eNB_AllowMergeRequestProcess = params.eNB_mergeRequest
if (eNB_AllowMergeRequestProcess) {
if (params.eNB_TargetBranch != null) {
eNB_TargetBranch = params.eNB_TargetBranch
} else {
eNB_TargetBranch = 'develop'
}
echo "eNB_TargetBranch : ${eNB_TargetBranch}"
}
}
if (params.EPC_IPAddress == null) {
allParametersPresent = false
}
if (params.EPC_Type == null) {
allParametersPresent = false
}
if (params.EPC_SourceCodePath == null) {
allParametersPresent = false
}
if (params.EPC_Credentials == null) {
allParametersPresent = false
}
if (params.ADB_IPAddress == null) {
allParametersPresent = false
}
if (params.ADB_Credentials == null) {
allParametersPresent = false
}
if (params.OC_Credentials == null) {
allParametersPresent = false
}
if (params.OC_ProjectName == null) {
allParametersPresent = false
}
if (allParametersPresent) {
echo "All parameters are present"
if (eNB_AllowMergeRequestProcess) {
sh "git fetch"
sh "./ci-scripts/doGitLabMerge.sh --src-branch ${eNB_Branch} --src-commit ${eNB_CommitID} --target-branch ${eNB_TargetBranch} --target-commit latest"
} else {
sh "git fetch"
sh "git checkout -f ${eNB_CommitID}"
}
} else {
echo "Some parameters are missing"
sh "./ci-scripts/fail.sh"
}
}
}
}
stage ("Deploy and Test") {
steps {
script {
dir ('ci-scripts') {
echo "\u2705 \u001B[32m${testStageName}\u001B[0m"
// If not present picking a default XML file
if (params.pythonTestXmlFile == null) {
// picking default
testXMLFile = 'xml_files/enb_usrpB210_band7_50PRB.xml'
echo "Test XML file(default): ${testXMLFile}"
mainPythonAllXmlFiles += "--XMLTestFile=" + testXMLFile + " "
} else {
String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
for (xmlFile in myXmlTestSuite) {
if (fileExists(xmlFile)) {
mainPythonAllXmlFiles += "--XMLTestFile=" + xmlFile + " "
echo "Test XML file : ${xmlFile}"
}
}
}
withCredentials([
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password'],
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password'],
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.ADB_Credentials}", usernameVariable: 'ADB_Username', passwordVariable: 'ADB_Password'],
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.OC_Credentials}", usernameVariable: 'OC_Username', passwordVariable: 'OC_Password']
]) {
sh "python3 main.py --mode=InitiateHtml --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} ${mainPythonAllXmlFiles}"
String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
for (xmlFile in myXmlTestSuite) {
if (fileExists(xmlFile)) {
try {
sh "python3 main.py --mode=TesteNB --eNBIPAddress=${params.eNB_IPAddress} --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --EPCIPAddress=${params.EPC_IPAddress} --EPCType=${params.EPC_Type} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} --XMLTestFile=${xmlFile} --OCUserName=${OC_Username} --OCPassword=${OC_Password} --OCProjectName=${OC_ProjectName}"
} catch (Exception e) {
currentBuild.result = 'FAILURE'
buildStageStatus = false
}
}
}
sh "python3 main.py --mode=FinalizeHtml --finalStatus=${buildStageStatus} --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password}"
}
}
}
}
}
stage ("Log Collection") {
steps {
script {
dir ('ci-scripts') {
// Zipping all archived log files
sh "zip -r -qq physim_deploytest_logs_${env.BUILD_ID}.zip physim_test_logs_*/*"
sh "rm -rf physim_test_logs_*/"
if (fileExists("physim_deploytest_logs_${env.BUILD_ID}.zip")) {
archiveArtifacts artifacts: "physim_deploytest_logs_${env.BUILD_ID}.zip"
}
if (fileExists("test_results.html")) {
sh "mv test_results.html test_results-${env.JOB_NAME}.html"
sh "sed -i -e 's#TEMPLATE_JOB_NAME#${JOB_NAME}#' -e 's@build #TEMPLATE_BUILD_ID@build #${BUILD_ID}@' -e 's#Build-ID: TEMPLATE_BUILD_ID#Build-ID: <a href=\"${BUILD_URL}\">${BUILD_ID}</a>#' -e 's#TEMPLATE_STAGE_NAME#${testStageName}#' test_results-${JOB_NAME}.html"
archiveArtifacts artifacts: "test_results-${env.JOB_NAME}.html"
}
}
}
}
}
}
}

View File

@@ -208,12 +208,12 @@ pipeline {
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password'],
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.ADB_Credentials}", usernameVariable: 'ADB_Username', passwordVariable: 'ADB_Password']
]) {
sh "python3 main.py --mode=InitiateHtml --eNBRepository=${eNB_Repository} --eNBBranch=${eNB_Branch} --eNBCommitID=${eNB_CommitID} --eNB_AllowMerge=${eNB_AllowMergeRequestProcess} --eNBTargetBranch=${eNB_TargetBranch} --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} ${mainPythonAllXmlFiles}"
sh "python3 main.py --mode=InitiateHtml --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} ${mainPythonAllXmlFiles}"
String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
for (xmlFile in myXmlTestSuite) {
if (fileExists(xmlFile)) {
try {
sh "python3 main.py --mode=TesteNB --eNBRepository=${eNB_Repository} --eNBBranch=${eNB_Branch} --eNBCommitID=${eNB_CommitID} --eNB_AllowMerge=${eNB_AllowMergeRequestProcess} --eNBTargetBranch=${eNB_TargetBranch} --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --UEIPAddress=${params.UE_IPAddress} --UEUserName=${UE_Username} --UEPassword=${UE_Password} --UESourceCodePath=${params.UE_SourceCodePath} --EPCIPAddress=${params.EPC_IPAddress} --EPCType=${params.EPC_Type} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} --XMLTestFile=${xmlFile}"
sh "python3 main.py --mode=TesteNB --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --UEIPAddress=${params.UE_IPAddress} --UEUserName=${UE_Username} --UEPassword=${UE_Password} --UESourceCodePath=${params.UE_SourceCodePath} --EPCIPAddress=${params.EPC_IPAddress} --EPCType=${params.EPC_Type} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} --XMLTestFile=${xmlFile}"
} catch (Exception e) {
currentBuild.result = 'FAILURE'
buildStageStatus = false
@@ -266,6 +266,42 @@ pipeline {
}
stage('Log Collection') {
parallel {
stage('Log Collection (eNB - Build)') {
steps {
withCredentials([
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password']
]) {
echo '\u2705 \u001B[32mLog Collection (eNB - Build)\u001B[0m'
sh "python3 ci-scripts/main.py --mode=LogCollectBuild --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath}"
echo '\u2705 \u001B[32mLog Transfer (eNB - Build)\u001B[0m'
sh "sshpass -p \'${eNB_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${eNB_Username}@${params.eNB_IPAddress}:${eNB_SourceCodePath}/cmake_targets/build.log.zip ./build.log.${env.BUILD_ID}.zip || true"
}
script {
if(fileExists("build.log.${env.BUILD_ID}.zip")) {
archiveArtifacts "build.log.${env.BUILD_ID}.zip"
}
}
}
}
stage('Log Collection (OAI UE - Build)') {
steps {
echo '\u2705 \u001B[32mLog Collection (OAI UE - Build)\u001B[0m'
withCredentials([
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.UE_Credentials}", usernameVariable: 'UE_Username', passwordVariable: 'UE_Password']
]) {
sh "python3 ci-scripts/main.py --mode=LogCollectBuild --UEIPAddress=${params.UE_IPAddress} --UEUserName=${UE_Username} --UEPassword=${UE_Password} --UESourceCodePath=${params.UE_SourceCodePath}"
echo '\u2705 \u001B[32mLog Transfer (UE - Build)\u001B[0m'
sh "sshpass -p \'${UE_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${UE_Username}@${params.UE_IPAddress}:${UE_SourceCodePath}/cmake_targets/build.log.zip ./build.log.${env.BUILD_ID}.zip || true"
}
script {
if(fileExists("build.log.${env.BUILD_ID}.zip")) {
archiveArtifacts "build.log.${env.BUILD_ID}.zip"
}
}
}
}
stage('Log Collection (eNB - Run)') {
steps {
withCredentials([

View File

@@ -0,0 +1,293 @@
#!/bin/groovy
/*
* Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The OpenAirInterface Software Alliance licenses this file to You under
* the OAI Public License, Version 1.1 (the "License"); you may not use this file
* except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.openairinterface.org/?page_id=698
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*-------------------------------------------------------------------------------
* For more information about the OpenAirInterface (OAI) Software Alliance:
* contact@openairinterface.org
*/
// Template Jenkins Declarative Pipeline script to run Test w/ RF HW
// Location of the python executor node shall be in the same subnet as the others servers
def pythonExecutor = params.pythonExecutor
// Location of the test XML file to be run
def testXMLFile = params.pythonTestXmlFile
def mainPythonAllXmlFiles = ""
def buildStageStatus = true
// Name of the test stage
def testStageName = params.pipelineTestStageName
// Name of the phone resource
def ciSmartPhonesResource1 = params.SmartPhonesResource1
def ciSmartPhonesResource2 = params.SmartPhonesResource2
// Global Parameters. Normally they should be populated when the master job
// triggers the slave job with parameters
def eNB_Repository
def eNB_Branch
def eNB_CommitID
def eNB_AllowMergeRequestProcess
def eNB_TargetBranch
pipeline {
agent {
label pythonExecutor
}
options {
disableConcurrentBuilds()
ansiColor('xterm')
lock(extra: [[resource: ciSmartPhonesResource2]], resource: ciSmartPhonesResource1)
}
stages {
stage("Build Init") {
steps {
// update the build name and description
buildName "${params.eNB_MR}"
buildDescription "Branch : ${params.eNB_Branch}"
}
}
stage ("Verify Parameters") {
steps {
script {
echo '\u2705 \u001B[32mVerify Parameters\u001B[0m'
def allParametersPresent = true
// It is already to late to check it
if (params.pythonExecutor != null) {
echo "eNB CI executor node : ${pythonExecutor}"
}
// If not present picking a default Stage Name
if (params.pipelineTestStageName == null) {
// picking default
testStageName = 'Template Test Stage'
}
if (params.SmartPhonesResource1 == null) {
allParametersPresent = false
}
if (params.SmartPhonesResource2 == null) {
allParametersPresent = false
}
// 1st eNB parameters
if (params.eNB_IPAddress == null) {
allParametersPresent = false
}
if (params.eNB_SourceCodePath == null) {
allParametersPresent = false
}
if (params.eNB_Credentials == null) {
allParametersPresent = false
}
// 2nd eNB parameters
if (params.eNB1_IPAddress == null) {
allParametersPresent = false
}
if (params.eNB1_SourceCodePath == null) {
allParametersPresent = false
}
if (params.eNB1_Credentials == null) {
allParametersPresent = false
}
// 3rd eNB parameters
if (params.eNB2_IPAddress == null) {
allParametersPresent = false
}
if (params.eNB2_SourceCodePath == null) {
allParametersPresent = false
}
if (params.eNB2_Credentials == null) {
allParametersPresent = false
}
// the following 4 parameters should be pushed by the master trigger
// if not present, take the job GIT variables (used for developing)
if (params.eNB_Repository == null) {
eNB_Repository = env.GIT_URL
} else {
eNB_Repository = params.eNB_Repository
}
echo "eNB_Repository : ${eNB_Repository}"
if (params.eNB_Branch == null) {
eNB_Branch = env.GIT_BRANCH
} else {
eNB_Branch = params.eNB_Branch
}
echo "eNB_Branch : ${eNB_Branch}"
if (params.eNB_CommitID == null) {
eNB_CommitID = env.GIT_COMMIT
} else {
eNB_CommitID = params.eNB_CommitID
}
echo "eNB_CommitID : ${eNB_CommitID}"
if (params.eNB_AllowMergeRequestProcess!= null) {
eNB_AllowMergeRequestProcess = params.eNB_AllowMergeRequestProcess
if (eNB_AllowMergeRequestProcess) {
if (params.eNB_TargetBranch != null) {
eNB_TargetBranch = params.eNB_TargetBranch
} else {
eNB_TargetBranch = 'develop'
}
echo "eNB_TargetBranch : ${eNB_TargetBranch}"
}
}
if (params.EPC_IPAddress == null) {
allParametersPresent = false
}
if (params.EPC_Type == null) {
allParametersPresent = false
}
if (params.EPC_SourceCodePath == null) {
allParametersPresent = false
}
if (params.EPC_Credentials == null) {
allParametersPresent = false
}
if (params.ADB_IPAddress == null) {
allParametersPresent = false
}
if (params.ADB_Credentials == null) {
allParametersPresent = false
}
if (allParametersPresent) {
echo "All parameters are present"
if (eNB_AllowMergeRequestProcess) {
sh "git fetch"
sh "./ci-scripts/doGitLabMerge.sh --src-branch ${eNB_Branch} --src-commit ${eNB_CommitID} --target-branch ${eNB_TargetBranch} --target-commit latest"
} else {
sh "git fetch"
sh "git checkout -f ${eNB_CommitID}"
}
} else {
echo "Some parameters are missing"
sh "./ci-scripts/fail.sh"
}
}
}
}
stage ("Build and Test") {
steps {
script {
dir ('ci-scripts') {
echo "\u2705 \u001B[32m${testStageName}\u001B[0m"
// If not present picking a default XML file
if (params.pythonTestXmlFile == null) {
// picking default
testXMLFile = 'xml_files/enb_usrpB210_band7_50PRB.xml'
echo "Test XML file(default): ${testXMLFile}"
mainPythonAllXmlFiles += "--XMLTestFile=" + testXMLFile + " "
} else {
String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
for (xmlFile in myXmlTestSuite) {
if (fileExists(xmlFile)) {
mainPythonAllXmlFiles += "--XMLTestFile=" + xmlFile + " "
echo "Test XML file : ${xmlFile}"
}
}
}
withCredentials([
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password'],
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB1_Credentials}", usernameVariable: 'eNB1_Username', passwordVariable: 'eNB1_Password'],
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB2_Credentials}", usernameVariable: 'eNB2_Username', passwordVariable: 'eNB2_Password'],
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password'],
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.ADB_Credentials}", usernameVariable: 'ADB_Username', passwordVariable: 'ADB_Password']
]) {
sh "python3 main.py --mode=InitiateHtml --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} ${mainPythonAllXmlFiles}"
String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
for (xmlFile in myXmlTestSuite) {
if (fileExists(xmlFile)) {
try {
sh "python3 main.py --mode=TesteNB --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --eNB1IPAddress=${params.eNB1_IPAddress} --eNB1UserName=${eNB1_Username} --eNB1Password=${eNB1_Password} --eNB1SourceCodePath=${params.eNB1_SourceCodePath} --eNB2IPAddress=${params.eNB2_IPAddress} --eNB2UserName=${eNB2_Username} --eNB2Password=${eNB2_Password} --eNB2SourceCodePath=${params.eNB2_SourceCodePath} --EPCIPAddress=${params.EPC_IPAddress} --EPCType=${params.EPC_Type} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} --XMLTestFile=${xmlFile}"
} catch (Exception e) {
currentBuild.result = 'FAILURE'
buildStageStatus = false
}
}
}
sh "python3 main.py --mode=FinalizeHtml --finalStatus=${buildStageStatus} --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password}"
}
}
}
}
}
stage('Log Collection') {
parallel {
stage('Log Collection (eNB - Build)') {
steps {
withCredentials([
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password']
]) {
echo '\u2705 \u001B[32mLog Collection (eNB - Build)\u001B[0m'
sh "python3 ci-scripts/main.py --mode=LogCollectBuild --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath}"
echo '\u2705 \u001B[32mLog Transfer (eNB - Build)\u001B[0m'
sh "sshpass -p \'${eNB_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${eNB_Username}@${params.eNB_IPAddress}:${eNB_SourceCodePath}/cmake_targets/build.log.zip ./build.log.${env.BUILD_ID}.zip || true"
}
script {
if(fileExists("build.log.${env.BUILD_ID}.zip")) {
archiveArtifacts "build.log.${env.BUILD_ID}.zip"
}
}
}
}
stage('Log Collection (eNB - Run)') {
steps {
withCredentials([
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password']
]) {
echo '\u2705 \u001B[32mLog Collection (eNB - Run)\u001B[0m'
sh "python3 ci-scripts/main.py --mode=LogCollecteNB --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath}"
echo '\u2705 \u001B[32mLog Transfer (eNB - Run)\u001B[0m'
sh "sshpass -p \'${eNB_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${eNB_Username}@${params.eNB_IPAddress}:${eNB_SourceCodePath}/cmake_targets/enb.log.zip ./enb.log.${env.BUILD_ID}.zip || true"
}
script {
if(fileExists("enb.log.${env.BUILD_ID}.zip")) {
archiveArtifacts "enb.log.${env.BUILD_ID}.zip"
}
if(fileExists("ci-scripts/test_results.html")) {
sh "mv ci-scripts/test_results.html test_results-${JOB_NAME}.html"
sh "sed -i -e 's#TEMPLATE_JOB_NAME#${JOB_NAME}#' -e 's@build #TEMPLATE_BUILD_ID@build #${BUILD_ID}@' -e 's#Build-ID: TEMPLATE_BUILD_ID#Build-ID: <a href=\"${BUILD_URL}\">${BUILD_ID}</a>#' -e 's#TEMPLATE_STAGE_NAME#${testStageName}#' test_results-${JOB_NAME}.html"
archiveArtifacts "test_results-${JOB_NAME}.html"
}
}
}
}
}
}
}
post {
always {
script {
if (params.pipelineZipsConsoleLog != null) {
if (params.pipelineZipsConsoleLog) {
echo "Archiving Jenkins console log"
sh "wget --no-check-certificate --no-proxy ${env.JENKINS_URL}/job/${env.JOB_NAME}/${env.BUILD_ID}/consoleText -O consoleText.log || true"
sh "zip -m consoleText.log.${env.BUILD_ID}.zip consoleText.log || true"
if(fileExists("consoleText.log.${env.BUILD_ID}.zip")) {
archiveArtifacts "consoleText.log.${env.BUILD_ID}.zip"
}
}
}
}
}
}
}

View File

@@ -0,0 +1,304 @@
#!/bin/groovy
/*
* Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The OpenAirInterface Software Alliance licenses this file to You under
* the OAI Public License, Version 1.1 (the "License"); you may not use this file
* except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.openairinterface.org/?page_id=698
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*-------------------------------------------------------------------------------
* For more information about the OpenAirInterface (OAI) Software Alliance:
* contact@openairinterface.org
*/
// Template Jenkins Declarative Pipeline script to run Test w/ RF HW
// Location of the python executor node shall be in the same subnet as the others servers
def pythonExecutor = params.pythonExecutor
// Location of the test XML file to be run
def testXMLFile = params.pythonTestXmlFile
def mainPythonAllXmlFiles = ""
def buildStageStatus = true
// Name of the test stage
def testStageName = params.pipelineTestStageName
// Name of the phone resource
def ciSmartPhonesResource1 = params.SmartPhonesResource1
def ciSmartPhonesResource2 = params.SmartPhonesResource2
// Global Parameters. Populated when the master job
// triggers the slave job with parameters
def eNB_Repository = "https://gitlab.eurecom.fr/oai/openairinterface5g.git"
def eNB_Branch = "develop"
def eNB_CommitID
def eNB_AllowMergeRequestProcess = false
def eNB_TargetBranch = "develop"
def eNB_MR = "develop"
pipeline {
agent {
label pythonExecutor
}
options {
disableConcurrentBuilds()
ansiColor('xterm')
lock(extra: [[resource: ciSmartPhonesResource2]], resource: ciSmartPhonesResource1)
}
stages {
stage("Build Init") {
steps {
script {
//retrieve latest commit ID from branch
latest_commit_from_branch= sh returnStdout: true, script: 'git log -1 origin/${eNB_Branch} | grep commit'
echo "Branch ${eNB_Branch}"
echo "${latest_commit_from_branch}"
tmp=latest_commit_from_branch.split()
echo "${tmp}"
eNB_CommitID = tmp[1]
echo "eNB_CommitID ${eNB_CommitID}"
// update the build name and description
buildName "${params.eNB_MR}"
buildDescription "Commit : ${eNB_CommitID}"
}
}
}
stage ("Verify Parameters") {
steps {
script {
echo '\u2705 \u001B[32mVerify Parameters\u001B[0m'
def allParametersPresent = true
// It is already to late to check it
if (params.pythonExecutor != null) {
echo "eNB CI executor node : ${pythonExecutor}"
}
// If not present picking a default Stage Name
if (params.pipelineTestStageName == null) {
// picking default
testStageName = 'Template Test Stage'
}
if (params.SmartPhonesResource1 == null) {
allParametersPresent = false
}
if (params.SmartPhonesResource2 == null) {
allParametersPresent = false
}
// 1st eNB parameters
if (params.eNB_IPAddress == null) {
allParametersPresent = false
}
if (params.eNB_SourceCodePath == null) {
allParametersPresent = false
}
if (params.eNB_Credentials == null) {
allParametersPresent = false
}
// 2nd eNB parameters
if (params.eNB1_IPAddress == null) {
allParametersPresent = false
}
if (params.eNB1_SourceCodePath == null) {
allParametersPresent = false
}
if (params.eNB1_Credentials == null) {
allParametersPresent = false
}
// 3rd eNB parameters
if (params.eNB2_IPAddress == null) {
allParametersPresent = false
}
if (params.eNB2_SourceCodePath == null) {
allParametersPresent = false
}
if (params.eNB2_Credentials == null) {
allParametersPresent = false
}
// the following 4 parameters should be pushed by the master trigger
// if not present, take the job GIT variables (used for developing)
if (params.eNB_Repository == null) {
eNB_Repository = env.GIT_URL
} else {
eNB_Repository = params.eNB_Repository
}
echo "eNB_Repository : ${eNB_Repository}"
if (params.eNB_Branch == null) {
eNB_Branch = env.GIT_BRANCH
} else {
eNB_Branch = params.eNB_Branch
}
echo "eNB_Branch : ${eNB_Branch}"
//if (params.eNB_CommitID == null) {
// eNB_CommitID = env.GIT_COMMIT
//} else {
// eNB_CommitID = params.eNB_CommitID
//}
echo "eNB_CommitID : ${eNB_CommitID}"
if (params.eNB_AllowMergeRequestProcess!= null) {
eNB_AllowMergeRequestProcess = params.eNB_AllowMergeRequestProcess
if (eNB_AllowMergeRequestProcess) {
if (params.eNB_TargetBranch != null) {
eNB_TargetBranch = params.eNB_TargetBranch
} else {
eNB_TargetBranch = 'develop'
}
echo "eNB_TargetBranch : ${eNB_TargetBranch}"
}
}
if (params.EPC_IPAddress == null) {
allParametersPresent = false
}
if (params.EPC_Type == null) {
allParametersPresent = false
}
if (params.EPC_SourceCodePath == null) {
allParametersPresent = false
}
if (params.EPC_Credentials == null) {
allParametersPresent = false
}
if (params.ADB_IPAddress == null) {
allParametersPresent = false
}
if (params.ADB_Credentials == null) {
allParametersPresent = false
}
if (allParametersPresent) {
echo "All parameters are present"
if (eNB_AllowMergeRequestProcess) {
sh "git fetch"
sh "./ci-scripts/doGitLabMerge.sh --src-branch ${eNB_Branch} --src-commit ${eNB_CommitID} --target-branch ${eNB_TargetBranch} --target-commit latest"
} else {
sh "git fetch"
sh "git checkout -f ${eNB_CommitID}"
}
} else {
echo "Some parameters are missing"
sh "./ci-scripts/fail.sh"
}
}
}
}
stage ("Build and Test") {
steps {
script {
dir ('ci-scripts') {
echo "\u2705 \u001B[32m${testStageName}\u001B[0m"
// If not present picking a default XML file
if (params.pythonTestXmlFile == null) {
// picking default
testXMLFile = 'xml_files/enb_usrpB210_band7_50PRB.xml'
echo "Test XML file(default): ${testXMLFile}"
mainPythonAllXmlFiles += "--XMLTestFile=" + testXMLFile + " "
} else {
String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
for (xmlFile in myXmlTestSuite) {
if (fileExists(xmlFile)) {
mainPythonAllXmlFiles += "--XMLTestFile=" + xmlFile + " "
echo "Test XML file : ${xmlFile}"
}
}
}
withCredentials([
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password'],
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB1_Credentials}", usernameVariable: 'eNB1_Username', passwordVariable: 'eNB1_Password'],
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB2_Credentials}", usernameVariable: 'eNB2_Username', passwordVariable: 'eNB2_Password'],
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password'],
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.ADB_Credentials}", usernameVariable: 'ADB_Username', passwordVariable: 'ADB_Password']
]) {
sh "python3 main.py --mode=InitiateHtml --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} ${mainPythonAllXmlFiles}"
String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
for (xmlFile in myXmlTestSuite) {
if (fileExists(xmlFile)) {
try {
sh "python3 main.py --mode=TesteNB --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --eNB1IPAddress=${params.eNB1_IPAddress} --eNB1UserName=${eNB1_Username} --eNB1Password=${eNB1_Password} --eNB1SourceCodePath=${params.eNB1_SourceCodePath} --eNB2IPAddress=${params.eNB2_IPAddress} --eNB2UserName=${eNB2_Username} --eNB2Password=${eNB2_Password} --eNB2SourceCodePath=${params.eNB2_SourceCodePath} --EPCIPAddress=${params.EPC_IPAddress} --EPCType=${params.EPC_Type} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} --XMLTestFile=${xmlFile}"
} catch (Exception e) {
currentBuild.result = 'FAILURE'
buildStageStatus = false
}
}
}
sh "python3 main.py --mode=FinalizeHtml --finalStatus=${buildStageStatus} --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password}"
}
}
}
}
}
stage('Log Collection') {
parallel {
stage('Log Collection (eNB - Build)') {
steps {
withCredentials([
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password']
]) {
echo '\u2705 \u001B[32mLog Collection (eNB - Build)\u001B[0m'
sh "python3 ci-scripts/main.py --mode=LogCollectBuild --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath}"
echo '\u2705 \u001B[32mLog Transfer (eNB - Build)\u001B[0m'
sh "sshpass -p \'${eNB_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${eNB_Username}@${params.eNB_IPAddress}:${eNB_SourceCodePath}/cmake_targets/build.log.zip ./build.log.${env.BUILD_ID}.zip || true"
}
script {
if(fileExists("build.log.${env.BUILD_ID}.zip")) {
archiveArtifacts "build.log.${env.BUILD_ID}.zip"
}
}
}
}
stage('Log Collection (eNB - Run)') {
steps {
withCredentials([
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password']
]) {
echo '\u2705 \u001B[32mLog Collection (eNB - Run)\u001B[0m'
sh "python3 ci-scripts/main.py --mode=LogCollecteNB --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath}"
echo '\u2705 \u001B[32mLog Transfer (eNB - Run)\u001B[0m'
sh "sshpass -p \'${eNB_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${eNB_Username}@${params.eNB_IPAddress}:${eNB_SourceCodePath}/cmake_targets/enb.log.zip ./enb.log.${env.BUILD_ID}.zip || true"
}
script {
if(fileExists("enb.log.${env.BUILD_ID}.zip")) {
archiveArtifacts "enb.log.${env.BUILD_ID}.zip"
}
if(fileExists("ci-scripts/test_results.html")) {
sh "mv ci-scripts/test_results.html test_results-${JOB_NAME}.html"
sh "sed -i -e 's#TEMPLATE_JOB_NAME#${JOB_NAME}#' -e 's@build #TEMPLATE_BUILD_ID@build #${BUILD_ID}@' -e 's#Build-ID: TEMPLATE_BUILD_ID#Build-ID: <a href=\"${BUILD_URL}\">${BUILD_ID}</a>#' -e 's#TEMPLATE_STAGE_NAME#${testStageName}#' test_results-${JOB_NAME}.html"
archiveArtifacts "test_results-${JOB_NAME}.html"
}
}
}
}
}
}
}
post {
always {
script {
if (params.pipelineZipsConsoleLog != null) {
if (params.pipelineZipsConsoleLog) {
echo "Archiving Jenkins console log"
sh "wget --no-check-certificate --no-proxy ${env.JENKINS_URL}/job/${env.JOB_NAME}/${env.BUILD_ID}/consoleText -O consoleText.log || true"
sh "zip -m consoleText.log.${env.BUILD_ID}.zip consoleText.log || true"
if(fileExists("consoleText.log.${env.BUILD_ID}.zip")) {
archiveArtifacts "consoleText.log.${env.BUILD_ID}.zip"
}
}
}
}
}
}
}

View File

@@ -0,0 +1,293 @@
#!/bin/groovy
/*
* Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The OpenAirInterface Software Alliance licenses this file to You under
* the OAI Public License, Version 1.1 (the "License"); you may not use this file
* except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.openairinterface.org/?page_id=698
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*-------------------------------------------------------------------------------
* For more information about the OpenAirInterface (OAI) Software Alliance:
* contact@openairinterface.org
*/
// Template Jenkins Declarative Pipeline script to run Test w/ RF HW
// Location of the python executor node shall be in the same subnet as the others servers
def pythonExecutor = params.pythonExecutor
// Location of the test XML file to be run
def testXMLFile = params.pythonTestXmlFile
def mainPythonAllXmlFiles = ""
def buildStageStatus = true
// Name of the test stage
def testStageName = params.pipelineTestStageName
// Name of the phone/server resource
def ciSmartPhonesResource1 = params.SmartPhonesResource1
def ciSmartPhonesResource2 = params.SmartPhonesResource2
// Global Parameters. Normally they should be populated when the master job
// triggers the slave job with parameters
def eNB_Repository
def eNB_Branch
def eNB_CommitID
def eNB_AllowMergeRequestProcess
def eNB_TargetBranch
pipeline {
agent {
label pythonExecutor
}
options {
disableConcurrentBuilds()
ansiColor('xterm')
lock(extra: [[resource: ciSmartPhonesResource2]], resource: ciSmartPhonesResource1)
}
stages {
stage("Build Init") {
steps {
// update the build name and description
buildName "${params.eNB_MR}"
buildDescription "Branch : ${params.eNB_Branch}"
}
}
stage ("Verify Parameters") {
steps {
script {
echo '\u2705 \u001B[32mVerify Parameters\u001B[0m'
def allParametersPresent = true
// It is already to late to check it
if (params.pythonExecutor != null) {
echo "eNB CI executor node : ${pythonExecutor}"
}
// If not present picking a default Stage Name
if (params.pipelineTestStageName == null) {
// picking default
testStageName = 'Template Test Stage'
}
if (params.SmartPhonesResource1 == null) {
allParametersPresent = false
}
if (params.SmartPhonesResource2 == null) {
allParametersPresent = false
}
// 1st eNB parameters
if (params.eNB_IPAddress == null) {
allParametersPresent = false
}
if (params.eNB_SourceCodePath == null) {
allParametersPresent = false
}
if (params.eNB_Credentials == null) {
allParametersPresent = false
}
// 2nd eNB parameters
if (params.eNB1_IPAddress == null) {
allParametersPresent = false
}
if (params.eNB1_SourceCodePath == null) {
allParametersPresent = false
}
if (params.eNB1_Credentials == null) {
allParametersPresent = false
}
// 3rd eNB parameters
if (params.eNB2_IPAddress == null) {
allParametersPresent = false
}
if (params.eNB2_SourceCodePath == null) {
allParametersPresent = false
}
if (params.eNB2_Credentials == null) {
allParametersPresent = false
}
// the following 4 parameters should be pushed by the master trigger
// if not present, take the job GIT variables (used for developing)
if (params.eNB_Repository == null) {
eNB_Repository = env.GIT_URL
} else {
eNB_Repository = params.eNB_Repository
}
echo "eNB_Repository : ${eNB_Repository}"
if (params.eNB_Branch == null) {
eNB_Branch = env.GIT_BRANCH
} else {
eNB_Branch = params.eNB_Branch
}
echo "eNB_Branch : ${eNB_Branch}"
if (params.eNB_CommitID == null) {
eNB_CommitID = env.GIT_COMMIT
} else {
eNB_CommitID = params.eNB_CommitID
}
echo "eNB_CommitID : ${eNB_CommitID}"
if (params.eNB_AllowMergeRequestProcess!= null) {
eNB_AllowMergeRequestProcess = params.eNB_AllowMergeRequestProcess
if (eNB_AllowMergeRequestProcess) {
if (params.eNB_TargetBranch != null) {
eNB_TargetBranch = params.eNB_TargetBranch
} else {
eNB_TargetBranch = 'develop'
}
echo "eNB_TargetBranch : ${eNB_TargetBranch}"
}
}
if (params.EPC_IPAddress == null) {
allParametersPresent = false
}
if (params.EPC_Type == null) {
allParametersPresent = false
}
if (params.EPC_SourceCodePath == null) {
allParametersPresent = false
}
if (params.EPC_Credentials == null) {
allParametersPresent = false
}
if (params.ADB_IPAddress == null) {
allParametersPresent = false
}
if (params.ADB_Credentials == null) {
allParametersPresent = false
}
if (allParametersPresent) {
echo "All parameters are present"
if (eNB_AllowMergeRequestProcess) {
sh "git fetch"
sh "./ci-scripts/doGitLabMerge.sh --src-branch ${eNB_Branch} --src-commit ${eNB_CommitID} --target-branch ${eNB_TargetBranch} --target-commit latest"
} else {
sh "git fetch"
sh "git checkout -f ${eNB_CommitID}"
}
} else {
echo "Some parameters are missing"
sh "./ci-scripts/fail.sh"
}
}
}
}
stage ("Build and Test") {
steps {
script {
dir ('ci-scripts') {
echo "\u2705 \u001B[32m${testStageName}\u001B[0m"
// If not present picking a default XML file
if (params.pythonTestXmlFile == null) {
// picking default
testXMLFile = 'xml_files/enb_usrpB210_band7_50PRB.xml'
echo "Test XML file(default): ${testXMLFile}"
mainPythonAllXmlFiles += "--XMLTestFile=" + testXMLFile + " "
} else {
String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
for (xmlFile in myXmlTestSuite) {
if (fileExists(xmlFile)) {
mainPythonAllXmlFiles += "--XMLTestFile=" + xmlFile + " "
echo "Test XML file : ${xmlFile}"
}
}
}
withCredentials([
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password'],
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB1_Credentials}", usernameVariable: 'eNB1_Username', passwordVariable: 'eNB1_Password'],
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB2_Credentials}", usernameVariable: 'eNB2_Username', passwordVariable: 'eNB2_Password'],
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password'],
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.ADB_Credentials}", usernameVariable: 'ADB_Username', passwordVariable: 'ADB_Password']
]) {
sh "python3 main.py --mode=InitiateHtml --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} ${mainPythonAllXmlFiles}"
String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
for (xmlFile in myXmlTestSuite) {
if (fileExists(xmlFile)) {
try {
sh "python3 main.py --mode=TesteNB --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --eNB1IPAddress=${params.eNB1_IPAddress} --eNB1UserName=${eNB1_Username} --eNB1Password=${eNB1_Password} --eNB1SourceCodePath=${params.eNB1_SourceCodePath} --eNB2IPAddress=${params.eNB2_IPAddress} --eNB2UserName=${eNB2_Username} --eNB2Password=${eNB2_Password} --eNB2SourceCodePath=${params.eNB2_SourceCodePath} --EPCIPAddress=${params.EPC_IPAddress} --EPCType=${params.EPC_Type} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} --XMLTestFile=${xmlFile}"
} catch (Exception e) {
currentBuild.result = 'FAILURE'
buildStageStatus = false
}
}
}
sh "python3 main.py --mode=FinalizeHtml --finalStatus=${buildStageStatus} --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password}"
}
}
}
}
}
stage('Log Collection') {
parallel {
stage('Log Collection (eNB - Build)') {
steps {
withCredentials([
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password']
]) {
echo '\u2705 \u001B[32mLog Collection (eNB - Build)\u001B[0m'
sh "python3 ci-scripts/main.py --mode=LogCollectBuild --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath}"
echo '\u2705 \u001B[32mLog Transfer (eNB - Build)\u001B[0m'
sh "sshpass -p \'${eNB_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${eNB_Username}@${params.eNB_IPAddress}:${eNB_SourceCodePath}/cmake_targets/build.log.zip ./build.log.${env.BUILD_ID}.zip || true"
}
script {
if(fileExists("build.log.${env.BUILD_ID}.zip")) {
archiveArtifacts "build.log.${env.BUILD_ID}.zip"
}
}
}
}
stage('Log Collection (eNB - Run)') {
steps {
withCredentials([
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password']
]) {
echo '\u2705 \u001B[32mLog Collection (eNB - Run)\u001B[0m'
sh "python3 ci-scripts/main.py --mode=LogCollecteNB --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath}"
echo '\u2705 \u001B[32mLog Transfer (eNB - Run)\u001B[0m'
sh "sshpass -p \'${eNB_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${eNB_Username}@${params.eNB_IPAddress}:${eNB_SourceCodePath}/cmake_targets/enb.log.zip ./enb.log.${env.BUILD_ID}.zip || true"
}
script {
if(fileExists("enb.log.${env.BUILD_ID}.zip")) {
archiveArtifacts "enb.log.${env.BUILD_ID}.zip"
}
if(fileExists("ci-scripts/test_results.html")) {
sh "mv ci-scripts/test_results.html test_results-${JOB_NAME}.html"
sh "sed -i -e 's#TEMPLATE_JOB_NAME#${JOB_NAME}#' -e 's@build #TEMPLATE_BUILD_ID@build #${BUILD_ID}@' -e 's#Build-ID: TEMPLATE_BUILD_ID#Build-ID: <a href=\"${BUILD_URL}\">${BUILD_ID}</a>#' -e 's#TEMPLATE_STAGE_NAME#${testStageName}#' test_results-${JOB_NAME}.html"
archiveArtifacts "test_results-${JOB_NAME}.html"
}
}
}
}
}
}
}
post {
always {
script {
if (params.pipelineZipsConsoleLog != null) {
if (params.pipelineZipsConsoleLog) {
echo "Archiving Jenkins console log"
sh "wget --no-check-certificate --no-proxy ${env.JENKINS_URL}/job/${env.JOB_NAME}/${env.BUILD_ID}/consoleText -O consoleText.log || true"
sh "zip -m consoleText.log.${env.BUILD_ID}.zip consoleText.log || true"
if(fileExists("consoleText.log.${env.BUILD_ID}.zip")) {
archiveArtifacts "consoleText.log.${env.BUILD_ID}.zip"
}
}
}
}
}
}
}

View File

@@ -36,6 +36,9 @@ def testStageName = params.pipelineTestStageName
// Name of the phone resource
def ciSmartPhoneResource = params.smartphonesResource
// Name of the phone resource
def ciEpcResource = params.epcResource
// Terminate Status
def termUE = 0
def termENB = 1
@@ -64,7 +67,7 @@ pipeline {
options {
disableConcurrentBuilds()
ansiColor('xterm')
lock (ciSmartPhoneResource)
lock(extra: [[resource: ciEpcResource]], resource: ciSmartPhoneResource)
}
// the following parameter options are commented out so it shows the ones
// that you SHALL have to run the job.
@@ -217,12 +220,12 @@ pipeline {
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password'],
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.ADB_Credentials}", usernameVariable: 'ADB_Username', passwordVariable: 'ADB_Password']
]) {
sh "python3 main.py --mode=InitiateHtml --eNBRepository=${eNB_Repository} --eNBBranch=${eNB_Branch} --eNBCommitID=${eNB_CommitID} --eNB_AllowMerge=${eNB_AllowMergeRequestProcess} --eNBTargetBranch=${eNB_TargetBranch} --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} ${mainPythonAllXmlFiles}"
sh "python3 main.py --mode=InitiateHtml --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} ${mainPythonAllXmlFiles}"
String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
for (xmlFile in myXmlTestSuite) {
if (fileExists(xmlFile)) {
try {
sh "python3 main.py --mode=TesteNB --eNBIPAddress=${params.eNB_IPAddress} --eNBRepository=${eNB_Repository} --eNBBranch=${eNB_Branch} --eNBCommitID=${eNB_CommitID} --eNB_AllowMerge=${eNB_AllowMergeRequestProcess} --eNBTargetBranch=${eNB_TargetBranch} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --EPCIPAddress=${params.EPC_IPAddress} --EPCType=${params.EPC_Type} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} --XMLTestFile=${xmlFile}"
sh "python3 main.py --mode=TesteNB --eNBIPAddress=${params.eNB_IPAddress} --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --EPCIPAddress=${params.EPC_IPAddress} --EPCType=${params.EPC_Type} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} --XMLTestFile=${xmlFile}"
} catch (Exception e) {
currentBuild.result = 'FAILURE'
buildStageStatus = false
@@ -238,6 +241,10 @@ pipeline {
stage ("Terminate") {
parallel {
stage('Terminate UE') {
// Bypassing this stage if there are no abd server defined
when {
expression { params.ADB_IPAddress != "none" }
}
steps {
echo '\u2705 \u001B[32mTerminate UE\u001B[0m'
withCredentials([
@@ -272,6 +279,10 @@ pipeline {
}
}
stage('Terminate SPGW') {
// Bypassing this stage if EPC server is not defined
when {
expression { params.EPC_IPAddress != "none" }
}
steps {
echo '\u2705 \u001B[32mTerminate SPGW\u001B[0m'
withCredentials([
@@ -289,6 +300,10 @@ pipeline {
}
}
stage('Terminate MME') {
// Bypassing this stage if EPC server is not defined
when {
expression { params.EPC_IPAddress != "none" }
}
steps {
echo '\u2705 \u001B[32mTerminate MME\u001B[0m'
withCredentials([
@@ -306,6 +321,10 @@ pipeline {
}
}
stage('Terminate HSS') {
// Bypassing this stage if EPC server is not defined
when {
expression { params.EPC_IPAddress != "none" }
}
steps {
echo '\u2705 \u001B[32mTerminate HSS\u001B[0m'
withCredentials([
@@ -368,6 +387,10 @@ pipeline {
}
}
stage('Log Collection (SPGW)') {
// Bypassing this stage if EPC server is not defined
when {
expression { params.EPC_IPAddress != "none" }
}
steps {
withCredentials([
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password']
@@ -386,6 +409,10 @@ pipeline {
}
}
stage('Log Collection (MME)') {
// Bypassing this stage if EPC server is not defined
when {
expression { params.EPC_IPAddress != "none" }
}
steps {
withCredentials([
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password']
@@ -404,6 +431,10 @@ pipeline {
}
}
stage('Log Collection (HSS)') {
// Bypassing this stage if EPC server is not defined
when {
expression { params.EPC_IPAddress != "none" }
}
steps {
withCredentials([
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password']
@@ -422,6 +453,10 @@ pipeline {
}
}
stage('Log Collection (Ping)') {
// Bypassing this stage if EPC server is not defined
when {
expression { params.EPC_IPAddress != "none" }
}
steps {
withCredentials([
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password']
@@ -440,6 +475,10 @@ pipeline {
}
}
stage('Log Collection (Iperf)') {
// Bypassing this stage if EPC server is not defined
when {
expression { params.EPC_IPAddress != "none" }
}
steps {
withCredentials([
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password']
@@ -479,7 +518,7 @@ pipeline {
// Making sure that we really shutdown every thing before leaving
failure {
script {
if (!termStatusArray[termUE]) {
if ((!termStatusArray[termUE]) && (params.ADB_IPAddress != "none")) {
withCredentials([
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.ADB_Credentials}", usernameVariable: 'ADB_Username', passwordVariable: 'ADB_Password']
]) {
@@ -493,21 +532,21 @@ pipeline {
sh "python3 ci-scripts/main.py --mode=TerminateeNB --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password}"
}
}
if (!termStatusArray[termSPGW]) {
if ((!termStatusArray[termSPGW]) && (params.EPC_IPAddress != "none")) {
withCredentials([
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password']
]) {
sh "python3 ci-scripts/main.py --mode=TerminateSPGW --EPCIPAddress=${params.EPC_IPAddress} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCType=${params.EPC_Type} --EPCSourceCodePath=${params.EPC_SourceCodePath}"
}
}
if (!termStatusArray[termMME]) {
if ((!termStatusArray[termMME]) && (params.EPC_IPAddress != "none")) {
withCredentials([
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password']
]) {
sh "python3 ci-scripts/main.py --mode=TerminateMME --EPCIPAddress=${params.EPC_IPAddress} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCType=${params.EPC_Type} --EPCSourceCodePath=${params.EPC_SourceCodePath}"
}
}
if (!termStatusArray[termHSS]) {
if ((!termStatusArray[termHSS]) && (params.EPC_IPAddress != "none")) {
withCredentials([
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password']
]) {

View File

@@ -187,12 +187,12 @@ pipeline {
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.UE_Credentials}", usernameVariable: 'UE_Username', passwordVariable: 'UE_Password'],
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.ADB_Credentials}", usernameVariable: 'ADB_Username', passwordVariable: 'ADB_Password']
]) {
sh "python3 main.py --mode=InitiateHtml --eNBRepository=${eNB_Repository} --eNBBranch=${eNB_Branch} --eNBCommitID=${eNB_CommitID} --eNB_AllowMerge=${eNB_AllowMergeRequestProcess} --eNBTargetBranch=${eNB_TargetBranch} --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} ${mainPythonAllXmlFiles}"
sh "python3 main.py --mode=InitiateHtml --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} ${mainPythonAllXmlFiles}"
String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
for (xmlFile in myXmlTestSuite) {
if (fileExists(xmlFile)) {
try {
sh "python3 main.py --mode=TestUE --UEIPAddress=${params.UE_IPAddress} --eNBRepository=${eNB_Repository} --eNBBranch=${eNB_Branch} --eNBCommitID=${eNB_CommitID} --eNB_AllowMerge=${eNB_AllowMergeRequestProcess} --eNBTargetBranch=${eNB_TargetBranch} --UEUserName=${UE_Username} --UEPassword=${UE_Password} --UESourceCodePath=${params.UE_SourceCodePath} --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} --XMLTestFile=${xmlFile}"
sh "python3 main.py --mode=TestUE --UEIPAddress=${params.UE_IPAddress} --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --UEUserName=${UE_Username} --UEPassword=${UE_Password} --UESourceCodePath=${params.UE_SourceCodePath} --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} --XMLTestFile=${xmlFile}"
} catch (Exception e) {
currentBuild.result = 'FAILURE'
buildStageStatus = false

View File

@@ -0,0 +1,82 @@
#!/bin/groovy
/*
* Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The OpenAirInterface Software Alliance licenses this file to You under
* the OAI Public License, Version 1.1 (the "License"); you may not use this file
* except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.openairinterface.org/?page_id=698
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*-------------------------------------------------------------------------------
* For more information about the OpenAirInterface (OAI) Software Alliance:
* contact@openairinterface.org
*/
// Template Jenkins Declarative Pipeline script to run Test w/ RF HW
// Location of the python executor node shall be in the same subnet as the others servers
def pythonExecutor = params.pythonExecutor
def TARGET_BRANCH = "develop"
def ALLOW_MERGE = true
pipeline {
agent {
label pythonExecutor
}
stages {
stage ("Launcher") {
steps {
script {
//retrieve MR that are opened nd with tag NSA
MR_LIST= sh returnStdout: true, script: 'curl --silent "https://gitlab.eurecom.fr/api/v4/projects/oai%2Fopenairinterface5g/merge_requests?state=opened&per_page=100&labels=NSA" | jq ".[].iid" || true '
echo "List of selected MR:\n${MR_LIST}"
def MR_ARRAY = MR_LIST.split('\n')
//for every selected MR, retrieve the branch name and the latest commit
for (MR in MR_ARRAY) {
SRC_BRANCH=sh returnStdout: true, script: """curl --silent "https://gitlab.eurecom.fr/api/v4/projects/oai%2Fopenairinterface5g/merge_requests/${MR}" | jq ".source_branch" || true """
SRC_BRANCH=SRC_BRANCH.trim()
COMMIT_ID=sh returnStdout: true, script: """curl --silent "https://gitlab.eurecom.fr/api/v4/projects/oai%2Fopenairinterface5g/merge_requests/${MR}" | jq ".sha" || true """
COMMIT_ID=COMMIT_ID.trim()
echo "Testing NSA on : ${MR} ${SRC_BRANCH} ${COMMIT_ID}"
//calling NSA sub job
build job: "RAN-NSA-Mini-Module", wait : true, propagate : false, parameters: [
string(name: 'eNB_MR', value: String.valueOf(MR)),
string(name: 'eNB_Branch', value: String.valueOf(SRC_BRANCH)),
string(name: 'eNB_CommitID', value: String.valueOf(COMMIT_ID)),
string(name: 'eNB_TargetBranch', value: String.valueOf(TARGET_BRANCH)),
booleanParam(name: 'eNB_AllowMergeRequestProcess', value: Boolean.valueOf(ALLOW_MERGE))
]
//calling NSA long sub job
// build job: "RAN-NSA-Mini-Module-Long", wait : true, propagate : false, parameters: [
// string(name: 'eNB_MR', value: String.valueOf(MR)),
// string(name: 'eNB_Branch', value: String.valueOf(SRC_BRANCH)),
// string(name: 'eNB_CommitID', value: String.valueOf(COMMIT_ID)),
// string(name: 'eNB_TargetBranch', value: String.valueOf(TARGET_BRANCH)),
// booleanParam(name: 'eNB_AllowMergeRequestProcess', value: Boolean.valueOf(ALLOW_MERGE))
// ]
//calling NSA attach/detach job
// build job: "RAN-NSA-Mini-Module-Attach-Detach", wait : true, propagate : false, parameters: [
// string(name: 'eNB_MR', value: String.valueOf(MR)),
// string(name: 'eNB_Branch', value: String.valueOf(SRC_BRANCH)),
// string(name: 'eNB_CommitID', value: String.valueOf(COMMIT_ID)),
// string(name: 'eNB_TargetBranch', value: String.valueOf(TARGET_BRANCH)),
// booleanParam(name: 'eNB_AllowMergeRequestProcess', value: Boolean.valueOf(ALLOW_MERGE))
// ]
}
}
}
}
}
}

273
ci-scripts/args_parse.py Normal file
View File

@@ -0,0 +1,273 @@
# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
# * contributor license agreements. See the NOTICE file distributed with
# * this work for additional information regarding copyright ownership.
# * The OpenAirInterface Software Alliance licenses this file to You under
# * the OAI Public License, Version 1.1 (the "License"); you may not use this file
# * except in compliance with the License.
# * You may obtain a copy of the License at
# *
# * http://www.openairinterface.org/?page_id=698
# *
# * Unless required by applicable law or agreed to in writing, software
# * distributed under the License is distributed on an "AS IS" BASIS,
# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# * See the License for the specific language governing permissions and
# * limitations under the License.
# *-------------------------------------------------------------------------------
# * For more information about the OpenAirInterface (OAI) Software Alliance:
# * contact@openairinterface.org
# */
#---------------------------------------------------------------------
# Python for CI of OAI-eNB + COTS-UE
#
# Required Python Version
# Python 3.x
#
# Required Python Package
# pexpect
#---------------------------------------------------------------------
#-----------------------------------------------------------
# Import Libs
#-----------------------------------------------------------
import sys # arg
import re # reg
import yaml
import constants as CONST
#-----------------------------------------------------------
# Parsing Command Line Arguements
#-----------------------------------------------------------
def ArgsParse(argvs,CiTestObj,RAN,HTML,EPC,ldpc,CONTAINERS,HELP,SCA,PHYSIM):
py_param_file_present = False
py_params={}
while len(argvs) > 1:
myArgv = argvs.pop(1) # 0th is this file's name
#--help
if re.match('^\-\-help$', myArgv, re.IGNORECASE):
HELP.GenericHelp(CONST.Version)
sys.exit(0)
#--apply=<filename> as parameters file, to replace inline parameters
elif re.match('^\-\-Apply=(.+)$', myArgv, re.IGNORECASE):
matchReg = re.match('^\-\-Apply=(.+)$', myArgv, re.IGNORECASE)
py_params_file = matchReg.group(1)
with open(py_params_file,'r') as file:
# The FullLoader parameter handles the conversion from YAML
# scalar values to Python dictionary format
py_params = yaml.load(file,Loader=yaml.FullLoader)
py_param_file_present = True #to be removed once validated
#AssignParams(py_params) #to be uncommented once validated
#consider inline parameters
elif re.match('^\-\-mode=(.+)$', myArgv, re.IGNORECASE):
matchReg = re.match('^\-\-mode=(.+)$', myArgv, re.IGNORECASE)
mode = matchReg.group(1)
elif re.match('^\-\-eNBRepository=(.+)$|^\-\-ranRepository(.+)$', myArgv, re.IGNORECASE):
if re.match('^\-\-eNBRepository=(.+)$', myArgv, re.IGNORECASE):
matchReg = re.match('^\-\-eNBRepository=(.+)$', myArgv, re.IGNORECASE)
else:
matchReg = re.match('^\-\-ranRepository=(.+)$', myArgv, re.IGNORECASE)
CiTestObj.ranRepository = matchReg.group(1)
RAN.ranRepository=matchReg.group(1)
HTML.ranRepository=matchReg.group(1)
ldpc.ranRepository=matchReg.group(1)
CONTAINERS.ranRepository=matchReg.group(1)
SCA.ranRepository=matchReg.group(1)
PHYSIM.ranRepository=matchReg.group(1)
elif re.match('^\-\-eNB_AllowMerge=(.+)$|^\-\-ranAllowMerge=(.+)$', myArgv, re.IGNORECASE):
if re.match('^\-\-eNB_AllowMerge=(.+)$', myArgv, re.IGNORECASE):
matchReg = re.match('^\-\-eNB_AllowMerge=(.+)$', myArgv, re.IGNORECASE)
else:
matchReg = re.match('^\-\-ranAllowMerge=(.+)$', myArgv, re.IGNORECASE)
doMerge = matchReg.group(1)
ldpc.ranAllowMerge=matchReg.group(1)
if ((doMerge == 'true') or (doMerge == 'True')):
CiTestObj.ranAllowMerge = True
RAN.ranAllowMerge=True
HTML.ranAllowMerge=True
CONTAINERS.ranAllowMerge=True
SCA.ranAllowMerge=True
PHYSIM.ranAllowMerge=True
elif re.match('^\-\-eNBBranch=(.+)$|^\-\-ranBranch=(.+)$', myArgv, re.IGNORECASE):
if re.match('^\-\-eNBBranch=(.+)$', myArgv, re.IGNORECASE):
matchReg = re.match('^\-\-eNBBranch=(.+)$', myArgv, re.IGNORECASE)
else:
matchReg = re.match('^\-\-ranBranch=(.+)$', myArgv, re.IGNORECASE)
CiTestObj.ranBranch = matchReg.group(1)
RAN.ranBranch=matchReg.group(1)
HTML.ranBranch=matchReg.group(1)
ldpc.ranBranch=matchReg.group(1)
CONTAINERS.ranBranch=matchReg.group(1)
SCA.ranBranch=matchReg.group(1)
PHYSIM.ranBranch=matchReg.group(1)
elif re.match('^\-\-eNBCommitID=(.*)$|^\-\-ranCommitID=(.*)$', myArgv, re.IGNORECASE):
if re.match('^\-\-eNBCommitID=(.*)$', myArgv, re.IGNORECASE):
matchReg = re.match('^\-\-eNBCommitID=(.*)$', myArgv, re.IGNORECASE)
else:
matchReg = re.match('^\-\-ranCommitID=(.*)$', myArgv, re.IGNORECASE)
CiTestObj.ranCommitID = matchReg.group(1)
RAN.ranCommitID=matchReg.group(1)
HTML.ranCommitID=matchReg.group(1)
ldpc.ranCommitID=matchReg.group(1)
CONTAINERS.ranCommitID=matchReg.group(1)
SCA.ranCommitID=matchReg.group(1)
PHYSIM.ranCommitID=matchReg.group(1)
elif re.match('^\-\-eNBTargetBranch=(.*)$|^\-\-ranTargetBranch=(.*)$', myArgv, re.IGNORECASE):
if re.match('^\-\-eNBTargetBranch=(.*)$', myArgv, re.IGNORECASE):
matchReg = re.match('^\-\-eNBTargetBranch=(.*)$', myArgv, re.IGNORECASE)
else:
matchReg = re.match('^\-\-ranTargetBranch=(.*)$', myArgv, re.IGNORECASE)
CiTestObj.ranTargetBranch = matchReg.group(1)
RAN.ranTargetBranch=matchReg.group(1)
HTML.ranTargetBranch=matchReg.group(1)
ldpc.ranTargetBranch=matchReg.group(1)
CONTAINERS.ranTargetBranch=matchReg.group(1)
SCA.ranTargetBranch=matchReg.group(1)
PHYSIM.ranTargetBranch=matchReg.group(1)
elif re.match('^\-\-eNBIPAddress=(.+)$|^\-\-eNB[1-2]IPAddress=(.+)$', myArgv, re.IGNORECASE):
if re.match('^\-\-eNBIPAddress=(.+)$', myArgv, re.IGNORECASE):
matchReg = re.match('^\-\-eNBIPAddress=(.+)$', myArgv, re.IGNORECASE)
RAN.eNBIPAddress=matchReg.group(1)
ldpc.eNBIpAddr=matchReg.group(1)
CONTAINERS.eNBIPAddress=matchReg.group(1)
SCA.eNBIPAddress=matchReg.group(1)
PHYSIM.eNBIPAddress=matchReg.group(1)
elif re.match('^\-\-eNB1IPAddress=(.+)$', myArgv, re.IGNORECASE):
matchReg = re.match('^\-\-eNB1IPAddress=(.+)$', myArgv, re.IGNORECASE)
RAN.eNB1IPAddress=matchReg.group(1)
CONTAINERS.eNB1IPAddress=matchReg.group(1)
elif re.match('^\-\-eNB2IPAddress=(.+)$', myArgv, re.IGNORECASE):
matchReg = re.match('^\-\-eNB2IPAddress=(.+)$', myArgv, re.IGNORECASE)
RAN.eNB2IPAddress=matchReg.group(1)
CONTAINERS.eNB2IPAddress=matchReg.group(1)
elif re.match('^\-\-eNBUserName=(.+)$|^\-\-eNB[1-2]UserName=(.+)$', myArgv, re.IGNORECASE):
if re.match('^\-\-eNBUserName=(.+)$', myArgv, re.IGNORECASE):
matchReg = re.match('^\-\-eNBUserName=(.+)$', myArgv, re.IGNORECASE)
RAN.eNBUserName=matchReg.group(1)
ldpc.eNBUserName=matchReg.group(1)
CONTAINERS.eNBUserName=matchReg.group(1)
SCA.eNBUserName=matchReg.group(1)
PHYSIM.eNBUserName=matchReg.group(1)
elif re.match('^\-\-eNB1UserName=(.+)$', myArgv, re.IGNORECASE):
matchReg = re.match('^\-\-eNB1UserName=(.+)$', myArgv, re.IGNORECASE)
RAN.eNB1UserName=matchReg.group(1)
CONTAINERS.eNB1UserName=matchReg.group(1)
elif re.match('^\-\-eNB2UserName=(.+)$', myArgv, re.IGNORECASE):
matchReg = re.match('^\-\-eNB2UserName=(.+)$', myArgv, re.IGNORECASE)
RAN.eNB2UserName=matchReg.group(1)
CONTAINERS.eNB2UserName=matchReg.group(1)
elif re.match('^\-\-eNBPassword=(.+)$|^\-\-eNB[1-2]Password=(.+)$', myArgv, re.IGNORECASE):
if re.match('^\-\-eNBPassword=(.+)$', myArgv, re.IGNORECASE):
matchReg = re.match('^\-\-eNBPassword=(.+)$', myArgv, re.IGNORECASE)
RAN.eNBPassword=matchReg.group(1)
ldpc.eNBPassWord=matchReg.group(1)
CONTAINERS.eNBPassword=matchReg.group(1)
SCA.eNBPassword=matchReg.group(1)
PHYSIM.eNBPassword=matchReg.group(1)
elif re.match('^\-\-eNB1Password=(.+)$', myArgv, re.IGNORECASE):
matchReg = re.match('^\-\-eNB1Password=(.+)$', myArgv, re.IGNORECASE)
RAN.eNB1Password=matchReg.group(1)
CONTAINERS.eNB1Password=matchReg.group(1)
elif re.match('^\-\-eNB2Password=(.+)$', myArgv, re.IGNORECASE):
matchReg = re.match('^\-\-eNB2Password=(.+)$', myArgv, re.IGNORECASE)
RAN.eNB2Password=matchReg.group(1)
CONTAINERS.eNB2Password=matchReg.group(1)
elif re.match('^\-\-eNBSourceCodePath=(.+)$|^\-\-eNB[1-2]SourceCodePath=(.+)$', myArgv, re.IGNORECASE):
if re.match('^\-\-eNBSourceCodePath=(.+)$', myArgv, re.IGNORECASE):
matchReg = re.match('^\-\-eNBSourceCodePath=(.+)$', myArgv, re.IGNORECASE)
RAN.eNBSourceCodePath=matchReg.group(1)
ldpc.eNBSourceCodePath=matchReg.group(1)
CONTAINERS.eNBSourceCodePath=matchReg.group(1)
SCA.eNBSourceCodePath=matchReg.group(1)
PHYSIM.eNBSourceCodePath=matchReg.group(1)
elif re.match('^\-\-eNB1SourceCodePath=(.+)$', myArgv, re.IGNORECASE):
matchReg = re.match('^\-\-eNB1SourceCodePath=(.+)$', myArgv, re.IGNORECASE)
RAN.eNB1SourceCodePath=matchReg.group(1)
CONTAINERS.eNB1SourceCodePath=matchReg.group(1)
elif re.match('^\-\-eNB2SourceCodePath=(.+)$', myArgv, re.IGNORECASE):
matchReg = re.match('^\-\-eNB2SourceCodePath=(.+)$', myArgv, re.IGNORECASE)
RAN.eNB2SourceCodePath=matchReg.group(1)
CONTAINERS.eNB2SourceCodePath=matchReg.group(1)
elif re.match('^\-\-EPCIPAddress=(.+)$', myArgv, re.IGNORECASE):
matchReg = re.match('^\-\-EPCIPAddress=(.+)$', myArgv, re.IGNORECASE)
EPC.IPAddress=matchReg.group(1)
elif re.match('^\-\-EPCUserName=(.+)$', myArgv, re.IGNORECASE):
matchReg = re.match('^\-\-EPCUserName=(.+)$', myArgv, re.IGNORECASE)
EPC.UserName=matchReg.group(1)
elif re.match('^\-\-EPCPassword=(.+)$', myArgv, re.IGNORECASE):
matchReg = re.match('^\-\-EPCPassword=(.+)$', myArgv, re.IGNORECASE)
EPC.Password=matchReg.group(1)
elif re.match('^\-\-EPCSourceCodePath=(.+)$', myArgv, re.IGNORECASE):
matchReg = re.match('^\-\-EPCSourceCodePath=(.+)$', myArgv, re.IGNORECASE)
EPC.SourceCodePath=matchReg.group(1)
elif re.match('^\-\-EPCType=(.+)$', myArgv, re.IGNORECASE):
matchReg = re.match('^\-\-EPCType=(.+)$', myArgv, re.IGNORECASE)
if re.match('OAI', matchReg.group(1), re.IGNORECASE) or re.match('ltebox', matchReg.group(1), re.IGNORECASE) or re.match('OAI-Rel14-CUPS', matchReg.group(1), re.IGNORECASE) or re.match('OAI-Rel14-Docker', matchReg.group(1), re.IGNORECASE):
EPC.Type=matchReg.group(1)
else:
sys.exit('Invalid EPC Type: ' + matchReg.group(1) + ' -- (should be OAI or ltebox or OAI-Rel14-CUPS or OAI-Rel14-Docker)')
elif re.match('^\-\-EPCContainerPrefix=(.+)$', myArgv, re.IGNORECASE):
matchReg = re.match('^\-\-EPCContainerPrefix=(.+)$', myArgv, re.IGNORECASE)
EPC.ContainerPrefix=matchReg.group(1)
elif re.match('^\-\-ADBIPAddress=(.+)$', myArgv, re.IGNORECASE):
matchReg = re.match('^\-\-ADBIPAddress=(.+)$', myArgv, re.IGNORECASE)
CiTestObj.ADBIPAddress = matchReg.group(1)
elif re.match('^\-\-ADBUserName=(.+)$', myArgv, re.IGNORECASE):
matchReg = re.match('^\-\-ADBUserName=(.+)$', myArgv, re.IGNORECASE)
CiTestObj.ADBUserName = matchReg.group(1)
elif re.match('^\-\-ADBType=(.+)$', myArgv, re.IGNORECASE):
matchReg = re.match('^\-\-ADBType=(.+)$', myArgv, re.IGNORECASE)
if re.match('centralized', matchReg.group(1), re.IGNORECASE) or re.match('distributed', matchReg.group(1), re.IGNORECASE):
if re.match('distributed', matchReg.group(1), re.IGNORECASE):
CiTestObj.ADBCentralized = False
else:
CiTestObj.ADBCentralized = True
else:
sys.exit('Invalid ADB Type: ' + matchReg.group(1) + ' -- (should be centralized or distributed)')
elif re.match('^\-\-ADBPassword=(.+)$', myArgv, re.IGNORECASE):
matchReg = re.match('^\-\-ADBPassword=(.+)$', myArgv, re.IGNORECASE)
CiTestObj.ADBPassword = matchReg.group(1)
elif re.match('^\-\-XMLTestFile=(.+)$', myArgv, re.IGNORECASE):
matchReg = re.match('^\-\-XMLTestFile=(.+)$', myArgv, re.IGNORECASE)
CiTestObj.testXMLfiles.append(matchReg.group(1))
HTML.testXMLfiles.append(matchReg.group(1))
HTML.nbTestXMLfiles=HTML.nbTestXMLfiles+1
elif re.match('^\-\-UEIPAddress=(.+)$', myArgv, re.IGNORECASE):
matchReg = re.match('^\-\-UEIPAddress=(.+)$', myArgv, re.IGNORECASE)
CiTestObj.UEIPAddress = matchReg.group(1)
elif re.match('^\-\-UEUserName=(.+)$', myArgv, re.IGNORECASE):
matchReg = re.match('^\-\-UEUserName=(.+)$', myArgv, re.IGNORECASE)
CiTestObj.UEUserName = matchReg.group(1)
elif re.match('^\-\-UEPassword=(.+)$', myArgv, re.IGNORECASE):
matchReg = re.match('^\-\-UEPassword=(.+)$', myArgv, re.IGNORECASE)
CiTestObj.UEPassword = matchReg.group(1)
elif re.match('^\-\-UESourceCodePath=(.+)$', myArgv, re.IGNORECASE):
matchReg = re.match('^\-\-UESourceCodePath=(.+)$', myArgv, re.IGNORECASE)
CiTestObj.UESourceCodePath = matchReg.group(1)
elif re.match('^\-\-finalStatus=(.+)$', myArgv, re.IGNORECASE):
matchReg = re.match('^\-\-finalStatus=(.+)$', myArgv, re.IGNORECASE)
finalStatus = matchReg.group(1)
if ((finalStatus == 'true') or (finalStatus == 'True')):
CiTestObj.finalStatus = True
elif re.match('^\-\-OCUserName=(.+)$', myArgv, re.IGNORECASE):
matchReg = re.match('^\-\-OCUserName=(.+)$', myArgv, re.IGNORECASE)
PHYSIM.OCUserName = matchReg.group(1)
elif re.match('^\-\-OCPassword=(.+)$', myArgv, re.IGNORECASE):
matchReg = re.match('^\-\-OCPassword=(.+)$', myArgv, re.IGNORECASE)
PHYSIM.OCPassword = matchReg.group(1)
elif re.match('^\-\-OCProjectName=(.+)$', myArgv, re.IGNORECASE):
matchReg = re.match('^\-\-OCProjectName=(.+)$', myArgv, re.IGNORECASE)
PHYSIM.OCProjectName = matchReg.group(1)
else:
HELP.GenericHelp(CONST.Version)
sys.exit('Invalid Parameter: ' + myArgv)
return py_param_file_present, py_params, mode

Some files were not shown because too many files have changed in this diff Show More