maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,287 Commits 5 Branches 0 Tags
8cff73dc399a0982962a0e2e1e29d67cc28c7dc1
Commit Graph
14287 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
masayuki.harada 8cff73dc39 Fix merge error. 2020-10-28 03:19:41 +09:00
masayuki.harada 5c49c67f98 Merge remote-tracking branch 'remotes/origin/develop_SA_RRC' into develop_SA_L3 
# Conflicts:
#	openair2/RRC/NR_UE/rrc_UE.c
#	openair2/RRC/NR_UE/rrc_defs.h
 2020-10-27 20:47:03 +09:00
masayuki.harada 1956fd3b72 Merge commit 'b67badef1b2fd390d801e20644b08df0d5880583' into develop_SA_L3 
# Conflicts:
#	common/utils/ocp_itti/intertask_interface.h
#	openair2/RRC/NR/rrc_gNB.c
#	openair3/NGAP/ngap_gNB_nas_procedures.c
 2020-10-27 20:25:16 +09:00
masayuki.harada 4649f0f615 Merge remote-tracking branch 'remotes/origin/develop_SA_SIM' into develop_SA_L3 2020-10-27 19:47:49 +09:00
He Shanyun 5880c1f8c7 add nas message for registration request 2020-10-27 09:28:47 +00:00
Xue Song 356a4d83e9 fix nrUE build error 2020-10-27 07:41:53 +00:00
yaojie a5343618cf Added the judgment of the NGAP field in the configuration file 2020-10-27 07:40:09 +00:00
He Shanyun b67badef1b fix build error of phy simulator 2020-10-27 02:59:52 +00:00
Xue Song 41d3892c64 Merge branch 'develop_SA_NGAP' into develop_SA_RRC 2020-10-27 02:51:57 +00:00
Xue Song 62292f892e modify ngap_gNB_handle_nas_first_req 2020-10-27 01:56:41 +00:00
Wu.Jing 66bc0bac1e Merge branch 'master' into develop_SA_L3 2020-10-26 09:04:03 +00:00
Wu.Jing 08e775559b Merge branch 'develop_SA_SIM' into develop_SA_L3 2020-10-26 09:02:18 +00:00
Wu.Jing a9b76b5341 Merge branch 'develop_SA_RRC' into develop_SA_SIM 
Conflicts:
	openair2/RRC/NR/MESSAGES/asn1_msg.c
	openair2/RRC/NR/rrc_gNB.c
 2020-10-26 07:30:18 +00:00
Wu.Jing 92ba7dc249 Merge branch 'develop_SA_NGAP' into develop_SA_RRC 2020-10-26 06:20:02 +00:00
masayuki.harada 1ce1e8f82b Merge branch 'oai_develop' 
# Conflicts:
#	ci-scripts/Jenkinsfile-gitlab
 2020-10-26 15:03:58 +09:00
Remi Hardy 97ae4300f7 Merge branch 'integration_2020_wk42_2' into 'develop' 
Integration 2020 wk42 (2)

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

MR915 : Fix to avoid RRC->X2AP ticking every msec when x2ap task is not enabled  
The aim of itti RRC_SUBFRAME_PROCESS message (MAC->RRC) is to trigger an itti X2AP_SUBFRAME_PROCESS message (RRC->X2AP)  
This change avoids creating RRC_SUBFRAME_PROCESS message if x2ap task is not enabled
 2020-10-25 15:50:41 +01:00
Xue Song d5f95c6c79 fix some error 2020-10-23 08:00:21 +00:00
Xue Song ce85677762 modify some issues 2020-10-23 03:42:06 +00:00
hardy bebc0d98d7 Merge remote-tracking branch 'origin/UE_DL_DCI_hotfix' into integration_2020_wk42_2 2020-10-22 16:23:34 +02:00
hardy 0a8bc5cdb5 Merge remote-tracking branch 'origin/fix_rrc_x2_ticking' into integration_2020_wk42_2 2020-10-22 16:23:05 +02:00
matzakos e904cf3a00 Add comments for dummy function definitions in nr phy simulators 2020-10-22 16:16:10 +02:00
zhanghuiqin f3c922b1c1 fix RRCReject 2020-10-22 09:19:27 +00:00
He Shanyun 028be9e486 fix build error of phy simulator 2020-10-22 05:55:51 +00:00
Raphael Defosseux b70671777c Merge branch 'integration_2020_wk42' into 'develop' 
Develop Integration Branch: 2020 wk42

The following Merge Requests were included:

* MR 913 : Flexran Base Station Apps  
* MR 875 : Nr mac ssb ro global edge  
* MR 897 : python framework cleanup (CI)  
* MR 924 : C-RNTI as TC-RNTI  
* MR 911 : Cce indexing fix  
* MR 922 : fixes mac sched nfapi
 2020-10-21 13:39:04 +02:00
yaojie bfd2c35c35 fix warning/error 2020-10-21 07:30:20 +00:00
masayuki.harada 72cc6b16bf Merge branch 'develop_SA_L3' into 'master' 
develop_SA_L3_20201021

See merge request !2
 2020-10-21 14:25:37 +09:00
Xue Song 592642cb28 modify RRC messages 2020-10-21 02:46:40 +00:00
He Shanyun e15f0b2813 add struct for registration request message 2020-10-20 11:30:06 +00:00
zhanghuiqin fad30fff8a fix UECapabilityEnquiry & UECapabilityInformation 2020-10-20 08:41:41 +00:00
Raphael Defosseux 01c8e3e63f [OC]: point to proper namespace and branch 
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
 2020-10-19 17:24:26 +02:00
Raphael Defosseux 50fbb1f111 CI: increased time-outs on last few VM creations 
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
 2020-10-19 13:16:26 +02:00
Francesco Mani 914b8da916 fix after integration 2020-10-19 12:46:55 +02:00
matzakos 8e3ec3e5a8 Merge remote-tracking branch 'origin/develop' into fix_rrc_x2_ticking 2020-10-19 11:49:43 +02:00
Raphael Defosseux 1da61458ba DOC: adding docker readme skeleton 
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
 2020-10-19 11:32:32 +02:00
hardy ae6af7ed8c Merge remote-tracking branch 'origin/rh_ci_py' into integration_2020_wk42 
Conflicts:
	ci-scripts/reportTestLocally.sh

Kept new RA test disabled
 2020-10-19 11:24:12 +02:00
hardy 03e5b461a3 Merge remote-tracking branch 'origin/NR_MAC_SSB_RO_GlobalEdge' into integration_2020_wk42 
Solved Conflicts in:
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
	openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
 2020-10-19 11:18:30 +02:00
hardy 8eb9d0b4a6 Merge remote-tracking branch 'origin/fixes-mac-sched-nfapi' into integration_2020_wk42 2020-10-19 10:52:37 +02:00
hardy 4d14cc63b9 Merge remote-tracking branch 'origin/cce_indexing_fix' into integration_2020_wk42 2020-10-19 10:51:46 +02:00
hardy d94fc12887 Merge remote-tracking branch 'origin/NR_RA_updates' into integration_2020_wk42 2020-10-19 10:50:56 +02:00
hardy 639d957e30 Merge remote-tracking branch 'origin/flexran-apps' into integration_2020_wk42 2020-10-19 10:49:44 +02:00
zhanghuiqin 49487217bf add UECapabitlityEnquiry(ue) 2020-10-19 08:22:15 +00:00
Xue Song 4766f3a629 fix RRCReconfiguration/RRCReconfigurationComplete 2020-10-19 07:58:10 +00:00
Qiu DeZhi 4421bc5665 modify rrcRelease 2020-10-19 06:55:53 +00:00
Qiu DeZhi 1605266440 Add RRCrelease 2020-10-19 04:59:29 +00:00
Raphael Defosseux 13cf8284fd Merge branch 'integration_2020_wk41' into 'develop' 
develop integration branch : 2020 week 41

* MR909 small-bugfixes-wk40 (Cedric Roux)
* MR919 docker and openshift initial support
 2020-10-18 21:21:59 +02:00
Raphael Defosseux 591184c4ba CI: proper disabling of 5g RF sim RA-TEST 
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
 2020-10-17 22:07:03 +02:00
Raphael Defosseux 3f2da854ef CI: increase time-out for RF Sim tests 
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
 2020-10-17 21:18:00 +02:00
Florian Kaltenberger 63ddc9ac10 fixing a cppcheck warning 2020-10-16 14:21:44 +02:00
hardy 930c147b18 removing useless debug comments 2020-10-16 14:13:31 +02:00
hardy 118575d7d2 aligning ci-scripts/runTestOnVM.sh with integration_2020_wk41 2020-10-16 14:11:06 +02:00