Compare commits

..

3266 Commits

Author SHA1 Message Date
Raymond Knopp
a29f0dd5d6 Merge remote-tracking branch 'origin/develop' into CSI-SA
Conflicts:
	ci-scripts/xml_files/fr1_sa_quectel.xml
	executables/nr-gnb.c
	openair1/SCHED_NR/phy_procedures_nr_gNB.c
	openair2/GNB_APP/gnb_paramdef.h
2021-10-26 10:14:45 +02:00
hardy
a722993724 Integration_2021_wk42
integration of integration_2021_wk41_bwt-abs into develop, completed week 42

MR !1273 : [CI] adding Docker Hub push pipeline
-When we merge to develop, this pipeline will automatically push images to hub.docker.com

MR !1267 : Enabled multi-threading for gNB L1 tx
-PHY PDUs like PDCCH PDU, PDSCH PDU, SSB PDU and CSI PDU have been removed from PHY_VARS_gNB structure.
Instead, they are made as a part of thread message for L1 Tx processing.
Two such thread messages are used so that two independent L1 Tx processing threads can be executed at once.
Monolithic mode works fine with rfsimulator. nfapi mode changes are integrated by not tested. Let the CI test it.

MR !1285 : [CI] test sa nsa
-Dev of nsa and sa test pipelines

MR !1266 : Changes for initialBWP size different than Coreset0
-Changes for initialBWP size different than Coreset0. Tested with 50 MHz 2x2 configuration, initialBWP with 133 PRBs.
-Other fixes and improvements to get a more stable 5G NR connection
2021-10-20 10:17:12 +02:00
hardy
a0d8e0fa51 fix SA testcase 2021-10-19 14:44:33 +02:00
Raphael Defosseux
73561c590a fix(ci): looping multiple times when trying to attach a module
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-10-19 13:57:11 +02:00
hardy
faadaaa475 fix nohup for OAICN iperf 2021-10-19 13:41:24 +02:00
hardy
433b8421ad tentative : push UL traffic nsa 2x2 2021-10-19 11:37:45 +02:00
hardy
68db2a0afd fix nohup 2021-10-18 16:41:36 +02:00
hardy
f32153f4df TC fix for nsa 2x2 fast ping : incorrect arguments 2021-10-18 16:41:36 +02:00
Eurecom
4496b05423 testing CSI reporting and MIMO DL 2021-10-17 18:03:55 +02:00
Eurecom
f83c02d981 Merge branch 'NR_2port_CSIRS' into CSI-SA
Conflicts:
	openair1/PHY/NR_TRANSPORT/nr_ulsch.c
	openair1/SIMULATION/NR_PHY/dlsim.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_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
	targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
2021-10-17 02:13:11 +02:00
Eurecom
52af089e2d Merge remote-tracking branch 'origin/integration_2021_wk41' into CSI-SA
Conflicts:
	ci-scripts/xml_files/fr1_sa_quectel.xml
	openair1/PHY/NR_ESTIMATION/nr_measurements_gNB.c
	openair1/SCHED_NR/fapi_nr_l1.c
	openair1/SCHED_NR/phy_procedures_nr_gNB.c
	openair2/GNB_APP/gnb_config.c
	openair2/GNB_APP/gnb_paramdef.h
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
	openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
2021-10-16 16:04:54 +02:00
Eurecom
8b441a19d6 Merge remote-tracking branch 'origin/integration_2021_wk41' into NR_2port_CSIRS 2021-10-16 15:55:59 +02:00
Eurecom
e1eebbad19 CSI RSRP reporting ok. 2021-10-16 11:11:05 +02:00
hardy
972b9847ea fix UE start command 2021-10-15 07:00:31 +02:00
hardy
92e286ecae aligning NSA and SA tests 2021-10-15 07:00:31 +02:00
hardy
fcb3233645 Merge remote-tracking branch 'origin/ci_test_sa_nsa' into integration_2021_wk41_bwt-abs 2021-10-14 20:51:22 +02:00
hardy
d3bc6d675c update trigger for 4 tests 2021-10-14 20:40:09 +02:00
rmagueta
4e949657fb Fix after merge 2021-10-14 14:59:11 +01:00
Eurecom
85d54ac9df logging 2021-10-14 15:46:50 +02: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
hardy
41bf35a605 fix stats monitor pickle filename 2021-10-14 14:15:51 +02:00
hardy
f462417b05 update runtime stats graphs 2021-10-14 12:57:30 +02:00
hardy
563fd66b9c bring ulsch and dlsch stats for gnb 2021-10-14 12:12:20 +02:00
hardy
010e0cca1b bring ulsch and dlsch stats for gnb 2021-10-14 11:22:22 +02:00
hardy
30c5668bbe push tc in duration and UL bw 2021-10-14 09:09:11 +02:00
hardy
95108806c5 checking pep8 2021-10-14 08:34:09 +02:00
Raymond Knopp
98a72d6c42 reduced logging 2021-10-14 07:56:58 +02:00
Raymond Knopp
be8dbcf52f Merge branch 'integration_2021_wk41' of https://gitlab.eurecom.fr/oai/openairinterface5g into integration_2021_wk41 2021-10-14 01:37:20 +02:00
Raymond Knopp
166a8f69bb prb_mask calculation for mixed slot (for blacklisted PRBs) 2021-10-14 01:35:01 +02:00
hardy
eea4e17989 temp for debug : do not exit if RT stats are exceeded 2021-10-13 21:49:10 +02:00
Raymond Knopp
f287f0ec2d Merge branch 'integration_2021_wk41' of https://gitlab.eurecom.fr/oai/openairinterface5g into integration_2021_wk41 2021-10-13 17:05:44 +02:00
Raymond Knopp
0a87da0b74 bugfix for allocation of blacklisted PRBs in MAC 2021-10-13 17:05:12 +02:00
hardy
5b40814f3b fix typo 2021-10-13 16:32:01 +02:00
hardy
e579d5d27a fix typo 2021-10-13 16:18:55 +02:00
hardy
65d64518db typo fix 2021-10-13 16:12:06 +02:00
Raymond Knopp
c92899f704 blacklisting modification in ULSCH scheduler. 2021-10-13 15:54:27 +02:00
hardy
4b03a4ad61 copyout workaround 2021-10-13 15:04:15 +02:00
Raymond Knopp
bb0b900848 Merge branch 'integration_2021_wk41' of https://gitlab.eurecom.fr/oai/openairinterface5g into integration_2021_wk41 2021-10-13 15:00:10 +02:00
Raymond Knopp
64538f086c NSA configuration files for CI (move to 3.35 GHz for NR) 2021-10-13 14:59:29 +02:00
hardy
548d3be97a Merge remote-tracking branch 'origin/ci_test_sa_nsa' into integration_2021_wk41 2021-10-13 14:58:31 +02:00
Raymond Knopp
a5b60534c2 added/activated logging for PUSCH decoding when NAK 2021-10-13 14:56:28 +02:00
hardy
37c66efd01 improve script struct 2021-10-13 14:35:28 +02:00
hardy
13dcddf40c add mtu 1500 in epc docker compose 2021-10-13 14:04:28 +02:00
francescomani
02e48dea4a change in 2x2 config file 5g carrier frequency 2021-10-13 12:34:58 +02:00
rmagueta
614c29ad1a Function cblas_zgemv replaced by cblas_zaxpy because it has an undefined output (for the same input) after a second call in RHEL8 (acorr = nan) 2021-10-12 18:56:35 +01:00
hardy
90eb329da9 refactor stat_monitor 2021-10-12 16:06:41 +02:00
hardy
90c6b8b58b copyout workaround 2021-10-12 13:26:25 +02:00
hardy
12a773ac32 tentative to fix artifacts copyout 2021-10-12 12:27:29 +02:00
hardy
dd8a0798a7 more fixes for test framework 2021-10-12 09:02:24 +02:00
hardy
a7fe971522 collect stats log for multiple nodes 2021-10-12 09:02:09 +02:00
hardy
3a0161f10f fix NSA 2x2 pipeline and test 2021-10-12 09:01:51 +02:00
hardy
8a3f69049d more tests to be triggered by NSA tag 2021-10-12 09:01:36 +02:00
hardy
42deebac48 fix copyout fail 2021-10-12 09:01:22 +02:00
hardy
8570aaa59b debug 2021-10-12 00:15:39 +02:00
hardy
f9d5a87570 more fixes for test framework 2021-10-11 23:12:30 +02:00
hardy
6c64382d60 collect stats log for multiple nodes 2021-10-11 22:35:58 +02:00
luis_pereira87
545ee44407 Remove unreachable "else" statement 2021-10-11 18:14:45 +01:00
luis_pereira87
ae8d459c06 Fix in polar_rate_matching 2021-10-11 16:25:56 +01:00
Raymond Knopp
92c5b69b8e Merge branch 'integration_2021_wk41' of https://gitlab.eurecom.fr/oai/openairinterface5g into integration_2021_wk41 2021-10-11 16:03:30 +02:00
Raymond Knopp
0e6e2c3c52 Msg3 PRB reduction to 8. Gives 8 byte Msg3 with MCS 0 2021-10-11 16:03:02 +02:00
hardy
d82a1c5d28 fix NSA 2x2 pipeline and test 2021-10-11 15:30:52 +02:00
Raymond Knopp
7edc7169ff updated CI conf file for 2x2 NSA (blacklisting middle 4 PRBs) 2021-10-11 14:37:39 +02:00
Raymond Knopp
fe0c3293cb Merge branch 'integration_2021_wk41' of https://gitlab.eurecom.fr/oai/openairinterface5g into integration_2021_wk41 2021-10-11 14:35:45 +02:00
Raymond Knopp
b05d165cd0 hand cherry-picked PRB blacklisting 2021-10-11 14:34:49 +02:00
hardy
3e377a17a9 more tests to be triggered by NSA tag 2021-10-11 14:06:09 +02:00
hardy
9c94b0747b fix copyout fail 2021-10-11 13:58:34 +02:00
Eurecom
71d933d2f4 Merge remote-tracking branch 'origin/bandwidth-testing-abs' into bandwidth-testing
Conflicts:
	executables/nr-ru.c
	openair1/SCHED_NR/phy_procedures_nr_gNB.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
2021-10-11 13:46:15 +02:00
hardy
210829e91c Merge remote-tracking branch 'origin/phy-asan-fixes' into integration_2021_wk41 2021-10-11 12:01:28 +02:00
hardy
640e3ce8e1 Merge remote-tracking branch 'origin/ci_push_dockerhub' into integration_2021_wk41 2021-10-11 12:00:53 +02:00
hardy
0276ec0ca8 Merge remote-tracking branch 'origin/ci_test_sa_nsa' into integration_2021_wk41 2021-10-11 12:00:12 +02:00
hardy
ace498824b remove deploy of trf_gen (redundant) 2021-10-11 11:47:04 +02:00
hardy
5f12399c7a complete nsa 2x2 test 2021-10-11 11:40:02 +02:00
Eurecom
a28c6e7c9f MAC support for prb blacklisting 2021-10-08 21:21:28 +02:00
Eurecom
7b1d84df74 Merge branch 'bandwidth-testing' of https://gitlab.eurecom.fr/oai/openairinterface5g into bandwidth-testing 2021-10-08 15:46:15 +02:00
Raymond Knopp
7d7dd29514 blacklisting of PRBs in configuration file 2021-10-08 15:44:57 +02:00
rmagueta
a189a3a58c Revert BWPSize for Msg2 2021-10-08 13:52:00 +01:00
rmagueta
ead800d0f0 Update config filename for CI RAN-SA-Module-CN5G 2021-10-08 13:15:03 +01:00
rmagueta
d57a4cf513 Remove hardcoded opp_enabled 2021-10-08 13:01:46 +01:00
rmagueta
085a98b14c Improve get_coreset to handle also coreset0 2021-10-08 11:58:28 +01: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
francescomani
b5d5481616 Merge branch 'bandwidth-testing-abs' of https://gitlab.eurecom.fr/oai/openairinterface5g into bandwidth-testing-abs 2021-10-07 16:46:08 +02:00
francescomani
90ff07c6cc aggregation level loops at gnb (currently selecting the lowest value) 2021-10-07 16:45:38 +02:00
hardy
5a4dd071fe copyout active_net_interfaces.awk to xNB tmp 2021-10-07 15:55:19 +02:00
hardy
5f2f1b5eab adding the support of different apn depending on CN in ue infra yaml 2021-10-07 10:32:04 +02:00
francescomani
b59b94046f fix compilation 2021-10-07 09:22:07 +02:00
Eurecom
a0eddabbbd log reduction 2021-10-06 22:44:22 +02:00
Raymond Knopp
3549168347 removal of mean signal level 2021-10-06 22:43:06 +02:00
hardy
28ce54a831 fix regex 2021-10-06 17:25:27 +02:00
hardy
b8ea886efd add NR stats files to monitoring 2021-10-06 16:51:47 +02:00
hardy
504fb9df7f fix regex for iperf server analysis 2021-10-06 16:49:44 +02:00
francescomani
652d0f57eb improve sib1 code for aggregation levels 2021-10-06 16:45:46 +02:00
hardy
b80d8ae5c5 terminate trf_gen when closing CN5G 2021-10-06 16:11:08 +02:00
hardy
7442aab5c9 completing SA test for iperf and stats mon 2021-10-06 16:01:30 +02:00
hardy
f577ec6a45 Merge remote-tracking branch 'origin/ci_implement_cn5g_deployment' into ci_test_sa_nsa 2021-10-06 15:58:10 +02:00
hardy
700a149d20 update for CI SA test 2021-10-06 15:51:08 +02:00
rmagueta
e7e90beeeb Merge remote-tracking branch 'origin/develop' into bandwidth-testing-abs 2021-10-06 10:43:05 +01:00
Raphael Defosseux
81e4a7832a style(ci): LTE F1 split has its own pipeline now. less confusion
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-10-05 11:38:51 +02:00
Raphael Defosseux
31567fe390 doc(release): Updating the 5F RF simulator documentation and docker-compose following the v1.2.0 release of OAI-CN5G
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-10-05 10:56:07 +02:00
hardy
72d3be655c UHD_RFNOC_DIR hack + testcase fix for testing 2021-10-05 08:28:55 +02:00
hardy
0206cd687f do not build in bg 2021-10-05 07:47:30 +02:00
luis_pereira87
db2c6ce79e Fix maxL for NSA 2021-10-04 18:40:41 +01:00
hardy
f1134557d4 tentative change of monitor script launch 2021-10-04 18:46:28 +02:00
rmagueta
7c280e6f12 Get the PINGs working again for the FDD 2021-10-04 16:54:02 +01:00
francescomani
97d114e0ed bugfix 2021-10-04 17:11:41 +02:00
francescomani
616481b158 fix for ulsch missed detection using ndi 2021-10-04 12:06:03 +02:00
hardy
21adc587d6 tentative to fix capture of stat files 2021-10-04 07:48:01 +02:00
hardy
8ce6e4f6e0 poc : stats monitoring 2021-10-03 23:51:35 +02:00
hardy
76be9fe5ba poc : add radio monitor script for test runtime 2021-10-03 20:40:41 +02:00
hardy
a7a8a6cb1c fix 2021-10-03 20:40:41 +02:00
hardy
66219a9a76 add UL implementation 2021-10-03 20:40:41 +02:00
luis_pereira87
cd57c618d1 Put back harq round obtained from rv_index 2021-10-01 15:38:12 +01:00
luis_pereira87
4fd861a28a Fix nr_get_tpc to return increase 3dB 2021-10-01 13:36:49 +01:00
luis_pereira87
c1ba735fee Improve fill_ul_rb_mask 2021-10-01 12:02:39 +01:00
luis_pereira87
bf0bc0de54 Remove hardcoded maxL (kept only for do-ra) 2021-10-01 10:59:45 +01:00
luis_pereira87
c23117da6f Fix effective_BWPSize when coreset has 96 PRBs for Msg2 2021-10-01 10:26:09 +01:00
rmagueta
ff34838423 Put back scheduling request configuration after the cherry-pick which solved the segfault 2021-09-30 17:18:00 +01:00
rmagueta
a58fd73e17 Merge remote-tracking branch 'origin/bandwidth-testing-abs' into bandwidth-testing-abs 2021-09-30 17:15:41 +01:00
Mario Joa-Ng
dffd63d35a fix a segfault when uci_01->harq is null 2021-09-30 17:12:02 +01:00
francescomani
0fdd2fb42a comment added log fixed 2021-09-30 18:11:49 +02:00
francescomani
70d81ac8fa additional fix for coreset in calculate_preferred_dl_tda 2021-09-30 15:49:57 +02:00
hardy
afb748ecd4 update for radio conf and testcase 2021-09-30 15:33:45 +02:00
mjoang
f48c1d913b handle pdu_length up 65535byte. 2021-09-30 13:22:04 +01:00
rmagueta
081d566201 Fix calculate_preferred_dl_tda and remove duplicated code 2021-09-30 13:08:15 +01:00
rmagueta
568071cb57 Change LOG levels 2021-09-30 12:52:22 +01:00
rmagueta
dc1cbfaa63 Revert wrong merge related to num_dmrs_cdm_grps_no_data in scheduler DLSCH 2021-09-30 10:16:11 +01:00
francescomani
b8af250fb9 improve ssb sco condition 2021-09-30 09:47:03 +02:00
hardy
893cf7c2e0 temp remove ping to debug DL 2021-09-30 08:29:39 +02:00
hardy
c16e71b022 add DL stage to NSA 2x2 test 2021-09-30 08:00:25 +02:00
hardy
ea4a60d926 DL support + testcase fix 2021-09-30 08:00:25 +02:00
hardy
2d46faaf13 check mtu is as expected 2021-09-29 23:32:07 +02:00
Eurecom
95478f1937 Merge branch 'bandwidth-testing' of https://gitlab.eurecom.fr/oai/openairinterface5g into bandwidth-testing 2021-09-29 21:34:51 +02:00
Raymond Knopp
d9235268b4 MAC statistics in separate thread 2021-09-29 21:32:22 +02:00
rmagueta
2d2f6c6421 Fix function to fill UL RB mask to be used for N0 measurements of PUCCH 2021-09-29 19:51:17 +01:00
hardy
e3a1c21a3d update of the NSA/LTE 2x2 bench pipeline 2021-09-29 20:31:57 +02:00
rmagueta
432e00a0c1 General tda selection 2021-09-29 15:56:13 +01:00
Eurecom
bc03e8c13d Merge branch 'bandwidth-testing' of https://gitlab.eurecom.fr/oai/openairinterface5g into bandwidth-testing 2021-09-29 14:46:05 +02:00
francescomani
36c321a785 Merge remote-tracking branch 'origin/develop' into NR_2port_CSIRS 2021-09-29 14:11:27 +02:00
rmagueta
76a8ac303d Set back threshold to 50 for xrtmag_dBtimes10 2021-09-28 18:02:10 +01:00
rmagueta
c5e877df58 Change LOG levels 2021-09-28 17:36:22 +01:00
rmagueta
1ab23d4b96 Remove commented functions 2021-09-28 17:25:38 +01:00
rmagueta
5630c434a8 Revert sl10 to 7 2021-09-28 17:13:56 +01:00
Laurent Thomas
b0b7101641 Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into phy-asan-fixes 2021-09-28 16:52:09 +02:00
hardy
5c335eaf33 update RT stats config file to capture new metrics 2021-09-28 16:37:00 +02:00
francescomani
2b30a1e6f9 Merge branch 'bandwidth-testing-abs' of https://gitlab.eurecom.fr/oai/openairinterface5g into bandwidth-testing-abs 2021-09-28 16:21:21 +02:00
francescomani
6df8f942e1 fix log in pucch0 rx 2021-09-28 16:20:58 +02:00
luis_pereira87
ac4954bc79 Fix apply_nr_rotation_ul 2021-09-28 15:14:33 +01:00
luis_pereira87
64fa82673c Fix in the improvement of ssb_SubcarrierOffset validation 2021-09-28 14:24:03 +01:00
luis_pereira87
061f1da363 Improve ssb_SubcarrierOffset validation 2021-09-28 14:07:03 +01:00
luis_pereira87
18fef22ad1 Fill lcid_mask for NSA 2021-09-28 13:30:14 +01:00
Sakthivel Velumani
4a93a8220f Fix ulsim segfault 2021-09-28 17:55:56 +05:30
rmagueta
345ee2fd88 Revert min_rb to 5 2021-09-27 11:21:55 +01:00
rmagueta
280249bb2a Merge remote-tracking branch 'origin/bandwidth-testing' into bandwidth-testing-abs
# Conflicts:
#	openair1/PHY/NR_TRANSPORT/pucch_rx.c
2021-09-27 11:05:30 +01:00
Raymond Knopp
fb4235fd50 changes in PUCCH0 SNR measurement, testing for PUCCH power control 2021-09-27 11:52:50 +02:00
rmagueta
c0b260673d Merge remote-tracking branch 'origin/develop' into bandwidth-testing-abs 2021-09-27 10:08:14 +01:00
Eurecom
5392b1f13f Merge branch 'bandwidth-testing' of https://gitlab.eurecom.fr/oai/openairinterface5g into bandwidth-testing 2021-09-27 07:22:13 +02:00
Eurecom
286893a1ed commit before merge 2021-09-27 07:21:00 +02:00
Remi Hardy
314760acf3 integration_2021_wk37
MR !1272 : \[DOC\] NR feature set update  
MR !1244 : \[DOC\] Update SA tutorial  
MR !1269 : \[CI\] dashboard creds and executor change  
MR !1262 : \[CI\] jenkins pipe to write test results to mysql  
MR !1250 : NR_NSA_no_msg3_retransmission  
MR !1264 : NR_UE_IF_FREQ (IF frequency command line option at OAI UE)
2021-09-26 07:32:47 +00: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
hardy
ef99e1ded4 Merge remote-tracking branch 'origin/NR_UE_IF_FREQ' into integration_2021_wk37 2021-09-24 14:09:47 +02:00
hardy
03eb29580a Merge remote-tracking branch 'origin/NR_NSA_no_msg3_retransmission' into integration_2021_wk37 2021-09-24 14:08:54 +02:00
hardy
8d5e74cbb9 Merge remote-tracking branch 'origin/ci_sql_collect_results' into integration_2021_wk37 2021-09-24 09:55:51 +02:00
hardy
67b03a5d04 Merge remote-tracking branch 'origin/ci_clean_dashboard_setup' into integration_2021_wk37 2021-09-24 09:55:21 +02:00
hardy
20fd6472fa Merge remote-tracking branch 'origin/NR_SA_documentation_update' into integration_2021_wk37 2021-09-24 09:54:53 +02:00
hardy
6bed20a072 Merge remote-tracking branch 'origin/NR_feature_set_update' into integration_2021_wk37 2021-09-24 09:54:29 +02:00
francescomani
6148e8f3e5 Merge branch 'bandwidth-testing-abs' of https://gitlab.eurecom.fr/oai/openairinterface5g into bandwidth-testing-abs 2021-09-22 18:22:10 +02:00
francescomani
0c228ac12a fixed amplitude for pucch at ue 2021-09-22 17:59:16 +02:00
rmagueta
1540f9bf1a Fix PINGs and IPERF for phy-test 2021-09-22 15:25:08 +01:00
Raymond Knopp
87310ec55c Merge remote-tracking branch 'origin/bandwith_testing_debug' into bandwidth-testing
Conflicts:
	openair1/SCHED_NR/phy_procedures_nr_gNB.c
2021-09-22 15:05:27 +02:00
Raymond Knopp
0270bf0321 commit before merge 2021-09-22 14:08:06 +02:00
Raphael Defosseux
929cfef814 feat(ci): adding DH push pipeline
triggering from main pipeline

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-09-22 12:11:07 +02:00
rmagueta
32460820f4 Change 50 to 30 for no_conf condition in nr_decode_pucch0 2021-09-21 19:43:06 +01:00
rmagueta
f2abff7745 Add prach_dtx_threshold and pucch0_dtx_threshold in some conf files 2021-09-21 19:20:11 +01:00
Roberto Louro Magueta
99f53ea942 Revert "Update pucch0_dtx_threshold"
This reverts commit e13ef657f3
2021-09-21 18:15:17 +00:00
rmagueta
b2e5b2884e Change LOG level 2021-09-21 18:19:07 +01:00
rmagueta
bafa835099 Merge remote-tracking branch 'origin/bandwith_testing_debug' into bandwidth-testing-abs 2021-09-21 18:18:01 +01:00
Roberto Louro Magueta
2ef4ab6d54 Revert "Set initialULBWPstartSymbolAndLength_0 = 54"
This reverts commit a53b260987
2021-09-21 16:57:24 +00:00
francescomani
06cfa4e934 yet another bugfix 2021-09-21 18:45:36 +02:00
rmagueta
beb065d2e8 Change LOG levels 2021-09-21 17:19:19 +01: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
francescomani
7301280736 bugfix of the bugfix 2021-09-21 17:29:21 +02:00
francescomani
5b976712a3 another bugfix in acknack scheduling 2021-09-21 17:02:31 +02:00
francescomani
1ca995f97a improve xrtmag_next 2021-09-21 15:58:37 +02:00
francescomani
4042788934 log for xrtmag debug 2021-09-21 14:48:25 +02:00
rmagueta
18d52cd129 Change LOG level 2021-09-21 13:42:44 +01:00
francescomani
06ad8f6a28 remove added code in msg4 retransmission 2021-09-21 14:34:42 +02:00
rmagueta
a53b260987 Set initialULBWPstartSymbolAndLength_0 = 54 2021-09-21 13:14:23 +01:00
rmagueta
993974c4b4 Set pusch_TargetSNRx10 = 150 2021-09-21 13:04:39 +01:00
rmagueta
617bf6a16c Set initial_wait=0 and opp_enabled = 0 2021-09-21 13:00:03 +01:00
rmagueta
e13ef657f3 Update pucch0_dtx_threshold 2021-09-21 12:41:38 +01:00
rmagueta
bc936bfffd Update LOGs 2021-09-21 12:31:15 +01:00
rmagueta
e5f677aa2b Change LOG levels 2021-09-21 12:13:32 +01:00
francescomani
398d81e736 bugfix in acknack scheduling 2021-09-21 13:08:43 +02:00
matzakos
1b1a2c8411 Merge with develop, resolve conflicts in CU/DU conf files 2021-09-21 11:00:29 +02:00
Raphael Defosseux
f1e43eb703 doc(SA): updated SA tutorial
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-09-21 09:53:21 +02:00
Raymond Knopp
2afb70f179 Merge branch 'bandwidth-testing' of https://gitlab.eurecom.fr/oai/openairinterface5g into bandwidth-testing 2021-09-20 23:28:40 +02:00
Raymond Knopp
7ceef76ba5 switchpoint advance for X300 2021-09-20 23:28:13 +02:00
francescomani
f8e1f93db3 Merge branch 'bandwith_testing_debug' of https://gitlab.eurecom.fr/oai/openairinterface5g into bandwith_testing_debug 2021-09-20 19:37:20 +02:00
francescomani
bfd9671626 fixes in acknack scheduling 2021-09-20 19:32:19 +02:00
Panos Matzakos
0271ea8202 Update FEATURE_SET.md for the gNB SA procedures 2021-09-20 14:25:53 +00:00
luis_pereira87
90e6f5dd25 Add more pucch_acknak logs 2021-09-20 13:38:02 +01:00
luis_pereira87
85a03cd3c1 Intermediate backup commit 2021-09-20 13:03:44 +01:00
Eurecom
9ec02b2010 pucch0 threshold rule 2021-09-20 10:56:23 +02:00
Raymond Knopp
f21211c23d removed logging 2021-09-20 00:24:43 +02:00
Raymond Knopp
90029d4f98 Merge branch 'bandwidth-testing' of https://gitlab.eurecom.fr/oai/openairinterface5g into bandwidth-testing 2021-09-19 14:47:37 +02:00
Eurecom
9525beb399 N310 testing 2021-09-19 14:46:47 +02:00
francescomani
31e306abdc adding logs 2021-09-17 17:10:22 +02:00
rmagueta
80592c7162 Fix nr_ulsim 2021-09-17 11:19:21 +01:00
rmagueta
3942467484 Revert min_rb to 5 in pf_ul 2021-09-17 10:41:41 +01:00
Roberto Louro Magueta
5d25c522a2 Revert "Temporary fix in min_rb for pf_ul"
This reverts commit c5429cbf57
2021-09-17 09:40:16 +00:00
rmagueta
9afb2e2b43 Revert rxdataF in nr_pucchsim 2021-09-17 10:38:16 +01:00
rmagueta
b6f0546f7f Fix nr_pucchsim 2021-09-16 20:47:01 +01:00
rmagueta
115063161f Revert simulation parameters of pucchsim 2021-09-16 18:50:47 +01:00
Panos Matzakos
07a597dc2c Update FEATURE_SET.md with information on SA availability for OAI UE 2021-09-16 15:12:03 +00:00
Panos Matzakos
74eb986352 Update FEATURE_SET.md for the higher layers of the nrUE 2021-09-16 15:04:10 +00:00
hardy
b40f95aa04 relocate google API credentials to a cleaner place 2021-09-16 15:13:25 +02:00
rmagueta
a52658174b Fix dci_format in nr_dlsim 2021-09-16 11:50:33 +01:00
rmagueta
c5429cbf57 Temporary fix in min_rb for pf_ul 2021-09-15 19:02:59 +01:00
rmagueta
693804c163 Fix bands in some conf files 2021-09-15 18:43:32 +01:00
rmagueta
d680dcd18a Fix phy-simulators 2021-09-15 18:40:35 +01:00
rmagueta
ec1834c5aa Temporary fix in pathloss computation for do-ra 2021-09-15 15:58:55 +01:00
Roberto Louro Magueta
fbce3dc9dd Revert "Revert PUCCH0 threshold"
This reverts commit 2c41c4cd7c
2021-09-15 13:35:13 +00:00
hardy
11eab6882c fix executor agent syntax 2021-09-15 15:28:59 +02:00
hardy
41131bf994 updating testcase for ping 2021-09-15 14:59:56 +02:00
hardy
9c2785a72c fix delay to start OAI5GCN 2021-09-15 14:49:35 +02:00
hardy
18d66873f3 fixing dnn to use with OAICN5G in infra yaml 2021-09-15 14:49:35 +02:00
hardy
5a24210b45 check if container is running 2021-09-15 14:49:35 +02:00
hardy
7a505f75d1 adding cn logs to artifacts 2021-09-15 14:49:35 +02:00
rmagueta
a7982dff31 Remove DL scheduling limitation to slots 1 and 11 2021-09-15 13:01:12 +01:00
rmagueta
2c41c4cd7c Revert PUCCH0 threshold 2021-09-15 12:54:26 +01:00
Sakthivel Velumani
6443cedd6a Updated nfapi PNF to use the thread message buffers 2021-09-15 14:52:24 +05:30
francescomani
a7887e85f4 change in condition (not nsa but cfra) 2021-09-15 10:37:00 +02:00
matzakos
c258229873 Bring back sib1 tda from config file in du conf. file 2021-09-14 16:30:22 +02:00
matzakos
982c087b92 Fix conflicts in CU/DU config files 2021-09-14 16:30:05 +02:00
Panos Matzakos
610bd03773 Update TESTING_5GSA_setup.md with information on CU/DU split setup and OAI UE 2021-09-14 14:12:43 +00:00
Sakthivel Velumani
0de2a333af Merge branch 'develop' into phy-asan-fixes 2021-09-14 16:47:15 +05:30
rmagueta
4ec92f1268 Merge remote-tracking branch 'origin/bandwidth-testing-abs' into bandwidth-testing-abs 2021-09-13 20:08:22 +01:00
rmagueta
014915a5a3 Initialize maxL 2021-09-13 20:07:16 +01:00
francescomani
beb0c4d8bb implementation of if_freq option at OAI UE 2021-09-13 19:05:32 +02:00
luis_pereira87
0a84715a82 Fix UE_sched_ctrl pointer when there is more than one UE 2021-09-13 17:05:34 +01:00
francescomani
9fb094600f cosmetic changes and duplicate code 2021-09-13 14:54:49 +02:00
rmagueta
974bb21dda Fix phy-test 2021-09-13 11:40:34 +01:00
hardy
8dca182255 CI scripted deployment of OAI CN5G 2021-09-13 11:59:31 +02:00
rmagueta
2710ad9934 Fix build warning 2021-09-13 10:39:55 +01:00
francescomani
cfccd8ece8 fix another compilation issue 2021-09-13 10:01:05 +02:00
luis_pereira87
5af47448c0 Duplicate parameter removal 2021-09-13 08:55:35 +01:00
luis_pereira87
3a02a7ad4c Update ue-rxgain default value 2021-09-13 08:41:54 +01:00
francescomani
b31199c4ef make csirs prb occupation generic 2021-09-12 11:27:45 +02:00
francescomani
736b8be64d fix phy sim compilation issue 2021-09-12 10:08:26 +02:00
francescomani
3c766d29f3 Merge remote-tracking branch 'origin/develop' into NR_2port_CSIRS 2021-09-12 09:38:38 +02:00
Raymond Knopp
ae2ccb4e7b further fix for UE DCI candidate enumeration 2021-09-12 00:01:48 +02:00
Raymond Knopp
c8d2932172 small fix in dci handling in UE for multiple aggregation levels. 2021-09-11 20:07:36 +02:00
Raymond Knopp
37b135b616 logging and DL-CCCH decoding size:: 2021-09-11 13:58:08 +02:00
rmagueta
705a627756 Merge remote-tracking branch 'origin/bandwidth-testing' into bandwidth-testing-abs
# Conflicts:
#	openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
2021-09-10 16:13:05 +01:00
Eurecom
18e51299aa minor changes for testing 2021-09-10 16:51:50 +02:00
rmagueta
664069e198 Fix DLSCH failure with COTS after merge 2021-09-10 15:22:57 +01:00
Roberto Louro Magueta
0e4a1ecbc2 Revert "Fix DLSCH failure with COTS after merge"
This reverts commit 68f94f5505
2021-09-10 14:17:28 +00:00
rmagueta
dc0f693c95 Fix in phytest 2021-09-10 13:05:58 +01:00
rmagueta
68f94f5505 Fix DLSCH failure with COTS after merge 2021-09-10 13:02:14 +01:00
rmagueta
2688256a59 Change LOG level 2021-09-10 11:08:06 +01:00
rmagueta
eb99d98ccf Fix issues after merge 2021-09-10 10:42:02 +01:00
rmagueta
b898981109 Merge remote-tracking branch 'origin/develop' into bandwidth-testing-abs
# Conflicts:
#	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
2021-09-10 10:03:22 +01:00
Remi Hardy
de553cd1b6 integration_2021_wk36
MR !1252 : Bugfix nr rlc w36
Fix a bug about segmentation present in both NR RLC AM and NR RLC UM.

MR !1253 : minor: T tracer: be more verbose for DLSCH DCI

MR !1254 : fix for pointa computation in sib1
Fix computation of pointA in SIB1

MR !1217 : fix-physim-run-script-on-cluster
oai-nr-dlsim may seem fine but in fact, test21 may or may not be executed. 
On some run example, we do not have finished message on nr-dlsim pod.

MR !1255 : Attempt to fix nr-dlsim Test 21 (4x4 MIMO, 2 Layers)
2021-09-10 07:52:42 +00:00
hardy
4889a3833b Merge remote-tracking branch 'origin/bugfix-nr-rlc-w36' into integration_2021_wk36 2021-09-09 15:56:40 +02:00
hardy
157a975bab Merge remote-tracking branch 'origin/minor-t-tracer-w36' into integration_2021_wk36 2021-09-09 15:56:20 +02:00
hardy
a27cb7e2fb Merge remote-tracking branch 'origin/NR_SIB1_fix_pointa' into integration_2021_wk36 2021-09-09 15:56:00 +02:00
hardy
eaf0f45077 Merge remote-tracking branch 'origin/fix-ip-missing-rhel8-image' into integration_2021_wk36 2021-09-09 15:55:40 +02:00
hardy
ddf2d0027d Merge remote-tracking branch 'origin/fix-physim-run-script-on-cluster' into integration_2021_wk36 2021-09-09 15:55:22 +02:00
rmagueta
eec5774f0f Fix infinite loop in fill_dci_search_candidates 2021-09-09 11:18:45 +01:00
rmagueta
649da26cf0 Revert "Fix infinite loop in fill_dci_search_candidates"
This reverts commit e8f67b9401.
2021-09-09 11:18:18 +01:00
rmagueta
e8f67b9401 Fix infinite loop in fill_dci_search_candidates 2021-09-09 10:22:13 +01:00
rmagueta
452e2eb812 Fix ulsch_max_slots_inactivity 2021-09-09 09:37:13 +01: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
0429d3d410 nr-rlc: bugfix: copy correct part of PDUs in case of segmentation 2021-09-08 17:18:20 +01:00
rmagueta
722505f22d Merge remote-tracking branch 'origin/bandwidth-testing' into bandwidth-testing-abs
# Conflicts:
#	openair1/PHY/MODULATION/slot_fep_nr.c
#	openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c
#	openair1/PHY/NR_TRANSPORT/pucch_rx.c
#	openair2/LAYER2/NR_MAC_UE/config_ue.c
#	openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
#	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_uci.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
2021-09-08 17:05:01 +01:00
rmagueta
204bffbc7a Merge remote-tracking branch 'origin/develop' into bandwidth-testing-abs
# Conflicts:
#	executables/nr-uesoftmodem.c
#	executables/nr-uesoftmodem.h
#	executables/softmodem-common.h
#	openair2/LAYER2/NR_MAC_UE/mac_proto.h
#	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_uci.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
2021-09-08 16:31:24 +01:00
Raphael Defosseux
85378a707e fix(docker): NR-UE RHEL8 image is missing ip command
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-09-08 16:27:58 +02:00
Florian Kaltenberger
8c7749547a Update BUILD.md 2021-09-08 13:48:40 +00:00
Eurecom
f2cd650126 Merge remote-tracking branch 'origin/bugfix-nr-rlc-w36' into bandwidth-testing 2021-09-08 14:51:40 +02:00
francescomani
afdb5728ed fix for pointa computation in sib1 2021-09-08 14:21:28 +02:00
rmagueta
4e30f11e3a Temporary fix for SRB2 integrity algorithm 2021-09-08 12:26:03 +01:00
francescomani
17c0268775 Merge remote-tracking branch 'origin/develop' into NR_2port_CSIRS 2021-09-07 17:17:35 +02:00
francescomani
32bbf94c5d adding condition to use type 2 only for OAI UE 2021-09-07 16:54:53 +02:00
francescomani
aa431f353f new attempt to fix cdm both for sa and mimo 2021-09-07 15:13:10 +02:00
Cedric Roux
5ac4ae361a minor: T tracer: be more verbose for DLSCH DCI 2021-09-07 13:33:45 +02:00
Cedric Roux
36bae67eef nr-rlc: bugfix: copy correct part of PDUs in case of segmentation 2021-09-07 13:16:39 +02:00
Cedric Roux
58904eaab8 cleanup: replace "eNB" by "gNB" as it should be 2021-09-07 13:08:14 +02:00
Sakthivel Velumani
76b0aa1fa6 Logging fixes in ulsim 2021-09-07 08:18:11 +05:30
Sakthivel Velumani
81a1ed703b Merge branch 'bandwidth-testing' of https://gitlab.eurecom.fr/oai/openairinterface5g into bandwidth-testing 2021-09-06 16:36:10 +05:30
Eurecom
15c5ea07bc Merge remote-tracking branch 'origin/develop' into bandwidth-testing
Conflicts:
	executables/nr-uesoftmodem.c
	executables/nr-uesoftmodem.h
	executables/softmodem-common.h
	openair2/LAYER2/NR_MAC_UE/mac_proto.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_uci.c
2021-09-06 11:53:56 +02:00
Eurecom
eceb0d79bc Merge branch 'bandwidth-testing' of https://gitlab.eurecom.fr/oai/openairinterface5g into bandwidth-testing
Conflicts:
	executables/nr-uesoftmodem.c
	openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c
	openair1/SIMULATION/TOOLS/random_channel.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-06 11:22:30 +02: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
Cedric Roux
eeca38368e gnb sa: improve security
Note: some modifications have been done to the UE too, but for syntactic
reasons. The UE may fail to work, not tested.

For the UE, we have the problem of handling properly SecurityModeCommand.
We don't verify its integrity. This is a bit complicated to handle properly
and may require some API changes in the PDCP layer. So, as of today, the
integrity of this message is not verified.

Also, NSA mode has been touched, but it should not be a problem. But not
tested, so not sure.
2021-09-06 11:06:47 +02:00
Sakthivel Velumani
6fc6b7d120 Updated nr_ulsim for multi antenna support 2021-09-06 14:15:53 +05:30
Sakthivel Velumani
3be476c84d Improved logging of PUSCH rx 2021-09-06 14:14:38 +05:30
Eurecom
4624a94d48 Merge remote-tracking branch 'origin/develop' into bandwidth-testing
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/PHY/NR_TRANSPORT/pucch_rx.c
	openair1/SCHED_NR/fapi_nr_l1.c
	openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
	openair1/SIMULATION/TOOLS/abstraction.c
	openair1/SIMULATION/TOOLS/random_channel.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-06 10:34:14 +02:00
Remi Hardy
b590cec2e3 integration_2021_wk35
MR !1245: [CI] Improve Iperf packet loss mismatch detection
-improve the Iperf packet loss detection and flagging when pl target (from xml) is below the test result

MR !1246: patch: remove call to end_configmodule
- full fix that set properly PARAMFLAG_NOFREE on relevant parameters

MR !1235: Nr msg4 retransmission
-Retransmission of msg4
-Some reworking in UE harq DLSCH processing

MR !1214: NR UE SA
-SIB1 detection part of initial sync at UE
-Removing a lot of hard-coding in SA procedures
-SSB start subcarrier from command line at UE

MR !1243: Nr skip mac pdu processing when nack
-Skipping processing DLSCH MAC PDU at OAI UE when NACK

MR !1229: fix(nr-ue): apply ip rules/route
-Also added 4G RF sim tests
2021-09-05 19:51:46 +00:00
Eurecom
c834f40186 Merge remote-tracking branch 'origin/develop' into bandwidth-testing
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/PHY/NR_TRANSPORT/pucch_rx.c
	openair1/SCHED_NR/fapi_nr_l1.c
	openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
	openair1/SIMULATION/TOOLS/abstraction.c
	openair1/SIMULATION/TOOLS/random_channel.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-05 15:37:11 +02:00
francescomani
fa7acb96c8 no msg3 retransmission in NSA 2021-09-05 09:15:08 +02:00
Eurecom
efed5abbfe commit before merge with develop 2021-09-04 22:42:32 +02:00
Eurecom
81314a2020 Merge remote-tracking branch 'origin/bandwidth-testing-pucch' into bandwidth-testing 2021-09-04 21:40:53 +02:00
Raymond Knopp
8e4763bf94 small change in ulsch_decoder to allow segment even if parity-check fails but CRC passes. 2021-09-04 21:36:41 +02:00
rmagueta
fb63951450 Fix NGAP UE release cause when uplink failure 2021-09-03 15:19:35 +01:00
rmagueta
cf4066f7cd Merge remote-tracking branch 'origin/bandwidth-testing' into bandwidth-testing-abs 2021-09-03 15:19:06 +01:00
hardy
fceea50a8b productive version of sql table 2021-09-03 14:34:32 +02:00
Raphael Defosseux
d9d4b91185 fix(NAS): remove compilation warning
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-09-03 13:07:56 +02:00
Raphael Defosseux
592d99b5bc fix(enb): start_background_system was not called in noS1 mode
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-09-03 10:27:33 +02:00
hardy
be5448da66 [CI] edit config file for SA test 2021-09-03 10:19:56 +02:00
hardy
5ae7e456ed Merge remote-tracking branch 'origin/nr-ue-fix-ip-route' into integration_2021_wk35 2021-09-02 23:13:14 +02:00
hardy
12b1cb8fde Merge remote-tracking branch 'origin/NR_UE_SA' into integration_2021_wk35 2021-09-02 23:11:40 +02:00
hardy
8795d92c31 Merge remote-tracking branch 'origin/NR_skip_mac_pdu_processing_when_nack' into integration_2021_wk35 2021-09-02 23:11:17 +02:00
hardy
f4cb0d288a Merge remote-tracking branch 'origin/NR_msg4_retransmission' into integration_2021_wk35 2021-09-02 23:10:57 +02:00
hardy
86173c1239 Merge remote-tracking branch 'origin/workaround-end_configmodule' into integration_2021_wk35 2021-09-02 23:10:36 +02:00
rmagueta
5765d0e508 Fix build after merge 2021-09-02 18:57:14 +01: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
Raymond Knopp
98ef919502 Merge remote-tracking branch 'origin/bandwidth-testing' into bandwidth-testing-pucch
Conflicts:
	openair1/PHY/NR_TRANSPORT/pucch_rx.c
	openair1/PHY/NR_UE_TRANSPORT/pucch_nr.c
	openair1/SIMULATION/NR_PHY/dlsim.c
	openair1/SIMULATION/NR_PHY/pucchsim.c
2021-09-02 13:34:36 +02:00
hardy
3b557060d3 writing the status to SQL DB + stage exec on 2 agents 2021-09-01 23:33:20 +02:00
rmagueta
7be39f7120 Change choffset to use channel RF A in B210 2021-09-01 18:28:31 +01:00
rmagueta
f24bc5676d Merge remote-tracking branch 'origin/bandwidth-testing' into bandwidth-testing-abs 2021-09-01 17:58:36 +01:00
Eurecom
3005e1652a 106 PRB SA configuration file for ci 2021-09-01 16:46:16 +02:00
rmagueta
5836ab1927 Fix build warnings 2021-09-01 14:03:28 +01:00
rmagueta
a45eb42fca Change log levels 2021-09-01 12:57:01 +01: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
Eurecom
33cd8cafbb after merge with abs 2021-09-01 10:27:13 +02:00
francescomani
854f7a769c fixing missed initialization 2021-09-01 06:59:07 +02:00
francescomani
af87ccffa9 Merge remote-tracking branch 'origin/develop' into fix-physim-run-script-on-cluster 2021-09-01 06:57:35 +02:00
Raymond Knopp
248fdfbd2c merge with abs 2021-08-31 23:18:14 +02:00
Raymond Knopp
cf3b3f889c Merge remote-tracking branch 'origin/bandwidth-testing-abs' into bandwidth-testing 2021-08-31 22:12:24 +02:00
Raymond Knopp
ee301a5acb commit before merge 2021-08-31 22:12:12 +02:00
rmagueta
2590711b05 Fix Msg4 PDSCH when coreset0 2021-08-31 20:37:03 +01:00
rmagueta
5dde1a53dc Fix Msg2 PDSCH when coreset0 2021-08-31 20:29:46 +01:00
rmagueta
6746fd4077 Fix DCI allocation for coreset0 2021-08-31 20:14:07 +01:00
rmagueta
e621c3533c Change log levels 2021-08-31 18:27:27 +01:00
rmagueta
7928ed42bf Change choffset to use channel RF A in B210 2021-08-31 17:45:30 +01:00
francescomani
bb48991242 Merge remote-tracking branch 'origin/develop' into NR_skip_mac_pdu_processing_when_nack 2021-08-31 18:32:09 +02:00
hardy
81d818cf68 improve packet loss mismatch detection 2021-08-31 16:40:41 +02:00
francescomani
2f5af6008b Merge remote-tracking branch 'origin/develop' into NR_msg4_retransmission 2021-08-30 18:06:06 +02:00
francescomani
6a2352f843 Merge remote-tracking branch 'origin/develop' into NR_UE_SA 2021-08-30 17:55:38 +02:00
Raphael Defosseux
3bd6309e2e fix(test): cosmetics in 4G LTE RF sim test
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-08-30 16:36:40 +02:00
Raymond Knopp
3243f881b7 Merge branch 'bandwidth-testing' of https://gitlab.eurecom.fr/oai/openairinterface5g into bandwidth-testing 2021-08-30 14:55:02 +02:00
Raymond Knopp
5d760e5cab Merge branch 'bandwidth-testing' of https://gitlab.eurecom.fr/oai/openairinterface5g into bandwidth-testing
Conflicts:
	executables/nr-ru.c
	openair1/PHY/NR_TRANSPORT/nr_dci.c
	openair1/PHY/NR_TRANSPORT/nr_dci_tools.c
2021-08-30 14:54:54 +02:00
Eurecom
07b89315ab changes for debugging. switching to another marchine 2021-08-30 14:52:40 +02:00
Raphael Defosseux
309a8c3e3e CI:
-- Reduce required BW test in 4G RF sim

Docker:
  -- Made the "Thread Parallel Config" a flexible parameter
     default is SINGLE_THREAD
  -- Clean Up on some Docker file about pyyaml

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-08-30 14:31:22 +02:00
luis_pereira87
ea8120090c Merge remote-tracking branch 'origin/develop' into NR_SA_documentation_update 2021-08-30 11:23:01 +01:00
luis_pereira87
fec673c89a Update SA tutorial 2021-08-30 11:10:23 +01:00
Remi Hardy
11477c7a2d integration_2021_wk34
MR !1081 : Prb based channel estimation
-An option for using average channel estimates over 1 prb is introduced in DLSCH and ULSCH. 
This improved BLER performance for MCS 28 when prbs are allocated across DC.

MR !1231 : Nr msg3 retransmission
-Implement re-transmission of MSG3 gNB and UE
-Fixes content resolution timer at UE

MR !1236 : nr: add T trace for msg4 (rrc setup)
2021-08-30 08:50:50 +00:00
francescomani
50c74b684d update gNB feature set 2021-08-27 18:03:10 +02:00
francescomani
822d8e71ad fixed missed initialization 2021-08-27 16:05:35 +02:00
francescomani
b10d32d8b8 Merge remote-tracking branch 'origin/develop' into NR_2port_CSIRS 2021-08-27 16:02:58 +02:00
francescomani
e93545bc08 formatting 2021-08-27 12:58:53 +02:00
francescomani
d0c1bc4340 skip dlsch mac pdu processing when crc fails 2021-08-27 12:42:25 +02:00
francescomani
37a11c07cf update UE MAC feature set 2021-08-27 11:01:28 +02:00
Eurecom
1b028d7d89 limitation to 1 DL slot/TDD period for testing 2021-08-27 08:04:03 +02:00
Raymond Knopp
6217d58eca Merge branch 'bandwidth-testing' of https://gitlab.eurecom.fr/oai/openairinterface5g into bandwidth-testing
Conflicts:
	executables/nr-ru.c
2021-08-27 00:23:23 +02:00
francescomani
8d3e11484a update on UE PHY feature set 2021-08-26 18:07:58 +02:00
hardy
5bd6d0d31b Merge remote-tracking branch 'origin/t-nr-add-rrc-setup-trace' into integration_2021_wk34 2021-08-26 14:34:23 +02:00
hardy
fcbf8706d9 Merge remote-tracking branch 'origin/NR_msg3_retransmission' into integration_2021_wk34 2021-08-26 14:33:59 +02:00
hardy
b798755347 Merge remote-tracking branch 'origin/prb_based_dl_channel_estimation' into integration_2021_wk34 2021-08-26 14:33:33 +02:00
francescomani
e8c7476046 fix to allow traffic to be put in msg3 2021-08-26 13:23:41 +02:00
Eurecom
bd955d4817 bugfixes in MAC for ACK/NAK scheduling beyond the TDD period (for OAI UE) 2021-08-26 12:11:06 +02:00
hardy
6df331d80e fixing packet loss thresholds for nsa test for better fail detection 2021-08-25 17:09:03 +02:00
francescomani
b356a8166b Merge remote-tracking branch 'origin/develop' into NR_msg3_retransmission 2021-08-25 16:02:31 +02:00
Thomas Schlichter
054c1e53b7 Fix for vrb_map occupation loop 2021-08-25 13:49:30 +00:00
francescomani
e3c4a9806f Merge remote-tracking branch 'origin/develop' into NR_msg4_retransmission 2021-08-25 15:43:54 +02:00
Eurecom
902c04e60a integrated ABS patch for IP address string allocation in UE 2021-08-25 15:15:35 +02:00
francescomani
b6ef23a395 Merge remote-tracking branch 'origin/develop' into NR_UE_SA 2021-08-25 15:01:40 +02:00
Remi Hardy
b28a368308 Integration Branch 2021 Week 33
MR 1170 : 5G nFAPI Improvements
- Bugfixes in packing/unpacking
- Adds uplink indication functionality
- Changes the nFAPI system architecture to account for architecture changes in the develop branch
- Adds nFAPI system documentation
- Removes hardcodings

MR 1222 : Update RRC ASN1 file to version 16.4.1 

MR 1223 : Fixes to NR UE MAC PDU generation 
- included MAC CE sub-PDUs size in the computation of RLC data to transmit this fixes the error with residual mac pdu appearing at gNB side when transmitting higher amount of data 
-  got rid of the nr_generate_ulsch_pdu and moved the relevant UL-SCH MAC PDU generation procedure within the nr_ue_get_sdu and nr_ue_get_rach 
-  reduced memcpy calls and unnecessary memory allocations 
-  fetching RLC data and SDU size from the mac_rlc_data_req, removed the call to mac_rlc_get_buffer_occupancy_ind 
-  introduced a new function to generate the MAC CEs sub-PDUs 
-  removed unnecessary function input parameters 
-  minor fixes and cleanup 
-  enhanced logging

MR 1227 : removed duplicate structure, changed 'x' to 'r' and 'y' to 'i'
2021-08-25 12:39:08 +00:00
Thomas Schlichter
b4a20d062d Fix in rbSize loop 2021-08-25 12:21:18 +00:00
Eurecom
d98d7c26c5 DCI 0_1/1_1 for SA UE, arbitrary initialBWP configuration 2021-08-25 02:20:25 +02:00
Cedric Roux
6bf2874711 nr: add T trace for msg4 (rrc setup) 2021-08-23 17:09:25 +02:00
francescomani
e86a48bc1f fixes 2021-08-23 14:41:08 +02:00
francescomani
01de60f95c initialization of harq ndi 2021-08-23 12:14:17 +02:00
francescomani
3a07b6bf1b rewriting downlink harq process function 2021-08-23 11:55:20 +02:00
francescomani
d78861dbf0 use the same buffer and size for msg4 retransmission 2021-08-23 11:46:34 +02:00
francescomani
7ab05b666d reset dci at ue after processing 2021-08-22 18:06:45 +02:00
francescomani
965945f9e7 bugfix in dlsch scramblingid 2021-08-22 14:55:17 +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
francescomani
cebe8b7997 do not process rar in case of nack 2021-08-20 18:34:18 +02:00
francescomani
1d09adc74c fixes for msg4 retransmission 2021-08-20 18:06:53 +02:00
Raymond Knopp
4b25f774f8 commit minor logging changes before merge 2021-08-20 14:19:50 +02:00
Eurecom
f41890b3f5 testing in SA, initialBWP 2021-08-20 14:17:37 +02:00
Sakthivel Velumani
38d1782f9b minor fixes (review comments) 2021-08-19 13:40:12 +05:30
francescomani
834af3d5c6 Merge remote-tracking branch 'origin/fix-513-duplicate-complex-structure' into integration_2021_w33 2021-08-19 08:33:00 +02:00
Laurent THOMAS
c310d246bb merge develop 2021-08-18 11:20:39 +02:00
Sakthivel Velumani
7f5009d7cc fixed SA issues 2021-08-17 17:59:41 +05:30
Eurecom
76882ca87d logging removal 2021-08-17 13:56:35 +02:00
Eurecom
bdfd3c63c5 Merge branch 'bandwidth-testing' of https://gitlab.eurecom.fr/oai/openairinterface5g into bandwidth-testing 2021-08-17 13:45:41 +02:00
Eurecom
dc92538744 DCI formats 1_1/0_1 on initialBWP 2021-08-17 13:44:50 +02:00
Sakthivel Velumani
cdbdba5631 fixed merge 2021-08-17 16:10:40 +05:30
francescomani
009f7fd94f restart content resolution timer at each msg3 retransmission 2021-08-16 18:07:51 +02:00
francescomani
4fc24374d5 fixes for contention resolution timer etc 2021-08-16 17:42:07 +02:00
francescomani
275b82eab2 fix for contention resolution timer at NR UE 2021-08-16 17:21:18 +02:00
Sakthivel Velumani
a87dca8691 Merge branch 'develop' into prb_based_dl_channel_estimation 2021-08-16 18:59:29 +05:30
francescomani
356e6cadd8 Merge remote-tracking branch 'origin/develop' into NR_msg3_retransmission 2021-08-16 12:36:29 +02:00
francescomani
02d86a889c additional fix for dci_pdu format 2021-08-16 11:53:58 +02:00
francescomani
f2fc22df81 fix for dci_pdu format 2021-08-16 10:18:04 +02:00
francescomani
d2b131af1d msg3 retransmission rounds at gnb 2021-08-15 18:16:15 +02:00
francescomani
13980b5ebb msg3 retransmission at UE 2021-08-15 16:23:25 +02:00
Raymond Knopp
f885f40eb7 Merge branch 'bandwidth-testing' of https://gitlab.eurecom.fr/oai/openairinterface5g into bandwidth-testing
Conflicts:
	openair1/PHY/NR_TRANSPORT/pucch_rx.c
	openair1/SCHED_NR/phy_procedures_nr_gNB.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
	openair2/RRC/NR/MESSAGES/asn1_msg.c
2021-08-14 14:07:41 +02:00
Sakthivel Velumani
5b37846524 Fixed build error & warnings 2021-08-14 10:59:25 +05:30
Sakthivel Velumani
255a5acbfa Made FD interpolation by default
PRB based averaging can activated from command line options
2021-08-14 09:05:49 +05:30
Eurecom
2d5e095120 testing on another machine. 2021-08-13 21:47:21 +02:00
francescomani
6d4437e607 fix unnecessary error message in handle_nr_ul_harq during RA 2021-08-13 17:37:35 +02:00
francescomani
8fbc5a7146 fix sib1 detection in sa after merge 2021-08-13 16:19:36 +02:00
francescomani
8060376fcd fix compilation warning 2021-08-13 15:56:49 +02:00
francescomani
e083bd4330 Merge remote-tracking branch 'origin/develop' into NR_UE_SA 2021-08-13 15:09:52 +02:00
Raphael Defosseux
4cba1a2b6c Merge remote-tracking branch 'origin/nr_ue_mac_pdu_fixes' into integration_2021_w33 2021-08-13 14:28:43 +02:00
Raphael Defosseux
e3499d948f Merge remote-tracking branch 'origin/nr_rrc_asn1_16_4_1' into integration_2021_w33 2021-08-13 14:28:09 +02:00
Raphael Defosseux
1292b8eaa4 Merge remote-tracking branch 'origin/nfapi_nr_arch_mod' into integration_2021_w33 2021-08-13 14:27:33 +02:00
Sakthivel Velumani
3ab21d8fd1 Merge branch 'develop' into prb_based_dl_channel_estimation 2021-08-13 17:57:05 +05:30
Raphael Defosseux
c70aa4c43a fix(nr-ue): apply ip rules/route
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-08-13 14:21:50 +02:00
francescomani
f2dd94d7c9 fix in condition to call nr_ue_get_sdu 2021-08-13 11:48:14 +02:00
francescomani
93fe1652ed Merge remote-tracking branch 'origin/develop' into NR_UE_SA 2021-08-13 11:14:20 +02:00
francescomani
59413c184d implementation of scheduling of msg3 retransmission at gnb 2021-08-13 11:13:16 +02:00
Raphael Defosseux
8c91e71992 feat(ci): adding artifacting on run logs
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-08-13 11:02:37 +02:00
Raphael Defosseux
8f0218828f feat(ci): triggering RF Sim pipeline from main pipeline
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-08-13 10:45:20 +02:00
Raphael Defosseux
b23f972e44 feat(ci): Q&D adding of 5G RF sim on container/docker-compose
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-08-13 10:29:51 +02:00
Raphael Defosseux
146f8e6e0d doc(docker): added tutorial for deploying 5G SA RF sim
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-08-12 14:53:59 +02:00
Rahul Gottipati
540d2e2977 Rebase to latest develop 2021-08-12 15:20:16 +05:30
Thomas Schlichter
b5fb1dc05f Merge remote-tracking branch 'origin/develop' into nr_ue_mac_pdu_fixes 2021-08-12 11:35:27 +02:00
Raphael Defosseux
047c56328c fix(docker): typo in ran.rhel8 dockerfile, cleanup on other dockerfiles, proper tag for 5G RF sim docker-compose
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-08-12 10:05:22 +02:00
francescomani
99afe22855 Merge remote-tracking branch 'origin/develop' into fix-physim-run-script-on-cluster 2021-08-12 08:37:18 +02:00
Raphael Defosseux
e63985f83f Merge branch 'integration_2021_w32' into 'develop'
Integration Branch : 2021 week 32

See merge request oai/openairinterface5g!1224

The following Merge Requests have been included:

* MR [1198] : 5G UE UCI procedurers at MAC
* MR [1207] : Code-cleanup-20210716
* MR [1215] : NR UL antenna ports cleanup
* MR [1220] : Temporary fix for CORESET configuration in SIB1
* MR [1221] : Container: adding conf template to gNB container image
2021-08-12 05:25:56 +00:00
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
Mahesh
8030549342 phy-sim build error fix 2021-08-11 16:15:49 +05:30
Mahesh
f74b928d80 Moved documentation to doc folder 2021-08-11 13:22:16 +05:30
Mahesh
49fc03a65e Cleanup and some minor bugfixes 2021-08-11 13:16:32 +05:30
francescomani
0934403a42 bugfix in setting the nb of layers for sa 2021-08-10 14:26:09 +02:00
francescomani
2e8018d28f avoid segmentation fault in scheduling csirs for sa 2021-08-10 12:32:52 +02:00
Mahesh
37e7db80a3 documentation typo, build error, pack/unpack bug fix 2021-08-10 14:22:50 +05:30
Raymond Knopp
a2dbd7dc85 pucch unitary testing 2021-08-10 10:27:04 +02:00
Raphael Defosseux
eceb67215c fix(ci): fix typo
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-08-10 08:38:49 +02:00
Laurent THOMAS
bfccbfd15d sanitize heap overflow detection 2021-08-09 21:57:35 +02:00
Laurent THOMAS
164474a40f Merge branch 'integration_2021_w32' of https://gitlab.eurecom.fr/oai/openairinterface5g into integration_2021_w32 2021-08-09 17:28:53 +02:00
Laurent THOMAS
b89d67d9db fix memory error detected by sanitize-addr 2021-08-09 17:28:28 +02:00
Raphael Defosseux
902f3a83d4 fix(ci): when using modules, no more adb-connected UE required
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-08-09 17:02:32 +02:00
Rahul Gottipati
09e32b2839 Code cleanup and documentation update 2021-08-09 19:41:22 +05:30
Rahul Gottipati
78f3bca19a CSI-RS handling in nFAPI 2021-08-09 16:36:27 +05:30
Laurent THOMAS
6091452dd3 fix remaining usage of deleted type struct complex 2021-08-09 12:05:07 +02:00
Raymond Knopp
8065e69a28 Merge branch 'bandwidth-testing' of https://gitlab.eurecom.fr/oai/openairinterface5g into bandwidth-testing
Conflicts:
	openair1/PHY/NR_ESTIMATION/nr_measurements_gNB.c
	openair1/PHY/NR_TRANSPORT/pucch_rx.c
	openair1/PHY/defs_gNB.h
	openair1/SCHED_NR/phy_procedures_nr_gNB.c
2021-08-09 11:01:55 +02:00
Raymond Knopp
8a9194300f commit before merge 2021-08-09 10:55:55 +02:00
Raphael Defosseux
5f9e0a235d Merge remote-tracking branch 'origin/code-cleanup-20210716' into integration_2021_w32 2021-08-09 10:07:45 +02:00
Rodolphe BERTOLINI
387223eea6 removed duplicate structure, changed 'x' to 'r' and 'y' to 'i' 2021-08-09 09:59:38 +02:00
Sakthivel Velumani
9bc29750e3 fixed errors after rebase 2021-08-09 08:02:24 +05:30
Mahesh
557b5445d3 PNF config file pusch_proc_threads update 2021-08-08 12:23:15 +05:30
magounaki
4ba8ef3a60 n310 config file 2021-08-06 20:23:10 +05:30
Sakthivel Velumani
c706f09e44 fixed phy simulators 2021-08-06 20:23:10 +05:30
Sakthivel Velumani
463634365c Fixed frame parms bug in dci gen 2021-08-06 20:23:10 +05:30
Sakthivel Velumani
41380e932e Fixed ssb sync issue 2021-08-06 20:23:10 +05:30
Sakthivel Velumani
3f1c9df35c commenting out function calls in nfapi
the priority now is monolitic. this should we reverted and fixed properly once we have a working code in monolitic
2021-08-06 20:23:10 +05:30
Sakthivel Velumani
bc6f39370c Added checks if tx RU processing start in order 2021-08-06 20:23:10 +05:30
Raphael Defosseux
3e6ef7baa4 Merge remote-tracking branch 'origin/docker-improvements-august-2021' into integration_2021_w32 2021-08-06 10:40:53 +02:00
Raphael Defosseux
a0e3cc8de4 Merge remote-tracking branch 'origin/NR_SA_tempfix_coreset' into integration_2021_w32 2021-08-06 10:39:56 +02:00
Raphael Defosseux
597f2b3e8f Merge remote-tracking branch 'origin/NR_new_ul_antennaports' into integration_2021_w32 2021-08-06 10:39:34 +02:00
Raphael Defosseux
7b2420760f Merge remote-tracking branch 'origin/NR_UE_reworking_UCI_procedures' into integration_2021_w32 2021-08-06 10:37:22 +02:00
francescomani
2daa9144c4 Merge remote-tracking branch 'origin/NR_SA_tempfix_coreset' into NR_UE_SA 2021-08-06 09:26:17 +02:00
Sakthivel Velumani
902d6b6550 correcting the dlsch array size 2021-08-05 21:29:53 +05:30
Sakthivel Velumani
cb68456357 Enabled multi-threading for gNB L1 tx
A second thread message is created for L1 tx processing and pushed into the threaPool.
The message contain the nfapi rel15 PDUs for SSB, PDCCH and PDSCH. The memory of these PDUs are reused for subsequent slots.
Need to fix the nfapi mode VNF PNF implementation to adapt to this memory scheme.
2021-08-05 21:29:53 +05:30
Sakthivel Velumani
4d05f4b288 Blocking nr_scheduler_response untill L1 tx finishes 2021-08-05 21:28:08 +05:30
Sakthivel Velumani
66cbe490e1 Prevent buffer under/overflow in ULSCH decoding through alignment and sufficient array size 2021-08-05 21:28:08 +05:30
Laurent THOMAS
b7857a505e try to fix CUDA, and fix infinite loop in nr UE uplink data collect 2021-08-05 17:31:31 +02:00
francescomani
067d9f8c87 reworking function for csi meas report bitlen (still not complete)
Conflicts:
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
2021-08-05 15:43:56 +02:00
Rahul Gottipati
74c5816c72 VNF clock dependency removed 2021-08-05 17:30:12 +05:30
Thomas Schlichter
6c227f4d6b NR_UE: Assure correct padding in nr_ue_get_sdu()
In case no MAC CE needs to be transmitted and we filled the buffer with SDUs from RLC, we missed to add padding for the last 3 bytes.
2021-08-05 12:33:09 +02:00
Raphael Defosseux
7e158447bb fix(ci): phy-sim build failure not correctly handled
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-08-05 12:04:03 +02:00
Raphael Defosseux
4db87599bf doc(ci): how to properly capture control packets
also added how to pull RAN images

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-08-05 10:52:22 +02:00
Laurent THOMAS
fadbdd3671 pdusession id fix: different values for UL and DL 2021-08-05 10:02:36 +02:00
Laurent THOMAS
464520304b merge develop, make DNN, NSSAI configurable, fix infinite loop 2021-08-05 09:49:25 +02:00
Laurent THOMAS
3cbf516885 Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into code-cleanup-20210716 2021-08-04 19:57:45 +02:00
Raphael Defosseux
3247e967ec fix(docker): explicitely adding procps to target images
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-08-04 17:09:18 +02:00
Raphael Defosseux
ebebd3c7d7 doc(docker): adding tutorial on how to deploy RF sim with EPC
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-08-04 16:51:53 +02:00
francescomani
62b1531c55 improvement in fix for commonControlResourceSet for SIB1 2021-08-04 14:23:50 +02:00
cig
92fb370258 Removed unnecessary sdu_lengths array in nr_ue_get_sdu 2021-08-04 13:06:31 +02:00
cig
05a4c48d96 Bugfix in the generation of UL MAC PDU in Msg3
- restored FIXED subheader length
- restored SHORT subheader in MAX TBS (still unclear the reason behind the
  selection of SHORT subheader here by developer)
2021-08-04 13:06:31 +02:00
cig
6e0737d9e4 Send Msg3 CCCH SDU in SA mode only
- send C-RNTI MAC CE otherwise
- init RA if there are bytes to send and is a PRACH occasion
- minor cleanups
2021-08-04 13:06:31 +02:00
cig
9af71a7a46 Set the tc-rnti only in CBRA
- TC-RNTI is set and used after RAR reception according to the specs
- C-RNTI is used in CFRA
2021-08-04 13:06:31 +02:00
cig
b6e3718d70 Changes to nr_write_ce_ulsch_pdu
- takes in input MAC instance
- uses a mac ce struct
- minor fixes
2021-08-04 13:06:31 +02:00
cig
07a80bc84e Do generation of UL padding in nr_ue_get_sdu only
- removed code from outside this function
- generate random padding in RFSIM mode
- generate 0 padding in real-time
- padding is generated either to complete the PDU or to transmit a new one
  when no data from RLC was fetched
2021-08-04 13:06:31 +02:00
cig
02012e77ee Minor MAC UE fixes
- set constant variables to const
2021-08-04 13:06:31 +02:00
cig
021788c7a7 Improved logging in the MAC PDU processing function at gNB
- improved debug logging
- minor fixes and cleanup
2021-08-04 13:06:31 +02:00
cig
5cfa2cd2f4 Removed OAI exit in mac_rlc_data_req when no RB is present
- this prevents crashes when the function is called for LCIDs that have no RB
- and simply print error message and return 0 when no RB is found
2021-08-04 12:49:42 +02:00
cig
4277d4e1bb Fixes to UE ULSCH PDU generation
- included MAC CE sub-PDUs size in the computation of RLC data to transmit
  this fixes the error with residual mac pdu appearing at gNB side when
  transmitting higher amount of data
- got rid of the nr_generate_ulsch_pdu and moved the relevant UL-SCH MAC PDU
  generation procedure within the nr_ue_get_sdu and nr_ue_get_rach
- reduced memcpy calls and unnecessary memory allocations
- fetching RLC data and SDU size from the mac_rlc_data_req, removed the call
  to mac_rlc_get_buffer_occupancy_ind
- introduced a new function to generate the MAC CEs sub-PDUs
- removed unnecessary function input parameters
- minor fixes and cleanup
- enhanced logging
2021-08-04 12:49:42 +02: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
Rahul Gottipati
4ec3434128 Rebase to latest develop 2021-08-04 14:57:52 +05:30
Eurecom
5274b35d02 added SA configuration file for n310, SA, 40 MHz BW. All on initial BWP. 2021-08-04 11:26:51 +02:00
Eurecom
1385af17e9 end2end functional again (sort of). 2021-08-04 11:21:39 +02:00
francescomani
8cc1d0a2de initialization of pdcp only in nos1 2021-08-04 11:21:07 +02:00
Raphael Defosseux
efc696cce9 fix(ci): split 4G RF sim / 5G RF sim into 2 stages
- Fix the SA RF test (wrong conf file)
- No more copy of RAW files in SA
- Fix no-detection of failures on RA

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-08-03 15:41:16 +02:00
Raghavendra Dinavahi
6d051b4229 Changes in ASN extraction PERL script 2021-08-03 14:27:11 +02:00
Gokul Srinivasan
85b8f78d71 process ID overflow bugfix 2021-08-03 17:57:11 +05:30
Raghavendra Dinavahi
7043f64da3 Fixes of compilation errors after ASN update 2021-08-03 14:27:11 +02:00
Raghavendra Dinavahi
2380646da0 Updated ASN to Spec 38.331 version 16.4.1 2021-08-03 14:27:11 +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
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
francescomani
39307247c9 change error log to log_d to avoid flooding of error messages at ue 2021-08-02 12:49:50 +02:00
francescomani
5c744429c9 bugfix: not scheduling pucch transmission at UE when there is only negative SR 2021-08-02 12:47:32 +02:00
Sakthivel Velumani
6050776f55 Merge branch 'develop' into prb_based_dl_channel_estimation 2021-08-02 12:17:03 +02: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
francescomani
8bb80c9ef0 another attempt to fix ping and iper issues by calling commented functions 2021-07-30 12:18:14 +02:00
francescomani
0904d32e2c Revert "tentatively adding pdcp layer init"
This reverts commit c7106ed315.
2021-07-30 08:22:05 +02:00
Laurent OpenCells
d649434be9 Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into code-cleanup-20210716 2021-07-29 22:29:52 +02:00
francescomani
d9fdbe6338 fix for pucch prb size 2021-07-29 15:59:02 +02:00
francescomani
8d7636bb1e temp fix for SIB1 coreset 2021-07-29 14:31:38 +02:00
Francesco Mani
c7106ed315 tentatively adding pdcp layer init 2021-07-29 11:52:50 +00:00
Laurent OpenCells
c3612b969f fix regression on cuda test 2021-07-29 11:56:59 +02:00
francescomani
fe2fa4ce8d adding comments for transform precoding 2021-07-29 11:26:47 +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
francescomani
13d30c96b3 temporary fix for pucch tx amp 2021-07-29 07:46:16 +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
francescomani
5e3e4714d6 tentative fix for rlc initialization 2021-07-28 09:45:31 +02:00
francescomani
c1ba654a9b fix for phytest 2021-07-27 17:53:46 +02:00
hardy
dabf5c8b55 fix ping target address for module, depending on EPC type 2021-07-27 17:53:22 +02:00
francescomani
b88cc798cd fix for phytest 2021-07-27 17:52:58 +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
francescomani
d4a746ac11 fix for 2 layers dlsim using layers in NR_pdsch_semi_static_t 2021-07-27 16:07:05 +02:00
hardy
017b362359 added reboot control of Eth USRP 2021-07-27 15:50:25 +02:00
spclab
ac4ae0e0fd Hardcodings removed fully, system runs but unstable 2021-07-27 15:10:54 +05:30
Raphael Defosseux
fab6ec4579 fix(ci): adding detection of timed-out run on the physims on cluster
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-07-27 11:12:02 +02:00
francescomani
3c7796adaa Merge remote-tracking branch 'origin/develop' into NR_2port_CSIRS 2021-07-27 11:00:29 +02:00
francescomani
ea6cd95009 bugfix in rrc configuration 2021-07-27 07:29:19 +02:00
rmagueta
bf53625dac Fix selection of Msg3 for CFRA at UE 2021-07-26 19:26:03 +02:00
francescomani
201271846c some fixes for NSA UE 2021-07-26 19:24:31 +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
francescomani
1d66b5c415 attempting to fix wrong implementation in NSA UE configuration 2021-07-26 16:08:52 +02:00
Laurent OpenCells
0f1d787a90 fix obsolete system call 2021-07-26 15:47:57 +02:00
francescomani
09665eeb76 Revert "Put back cell_group_config when do-ra"
This reverts commit bb646da064.
2021-07-26 15:04:34 +02:00
francescomani
d2127b65f3 flexible csi configuration including do_csirs config parameter 2021-07-26 12:45:04 +02:00
francescomani
17ee4648c7 fixes in ssb rsrp functions at ue 2021-07-26 11:47:32 +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
Eurecom
378211346a debugging 2021-07-26 08:13:06 +02:00
francescomani
5c70aa96c4 Merge remote-tracking branch 'origin/develop' into NR_UE_reworking_UCI_procedures 2021-07-26 07:39:57 +02:00
Laurent OpenCells
4a5a73bd9c overkilling: oai support multiple versions of ubuntu 2021-07-25 23:49:41 +02:00
Laurent OpenCells
4700b7bbc6 overkilling: oai support multiple versions of ubuntu 2021-07-25 20:49:31 +02:00
Laurent OpenCells
0c6ce0868c CMakeList cleanup,improvement and trial to run in ubuntu 16 2021-07-25 13:53:49 +02:00
Laurent OpenCells
754e8e3043 CMakeList cleanup,improvement and trial to run in ubuntu 16 2021-07-25 13:52:01 +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
francescomani
f833ca474a some more changes in ulsch structures 2021-07-24 16:45:37 +02:00
francescomani
0f4e765991 add get_dmrs_port function for ul 2021-07-24 16:20:54 +02:00
francescomani
de4676dde1 reworking UL antenna port definitions at gNB 2021-07-24 16:09:18 +02:00
Laurent Thomas
654e37cdb1 try another (second trial) gcc option for ubuntu 16 2021-07-23 23:12:07 +02:00
Raymond Knopp
3315a743a2 for testing with another machine. 2021-07-23 21:51:03 +02:00
Laurent Thomas
b3f3a1db57 try another gcc option for ubuntu 16, one fix in fapi p7 2021-07-23 16:38:01 +02:00
hardy
e241fb5034 fix ssh remote access to UE module 2021-07-23 16:31:43 +02:00
francescomani
196213b6c2 fixing a compilation warning in enb_app 2021-07-23 16:02:29 +02:00
francescomani
ef84130e7c Merge remote-tracking branch 'origin/develop' into NR_UE_SA 2021-07-23 16:01:43 +02:00
magounaki
d1dec5ed0e for testing with another machine. 2021-07-23 15:53:49 +02:00
rmagueta
165b406839 Avoid segmentation fault for LTE 2021-07-23 13:12:35 +01:00
francescomani
bd816e5175 Merge remote-tracking branch 'origin/develop' into NR_UE_reworking_UCI_procedures 2021-07-23 13:51:41 +02: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
Laurent OpenCells
f62b7e1f9e nfapi work around (missing malloc) 2021-07-22 15:32:09 +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
Eurecom
71608f5f75 modifications to statistics gathering for NR 2021-07-22 13:29:28 +02:00
Laurent OpenCells
39c63eb158 move function declaration in not duplicated files (.h instead of .c) 2021-07-22 13:19:37 +02: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
francescomani
227529c129 Merge remote-tracking branch 'origin/develop' into NR_UE_reworking_UCI_procedures 2021-07-21 17:49:33 +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
Laurent OpenCells
6b71382a68 merge develop 2021-07-20 17:50:08 +02:00
hardy
a052e1b719 update conf files for CI 2021-07-20 17:27:59 +02:00
Laurent OpenCells
3f436e3e2f merge develop (was in conflict) 2021-07-20 17:26:15 +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
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
Mahesh
c79a61b895 Merge remote-tracking branch 'origin/develop' into nfapi_nr_arch_mod 2021-07-20 08:39:08 +05:30
Mahesh
c9c1df5e32 fix tdd slot config pack/unpack 2021-07-20 08:29:55 +05:30
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
Eurecom
6eea5b9cba testing ok for 40,50,60 MHz BW. 2021-07-18 15:31:09 +02: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
Eurecom
2c01000955 Merge remote-tracking branch 'origin/develop-NR_SA_F1AP_5GRECORDS-abs' into bandwidth-testing 2021-07-18 09:17:00 +02:00
Eurecom
3c303223f0 Merge remote-tracking branch 'origin/develop-NR_SA_F1AP_5GRECORDS-abs' into bandwidth-testing
Conflicts:
	openair1/PHY/LTE_TRANSPORT/if5_tools.c
	openair2/LAYER2/NR_MAC_gNB/config.c
	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_rlc/nr_rlc_oai_api.c
	openair2/RRC/NR/rrc_gNB_reconfig.c
2021-07-18 09:16:14 +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
Laurent OpenCells
78da843624 code-cleanup-20210716 2021-07-16 17:16:15 +02:00
rmagueta
1c17196f73 Merge remote-tracking branch 'origin/develop' into develop-NR_SA_F1AP_5GRECORDS-abs 2021-07-16 11:38:04 +01:00
Eurecom
d6dee0d1f1 Merge branch 'bandwidth-testing' of https://gitlab.eurecom.fr/oai/openairinterface5g into bandwidth-testing 2021-07-16 11:48:16 +02:00
Eurecom
d64b96f326 reduced logging for 5G SA 2021-07-16 11:47:43 +02: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
Raymond Knopp
ec4fce4339 testing with aw2s jaguar 2021-07-15 09:50:15 +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
francescomani
2fe8dd7657 Merge remote-tracking branch 'origin/develop-NR_SA_F1AP_5GRECORDS-abs' into NR_UE_SA 2021-07-14 10:35:09 +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
francescomani
d9d4e80743 adding missing parameter in pucchsim 2021-07-13 09:38:21 +02:00
Eurecom
6777c46b56 testing on another machine 2021-07-13 07:30:58 +02: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
francescomani
58063acf54 rx_gain = 0 in rfsimulator 2021-07-12 16:30:29 +02:00
hardy
f3ea310429 quick fix for CI NR phy test 2021-07-12 14:56:48 +02:00
Thomas Schlichter
cdbdb15858 fix 2 layer MIMO in nr_dlsim after last merge with develop 2021-07-12 14:42:03 +02:00
francescomani
57775af3c1 Merge remote-tracking branch 'origin/develop' into NR_2port_CSIRS 2021-07-12 14:02:31 +02:00
Laurent THOMAS
bc528d0c73 fix wireshark interface headers 2021-07-12 13:22:38 +02:00
francescomani
8ad3b40cd5 fixes in pucch configuration for SA 2021-07-12 11:53:35 +02:00
Eurecom
8c482709dc changes for initialBWP size different than Coreset0. Tested with 50 MHz 2x2 configuration, initialBWP with 133 PRBs. 2021-07-11 19:42:01 +02:00
francescomani
5055023dae fix in activation of pucch_vars 2021-07-10 12:17:46 +02:00
francescomani
8981f5cbd7 fix in pucch ue scheduler for pucch_Config = NULL 2021-07-10 11:41:38 +02:00
francescomani
3228ebf3f6 using pdsch_pdu for sib1 indication 2021-07-10 11:26:56 +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
francescomani
c80c253c3e Merge remote-tracking branch 'origin/develop' into NR_UE_reworking_UCI_procedures 2021-07-08 15:17:02 +02:00
francescomani
724b0c076b fix in rsrp table including max and min int for out of range report 2021-07-08 15:15:22 +02:00
francescomani
b15c39d9f8 bugfix in pucch resource selection for csi meas report 2021-07-08 14:35:18 +02: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
francescomani
9709b5efe7 copying retInfo to sched_pusch in the right place 2021-07-07 17:41:36 +02: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
francescomani
c72156aa07 bugfix in set_dl_mcs 2021-07-06 17:45:10 +02:00
Mahesh
74a092f73a Documentation update, UL transmission 2021-07-06 15:59:52 +05:30
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
Mahesh
02f3fecfef future_ul_tti hardcoding solved, other hardcodings commented out 2021-07-05 22:55:35 +05:30
francescomani
72fc7bfafc Revert "RSRP tables in mac common"
This reverts commit b38cc83233.
2021-07-05 18:05:26 +02:00
francescomani
19c356ee23 first implementation of MAC function for SSB RSRP (to be verified) 2021-07-05 18:00:44 +02:00
Thomas Schlichter
c3482e376d Merge remote-tracking branch 'origin/develop' into nr-dl-mimo-2layer 2021-07-05 16:25:26 +02:00
francescomani
b38cc83233 RSRP tables in mac common 2021-07-05 15:43:05 +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
Mahesh
cea8730403 Merge conflicts resolved 2021-07-04 22:39:22 +05:30
Mahesh
dc3f61b5c5 Build error fix, sync hardcode, UL indication called in every slot 2021-07-04 21:57:28 +05:30
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
francescomani
cb0de3ba03 csi period and offset in mac common 2021-07-02 17:29:23 +02: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
francescomani
a49ebe249b Merge remote-tracking branch 'origin/develop' into NR_UE_reworking_UCI_procedures 2021-07-01 16:38:41 +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
francescomani
1de542eb35 removing layers from UE_info 2021-07-01 14:41:05 +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
Eurecom
bf4a3d1a88 Merge branch 'NR_SA_F1AP_5GRECORDS' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_SA_F1AP_5GRECORDS 2021-06-30 11:15:31 +02:00
rmagueta
18fae95fc7 Fix UL TDA in config file for NSA 2021-06-29 18:54:52 +01:00
Mahesh
64a7191872 Cleanup 2021-06-29 20:15:29 +05:30
Mahesh
9421c35a72 Code cleanup 2021-06-29 08:49:48 +05:30
Mahesh
831c47c40b Merge remote-tracking branch 'origin/develop' into nfapi_nr_arch_mod 2021-06-29 07:54:09 +05:30
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
francescomani
a8c4dd537f fill dmrs mask depending on actual number of frontloaded symbols, not maxlength 2021-06-25 18:10:16 +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
francescomani
c9a3125937 get nrOfLayers from DCI info at UE 2021-06-24 14:37:24 +02: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
francescomani
ee2079816b handling dl dmrs ports at mac and other modifications for semi static parameters for dlsch 2021-06-23 18:30:24 +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
francescomani
ed54f59818 handling dl dmrs ports at phy 2021-06-22 18:29:22 +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
francescomani
ee2f133cae max mimo layers depending on antenna ports from config file 2021-06-21 12:19:39 +02:00
Masayuki Harada
3a662d95f5 Move memory for USIM information to UICC. 2021-06-21 18:52:05 +09:00
Mahesh
ba2c28f6b1 PNF slot ticking fix 2021-06-18 19:26:56 +05:30
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
francescomani
d3ad905324 remove debug print from log 2021-06-17 18:24:13 +02:00
francescomani
549e3a9159 remove choice in CSI report structure 2021-06-17 18:21:25 +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
francescomani
0ec932b57f nb of layers from CSI Report 2021-06-17 13:18:45 +02:00
francescomani
5e4d40b1ec bugfix in rrc configuration 2021-06-17 12:55:43 +02:00
francescomani
39defb49ed passing nroflayers to nr_find_nb_rb 2021-06-17 10:54:52 +02:00
Thomas Schlichter
311b97685e gNB: add nrOfLayers to sched_pdsch 2021-06-17 10:41:30 +02:00
francescomani
40c51ebc0b tbs computation on the fly in pf_dl 2021-06-17 10:37:34 +02:00
francescomani
5d34f4906d set mcs from csi report 2021-06-17 10:04:03 +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
Eurecom
d9e03ad60a Merge branch 'NR_SA_F1AP_5GRECORDS' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_SA_F1AP_5GRECORDS 2021-06-17 06:42:51 +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
francescomani
63d0c085a6 fixing dlsim ulsim 2021-06-16 18:47:03 +02:00
hardy
5ef64f467a update att_tx in config to improve 5g attach in our setup 2021-06-16 13:40:08 +02:00
francescomani
3ca8ee8601 some cleanup and fixes 2021-06-16 10:51:17 +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
francescomani
ec36342fa6 Merge branch 'NR_2port_CSIRS' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_2port_CSIRS 2021-06-16 08:50:08 +02:00
Eurecom
5d1fdd5071 time_allocation index for Msg2 to fit new configuration file (SCC) 2021-06-16 00:00:46 +02:00
francescomani
71a9ee0c4e flexible csi configuration including do_csirs config parameter 2021-06-15 18:04:06 +02:00
Eurecom
0cdff39806 Merge remote-tracking branch 'origin/develop-NR_SA_F1AP_5GRECORDS' into NR_2port_CSIRS 2021-06-15 17:54:37 +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
Mahesh
6210519d51 Bugfix - UL info filling 2021-06-15 18:35:46 +05:30
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
francescomani
f879260bf9 removing unused fapi structures at UE 2021-06-11 18:11:09 +02: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
francescomani
0f5071c166 bugfix in zero padding 2021-06-11 12:06:13 +02: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
francescomani
5451db54f1 RRC configuration for CSI-IM 2021-06-09 15:27:34 +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
Eurecom
3e8bc05bdf testing with 2x2 and 4x4 with N310, small modifications in nr_ru_procedures and usrp_lib.cpp for multiple antennas 2021-06-08 19:23:00 +02:00
Eurecom
3dbf4e94cb handling for UL failure. added do_precoding flag to nr-ru procedures. testing with 2x2 N310. 2021-06-08 18:38:17 +02:00
Remi Hardy
97d0973476 update module mgt and log collect for nsa test 2021-06-08 17:38:40 +02:00
francescomani
9a030b42f0 Merge remote-tracking branch 'origin/develop-NR_SA_F1AP_5GRECORDS' into NR_2port_CSIRS 2021-06-08 14:50:52 +02:00
Gokul Srinivasan
e93df00434 Update nfapi/open-nFAPI/nfapi/public_inc/fapi_nr_ue_interface.h, openair1/SCHED_NR_UE/fapi_nr_ue_l1.c, nfapi/oai_integration/nfapi_pnf.h, nfapi/oai_integration/nfapi_pnf.c files 2021-06-08 12:46:34 +00: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
francescomani
601381cb44 another tentative change of configuration for 2 port CSI 2021-06-08 08:47:55 +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
Gokul Srinivasan
4dc9d22f16 bugfix in gNB_scheduler_uci.c 2021-06-07 22:41:08 +00:00
Remi Hardy
773f2a58e4 add QLog traces and fix autoterminate for module 2021-06-07 23:05:36 +02:00
francescomani
4819b14671 bitlen for typeI single panel 2021-06-07 17:36:16 +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
francescomani
c114c245de adding rrc parameter csi-ReportingBand 2021-06-04 18:19:54 +02:00
francescomani
4b0883f2e0 adding cri_RI_LI_PMI_CQI option 2021-06-04 11:56:15 +02:00
francescomani
9cda0a0ced update in CSI report evaluation including PMI 2021-06-04 09:54:01 +02: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
francescomani
c3627daa22 update in CSI meas computation, including PMI for 2 port 2021-06-03 16:03:48 +02: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
francescomani
2959b34704 2 port CSI configuration 2021-06-02 12:37:43 +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
Gokul Srinivasan
8889d6d808 Add .gitlab-ci.yml 2021-05-30 21:05:12 +00:00
Mahesh
cf0659abe9 Cleanup 2021-05-31 02:13:19 +05:30
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
4ec568f5c4 Merge remote-tracking branch 'origin/NR_UE_rework_test' into NR_UE_reworking_UCI_procedures 2021-05-27 17:43:43 +02: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
Sakthivel Velumani
5ec7f39adf fixed PUSCH tx issue 2021-05-26 10:12:58 +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
Sakthivel Velumani
99f69b87a1 fix bug 2021-05-25 17:59:17 +02: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
Mahesh
99a6001643 Resolved merge conflicts and allocated gNB struct in VNF 2021-05-25 04:37:23 +05:30
Sakthivel Velumani
30c2746b9b call ul_indication again for PUCCH 2021-05-24 20:07:43 +02: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
francescomani
049c8314f9 triggering SR transmission at UE 2021-05-24 10:29:09 +02:00
Sakthivel Velumani
0c84d4db02 printing time response in ulsim 2021-05-23 16:57:49 +02:00
luis_pereira87
824faeb163 Avoid a segmentation fault in LTE when first_uci_stats is NULL 2021-05-22 17:11:19 +01:00
Raymond Knopp
1c4fef02dd Merge remote-tracking branch 'origin/develop' into prb_based_dl_channel_estimation
Conflicts:
	cmake_targets/autotests/test_case_list.xml
	openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c
	openair1/SIMULATION/NR_PHY/ulsim.c
	targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band22.tm1.106PRB.adrv9371zc706.conf
	targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.217PRB.usrpn300.conf
	targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.217PRB.usrpx300.conf
	targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.273PRB.usrpn300.conf
2021-05-22 16:33:44 +02:00
Raymond Knopp
de7d35007c temporary revert to 1 estimate per PRB for performance evaluation 2021-05-22 16:26:00 +02: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
francescomani
2ffceb333c function for SR periodicity in mac common 2021-05-21 18:19:16 +02: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
francescomani
f84d6767c3 Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into NR_UE_SA 2021-05-20 16:13:46 +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
francescomani
dbf3b72414 putting back downlink_harq_process and some other fixes 2021-05-20 10:00:05 +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
francescomani
f0c0a303d2 fix compilation in pucch_nr debug case 2021-05-19 10:15:55 +02:00
francescomani
5bf3b09a48 adding call to fill_scheduled_response 2021-05-19 10:06:56 +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
francescomani
c02d9f6221 improvements in configure_pdcch function 2021-05-18 15:01:41 +02: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
rmagueta
4204b8bb4c CCE-to-REG mapping extended for 2 or more DCI symbols at UE 2021-05-18 11:07:22 +02:00
rmagueta
b4bf06f791 CCE-to-REG mapping extended for 2 or more DCI symbols 2021-05-18 11:07:08 +02:00
francescomani
cd9a8f963f moving pucch functions for harq at MAC (version still to be tested) 2021-05-18 11:04:10 +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
Mahesh
7d59106c5f nfapi working with latest threading architecture 2021-05-11 02:26:59 +05:30
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
Sakthivel Velumani
3ac2343ad9 Fixed start & end PRB 2021-05-10 11:15:51 +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
Sakthivel Velumani
d621ad67e5 Fixied nrulsim 2021-05-10 00:23:37 +02:00
Sakthivel Velumani
7948949604 Smoothing the frequency response 2021-05-10 00:09:18 +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
f691d8805a formatting in nr_ue_dlsch_procedures 2021-05-06 17:40:59 +02: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
francescomani
7577df9401 adding rsrp to ssb indication 2021-05-06 10:53:13 +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
Sakthivel Velumani
2a6442096c Merge remote-tracking branch 'origin/develop' into prb_based_dl_channel_estimation 2021-05-05 14:34:14 +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
Thomas Schlichter
014280bf13 NR_UE: fix PRACH TX timing for FR2 2021-05-04 16:47:30 +02: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
Sakthivel Velumani
2437d58b17 Fixing sample offset for PRACH rx 2021-05-04 01:44:55 +02: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
Sakthivel Velumani
e7425965ed Fixing UE OFDM symbol generation
The CP length was hard coded for numerology 1
2021-05-03 20:46:10 +02: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
francescomani
d6c70f85d2 sib1 tda from config file 2021-05-03 14:30:58 +02: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
francescomani
4a00aa25ef improvements in pdsch allocation for sib1 2021-04-30 18:56:43 +02:00
rmagueta
916daed3a9 Fix DL after CFRA 2021-04-30 17:03:21 +01:00
Sakthivel Velumani
2b96ebac1f Changing back the default numnerology 2021-04-30 16:48:06 +02: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
Sakthivel Velumani
04b46effc2 Disabling the DC clearing in UL 2021-04-30 16:34:35 +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
Sakthivel Velumani
493dab700d Updating ulsim
adding option to change numberology
2021-04-29 15:29:43 +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
luis_pereira87
be9fe071d2 Fix dmrs_idx for coreset with duration > 1 symbol 2021-04-29 09:30:28 +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
francescomani
4c6cf19364 bugfix for sib1 in case of ssb different from 0 again 2021-04-27 18:17:40 +02:00
hardy
b6daabc2b5 tentative to improve Module control encapsulation 2021-04-27 17:49:45 +02:00
Thomas Schlichter
8a7a79374b 5G NR: change PUSCH and PDSCH channel levelling for higher accuracy 2021-04-27 17:08:13 +02:00
Thomas Schlichter
da799243d5 Merge remote-tracking branch 'origin/develop' into prb_based_dl_channel_estimation 2021-04-27 16:55:29 +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
Sakthivel Velumani
7edb235102 Updating gnb config files 2021-04-26 22:47:19 +02:00
Thomas Schlichter
b073ca48c3 gNB: improve TA accuracy
The TA calculation takes the CIR peak position error and scales it according to 38.213 section 4.2.
Till now it was simply an integer division "timing_advance_update = sync_pos / bw_scaling".

E.g. in case of bandwidth_scaling == 16, the timing_advance_update was 0 for sync_pos between -15 and +15.
With this change, this range (and thus the UL timing error) will be reduced to -8 and +8.
2021-04-26 18:05:17 +02: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
Thomas Schlichter
5c6865fbc6 5G NR: simplify init_timeshift_rotation()
Only Ncp1 is used, so get rid of the second timeshift_symbol_rotation array.
Also simplify the computation of "t0 * Tc * f".
2021-04-26 16:09:32 +02: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
Thomas Schlichter
942037beb3 5G NR: move CIR peak to 0
The rotation compensating the shifted OFDM position _before_ the channel estimation makes the CIR peak move back to 0.
We have to take this into account on gNB side when calculating the timing advance command, and on UE side in the time adjustment.
2021-04-26 14:58:01 +02:00
Thomas Schlichter
626ab8aa3a NR_UE: adjust some LOG levels 2021-04-26 14:58:01 +02:00
Sakthivel Velumani
4d60c5e4fd Fixing a bug 2021-04-26 14:52:45 +02:00
Sakthivel Velumani
33021bd826 Adding offset divisor parameter to all config files 2021-04-26 13:32:02 +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
Sakthivel Velumani
f5913f3bfc Fixed bug in UL slot fep 2021-04-26 03:10:41 +02:00
Sakthivel Velumani
215f263a69 Making sample offset as cmd line parameter
for gNB its in L1 section of config file
for UE its a cmd line paramenter
2021-04-26 03:09:17 +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
Sakthivel Velumani
11111bcd68 Adding freq domain deroration to DL
also fixed build wanings
2021-04-23 16:22:28 +02:00
Sakthivel Velumani
1991c2f9cd Revert "HACK: cut PUSCH and PDSCH OFDM symbol after complete CP"
This reverts commit 87b53883b2.
2021-04-23 15:42:16 +02:00
francescomani
48b847cbd3 reworking extraction of csi meas report (first version) 2021-04-23 15:41:47 +02:00
Sakthivel Velumani
945a020f93 Added linear phase derotation in UL
This is necessary to compensate the rotation caused by the timeshifted OFDM symbol (1/8 CP)
2021-04-23 15:41:44 +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
Thomas Schlichter
87b53883b2 HACK: cut PUSCH and PDSCH OFDM symbol after complete CP
Currently we cute the PUSCH and PDSCH OFDM symbols starting within the last 1/8th of the CP to avoid ISI.
This time shift leads to a rotation in frequency domain.
The current PRB based channel estimation does not compensate for the rotation _within_ a PRB, leading to bad performance.

This commit should _not_ make it into develop branch, it is just for testing!
Instead, we should do some compensating rotation before channel estimation.
2021-04-21 13:45:22 +02:00
Thomas Schlichter
b110c3622b NR_UE: fix possible overflow in PRB based PDSCH channel estimation 2021-04-21 13:45:22 +02:00
Thomas Schlichter
fd70cd3e44 gNB: fix possible overflow in PRB based PUSCH channel estimation 2021-04-21 13:45:22 +02:00
Thomas Schlichter
5d6c01de91 nr_ulsim: fix for nb_antennas_tx != nb_antennas_rx
use nb_antennas_tx instead of nb_antennas_rx when copying data from UE->common_vars.txdata to s_re and s_im
2021-04-21 13:23:27 +02:00
Thomas Schlichter
d2752d0dc5 NR_UE: fix allocation of txdataF_layers
Each element is sizeof(int32_t), not sizeof(int32_t *).
2021-04-21 13:20:24 +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
francescomani
f31badef03 ssb_start_subcarrier from command line 2021-04-20 15:54:38 +02:00
francescomani
80f3e79efd Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into NR_UE_SA 2021-04-20 15:07:15 +02: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
francescomani
c8ba34cf87 fix in extract dci 2021-04-20 11:58:55 +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
francescomani
40eb1fb748 Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into NR_UE_SA 2021-04-20 11:12:20 +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
Sakthivel Velumani
b546e6445d Merge remote-tracking branch 'origin/develop' into prb_based_dl_channel_estimation 2021-04-19 10:18:05 +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
Sakthivel Velumani
a96501177e Code cleanup as per reiview comments 2021-04-17 21:47:01 +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
francescomani
e6ad0aac74 fix for csi meas report 2021-04-16 17:34:05 +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
francescomani
b968a88413 bugfix in ue sib1 scheduling 2021-04-16 09:02:43 +02:00
francescomani
6b82ac26fc using common configuration complete to signal sib1 decoded 2021-04-16 08:52:31 +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
francescomani
29165a93c1 Merge remote-tracking branch 'origin/develop' into NR_UE_SA 2021-04-15 15:46:04 +02:00
francescomani
a170257d62 fix for RA SS 2021-04-15 15:33:08 +02: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
francescomani
1051c94cf6 Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into NR_UE_SA 2021-04-15 11:53:16 +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
francescomani
9fe3289cc0 fix in nr-ue for ul slots 2021-04-14 15:55:01 +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
francescomani
0fac0ee70c filling config request, adjustment of prach functions and remove hardcoding from sib1 2021-04-14 15:03:25 +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
francescomani
7e5ef00996 removal of bwp from sib1, removal of fill_default_initialDownlinkBWP 2021-04-13 16:12:06 +02: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
francescomani
e030713c09 fix dlsch decoding for sib1 2021-04-13 10:37:04 +02:00
luis_pereira87
6c7280c087 Define Initial BWP with the same locationAndBandwidth as Coreset0 defined by PDCCHConfigSIB1 in MIB 2021-04-13 10:26:05 +02:00
Raymond Knopp
f5b2da21b2 fixing previous commit 2021-04-13 10:01:19 +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
Mahesh
047b7b17ba Uplink indication 2021-04-13 02:31:40 +05:30
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
francescomani
6f31e80ac4 bugfix for dci reception when sync in second frame 2021-04-12 18:52:05 +02:00
rmagueta
927d936317 Remove hard code in nr_pdsch_channel_estimation 2021-04-12 17:30:53 +02:00
Robert Schmidt
7f774d5fbc Merge branch 'develop' into integration_2021_wk13_b 2021-04-12 17:23:21 +02:00
francescomani
23330e4c67 bugfix 2021-04-12 17:21:40 +02:00
francescomani
2ca2adeabd Merge remote-tracking branch 'origin/develop' into NR_UE_SA 2021-04-12 17:05:27 +02:00
francescomani
25b8b91020 calling dlsch detection in initial sync for sib1 2021-04-12 17:01:57 +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
rmagueta
99a56f0530 Rework default PDSCH time domain resource allocation tables 2021-04-12 13:41:57 +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
francescomani
f2127adf40 reworking of pdcch procedures function call 2021-04-12 11:22:16 +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
Sakthivel Velumani
913ac80093 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-04-09 19:37:28 +02:00
francescomani
6ebb815eba modifications in aggregation level for sib1 and decoding of dci at ue for sib1 2021-04-09 19:22:17 +02: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
francescomani
e2b35e684f quick fix for nb antennas in frame parms 2021-04-08 10:14:49 +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
Sakthivel Velumani
3c17c29a1d Merge branch 'develop' into prb_based_dl_channel_estimation 2021-04-07 14:02:40 +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
Sakthivel Velumani
476e51fb90 removing j from options 2021-04-07 12:51:28 +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
francescomani
73a42a67ca Merge remote-tracking branch 'origin/develop' into NR_UE_SA 2021-04-06 11:34:18 +02:00
francescomani
272b53bc86 call for pdcch procedure for sib1 in initial sync 2021-04-06 11:07:13 +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
Francesco Mani
be6b413a82 moving initialization of gold for pdcch to nr_init_ue 2021-04-05 11:04:51 +02:00
francescomani
83ad469a33 add option sa for sib1 detection in initial sync 2021-04-05 11:03:37 +02:00
francescomani
cb31468c16 first version of scheduler for sib1 2021-04-05 10:15:22 +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
francescomani
438a6fe0fc fixes in fill ss0 and coreset0 2021-04-02 18:20:30 +02:00
francescomani
259191df06 new functions to fill ss0 and coreset0 2021-04-02 16:09:33 +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
francescomani
3aebb08130 function to schedule reception of sib1 2021-03-30 17:34:33 +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
francescomani
b711517a57 improved slot computation in decode mib function 2021-03-29 17:45:04 +02: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
francescomani
3de0730034 reuse softmodem common tags for command line paremeters 2021-03-26 19:10:22 +01:00
francescomani
a83265dfb1 not reading .raw files in SA 2021-03-26 17:57:50 +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
francescomani
032a850c23 getting rid of dl and ul_bwp_dedicated in config request 2021-03-26 15:46:51 +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
Sakthivel Velumani
1d2e5cabd8 Closing review comments
MR 1081
2021-03-26 14:41:56 +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
francescomani
a788c696d8 ssb start subcarrier in ssb indication for reception of sib1 2021-03-25 10:56:19 +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
francescomani
81ebec80f5 Merge remote-tracking branch 'origin/NR_MAC_SSB' into NR_UE_SA 2021-03-24 15:45:25 +01:00
francescomani
0862988c23 initial sync ok if SSB in the middle 2021-03-24 10:36:27 +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
francescomani
62b68e788c init frame parms ue sa 2021-03-23 15:47:46 +01:00
hardy
b28ac6d982 Merge remote-tracking branch 'origin/ci_benetel_test' into develop 2021-03-23 13:44:25 +01:00
francescomani
88c36546f8 command line parameters for SA UE 2021-03-23 11:45:45 +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
Sakthivel Velumani
03ba68d42e Merge branch 'develop' into prb_based_dl_channel_estimation 2021-03-22 16:25:19 +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
Mahesh
4454627ba3 Uplink constellation + CRC OK 2021-03-17 14:43:05 +05:30
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
Mahesh
b232c43477 Uplink improvement 2021-03-16 12:49:46 +05:30
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
Mahesh
39577ba0d8 UL P7 messages and UL scheduling re-enabled. Disabled HARQ from the UE side --> DL CRC OK 2021-03-11 12:49:40 +05:30
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
Sakthivel Velumani
6610ce11f1 Updated phy_simulators to use new chest
Added a CI test case for dlsim to test 256 QAM
2021-03-09 16:17:56 +01: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
Sakthivel Velumani
4304239520 fixing build issue 2021-03-08 16:26:35 +01: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
Shruthi
6e61393f7e DCI payload corrections in nFAPI mode 2021-03-06 15:18:02 +05:30
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
Shruthi
9a623a2b45 pdcch pdu pack/unpack fix 2021-03-05 21:45:38 +05:30
Sakthivel Velumani
3fe2628df0 fixing build errors 2021-03-05 16:51:09 +01:00
Shruthi
86c3928652 Minor build error fix, README improved 2021-03-05 21:09:39 +05:30
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
Sakthivel Velumani
b7dddf0849 Adding ulsch encoding stats 2021-03-05 13:54:44 +01:00
Sakthivel Velumani
d4a53d522f Merge branch 'develop' into prb_based_dl_channel_estimation 2021-03-05 13:25:35 +01:00
Sakthivel Velumani
8c31044031 Merge branch 'uslim-updates' into prb_based_dl_channel_estimation 2021-03-05 13:24:55 +01:00
Sakthivel Velumani
0fb6934fed Cmd line parameter for UE 2021-03-05 12:11:46 +01:00
Sakthivel Velumani
8d07eacd9e Added averaging channel est to PUSCH
Included command line option to select interpolation method
2021-03-05 11:44:31 +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
Shruthi
28d02f8722 Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop 2021-03-03 23:15:12 +05:30
Shruthi
9fce798a0e Fixed errors in nFAPI after first merge 2021-03-03 23:09:02 +05:30
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
Sakthivel Velumani
e881a108cd Added encoding stats in ulsim 2021-02-26 11:03:15 +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
Raymond Knopp
d26d60300e added a PRB-based channel estimation. It averages the 4/6 DMRS LS channel estimates and uses a single value per PRB. Improves performance of high MCS
PHY_VARS_NR_UE now has a flag fd_lin_interpolation which turns this on/off. By default it uses the "new" method.
2021-02-22 12:26:42 +01:00
Gokul Srinivasan
880096cc95 Delete create_nr_tasks.c 2021-02-21 18:40:51 +01:00
Raymond Knopp
e14786b301 Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop 2021-02-21 12:26:45 +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
Raymond Knopp
d56a50609c Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop 2021-01-30 15:54:59 +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
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
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
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
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
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
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
Raymond Knopp
be16207602 Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop 2020-11-24 17:46:46 +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
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
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
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
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
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
hardy
708f34eeec fixing auto-terminate function to kill all RAN nodes 2020-11-20 11:59:40 +01:00
yaojie
9d579b7a47 fix errors and warnings 2020-11-20 14:39:45 +09: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
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
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
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
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
yaojie
f8f489ec22 add NGAP UE CONTEXT RELEASE MESSAGE 2020-11-18 18:33:58 +09:00
yaojie
959681424c fix some errors and warnings. 2020-11-18 03:12:59 +00:00
Francesco Mani
fa35662044 10 MHz config file 2020-11-17 14:10:10 +01:00
Florian Kaltenberger
e595ec0d8d Merge remote-tracking branch 'origin/develop' into NR_FR2_RRC_SSB 2020-11-17 13:57:51 +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
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
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
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
rmagueta
17312d685f Minor fixes on used BWP. 2020-11-13 12:07:53 +00: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
Francesco Mani
471c8eb8e1 bugfix for long ssb bitmap in fix scc 2020-11-12 10:20:49 +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
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
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
Francesco Mani
b1bffcee81 extend bitmap for SSB in RRC to FR2 2020-11-10 19:03:29 +01:00
Francesco Mani
f7827a1d2b fix for dword length in csi rs 2020-11-10 16:39:41 +01:00
Francesco Mani
ef4adce1e5 using cell id as scrambling id for csi-rs 2020-11-10 14:14:44 +01:00
Francesco Mani
e7a3cb295e uint in corr for pucch rx 2020-11-09 18:13:35 +01:00
Xue Song
04897ab64f Fix GTPU's IP setting error 2020-11-09 08:32:57 +00:00
Mahesh
643fc632d6 PBCH working 2020-11-06 19:48:34 +05:30
yaojie
bce573e64e fix process NGAP_INITIAL_CONTEXT_SETUP_REQ 2020-11-06 10:36:56 +00: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
yaojie
56b1d24ff4 fix error InitialContextSetupResponse 2020-11-05 10:10:29 +00:00
Xue Song
7bef73bfa8 set nas message container for security mode complete 2020-11-05 07:57:05 +00:00
He Shanyun
1a9fd6028f set authentication code for security mode complete 2020-11-05 01:20:46 +00:00
rmagueta
976c2b2e84 Fill SIB1 with configuration values 2020-11-04 11:52:55 +00:00
rmagueta
578b17dec6 First baseline implementation of SIB1 2020-11-04 00:00:24 +00: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
rmagueta
6e0b0049ea Coreset0 frequency allocation update 2020-11-03 18:58:56 +00: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
rmagueta
23f5277d29 Decoding and xer_fprint of SIB1 at UE 2020-11-03 02:31:46 +00:00
Francesco Mani
e8d4d6a138 change in RRC for csi rsrp 2020-11-02 19:10:17 +01:00
rmagueta
d07e2ecc3b Minor correction: removing mac header 2020-11-02 12:44:00 +00: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
rmagueta
ac0dc9d3aa Transmission of SIB1 2020-10-30 17:01:51 +00:00
He Shanyun
63795a6c94 implement identityresponse 2020-10-30 08:34:52 +00: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
rmagueta
4f525854d0 Update nr_extract_dci_info() for the NR_RNTI_SI case. 2020-10-28 16:39:09 +00:00
Xue Song
b6e038e044 add NAS up/downlink 2020-10-28 09:54:03 +00: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
He Shanyun
90a10cd051 set amf setid and regionid for registration request 2020-10-27 11:06:23 +00: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
rmagueta
807b3e90b8 RNTI_SI: update to 0xFFFF 2020-10-27 00:30:03 +00: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
Francesco Mani
cea71b473c fixes for csi-rs amplitude 2020-10-22 10:46:04 +02:00
Francesco Mani
dde3e87938 handling csirs and calling the phy function 2020-10-21 17:28:12 +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
Francesco Mani
0768dda232 first rrc config of CSI_RS resource 2020-10-20 10:53:35 +02:00
Florian Kaltenberger
6103c758d1 handling beamforming also for PDSCH 2020-10-20 07:22:55 +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
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
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
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
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
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
Raymond Knopp
da82cd9a91 Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop
Conflicts:
	openair1/SIMULATION/NR_PHY/ulsim.c
2020-10-09 18:38:29 +02:00
Raymond Knopp
9540a0d34a minor changes in ulsim 2020-10-09 18:35:16 +02:00
Mahesh
ff64d6ac10 Resolved UE building error and updated packing of P7 messages 2020-10-07 15:01:40 +05:30
Mahesh
0531e27c7a Added send_mac_slot_indications() and updated timing info procedure 2020-09-03 16:17:09 +05:30
Mahesh
c97bb9630c error in pnf_p7_slot_ind() resolved 2020-08-24 19:29:23 +05:30
Aniq
a3156f54c0 Added the handle messages for P7 DL messages at PNF 2020-08-08 11:46:12 +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
Aniq
5406c16722 Packing fns for tx_data_request added 2020-08-03 15:09:42 +05:30
Aniq
524b9e8b19 UL_TTI [DONE] 2020-07-27 20:52:25 +05:30
Aniq
ac1d74cb05 Completed pack_ul_tti_request_pusch_pdu() 2020-07-27 18:38:21 +05:30
Aniq
69ca893bbd Added pack fn for ul_tti_pdus 2020-07-27 14:35:06 +05:30
Aniq
f67a5aa08c linked the new unpack message fns in check_unpack_length() 2020-07-25 21:36:24 +05:30
Aniq
3d401150ba p5 config request [hardcoding removed] 2020-07-23 22:44:15 +05:30
Aniq
3a5b5ffe55 Added unpack_dl_tti_req 2020-07-22 21:04:40 +05:30
Aniq
a7feca124b added pack_dl_tti component functions [DUMMY TAG] 2020-07-21 17:46:02 +05:30
Aniq
1c0fbee268 adding pack_dl_tti_request function 2020-07-20 20:07:18 +05:30
Aniq
f050e02a90 added plan for vnf p7 2020-07-20 15:43:03 +05:30
Aniq
383daaf71e Added slot_indication on VNF side 2020-07-17 20:42:46 +05:30
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
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
MaheshK1995
553844204c slot indication changes 2020-07-06 20:42:42 +05:30
MaheshK1995
0bfdeebd75 p7 function flow created 2020-07-02 20:28:49 +05:30
MaheshK1995
1faeb991c1 PNF running in RFSIM through VSCODE 2020-06-30 18:50:15 +05:30
MaheshK1995
315288de44 Hard-coded SLOT_CONFIG reception at PNF 2020-06-30 18:05:56 +05:30
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
MaheshK1995
f17fc6dafd VNF/PNF mode set using --vnf --pnf options 2020-06-27 17:24:19 +05:30
MaheshK1995
abefe1a095 Added custom error codes for p5 2020-06-25 18:02:05 +05:30
MaheshK1995
e3a05b9af7 [no USRP found] error resolved 2020-06-19 18:35:52 +05:30
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
MaheshK1995
a6d105d2d1 P5 messages DONE [bypassed a bug] 2020-06-18 17:24:03 +05:30
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
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
Raymond Knopp
e99ad54b66 added missing file 2020-06-17 12:49:56 +02:00
Raymond Knopp
103168a047 standalone RRU executable initial testing version 2020-06-17 09:55:26 +02:00
MaheshK1995
164397b013 resolved pack/unpack issue 2020-06-16 13:23:14 +05:30
MaheshK1995
3343d93d2e investigating pack/unpack 2020-06-13 16:06:49 +05:30
MaheshK1995
fd51a5bdcb PARAM message exchange DONE 2020-06-04 19:09:37 +05:30
MaheshK1995
776a74401d LTE to NR conversions 2020-06-04 15:00:09 +05:30
MaheshK1995
017517986c Debugging 2020-06-02 16:07:02 +05:30
MaheshK1995
1e377d584f updated gitignore 2020-06-02 15:35:58 +05:30
1178 changed files with 145956 additions and 61670 deletions

2
.vscode/launch.json vendored
View File

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

0
CHANGELOG.md Normal file → Executable file
View File

0
LICENSE Normal file → Executable file
View File

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

@@ -0,0 +1,342 @@
#!/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'
}
}
}
}
stage ("RF Simulators") {
when { expression {doMandatoryTests} }
steps {
script {
triggerSlaveJob ('RAN-RF-Sim-Test', 'Test-RF-Sim-Container')
}
}
post {
always {
script {
finalizeSlaveJob('RAN-RF-Sim-Test')
}
}
failure {
script {
currentBuild.result = 'FAILURE'
}
}
}
}
}
}
stage ("Images Push to Registries") {
when { expression {"PUSH".equals(env.gitlabActionType)} }
steps {
script {
triggerSlaveJob ('RAN-DockerHub-Push', 'Push-to-Docker-Hub')
}
post {
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

@@ -1,3 +1,4 @@
#!/bin/groovy
/*
* Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -19,19 +20,26 @@
* contact@openairinterface.org
*/
#include "types.h"
// Template Jenkins Declarative Pipeline script to run Test w/ RF HW
#ifndef ENUM_VALUE_TYPE_H_
#define ENUM_VALUE_TYPE_H_
// Location of the python executor node shall be in the same subnet as the others servers
def pythonExecutor = params.pythonExecutor
extern uint32_t last_enum_value;
int enum_value_dissect_from_buffer(
types_t *type, ui_set_signal_text_cb_t ui_set_signal_text_cb, gpointer user_data,
buffer_t *buffer, uint32_t offset, uint32_t parent_offset, int indent, gboolean new_line);
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'
}
}
}
}
}
int enum_value_file_print(types_t *type, int indent, FILE *file);
int enum_value_type_hr_display(types_t *type, int indent);
#endif /* ENUM_VALUE_TYPE_H_ */

View File

@@ -30,14 +30,16 @@ def sendSocialMediaMessage(pipeChannel, pipeColor, pipeMessage) {
}
}
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
@@ -46,31 +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 L1-sim",
"Test RF-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",
"Test-OCP-FDD-Band7"
])
ansiColor('xterm')
}
@@ -87,12 +64,36 @@ pipeline {
echo "Platform is ${env.TESTPLATFORM_OWNER}"
}
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
}
}
}
}
@@ -135,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 ."
}
}
@@ -190,26 +189,6 @@ pipeline {
}
}
stage ("Start VM -- enb-usrp") {
steps {
lock (vmResource) {
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 {
lock (vmResource) {
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 {
lock (vmResource) {
@@ -228,33 +207,14 @@ pipeline {
}
}
}
}
}
stage ("Start VM -- cppcheck") {
steps {
lock (vmResource) {
timeout (time: 7, 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"
}
}
@@ -263,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"
}
}
@@ -272,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}"
}
}
}
}
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"
}
}
@@ -310,7 +252,7 @@ pipeline {
// 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"
}
}
@@ -328,9 +270,9 @@ pipeline {
script {
dir ('archives') {
if (fileExists('red_hat')) {
sh "zip -r -qq vm_build_logs.zip basic_sim enb_usrp phy_sim cppcheck enb_eth ue_eth gnb_usrp nr_ue_usrp 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_usrp phy_sim cppcheck enb_eth ue_eth gnb_usrp nr_ue_usrp"
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')) {
@@ -338,16 +280,6 @@ pipeline {
}
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();
@@ -374,26 +306,9 @@ pipeline {
parallel {
stage ("VM-based tests") {
stages {
stage ("Test physical simulators") {
steps {
lock (vmResource) {
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) {
@@ -410,6 +325,9 @@ pipeline {
}
}
stage ("Test basic simulator") {
when {
expression {doMandatoryTests}
}
steps {
lock (vmResource) {
script {
@@ -427,6 +345,9 @@ pipeline {
}
}
stage ("Test L1 simulator") {
when {
expression {doMandatoryTests}
}
steps {
lock (vmResource) {
script {
@@ -444,6 +365,9 @@ pipeline {
}
}
stage ("Test RF simulator") {
when {
expression {doMandatoryTests}
}
steps {
lock (vmResource) {
script {
@@ -460,7 +384,30 @@ pipeline {
}
}
}
stage ("Test 5G RF simulator") {
when {
expression {doMandatoryTests}
}
steps {
lock (vmResource) {
script {
timeout (time: 40, unit: 'MINUTES') {
try {
gitlabCommitStatus(name: "Test 5G RF-sim") {
sh "./ci-scripts/oai-ci-vm-tool test --workspace $WORKSPACE --variant rf5g-sim --job-name ${JOB_NAME} --build-id ${BUILD_ID} --keep-vm-alive"
}
} catch (Exception e) {
currentBuild.result = 'FAILURE'
}
}
}
}
}
}
stage ("Test L2 simulator") {
when {
expression {doFullTestsuite}
}
steps {
lock (vmResource) {
script {
@@ -478,6 +425,9 @@ 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}"
@@ -487,6 +437,9 @@ pipeline {
}
}
stage ("Test MONOLITHIC - FDD - Band 7 - B210") {
when {
expression {doFullTestsuite}
}
steps {
script {
triggerSlaveJob ('eNB-CI-FDD-Band7-B210', 'Test-Mono-FDD-Band7')
@@ -506,6 +459,9 @@ pipeline {
}
}
stage ("Test MONOLITHIC - TDD - Band 40 - B210") {
when {
expression {doFullTestsuite}
}
steps {
script {
triggerSlaveJob ('eNB-CI-TDD-Band40-B210', 'Test-Mono-TDD-Band40')
@@ -525,6 +481,9 @@ pipeline {
}
}
stage ("Test IF4p5 - FDD - Band 7 - B210") {
when {
expression {doFullTestsuite}
}
steps {
script {
sh "sleep 60"
@@ -544,7 +503,33 @@ pipeline {
}
}
}
stage ("Test F1 - FDD - Band 7 - B210") {
when {
expression {doFullTestsuite}
}
steps {
script {
sh "sleep 60"
triggerSlaveJob ('eNB-CI-F1-FDD-Band7-B210', 'Test-F1-FDD-Band7')
}
}
post {
always {
script {
finalizeSlaveJob('eNB-CI-F1-FDD-Band7-B210')
}
}
failure {
script {
currentBuild.result = 'FAILURE'
}
}
}
}
stage ("Test IF4p5 - TDD - Band 40 - B210") {
when {
expression {doFullTestsuite}
}
steps {
script {
sh "sleep 60"
@@ -565,6 +550,9 @@ pipeline {
}
}
stage ("Test MONOLITHIC - FDD - Band 13 - B210") {
when {
expression {doFullTestsuite}
}
steps {
script {
sh "sleep 60"
@@ -585,6 +573,9 @@ pipeline {
}
}
stage ("Test X2 Handover - FDD - Band 13 - B210") {
when {
expression {doFullTestsuite}
}
steps {
script {
sh "sleep 60"
@@ -605,6 +596,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')
@@ -624,6 +618,9 @@ pipeline {
}
}
stage ("Test OAI UE - FDD - Band 20 - B200") {
when {
expression {doFullTestsuite}
}
steps {
script {
triggerSlaveJobNoGitLab ('UE-CI-FDD-Band20-B200')
@@ -643,6 +640,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
@@ -664,6 +664,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')
@@ -683,6 +686,9 @@ pipeline {
}
}
stage ("Test OAI OCP-eNB - FDD - Band 7 - B210") {
when {
expression {doFullTestsuite}
}
steps {
script {
triggerSlaveJob ('OCPeNB-FDD-Band7-B210', 'Test-OCP-FDD-Band7')
@@ -705,8 +711,9 @@ pipeline {
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'
@@ -720,6 +727,7 @@ pipeline {
archiveArtifacts artifacts: 'test_simulator_results.html'
}
}
}
}
}
}

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

@@ -0,0 +1,86 @@
#!/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 python executor node shall be in the same subnet as the others servers
def nodeExecutor = params.nodeExecutor
// Name of the phone resource
def ciServerResource = params.serverResource
pipeline {
agent {
label nodeExecutor
}
options {
disableConcurrentBuilds()
ansiColor('xterm')
lock (ciServerResource)
}
stages {
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.nodeExecutor != null) {
echo "Docker Push executor node : ${nodeExecutor}"
}
if (params.serverResource == null) {
allParametersPresent = false
}
}
}
}
stage ("Push to DockerHub") {
steps {
script {
WEEK_TAG = sh returnStdout: true, script: 'date +"%Y.w%U"'
WEEK_TAG = WEEK_TAG.trim()
withCredentials([
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.DH_Credentials}", usernameVariable: 'DH_Username', passwordVariable: 'DH_Password']
]) {
def listOfImages = ["oai-enb", "oai-gnb", "oai-lte-ue", "oai-nr-ue"]
sh "docker login -u ${DH_Username} -p ${DH_Password} > /dev/null 2>&1"
listOfImages.eachWithIndex { item, iindex ->
sh "docker image tag ${item}:develop ${DH_Username}/${item}:develop"
sh "docker image tag ${item}:develop ${DH_Username}/${item}:${WEEK_TAG}"
sh "docker push --quiet ${DH_Username}/${item}:${WEEK_TAG}"
sh "docker push --quiet ${DH_Username}/${item}:develop"
sh "docker rmi ${DH_Username}/${item}:${WEEK_TAG} ${DH_Username}/${item}:develop"
}
sh "docker logout > /dev/null 2>&1"
}
}
}
}
}
post {
always {
script {
echo "End of Registry Push"
}
}
}
}

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,320 @@
#!/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 DataBaseHost = params.DataBaseHost
// 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
//Status fed to the database
def StatusForDb = ""
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"
}
}
}
}
stage('Log Collection (CN)') {
steps {
withCredentials([
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password']
]) {
echo '\u2705 \u001B[32mLog Transfer (CN)\u001B[0m'
sh "sshpass -p \'${EPC_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${EPC_Username}@${params.EPC_IPAddress}:${EPC_SourceCodePath}/logs/oai-cn5g.log.zip ./oai-cn5g.log.${env.BUILD_ID}.zip || true"
}
script {
if(fileExists("oai-cn5g.log.${env.BUILD_ID}.zip")) {
archiveArtifacts "oai-cn5g.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"
}
}
}
}
stage ("SQL Collect"){
agent {label DataBaseHost}
steps {
script {
if (currentBuild.result=='FAILURE') {StatusForDb = 'FAIL'} else {StatusForDb = 'PASS'}
sh "python3 /home/oaicicd/mysql/sql_connect.py ${JOB_NAME} ${params.eNB_MR} ${params.eNB_Branch} ${env.BUILD_ID} ${env.BUILD_URL} ${StatusForDb} ''"
}
}
}
}
}
}
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

@@ -241,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([
@@ -275,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([
@@ -292,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([
@@ -309,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([
@@ -353,7 +369,7 @@ pipeline {
[$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}"
sh "python3 ci-scripts/main.py --mode=LogCollecteNB --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --BuildId=${env.BUILD_ID}"
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"
@@ -371,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']
@@ -389,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']
@@ -407,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']
@@ -425,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']
@@ -443,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']
@@ -482,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']
]) {
@@ -496,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

@@ -0,0 +1,90 @@
#!/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 B200
build job: "RAN-NSA-B200-Module-LTEBOX", 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 2x2
build job: "RAN-NSA-2x2-Module-OAIEPC", 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 LTE 2x2
build job: "RAN-LTE-2x2-Module-OAIEPC", 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 SA
build job: "RAN-SA-Module-CN5G", 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))
]
}
}
}
}
}
}

View File

@@ -41,7 +41,7 @@ import constants as CONST
#-----------------------------------------------------------
def ArgsParse(argvs,CiTestObj,RAN,HTML,EPC,ldpc,HELP):
def ArgsParse(argvs,CiTestObj,RAN,HTML,EPC,ldpc,CONTAINERS,HELP,SCA,PHYSIM):
py_param_file_present = False
@@ -79,6 +79,9 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,EPC,ldpc,HELP):
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)
@@ -90,6 +93,9 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,EPC,ldpc,HELP):
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)
@@ -99,6 +105,9 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,EPC,ldpc,HELP):
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)
@@ -108,6 +117,9 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,EPC,ldpc,HELP):
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)
@@ -117,50 +129,73 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,EPC,ldpc,HELP):
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)
@@ -222,6 +257,18 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,EPC,ldpc,HELP):
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)
elif re.match('^\-\-BuildId=(.+)$', myArgv, re.IGNORECASE):
matchReg = re.match('^\-\-BuildId=(.+)$', myArgv, re.IGNORECASE)
RAN.BuildId = matchReg.group(1)
else:
HELP.GenericHelp(CONST.Version)
sys.exit('Invalid Parameter: ' + myArgv)

View File

@@ -0,0 +1,7 @@
#!/bin/bash
while true
do
echo "gNB will be started automatically..."
sleep 1
sudo .././cmake_targets/ran_build/build/nr-softmodem -E -O ../targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb.conf
done

View File

@@ -1,216 +0,0 @@
#!/bin/bash
#/*
# * 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
# */
function usage {
echo "OAI RedHat Build Check script"
echo " Original Author: Raphael Defosseux"
echo ""
echo "Usage:"
echo "------"
echo " buildOnRH.sh [OPTIONS]"
echo ""
echo "Options:"
echo "--------"
echo " --job-name #### OR -jn ####"
echo " Specify the name of the Jenkins job."
echo ""
echo " --build-id #### OR -id ####"
echo " Specify the build ID of the Jenkins job."
echo ""
echo " --workspace #### OR -ws ####"
echo " Specify the workspace."
echo ""
echo " --remote-host #### OR -rh ####"
echo " Specify the RedHat remote server."
echo ""
echo " --remote-user-name #### OR -ru ####"
echo " Specify the RedHat remote server username."
echo ""
echo " --remote-password #### OR -rp ####"
echo " Specify the RedHat remote server password."
echo ""
echo " --remote-path #### OR -ra ####"
echo " Specify the RedHat remote server path to work on."
echo ""
}
if [ $# -lt 1 ] || [ $# -gt 14 ]
then
echo "Syntax Error: not the correct number of arguments"
echo ""
usage
exit 1
fi
RH_HOST=XX
RH_USER=XX
RH_PASSWD=XX
RH_PATH=XX
JOB_NAME=XX
BUILD_ID=XX
while [[ $# -gt 0 ]]
do
key="$1"
case $key in
-h|--help)
shift
usage
exit 0
;;
-jn|--job-name)
JOB_NAME="$2"
shift
shift
;;
-id|--build-id)
BUILD_ID="$2"
shift
shift
;;
-ws|--workspace)
JENKINS_WKSP="$2"
shift
shift
;;
-rh|--remote-host)
RH_HOST="$2"
shift
shift
;;
-ru|--remote-user-name)
RH_USER="$2"
shift
shift
;;
-rp|--remote-password)
RH_PASSWD="$2"
shift
shift
;;
-ra|--remote-path)
RH_PATH="$2"
shift
shift
;;
*)
echo "Syntax Error: unknown option: $key"
echo ""
usage
exit 1
esac
done
if [ ! -f $JENKINS_WKSP/localZip.zip ]
then
echo "Missing localZip.zip file!"
exit 1
fi
if [ "$JOB_NAME" == "XX" ] || [ "$BUILD_ID" == "XX" ] || [ "$RH_HOST" == "XX" ] || [ "$RH_USER" == "XX" ] || [ "$RH_PASSWD" == "XX" ] || [ "$RH_PATH" == "XX" ]
then
echo "Missing options"
usage
exit 1
fi
echo "############################################################"
echo "Copying GIT repo into RedHat Server"
echo "############################################################"
echo "rm -Rf ${RH_PATH}" >> rh-cmd.txt
echo "mkdir -p ${RH_PATH}" >> rh-cmd.txt
sshpass -p ${RH_PASSWD} ssh -o 'StrictHostKeyChecking no' ${RH_USER}@${RH_HOST} < rh-cmd.txt
rm -f rh-cmd.txt
echo "############################################################"
echo "Running install and build script on RedHat Server"
echo "############################################################"
sshpass -p ${RH_PASSWD} scp -o 'StrictHostKeyChecking no' $JENKINS_WKSP/localZip.zip ${RH_USER}@${RH_HOST}:${RH_PATH}
echo "cd ${RH_PATH}" > rh-cmd.txt
echo "unzip -qq localZip.zip" >> rh-cmd.txt
echo "source oaienv" >> rh-cmd.txt
echo "cd cmake_targets" >> rh-cmd.txt
echo "mkdir -p log" >> rh-cmd.txt
echo "./build_oai -I -w USRP --eNB > log/install-build.txt 2>&1" >> rh-cmd.txt
sshpass -p ${RH_PASSWD} ssh -o 'StrictHostKeyChecking no' ${RH_USER}@${RH_HOST} < rh-cmd.txt
rm -f rh-cmd.txt
echo "############################################################"
echo "Creating a tmp folder to store results and artifacts"
echo "############################################################"
if [ ! -d $JENKINS_WKSP/archives ]
then
mkdir -p $JENKINS_WKSP/archives
fi
ARCHIVES_LOC=$JENKINS_WKSP/archives/red_hat
if [ ! -d $ARCHIVES_LOC ]
then
mkdir -p $ARCHIVES_LOC
fi
sshpass -p ${RH_PASSWD} scp -o 'StrictHostKeyChecking no' ${RH_USER}@${RH_HOST}:${RH_PATH}/cmake_targets/log/*.txt $ARCHIVES_LOC
echo "############################################################"
echo "Checking build status"
echo "############################################################"
LOG_PATTERN=.Rel15.txt
NB_PATTERN_FILES=7
LOG_FILES=`ls $ARCHIVES_LOC/*.txt`
STATUS=0
NB_FOUND_FILES=0
for FULLFILE in $LOG_FILES
do
if [[ $FULLFILE == *"$LOG_PATTERN"* ]]
then
filename=$(basename -- "$FULLFILE")
PASS_PATTERN=`echo $filename | sed -e "s#$LOG_PATTERN##"`
LOCAL_STAT=`egrep -c "Built target $PASS_PATTERN" $FULLFILE`
if [ $LOCAL_STAT -eq 0 ]; then STATUS=-1; fi
NB_FOUND_FILES=$((NB_FOUND_FILES + 1))
fi
done
if [ $NB_PATTERN_FILES -ne $NB_FOUND_FILES ]
then
echo "Expecting $NB_PATTERN_FILES log files and found $NB_FOUND_FILES"
STATUS=-1
fi
echo "COMMAND: build_oai -I -w USRP --eNB" > $ARCHIVES_LOC/build_final_status.log
if [ $STATUS -eq 0 ]
then
echo "BUILD_OK" >> $ARCHIVES_LOC/build_final_status.log
echo "STATUS seems OK"
else
echo "BUILD_KO" >> $ARCHIVES_LOC/build_final_status.log
echo "STATUS failed?"
fi
exit $STATUS

View File

@@ -62,6 +62,12 @@ function build_on_vm {
echo "ARCHIVES_LOC = $ARCHIVES_LOC"
echo "BUILD_OPTIONS = $BUILD_OPTIONS"
if [[ "$VM_NAME" == *"-enb-usrp"* ]] || [[ "$VM_NAME" == *"-cppcheck"* ]] || [[ "$VM_NAME" == *"-phy-sim"* ]]
then
echo "This VM type is no longer supported in the pipeline framework"
return
fi
IS_VM_ALIVE=`uvt-kvm list | grep -c $VM_NAME`
if [ $IS_VM_ALIVE -eq 0 ]
@@ -158,6 +164,9 @@ function build_on_vm {
echo "cd tmp" >> $VM_CMDS
echo "echo \"unzip -qq -DD ../localZip.zip\"" >> $VM_CMDS
echo "unzip -qq -DD ../localZip.zip" >> $VM_CMDS
# Trying to make some room on filesystem before building
echo "rm ../localZip.zip" >> $VM_CMDS
echo "export CI_ENV=True" >> $VM_CMDS
if [[ "$VM_NAME" == *"-cppcheck"* ]]
then
echo "mkdir cmake_targets/log" >> $VM_CMDS
@@ -178,6 +187,8 @@ function build_on_vm {
echo "mkdir -p cmake_targets/log" >> $VM_CMDS
echo "chmod 777 cmake_targets/log" >> $VM_CMDS
echo "cp /home/ubuntu/zip-install.txt cmake_targets/log" >> $VM_CMDS
# Patching the pistache build for Xenial (cmake too old for new commits)
echo "sed -i -e 's@cd pistache@cd pistache \&\& git checkout -f 9a65f40975fafca5bb5370ba6d0d00f42cbc4356@' ./tools/install_dependencies" >> $VM_CMDS
echo "echo \"./tools/install_dependencies \"" >> $VM_CMDS
echo "./tools/install_dependencies > cmake_targets/log/install-build.txt 2>&1" >> $VM_CMDS
echo "echo \"mkdir build\"" >> $VM_CMDS
@@ -206,7 +217,15 @@ function build_on_vm {
echo "echo \"./build_oai -I $BUILD_OPTIONS \"" >> $VM_CMDS
echo "./build_oai -I $BUILD_OPTIONS > log/install-build.txt 2>&1" >> $VM_CMDS
else
echo "echo \"./build_oai -I $BUILD_OPTIONS\" > ./my-vm-build.sh" >> $VM_CMDS
if [[ "$VM_NAME" == *"-enb-ethernet"* ]]
then
echo "echo \"sleep 170 && ./build_oai -I $BUILD_OPTIONS\" > ./my-vm-build.sh" >> $VM_CMDS
elif [[ "$VM_NAME" == *"-ue-ethernet"* ]]
then
echo "echo \"sleep 60 && ./build_oai -I $BUILD_OPTIONS\" > ./my-vm-build.sh" >> $VM_CMDS
else
echo "echo \"./build_oai -I $BUILD_OPTIONS\" > ./my-vm-build.sh" >> $VM_CMDS
fi
echo "chmod 775 ./my-vm-build.sh " >> $VM_CMDS
echo "echo \"sudo -E daemon --inherit --unsafe --name=build_daemon --chdir=/home/ubuntu/tmp/cmake_targets -o /home/ubuntu/tmp/cmake_targets/log/install-build.txt ./my-vm-build.sh\"" >> $VM_CMDS
echo "sudo -E daemon --inherit --unsafe --name=build_daemon --chdir=/home/ubuntu/tmp/cmake_targets -o /home/ubuntu/tmp/cmake_targets/log/install-build.txt ./my-vm-build.sh" >> $VM_CMDS

View File

@@ -0,0 +1,83 @@
#!/usr/bin/env python3
# -*- coding: utf-8 -*-
"""
Created on Tue Jul 7 23:04:51 2020
@author: hardy
"""
import yaml
import sys
import subprocess
def main():
f_yaml=sys.argv[1]
f_sh=sys.argv[2]
#filename='py_params_template.yaml'
with open(f_yaml,'r') as file:
# The FullLoader parameter handles the conversion from YAML
# scalar values to Python the dictionary format
print('Loading '+f_yaml)
params = yaml.load(file,Loader=yaml.FullLoader)
with open(f_sh,'w') as f:
f.write('#!/bin/sh\n')
for i in range (0, len(params['steps'])):
step=params['steps'][i].split(',')
mode=step[0]
f_xml=step[1]
line='python3 main.py ' + \
'--mode='+ mode + ' ' + \
'--ranRepository=' + params['ranRepository'] + ' ' + \
'--ranBranch=' + params['ranBranch'] + ' ' + \
'--ranCommitID=' + params['ranCommitID'] + ' ' + \
'--ranAllowMerge=' + params['ranAllowMerge'] + ' ' + \
'--ranTargetBranch=' + params['ranTargetBranch'] + ' ' + \
\
'--ADBIPAddress=' + params['ADB']['ADBIPAddress'] + ' ' + \
'--ADBUserName=' + params['ADB']['ADBUserName'] + ' ' + \
'--ADBPassword=' + params['ADB']['ADBPassword'] + ' ' + \
\
'--UEIPAddress=' + params['UE']['UEIPAddress'] + ' ' + \
'--UEUserName=' + params['UE']['UEUserName'] + ' ' + \
'--UEPassword=' + params['UE']['UEPassword'] + ' ' + \
'--UESourceCodePath=' + params['UE']['UESourceCodePath'] + ' ' + \
\
'--EPCIPAddress=' + params['EPC']['EPCIPAddress'] + ' ' + \
'--EPCUserName=' + params['EPC']['EPCUserName'] + ' ' + \
'--EPCPassword=' + params['EPC']['EPCPassword'] + ' ' + \
'--EPCSourceCodePath=' + params['EPC']['EPCSourceCodePath'] + ' ' + \
'--EPCType=' + params['EPC']['EPCType'] + ' ' + \
\
'--eNBIPAddress=' + params['RAN'][0]['eNBIPAddress'] + ' ' + \
'--eNBUserName=' + params['RAN'][0]['eNBUserName'] + ' ' + \
'--eNBPassword=' + params['RAN'][0]['eNBPassword'] + ' ' + \
'--eNBSourceCodePath=' + params['RAN'][0]['eNBSourceCodePath'] + ' ' + \
\
'--eNB1IPAddress=' + params['RAN'][1]['eNB1IPAddress'] + ' ' + \
'--eNB1UserName=' + params['RAN'][1]['eNB1UserName'] + ' ' + \
'--eNB1Password=' + params['RAN'][1]['eNB1Password'] + ' ' + \
'--eNB1SourceCodePath=' + params['RAN'][1]['eNB1SourceCodePath'] + ' '
if mode!="InitiateHtml":
line+='--XMLTestFile=' + f_xml
#if mode is InitiateHTML we have a special processing to mention all xml files from the list
#loop starting at 1 to avoid the xml file mentioned with InitiateHtml in yaml file (file is none)
else:
for i in range (1, len(params['steps'])):
step=params['steps'][i].split(',')
f_xml=step[1]
line+='--XMLTestFile=' + f_xml+' '
line+='\n'
print(line)
f.write(line)
subprocess.call(['chmod','777',f_sh])
if __name__ == "__main__":
main()

View File

@@ -0,0 +1,46 @@
ranRepository : https://gitlab.eurecom.fr/oai/openairinterface5g.git
ranBranch : integration_2021_wk13_a
ranCommitID : 104aa7eed5d6702c1b9da663414079ef698da206
ranAllowMerge : 'yes'
ranTargetBranch : develop
steps:
- InitiateHtml,none
- TesteNB,xml_files/fr1_multi_node_build.xml
- TesteNB,xml_files/fr1_epc_start.xml
- TesteNB,xml_files/fr1_nsa_base_next.xml #ue toggle, nodes initialize, ue toggle, ping, nodes terminate
- TesteNB,xml_files/fr1_epc_closure.xml
ADB: #on Caracal
ADBIPAddress : 192.168.18.196
ADBUserName : oaici
ADBPassword : KkexF6CErOi1fNuebCPsuIVK
RAN:
- eNBIPAddress : 192.168.18.199 #eNB on Minimassive
eNBUserName : oaicicd
eNBPassword : HzB*nkryaITdVd08TKlT#2Z5a!7M#~qn
eNBSourceCodePath : /tmp/CI-FR1-eNB
- eNB1IPAddress : 192.168.18.198 #gNB on Mozart
eNB1UserName : oaicicd
eNB1Password : 7zkDOFgh@w3HvRBMPTMh@BAx
eNB1SourceCodePath : /tmp/CI-FR1-gNB
EPC: #on Nikaia
EPCIPAddress : 192.168.18.99
EPCUserName : nikaia
EPCPassword : linux
EPCSourceCodePath : /tmp/CI-FR1-EPC
EPCType : ltebox
UE:
UEIPAddress : none
UEUserName : none
UEPassword : none
UESourceCodePath : none

View File

@@ -76,8 +76,8 @@ then
do
IS_NFAPI=`echo $FILE | egrep -c "nfapi/open-nFAPI|nfapi/oai_integration/vendor_ext" || true`
IS_OAI_LICENCE_PRESENT=`egrep -c "OAI Public License" $FILE || true`
IS_BSD_LICENCE_PRESENT=`egrep -c "the terms of the BSD Licence" $FILE || true`
IS_EXCEPTION=`echo $FILE | egrep -c "common/utils/collection/tree.h|common/utils/collection/queue.h|common/utils/itti_analyzer/common/queue.h|openair3/UTILS/tree.h|openair3/UTILS/queue.h|openair3/GTPV1-U/nw-gtpv1u|openair2/UTIL/OPT/ws_|openair3/NAS/COMMON/milenage.h" || true`
IS_BSD_LICENCE_PRESENT=`egrep -c "the terms of the BSD Licence|License-Identifier: BSD-2-Clause" $FILE || true`
IS_EXCEPTION=`echo $FILE | egrep -c "common/utils/collection/tree.h|common/utils/collection/queue.h|common/utils/itti_analyzer/common/queue.h|openair3/UTILS/tree.h|openair3/UTILS/queue.h|openair3/GTPV1-U/nw-gtpv1u|openair2/UTIL/OPT/ws_|openair2/UTIL/OPT/packet-rohc.h|openair3/NAS/COMMON/milenage.h" || true`
if [ $IS_OAI_LICENCE_PRESENT -eq 0 ] && [ $IS_BSD_LICENCE_PRESENT -eq 0 ]
then
if [ $IS_NFAPI -eq 0 ] && [ $IS_EXCEPTION -eq 0 ]
@@ -197,8 +197,8 @@ do
then
IS_NFAPI=`echo $FULLFILE | egrep -c "nfapi/open-nFAPI|nfapi/oai_integration/vendor_ext" || true`
IS_OAI_LICENCE_PRESENT=`egrep -c "OAI Public License" $FULLFILE || true`
IS_BSD_LICENCE_PRESENT=`egrep -c "the terms of the BSD Licence" $FULLFILE || true`
IS_EXCEPTION=`echo $FULLFILE | egrep -c "common/utils/collection/tree.h|common/utils/collection/queue.h|common/utils/itti_analyzer/common/queue.h|openair3/UTILS/tree.h|openair3/UTILS/queue.h|openair3/GTPV1-U/nw-gtpv1u|openair2/UTIL/OPT/ws_|openair3/NAS/COMMON/milenage.h" || true`
IS_BSD_LICENCE_PRESENT=`egrep -c "the terms of the BSD Licence|License-Identifier: BSD-2-Clause" $FULLFILE || true`
IS_EXCEPTION=`echo $FULLFILE | egrep -c "common/utils/collection/tree.h|common/utils/collection/queue.h|common/utils/itti_analyzer/common/queue.h|openair3/UTILS/tree.h|openair3/UTILS/queue.h|openair3/GTPV1-U/nw-gtpv1u|openair2/UTIL/OPT/ws_|openair2/UTIL/OPT/packet-rohc.h|openair3/NAS/COMMON/milenage.h" || true`
if [ $IS_OAI_LICENCE_PRESENT -eq 0 ] && [ $IS_BSD_LICENCE_PRESENT -eq 0 ]
then
if [ $IS_NFAPI -eq 0 ] && [ $IS_EXCEPTION -eq 0 ]

View File

@@ -0,0 +1,108 @@
#!/bin/bash
#/*
# * 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
# */
function usage {
echo "OAI GitLab merge request applying script"
echo " Original Author: Raphael Defosseux"
echo ""
echo "Usage:"
echo "------"
echo ""
echo " checkGitLabMergeRequestLabels.sh [OPTIONS]"
echo ""
echo "Options:"
echo "------------------"
echo ""
echo " --mr-id ####"
echo " Specify the ID of the merge request."
echo ""
echo " --help OR -h"
echo " Print this help message."
echo ""
}
if [ $# -ne 2 ] && [ $# -ne 1 ]
then
echo "Syntax Error: not the correct number of arguments"
echo ""
usage
exit 1
fi
while [[ $# -gt 0 ]]
do
key="$1"
case $key in
-h|--help)
shift
usage
exit 0
;;
--mr-id)
MERGE_REQUEST_ID="$2"
shift
shift
;;
*)
echo "Syntax Error: unknown option: $key"
echo ""
usage
exit 1
esac
done
LABELS=`curl --silent "https://gitlab.eurecom.fr/api/v4/projects/oai%2Fopenairinterface5g/merge_requests/$MERGE_REQUEST_ID" | jq '.labels' || true`
IS_MR_BUILD_ONLY=`echo $LABELS | grep -c BUILD-ONLY || true`
IS_MR_CI=`echo $LABELS | grep -c CI || true`
IS_MR_4G=`echo $LABELS | grep -c 4G-LTE || true`
IS_MR_5G=`echo $LABELS | grep -c 5G-NR || true`
# First case: none is present! No CI
if [ $IS_MR_BUILD_ONLY -eq 0 ] && [ $IS_MR_CI -eq 0 ] && [ $IS_MR_4G -eq 0 ] && [ $IS_MR_5G -eq 0 ]
then
echo "NONE"
exit 0
fi
# Second case: Build-Only
if [ $IS_MR_BUILD_ONLY -eq 1 ]
then
echo "BUILD-ONLY"
exit 0
fi
# Third case: CI or 4G label --> Full CI run
if [ $IS_MR_4G -eq 1 ] || [ $IS_MR_CI -eq 1 ]
then
echo "FULL"
exit 0
fi
# Fourth case: 5G label
if [ $IS_MR_BUILD_ONLY -eq 0 ] && [ $IS_MR_CI -eq 0 ] && [ $IS_MR_4G -eq 0 ] && [ $IS_MR_5G -eq 1 ]
then
echo "SHORTEN-5G"
exit 0
fi

86
ci-scripts/ci_ctl_qtel.py Normal file
View File

@@ -0,0 +1,86 @@
# * 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
# */
#---------------------------------------------------------------------
#
# Required Python Version
# Python 3.x
#
#---------------------------------------------------------------------
#usage example:
#sudo python3 ci_ctl_qtel.py /dev/ttyUSB2 wup
#sudo python3 ci_ctl_qtel.py /dev/ttyUSB2 detach
import sys
import time
import serial
class qtel_ctl:
#---------------
#private methods
#---------------
def __init__(self, usb_port_at):
self.QUECTEL_USB_PORT_AT = usb_port_at #ex : '/dev/ttyUSB2'
self.modem = serial.Serial(self.QUECTEL_USB_PORT_AT, timeout=1)
self.cmd_dict= {"wup": self.wup,"detach":self.detach}#dictionary of function pointers
def __set_modem_state(self,ser,state):
self.__send_command(ser,"AT+CFUN={}\r".format(state))
def __send_command(self,ser,com):
ser.write(com.encode())
time.sleep(0.1)
ret=[]
while ser.inWaiting()>0:
print("waiting")
msg=ser.readline()
msg=msg.decode("utf-8")
msg=msg.replace("\r","")
msg=msg.replace("\n","")
print(msg)
if msg!="":
ret.append(msg)
else:
print("msg empty")
return ret
#--------------
#public methods
#--------------
def wup(self):#sending AT+CFUN=0, then AT+CFUN=1
self.__set_modem_state(self.modem,'0')
time.sleep(3)
self.__set_modem_state(self.modem,'1')
def detach(self):#sending AT+CFUN=0
self.__set_modem_state(self.modem,'0')
if __name__ == "__main__":
#argv[1] : usb port
#argv[2] : qtel command (see function pointers dict "wup", "detach" etc ...)
command = sys.argv[2]
Module=qtel_ctl(sys.argv[1])
#calling the function to be applied
Module.cmd_dict[command]()

View File

@@ -0,0 +1,58 @@
idefix:
ID: idefix
State : enabled
Kind : quectel
Process :
Name : quectel-CM
Cmd : /home/oaicicd/quectel-CM/quectel-CM -4 -s
Apn :
ltebox : oai.ipv4
WakeupScript : ci_ctl_qtel.py /dev/ttyUSB2 wup
DetachScript : ci_ctl_qtel.py /dev/ttyUSB2 detach
LogStore : /media/usb-drive/ci_qlogs
PLMN : 22201
UENetwork : wwan0
HostIPAddress : 192.168.18.188
HostUsername : oaicicd
HostPassword : oaicicd
HostSourceCodePath : none
MTU : 1500
nrmodule2_quectel:
ID: nrmodule2_quectel
State : enabled
Kind : quectel
Process :
Name : quectel-CM
Cmd : /home/nrmodule2/quectel-CM/quectel-CM -4 -s
Apn :
OAICN5G : oai
OAI-Rel14-Docker : oai.ipv4
WakeupScript : ci_ctl_qtel.py /dev/ttyUSB7 wup
DetachScript : ci_ctl_qtel.py /dev/ttyUSB7 detach
LogStore : /media/ci_qlogs
PLMN : 20897
UENetwork : wwan1
HostIPAddress : 192.168.18.189
HostUsername : nrmodule2
HostPassword : linux
HostSourceCodePath : none
StartCommands :
- sudo -S ip link set dev wwan1 mtu 1500
MTU : 1500
dummy:
ID: ''
State : ''
Kind : ''
Process :
Name : ''
Cmd : ''
WakeupScript : ''
DetachScript : ''
PLMN : 22201
UENetwork : wwan0
HostIPAddress : 192.168.18.188
HostUsername : oaicicd
HostPassword : oaicicd
HostSourceCodePath : none

View File

@@ -0,0 +1,57 @@
# * 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
# */
#---------------------------------------------------------------------
#
# Required Python Version
# Python 3.x
#
#---------------------------------------------------------------------
#to use isfile
import os
import sys
import logging
#to create a SSH object locally in the methods
import sshconnection
#time.sleep
import time
#to load ue infrastructure dictionary
import yaml
class InfraUE:
def __init__(self):
self.ci_ue_infra ={}
#-----------------$
#PUBLIC Methods$
#-----------------$
#This method reads the yaml file describing the multi-UE infrastructure
#and stores the infra permanently in the related class attribute self.ci_ue_infra
def Get_UE_Infra(self,ue_infra_filename):
f_yaml=ue_infra_filename
with open(f_yaml,'r') as file:
logging.debug('Loading UE infrastructure from file '+f_yaml)
#load it permanently in the class attribute
self.ci_ue_infra = yaml.load(file,Loader=yaml.FullLoader)

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