Raphael Defosseux
9b143e9a69
CI: astyle to help merge
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2019-02-15 11:51:10 +01:00
Raphael Defosseux
ee3b650904
Compilation fix
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2019-02-15 10:40:06 +01:00
Raphael Defosseux
869e0271d3
Merge remote-tracking branch 'origin/master' into develop_integration_2019_w07_v2
2019-02-15 09:55:55 +01:00
Raphael Defosseux
21aec74478
Merge remote-tracking branch 'origin/rhel76-support' into develop_integration_2019_w07_v2
2019-02-15 09:55:40 +01:00
Raphael Defosseux
e4560d8ae4
Merge remote-tracking branch 'origin/issue397_telnet_stats' into develop_integration_2019_w07_v2
2019-02-15 09:55:17 +01:00
Raphael Defosseux
4cdae9d93d
Merge remote-tracking branch 'origin/x2' into develop_integration_2019_w07_v2
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2019-02-15 09:54:44 +01:00
Raphael Defosseux
03d404a6ef
Merge branch 'issue-399-master-ue-hot-fix' into 'master'
...
Hot fix on UE configuration module
See merge request oai/openairinterface5g!506
2019-02-14 13:14:39 +01:00
Louis Adrien Dufrene
0cc0485520
Merge branch 'ulsch_scheduler_opti' into 383-ulsch-scheduler-optimization
2019-02-14 10:32:30 +01:00
Raphael Defosseux
28a1fcde2e
Adding comment in release notes
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2019-02-14 10:10:59 +01:00
Raphael Defosseux
e85bd10307
CI: trying to improve reliability of L2 sim
...
-- checking if oip1 interface has an IP address before pinging
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
(cherry picked from commit a4dd3fdb07 )
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2019-02-13 16:47:27 +01:00
Boris Djalal
7c63d0d551
Proposal of Francois Taburet
...
Signed-off-by: Boris Djalal <boris.djalal@eurecom.fr >
2019-02-13 15:56:10 +01:00
Cedric Roux
e4443b1810
x2: fix compilation
2019-02-13 15:42:29 +01:00
Cedric Roux
1c6b9f0eda
Merge remote-tracking branch 'origin/develop' into x2
...
Conflicts:
openair2/LAYER2/MAC/config.c
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
openair2/RRC/LTE/MESSAGES/asn1_msg.c
openair2/RRC/LTE/rrc_defs.h
2019-02-13 15:20:45 +01:00
Raphael Defosseux
fcb16521f3
Hot fix on UE configuration module proposed by Xenofon Foukas
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2019-02-13 13:42:59 +01:00
Raphael Defosseux
4766a694c8
RHE7.6: UHD installation should be now correct
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2019-02-13 10:37:00 +01:00
Raphael Defosseux
d035be0dd3
Fix for all other OS versions
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2019-02-13 10:04:40 +01:00
Louis Adrien Dufrene
ce87a9dc09
Merge from develop
2019-02-13 08:41:13 +01:00
Raymond Knopp
b7cbb43130
minor change for UHD on RHEL7.6
2019-02-12 17:24:18 +01:00
Cedric Roux
5275479751
Merge remote-tracking branch 'origin/develop_integration_2019_w06' into develop
...
merge:
- enhancement-ltem
2019-02-11 14:07:37 +01:00
Cedric Roux
26e9fe8171
Merge remote-tracking branch 'origin/enhancement-ltem' into develop_integration_2019_w06
2019-02-11 09:44:17 +01:00
Raymond Knopp
b22f2d888a
minor changes in CMakelists.txt for building on RHEL7.6. Note, the optional packages in
...
/etc/yum.repos.d/redhat.repo by setting "enabled = 1" in [rhel-6-server-optional-rpms] section
2019-02-10 14:45:58 +01:00
Raymond Knopp
dd63e5239c
minor change for CI with L2 emulator (NFAPI)
2019-02-08 15:14:39 +01:00
Raymond Knopp
e704e7ccc0
Merge remote-tracking branch 'origin/develop' into enhancement-ltem
2019-02-07 23:58:17 +01:00
frtabu
5a51929781
Add cpu measurements access from telnet server
2019-02-07 18:59:48 +01:00
frtabu
bbf4cc310c
improve flexibility of measure implementation
2019-02-07 01:00:44 +01:00
frtabu
eb6e5ffe80
rewrite lte stats display, prepare cpu stats display
2019-02-06 19:30:38 +01:00
Cedric Roux
932f6017fa
fix after merge
2019-02-01 14:52:38 +01:00
Cedric Roux
be68e1e651
Merge remote-tracking branch 'origin/develop' into x2
...
Conflicts:
common/utils/msc/msc.h
openair2/X2AP/x2ap_eNB.c
2019-02-01 14:27:55 +01:00
Raphael Defosseux
f7a2965b96
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2019-01-31 14:35:23 +01:00
Raphael Defosseux
05f395b25b
Merge branch 'develop_integration_2019_w04' into 'develop'
...
See merge request oai/openairinterface5g!494
Integration Branch: 2019 week 04 -- master candidate
* MR 488: Issue 390 configmodule cmdlinebug
* MR 490: Issue391 remove L1L2 task
* MR 495: CentOS build fix
2019-01-31 14:21:12 +01:00
Raphael Defosseux
f7938a4b24
Fixing L2-simulator for TDD environment
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2019-01-29 09:55:21 +01:00
Raphael Defosseux
c81820b224
CI: removing the yml GitLab CI file (useless w/ our Jenkins pipelines)
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2019-01-28 10:22:21 +01:00
Raphael Defosseux
f591427e6e
Documentation update for master release
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2019-01-25 16:06:05 +01:00
Raphael Defosseux
1b2ea38845
Merge branch 'develop_integration_2019_w04' of gitlab.eurecom.fr:oai/openairinterface5g into develop_integration_2019_w04
2019-01-25 15:09:09 +01:00
Florian Kaltenberger
c1ed6685ea
update openair1/README.txt
2019-01-25 15:01:08 +01:00
Raphael Defosseux
1b14813a76
Merge remote-tracking branch 'origin/hotfix_centos_build' into develop_integration_2019_w04
2019-01-25 13:34:03 +01:00
Cedric Roux
8c388b7c46
documentation: describe UE's NAS
2019-01-25 10:53:32 +01:00
Raphael Defosseux
f031fda986
CI: hotfix on the CentOS build on OSA bench
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2019-01-25 10:07:50 +01:00
Raphael Defosseux
2d7c9734fd
Fixing a few warnings (flexran)
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2019-01-24 19:57:49 +01:00
Raphael Defosseux
bb4a1f9a75
Manual merge conflict resolution was incorrect.
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2019-01-24 16:58:14 +01:00
Konstantinos Alexandris
6f0267c4fa
x2: fix UE measurement report
2019-01-24 15:55:26 +01:00
Raphael Defosseux
64144a8442
Merge remote-tracking branch 'origin/issue391-removeunusedcode_L2L1task' into develop_integration_2019_w04
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2019-01-24 15:33:19 +01:00
Raphael Defosseux
298de921a3
Merge remote-tracking branch 'origin/issue390_configmodule_cmdlinebug' into develop_integration_2019_w04
2019-01-24 15:12:37 +01:00
Cedric Roux
8e3638147d
basic simulator: workaround: skip first simulation's frames
...
Due to some unknown bug in the eNB (or UE, or both), the first frames
are not correctly generated (or handled), which leads to a bad behavior
of the simulator in some cases (seen with 100 RBs: the UE reads a bad
MIB and switches to 25 RBs, which results in a deadlock in the
tcp_bridge_oai driver).
Let's "fix" this problem by skipping (in the driver) some frames at the
beginning of the simulation.
2019-01-24 12:29:49 +01:00
Raphael Defosseux
5e35d90974
CI: adding L2-NFAPI simulator test results to HTML report
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2019-01-23 16:53:52 +01:00
Louis Adrien Dufrene
2986325ad7
Merge branch 'ulsch_scheduler_opti' into 383-ulsch-scheduler-optimization: resolve conflicts from new develop
2019-01-23 14:02:07 +01:00
Louis Adrien Dufrene
aac0a56116
Merge from develop
2019-01-23 13:27:56 +01:00
Raphael Defosseux
869d58fd4b
Merge remote-tracking branch 'origin/patch-1' into x2
2019-01-23 10:27:57 +01:00
frtabu
5aeb00d33d
fix compilation Pb after rebase
2019-01-22 23:07:51 +01:00
frtabu
1d86c8a95a
fix compilation bugs after cppcheck fixes
2019-01-22 22:43:33 +01:00