Commit Graph
297 Commits
Author SHA1 Message Date
Melissa Elkadi 2edfdb20a4 Merge remote-tracking branch 'eurecom/develop' into episys/mel/merge_bw_testing_abs 2021-10-25 09:52:23 -07:00
rmagueta 4e949657fb Fix after merge 2021-10-14 14:59:11 +01:00
rmagueta b1a8b06547 Merge remote-tracking branch 'origin/integration_2021_wk41' into integration_2021_wk41_bwt-abs
# Conflicts:
#	ci-scripts/xml_files/fr1_sa_quectel.xml
#	openair1/SCHED_NR/fapi_nr_l1.c
#	openair1/SCHED_NR/phy_procedures_nr_gNB.c
#	openair2/GNB_APP/gnb_paramdef.h
2021-10-14 14:22:23 +01:00
francescomani 02e48dea4a change in 2x2 config file 5g carrier frequency 2021-10-13 12:34:58 +02:00
Raymond Knopp 7edc7169ff updated CI conf file for 2x2 NSA (blacklisting middle 4 PRBs) 2021-10-11 14:37:39 +02:00
rmagueta 86664eb0a9 Add 2x2 conf file for CI RAN-SA-Module-CN5G 2021-10-08 11:11:30 +01:00
rmagueta 0438d64ddb Minor update in security section in conf files 2021-10-08 10:34:35 +01:00
David Kim 39563f3cd5 Restored the original NAS configuration file. 2021-10-07 10:11:21 -07:00
David Kim eb5f517165 updated configuration file location for ci test. 2021-10-01 15:34:12 -07:00
David Kim b2d1052fe9 Added some config files after restoring original config files. 2021-09-30 18:39:30 -07:00
hardy afb748ecd4 update for radio conf and testcase 2021-09-30 15:33:45 +02:00
hardy e3a1c21a3d update of the NSA/LTE 2x2 bench pipeline 2021-09-29 20:31:57 +02:00
Melissa Elkadi 62118252dd Merge remote-tracking branch 'eurecom/bandwidth-testing-abs' into episys/mel/merge_bw_testing_abs 2021-09-28 13:13:54 -07:00
Roberto Louro Magueta 6d88c040ce Revert "Fix ssb_SubcarrierOffset for NSA"
This reverts commit aad4e1a015
2021-09-24 16:28:18 +00:00
rmagueta aad4e1a015 Fix ssb_SubcarrierOffset for NSA 2021-09-24 16:46:32 +01:00
Roberto Louro Magueta 99f53ea942 Revert "Update pucch0_dtx_threshold"
This reverts commit e13ef657f3
2021-09-21 18:15:17 +00:00
rmagueta 96c194f0e8 Merge remote-tracking branch 'origin/bandwith_testing_debug' into bandwidth-testing-abs
# Conflicts:
#	openair1/SCHED_NR/phy_procedures_nr_gNB.c
#	targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf
2021-09-21 17:13:19 +01:00
rmagueta e13ef657f3 Update pucch0_dtx_threshold 2021-09-21 12:41:38 +01:00
luis_pereira87 85a03cd3c1 Intermediate backup commit 2021-09-20 13:03:44 +01:00
Melissa Elkadi 6a8e4e2883 Merge remote-tracking branch 'eurecom/develop' into episys/mel/merge_develop_cfra_working 2021-09-14 07:34:58 -07:00
rmagueta 71cd100335 Merge remote-tracking branch 'origin/nr-pdcp-security-w34' into bandwidth-testing-abs
# Conflicts:
#	ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.usrpn310.conf
#	openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
2021-09-08 17:22:28 +01:00
Cedric Roux 4877d56a12 nr: add security section to gnb config files
The configuration files named "gnb*conf" have been modified.
Other configuration files were left unmodified.
2021-09-06 11:06:47 +02:00
David Kim f8c9be3af9 Added function declaration to read config file.
config files were also updated.
2021-09-03 10:46:09 -07:00
Melissa Elkadi ca1805faaf IP ping traffic is working correctly
In this commit we have updated the NRUE
to properly get the RadioBearer info from
the gNB. Because NSA and SA mode both use
this information, we have updated the SA
function previously in place by changing
the name to allow both NSA and SA mode to
use. This commit also updated the NR/LTE UEs
configuration files to with the correct
proxy IP address.
2021-09-03 10:13:59 -07:00
rmagueta cf4066f7cd Merge remote-tracking branch 'origin/bandwidth-testing' into bandwidth-testing-abs 2021-09-03 15:19:06 +01:00
hardy be5448da66 [CI] edit config file for SA test 2021-09-03 10:19:56 +02:00
David Kim 6342e67c33 Setting UE and nrUE IP address in config file.
1. Removed hard coded IP address in the code for UE and nrUE's remote address.
2. Read IP address from config file for UE and nrUE's remote address.
2021-09-02 13:33:42 -07:00
rmagueta 5e1065e88f Merge remote-tracking branch 'origin/develop' into bandwidth-testing-abs
# Conflicts:
#	executables/nr-uesoftmodem.c
#	executables/nr-uesoftmodem.h
#	executables/softmodem-common.h
#	openair1/PHY/MODULATION/slot_fep_nr.c
#	openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c
#	openair1/SCHED_NR/fapi_nr_l1.c
#	openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
#	openair2/LAYER2/NR_MAC_UE/mac_proto.h
#	openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.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_ulsch.c
2021-09-02 17:57:48 +01:00
Eurecom 3005e1652a 106 PRB SA configuration file for ci 2021-09-01 16:46:16 +02:00
Eurecom bafd82a935 Merge remote-tracking branch 'origin/NR_UE_SA' into bandwidth-testing
Conflicts:
	executables/nr-ru.c
	openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c
	openair1/SCHED_NR/phy_procedures_nr_gNB.c
	openair2/LAYER2/NR_MAC_gNB/config.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_primitives.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_reconfig.c
2021-08-21 07:48:04 +02:00
Sakthivel Velumani a87dca8691 Merge branch 'develop' into prb_based_dl_channel_estimation 2021-08-16 18:59:29 +05:30
Melissa Elkadi 2a979f4e2f Merge branch 'eurecom-nfapi-nr-arch-mod' into episys/merge_nsa_w_develop 2021-08-13 10:27:30 -07:00
Sakthivel Velumani 3ab21d8fd1 Merge branch 'develop' into prb_based_dl_channel_estimation 2021-08-13 17:57:05 +05:30
Raphael Defosseux e2347afbb5 feat(ci): adding working docker-compose for 5G RF sim
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-08-11 23:24:29 +02: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 745241bd63 Merge branch 'episys/nsa_epc_gnb_updates' into episys/david/multiUE_with_crnti_checking
Also, lots of debugging logs added
2021-08-04 16:24:27 -07:00
Eurecom 969a7a08fe Merge remote-tracking branch 'origin/develop' into bandwidth-testing
Conflicts:
	openair2/GNB_APP/MACRLC_nr_paramdef.h
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
2021-08-04 12:09:42 +02:00
Eurecom 24b2975893 added 50 MHz configuration file, SA,2x2,n310 all initial BWP. 2021-08-04 11:57:52 +02:00
Eurecom 5274b35d02 added SA configuration file for n310, SA, 40 MHz BW. All on initial BWP. 2021-08-04 11:26:51 +02:00
Raphael Defosseux a518701a27 feat(docker): adding conf template to gNB container image
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-08-03 11:52:31 +02:00
Sakthivel Velumani 6050776f55 Merge branch 'develop' into prb_based_dl_channel_estimation 2021-08-02 12:17:03 +02:00
Raphael Defosseux 5adf940b99 Merge remote-tracking branch 'origin/ci_nsa_2x2_implem' into develop 2021-08-02 09:58:35 +02: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
hardy 087a2da298 SA test pipeline udpate 2021-07-28 21:41:15 +02:00
David Kim 829bf4f8a2 Restored to the original OAI ue and nr-ue config file
Restored original LOG level.
Code cleanup to remove emptry space and added some logs.
2021-07-28 00:24:35 -07:00
luis_pereira87 7c61f6d969 Fix pusch_TargetSNRx10 and pucch_TargetSNRx10 in configuration files 2021-07-22 11:13:14 +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 a052e1b719 update conf files for CI 2021-07-20 17:27:59 +02:00
David Kim 4f23fa2f61 added queues between VNF and MAC to handle indications. 2021-07-19 18:55:02 -07:00
hardy a6d53823a3 nsa 2x2 test implem 2021-07-19 14:42:39 +02:00