Melissa Elkadi
6a8e4e2883
Merge remote-tracking branch 'eurecom/develop' into episys/mel/merge_develop_cfra_working
2021-09-14 07:34:58 -07:00
Laurent THOMAS
d360113cfa
comment out end_configmodule meanwhile someone verify all parameters that should have PARAMFLAG_NOFREE
2021-09-01 11:29:32 +02:00
Melissa Elkadi
1b49e7e2ef
Additions to get UE connected to EPC
2021-08-25 12:10:12 -07:00
Melissa Elkadi
2a979f4e2f
Merge branch 'eurecom-nfapi-nr-arch-mod' into episys/merge_nsa_w_develop
2021-08-13 10:27:30 -07:00
Melissa Elkadi
9b16c1d860
Merge branch 'eurecom-develop' into episys/merge_nsa_w_develop
...
At this point we are successfully able to build.
Additionally, we can run the scenario,
however, it does not pass. It seems that the gNB
is not connecting to the proxy correctly. Just
wanted to push the progress so far. FYI, the items
that had to be changed to correct the linking issues
were the following:
- mac_rrc_data_ind_ue vs. nr_mac_rrc_data_ind_ue
- rrc_data_req vs. nr_rrc_data_req
- mac_rrc_data_req_ue vs. nr_mac_rrc_data_req_ue
- rrc_data_req_ue vs. rrc_data_req_nr_ue
- rrc_data_req vs. nr_rrc_data_req
The listed functions should be declard in the LTE/NR
UE directory depending on the functionality. Several
were mixed. i.e.: LTE functions being called in NR UE.
Also, removing siWindowLength, siWindowLength_int,
SIBType, SIBPeriod, and siPeriod_int from the NR UE RRC.
These variable were not used in the NR UE and are defined
for LTE only.
Lastly, in the NR_IF_Module.c of the NR UE, the global
variable def_dci_pdu_rel15 is not accessible. Need to
revisit this. For not it is commented out.
2021-08-11 10:23:42 -07:00
Melissa Elkadi
5751a0a435
Not sending random data to gNB, sending IP
...
The IP traffic still does not work. But we are
updating the NR UE scheduler to ensure we are are
sending true IP traffic. Also, we were getting an
assert(); as well, and there was no logs, so we
fix that in this commit as well.
2021-08-03 13:25:45 -07:00
Melissa Elkadi
97a648e35f
IP Traffic not working, tun if established by NRUE
...
Updated the configuration files. Added a sleep to
ensure that the LTE UE gets attached to the EPC
before the bearer is modified to be gNB. Updated
the ifconfig tunnel up command to be brought up
by the NR UE socket when in NSA mode. Lastly,
started the gNB PDCP layer in S1 mode.
2021-07-28 15:36:11 -07:00
Laurent OpenCells
39c63eb158
move function declaration in not duplicated files (.h instead of .c)
2021-07-22 13:19:37 +02:00
Laurent OpenCells
5ed848c76e
more fixes on gcc warnings, misleading indentation and CPU mitigation when the traffic demand in 5G exeeds the available througput
2021-07-20 16:30:14 +02:00
Melissa Elkadi
7f2e622b0e
Sending tunnel interface 'up' command to NR UE
...
Once the LTE UE's tunnel interface with the EPC
is ready to be established, if we are in NSA mode,
we do not want to launch the tunnel interface
from the LTE UE side, but in the NR UE. Via itti_msgs
we send the string containing the tunnel interface
'up' command to the NR UE and bring it up from the NR UE.
2021-07-07 11:55:34 -07: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
Masayuki Harada
1b69c2a00d
Remove pdcp_layer_init_for_CU function and merge to pdcp_layer_init.
2021-06-08 15:32:12 +09: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
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
rmagueta
64aa42d646
Change hardcoded task id to TASK_VARIABLE
2021-05-30 20:16:55 +01:00
rmagueta
fd3a45de82
Fix build issues
2021-05-17 12:01:32 +01: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
rmagueta
0ef6ef2b28
Code format improvements in differences for develop
2021-05-12 19:29:10 +01:00
matzakos
0ea7946da8
Remove redundant call to init_pdcp for noS1
2021-05-07 15:05:05 +02: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
Melissa Elkadi
6cace48013
Added in init function in RRC_NSA_NRUE task creation
2021-05-01 12:47:16 -07:00
Melissa Elkadi
539b1b564a
Removed commented code in nr-softmodem.c
...
Also enabled X2 when we are not using the EPC
Added in the case statement for handling the
dl_dcch_msg from the NR UE. Also added in the
proper decoding of that dl_dcch_msg and freeing
2021-05-01 11:48:21 -07:00
Melissa Elkadi
e50ca02957
Chaging NR functions to be properly named
...
This commit removed all the linking errors
between the NR UE and the LTE UE. This was done by
changing:
- rrc_data_req_ue
+ rrc_data_req_nr_ue
2021-05-01 11:32:26 -07: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
Laurent THOMAS
04b28b4518
fixes from testing
2021-04-30 16:47:40 +02: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
Laurent THOMAS
9643a5fb9b
memory mgmt error
2021-04-29 19:06:10 +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
matzakos
19ba8dd7a9
Call the right function for the initiation of gtp-u task at gNB
2021-04-27 13:31:41 +02:00
Raymond Knopp
d88ce5b9bf
Merge remote-tracking branch 'origin/develop' into oairu
2021-04-27 11:58:31 +02:00
Raymond Knopp
2be602e938
Merge remote-tracking branch 'origin/develop' into NR_SA_F1AP_5GRECORDS
2021-04-26 10:51:18 +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
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
Laurent THOMAS
86f1c69f26
Fix code review remarks, merge develop, revert some merge errors
2021-04-13 22:28:02 +02:00
Laurent Thomas
307098da4a
merge develop
2021-04-09 12:39:33 +02:00
Raymond Knopp
0b59ce4faf
Merge remote-tracking branch 'origin/develop' into oairu
2021-04-07 15:50:46 +02:00
Laurent OpenCells
c0ef3e6f88
fix gcc reported issues
2021-04-03 23:37:58 +02:00
Laurent THOMAS
0317d6725b
sanitize, calibration tool kickoff
2021-04-02 10:12:13 +02:00
David Kim
bdf98b03f5
updating vnf ip and udp port
2021-03-31 22:44:42 -07: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
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
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
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
Raymond Knopp
08b781ebfe
Merge remote-tracking branch 'origin/develop' into oairu
2021-03-25 06:44:11 +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
francescomani
f659a76f43
Merge remote-tracking branch 'origin/develop' into NR_FAPI_beamindex_SSB_RO
2021-03-19 10:06:20 +01:00