Raymond Knopp
a446eb0ebc
Merge branch 'episys/master' into episys-merge
...
Conflicts:
common/utils/LOG/log.h
common/utils/ocp_itti/intertask_interface.cpp
nfapi/oai_integration/nfapi_vnf.c
nfapi/open-nFAPI/nfapi/src/nfapi.c
openair2/LAYER2/MAC/main_ue.c
openair2/LAYER2/PDCP_v10.1.0/pdcp.c
openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
openair2/PHY_INTERFACE/phy_stub_UE.c
openair2/RRC/LTE/rrc_UE.c
openair2/RRC/LTE/rrc_eNB.c
openair3/NAS/UE/ESM/esm_ebr_context.c
targets/COMMON/openairinterface5g_limits.h
targets/RT/USER/lte-softmodem.c
targets/RT/USER/lte-uesoftmodem.c
2021-02-13 22:52:33 +01:00
Sakthivel Velumani
0eb2e06725
Moved pusch thread parameter to L1 in config file
2021-01-29 13:14:14 +01:00
Melissa Elkadi
a288e502f0
Cleanup before merge
...
The clean up includes removing white space changes, adding logs,
adding comments to make various changes more obvious, etc.
2021-01-08 14:31:13 -08:00
Melissa Elkadi
08cfc0c9df
Select fair RR packet scheduler
...
Also fixed some build problems
2020-12-23 09:28:54 -08:00
hardy
4e0e95aa49
Merge remote-tracking branch 'origin/ci-deploy-docker-compose' into integration_2020_wk51
2020-12-14 13:33:05 +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
Raphael Defosseux
68e193c6cc
[DOCKER] finalize RRU templates
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2020-12-02 11:25:06 +01:00
Melissa
e3d34c8b01
Fixed multiple UE EPC integration by resetting user->ueid=0;. Lots of logs in this commit, will remove later
2020-12-01 13:39:05 -08: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
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
hardy
02594fea3b
Merge remote-tracking branch 'origin/feature/make-s1-mme-port-configurable' into integration_2020_wk47
2020-11-17 13:53:10 +01:00
Andrew Burger
cb4e5a35c4
Episys/andrew/dlsch pdu index bug fix
2020-11-13 14:11:35 -08:00
Andrew Burger
3960694b27
Revert "This commit includes:"
...
This reverts commit b1ff8e1a6a .
2020-11-12 15:50:49 -08:00
cig
7e1ac1fa49
Merge remote-tracking branch 'origin/develop' into fhg-fdd-custom-if
2020-11-10 10:41:10 +01:00
Frédéric Leroy
78fa6df3a4
feat: add "port" parameter on configuration files
...
Use default port 36412 for S1
2020-11-09 15:15:46 +01:00
Andrew Burger
b1ff8e1a6a
This commit includes:
...
1.) Shutdown fix which allows us to see who requested to abort the simulation
2.) Properly initializing the NAS layer which previously was not happening for our simulation mode 5
3.) Changes in configurations to support the EPC(Have Melissa Verify these)
2020-11-04 13:39:43 -08:00
Laurent
39bb839d7c
Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into noCore
2020-11-03 23:21:47 +01:00
Thomas Schlichter
5903467849
Merge remote-tracking branch 'develop' into nr_fdd_if_fix
...
Conflicts:
ci-scripts/conf_files/gnb.band78.tm1.106PRB.usrpn300.conf
openair2/LAYER2/NR_MAC_UE/config_ue.c
openair2/LAYER2/NR_MAC_gNB/config.c
2020-11-03 14:27:16 +01:00
Thomas Schlichter
41f4ed9eaf
synchronize gnb.band78.tm1.106PRB.usrpn300.conf file in ci-scripts and target directory
2020-10-28 09:53:38 +01:00
Thomas Schlichter
7428723c87
Synchronize gnb.band78.tm1.106PRB.usrpn300.conf files in ci-scripts and targets directory
2020-10-20 13:35:46 +02:00
Laurent
4f2d8ebfcd
merge develop, use Linux crypto library
2020-10-12 18:24:08 +02:00
Raphael Defosseux
5411461582
Merge remote-tracking branch 'origin/develop' into integration_2020_wk40
2020-10-07 10:53:36 +02:00
hardy
8f9ba5553d
Merge remote-tracking branch 'origin/nsa_remove_band_hardcodings' into integration_2020_wk40
2020-10-06 09:30:04 +02:00
Laurent
4772f7f6e4
for push to OSA git
2020-10-04 19:35:41 +02:00
Laurent
4dacef8bb7
merge develop and test
2020-10-04 19:22:33 +02:00
laurent
5cb8e9e14d
Reduce difference with OSA develop branch for merge
2020-10-02 11:26:46 +02:00
laurent
6b50cbcae2
continue 5G SA
2020-10-01 16:13:03 +02:00
hardy
70135e1c74
Merge remote-tracking branch 'origin/nsa_remove_band_hardcodings' into integration_2020_wk39
2020-09-30 14:36:24 +02:00
Shweta Shrivastava
911092f574
Fixed values of slot offset K2 in gNB config file
2020-09-24 23:48:46 -05:00
Remi Hardy
f66b79fffb
added nr_scg_ssb_freq param in enb conf file used by CI
2020-09-23 17:48:35 +02:00
Laurent
19c6229049
merge develop, compile ok
2020-09-22 16:24:49 +02:00
Cedric Roux
4236ff2b3e
nr: improve x2/rrc for ENDC
...
This commit introduces several enhancements in X2AP and RRC to deal
with ENDC. The main goal is to deal with UE's on/off and with various
errors.
The following work is included:
- DC prep and DC overall X2 timers
- X2 messages for UE release and DC timers' timeout
Open problems:
- what to do when the UE sends an scg Failure? This commit removes
the UE. And this removal may not be correctly done
- UE removal in the gNB's PHY layer (a next commit is coming,
but it is hackish and will need a rework)
2020-09-22 11:57:31 +02:00
Laurent
93550b1cb0
add test code, finished authentication
2020-09-21 15:11:02 +02:00
Raphael Defosseux
0e96ad6a57
CI: updating also ci conf file
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2020-09-03 16:51:54 +02:00
Florian Kaltenberger
a44a32af28
Merge remote-tracking branch 'origin/develop' into benetel_integration
2020-09-03 15:28:52 +02:00
Florian Kaltenberger
8ba3ba91ef
updating conf file for CI
2020-09-03 15:27:56 +02:00
Laurent
a3367e58ea
Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into main5G
2020-08-29 09:35:47 +02:00
Raphael Defosseux
34a2945abf
Merge remote-tracking branch 'origin/fembms-enb-ue' into develop_integration_2020_w34
2020-08-21 16:13:08 +02:00
laurent
5729f15363
merge develop
2020-08-12 11:43:33 +02:00
Raphael Defosseux
3ec2a46fd3
CI: fix clock management in FR1 conf files
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2020-07-31 14:40:52 +02:00
Raphael Defosseux
e55f2aea0c
CI: adding support for FR1 run of both eNB and gNB
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2020-07-30 16:21:51 +02:00
Javier Morgade
8e9a989aa5
fembms: FIX filename typo
...
Signed-off-by: Javier Morgade <javier.morgade@ieee.org >
2020-07-24 17:48:51 +02:00
Javier Morgade
6e54a81fa5
Merge branch 'fembms-enb-ue' of https://gitlab.eurecom.fr/oai/openairinterface5g into fembms-enb-ue
2020-07-24 09:46:52 +02:00
Javier Morgade
63ed400e28
fembms: CI/CD Adding FeMBMS RFSIM coverage test
...
Signed-off-by: Javier Morgade <javier.morgade@ieee.org >
2020-07-24 09:44:13 +02:00
Dr.-Ing. Javier Morgade
5a68767d6a
Update enb.band17.tm1.mbms.25PRB.usrpb210.conf
2020-07-22 16:57:51 +02:00
Javier Morgade
43dc75f92f
fembms: reference config files re-arranged
2020-07-20 10:39:12 +02:00
Michael Cook
5714440427
Cleanup
...
Revert unnecessary changes relative to origin/develop
Reviewed with Andrew
2020-07-19 13:42:35 -04:00
laurent
cf18c0d7e0
ocp-gnb regression fixed on rfsimulator
2020-07-17 15:12:20 +02:00
laurent
3772d7e56a
merge develop, other modifs, not working
2020-07-17 13:57:56 +02:00