maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,255 Commits 5 Branches 0 Tags
1ce1e8f82b2c61b8641b50b5fa40ce2a874abd0b
Commit Graph
14255 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
matzakos dc63cab2b0 Merge remote-tracking branch 'origin/develop' into fix_rrc_x2_ticking 2020-10-16 11:35:54 +02:00
Florian Kaltenberger 0d555854e9 Merge branch 'NR_MAC_SSB_RO_GlobalEdge' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_MAC_SSB_RO_GlobalEdge 2020-10-15 11:27:10 +02:00
Remi Hardy 4f2f1cc744 Update TESTING_GNB_W_COTS_UE.md 2020-10-15 11:16:00 +02:00
Wu.Jing 0312db24b4 comment nnsf that it hasnot be test 2020-10-15 08:57:28 +00:00
Wu.Jing b2722225ab Merge branch 'master' into develop_SA_L3 2020-10-15 08:26:42 +00:00
Francesco Mani 62dbda5c83 Merge remote-tracking branch 'origin/develop' into NR_RA_updates 2020-10-15 10:18:16 +02:00
Raphael Defosseux c69a30fe5d CI: disabling RA test check for the moment. 5G RF SIM normal phy-test should be passing now 
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
 2020-10-15 10:14:56 +02:00
kn.raju 2cad2b936e modified mapping of SSB index to UE_id 2020-10-15 13:00:04 +05:30
Francesco Mani 5f1fe21c7c Revert "Fix to avoid RRC->X2AP ticking every msec when x2ap task is not enabled" 
This reverts commit 1a5874d40f.
 2020-10-15 08:54:31 +02:00
masayuki.harada fa8e7d9f71 Merge remote-tracking branch 'remotes/origin/develop_SA_SIM' into develop_SA_L3 2020-10-15 15:43:46 +09:00
masayuki.harada d626d4b27f Merge remote-tracking branch 'remotes/origin/develop_SA_RRC' into develop_SA_L3 2020-10-15 15:42:34 +09:00
masayuki.harada bdc83aaac6 Merge remote-tracking branch 'remotes/origin/develop_SA_NGAP' into develop_SA_L3 
# Conflicts:
#	openair2/GNB_APP/gnb_paramdef.h
#	openair3/NGAP/ngap_gNB_nas_procedures.c
 2020-10-15 15:39:46 +09:00
masayuki.harada af35e37c74 Merge branch 'oai_develop' 
# Conflicts:
#	openair2/RRC/NR/rrc_gNB.c
 2020-10-15 15:25:04 +09:00
yaojie 1fd1853ce7 add nr_decode_SI/SIB2/SIB3 2020-10-15 05:46:32 +00:00
yaojie f00e5deb14 fix about nnfs,make it TODO 2020-10-14 08:34:41 +00:00
Qiu DeZhi b4fad9c589 Merge branch 'develop_SA_SIM' of http://10.37.143.24:8000/gitlab/vran/OAI-5GNR into develop_SA_SIM 2020-10-14 08:02:27 +00:00
yaojie e981df3cd8 add nr_decode_SIB1 2020-10-14 05:27:38 +00:00
He Shanyun e6ddb5379c add process for itti simulator 2020-10-14 03:22:55 +00:00
Florian Kaltenberger 18ae5acc98 Merge remote-tracking branch 'origin/develop' into NR_MAC_SSB_RO_GlobalEdge 2020-10-13 21:47:21 +02:00
Xue Song 878b483746 Merge branch 'develop_SA_RRC' into develop_SA_SIM 2020-10-13 11:37:45 +00:00
Xue Song 9812545c61 modify rrc_gNB_generate_RRCSetup 2020-10-13 11:36:52 +00:00
Xue Song 38516da2dc Merge branch 'develop_SA_RRC' into develop_SA_SIM 2020-10-13 10:48:46 +00:00
Xue Song 0f378cf3da modify RRCSetup 2020-10-13 10:48:01 +00:00
Sakthivel Velumani 2581428808 changing k2 to 6 to support oai-ue 
this shouldn't affect the testing with cots ue
 2020-10-13 11:49:21 +02:00
Xue Song db410e41a6 Merge branch 'develop_SA_RRC' into develop_SA_SIM 2020-10-13 09:31:16 +00:00
Xue Song 8c421698c4 modify do_RRCSetup 2020-10-13 09:07:19 +00:00