Xue Song
9bba3c795a
Fix GTPU's IP setting error
2020-11-09 18:04:56 +09:00
matzakos
87c83aaf21
Merge remote-tracking branch 'origin/develop' into NR_SA_NGAP_RRC_wk42
...
Conflicts:
cmake_targets/CMakeLists.txt
docker/Dockerfile.enb.rhel7.oc4-4
openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
2020-10-29 00:19:49 +01:00
masayuki.harada
483f4b2d1b
Fix merge miss.
2020-10-28 04:21:41 +09:00
masayuki.harada
dc288b7bc8
Merge branch 'develop_SA_L3' into NR_SA_NGAP_RRC_wk42
...
# Conflicts:
# openair2/GNB_APP/gnb_paramdef.h
# openair2/RRC/NR/rrc_gNB.c
2020-10-28 03:57:14 +09:00
masayuki.harada
8cff73dc39
Fix merge error.
2020-10-28 03:19:41 +09:00
Remi Hardy
68619cae68
Merge branch 'integration_2020_wk44' into 'develop'
...
Integration 2020 wk44
MR923 : Fixes tun
TUN-interface related changes
MR925 : bugfix: fix frequencies in nr_bandtable
The array nr_bandtable has then been reviewed fully and all the values that were wrong have been changed. The check of correctness was done using the website https://www.sqimway.com/nr_band.php
MR931 : Finalize oaicn integration (CI)
In addition, the "known unstable scenarios" are highlighted in the CI HTML reports.
MR917 : NR CSI reporting
This is a new feature
2020-10-27 18:35:34 +01: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
hardy
779362dcb7
Merge remote-tracking branch 'origin/NR_CSI_reporting' into integration_2020_wk44
2020-10-26 17:30:17 +01:00
hardy
b0797c0899
Merge remote-tracking branch 'origin/finalize-oaicn-integration' into integration_2020_wk44
2020-10-26 17:29:28 +01:00
hardy
97d284bea3
Merge remote-tracking branch 'origin/bugfix-nr-bands' into integration_2020_wk44
2020-10-26 17:28:58 +01:00
hardy
89d7353ddf
Merge remote-tracking branch 'origin/fixes-tun' into integration_2020_wk44
2020-10-26 17:28:11 +01: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
Raphael Defosseux
41d059794c
Merge remote-tracking branch 'origin/oc-docker-october-improvements' into finalize-oaicn-integration
2020-10-26 09:49:44 +01:00
Raphael Defosseux
457734988c
CI: lock mechanism around the VM usage
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2020-10-26 09:49:33 +01:00
Raphael Defosseux
61989549e1
CI: better handling of the case when no UE is connected to ADB server
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2020-10-26 09:49:33 +01:00
Raphael Defosseux
0a4cfc2173
CI: scenarios that are known as unstable won't be seen as failures
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2020-10-26 09:49:33 +01:00
Raphael Defosseux
fb957484af
CI: intermediate commit
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2020-10-26 09:49:33 +01:00
Francesco Mani
1a1ee59d39
Merge remote-tracking branch 'origin/develop' into NR_CSI_reporting
2020-10-26 09:27:52 +01:00
Francesco Mani
c41566ac6a
fix compilation error
2020-10-26 09:27:40 +01: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
Hongzhi WANG
0109c7b1fb
remove ue warnings
2020-10-23 18:09:13 +02:00
Raphael Defosseux
d240e85c21
docker: removing obsolete file
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2020-10-23 17:08:29 +02:00
Francesco Mani
5de83e0bb8
fixing a couple of warnings
2020-10-23 16:49:58 +02: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
Raphael Defosseux
4899c55101
[docker] adding some tools and missing USIM generation config file
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2020-10-22 17:05:08 +02:00
Raphael Defosseux
0519e31575
[docker] add CMD w/ 'sleep infinity' for remaining target images
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2020-10-22 16:56:04 +02: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
masayuki.harada
a21ba6c7dc
Merge remote-tracking branch 'remotes/origin/develop_SA_L3' into NR_SA_NGAP_RRC_wk42
2020-10-22 19:59:13 +09:00
zhanghuiqin
f3c922b1c1
fix RRCReject
2020-10-22 09:19:27 +00:00
Francesco Mani
76abeaf30e
Merge remote-tracking branch 'origin/develop' into NR_CSI_reporting
2020-10-22 09:26:51 +02:00
He Shanyun
028be9e486
fix build error of phy simulator
2020-10-22 05:55:51 +00:00
Mohammed Ismail
7cc5765848
docker file updates on gnb and lteue
...
Signed-off-by: Mohammed Ismail <mohammed.ismail@eurecom.fr >
2020-10-21 16:35:34 +02:00
Raphael Defosseux
0e1a56c766
DOC: 1st draft for OC build / deployment
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2020-10-21 15:59:27 +02:00
Raphael Defosseux
1bed270326
DOC: adding table of content
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2020-10-21 15:14:00 +02:00
Raphael Defosseux
81785c1d91
DOC: initial draft for docker/openshift
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2020-10-21 15:14:00 +02:00