Compare commits

..

3876 Commits

Author SHA1 Message Date
Raphael Defosseux
4eaadf8d82 CI: fixing slave pipelines
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-01-26 13:41:36 +01:00
Raphael Defosseux
893e19fa16 Merge branch 'develop_integration_2020_w04' into 'develop'
Develop integration 2020 week 04

See merge request oai/openairinterface5g!763

The following MRs have been included:

* MR [726] : Flexran improvements
* MR [756] : remove uhd_set_thread_priority function
* MR [757] : HOTFIX: After develop/develop-nr merge UE was crashing with MBMS U-Plane traffic running
* MR [758] : Improve build after nr lte merge
* MR [759] : Doc update after 5g lte merge and latest build procedure modifications
* MR [761] : fixes for mutex lock for wake up signal
* MR [761] : CI: count ULSCH received ok messages
2020-01-26 00:20:19 +01:00
Raphael Defosseux
44cfdab5b7 CI: fix the missing 5G-NR UE build report
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-01-24 17:53:18 +01:00
Raphael Defosseux
9078a01e35 CI: adding FDD-10MHz to RFSIM
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-01-24 16:03:42 +01:00
Raphael Defosseux
fd865ea06d CI: doing the check only in NR
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-01-24 12:05:58 +01:00
Raphael Defosseux
9ca17fd3e7 Merge remote-tracking branch 'origin/ci-scripts-cleanup' into develop_integration_2020_w04 2020-01-24 12:02:59 +01:00
Raphael Defosseux
8c6ac1092e Merge remote-tracking branch 'origin/ci_check_ulsch' into develop_integration_2020_w04 2020-01-24 12:02:45 +01:00
Raphael Defosseux
7a6b857953 Merge remote-tracking branch 'origin/mutex_fix' into develop_integration_2020_w04 2020-01-24 12:02:31 +01:00
Raphael Defosseux
01470da96b Merge remote-tracking branch 'origin/doc_update_5GLTE' into develop_integration_2020_w04 2020-01-24 12:01:05 +01:00
Raphael Defosseux
5c80ef080c Merge remote-tracking branch 'origin/improve_build_nr_lte_merge' into develop_integration_2020_w04 2020-01-24 12:00:49 +01:00
Raphael Defosseux
7d26df6ecf Merge remote-tracking branch 'origin/mbms-fix-develop-nr' into develop_integration_2020_w04 2020-01-24 12:00:31 +01:00
Raphael Defosseux
0b75b75132 Merge remote-tracking branch 'origin/uhd_priority_set_cleanup' into develop_integration_2020_w04 2020-01-24 12:00:16 +01:00
Thomas Schlichter
d3b19823f0 CI: count ULSCH received ok messages 2020-01-23 15:54:19 +01:00
WANG Tsu-Han
b7a027f905 fixes for mutex lock for wake up signal 2020-01-23 14:52:30 +01:00
Raphael Defosseux
4a2abc03b5 CI: splitting build xml files into build and epc-start XML files
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-01-23 11:05:08 +01:00
Raphael Defosseux
9b920255b3 DOC: added kernel headers install guidelines for CentOS / RHEL
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-01-22 22:53:34 +01:00
Raphael Defosseux
009c75d60b CI: removed obsolete python obsolete options
split the RRC inactivity scenarios

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-01-22 22:43:38 +01:00
Raphael Defosseux
b723418c33 CI: fix RF simulator hyperlinks in HTML report
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-01-22 21:36:58 +01:00
Javier Morgade
fb57ef2fd4 patch from Robert Schmidt <robert.schmidt@eurecom.fr>
-BUGFIX: CD/DU F1 split
2020-01-22 20:18:51 +01:00
Raphael Defosseux
b85731f4a9 CI: Add LTE RF Simulator test (normal and with MBMS)
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-01-22 17:59:21 +01:00
frtabu
22e45b8adf update doc/BUILD.md and doc/RUNMODEM.md to reflect develop/develop-nr merge and latest merge requests affecting the build procedure 2020-01-21 18:01:50 +01:00
frtabu
6cdac7e12f fix config lib and config sources usage in CmakeList.txt 2020-01-20 19:45:21 +01:00
frtabu
61f6af80ad build improvements: allow build mode selection (-g -G options) allow all exec build in one pass, remove remaining USE_MME macros in nr code 2020-01-20 19:06:15 +01:00
Robert Schmidt
dabe2ae7ab FlexRAN: remove unused import in protocol def 2020-01-20 14:05:05 +01:00
Robert Schmidt
1c8c839f65 FlexRAN: Reformat code for X2 HO NetControl activation 2020-01-20 14:05:05 +01:00
Robert Schmidt
e33be3ccd3 FlexRAN: Re-enable the soft-restart, it works 2020-01-20 14:05:05 +01:00
Robert Schmidt
c6e389ed4c FlexRAN: assert if out of memory 2020-01-20 14:05:05 +01:00
Robert Schmidt
a87220d376 Add S1AP control module for FlexRAN with status monitoring support 2020-01-20 14:05:05 +01:00
Robert Schmidt
44fdb23f15 FlexRAN: fix RRC protobuf definition 2020-01-20 11:35:35 +01:00
Robert Schmidt
6a581d903b Add FlexRAN protobuf definition for S1AP 2020-01-20 11:35:35 +01:00
Robert Schmidt
d2b1e6aa9a FlexRAN: report employed splits to controller 2020-01-20 11:35:35 +01:00
Robert Schmidt
a8b4a62b82 Read RU config before FlexRAN to allow split identification 2020-01-20 11:35:35 +01:00
Robert Schmidt
f87c1cbb92 FlexRAN refactor+format MAC stats function 2020-01-20 11:35:35 +01:00
Robert Schmidt
b6d466d772 FlexRAN: reimplement timers without ITTI
The timer code used to trigger periodic statistics message sending used
ITTI. Together with a high frequency reporting (e.g. 1ms), this resulted
in high CPU usage. This commit reimplements this:
* using a thread that is synchronized to the RU (if there is no MAC, we
  assume there is no RU generating a tick so we create the tick source
  ourselves)
* no RB trees but plain arrays
* smaller interface for users
* slight user interface changes
* remove stopped timer state: such timer might be simply removed
* remove one-shot timers
2020-01-20 11:35:35 +01:00
Robert Schmidt
233affc9dd FlexRAN: include header, not C file 2020-01-20 11:34:54 +01:00
Robert Schmidt
5c4aa309eb FlexRAN: helper function to get No. UEs 2020-01-20 11:34:54 +01:00
Robert Schmidt
7415d08138 FlexRAN: Simplify stats request handling
* only set up timer for sending requests
* simplify interface for timer setup
* on timer expiry, do not pass through stats request function but
  directly send the reply
* Remove whatever report structure and use stats request directly for
  inferring the data to send
2020-01-20 11:34:54 +01:00
Robert Schmidt
a21c1b1f73 Remove unused sleep function() 2020-01-20 11:33:32 +01:00
Javier Morgade
dff766ae15 *HOTFIX: After develop/develop-nr merge UE was crashing with MBMS U-Plane traffic running
-New MAC SDU integrity check in ue_procedures .c introduced for MCH channels.
	-This SDU behavior didn’t show up with former develop
	-TOCHECK whether NFAPI was properly merged on the eNB side.
	-eNB_scheduler_mch has been slightly rearranged.

	*BUGFIX:
	-In dlsch_demodulation.c  “ rxF_comp_d.m” was continuously being written to disk

	*New reference config file added (lte-fdd-mbms-basic-sim.conf) for rfsim environment
2020-01-20 10:34:41 +01:00
Raphael Defosseux
979fa3a659 DOC: added hyper links to new sections
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-01-17 21:42:14 +01:00
Dr.-Ing. Javier Morgade
954c9d4173 Update FEATURE_SET.md with MBMS features 2020-01-17 21:41:08 +01:00
Dr.-Ing. Javier Morgade
0ec5db48d3 Update README.txt with MBMS features 2020-01-17 21:41:00 +01:00
Raphael Defosseux
c383b5e696 CI: prepare release notes for release 1.2.0
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-01-17 21:40:49 +01:00
Raphael Defosseux
f2d90e79e3 CI: fix the git clone extension when creating the UE workspace
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-01-17 21:39:34 +01:00
Raphael Defosseux
0e3401829f Merge branch 'integration-develop-nr-2020w03' into 'develop-nr'
Integration develop-nr 2020 week 03

See merge request oai/openairinterface5g!755

This integration branch includes the following MRs:

- MR 745 : Add support for different PUSCH DMRS modes
- MR 748 : Nr dlsch multi threading
- MR 752 : Merging develop tag 2019.w51 to develop-nr
- MR 753 : RedHat Entreprise 7.7 build support

IMPORTANT: This should be the last integration branch to develop-nr as the result of this MR will become develop
2020-01-17 21:37:28 +01:00
Dr.-Ing. Javier Morgade
a25c06edf7 BUGFIX feptx0
- New slot numbering approach was missing for PMCH case
2020-01-16 23:15:13 +01:00
Raphael Defosseux
b3dbce6db6 Merge remote-tracking branch 'origin/nr-dlsch-multi-thread' into integration-develop-nr-2020w03 2020-01-16 12:47:49 +01:00
Raphael Defosseux
d3478a9f9f Merge remote-tracking branch 'origin/472-add-pusch-dmrs-modes' into integration-develop-nr-2020w03 2020-01-16 12:47:23 +01:00
Raphael Defosseux
c82fd2e444 CI: fixing the check after UE mounted tunnel interfaces
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-01-16 12:34:30 +01:00
WANG Tsu-Han
92c100bb5a remove uhd_set_thread_priority function 2020-01-16 11:30:27 +01:00
Raphael Defosseux
7be64625cc CI: fix false negative report on 5G-NR RF simulator check
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-01-16 09:58:34 +01:00
Raymond Knopp
90731a683a minor modifications for rhel7.7 build 2020-01-15 17:21:47 +01:00
Raphael Defosseux
f4f0fae00a Removing all spare4 references
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-01-15 17:18:15 +01:00
Cedric Roux
4256251f24 fix rrc asn file
spare4 is not there in rrc 15.6. It leads to bad encoding.
2020-01-15 16:14:24 +01:00
Raphael Defosseux
2a92d27bad refix gNB build and eNB seg fault issue
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-01-15 15:59:10 +01:00
Raphael Defosseux
7292fb2505 NR-UE: fix temporarly the build. Quite dirty.
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-01-15 12:56:52 +01:00
Raphael Defosseux
ffd80e2caf Fixing easy cppcheck errors
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-01-14 10:44:48 +01:00
Raphael Defosseux
2dfad4c065 Fix compilation issues for:
- physical simulators
 - LTE eNB
 - LTE UE
 - 5G-NR gNB

Still NR-UE does not build and eNB segs fault at start of program

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-01-13 16:46:21 +01:00
Raphael Defosseux
7aa35e874b Removing obsolete LTE_RRC_VERSION
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-01-10 15:38:13 +01:00
Raphael Defosseux
e7aa071e1b Merge remote-tracking branch 'origin/develop' into merging-2019-w51-to-develop-nr 2020-01-10 15:35:54 +01:00
Raphael Defosseux
6c3d5cf02d Making the basic-sim on UE side able to synch!
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-01-10 13:27:02 +01:00
Raphael Defosseux
7de6a7f252 Merge remote-tracking branch 'origin/develop-nr' into 472-add-pusch-dmrs-modes 2020-01-09 17:22:40 +01:00
Raphael Defosseux
6835ac82d8 RFSIMULATOR: final integration of Laurent Thomas's review feedback
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-01-09 14:32:33 +01:00
Raphael Defosseux
c409da3bb8 Patch provided by Gabriel Arrobo.
Mainly comestics and integer type management

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-01-09 14:10:04 +01:00
Raphael Defosseux
78017412f0 Merge branch 'integration-develop-nr-2020w02' into 'develop-nr'
Integration develop-nr 2020 week 02

See merge request oai/openairinterface5g!751

This integration branch contains the following MRs

* MR [706] : Merging develop tag `2019.w44` into develop-nr
* MR [746] : some cppcheck fixes and also compilation warnings removal
* MR [750] : hotfix: fix value of MAX_MOBILES_PER_ENB

Also contains an hotfix for the UHD thread priority
2020-01-09 13:49:52 +01:00
Raphael Defosseux
2cd6a40b9e CI: list of Gitlab notifications split into several lines to ease maintenance
DOC: CI documentation updated for 5G-NR

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-01-08 16:58:46 +01:00
Raphael Defosseux
e156e232fc HOTFIX: missing UHD set_thread_priority_safe call (based on Cedric's feedback)
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-01-08 16:57:46 +01:00
Raphael Defosseux
90e54318b5 RFSIMULATOR: fixes based on Laurent Thomas's feedback
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-01-08 16:57:17 +01:00
Raphael Defosseux
58f62a41bc Merge remote-tracking branch 'origin/nr_fix_easycppcheck' into integration-develop-nr-2020w02 2020-01-08 15:17:38 +01:00
Raphael Defosseux
cfc73e9823 Merge remote-tracking branch 'origin/nr-hotfix-for-lte-enb' into integration-develop-nr-2020w02 2020-01-08 15:17:27 +01:00
Raphael Defosseux
65adfb3919 Merge remote-tracking branch 'origin/develop-nr_cppcheck' into integration-develop-nr-2020w02 2020-01-08 15:17:16 +01:00
Raphael Defosseux
b8f58c5f92 CI: pipeline workaround for GitLab 'cancelled' status notification when failure
See https://github.com/jenkinsci/pipeline-build-step-plugin/blob/master/CHANGELOG.md#210 for more details

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-01-08 13:09:56 +01:00
Raphael Defosseux
c256932fe5 CI: pipeline workaround for GitLab 'cancelled' status notification when failure
See https://github.com/jenkinsci/pipeline-build-step-plugin/blob/master/CHANGELOG.md#210 for more details

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-01-08 11:47:42 +01:00
Cedric Roux
477631bd23 hotfix: fix value of MAX_MOBILES_PER_ENB
set MAX_MOBILES_PER_ENB to 4, to be same value as NUMBER_OF_UE_MAX.
Maybe we should set NUMBER_OF_UE_MAX to 16 instead?
2020-01-06 16:12:22 +01:00
Cedric Roux
e0f509841c hotfix: fix value of MAX_MOBILES_PER_ENB
set MAX_MOBILES_PER_ENB to 4, to be same value as NUMBER_OF_UE_MAX.
Maybe we should set NUMBER_OF_UE_MAX to 16 instead?
2020-01-06 12:45:37 +01:00
yilmazt
4978102e2f develop-nr merge 2019-12-23 15:20:00 +01:00
Raphael Defosseux
2161ff6cfa Merge branch 'develop_integration_2019_w51' into 'develop'
Develop integration branch: 2019 week 51

The following MRs have been merged:

* MR 687 : CDRX optimizations for Monolithic
* MR 739 : eMBMS-Vicomtech Fed4fire fec6 cdn x all
2019-12-23 13:38:59 +01:00
frtabu
aaaa6d5c51 more cppcheck fixes 2019-12-20 16:44:25 +01:00
Thomas Schlichter
a99612a536 make nb_re_dmrs a parameter of nr_ulsch_decoding() 2019-12-20 12:40:26 +01:00
Hongzhi Wang
896463a9a8 update dlsch thread 2019-12-20 10:56:24 +01:00
Hongzhi Wang
71369b5c60 adding vcd 2019-12-20 10:55:12 +01:00
Hongzhi Wang
f4772f2ba2 bug fix dlsch thread 2019-12-20 10:48:26 +01:00
Hongzhi Wang
82aebfa627 add thread pool for dlsch 2019-12-20 10:47:52 +01:00
Florian Kaltenberger
bc864d13c4 Merge branch 'integration-develop-nr-2019w51' into 'develop-nr'
Integration develop nr 2019w51

See merge request oai/openairinterface5g!744
2019-12-19 16:12:36 +01:00
Thomas Schlichter
4da175f514 [nr_ulsim] don't break out of SNR loop just because number_of_frames==1 2019-12-19 10:06:15 +01:00
Florian Kaltenberger
1bde69c032 Merge remote-tracking branch 'origin/fix-clock-source' into integration-develop-nr-2019w51 2019-12-19 09:50:16 +01:00
Florian Kaltenberger
4143cb16f9 Merge remote-tracking branch 'origin/ru-parallel-beamforming-fix' into integration-develop-nr-2019w51 2019-12-19 09:45:46 +01:00
Florian Kaltenberger
84f01c5e88 Merge remote-tracking branch 'origin/develop-nr-ci-rf-sim' into integration-develop-nr-2019w51 2019-12-19 09:45:27 +01:00
Florian Kaltenberger
177e3d4207 Merge remote-tracking branch 'origin/recordplay_cfgoption' into integration-develop-nr-2019w51 2019-12-19 09:45:00 +01:00
Raymond Knopp
5490d3e75d some cppcheck fixes and also compilation warnings removal 2019-12-19 09:43:45 +01:00
Francesco Mani
1e4cbce244 multiple ssb fix 2019-12-18 16:13:42 +01:00
Khalid Ahmed
4fe691f443 Fixing nr_ulsim configuration for DMRS 2019-12-18 11:12:04 +01:00
Khalid Ahmed
8e00f8df08 Fixing a bug in number of UL DMRS symbol computation 2019-12-18 11:12:04 +01:00
Khalid Ahmed
2dd941a22d Adding one UL empty slot before actual UL slot
- total num of symbols is 12 instead of 14 in PUSCH
- actual UL slot is 3 instead of 2
2019-12-18 11:11:50 +01:00
Thomas Schlichter
f7d546f2d9 port DL fix 4297beffa0 to UL 2019-12-18 11:11:49 +01:00
Thomas Schlichter
6ee0840562 make time to transmit UL slot less hard-coded
Replace "slot == 18" by "slot == (20 + NR_UPLINK_SLOT - DURATION_RX_TO_TX) % 20".
At least this is correct for 30 kHz SCS...
2019-12-18 11:11:49 +01:00
Khalid Ahmed
c9eea33fdb Fix samples per frame config for 3/4 sampling rate 2019-12-18 11:11:49 +01:00
Khalid Ahmed
c62443b235 fixing bugs intoduced after fapi implementation 2019-12-18 11:11:24 +01:00
Khalid Ahmed
23ade3ada6 PUSCH Rx channel estimation supporting DMRS type 2
- nr_ulsim supports multiple DMRS configurations
2019-12-18 11:05:37 +01:00
Khalid Ahmed
935c2ce7ce Adding table 6.4.1.1.3-4 for double DMRS symbol 2019-12-18 11:02:56 +01:00
Khalid Ahmed
ccc515c537 PUSCH Rx channel estimation supporting DMRS type 1 and mapping type B 2019-12-18 11:02:55 +01:00
Khalid Ahmed
bf24772766 PUSCH DMRS generation
- added get_l_prime function
- added Table 6.4.1.1.3-3
- added added is_dmrs_symbol function
2019-12-18 11:02:55 +01:00
Khalid Ahmed
e75a96c934 start_symbol has to be 0 as PUSCH mapping type A is used 2019-12-18 11:02:55 +01:00
Dr.-Ing. Javier Morgade
3e7ac8256e Just triggering CI to check HO scenario 2019-12-17 22:15:11 +01:00
yilmazt
1b1648d504 develop-nr up-to-date 2019-12-17 18:23:10 +01:00
Raphael Defosseux
00fb1e95ac CI: forcing the workspace removal on caracal
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-12-17 17:54:25 +01:00
yilmazt
b7820f5442 develop up-to-date as of 17.12.19 2019-12-17 17:30:26 +01:00
Florian Kaltenberger
c25c720fa5 hotfix for harq_pid 2019-12-17 17:29:17 +01:00
WANG Tsu-Han
3f066dec56 parameter fix 2019-12-17 17:06:17 +01:00
Raphael Defosseux
67c7f97350 Merge remote-tracking branch 'origin/452-cdrx-better-support-cu-du-split' into develop_integration_2019_w51 2019-12-17 11:39:50 +01:00
Raphael Defosseux
e47b212ab6 CI: adding RF simulator skeleton on 5G NR gNB and UE
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-12-17 10:33:59 +01:00
Wang Tsu-Han
ad28a3fe43 using the old mechanism if having L1 and gNB on the same machine 2019-12-17 10:10:18 +01:00
frtabu
69a7658c54 USRP device cleanup including record player as config option + some cppcheck warning/errors fixes 2019-12-16 17:53:22 +01:00
Javier Morgade
7d86b936ce Added NFAPI MCH scheduling support
M3AP ASN1 source spec updated

	ACKNOWLEDGEMENT:
 	1. This commit was developed at Vicomtech (https://www.vicomtech.org) under UE project CDN-X-ALL: "CDN edge-cloud computing for efficient cache and reliable streaming aCROSS Aggregated unicast-multicast LinkS"
 	2. Project funded by Fed4FIRE+ OC5 (https://www.fed4fire.eu)

	Signed-off-by: Javier Morgade <javier.morgade@ieee.org>
2019-12-14 13:01:12 +01:00
Javier Morgade
58734eb019 MBMS Scheduler code cleanup
MCH channel level calculation reformulated according to DLSCH

	ACKNOWLEDGEMENT:
 	1. This commit was developed at Vicomtech (https://www.vicomtech.org) under UE project CDN-X-ALL: "CDN edge-cloud computing for efficient cache and reliable streaming aCROSS Aggregated unicast-multicast LinkS"
 	2. Project funded by Fed4FIRE+ OC5 (https://www.fed4fire.eu)

	Signed-off-by: Javier Morgade <javier.morgade@ieee.org>
2019-12-14 10:54:18 +01:00
Raphael Defosseux
84f928e7de CI: adding initial testing for MBMS:
-- OAI eNB + OAI UE in USRP setting and in noS1 configuration

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-12-14 10:49:00 +01:00
Javier Morgade
a61984a3fd Merge remote-tracking branch 'origin/develop' into oai_test_fed4fire_old 2019-12-14 09:54:10 +01:00
Florian Kaltenberger
320e3f1f14 Merge remote-tracking branch 'origin/develop-nr' into fix-clock-source 2019-12-13 16:42:04 +01:00
Florian Kaltenberger
df791790ed Merge branch 'integration-develop-nr-2019w50' into 'develop-nr'
Integration develop nr 2019w50

See merge request oai/openairinterface5g!735
2019-12-12 13:07:43 +01:00
Florian Kaltenberger
cac89d49e4 reducing some logs 2019-12-12 13:06:51 +01:00
Florian Kaltenberger
da8be6a78b Merge remote-tracking branch 'origin/pdcp-ul-noS1-v2' into integration-develop-nr-2019w50 2019-12-12 12:52:55 +01:00
Florian Kaltenberger
5d7e7d5fe1 Merge remote-tracking branch 'origin/nr-rlc' into integration-develop-nr-2019w50 2019-12-12 12:50:49 +01:00
Florian Kaltenberger
cf57a43900 Merge remote-tracking branch 'origin/bug-fix-channel-est' into integration-develop-nr-2019w50 2019-12-12 12:50:17 +01:00
Florian Kaltenberger
e104d640e0 Merge remote-tracking branch 'origin/ru-parallel-beamforming-merge' into integration-develop-nr-2019w50 2019-12-12 12:49:55 +01:00
Raphael Defosseux
b3036372ca CI: Increasing again VM disk size --> now we have modular size based on VM variant
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-12-12 12:48:52 +01:00
Florian Kaltenberger
3566ef991e programming pin 5 of GPIO to "Shutdown LNA" (high -> TX, low -> RX) 2019-12-10 12:46:42 +01:00
Cedric Roux
b82787dde1 fix compilation of nr_dlsim and nr_ulsim 2019-12-10 10:23:34 +01:00
Cedric Roux
1a46b66d74 nr rlc: first commit
Initial implementation.

nr_rlc/nr_rlc_oai_api.c will need some clean rewrite at some point.

More testing is also needed.
2019-12-10 10:06:17 +01:00
laurent
719424f4b7 bug fix: ue was not reading options + more debug printf cleanup in openair1/PHY/NR_UE_TRANSPORT/dci_nr.c 2019-12-08 20:52:20 +01:00
laurent
22d4f20525 debug printf cleanup in openair1/PHY/NR_UE_TRANSPORT/dci_nr.c 2019-12-08 19:29:08 +01:00
Florian Kaltenberger
a78b5da529 fixes an issue with clock source
- command line paramter --clock-source can only be set at UE (removed this option from gNB)
 - at gNB use clock_source from RU section in config file
 - in both cases if clock_source is present in usrp_args, it will override clock_source
2019-12-06 08:54:17 +01:00
Florian Kaltenberger
6b1cabae41 Merge branch '468-fix-usrp_lib-for-threequarter-sampling' into 'develop-nr'
Fix usrp_lib for threequarter sampling

See merge request oai/openairinterface5g!732
2019-12-06 00:43:00 +01:00
laurent
ec08b771b1 merge develop-nr 2019-12-05 05:07:23 +01:00
laurent
97a2877cba fix worker_disable 2019-12-05 04:58:10 +01:00
laurent
8708af92ab error in one function prototype 2019-12-05 04:56:45 +01:00
laurent
7672257b2f asn1 encoding memory overflow 2019-12-05 04:56:42 +01:00
laurent
80cd6940af modifications 2019-12-05 04:53:56 +01:00
Raphael Defosseux
ee6b18d377 CI: adding a dummy build scenario for deactivated jobs
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-12-04 04:36:07 +01:00
Raphael Defosseux
424bf5c53e CI: adding a dummy build scenario for deactivated jobs
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-12-04 04:24:22 +01:00
Thomas Schlichter
602d025e89 fix tx_sample_advance in usrp_lib for 46.08MSps 2019-12-03 18:31:51 +01:00
Sakthivel Velumani
1928936883 Fixed a misaligned problem in PUSCH channel esti
An avx2 instruction in idft4096 introduced segfault sometimes
2019-12-03 15:55:14 +01:00
Sakthivel Velumani
f1740e2c9c Fixed CI failure 2019-12-02 14:11:47 +01:00
Sakthivel Velumani
11147c2e83 Merge branch 'develop-nr' into bug-fix-channel-est 2019-12-02 13:45:05 +01:00
Florian Kaltenberger
a54362ddef Merge branch 'integration-develop-nr-2019w48bis' into 'develop-nr'
Integration develop nr 2019w48bis

See merge request oai/openairinterface5g!729
2019-11-30 06:36:57 +01:00
Florian Kaltenberger
0e47a507d3 Merge remote-tracking branch 'origin/nr_x300_fixes' into integration-develop-nr-2019w48bis 2019-11-29 17:19:04 +01:00
Florian Kaltenberger
201d975318 Merge remote-tracking branch 'origin/feat-sib1-sa-mode' into integration-develop-nr-2019w48bis 2019-11-29 17:18:58 +01:00
Florian Kaltenberger
729498571b Merge remote-tracking branch 'origin/nr_100mhz' into integration-develop-nr-2019w48bis 2019-11-29 17:18:47 +01:00
Sakthivel Velumani
620038220c Fixed a bug in channel estimation; and updated a dlsim test case 2019-11-28 17:43:24 +01:00
Francesco Mani
d5db8c1634 make lte compile again 2019-11-28 17:29:41 +01:00
Francesco Mani
f3f58741d8 conflicts solved 2019-11-27 16:37:48 +01:00
Francesco Mani
f997ebb8ca Merge branch 'ru-parallel-beamforming-merge' of https://gitlab.eurecom.fr/oai/openairinterface5g into ru-parallel-beamforming-merge 2019-11-27 16:32:08 +01:00
Wang Tsu-Han
40bda9f8d0 fixes for beam precoding 2019-11-27 16:27:28 +01:00
Raphael Defosseux
ba17176c7c CI: putting back flexran-ctl in build/testing --> now on develop branch of this repo
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-11-27 15:01:03 +01:00
Francesco Mani
b2ddd33577 Merge branch 'nr_beamforming_new' into ru-parallel-beamforming-merge 2019-11-27 14:34:34 +01:00
Francesco Mani
aab575f66a bugfix 2019-11-27 14:26:35 +01:00
Francesco Mani
82880f6199 Merge branch 'nr_x300_fixes' into ru-parallel-beamforming-merge 2019-11-27 13:47:14 +01:00
Francesco Mani
fe0c9ba075 fix for number of slots in half frame for different numerologies 2019-11-27 09:11:51 +01:00
Prateek Bidwalkar
c724057947 updated file format using astyle
Signed-off-by: Prateek Bidwalkar <prateek.bidwalkar@ipaccess.com>
2019-11-27 11:04:23 +05:30
Prateek Bidwalkar
cf406af4f0 ASN encoding for SIB1 in SA mode
Signed-off-by: Prateek Bidwalkar <prateek.bidwalkar@ipaccess.com>
2019-11-27 11:04:23 +05:30
Francesco Mani
433e3edd21 fix for nr_is_ssb_slot in nr_slot_select 2019-11-26 18:31:04 +01:00
Raphael Defosseux
98311219ac Merge remote-tracking branch 'origin/develop-nr' into develop-nr_cppcheck 2019-11-26 13:59:54 +01:00
Raphael Defosseux
e6360d1365 Merge branch 'develop-nr-fix-multi-rru' into 'develop-nr'
Develop nr fix multi rru

See merge request oai/openairinterface5g!722
2019-11-26 13:46:25 +01:00
Francesco Mani
2406662e74 new config file for static beam weights 2019-11-26 11:07:43 +01:00
Florian Kaltenberger
c4121a997f registering log components 2019-11-25 22:07:51 +01:00
Francesco Mani
63375fa139 BF weights from config file for RU case 2019-11-25 16:43:15 +01:00
Wang Tsu-Han
56ecc5cfb2 Merge branch 'develop-nr' into ru-parallel-beamforming-merge
Conflicts:
	openair1/PHY/MODULATION/nr_modulation.h
	openair1/PHY/NR_TRANSPORT/nr_dlsch.c
	openair1/SCHED_NR/phy_procedures_nr_gNB.c
2019-11-22 17:00:53 +01:00
Raphael Defosseux
baf5f1ed93 Merge remote-tracking branch 'origin/develop' into develop-nr_cppcheck 2019-11-22 11:18:28 +01:00
Florian Kaltenberger
90445b0003 Merge branch 'nr-channel-estimation' into 'develop-nr'
Nr channel estimation and other fixes

See merge request oai/openairinterface5g!714
2019-11-21 17:14:59 +01:00
Raphael Defosseux
67a23b3386 CI: adding back the multi-RRU test in develop-nr
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-11-21 15:35:57 +01:00
Wang Tsu-Han
e0c80a83b8 bug fix for buffer setting in dlsch and wakeup_rxtx 2019-11-21 15:35:28 +01:00
Florian Kaltenberger
dfad6a91d7 removing duplicate and erroneous malloc 2019-11-21 15:34:50 +01:00
Raphael Defosseux
72fc49ccf2 CI: putting back flexran-ctl in build/testing --> now on develop branch of this repo
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-11-21 15:31:36 +01:00
Francesco Mani
2a0cfcb747 Merge branch 'develop-nr' into nr_beamforming 2019-11-21 12:34:44 +01:00
yilmazt
94968c14df develop-nr up-to-date as of 20.11.19 2019-11-20 23:50:39 +03:00
Francesco Mani
3ddce03c65 change in 273 config file 2019-11-19 16:03:34 +01:00
Francesco Mani
2e6d4c7572 Merge branch 'develop-nr' into nr_100mhz 2019-11-19 15:57:09 +01:00
magounak
9d1b66154b Merge remote-tracking branch 'origin/develop-nr' into nr-channel-estimation 2019-11-19 15:43:20 +01:00
Raphael Defosseux
b63e21b625 Merge branch 'hotfix-cqi-tdd' into 'develop'
hotfix: better CQI requests, especially for TDD

See merge request oai/openairinterface5g!708
2019-11-19 15:40:08 +01:00
Raphael Defosseux
aeffe090ba CI: increase the disk size on the VMs
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-11-18 13:18:25 +01:00
Wang Tsu-Han
6be2d8f081 using switch buffer for txdataF in L1 2019-11-18 12:33:48 +01:00
Florian Kaltenberger
376128761d Merge branch 'integration-develop-nr-2019w46' into 'develop-nr'
Integration develop nr 2019w46

See merge request oai/openairinterface5g!716
2019-11-18 12:13:13 +01:00
Sakthivel Velumani
0ea53f48b9 Added back ulsim test case for 273 RB 2019-11-15 17:21:37 +01:00
Francesco Mani
c5efa4f400 including option 273prbs in uesoftmodem 2019-11-15 14:31:58 +01:00
Sakthivel Velumani
e253a6f380 Added support for nushift 2019-11-15 14:15:45 +01:00
Francesco Mani
8ad07d3aef make gNB compile for 273 PRBs and including config file 2019-11-15 12:41:02 +01:00
Florian Kaltenberger
39457f5c12 Merge remote-tracking branch 'origin/ldpc_bg2_bug_fix' into integration-develop-nr-2019w46 2019-11-15 09:39:08 +01:00
Florian Kaltenberger
a3379d1d10 Merge remote-tracking branch 'origin/fix-nr-rfsim-gNB-notx-slots2to19' into integration-develop-nr-2019w46 2019-11-15 09:38:54 +01:00
Florian Kaltenberger
6082a33d2e Merge remote-tracking branch 'origin/nr_pdcch_crc_fix' into integration-develop-nr-2019w46 2019-11-15 09:38:38 +01:00
Francesco Mani
e2b77c3edb removing printf 2019-11-15 09:27:02 +01:00
Sakthivel Velumani
4815ff113d Removed 273 PRB test (not supported by PUSCH for now) 2019-11-14 18:21:11 +01:00
Sakthivel Velumani
bd0eb1cc26 Merge branch 'nr-channel-estimation' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr-channel-estimation 2019-11-14 17:32:25 +01:00
Thomas Schlichter
ef3be74025 Fix channel estimation for 3/4 sampling
In 3/4 sampling mode, the OFDM symbol size is _not_ a power of two (e.g. 1536 instead of 2048).
In this case it is _not_ OK to calculate the modulus using a binary AND, it _must_ use either the actul modulus operator (%) using an integer division,
or a _correct_ if statement or tertianary operator like this:

re_offset = (re_offset + 4 >= ue->frame_parms.ofdm_symbol_size) ? (re_offset + 4 - ue->frame_parms.ofdm_symbol_size) : (re_offset + 4);

But of course using the actual modulus operator is much more readable and surely not much slower:

re_offset = (re_offset + 4) % ue->frame_parms.ofdm_symbol_size;
2019-11-14 17:32:09 +01:00
Sakthivel Velumani
ebd3871827 Updated nr_dlsim test cases 2019-11-14 17:16:25 +01:00
Hongzhi Wang
feb461bafb add missing fix for bg2 2019-11-14 16:25:23 +01:00
Sakthivel Velumani
348afdc17e Added more test cases for nr_ulsim 2019-11-14 15:18:37 +01:00
Hongzhi Wang
17f5a80387 ldpc encoder bg2 bug fix 2019-11-14 15:16:21 +01:00
Sakthivel Velumani
eff0a870b7 PUSCH UE DMRS index with correct data type 2019-11-14 15:06:23 +01:00
Sakthivel Velumani
95ef6bd9b7 Included previously commented tests 2019-11-14 13:48:15 +01:00
Sakthivel Velumani
1aa2b3041b update to last commit 2019-11-13 15:05:19 +01:00
Sakthivel Velumani
8054ab64fa Fixed CRC fail in PDSCH for large PRBs 2019-11-13 14:57:29 +01:00
Sakthivel Velumani
3185728107 Some updates in uplink and downlink channel estimations 2019-11-13 14:35:14 +01:00
LAD
cc15b2231b Compilation fix 2019-11-13 01:21:56 -08:00
LAD
cd14e5d3dc Clean code for monolithic case. Remove support for CU/DU. 2019-11-13 00:53:34 -08:00
Sakthivel Velumani
c3fcee20a1 Added dlsim more dlsim test cases 2019-11-12 16:53:22 +01:00
Sakthivel Velumani
2deda8df51 Improved channel estimates around DC for uplink 2019-11-12 15:15:37 +01:00
laurent
ea7c4d9536 fix fix-nr-rfsim-gNB-notx-slots2to19 2019-11-12 14:35:43 +01:00
Sakthivel Velumani
09b38541c8 Included DC handling for odd number of RBs 2019-11-12 14:28:34 +01:00
Florian Kaltenberger
1bfbf8c96e adding missing case 2019-11-11 15:04:22 +01:00
Rakesh
6d4f03751e ulsim bug fix 2019-11-08 23:22:59 +01:00
Florian Kaltenberger
282f56fb7b fixing some bugs nr_ulsim 2019-11-08 17:10:30 +01:00
Rakesh
b4b1998c5e bug fix 2019-11-08 12:38:48 +01:00
Sakthivel Velumani
497afe4f58 UL improved channel estimation around DC 2019-11-08 10:27:06 +01:00
Raphael Defosseux
ca2e8d3553 CI: tuning on TDD scenarios
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-11-08 10:05:35 +01:00
Raphael Defosseux
ccd1b3be53 CI: preparing release notes for patch
--> also adding TDD monolithic test at 20MHz with default scheduler
 --> putting IF4.p5 TDD scenarios with default scheduler

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-11-08 10:05:24 +01:00
masayuki.harada
c8b638184c Fix scheduling PUSCH when CQI has not been received for a long time in fairRR scheduler. 2019-11-08 10:05:14 +01:00
masayuki.harada
c4255f0dd4 Fix cqi_req clear timing, and schedule PUSCH when CQI has not been received for a long time in fairRR scheduler. 2019-11-08 10:05:02 +01:00
yilmazt
c2460cc4d2 executables are compiling 2019-11-07 19:17:58 +03:00
Sakthivel Velumani
9e7186c2cb updated dlsim 2019-11-07 17:00:30 +01:00
Sakthivel Velumani
f5b0658a70 Improved channel estimates around DC;
ignored only DC pilot
2019-11-07 16:34:33 +01:00
Sakthivel Velumani
ca9b4d7ed9 Improved channel estimates around DC
Ignored 1 pilot before and after DC
2019-11-07 16:26:30 +01:00
Florian Kaltenberger
20df127684 astyling gNB_scheduler_phytest.c 2019-11-06 18:34:22 +01:00
Francesco Mani
1ef8aaee97 Revert "updating beamforming weights"
This reverts commit a9e07dce5f.
2019-11-06 16:25:54 +01:00
Cedric Roux
2a7ac81b0b hotfix: better CQI requests, especially for TDD
In TDD mode, CQI requests are not possible in special subframes (at
least for some TDD configurations, see 36.213 7.2.3 that says "a
DL subframe is valid if it does not contain a DwPTS field if the
length is less than  7680 Ts").

In the code, we simply disable CQI requests in special subframes,
no matter what the length of DwPTS.

A problem can arise if the DCI0 for a given UE are sent only in
those special subframes. In this case the UE will never report
CQI and the eNB will use low MCS for this UE, impacting performances.

Another, related, problem is when there are several UEs. There again
one UE might always get its DCI0 in special subframes and thus never
report CQI. There again, performance issues.

This commit is an attempt to improve the situation.

It does two things.

1 - tag the UE as schedulable in the function UE_is_to_be_scheduled
    if the cqi_req_timer is expired

2 - use cqi_req_timer as a criterium when ordering UEs for UL scheduling

The value chosen for the expiration of the cqi_req_timer in
UE_is_to_be_scheduled is quite high (300) because as the code is
today we may overschedule the UE for short bursts until we receive
a CQI from the UE. [TODO: fix the code properly to avoid this behavior.]

Note: the fairRR scheduler has not been analyzed and this commit may
      not fix anything in case the fairRR scheduler is used.
2019-11-06 12:30:50 +01:00
Wang Tsu-Han
d252696b14 Merge branch 'develop-nr' into ru-parallel-beamforming
Conflicts:
	common/utils/T/T_defs.h
	executables/nr-ru.c
	nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h
	openair1/PHY/defs_RU.h
	openair1/SCHED_NR/nr_ru_procedures.c
	openair1/SCHED_NR/sched_nr.h
	openair2/LAYER2/NR_MAC_gNB/nr_mac_common.c
2019-11-05 15:43:19 +01:00
Francesco Mani
2a5109d670 crc ones added also ar UE side 2019-11-05 12:47:32 +01:00
Francesco Mani
13f4acd5b6 Revert "disabling pdsch and ul"
This reverts commit 582ba0c922.
2019-11-05 10:59:15 +01:00
Francesco Mani
ccd38774ee Revert "generating a simple ue specific search space with 24 RB in 1 symbol for testing"
This reverts commit e47cd4a06d.
2019-11-05 10:58:25 +01:00
Wang Tsu-Han
57421caae5 adding tracer for tx fronthaul 2019-11-04 15:32:25 +01:00
yilmazt
94cf7de858 Merge branch 'develop-nr' into develop-nr_cppcheck 2019-11-02 19:10:01 +03:00
Florian Kaltenberger
69631e750b Merge remote-tracking branch 'origin/develop-nr' into nr_fapi_for_push 2019-11-01 17:13:54 +01:00
Florian Kaltenberger
615f278711 Merge branch 'integration-develop-nr-2019w44' into 'develop-nr'
Integration develop nr 2019w44

See merge request oai/openairinterface5g!703
2019-10-31 21:10:31 +01:00
Florian Kaltenberger
517c8585b3 UE sending only slot 2 (until we have real TDD procedures) to reduce stress on trx_write 2019-10-31 14:01:48 +01:00
Sakthivel Velumani
3052388709 Fix for ulsim MCS issue;
Still problem with low MCS (same as PDSCH)
2019-10-31 11:51:58 +01:00
Florian Kaltenberger
501a1272cd configuring PUSCH directly in nr_ulsim so that it works also for other MCS 2019-10-31 11:17:07 +01:00
Florian Kaltenberger
a13a167f08 Merge branch 'nr_fapi_for_push' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr_fapi_for_push 2019-10-31 09:56:36 +01:00
Florian Kaltenberger
afa7195638 making nr_ulschsim work again 2019-10-31 09:56:16 +01:00
LAD
d812ffd616 [tested] MAC itti ok. Add procedure to DU part (not tested, but need dedicated F1AP implementation). 2019-10-30 23:50:07 -07:00
Francesco Mani
cbbadf6bcd correction for dci crc computation 2019-10-30 17:26:03 +01:00
Florian Kaltenberger
5758bb8e44 UE sending only slot 2 (until we have real TDD procedures) to reduce stress on trx_write 2019-10-30 16:46:11 +01:00
Florian Kaltenberger
bf7d52de43 Merge remote-tracking branch 'origin/develop-nr' into nr_fapi_for_push 2019-10-30 16:33:35 +01:00
yilmazt
cd098f3971 develop&-nr merge 2019-10-30 16:17:41 +01:00
LAD
a3c337cc9f [to test] Add MAC itti loop and DRX config support 2019-10-30 07:36:44 -07:00
Florian Kaltenberger
61cfbc1f2a changing some log levels 2019-10-30 11:11:52 +01:00
Florian Kaltenberger
ac94b2e6f0 commenting out failing nr_dlsim test for MCS 0 2019-10-30 10:31:54 +01:00
Florian Kaltenberger
c52ba1db79 Merge remote-tracking branch 'origin/457-add-nr_ulsim-testcases' into integration-develop-nr-2019w44 2019-10-30 10:24:51 +01:00
Florian Kaltenberger
cf025a6569 Merge remote-tracking branch 'origin/nr-tbs-fixes' into integration-develop-nr-2019w44 2019-10-30 10:22:38 +01:00
Florian Kaltenberger
51462360a8 Merge remote-tracking branch 'origin/nr_time_tracking_ssb' into integration-develop-nr-2019w44 2019-10-30 10:22:20 +01:00
Florian Kaltenberger
da625f1397 making nr_ulsim working again with the FAPI 2019-10-29 17:14:46 +01:00
LouisAdrien
940ce3fe93 [tested] comment update 2019-10-29 16:33:57 +01:00
LAD
2306428e3d Merge branch 'develop' into orange_cdrx 2019-10-29 07:30:17 -07:00
LAD
3187127bd7 [to test] Improvements added to F1AP interface (no UE management messaging) 2019-10-29 07:22:44 -07:00
LAD
d1f54a98dc [to test] Check CE from UECap and TDD from RRC config 2019-10-29 03:41:56 -07:00
LAD
eddc13d235 [to build] Check coverage extension through UE capabilities 2019-10-29 03:05:36 -07:00
Francesco Mani
e47cd4a06d generating a simple ue specific search space with 24 RB in 1 symbol for testing 2019-10-29 10:45:27 +01:00
Francesco Mani
582ba0c922 disabling pdsch and ul 2019-10-29 09:55:12 +01:00
Francesco Mani
5cd4ad0411 Merge branch 'nr-tbs-fixes' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr-tbs-fixes 2019-10-28 17:11:37 +01:00
Francesco Mani
4297beffa0 another uint32 fix 2019-10-28 17:11:03 +01:00
DUFRENE Louis Adrien TGI/OLS
34f0bdac3a [to build] Monolithic: move RRC features in do_drxconfig 2019-10-28 14:44:16 +01:00
Sakthivel Velumani
5bfbfd9a37 Updated test cases (ready for CI tests) 2019-10-28 14:05:54 +01:00
Sakthivel Velumani
fcfc29ca8b Fixed ulsch 2019-10-28 14:01:22 +01:00
Sakthivel Velumani
db02c60ef5 Updated ulsch 2019-10-28 13:44:19 +01:00
Francesco Mani
e9355e2ef4 fix in coderate for ulsch decoding 2019-10-28 13:19:10 +01:00
Florian Kaltenberger
f459e90f2b excluding dlsim_tm4 test 2019-10-28 11:43:05 +01:00
Sakthivel Velumani
2308f35fa7 Merge branch 'nr-tbs-fixes' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr-tbs-fixes 2019-10-28 10:52:54 +01:00
Francesco Mani
ae2549b91a encoded length as uint32_t 2019-10-28 10:41:56 +01:00
Sakthivel Velumani
3995b59b34 Updated phy simulators 2019-10-28 10:27:55 +01:00
Francesco Mani
5a0b2fc05c Merge branch 'nr-tbs-fixes' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr-tbs-fixes 2019-10-25 15:54:37 +02:00
Francesco Mani
c1dc042d70 tbs as uint32_t 2019-10-25 15:53:54 +02:00
Sakthivel Velumani
0ceb9545a1 Added back the dlschsim test cases 2019-10-25 15:25:15 +02:00
Sakthivel Velumani
d4d4bb6df7 Removed unused variables 2019-10-25 15:22:18 +02:00
Sakthivel Velumani
80846efc2e Fixed nr_dlschsim 2019-10-25 15:16:03 +02:00
Florian Kaltenberger
3c16c57aa8 Merge branch 'integration-develop-nr-2019w43' into 'develop-nr'
Integration develop nr 2019w43

See merge request oai/openairinterface5g!696
2019-10-25 13:47:27 +02:00
Florian Kaltenberger
748a2397d6 fixing ldpctest and some encoding for >8 segments 2019-10-25 13:38:21 +02:00
Thomas Schlichter
f235e54056 autotests: update phy test case descriptions in README.txt 2019-10-25 11:20:00 +02:00
Thomas Schlichter
fe290e3a54 autotests: run more than only the first 10 phy test cases 2019-10-25 11:19:52 +02:00
Thomas Schlichter
9e80e8db73 autotests: add test cases for nr_ulsim 2019-10-25 11:18:56 +02:00
Sakthivel Velumani
3c47152c66 commented out nr_dlschsim test cases 2019-10-24 17:18:16 +02:00
Hongzhi Wang
397480c125 update time tracking 2019-10-24 10:42:11 +02:00
Florian Kaltenberger
a675d309aa Merge remote-tracking branch 'origin/hotfix_usrp_lib' into integration-develop-nr-2019w43 2019-10-24 10:02:03 +02:00
Florian Kaltenberger
7500911a1b applying fix from @heng_great 2019-10-24 10:00:57 +02:00
Florian Kaltenberger
609ec01888 Merge remote-tracking branch 'origin/develop-nr-fix-warnings' into integration-develop-nr-2019w43 2019-10-24 09:58:22 +02:00
Francesco Mani
93730f0e06 removing scale left out 2019-10-24 09:25:35 +02:00
Francesco Mani
6e38f7540f moving scale inside tbs computation function 2019-10-24 09:14:14 +02:00
Florian Kaltenberger
5465516fe0 making ulsim and dlsim compile again 2019-10-23 16:38:48 +02:00
Raphael Defosseux
96b59d07a3 fixing a typo in usrp_lib.cpp 2019-10-23 10:46:17 +02:00
Francesco Mani
f2c5ebd4cd Zc fix in LDPC encoder 2019-10-22 15:26:44 +02:00
Florian Kaltenberger
7b840212ff fixing compilation dlschsim (but still not passing test) 2019-10-22 12:01:20 +02:00
Francesco Mani
056deedf1e init R for gNB ulsch 2019-10-21 18:34:57 +02:00
Francesco Mani
69b58589dc bugfix in compute tbs 2019-10-21 17:29:51 +02:00
Francesco Mani
4e1b874adf fix on table definition in dlschsim 2019-10-21 16:44:04 +02:00
Francesco Mani
668de031ec a single function to compute tbs and an additional function to compute tbslbrm 2019-10-21 16:39:02 +02:00
Francesco Mani
624fdd78d2 fix on sch dmrs 2019-10-18 16:29:56 +02:00
Francesco Mani
a67113c64c fix for dlsch tbslbrm 2019-10-18 12:57:16 +02:00
Francesco Mani
494c9d37a1 Merge branch 'nr-coreset-bug-fix' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr-coreset-bug-fix 2019-10-18 12:47:21 +02:00
Francesco Mani
724fc3dcb5 reverting to old tbslbrm computation 2019-10-18 12:46:33 +02:00
Sakthivel Velumani
59141e1851 commented failing CI tests 2019-10-18 11:50:04 +02:00
Hongzhi Wang
2bfec87cb8 using ssb for time tracking 2019-10-18 10:44:02 +02:00
Raphael Defosseux
8a4fd4f0de CI: pushing the physical simulator testing to 90-minutes time-out!
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-10-17 16:53:00 +02:00
Sakthivel Velumani
38b61f0351 completely merged with develop-nr 2019-10-16 15:21:06 +02:00
Florian Kaltenberger
b39ac8893b fix warnings 2019-10-16 14:51:09 +02:00
Sakthivel Velumani
ada33879b6 Merge branch 'develop-nr' into nr-coreset-bug-fix
Resolved conflicts. rfsim not working.
2019-10-16 13:41:32 +02:00
Sakthivel Velumani
206028153b updated test case list 2019-10-15 16:05:19 +02:00
Sakthivel Velumani
f768d8f3bd added CI test cases for nr_dlsim 2019-10-15 15:52:58 +02:00
Florian Kaltenberger
7a6d174045 Merge branch 'integration_develop-nr_2019w42' into 'develop-nr'
Integration develop nr 2019w42

See merge request oai/openairinterface5g!691
2019-10-15 10:06:44 +02:00
Florian Kaltenberger
aa65503926 UE is transmitting again now (was disabled) and PUSCH working again 2019-10-15 10:04:01 +02:00
Florian Kaltenberger
3b5ddb9a8c Merge branch 'integration_develop-nr_2019w42' of https://gitlab.eurecom.fr/oai/openairinterface5g into integration_develop-nr_2019w42 2019-10-14 21:50:48 +02:00
Florian Kaltenberger
e97204d573 fixing bad merge 2019-10-14 21:50:25 +02:00
Raphael Defosseux
d4526975a7 CI: increase time-out on uhd_find_devices commands
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-10-14 17:12:07 +02:00
Florian Kaltenberger
952ca25559 Merge remote-tracking branch 'origin/442-integrate-pusch-into-nr-ue-softmodem' into nr_fapi_for_push 2019-10-14 14:32:46 +02:00
Florian Kaltenberger
f8d969d506 Merge remote-tracking branch 'origin/ldpc-endian' into integration_develop-nr_2019w42
Conflicts:
	openair1/PHY/CODING/TESTBENCH/ldpctest.c
2019-10-14 13:43:33 +02:00
Florian Kaltenberger
c046eb66a6 Merge remote-tracking branch 'origin/nr-ip-over-LTE-stack' into integration_develop-nr_2019w42
Conflicts:
	executables/nr-softmodem.c
	executables/nr-softmodem.h
	targets/ARCH/rfsimulator/simulator.c
2019-10-14 13:40:03 +02:00
Florian Kaltenberger
a5af01633a Merge remote-tracking branch 'origin/develop-nr_cppcheck' into integration_develop-nr_2019w42 2019-10-14 13:35:13 +02:00
Florian Kaltenberger
f26373c52b Merge remote-tracking branch 'origin/develop-nr_cppcheck' into integration_develop-nr_2019w42
Conflicts:
	executables/nr-gnb.c
	openair1/PHY/NR_REFSIG/nr_dmrs_rx.c
	openair1/SIMULATION/NR_PHY/ulsim.c
2019-10-14 13:34:14 +02:00
yilmazt
954e6c640d compilation error fix and some more cppcheck work 2019-10-14 12:14:12 +02:00
Florian Kaltenberger
054eaf66a6 fixing nr_dlsim CI tests 2019-10-14 10:54:14 +02:00
Florian Kaltenberger
da13ff9c36 improved real-time performance:
- gNB now only sends samples to USRP when DL slot. (should do the same for UE)
 - increased sf_ahead to 6
 - fixed timestamp for usrp_write at UE
2019-10-11 17:30:55 +02:00
Florian Kaltenberger
76b55e9cbd Merge remote-tracking branch 'origin/develop-nr' into nr_fapi_for_push 2019-10-11 17:26:03 +02:00
Florian Kaltenberger
189e15aa80 improved real-time performance:
- gNB now only sends samples to USRP when DL slot. (should do the same for UE)
 - increased sf_ahead to 6
 - fixed timestamp for usrp_write at UE
2019-10-11 17:12:39 +02:00
Hongzhi Wang
348cc790be Adding CRC16 for BG2 at NR UE 2019-10-11 16:15:36 +02:00
Raphael Defosseux
4f55943b3b Merge branch 'develop_integration_2019_w41' into 'develop'
Develop Integration Branch: 2019 week 41

See merge request oai/openairinterface5g!689
2019-10-11 13:13:54 +02:00
Francesco Mani
1a5efc7429 Merge branch 'ldpc-endian' into nr-coreset-bug-fix 2019-10-11 12:44:29 +02:00
Raphael Defosseux
0ab5a4c590 Merge remote-tracking branch 'origin/rfsim-trace_pdu-fixies' into develop_integration_2019_w41 2019-10-11 09:55:31 +02:00
Raphael Defosseux
b365b57cf4 Merge remote-tracking branch 'origin/multi-rru-hack' into develop_integration_2019_w41 2019-10-11 09:55:15 +02:00
Raphael Defosseux
50962242dd Merge remote-tracking branch 'origin/develop_inria_ci_deployment' into develop_integration_2019_w41 2019-10-11 09:54:53 +02:00
Raymond Knopp
2109c768df modified endian on unoptimized encoder 2019-10-10 18:44:32 +02:00
Raymond Knopp
a8bf0b2373 andmask for both optimized encoder routines. Minor changes in ldpctest 2019-10-10 18:39:41 +02:00
sebastian
0b9d015888 Fixed a bug 2019-10-10 14:22:30 +02:00
sebastian
2cd4d9f670 Updated packed LDPC output format to be compliant with 38.321 2019-10-10 10:20:06 +02:00
Francesco Mani
7e3d2cc05b Merge branch 'ldpc-endian' into nr-coreset-bug-fix 2019-10-10 09:18:34 +02:00
LouisAdrien
206f17b2a4 [under test] Fix CDRX starts at RRCReconfComplete again; new comments 2019-10-10 08:10:16 +02:00
Raymond Knopp
2daf95a027 ldpc encoder bit endian (MSB->LSB) for 3GPP compliance 2019-10-09 21:44:08 +02:00
LouisAdrien
9c811d22bc Merge branch 'orange_cdrx' of https://gitlab.forge.orange-labs.fr/afyf6286/oai-orange into orange_cdrx 2019-10-09 16:52:24 +02:00
LAD
c107789e4c [to test] CU/DU split supported 2019-10-09 07:30:10 -07:00
laurent
3ad36982dd one cppcheck only 2019-10-08 18:43:42 +02:00
yilmazt
08eda57aca final minor changes before the merge 2019-10-08 18:32:02 +02:00
laurent
0b7489b122 astyle only 2019-10-08 16:15:29 +02:00
laurent
445cf84e94 clean up wireshark traces 2019-10-08 16:04:10 +02:00
WANG Tsu-Han
d88ab2f9c0 fix for having 4 physical antennas and adding timing measument for local trx write 2019-10-08 15:28:57 +02:00
laurent
b7908ec25d bug fixies 2019-10-08 14:27:39 +02:00
magounak
c94a3b85e9 improve hack multi-rru-clean.c 2019-10-08 12:25:55 +02:00
Khalid Ahmed
7934ec451a In TTD mode consider ssb slot as DL slot
- added nr_is_ssb_slot function
2019-10-08 09:30:15 +02:00
Khalid Ahmed
740e4c8aa1 Setting start_rb = 0 and mcs = 9 for PUSCH 2019-10-08 09:30:15 +02:00
Ahmed Hussein
61a1b1c5a8 Adding new command line parameters 2019-10-08 09:30:15 +02:00
Ahmed Hussein
b0f5f5f864 Adding TA estimation at gNB PHY for TA updates 2019-10-08 09:30:15 +02:00
Ahmed Hussein
17e4f0f12d Reordering frame and SNR loops 2019-10-08 09:30:15 +02:00
Ahmed Hussein
675c0dff2d Providing time domain channel estimates 2019-10-08 09:30:15 +02:00
Ahmed Hussein
b28d006860 Minor Fixes in ulsim 2019-10-08 09:30:15 +02:00
Ahmed Hussein
3be72df335 Set start_rb to 0
- start_rb was set to 30, and nb_rb was set to 50 with NB_RB_DL = 106.
- When the DC subcarrier is included in the RB allocation,
  this causes errors in FFT/IFFT operations arounf the DC subcarrier
- This leads to errors in unscrambling and decoding
2019-10-08 09:30:15 +02:00
Ahmed Hussein
7c7a1e8262 Added frame loop to ulsim 2019-10-08 09:30:15 +02:00
Ahmed Hussein
03ac9b03c8 TBS fix at UE side + minor restructuring in "phy_procedures_nrUE_TX"
- TBS calculation was performed 2 times. Once in "phy_procedures_nrUE_TX" and
  another in "nr_ue_ulsch_procedures". The TBS calculation was wrong in "phy_procedures_nrUE_TX"
  and correct in "nr_ue_ulsch_procedures".

- The data generation was performed in "phy_procedures_nrUE_TX" with a wrongly
  calculated TBS because "ulsch_ue->nb_re_dmrs" wasn't set to a value, so the calculated
  TBS would be more than it should be. This doesn't create a problem in the test because
  the comparison between the TX and RX data is made using the correctly calculated TBS
  which is smaller.

- Solution was to perform data generation in "nr_ue_ulsch_procedures", and remove TBS calculation
  in "phy_procedures_nrUE_TX"
2019-10-08 09:30:15 +02:00
Ahmed Hussein
3d86e29508 Minor fixes and edits in ulsch_decoding 2019-10-08 09:30:15 +02:00
Khalid Ahmed
f6470ccc95 Add macro to print CRC OK at gNB PUSCH 2019-10-08 09:30:15 +02:00
Khalid Ahmed
cd5a321895 Fixing TDD mode using USRP x300 2019-10-08 09:30:14 +02:00
Khalid Ahmed
ef41f62f9f optimizing nr_ue_ulsch_procedures 2019-10-08 09:30:14 +02:00
Ahmed Hussein
b7733bae40 Minor fixes
- removing "Nsymb_pusch" and "Nsc_pusch" from "NR_UE_ULSCH_t"
- using "number_of_symbols" from "NR_UL_UE_HARQ_t" instead
- removing "generate_ue_ulsch_params"
2019-10-08 09:30:14 +02:00
Khalid Ahmed
b10cc48351 Fix ulsim and PUSCH in rf-simulator
- initialize PUSCH parameters properly
2019-10-08 09:30:14 +02:00
Thomas Schlichter
8df7d62e52 fix compilation of phy simulators introduced from the usage of get_band() 2019-10-08 09:30:14 +02:00
Khalid Ahmed
dd0927dd55 TDD fixes in real-time environment 2019-10-08 09:30:14 +02:00
Khalid Ahmed
c7951965e7 TDD in rfsimulator 2019-10-08 09:30:14 +02:00
Khalid Ahmed
dd26598ab2 handle tx_offset with negative value 2019-10-08 09:30:14 +02:00
Khalid Ahmed
bd39261980 fixing a memory leak in nr_ue_ulsch_procedures 2019-10-08 09:30:14 +02:00
Khalid Ahmed
274c60f87c PUSCH running with rfsimulator 2019-10-08 09:30:14 +02:00
Thomas Schlichter
b4c0acad9c fix crashes in nr_ulsch_decoding
- initialize p_decParams->Z from harq_process not only in round 0
- do not set opp_enabled=1, this crashes in LDPC encoder
2019-10-08 09:30:14 +02:00
Thomas Schlichter
ffbe17f3d7 fix gNB linker error and various warnings 2019-10-08 09:30:14 +02:00
Ahmed Hussein
3a8bf560da channel estimation, compensation, etc ..
Added the following folder:
- ../openair1/PHY/NR_ESTIMATION/

Added the following file to CMakelists.txt:
- ../openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c

Added the following functions:
- nr_pusch_dmrs_rx
- nr_gold_pusch
- nr_ulsch_channel_level
- nr_ulsch_channel_compensation
- nr_ulsch_scale_channel is commented out (I think only used for downlink)

Changes from Khalid Ahmed Mahmoud Mohamed:
- nr_pusch_channel_estimation is used
- nr_ulsch_scale_channel is used
- nr_ulsch_channel_level is used
- nr_ulsch_channel_compensation is used
- multiple logging options for channel and signal magnitude
2019-10-08 09:30:14 +02:00
Ahmed Hussein
ad37254217 adding PUSCH procedures to gNB side in RT with some logs
- removed gNB RT from "ru_procedures.c" to "nr_ru_procedures"
- added a new thread "nr_feprx_thread"
- added some functionalities for fep for rx in "nr_ru_procedures.c"
2019-10-08 09:30:14 +02:00
Khalid Ahmed
2b81a1bf48 using LOG_I instead of LOG_D in RT PUSCH UE side 2019-10-08 09:30:14 +02:00
Khalid Ahmed
031e424e46 Adding Frame tx to LOG_D for debugging 2019-10-08 09:30:14 +02:00
Khalid Ahmed
df65d8e323 Restrict UL transmission to NR_UPLINK_SLOT 2019-10-08 09:30:14 +02:00
Thomas Schlichter
376fc1eca3 Consolidate header files for nr_phy_scope 2019-10-08 09:30:14 +02:00
Khalid Ahmed
2960d27a47 enabling PUSCH UE side in RT 2019-10-08 09:30:14 +02:00
yilmazt
fbb5b54841 Merge branch 'develop-nr' into develop-nr_cppcheck 2019-10-07 15:18:25 +02:00
Raphael Defosseux
3a57b05893 CI: fix after merge conflicts...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-10-07 14:52:46 +02:00
Florian Kaltenberger
6548ae15d2 Merge branch 'nr-fo-fix' into 'develop-nr'
fix on dot_product64

See merge request oai/openairinterface5g!684
2019-10-07 14:13:03 +02:00
Sakthivel Velumani
7e0f257299 updated k indexing for PDSCH extraction 2019-10-07 12:22:27 +02:00
yilmazt
5f46038ed5 Merge branch 'develop-nr' into develop-nr_cppcheck 2019-10-07 12:09:18 +02:00
yilmazt
3a04f8f0ed Merge branch 'develop-nr_cppcheck' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-nr_cppcheck 2019-10-07 12:05:26 +02:00
yilmazt
e5a9f02af6 develop-nr merge 2019-10-07 12:04:58 +02:00
Sakthivel Velumani
52903c760e Merge branch 'nr-pdsch-extraction-bugfix' into nr-coreset-bug-fix 2019-10-07 10:29:15 +02:00
Francesco Mani
cba58a50a2 Merge branch 'develop-nr' into nr-coreset-bug-fix 2019-10-07 10:14:58 +02:00
Francesco Mani
3b14504237 Merge branch 'develop-nr' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-nr 2019-10-07 10:13:01 +02:00
Cedric Roux
1fe39ae262 remove compilation warning (may not be correct) 2019-10-07 10:09:28 +02:00
Raymond Knopp
5e1c31019d fixed issues when extracting pdsch REs in UE for positive frequency portion of BWP 2019-10-07 08:32:46 +02:00
Raphael Defosseux
cbb9464bac Merge branch '448-ldpc-decoder-optimizations' into 'develop-nr'
Resolve "LDPC Decoder Optimizations"

See merge request oai/openairinterface5g!680
2019-10-05 11:24:04 +02:00
Sebastian Wagner
03da0a5ed8 CI: fixing compilation warning in phy simulators
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-10-05 11:24:03 +02:00
yilmazt
c348a9eec6 common thread-related minor functions in new .h file 2019-10-04 16:48:13 +02:00
Francesco Mani
987026bb86 fix on dot_product64 2019-10-04 16:38:24 +02:00
Raphael Defosseux
09fefc7162 CI: better yet not final tshark capture filter
initial support for iperf in distributed environment

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-10-04 15:59:45 +02:00
Raymond Knopp
dfbe9fc1fd nr-ip-over-LTE: Synch with develop-nr and modification of max limits on number of UEs and eNBs 2019-10-04 12:07:39 +02:00
Sakthivel Velumani
fbe231dcad PDSCH decoding independent of PDCCH duration 2019-10-04 11:31:27 +02:00
Sakthivel Velumani
d73f7388ed Merge branch 'nr-coreset-bug-fix' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr-coreset-bug-fix 2019-10-03 18:37:00 +02:00
Sakthivel Velumani
8961090d9a updates in pdsch channel estimation (to be discussed) 2019-10-03 18:36:07 +02:00
Francesco Mani
cab801a049 reverting to previous nr rate matching function 2019-10-03 17:11:33 +02:00
Francesco Mani
391b73c4fd adding the option of 16 bit crc at gNB 2019-10-03 17:05:00 +02:00
yilmazt
9aa3483235 executables compiling again 2019-10-03 16:00:46 +02:00
Florian Kaltenberger
c0ca7038f1 Merge remote-tracking branch 'origin/448-ldpc-decoder-optimizations' into nr_fapi_for_push 2019-10-03 13:56:25 +02:00
Raphael Defosseux
03526f90a8 CI: adding tshark capturing on EPC side
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-10-03 11:50:10 +02:00
sebastian
aae1fa524a Updated with documentation 2019-10-02 17:29:40 +02:00
Florian Kaltenberger (Italie)
b3bc216df1 hotfix for gps sync in usrp_lib.cpp 2019-10-02 16:57:21 +02:00
sebastian
4012f63b09 More documentation, Matlab BLER results to be updated. 2019-09-30 17:47:03 +02:00
Raphael Defosseux
996b90a397 Merge branch 'develop-nr-integration-2019-w40' into 'develop-nr'
develop-nr integration branch: 2019 week 40

The following MRs have been merged:

* MR 675 : code clean-up, remove RRC_VERSION macros and more
* MR 677 : fix for LTE X2 HO
2019-09-30 16:33:48 +02:00
Sakthivel Velumani
3a5d27c591 fix for DLSCH with non zero rb offset
CRC randomy fails for random payload (problem might be on gNB side)
2019-09-30 15:15:12 +02:00
sebastian
72999a1074 Clean up and documentation 2019-09-30 13:42:18 +02:00
Raphael Defosseux
7247786f69 CI: test-suite improvements
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-09-30 10:47:07 +02:00
Raphael Defosseux
6c19d1e663 Merge remote-tracking branch 'origin/nr-fix-lte-x2ho' into develop-nr-integration-2019-w40 2019-09-30 10:42:16 +02:00
Raphael Defosseux
71cf3eab92 Merge remote-tracking branch 'origin/issue141_remove_LTE_RRC_VERSION' into develop-nr-integration-2019-w40 2019-09-30 10:41:55 +02:00
matzakos
1f33048109 nr-ip-over-LTE: Minor modifications to allow compilation of nr phy_simulators 2019-09-29 21:04:59 +02:00
Raphael Defosseux
666332e129 CI: fixing tab names
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-09-27 22:16:05 +02:00
Francesco Mani
10667b3662 modification to rate matching (to be tested) 2019-09-27 18:26:13 +02:00
sebastian
6f351c3d3b Fixed bug in llr2CnProcBuf, started updating documentation 2019-09-27 17:47:15 +02:00
Francesco Mani
a5ebee1897 Merge branch 'nr-coreset-bug-fix' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr-coreset-bug-fix 2019-09-27 17:08:16 +02:00
Francesco Mani
57c01460c6 adding mcs tables and using good mcs for tbs computation 2019-09-27 17:07:16 +02:00
Raphael Defosseux
aa9afa0aba CI: adding the gNB + NR UE with N300 test in the develop-nr CI process!
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-09-27 16:17:25 +02:00
DUFRENE Louis Adrien TGI/OLS
77115590cd [not built] CDRX CU/DU split ok, in case of mono still MAC code in RRC 2019-09-27 16:06:25 +02:00
Raphael Defosseux
7090357e53 CI: Adding scenarios for COTS-UE
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-09-27 16:01:08 +02:00
Sakthivel Velumani
e8e92e1dab dlsim accepts command line params for dlsch config 2019-09-27 11:27:24 +02:00
Francesco Mani
d351060b6b making segmentation BG dependent 2019-09-27 10:21:56 +02:00
Raymond Knopp
024a41424c nr-ip-over-LTE: Debug logs rearrangements 2019-09-26 19:45:28 +02:00
Raymond Knopp
175c813faf Merge with develop-nr 2019-09-26 17:57:10 +02:00
Raphael Defosseux
6a9c5884f3 CI: adding support for iperf (UDP) with CUPS CN
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-09-26 15:50:04 +02:00
Florian Kaltenberger
9b00843b57 Merge remote-tracking branch 'origin/448-ldpc-decoder-optimizations' into nr_fapi_for_push 2019-09-26 15:40:07 +02:00
Florian Kaltenberger
c386c65a69 Merge remote-tracking branch 'origin/develop-nr' into nr_fapi_for_push 2019-09-26 15:39:41 +02:00
Francesco Mani
ef850d1238 Merge branch 'nr-coreset-bug-fix' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr-coreset-bug-fix 2019-09-26 15:14:36 +02:00
Sakthivel Velumani
f826eff564 more updates on pdsch offset 2019-09-26 11:11:05 +02:00
sebastian
d2875d0267 Now it compiles as well :) 2019-09-26 11:08:05 +02:00
sebastian
576198aa7b All optimizations done, all LUT deleted. Still some clean up to do. 2019-09-26 11:04:17 +02:00
Sakthivel Velumani
7db64f6981 a possible fix for pdsch prb offset problem (to be tested) 2019-09-26 10:05:20 +02:00
sebastian
a65f59c8c9 Adapted all for BG2, still somethings not working... to debug 2019-09-25 18:16:44 +02:00
Raphael Defosseux
0c280a8245 CI: fixing the OAI UE ifconfig command and the noS1 ping sequence
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-09-25 16:56:09 +02:00
Raphael Defosseux
c71e763919 CI: improvements on R2LAB deployment
- Add more IP routes / rules
  - OAI UE should be pingable!
  - Relative time column added to HTML report

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-09-25 15:56:54 +02:00
Sakthivel Velumani
5cd6476465 updated UE for PDCCH time first and interleaved mapping (cont. of commit b39d4530) 2019-09-25 15:27:18 +02:00
Florian Kaltenberger
af4242c61f temporary workaround for real-time issues
Conflicts:
	openair2/GNB_APP/gnb_config.c
2019-09-25 14:14:11 +02:00
Francesco Mani
1bbf2458ae Merge branch 'develop-nr' into nr-coreset-bug-fix 2019-09-25 12:43:09 +02:00
sebastian
6b5d2eee70 Optimization llr2cnProcBuf done for BG 1 2019-09-25 09:21:10 +02:00
Raymond Knopp
6d6d05535c nr-ip-over-LTE: Resolved issue with duplicate IP packet at the receiver UE IP interface and packet losses are reduced. Remaining to identify why occasionally IP packets are received at the PDCP stack later than the time slot of their arrival at PHY/MAC. Introduced some debug logs, to be removed later. 2019-09-24 18:53:39 +02:00
Francesco Mani
ee20e21351 adding an if for dmrs offset config 2019-09-24 17:54:16 +02:00
sebastian
42a4649afd Optimized llr2cnProcBuf for BG1 and R13 but needs clean up. 2019-09-24 17:50:51 +02:00
Sakthivel Velumani
fdeb4c987d fix for DMRS offset (to be test) 2019-09-24 17:15:33 +02:00
Cedric Roux
a0f0a49336 x2ho for lte: have it functional again (plus remove some logs) 2019-09-24 16:32:51 +02:00
Raphael Defosseux
8e17a35cef CI: fixing minor bugs
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-09-24 16:13:07 +02:00
yilmazt
84af6103f8 another batch of cppcheck error corrections 2019-09-24 11:59:17 +02:00
sebastian
508b63c444 Updated/Optimized nrLDPC_llrRes2llrOut 2019-09-24 11:03:46 +02:00
frtabu
b9b4d05e41 remove RRC_VERSION macros, simplify build-oai and CMakefile.txt accordingly, get rid of remaining compilation warnings (opt module improperly merged and patch asn1c files with tests against max 64 bits integer value) 2019-09-23 19:46:44 +02:00
Sakthivel Velumani
2ee5164cab introduced DMRS offset before mapping to resources (to be tested) 2019-09-23 17:26:18 +02:00
sebastian
215315c79a Optimized llr2llrProcBuf for BG1 2019-09-23 15:57:40 +02:00
DUFRENE Louis Adrien TGI/OLS
2ca45bb3d7 [unbuilt] RRC Reconnection Complete for CU/DU done. Not done for monolithique 2019-09-23 11:43:38 +02:00
DUFRENE Louis Adrien TGI/OLS
93abc6d98b Merge branch 'orange_cdrx' of https://gitlab.forge.orange-labs.fr/afyf6286/oai-orange into orange_cdrx 2019-09-23 08:01:21 +02:00
Stefan Schaffelder
108aa72878 message-transfer-update 2019-09-23 08:01:02 +02:00
Stefan Schaffelder
e0b3e4fb89 rrc_eNB update 10/09 2019-09-23 08:01:02 +02:00
Stefan Schaffelder
1740153fae Status RRC-RECONFIGURED update 2019-09-23 08:01:02 +02:00
Stefan Schaffelder
020f0ef9e9 cdrx_configured update 2019-09-23 08:01:02 +02:00
Stefan Schaffelder
ddc336e2d8 asn1_msg.do_DrxConfig 2019-09-23 08:01:02 +02:00
sebastian
7e4d2f03bb cn2bnProc/bn2cnProc optimization done for BG1, 11MB gained 2019-09-20 16:41:04 +02:00
Wang Tsu-Han
b2275c7b48 adding time stats for ru 2019-09-20 15:39:17 +02:00
Sakthivel Velumani
b39d453098 PDCCH time first mapping fix for UE side (fix only for non interleaved mapping) 2019-09-20 14:26:12 +02:00
Florian Kaltenberger
348343be8f the gNB scheduler now schedules both UL and DL 2019-09-20 11:44:01 +02:00
sebastian
db71a0b98c cn2bnProc is done 2019-09-20 11:24:06 +02:00
Raphael Defosseux
c86f8d6539 CI: first scripts for Inria R2LAB deployment
-- Adding the python framework of build and test to inria r2lab pipeline
  -- R2LAB pipeline has logCollections and artifacts storing
  -- Python framework should support latest Rel14 OAI openair-cn/cn-cups EPC
  -- Pipeline uses the latest version of booking-lease script (by duration)
  -- Support for distributed smartphone adb servers
  -- Initial scenarios:
     ** Build on one OAI 4G eNB and one OAI 4G UE
     ** Test in FDD band7 / 5MHz / TM1 in noS1 configuration
     ** Test in FDD band7 / 5MHz / TM1 with latest OpenAir-CN-CUPS --> just attachment

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-09-20 09:32:09 +02:00
sebastian
51a45a4d12 Starting to put in the new reduced LUTs 2019-09-19 18:10:57 +02:00
Francesco Mani
5fcee9ccdc removing frequency first mapping (to be tested) 2019-09-19 16:54:36 +02:00
Raymond Knopp
889bc96c5d nr-ip-over-LTE: Small fixes, now IP traffic is received at the IP interface of the UE but there are many packet losses and occasionally there are duplicate ping requests received, leading to UE crashing 2019-09-18 18:59:38 +02:00
sebastian
79de8953aa Optimization of bn2cn shuffling 2019-09-18 17:37:16 +02:00
Wang Tsu-Han
046920e6bb changing ru process from slot base to symbol base 2019-09-18 16:36:50 +02:00
Francesco Mani
12ac400755 removing dmrs offset 2019-09-18 15:59:10 +02:00
Raymond Knopp
9c57aff287 nr-ip-over-LTE: Temporary workaround for issue with ldpc number of iterations and reduction of logs 2019-09-18 13:28:45 +02:00
Javier Morgade
3fbaf01eb3 Minor changes to also nable MBMS TUN interfaces with S1
ACKNOWLEDGEMENT:
 	1. This commit was developed at Vicomtech (https://www.vicomtech.org) under UE project CDN-X-ALL: "CDN edge-cloud computing for efficient cache and reliable streaming aCROSS Aggregated unicast-multicast LinkS"
 	2. Project funded by Fed4FIRE+ OC5 (https://www.fed4fire.eu)

	Signed-off-by: Javier Morgade <javier.morgade@ieee.org>
2019-09-18 12:57:22 +02:00
LouisAdrien
0bc7cf7c2f comment cdrx 2019-09-18 10:47:19 +02:00
Stefan Schaffelder
7e088701e1 message-transfer-update 2019-09-18 10:47:19 +02:00
Stefan Schaffelder
cd6b19fa53 rrc_eNB update 10/09 2019-09-18 10:47:19 +02:00
Stefan Schaffelder
73a90bf637 Status RRC-RECONFIGURED update 2019-09-18 10:47:19 +02:00
Stefan Schaffelder
28a4d4f501 cdrx_configured update 2019-09-18 10:47:19 +02:00
Stefan Schaffelder
f8c25858f2 asn1_msg.do_DrxConfig 2019-09-18 10:47:19 +02:00
Sakthivel Velumani
f296b84dcb added coreset offset test cases to the list 2019-09-18 10:21:40 +02:00
Sakthivel Velumani
c5586c2348 Added option to set coreset offset for dlsim 2019-09-18 10:10:53 +02:00
Stefan Schaffelder
189393f655 message-transfer-update 2019-09-17 16:15:58 +02:00
Sakthivel Velumani
053c292859 removed the unused for clause 2019-09-17 14:56:34 +02:00
Javier Morgade
143214e7b4 Remove few Cpp Warnings
ACKNOWLEDGEMENT:
 	1. This commit was developed at Vicomtech (https://www.vicomtech.org) under UE project CDN-X-ALL: "CDN edge-cloud computing for efficient cache and reliable streaming aCROSS Aggregated unicast-multicast LinkS"
 	2. Project funded by Fed4FIRE+ OC5 (https://www.fed4fire.eu)

	Signed-off-by: Javier Morgade <javier.morgade@ieee.org>
2019-09-17 13:15:08 +02:00
matzakos
f629b77e63 nr-ip-over-LTE: Add checks for noS1 use case (nr-UE side) 2019-09-17 11:44:12 +02:00
Javier Morgade
5f29a4e5a0 Code cleanup
-Removing unused files

	ACKNOWLEDGEMENT:
 	1. This commit was developed at Vicomtech (https://www.vicomtech.org) under UE project CDN-X-ALL: "CDN edge-cloud computing for efficient cache and reliable streaming aCROSS Aggregated unicast-multicast LinkS"
 	2. Project funded by Fed4FIRE+ OC5 (https://www.fed4fire.eu)

	Signed-off-by: Javier Morgade <javier.morgade@ieee.org>
2019-09-16 22:36:50 +02:00
Raymond Knopp
ec627f7c55 nr-ip-over-LTE: Add checks for noS1 use case (gNB side) 2019-09-16 18:26:59 +02:00
Sakthivel Velumani
3685b0936a removed the 2 lines added in previous merge 2019-09-16 16:19:37 +02:00
yilmazt
47825cbc6a Merge branch 'develop-nr' into develop-nr_cppcheck 2019-09-16 15:45:20 +02:00
Raymond Knopp
46c8d18151 nr-ip-over-LTE: Modification to support both use cases: DLSCH phy-test scheduling (random data generation in every opportunity) AND DLSCH scheduling only when there is IP traffic arriving through the LTE stack (noS1 mode) 2019-09-16 14:35:28 +02:00
Javier Morgade
cad6e8a274 Enable MBMS USRP E2E operation
-reference config files updated

	ACKNOWLEDGEMENT:
 	1. This commit was developed at Vicomtech (https://www.vicomtech.org) under UE project CDN-X-ALL: "CDN edge-cloud computing for efficient cache and reliable streaming aCROSS Aggregated unicast-multicast LinkS"
 	2. Project funded by Fed4FIRE+ OC5 (https://www.fed4fire.eu)

	Signed-off-by: Javier Morgade <javier.morgade@ieee.org>
2019-09-16 13:59:27 +02:00
Javier Morgade
4405275bb3 MBMS UE/eNB scheduler adjustments to avoid RLC misalignments and false MTCH detections
ACKNOWLEDGEMENT:
 	1. This commit was developed at Vicomtech (https://www.vicomtech.org) under UE project CDN-X-ALL: "CDN edge-cloud computing for efficient cache and reliable streaming aCROSS Aggregated unicast-multicast LinkS"
 	2. Project funded by Fed4FIRE+ OC5 (https://www.fed4fire.eu)

Signed-off-by: Javier Morgade <javier.morgade@ieee.org>
2019-09-16 12:13:59 +02:00
Dr.-Ing. Javier Morgade
ae4beed07d BUGFIX
ACKNOWLEDGEMENT:
 	1. This commit was developed at Vicomtech (https://www.vicomtech.org) under UE project CDN-X-ALL: "CDN edge-cloud computing for efficient cache and reliable streaming aCROSS Aggregated unicast-multicast LinkS"
 	2. Project funded by Fed4FIRE+ OC5 (https://www.fed4fire.eu)

Signed-off-by: Javier Morgade <javier.morgade@ieee.org>
2019-09-16 09:41:08 +02:00
Javier Morgade
9393ad95bf commit just to trigger CI again: looks no commercial UEs were connected during the test ?
ACKNOWLEDGEMENT:
 	1. This commit was developed at Vicomtech (https://www.vicomtech.org) under UE project CDN-X-ALL: "CDN edge-cloud computing for efficient cache and reliable streaming aCROSS Aggregated unicast-multicast LinkS"
 	2. Project funded by Fed4FIRE+ OC5 (https://www.fed4fire.eu)

Signed-off-by: Javier Morgade <javier.morgade@ieee.org>
2019-09-14 15:57:14 +02:00
Javier Morgade
8565b28a31 LOG level decreassed
BUGIFX PDCP MBMS PIPE

	ACKNOWLEDGEMENT:
 	1. This commit was developed at Vicomtech (https://www.vicomtech.org) under UE project CDN-X-ALL: "CDN edge-cloud computing for efficient cache and reliable streaming aCROSS Aggregated unicast-multicast LinkS"
 	2. Project funded by Fed4FIRE+ OC5 (https://www.fed4fire.eu)

	Signed-off-by: Javier Morgade <javier.morgade@ieee.org>
2019-09-14 14:40:34 +02:00
Javier Morgade
de96a82365 -Dissable temporary some features at RU
-Refence config file cleanup

	ACKNOWLEDGEMENT:
 	1. This commit was developed at Vicomtech (https://www.vicomtech.org) under UE project CDN-X-ALL: "CDN edge-cloud computing for efficient cache and reliable streaming aCROSS Aggregated unicast-multicast LinkS"
 	2. Project funded by Fed4FIRE+ OC5 (https://www.fed4fire.eu)

	Signed-off-by: Javier Morgade <javier.morgade@ieee.org>
2019-09-14 14:12:05 +02:00
Javier Morgade
334e3a57ef 1. Reference config file defined with basic MBMS configuration stuff
2. Dedicated MBMS tasks manager:
	   -If MBMS gets enabled through softmodem config file it will launch SCTP task (to check with S1 interface)
	3. "On the flight" dynamic RU configuration update mechanism implemented

	ACKNOWLEDGEMENT:
 	1. This commit was developed at Vicomtech (https://www.vicomtech.org) under UE project CDN-X-ALL: "CDN edge-cloud computing for efficient cache and reliable streaming aCROSS Aggregated unicast-multicast LinkS"
 	2. Project funded by Fed4FIRE+ OC5 (https://www.fed4fire.eu)

	Signed-off-by: Javier Morgade <javier.morgade@ieee.org>
2019-09-14 13:59:53 +02:00
Javier Morgade
2bd1e119dd missing file
ACKNOWLEDGEMENT:
 	1. This commit was developed at Vicomtech (https://www.vicomtech.org) under UE project CDN-X-ALL: "CDN edge-cloud computing for efficient cache and reliable streaming aCROSS Aggregated unicast-multicast LinkS"
 	2. Project funded by Fed4FIRE+ OC5 (https://www.fed4fire.eu)

	Signed-off-by: Javier Morgade <javier.morgade@ieee.org>
2019-09-14 13:58:47 +02:00
Javier Morgade
365527d401 M3AP 3GPP TS 36.444 interface implemented:
1.MME entity developed to handle M3 side (new dedicated task developed: TASK_MME_APP) (these procedures should be moved to OPENAIR-CN ... just implemented to easy the E-UTRAN MBMS stuff development)
        2.MCE side M3 interface procedures (new dedicated task developed: TASK_M3AP_MCE)
        3.MME side M3 interface procedures (new dedicated task developed: TASK_M2AP_MME) (these procedures should be moved to OPENAIR-CN ... just implemented to easy the E-UTRAN MBMS stuff development)
        4.ASN1 bindings for m3ap-14.0.0.asn1 implemented and tested
        5.MME config parameters

	ACKNOWLEDGEMENT:
 	1. This commit was developed at Vicomtech (https://www.vicomtech.org) under UE project CDN-X-ALL: "CDN edge-cloud computing for efficient cache and reliable streaming aCROSS Aggregated unicast-multicast LinkS"
 	2. Project funded by Fed4FIRE+ OC5 (https://www.fed4fire.eu)

	Signed-off-by: Javier Morgade <javier.morgade@ieee.org>
2019-09-14 13:53:39 +02:00
Javier Morgade
ab04e0e469 M2AP 3GPP TS 36.443 interface implemented:
1.MCE (Multicast Control Entity) entity developed (new dedicated task developed: TASK_MCE_APP)
	2.eNB side M2 interface procedures (new dedicated task developed: TASK_M2AP_ENB)
	3.MCE side M2 interface procedures (new dedicated task developed: TASK_M2AP_MCE)
	4.ASN1 bindings for m2ap-14.0.0.asn1 implemented and tested
	5.MCE config parameters

	ACKNOWLEDGEMENT:
 	1. This commit was developed at Vicomtech (https://www.vicomtech.org) under UE project CDN-X-ALL: "CDN edge-cloud computing for efficient cache and reliable streaming aCROSS Aggregated unicast-multicast LinkS"
 	2. Project funded by Fed4FIRE+ OC5 (https://www.fed4fire.eu)

	Signed-off-by: Javier Morgade <javier.morgade@ieee.org>
2019-09-14 13:45:27 +02:00
Javier Morgade
3992eb9e87 -MBMS RRC procedures for M2AP
-On the fligh MBMS recofiguration for MBSFN, sib13,sib2 and MCCH enabled through M2 interface (MCE)
	-RRC NAS update for MBMS TUN interfaces configuration
	-UE RRC modified to handle dynamic SIB2 (MBSFN Subframe Config Lists), SIB13 (MCCH) reconfigurations (TO CAREFULLY BE CHECKED)

	ACKNOWLEDGEMENT:
 	1. This commit was developed at Vicomtech (https://www.vicomtech.org) under UE project CDN-X-ALL: "CDN edge-cloud computing for efficient cache and reliable streaming aCROSS Aggregated unicast-multicast LinkS"
 	2. Project funded by Fed4FIRE+ OC5 (https://www.fed4fire.eu)

	Signed-off-by: Javier Morgade <javier.morgade@ieee.org>
2019-09-14 13:36:09 +02:00
Javier Morgade
97bc5e9292 Few missing files from previous commit
ACKNOWLEDGEMENT:
 	1. This commit was developed at Vicomtech (https://www.vicomtech.org) under UE project CDN-X-ALL: "CDN edge-cloud computing for efficient cache and reliable streaming aCROSS Aggregated unicast-multicast LinkS"
 	2. Project funded by Fed4FIRE+ OC5 (https://www.fed4fire.eu)

	Signed-off-by: Javier Morgade <javier.morgade@ieee.org>
2019-09-14 13:34:08 +02:00
Javier Morgade
dc14cdc665 *L2 procedures to enable mixed unicast/broadcast operation at ENB implemeted:
-MBMS scheduler developed (oneFrame allocations implemented at this time)
	-UE DSLCH schedulers updated: if an eMBMS session running UE DTCH, DCCH will be only scheduled at non MBSFN sufbframes
	-eMBMS L2 procedures implemented
	-Dedicated MBMS PDCP pipes src/sink enabled (only for TUN)
	-BUGFIX eMBMS MAC procedures (wrong indexing at few loops)
	-ENB FAPI updated to enable dynamic MBSFN configurations through M2AP (RRC<->MCE)

	ACKNOWLEDGEMENT:
 	1. This commit was developed at Vicomtech (https://www.vicomtech.org) under UE project CDN-X-ALL: "CDN edge-cloud computing for efficient cache and reliable streaming aCROSS Aggregated unicast-multicast LinkS"
 	2. Project funded by Fed4FIRE+ OC5 (https://www.fed4fire.eu)

	Signed-off-by: Javier Morgade <javier.morgade@ieee.org>
2019-09-14 13:23:30 +02:00
Javier Morgade
bcf42ca2a5 Implemented M2AP managing procedures at eNB (ENB_APP)
-M2 register against MCE (Multicast Control Entity)
	-Basic M2AP control procedures developed (eNB<-M2AP->MCE)

	ACKNOWLEDGEMENT:
 	1. This commit was developed at Vicomtech (https://www.vicomtech.org) under UE project CDN-X-ALL: "CDN edge-cloud computing for efficient cache and reliable streaming aCROSS Aggregated unicast-multicast LinkS"
 	2. Project funded by Fed4FIRE+ OC5 (https://www.fed4fire.eu)

	Signed-off-by: Javier Morgade <javier.morgade@ieee.org>
2019-09-14 13:19:00 +02:00
javier.morgade@ieee.org
f76cc82448 New common definitons for M2,M3 interfaces
-3GPP TS version 36.443 and 36.444

	ACKNOWLEDGEMENT:
 	1. This commit was developed at Vicomtech (https://www.vicomtech.org) under UE project CDN-X-ALL: "CDN edge-cloud computing for efficient cache and reliable streaming aCROSS Aggregated unicast-multicast LinkS"
 	2. Project funded by Fed4FIRE+ OC5 (https://www.fed4fire.eu)

	Signed-off-by: javier.morgade@ieee.org <javier.morgade@ieee.org>
2019-09-14 13:13:00 +02:00
javier.morgade@ieee.org
400c5458d4 Dedicated TUN interfaces for eMBMS oaitun_enm1 (eNB) <-> oaitun_uem1 (UE)
ACKNOWLEDGEMENT:
 	1. This commit was developed at Vicomtech (https://www.vicomtech.org) under UE project CDN-X-ALL: "CDN edge-cloud computing for efficient cache and reliable streaming aCROSS Aggregated unicast-multicast LinkS"
 	2. Project funded by Fed4FIRE+ OC5 (https://www.fed4fire.eu)

	Signed-off-by: javier.morgade@ieee.org <javier.morgade@ieee.org>
2019-09-14 13:05:38 +02:00
javier.morgade@ieee.org
65133d4e18 Implemented eMBMS FFT procedures (scheduling)
ACKNOWLEDGEMENT:
 	1. This commit was developed at Vicomtech (https://www.vicomtech.org) under UE project CDN-X-ALL: "CDN edge-cloud computing for efficient cache and reliable streaming aCROSS Aggregated unicast-multicast LinkS"
 	2. Project funded by Fed4FIRE+ OC5 (https://www.fed4fire.eu)

	Signed-off-by: javier.morgade@ieee.org <javier.morgade@ieee.org>
2019-09-14 13:02:56 +02:00
javier.morgade@ieee.org
1f50bea34a PMCH L1 Procedures updated
ACKNOWLEDGEMENT:
 	1. This commit was developed at Vicomtech (https://www.vicomtech.org) under UE project CDN-X-ALL: "CDN edge-cloud computing for efficient cache and reliable streaming aCROSS Aggregated unicast-multicast LinkS"
 	2. Project funded by Fed4FIRE+ OC5 (https://www.fed4fire.eu)

	Signed-off-by: javier.morgade@ieee.org <javier.morgade@ieee.org>
2019-09-14 13:00:06 +02:00
javier.morgade@ieee.org
ac1347843f COMMON types updated: VCD,FAPI
ACKNOWLEDGEMENT:
 	1. This commit was developed at Vicomtech (https://www.vicomtech.org) under UE project CDN-X-ALL: "CDN edge-cloud computing for efficient cache and reliable streaming aCROSS Aggregated unicast-multicast LinkS"
 	2. Project funded by Fed4FIRE+ OC5 (https://www.fed4fire.eu)

	Signed-off-by: javier.morgade@ieee.org <javier.morgade@ieee.org>
2019-09-14 12:55:32 +02:00
Florian Kaltenberger
69aef4684a Merge branch 'develop-nr-fix-l2-nfapi-sim' into 'develop-nr'
nFAPI fix for L2 nFAPI simulator.

See merge request oai/openairinterface5g!670
2019-09-13 17:59:08 +02:00
Florian Kaltenberger
04ea6a482b Merge branch '442-integrate-pusch-into-nr-ue-softmodem' of https://gitlab.eurecom.fr/oai/openairinterface5g into 442-integrate-pusch-into-nr-ue-softmodem 2019-09-13 16:21:58 +02:00
Florian Kaltenberger
257b70a7eb PUSCH now scheduled in slot 2 2019-09-13 16:21:30 +02:00
Florian Kaltenberger
f4758a17da temporary workaround for real-time issues 2019-09-13 15:31:25 +02:00
Francesco Mani
d64533bc9d bugfix in monitoring_symbols_in_slot 2019-09-12 17:18:11 +02:00
Francesco Mani
34efe2973f temporary fix for minimum bandwidth in mib decoding 2019-09-12 17:12:39 +02:00
yilmazt
54899a9be1 merge of develop&develop-nr 2019-09-12 16:02:36 +02:00
Sakthivel Velumani
adc3ab4e8f 1.Fixed bug in setting UE's coreset.frequecny_domain_resource
2.Set UE's coreset.rb_offset according to gNB's
2019-09-11 18:16:43 +02:00
Sakthivel Velumani
8119806fb7 Fixed a bug that skips some rbs when extracting DCIs (happens for non zero rb_offset) 2019-09-11 18:10:38 +02:00
Sakthivel Velumani
2af315bdf1 Removed the PDCCH DMRS offset which was unnecessary according to 38.211 7.4.1.3 2019-09-11 18:05:51 +02:00
Florian Kaltenberger
37a5ee9639 temporary workaround for real-time issues 2019-09-11 16:18:54 +02:00
Florian Kaltenberger (Italie)
a9e07dce5f updating beamforming weights 2019-09-11 13:50:05 +02:00
Raphael Defosseux
861eecf6db nFAPI fix for L2 nFAPI simulator.
Suggestion by Haruki NAOI.

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-09-11 09:24:32 +02:00
Raphael Defosseux
bc01744e6f CI: improving 5G-NR framework
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-09-10 21:53:20 +02:00
yilmazt
7f72360dc5 Merge branch 'develop-nr' into develop-nr_cppcheck 2019-09-10 16:38:40 +02:00
yilmazt
aec1263e71 initial cppcheck fixes 2019-09-10 16:37:06 +02:00
Stefan Schaffelder
33d7dedd05 rrc_eNB update 10/09 2019-09-10 15:46:25 +02:00
Wang Tsu-Han
3ac6e3e5a5 fixing for sampling rate 2019-09-10 09:32:09 +02:00
Florian Kaltenberger
0911624fe2 Merge branch 'integration_develop-nr_w37' into 'develop-nr'
Integration develop nr w37

See merge request oai/openairinterface5g!668
2019-09-10 09:18:57 +02:00
Raphael Defosseux
cd0f0f2fc0 CI: increased phy-sim test time-out to 45 minutes
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-09-09 16:18:49 +02:00
Wang Tsu-Han
9ccb93a094 adding mask for feptx thread and VCD logging 2019-09-09 15:36:08 +02:00
Florian Kaltenberger
be442d7993 Merge remote-tracking branch 'origin/interoperability-test' into integration_develop-nr_w37 2019-09-09 10:50:13 +02:00
Florian Kaltenberger
a1472f677b Merge remote-tracking branch 'origin/nr-timing-measurement' into integration_develop-nr_w37
Conflicts:
	executables/nr-ru.c
	nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h
2019-09-09 10:49:56 +02:00
Florian Kaltenberger
8466c0c5a2 Merge remote-tracking branch 'origin/443-add-support-to-create-vcd-files-in-develop-nr' into integration_develop-nr_w37 2019-09-09 10:29:11 +02:00
javier.morgade@ieee.org
de46db5f6e M2AP, M3AP common defs 2019-09-08 21:59:38 +02:00
javier.morgade@ieee.org
2a35715c9e M2AP, M3AP ITTI message defs/types 2019-09-08 21:53:13 +02:00
javier.morgade@ieee.org
65fd0de559 Merge remote-tracking branch 'origin/develop' into fed4fire_fec5_cdn-x-all 2019-09-08 21:46:20 +02:00
Florian Kaltenberger
6d69a1069f adding PHY side of FAPI UL handling 2019-09-06 18:12:13 +02:00
Florian Kaltenberger
2f402b1055 reducing number of UEs to save memory 2019-09-06 18:11:54 +02:00
Florian Kaltenberger
e96dfd4b52 adding PHY side of FAPI UL handling 2019-09-06 16:25:41 +02:00
matzakos
157a4f7b46 nr-ip-over-lte :Enable TUN interface at nrUE and required (LTE-based) PDCP, RLC configuration for DL IP traffic flow. Traffic received at the UE TUN IP interface successfully now. 2019-09-06 16:16:37 +02:00
Florian Kaltenberger
7fb14ab321 adding MAC part of 5G FAPI interface for PUSCH. Since the previous version was incomplete anyway I merged in the new SCF specs and used those (only for PUSCH). Todo: implement PHY part. 2019-09-05 16:40:31 +02:00
Raphael Defosseux
0fe0dd89bb CI: CDRX testing was limited to 1 UE due to instability. Back to normal testing
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-09-05 15:53:01 +02:00
Stefan Schaffelder
8ba41e82a2 Status RRC-RECONFIGURED update 2019-09-05 15:27:26 +02:00
Sakthivel Velumani
21d24c6aea Had set UE's PDSCH start_symbol to match with gNB's. 2019-09-05 14:44:01 +02:00
Florian Kaltenberger
fa040160d0 Merge remote-tracking branch 'origin/5g_fapi_scf' into 442-integrate-pusch-into-nr-ue-softmodem 2019-09-05 06:42:30 +02:00
Raymond Knopp
b3a26f9548 New merge with develop-nr. DL IP traffic reaching up to UE's MAC layer now successfully. 2019-09-04 17:40:08 +02:00
Raphael Defosseux
edb74831da CI: proper pipeline fix?
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-09-03 18:30:04 +02:00
Stefan Schaffelder
b01623f698 cdrx_configured update 2019-09-03 15:42:45 +02:00
Raphael Defosseux
c622896876 CI: fix in pipeline
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-09-03 15:03:29 +02:00
Raphael Defosseux
e880141244 Merge branch 'develop_integration_2019_w36' into 'develop'
Develop Integration Branch: 2019 week 36

The following MR are included:

* MR 653 : Feature LTE-M PUSCH CE - 8 Repetitions
* MR 654 : Rfsimu config and CI scripting updates
2019-09-03 14:54:52 +02:00
Stefan Schaffelder
5f00b40e45 asn1_msg.do_DrxConfig 2019-09-03 14:17:58 +02:00
Raphael Defosseux
ed2b77529b CI: better handling of test failures
-- Properly stopping FlexRan Ctl in case of failure

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-09-03 11:21:30 +02:00
Raphael Defosseux
4b441fc473 CI: better handling of test failures
-- IperfNoS1 when eNB crashed
  -- LTE-M module failed attachment
  -- LTE-M module pinging

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-09-03 11:20:50 +02:00
Raphael Defosseux
ac711d9adf Merge remote-tracking branch 'origin/rfsimu_config' into develop_integration_2019_w36 2019-09-03 11:19:34 +02:00
Wang Tsu-Han
009bacc8af fixes for feptx LTE 2019-08-30 17:04:09 +02:00
Wang Tsu-Han
131ad5383d adding precoding into feptx thread and having 2 threads per antenna 2019-08-30 15:06:16 +02:00
Raphael Defosseux
9881036cf3 CI: fixing the CI 5G-NR job
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-08-30 13:48:20 +02:00
Florian Kaltenberger
dd7a65ceba temporary workaround for real-time issues 2019-08-29 17:51:37 +02:00
Khalid Ahmed
9078c5dcb2 Adding VCD functions to NR dlschsim 2019-08-29 09:10:32 +02:00
Khalid Ahmed
aec5ebcfff Adding VCD liberaries to dlschsim 2019-08-28 10:53:40 +02:00
Khalid Ahmed
c984c71f52 Adding VCD liberaries to nr-softmodem/nr-uesoftmodem 2019-08-28 10:52:29 +02:00
Florian Kaltenberger
7a1a9f8363 Merge branch 'rfsimu_config' of https://gitlab.eurecom.fr/oai/openairinterface5g into rfsimu_config 2019-08-26 11:55:56 +02:00
Florian Kaltenberger
517afa5a45 adding example config for rfsimulator 2019-08-26 11:54:49 +02:00
Florian Kaltenberger
013d82ac30 making replay_node compile again 2019-08-26 11:52:03 +02:00
frtabu
90c708c10e bug fixing in the way customized behavior of CI depending of jenkins server is triggered 2019-08-23 19:08:09 +02:00
Ahmed Hussein
e27a88f6a6 Adding new command line parameters 2019-08-23 16:08:57 +02:00
Ahmed Hussein
45c764a3ae Adding TA estimation at gNB PHY for TA updates 2019-08-23 16:08:57 +02:00
Ahmed Hussein
5ba4de4d1d Reordering frame and SNR loops 2019-08-23 16:08:57 +02:00
Ahmed Hussein
768d214122 Providing time domain channel estimates 2019-08-23 16:08:57 +02:00
Ahmed Hussein
53e6a5223c Minor Fixes in ulsim 2019-08-23 16:08:57 +02:00
Ahmed Hussein
f398e4999b Set start_rb to 0
- start_rb was set to 30, and nb_rb was set to 50 with NB_RB_DL = 106.
- When the DC subcarrier is included in the RB allocation,
  this causes errors in FFT/IFFT operations arounf the DC subcarrier
- This leads to errors in unscrambling and decoding
2019-08-23 16:08:57 +02:00
Ahmed Hussein
2660f4ea4f Added frame loop to ulsim 2019-08-23 16:08:57 +02:00
Ahmed Hussein
0e78faa744 TBS fix at UE side + minor restructuring in "phy_procedures_nrUE_TX"
- TBS calculation was performed 2 times. Once in "phy_procedures_nrUE_TX" and
  another in "nr_ue_ulsch_procedures". The TBS calculation was wrong in "phy_procedures_nrUE_TX"
  and correct in "nr_ue_ulsch_procedures".

- The data generation was performed in "phy_procedures_nrUE_TX" with a wrongly
  calculated TBS because "ulsch_ue->nb_re_dmrs" wasn't set to a value, so the calculated
  TBS would be more than it should be. This doesn't create a problem in the test because
  the comparison between the TX and RX data is made using the correctly calculated TBS
  which is smaller.

- Solution was to perform data generation in "nr_ue_ulsch_procedures", and remove TBS calculation
  in "phy_procedures_nrUE_TX"
2019-08-23 16:08:57 +02:00
Ahmed Hussein
294e425645 Minor fixes and edits in ulsch_decoding 2019-08-23 16:08:57 +02:00
Khalid Ahmed
1d35890259 Add macro to print CRC OK at gNB PUSCH 2019-08-23 16:08:57 +02:00
Khalid Ahmed
c4ae0b0691 Fixing TDD mode using USRP x300 2019-08-23 16:08:57 +02:00
Khalid Ahmed
bb2efbe42c optimizing nr_ue_ulsch_procedures 2019-08-23 16:08:57 +02:00
Ahmed Hussein
779e8996e3 Minor fixes
- removing "Nsymb_pusch" and "Nsc_pusch" from "NR_UE_ULSCH_t"
- using "number_of_symbols" from "NR_UL_UE_HARQ_t" instead
- removing "generate_ue_ulsch_params"
2019-08-23 16:08:57 +02:00
Khalid Ahmed
fc2bbeef69 Adding VCD liberaries to nr-softmodem/nr-uesoftmodem 2019-08-23 16:08:56 +02:00
Khalid Ahmed
69abec3df1 Fix ulsim and PUSCH in rf-simulator
- initialize PUSCH parameters properly
2019-08-23 16:08:56 +02:00
Thomas Schlichter
34899cd404 fix compilation of phy simulators introduced from the usage of get_band() 2019-08-23 16:08:56 +02:00
Khalid Ahmed
9148716641 TDD fixes in real-time environment 2019-08-23 16:08:56 +02:00
Khalid Ahmed
d12a824433 TDD in rfsimulator 2019-08-23 16:08:56 +02:00
Khalid Ahmed
2b94608329 handle tx_offset with negative value 2019-08-23 16:08:56 +02:00
Khalid Ahmed
35b85d456c fixing a memory leak in nr_ue_ulsch_procedures 2019-08-23 16:08:56 +02:00
Khalid Ahmed
f9b583e06e PUSCH running with rfsimulator 2019-08-23 16:08:56 +02:00
Thomas Schlichter
4541922258 fix crashes in nr_ulsch_decoding
- initialize p_decParams->Z from harq_process not only in round 0
- do not set opp_enabled=1, this crashes in LDPC encoder
2019-08-23 16:08:56 +02:00
Thomas Schlichter
f51796180d fix gNB linker error and various warnings 2019-08-23 16:08:56 +02:00
Ahmed Hussein
abfd072376 channel estimation, compensation, etc ..
Added the following folder:
- ../openair1/PHY/NR_ESTIMATION/

Added the following file to CMakelists.txt:
- ../openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c

Added the following functions:
- nr_pusch_dmrs_rx
- nr_gold_pusch
- nr_ulsch_channel_level
- nr_ulsch_channel_compensation
- nr_ulsch_scale_channel is commented out (I think only used for downlink)

Changes from Khalid Ahmed Mahmoud Mohamed:
- nr_pusch_channel_estimation is used
- nr_ulsch_scale_channel is used
- nr_ulsch_channel_level is used
- nr_ulsch_channel_compensation is used
- multiple logging options for channel and signal magnitude
2019-08-23 16:08:56 +02:00
Ahmed Hussein
9d27079f05 adding PUSCH procedures to gNB side in RT with some logs
- removed gNB RT from "ru_procedures.c" to "nr_ru_procedures"
- added a new thread "nr_feprx_thread"
- added some functionalities for fep for rx in "nr_ru_procedures.c"
2019-08-23 16:08:56 +02:00
Khalid Ahmed
978f683eca using LOG_I instead of LOG_D in RT PUSCH UE side 2019-08-23 16:08:56 +02:00
Khalid Ahmed
9d4f5b4de7 Adding Frame tx to LOG_D for debugging 2019-08-23 16:08:56 +02:00
Khalid Ahmed
8effb52c84 Restrict UL transmission to NR_UPLINK_SLOT 2019-08-23 16:08:56 +02:00
Thomas Schlichter
ece26036e6 Consolidate header files for nr_phy_scope 2019-08-23 16:08:56 +02:00
Khalid Ahmed
705f2c1e42 enabling PUSCH UE side in RT 2019-08-23 16:08:56 +02:00
Florian Kaltenberger
26f1e090c5 fixing a bug in the allocation of the UE HARQ structures that was causing a segfault. Fixing some compiler warnings 2019-08-23 14:06:46 +02:00
Florian Kaltenberger
ca1759b9e3 Merge branch '441-problems-transmitting-data-via-nr-pdsch' into 'develop-nr'
Resolve "Problems transmitting data via NR-PDSCH"

See merge request oai/openairinterface5g!658
2019-08-23 14:02:52 +02:00
Francois TABURET
bb57c61aa0 Update README.md 2019-08-21 11:30:36 +02:00
frtabu
84f16d4ce9 Merge branch 'rfsimu_config' of https://gitlab.eurecom.fr/oai/openairinterface5g into rfsimu_config 2019-08-21 11:25:31 +02:00
frtabu
3d66fbdb7a Documentation update and small allignement of build_oai script -w option with documentation 2019-08-21 11:17:37 +02:00
Florian Kaltenberger
f2f8d47384 hotfix: replacing msg with printf in unitary simulators (msg(...) was replaced with LOG_D(PHY,...) but it was used before log was initialized) 2019-08-20 09:13:02 +02:00
Raphael Defosseux
2ec61ea77e CI: fixing CI test flexran ctrl + basic simulator
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-08-20 16:43:23 +02:00
Kujou
20d41208c8 to test S3.4 2019-08-16 15:25:51 +08:00
Kujou
bea98773b0 Sec 3.4 2019-08-16 15:16:55 +08:00
Kujou
c8471c1e54 finish section 3.3 and 3.4 2019-08-16 05:24:04 +08:00
Kujou
fb4165d62b S3.3 compile OK 2019-08-14 22:55:53 +08:00
Wang Tsu-Han
21fa809ce0 Merge branch 'ru_parallel' into ru-parallel-beamforming
Conflicts:
	executables/nr-ru.c
	nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h
	openair1/SCHED_NR/nr_ru_procedures.c
2019-08-14 16:51:59 +02:00
Kujou
e901aa79ab fix .h 2019-08-14 22:24:48 +08:00
Francesco Mani
09d3c72144 fix on single beam transmission 2019-08-14 16:23:32 +02:00
Kujou
224b781848 to test 2019-08-14 21:45:12 +08:00
Kujou
4d84f5cd87 to test 2019-08-14 21:39:43 +08:00
Florian Kaltenberger
8677d44ae9 fixing a bug in UE FAPI interface 2019-08-14 14:51:38 +02:00
Florian Kaltenberger
dbc9472aaf fixes in beamforming 2019-08-14 11:34:02 +02:00
frtabu
aff1eb3e6b Add TESTPLATFORM variable in jenkins file 2019-08-13 19:08:11 +02:00
frtabu
4e68e79894 Merge branch 'rfsimu_config' of https://gitlab.eurecom.fr/oai/openairinterface5g into rfsimu_config 2019-08-13 18:50:40 +02:00
frtabu
237a5594cb Allow optional apt-caher in build script (default behavior unchanged) 2019-08-13 18:49:13 +02:00
frtabu
aa741af06b dd OPTIONAL_APTCACHER authorized variable in oai-vm-tools script 2019-08-13 18:43:58 +02:00
Francesco Mani
a292f82fe2 conficts solved after merge with develop-nr 2019-08-13 17:52:07 +02:00
frtabu
db66552ff9 modify ci to allow running without apt cacher (default behavior of enforcing apt-cacher unchanged) 2019-08-13 17:24:40 +02:00
frtabu
5edb3e36ce add ci platform specific script support in oai-vm-tools 2019-08-13 16:19:44 +02:00
Florian Kaltenberger
6197de2373 Merge branch 'develop-nr-merge' into 'develop-nr'
Develop nr merge

See merge request oai/openairinterface5g!588
2019-08-13 15:46:39 +02:00
Cedric Roux
de8e225797 bugfix: do not use memory on the stack in do_SIB1_MBMS, allocate it with malloc 2019-08-13 12:10:39 +02:00
Florian Kaltenberger
283207cdf2 Merge branch 'develop-nr-merge' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-nr-merge 2019-08-12 23:48:35 +02:00
Florian Kaltenberger
469afa4bb6 removing #ifdef XFORMS from nr-uesoftmodem.c 2019-08-12 23:47:51 +02:00
frtabu
c8870fbcbc add option in build_oai script to build all optional libraries 2019-08-12 17:01:23 +02:00
Cedric Roux
75778a76c2 bugfix: do not use memory on the stack in do_SIB1, allocate it with malloc 2019-08-12 16:57:19 +02:00
Kujou
75305c383b adding initial version of fapi_nr_interface_scf.h 2019-08-12 20:13:00 +08:00
Florian Kaltenberger
dcb0b5a452 Merge branch 'usrp_ref_locked' into 'develop-nr'
Usrp ref locked

See merge request oai/openairinterface5g!657
2019-08-12 11:23:00 +02:00
Florian Kaltenberger
1927e34312 Merge remote-tracking branch 'origin/develop-nr' into develop-nr-merge 2019-08-11 18:03:31 +02:00
javier.morgade@ieee.org
c830d758e7 Added M3AP ETSI TS 136 444 V14.0.0 ASN1 references
Added M2AP ETSI TS 136 443 V14.0.0 ASN1 references
2019-08-11 12:48:33 +02:00
Wang Tsu-Han
054156c16c Merge branch 'nr-timing-measurement' into ru_parallel
Conflicts:
	executables/nr-ru.c
2019-08-09 17:10:48 +02:00
Wang Tsu-Han
4fbf754de5 adding condition for multi L1 and TDD slot select in nr_feptx_prec 2019-08-09 16:55:18 +02:00
Cedric Roux
2368c9096a Merge branch 'develop-nr-merge' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-nr-merge 2019-08-09 15:59:41 +02:00
Cedric Roux
7967701de1 lte-softmodem: fix if4p5 (maybe incorrect)
For whatever reason, ru->frame_parms was NULL and the RRU crashed.
Let's allocated memory.

Also, don't do fp = ru->frame_parms in ru_thread, it seems that it
takes the value before allocation (so: NULL) and the code crashes
later on.

Maybe it's not the correct solution. To be refined at some point.
2019-08-09 15:57:25 +02:00
Florian Kaltenberger
58eae03b48 1. NR RU was using wrong config file descriptor. It should be the same as for the LTE RU and we should remove the NR RU config file descriptor (todo)
2. NR RU was calling feptx_prec from LTE RU procedures, which it should not. In the older versions this function didn't do anything anyway as there was a check on num_eNB, which is 0 for gNB. Now NR RU is not calling this function at all, but we have to write such a function for NR RU (todo)
2019-08-09 15:31:54 +02:00
yilmazt
98757d7693 Merge branch 'develop-nr-merge' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-nr-merge 2019-08-08 17:44:58 +02:00
yilmazt
7bb5320716 develop-nr up-to-date as of 8.8.19 2019-08-08 17:44:19 +02:00
Cedric Roux
5265ea3135 fix some more valgrind errors 2019-08-08 17:14:07 +02:00
Cedric Roux
1737fdf3fa fix some valgrind issues 2019-08-08 17:09:29 +02:00
Florian Kaltenberger
afc5020cca Merge branch 'integration_develop-nr_2019w32' into 'develop-nr'
Integration develop nr 2019w32

See merge request oai/openairinterface5g!656
2019-08-07 21:41:54 +02:00
frtabu
d3217ac30b fix phy simulators build Pb: move snr_dB global to simulation code, add a channel mode section in configuration for snr_dB ,add a parameter flag in the config module to allow omitting prefix when modifying a parameter (for compatibility of -s option) 2019-08-07 18:42:35 +02:00
Florian Kaltenberger
ce74dd3e95 adding checking of external clock reference to usrp_lib.cpp 2019-08-07 17:41:16 +02:00
Francesco Mani
46adc28e08 fixing segmentation fault for 1 nb_tx 2019-08-07 17:24:42 +02:00
Florian Kaltenberger
c4e43703ea removing superflous parameter usrp_clrsrc from command line 2019-08-07 17:23:16 +02:00
Florian Kaltenberger
37fe6c743e automatic UE sync adjust can be disabled from command line 2019-08-08 16:49:14 +02:00
Florian Kaltenberger
a54cdfa3fb UE phy scope now displays all OFDM symbols of PDSCH 2019-08-08 16:48:45 +02:00
Florian Kaltenberger
51aa523c50 bugfix from Fraunhofer 2019-08-08 16:48:22 +02:00
Francesco Mani
794aac4137 initializing beam_weights to I 2019-08-07 16:46:36 +02:00
Florian Kaltenberger
0080f007c3 Merge remote-tracking branch 'origin/update-to-2019-march-june-release' into integration_develop-nr_2019w32 2019-08-07 15:20:59 +02:00
Florian Kaltenberger
03ca7391d3 Merge remote-tracking branch 'origin/ue_adjust_gain' into integration_develop-nr_2019w32 2019-08-07 15:20:39 +02:00
Florian Kaltenberger
28cf0350fc Merge remote-tracking branch 'origin/ue_dlsch-multi-threading' into integration_develop-nr_2019w32 2019-08-07 15:20:17 +02:00
frtabu
f3a757ce5a add channel model option to rfsimulator and prevent common libraries re-compilation when using both --UE --eNB options in build_oai script 2019-08-06 19:10:55 +02:00
Francesco Mani
c97cd87d47 nrbeam_weights and num port as SSB 2019-08-06 18:28:09 +02:00
Cedric Roux
e6f056d0af improve x2ap_gNB_generate_ENDC_x2_setup_response 2019-08-05 16:55:45 +02:00
Francesco Mani
1d3023a5f6 adapting beamforming functions from LTE to NR 2019-08-01 18:08:30 +02:00
Cedric Roux
290c277486 Merge remote-tracking branch 'origin/dual-connectivity' into develop-nr-merge 2019-08-01 17:06:26 +02:00
Cedric Roux
2955ae4731 bugfix: compile with x2ap release 15.03 2019-08-01 17:02:27 +02:00
matzakos
43a53f9952 ENDC X2AP: Minor correction at x2ap decoder 2019-08-01 12:20:18 +02:00
Raymond Knopp
81c5da5f2f ENDC X2AP: Corrections at setup generation message and logs addition 2019-08-01 12:20:18 +02:00
matzakos
d605e5ffc3 ENDC for 5G NSA support: Basic implementation of x2ap_gNB_generate_ENDC_x2_setup_response() and x2ap_gNB_handle_ENDC_x2_setup_response() 2019-08-01 12:20:18 +02:00
Raymond Knopp
e7d5162400 ENDC: Minor addition in x2ap decoder 2019-08-01 12:19:17 +02:00
matzakos
8234afe8c5 ENDC for 5G NSA support (preparatory work): Basic implementation of x2ap_eNB_generate_ENDC_x2_setup_request() and x2ap_gNB_handle_ENDC_x2_setup_request() 2019-08-01 12:19:17 +02:00
matzakos
2adf459f6e Update X2AP to Rel.15 to support EN-DC X2 signaling for 5G Non-standalone 2019-08-01 12:19:17 +02:00
matzakos
3dee153067 Dual connectivity: Basic implementation of x2ap_eNB_handle_senb_addition_request and x2ap_eNB_generate_senb_addition_request_ack 2019-08-01 12:19:17 +02:00
Cedric Roux
175fb1769a dual connectivity: preparatory work
- basic version of x2ap_eNB_generate_senb_addition_request with dumb values
- skeleton functions:
    - x2ap_eNB_handle_senb_addition_request
    - x2ap_eNB_handle_senb_addition_request_acknowledge
    - x2ap_eNB_handle_senb_addition_request_reject
2019-08-01 12:17:10 +02:00
frtabu
7995f413ef add config options for rfsimulator, set a common lib for l1sim and rfsimulator, avoid simulation sources to be added twice in some execs (tau.c) 2019-07-31 18:31:02 +02:00
yilmazt
920c1452bd Minor changes to the organization of nr_phy simulators 2019-07-31 17:40:05 +02:00
Mohamed Gamal
e45794ce08 Remove build warning
Signed-off-by: Mohamed Gamal <mohammed.abdelkhalek.ext@orange.com>
2019-07-31 13:00:41 +02:00
Francesco Mani
2d35c28633 minor fix 2019-07-31 12:41:08 +02:00
yilmazt
4967e1b1ac develop&-nr up-to-date as of 30.7.19 2019-07-30 22:01:48 +02:00
frtabu
4d073a75bb Merge branch 'develop' into rfsimu_config 2019-07-29 18:22:58 +02:00
frtabu
741a012867 add rfsimulator configuration module support 2019-07-29 18:18:39 +02:00
Mohamed Gamal
16c8762c2b PUSCH Repetition confoiguration and combining
Functionalities Added:
	- Modify RAR message to use number of repetitions configuration added in last commit
	- Configure msg3 with number of repetitions
	- DCI configuration for repetitions
	- Repeat MAC UL config each SF for the number of repetitions
	- PHY combining of repeated SF

Signed-off-by: Mohamed Gamal <mohammed.abdelkhalek.ext@orange.com>
2019-07-28 17:04:20 +02:00
Mohamed Gamal
21e578b5e6 Add new config parameter "pusch_repetitionLevelCEmodeA_r13"
To control along with pusch_maxNumRepetitionCEmodeA_r13 the actual number of repetitions for PUSCH according to 36.213 table 8.2b
Scope of commit: Parsing parameter's value. The value should be used in future commits.

Signed-off-by: Mohamed Gamal <mohammed.abdelkhalek.ext@orange.com>
2019-07-28 17:04:20 +02:00
Florian Kaltenberger
f4158dd91f fixing a typo 2019-07-26 20:31:35 +02:00
Bi-Ruei, Chiu
6b4419ad13 Update ASN.1 to newest version
LTE-RRC 15.6.0
NR-RRC  15.6.0
S1AP    15.6.0
X2AP    15.6.0 and 14.7.0
2019-07-29 20:35:33 +08:00
Raphael Defosseux
4c0d814873 CI: dummy commit to re-run CI job
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-07-26 15:42:48 +02:00
Raphael Defosseux
e4632f204b CI: dummy commit to re-run CI job
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-07-26 15:37:55 +02:00
Ahmed Hussein
e12c1ccc70 Adding PDCCH OK 2019-08-13 17:40:59 +02:00
Ahmed Hussein
aca390e63f Fixed repeating CRC NOK for 7 times, as well as CRC NOK occuring a lot more than CRC OK
- changed Mdlharq to Mlimit when comparing with the round number
- Not incrementing the HARQ round in case of err_flag = 1, until HARQ is implemented
- Changed MAX_LDPC_ITERATIONS to 5 from 4 (provided better performance)
2019-08-13 17:40:59 +02:00
Ahmed Hussein
37015999e5 DL bug fixes
- Setting the payload to random data instead of all zeros at the Tx side

- Handling "nb_symb_sch" equal to 0 in "phy_procedures_nrUE_RX" which prevents
  entering "nr_ue_pdsch_procedures"

- Handling symbol loop problem in "nr_ue_pdsch_procedures"

- Handling resource block loop problem in "nr_rx_pdsch"
2019-08-13 17:37:42 +02:00
Raphael Defosseux
8204413449 CI: dummy commit to validate new pipeline
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-07-26 15:33:47 +02:00
Cedric Roux
e844ed07d6 bugfix 2019-07-26 11:15:52 +02:00
Hongzhi Wang
3171ece714 nr ue adding adjust gain 2019-07-26 10:33:34 +02:00
Cedric Roux
31671946e7 bugfix 2019-07-25 14:06:59 +02:00
Raphael Defosseux
5ddad9bde2 CI: adding repeat count on X2 handover
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-07-25 12:28:47 +02:00
Raphael Defosseux
f8288afe1d Merge branch 'develop_integration_2019_w30' into 'develop'
See merge request oai/openairinterface5g!649

Develop: Integration 2019 Week 30
Master Branch Release v1.1 Candidate

The following Merge Requests are included:

* MR 630 : nfapi interface bug fixes
* MR 638 : X2 HO (tdd, forwarding, end marker)
* MR 646 : Loadtester bugfixes
* MR 647 : fix power estimation
* MR 648 : CI: X2 Handover Testing
2019-07-24 23:00:59 +02:00
Raphael Defosseux
bdf99ae7c9 CI: fix in allocated memory for phy-sim VM
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-07-23 15:33:08 +02:00
yilmazt
15df30545e converting 'lte_build_oai' to 'ran_buld' 2019-07-23 15:24:03 +02:00
WANG Tsu-Han
9249cd1c13 fixes for 100MHz bandwidth 2019-07-23 15:14:59 +02:00
Raphael Defosseux
90be2df3c3 CI: fix on the python script
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-07-23 14:02:53 +02:00
yilmazt
9362cbd0c8 minor fix2 2019-07-23 12:03:07 +02:00
yilmazt
9a4ffa5660 minor fix 2019-07-23 11:00:43 +02:00
yilmazt
f37a17e540 develop&-nr current as of 22.7.19 & OAI fully ready for testing 2019-07-22 21:56:44 +02:00
Francesco Mani
2070a3305f mapping each ssb to a different logical antenna port 2019-07-22 17:10:52 +02:00
yilmazt
03c28a697f Merge branch 'develop-nr-merge' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-nr-merge 2019-07-20 17:52:47 +02:00
yilmazt
e823ae9d0b phy_simulators working again 2019-07-20 17:52:32 +02:00
Raphael Defosseux
23a804ecd1 Merge branch 'ci-repeat-scenario' into 'develop'
CI: adding support to repeat scenario in case of failure.

See merge request oai/openairinterface5g!645
2019-07-19 07:05:33 +02:00
Raphael Defosseux
65002b7fb1 CI: adding support to repeat scenario in case of failure.
nice when the tested feature is known to be unstable
    CDRX testing is now separated from normal FDD 10MHz testing

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-07-18 22:40:12 +02:00
Hongzhi Wang
660278a6d8 clean up dlsch decoding 2019-07-18 10:25:58 +02:00
Raphael Defosseux
2d6d1dd965 Merge branch 'ci-downgrade-cdrx-testing' into 'develop'
CI:  Downgrade cdrx testing

See merge request oai/openairinterface5g!643
2019-07-17 21:48:57 +02:00
Raphael Defosseux
7001fdd3d6 CI: fix in LAST_BUILD_INFO generation
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-07-17 19:13:59 +02:00
Raphael Defosseux
68f482b6ac CI: adding back the 5G NR build variants
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-07-17 14:34:27 +02:00
yilmazt
ff6710c898 develop-nr current as of 16.7.19 2019-07-16 17:06:20 +02:00
Raphael Defosseux
dccda75168 Fix for FDD DL performance issue
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-07-16 12:33:12 +02:00
Raphael Defosseux
3851e3264d CI: fix in generating LAST_BUILD_INFO file
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-07-16 12:32:26 +02:00
yilmazt
4c49d5ab0d Merge branch 'develop-nr-merge' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-nr-merge 2019-07-16 11:20:33 +02:00
yilmazt
2b321fd1c7 Merging latest develop commits 2019-07-16 11:20:24 +02:00
Raphael Defosseux
6215c74b53 CI: downgrading CDRX testing to a single UE
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-07-15 15:14:22 +02:00
Raphael Defosseux
10dbfff50e CI: no need to rebuild multiple times
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-07-15 13:33:12 +02:00
Raphael Defosseux
0de5ff4877 Merge branch 'develop_integration_2019_w28' into 'develop'
develop integration branch: 2019 week 28

See merge request oai/openairinterface5g!640

* MR 635 : fix rfsim ue sync
* MR 636 : Bugfixes 2019 w28
* MR 637 : Fixing Multi-RRU support and CI Testing
* MR 639 : fix bladeRF compilation
2019-07-12 18:58:51 +02:00
Raphael Defosseux
5c743e23bb Merge remote-tracking branch 'origin/hotfix-bladerf-compilation' into develop_integration_2019_w28 2019-07-12 14:13:07 +02:00
Cedric Roux
db2853cc49 fix bladeRF compilation 2019-07-12 11:50:22 +02:00
Raphael Defosseux
af93bf9232 Merge remote-tracking branch 'origin/ci-develop-multi-rru-support' into develop_integration_2019_w28 2019-07-12 11:07:05 +02:00
Raphael Defosseux
78fb79016d Merge remote-tracking branch 'origin/bugfixes-2019-w28' into develop_integration_2019_w28 2019-07-12 11:06:44 +02:00
Raphael Defosseux
31b23d57eb CI: fix in terminateeNB mode
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-07-12 10:32:46 +02:00
Raphael Defosseux
1980f10512 CI: little fixes
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-07-11 23:25:59 +02:00
Raphael Defosseux
a371da7bf9 CI: adding new pipeline
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-07-11 18:04:17 +02:00
Cedric Roux
2421b71d68 x2ap/sctp: increase buffer size
The 5G phone OPPO has a very big UE capability (> 2KB).

We need bigger buffers to transfer this, especially in x2 handover.

Also the sctp messages need a bigger buffer.

Note: in sctp, we didn't check for partial messages, it's now
      done. When detected, we exit. To be redone differently
      if needed. (Look for "if (!(flags & MSG_EOR))".)
2019-07-11 16:34:28 +02:00
Raphael Defosseux
6b7861e098 DOC: update on feature list
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-07-11 15:54:15 +02:00
Cedric Roux
893392e476 DOC: minor: update basic-sim 2019-07-24 15:36:35 +02:00
laurent
3dfce6380e fix as per branch name 2019-07-11 15:42:40 +02:00
Cedric Roux
8a8fdd59c2 cleanup: no variable definition in header file
We declare variables in header files, we don't define them. So we need
to use 'extern' in the header file and put the definition
in some C file.
2019-07-11 15:28:33 +02:00
Cedric Roux
5775d325e0 phy: do not put random bits in unused DCI
This used to be done to ease power estimation in the UE,
but this is not correct. Let's put no energy in the REs
with no DCI data, which is what needs to be done.

Plus it consumes a lot of CPU because of calling taus()
way too much.
2019-07-11 15:26:00 +02:00
Cedric Roux
443b5fd026 T: add -no-bind option to macpdu2wireshark
To be used when you send data to another host.

On the other host, to avoid ICMP traffic about the port
not being open, do:

./nc -l -u -p 9999 > /dev/null

You need to restart this command each time you run macpdu2wireshark.
You can use any other program that will accept UDP packets on the
port 9999 (default port of macpdu2wireshark, change if you use another
port of course).
2019-07-11 15:22:30 +02:00
Raphael Defosseux
6c5feebaa9 CI: adding support for background build on eNB
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-07-11 15:08:48 +02:00
Raphael Defosseux
6b16efcb0c DOC: updating Release Notes and adding basic-sim documentation
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-07-11 14:51:01 +02:00
Raphael Defosseux
0f91d708bd Fix merge conflict resolution error.
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-07-24 08:59:13 +02:00
Raphael Defosseux
729aab5798 Merge remote-tracking branch 'origin/nfapi_cleanup1' into develop_integration_2019_w30 2019-07-24 08:29:01 +02:00
Raphael Defosseux
569756c2d4 CI: changing the parallel thread scheme for eNB in L2 nFAPI sim
--> impact on performance -- disabling iperf testing

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-07-23 18:34:46 +02:00
Raphael Defosseux
65b3220d21 Merge remote-tracking branch 'origin/ci-x2-ho-testing' into develop_integration_2019_w30 2019-07-23 13:03:10 +02:00
Raphael Defosseux
4eee2460f9 Merge remote-tracking branch 'origin/bugfix-pucch-power-estimation' into develop_integration_2019_w30 2019-07-23 13:02:42 +02:00
Raphael Defosseux
bfc3912f3e Merge remote-tracking branch 'origin/loadtester_bugfixes' into develop_integration_2019_w30 2019-07-23 13:02:16 +02:00
Raphael Defosseux
7fd9e1a5b7 Merge remote-tracking branch 'origin/x2ho_tdd' into develop_integration_2019_w30 2019-07-23 13:01:55 +02:00
Haruki NAOI
8976f988ed Fix: change default uplane_inactivity_timer value. 2019-07-22 11:13:05 +09:00
Raphael Defosseux
36a9f70111 CI: initial support for X2 HO (net control)
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-07-19 23:18:45 +02:00
Cedric Roux
d1fdbfedbc fix power estimation
Some computation has been fixed in PUCCH reception.

SNR has been fixed, uses measurement instead of
a fixed value for the noise.

normalized_rx_power and target_rx_power have been removed,
replaced by snr and target_snr. All the files using those
variables have been updated.
2019-07-19 17:10:42 +02:00
Raphael Defosseux
d07d91c206 CI: adding conf / scenario files for X2 FDD HO
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-07-19 10:23:52 +02:00
Raphael Defosseux
5c117684d4 CI: adding support to repeat scenario in case of failure.
nice when the tested feature is known to be unstable
    CDRX testing is now separated from normal FDD 10MHz testing

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-07-19 10:23:52 +02:00
Haruki NAOI
53d5547e67 fix compilation error. 2019-07-17 10:34:23 +09:00
Haruki NAOI
e41da445ef Fix: CCE allocation problem when containing DCI_format_0. 2019-07-17 09:10:53 +09:00
Haruki NAOI
c1950e0d7e Fix: schedule_SRS() avoid assertion. 2019-07-16 19:54:54 +09:00
wanghe
1f211efb12 Fix: GTP/S1AP UE resource release leak issue. 2019-07-16 19:50:28 +09:00
Wu Jing
3492f60407 Fix: dlsch RBG allocation issue. 2019-07-16 19:45:33 +09:00
Wu Jing
a4214072aa Fix: setup release flag after all sdus of RRCConnectonRelease are scheduled. 2019-07-16 19:41:34 +09:00
Wu Jing
79eb2d7066 Fix: skip c-rnti and reestablishment before first attach is completed. 2019-07-16 19:40:09 +09:00
Haruki NAOI
c94700c7e7 Fix: UE context release leak issue. 2019-07-16 19:30:57 +09:00
tomita.y
61cda3a0aa Fix: reestablishment issue(SRB2 NULL) 2019-07-16 19:30:17 +09:00
Wu Jing
e4dfc07553 Fix: reestablishment timer when there are two reestablishmentrequest at a moment 2019-07-16 19:28:20 +09:00
Haruki NAOI
29d361ff42 Fix: Loadtester's UESIM dose not receive paging. 2019-07-16 19:25:41 +09:00
Haruki NAOI
25a1e76a0e Fix: avoid pthread_mutex_lock abort.
This commit is workaround. This issue realy occures with the following log.
lte-softmodem: ../nptl/pthread_mutex_lock.c:81: _pthread_mutex_lock: Assertion `mutex->_data.__owner == 0' failed.
2019-07-16 19:23:29 +09:00
Haruki NAOI
b557f8960b Fix: remove useless mutexlock. 2019-07-16 19:19:32 +09:00
Haruki NAOI
35385d84aa Fix: uplane_inactivity_timer dose not count time correctly about TDD.(rm2174) 2019-07-16 19:13:47 +09:00
Haruki NAOI
762eef6599 Fix: avoid RLC segmentation reception of RRCConnectionSetupComplete. 2019-07-16 19:07:43 +09:00
Haruki NAOI
78ff532ae2 Fix: Used NDI is not saved after Msg4 transmitted. 2019-07-16 18:59:59 +09:00
Haruki NAOI
1059a2fcd7 Fix: release_harq segmentation fault. 2019-07-16 18:56:58 +09:00
luaihui
e773fc6a71 modify some cppcheck errors and warnings 2019-07-15 11:58:19 +09:00
Wang Tsu-Han
17939a9f66 changing back the CMake file for version 3.0 2019-07-11 11:47:29 +02:00
luaihui
e468376d93 add forwarding and end marker 2019-07-11 10:59:07 +09:00
Raphael Defosseux
4c3adcb58e CI: adding support to start/stop enb/rcc/rru on multiple physical servers
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-07-10 17:55:46 +02:00
Raphael Defosseux
590d2af568 CI: adding new marker detection on NR-UE
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-07-10 15:51:54 +02:00
Wang Tsu-Han
ef819e05b4 Merge branch 'develop-nr' into nr-timing-measurement 2019-07-10 14:53:44 +02:00
Raphael Defosseux
1419720cdc CI: adding support to build multiple eNB on multiple physical servers
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-07-10 14:16:42 +02:00
magounak
90344ce54a modify develop branch to enable multi-RRUs functionalities 2019-07-10 10:40:10 +02:00
Raphael Defosseux
339a4daa7b CI: build will not timeout if failure
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-07-09 10:15:22 +02:00
yoshio.inoue
d02234ff66 remove memset 0 after calloc 2019-07-09 15:52:36 +09:00
yoshio.inoue
46537af2b2 Merge remote-tracking branch 'origin/OAI_develop' into oai_dev_x2ho_tdd 2019-07-09 14:45:31 +09:00
luaihui
94af4d0eca Merge remote-tracking branch 'origin/OAI_develop' into oai_develop_nfapi 2019-07-09 12:45:45 +09:00
Florian Kaltenberger
bc0fc8ba4a fixing ulsim/dlsim 2019-07-09 03:09:03 +02:00
Florian Kaltenberger
c0e77a0faa Merge branch 'integration_develop-nr_2019w28' into 'develop-nr'
Integration develop nr 2019w28

See merge request oai/openairinterface5g!633
2019-07-08 21:29:38 +02:00
Florian Kaltenberger
a980e8895e fixing a few minor things for nr-softmodem and nr-uesoftmodem 2019-07-08 18:16:51 +02:00
yilmazt
45f5bdd38f WIP: develop-nr is current as of 8.7.19 2019-07-08 16:51:58 +02:00
Florian Kaltenberger
60d53688d8 Merge remote-tracking branch 'origin/uhd-priority-fix' into integration_develop-nr_2019w28 2019-07-08 15:42:52 +02:00
Florian Kaltenberger
56c6e59377 Merge remote-tracking branch 'origin/NR_PUCCH_format1' into integration_develop-nr_2019w28 2019-07-08 15:42:32 +02:00
yilmazt
9549537ed4 WIP: Minor changes 2019-07-08 15:39:19 +02:00
Florian Kaltenberger
819c3af0cf fixing bugs in UE 2019-07-08 15:29:14 +02:00
Florian Kaltenberger (Italie)
a7f217e5a2 adding support 3/4 sampling for 40MHz (in that case OFDM symbols are not necessarily aligned on 32byte -> segfault on AVX2 architectures) 2019-07-08 12:42:02 +02:00
Rakesh
98f2736404 Adding configuration file and was able to run both gNB and nrUE on b210 without any problem
* To run gNB : sudo ./nr-softmodem -E -O ../../../targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpb210.conf
* To run UE : sudo ./nr-uesoftmodem -E --numerology 1 -r 106 --phy-test -C 3510000000 --ue-rxgain 90 -d
* We had done a wired test with 40dB attenuator in between gNB and nrUE.
2019-07-08 12:42:02 +02:00
Rakesh
62c42f4e53 Fix for dmrs and data extraction for using threequarter sampling rate 2019-07-08 12:42:02 +02:00
Rakesh
4998b6ae6d Adding FFT/IFFT sizes for threequarter sampling rate 2019-07-08 12:42:02 +02:00
Rakesh
47f50281de Adding cases for 80Mhz for UE 2019-07-08 12:42:02 +02:00
Florian Kaltenberger (Italie)
550350e3d1 adding 3/4 sampling support to UE 2019-07-08 12:42:02 +02:00
Florian Kaltenberger (Italie)
77491ec57d adding 46.08MHz sampling to USRP B210 (to use e.g. with 40MHz 5G-NR) 2019-07-08 12:42:02 +02:00
Raphael Defosseux
3c85cd58b4 Merge branch 'develop_integration_2019_w27' into 'develop'
Develop: Integration 2019 Week 27

See merge request oai/openairinterface5g!629
2019-07-05 22:23:07 +02:00
Raphael Defosseux
94875783dd Fix a few compilation warnings
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-07-05 17:17:44 +02:00
Raphael Defosseux
b99c6a898d CI: little bug fixes
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-07-05 14:08:11 +02:00
Raphael Defosseux
a03ef2bfc3 Merge remote-tracking branch 'origin/hotfix-measurement-report' into develop_integration_2019_w27 2019-07-05 11:24:24 +02:00
Raphael Defosseux
3f2acf9485 Fix Coverity Scan CID 342010
Fix a few cppcheck errors/warnings

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-07-05 11:03:30 +02:00
Cedric Roux
e0eac2e331 hotfix: do not set s-Measure in measurement report configuration
The value was set to 20 which means -120 dB. Setting this value means
that the UE reports an event only if the RSRP of the serving cell
is lower than -120 dB.

In the lab, we get values of around -70, and to go as low as -120
means a very degraded environment. This is not practical.

Let's disactivate the setting of this parameter for the moment so that
the UE reports an event without taking into consideration the RSRP
of the serving cell.

With this hotfix, the X2 handover works much better.
2019-07-04 14:47:11 +02:00
Raphael Defosseux
d2a6cca8f9 CI: better detection for segmentation fault
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-07-04 12:58:55 +02:00
Raphael Defosseux
6eb4661a5d Merge remote-tracking branch 'origin/fix-init-cu' into develop_integration_2019_w27 2019-07-04 12:54:46 +02:00
Raphael Defosseux
6cabf4ff2b Merge remote-tracking branch 'origin/bugfix-minor-T-tracer' into develop_integration_2019_w27 2019-07-04 12:54:08 +02:00
Raphael Defosseux
6e1cac6e8b Merge remote-tracking branch 'origin/flexran_agent_rrc_cm_rebased2' into develop_integration_2019_w27 2019-07-04 12:53:08 +02:00
Wu Jing
02532d044e x2 handover for tdd 2019-07-04 17:40:31 +09:00
Padarthi Naga Prasanth
8fdc21b232 PUCCH format 1 receiver 2019-07-03 17:33:23 +02:00
Wang Tsu-Han
6dcd2ead9a markout code removal in usrp lib 2019-07-03 16:43:20 +02:00
Wang Tsu-Han
7e87ce3c13 markout code removal 2019-07-03 16:40:52 +02:00
Wang Tsu-Han
310359c678 adding log for priority setting and using pipeline structure 2019-07-03 16:11:57 +02:00
Raphael Defosseux
aa5aa9f321 Merge remote-tracking branch 'origin/channel-simulation-in-rfsimulator' into fix-rfsim-sync-ue 2019-07-03 12:29:34 +02:00
Wu Jing
4239dacd02 Merge branch 'OAI_develop' into oai_develop_nfapi 2019-07-02 22:23:35 +09:00
Wang Tsu-Han
a2bf9dc9f4 modified logging for PBCH and function pointer for uhd priority fix 2019-07-02 15:23:25 +02:00
Wang Tsu-Han
dda7fbd74b adding NULL function for priority setting for plateform other than USRP 2019-07-02 14:50:50 +02:00
Wang Tsu-Han
29bfcdb371 modified uhd set priority to USRP only 2019-07-02 14:36:35 +02:00
Wu Jing
5d11ab5467 fix compile error in ue because cqi_indication_body_t 2019-07-02 17:33:14 +09:00
laurent
924e10f73a fix rfsim ue initial sync and legacy OAI C struct syntax 2019-07-01 15:17:07 +02:00
laurent
1ce0700e5d fix rfsimulator UE sync 2019-07-01 13:45:34 +02:00
Robert Schmidt
e26f7d7555 F1: correctly initialize CU RRC params (clean up code after 99012f88b9) 2019-06-27 14:22:10 +02:00
Cedric Roux
175da6f258 minor: fix parameters to T call for T_ENB_MASTER_TICK 2019-06-27 12:20:09 +02:00
Wang Tsu-Han
bc4b6cf2cf adding timing measurement for RT execution 2019-06-26 15:48:05 +02:00
laurent
77bd2751ba merge again develop 2019-06-25 15:59:13 +02:00
Robert Schmidt
5b12a60950 Flexran-triggered RRC Reconf: free memory of mac_MainConfig after setting new, do not free new memory 2019-06-25 15:47:52 +02:00
Robert Schmidt
0f568fd40a FlexRAN: Comment non-functional code regarding Neigh CGI PLMN ID reporting 2019-06-25 10:40:12 +02:00
Robert Schmidt
f1a1ff036d FlexRAN: HO request first check whether X2 is active, minor indentation fixes 2019-06-24 17:55:13 +02:00
Robert Schmidt
a6be54a6f4 Fix: X2 Setup Req/Resp: first check, then increase number of cells 2019-06-24 17:54:38 +02:00
Robert Schmidt
960e8dc9d8 FlexRAN: Calculate sfnsn such that diff 1s = 1000 2019-06-24 16:29:14 +02:00
Robert Schmidt
a90a7f352e Additional messages for error diagnosis for net-ctrld HO 2019-06-24 16:29:14 +02:00
Robert Schmidt
67fc2f7c62 FlexRAN: add GTP statistics in UE stats through RRC module 2019-06-24 16:29:14 +02:00
Konstantinos Alexandris
75e3622daf Configure eNB for X2 handover controlled by network (ignore UE HO request) 2019-06-24 16:29:14 +02:00
Konstantinos Alexandris
8957cfef78 Add HO trigger function via FlexRAN controller (OAI + FlexRAN handler) 2019-06-24 16:29:14 +02:00
Konstantinos Alexandris
5e148d439a Legal 3GPP values check for measurement report parameters 2019-06-24 16:29:14 +02:00
Robert Schmidt
939251e004 Fix: Memory allocation for offsetFreq parameter 2019-06-24 16:29:14 +02:00
Robert Schmidt
8cf520d283 Rename FlexRAN RRC reconfiguration function, simplify function 2019-06-24 16:29:11 +02:00
Konstantinos Alexandris
1b90c4a02d Create RRC setters for Periodic, A1-A5 event and offsets related to RRC Measurement Report 2019-06-24 16:28:16 +02:00
Konstantinos Alexandris
1de4b7400b Fix: flexran agent for HO case, to be tested if Nb_ue in RRC is needed 2019-06-24 16:15:44 +02:00
Konstantinos Alexandris
3cd1717fb6 add measurement information/clean-up measurement report in flexran agent 2019-06-24 16:15:44 +02:00
Konstantinos Alexandris
f5e928afab Fix: condition on CellsToAddModList memory allocation in case of zero neighbouring cells 2019-06-24 16:15:44 +02:00
Robert Schmidt
76a7b7036e FlexRAN: Add Protobuf UE-specific RRC measurement report configuration 2019-06-24 16:15:44 +02:00
Konstantinos Alexandris
772dc508e8 Fix: Segfault error, free properly measurement info struct, add rsrp/rsrq filter coefficient 2019-06-24 16:15:44 +02:00
Konstantinos Alexandris
b7530528e0 To be tested: Add code for measurement report based on the neighbouring cells after x2 setup, ocs/ocn for multiple cells 2019-06-24 16:15:44 +02:00
Konstantinos Alexandris
5dfec71629 Fill in the RRC Measurement info struct in the RRC layer 2019-06-24 16:15:44 +02:00
Konstantinos Alexandris
0eeee616d8 Create RRC struct and getters for Periodic, A1-A5 event and offsets related to RRC Measurement Report 2019-06-24 16:15:44 +02:00
Konstantinos Alexandris
7024f289a6 fixes: segmentation faults issues in RRC CM for RRC Measurement report, clean-up and re-implementation of functions in RAN API 2019-06-24 16:15:44 +02:00
Konstantinos Alexandris
9ec157d9e1 Add neighbouring cells (cgi,plmn), clean-up a bit current RRC CM 2019-06-24 16:15:08 +02:00
Raphael Defosseux
67293964ac Merge branch 'develop_integration_2019_w25' into 'develop'
Develop: Integration 2019 Week 25

See merge request oai/openairinterface5g!617

The following Merge Requests are included:

* MR 576 : Multi-RU support and OTA Synch/Calibration for TDD
* MR 589 : UE side FeMBMS-EnTV
* MR 610 : Enhance CI with external EPC usage
* MR 614 : fixed rar_Hopping configuration for eMT
* MR 619 : bugfix: fix RRC UE removal
* MR 620 : Coverity Scan defect fixes
2019-06-21 18:58:38 +02:00
Florian Kaltenberger
fe6aa838ea Merge branch 'nr_ue_fapi_improvements' into 'develop-nr'
Nr ue fapi improvements

See merge request oai/openairinterface5g!618
2019-06-21 16:40:10 +02:00
Raphael Defosseux
541184c2cc CI: adding pauses in F1 cases
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-06-21 16:05:28 +02:00
Raphael Defosseux
99012f88b9 HACK: force initialization of variables in CU case!
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-06-21 16:02:23 +02:00
Raphael Defosseux
ec0538c461 CI: adding a include path to cppcheck
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-06-21 13:06:05 +02:00
Raphael Defosseux
8931915030 Merge remote-tracking branch 'origin/434-coverity-scan-fix-week25' into develop_integration_2019_w25 2019-06-21 13:04:51 +02:00
Raphael Defosseux
18b8bd4ee9 Merge remote-tracking branch 'origin/bugfix-rrc-ue-removal' into develop_integration_2019_w25 2019-06-21 13:03:39 +02:00
Raphael Defosseux
4bf932d6bd DOC: added caution message about nasmesh
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-06-21 12:57:40 +02:00
Dong Anyuan
42a0f7b016 Remove Coverity Scan CID 261519 (Using uninitialized value tmp. Field tmp.elems is uninitialized when calling _mm256_insert_epi16.) 2019-06-21 18:39:47 +09:00
Dong Anyuan
14e6da9ab5 Remove Coverity Scan CID 261470 (Using uninitialized value tmp. Field tmp.elems is uninitialized when calling _mm256_insert_epi8.) 2019-06-21 18:36:44 +09:00
Dong Anyuan
4c60ee7775 Remove Coverity Scan CID 60471 (Function memory_read does not terminate string *user->nas_user_nvdata.) 2019-06-21 18:34:14 +09:00
Dong Anyuan
0e2406f0fe Remove Coverity Scan CID 60241 (Passing &eplmn to function emm_proc_attach_accept which uses it as an array. This might corrupt or misinterpret adjacent memory locations.) 2019-06-21 18:31:58 +09:00
Raphael Defosseux
d908559a17 CI: adding a hack to build phy-sim --> manual generation of T_IDs.h
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-06-21 10:50:15 +02:00
yilmazt
680a0c97c7 Operation of all of the physical simulators are tested and verified + various warning removals 2019-06-20 21:46:35 +02:00
Cedric Roux
f6f83ca01b bugfix: fix RRC UE removal
If several UEs are removed, the variable ue_to_be_removed may be overwritten.
Let's use an array instead.
2019-06-20 17:20:20 +02:00
Dong Anyuan
3adb2efd8c Fix Coverity Scan CID 339954 (Overrunning callee's array of size 16 by passing argument ue_id (which evaluates to 65535) in call to flexran_set_ue_ul_slice_idx.) 2019-06-20 14:06:32 +09:00
Dong Anyuan
2f2f21d2aa Fix Coverity Scan CID 339964 (Passing &rrc_eNB_mui to function rrc_eNB_process_S1AP_DOWNLINK_NAS which uses it as an array. This might corrupt or misinterpret adjacent memory locations.) 2019-06-20 14:06:04 +09:00
Dong Anyuan
61ebac43f1 Fix Coverity Scan CID 339972 (Variable msg going out of scope leaks the storage it points to.) 2019-06-20 14:05:40 +09:00
Dong Anyuan
486f1368e0 Fix Coverity Scan CID 339974 (Overrunning array eutra_bandtable of 48 24-byte elements at element index 48 (byte offset 1152) using index i (which evaluates to 48).) 2019-06-20 14:05:13 +09:00
Dong Anyuan
4fd1495be6 Fix Coverity Scan CID 339978 (Variable msg going out of scope leaks the storage it points to..) 2019-06-20 14:04:40 +09:00
Dong Anyuan
21c4e256bf Fix Coverity Scan CID 339991 (Variable msg going out of scope leaks the storage it points to.) 2019-06-20 14:04:05 +09:00
Dong Anyuan
f3c3a1ff67 Fix Coverity Scan CID 340004 (Overrunning array eutra_bandtable of 48 24-byte elements at element index 48 (byte offset 1152) using index i (which evaluates to 48).) 2019-06-20 14:03:17 +09:00
Dong Anyuan
a70288769a Fix Coverity Scan CID 340209 (Variable message_p going out of scope leaks the storage it points to.) 2019-06-20 14:02:45 +09:00
Dong Anyuan
9b80070a59 Fix Coverity Scan CID 340211 (Variable message_p going out of scope leaks the storage it points to.) 2019-06-20 14:02:11 +09:00
Dong Anyuan
c7d2937e35 Fix Coverity Scan CID 340221 (Variable msg going out of scope leaks the storage it points to.) 2019-06-20 14:01:40 +09:00
Dong Anyuan
4a3f26b2cf Fix Coverity Scan CID 340228 (Handle variable s going out of scope leaks the handle.) 2019-06-20 14:01:05 +09:00
Dong Anyuan
f6765e0633 Fix Coverity Scan CID 340232 (Variable message_p going out of scope leaks the storage it points to.) 2019-06-20 14:00:24 +09:00
Dong Anyuan
f1fdff80a0 Fix Coverity Scan CID 340235 (Using variable UE_id_mac as an index to array RC.mac[ctxt_pP->module_id]->UE_list.UE_sched_ctrl.) 2019-06-20 13:59:53 +09:00
Dong Anyuan
bca84e8160 Fix Coverity Scan CID 340237 (Using variable UE_id as an index to array UE_list->UE_sched_ctrl.) 2019-06-20 13:59:21 +09:00
Dong Anyuan
e9267be8db Fix Coverity Scan CID 340243 (Overrunning array of 1 bytes at byte offset 1 by dereferencing pointer ie->value.choice.UESecurityCapabilities.encryptionAlgorithms.buf + 1.) 2019-06-20 13:58:52 +09:00
Dong Anyuan
6087373184 Fix Coverity Scan CID 340245 (Variable Sparams going out of scope leaks the storage it points to.) 2019-06-20 13:58:08 +09:00
Dong Anyuan
8e599681b0 Fix Coverity Scan CID 340247 (Variable pc5s_header going out of scope leaks the storage it points to.) 2019-06-20 13:57:34 +09:00
Dong Anyuan
b40385aa09 Fix Coverity Scan CID 340261 (Variable securityConfigHO going out of scope leaks the storage it points to.) 2019-06-20 13:57:04 +09:00
Dong Anyuan
1ad6361bd1 Fix Coverity Scan CID 340263 (Using uninitialized value DRB2LCHAN[i] when calling rrc_mac_config_req_eNB.) 2019-06-20 13:56:35 +09:00
Dong Anyuan
20406a7057 Fix Coverity Scan CID 340268 (Passing freed pointer pdu_mem_pP as an argument to rlc_um_store_pdu_in_dar_buffer.) 2019-06-20 13:56:05 +09:00
Dong Anyuan
62b5911bb3 Fix Coverity Scan CID 340277 (Variable gNB_CUSystemInformation going out of scope leaks the storage it points to.) 2019-06-20 13:55:32 +09:00
Dong Anyuan
3354bd5122 Fix Coverity Scan CID 340278 (Variable quantityConfig going out of scope leaks the storage it points to.) 2019-06-20 13:54:55 +09:00
Dong Anyuan
84acd4c692 Fix Coverity Scan CID 340280 (Variable msg going out of scope leaks the storage it points to.) 2019-06-20 13:53:58 +09:00
Dong Anyuan
cd31745af1 Fix Coverity Scan CID 340290 (Variable msg_p going out of scope leaks the storage it points to.) 2019-06-20 13:53:08 +09:00
Florian Kaltenberger
40adad6fc7 fix after merge with develop-nr.
however, I had to hardcode the parameters for the PUSCH in nr_ulsim as the fapi interface still has bugs.
2019-06-20 06:24:04 +02:00
Dong Anyuan
2a8ed1a056 Fix Coverity Scan CID 21666 (Variable measResultListEUTRA2 going out of scope leaks the storage it points to.) 2019-06-20 12:43:44 +09:00
Dong Anyuan
dc8b2c1ef0 Fix Coverity Scan CID 21694 (Variable quantityConfig going out of scope leaks the storage it points to.) 2019-06-20 12:43:17 +09:00
Dong Anyuan
87023eeb6a Fix Coverity Scan CID 21734 (Variable Sparams going out of scope leaks the storage it points to.) 2019-06-20 12:42:42 +09:00
Dong Anyuan
b7c04de927 Fix Coverity Scan CID 21842 (Using uninitialized value data_req. Field data_req.ue_id_type_indicator is uninitialized.) 2019-06-20 12:42:05 +09:00
Dong Anyuan
d415fc52ad Fix Coverity Scan CID 21843 (Using uninitialized value data_req. Field data_req.buffer_occupancy_in_pdus is uninitialized.) 2019-06-20 12:41:38 +09:00
Dong Anyuan
3d12d16c29 Fix Coverity Scan CID 21906 (Using uninitialized value pcfich_bt[2 * i].) 2019-06-20 12:41:05 +09:00
Dong Anyuan
bdd6b0fb18 Fix Coverity Scan CID 21911 (Using uninitialized value data_req. Field data_req.buffer_occupancy_in_pdus is uninitialized.) 2019-06-20 12:40:36 +09:00
Dong Anyuan
3c81412704 Fix Coverity Scan CID 21929 (Using uninitialized value newtbl.num_elements when calling hashtable_insert.) 2019-06-20 12:40:04 +09:00
Dong Anyuan
e84ba4fa6c Fix Coverity Scan CID 21938 (Using uninitialized value status_resp. Field status_resp.head_sdu_creation_time is uninitialized.) 2019-06-20 12:39:34 +09:00
Dong Anyuan
3b96a7ac3f Fix Coverity Scan CID 60241 (Passing &eplmn to function emm_proc_attach_accept which uses it as an array. This might corrupt or misinterpret adjacent memory locations.) 2019-06-20 12:39:06 +09:00
Dong Anyuan
7cf75c6d50 Fix Coverity Scan CID 60277 (Calling strncpy with a maximum size argument of 4096 bytes on destination array user_api_id->recv_buffer of size 4096 bytes might leave the destination string unterminated.) 2019-06-20 12:38:33 +09:00
Dong Anyuan
4eb0344714 Fix Coverity Scan CID 60348 (Variable addr going out of scope leaks the storage it points to.) 2019-06-20 12:37:36 +09:00
Dong Anyuan
264e429f23 Fix Coverity Scan CID 60351 (Variable sctp_cnx going out of scope leaks the storage it points to.) 2019-06-20 12:37:08 +09:00
Dong Anyuan
1338654285 Fix Coverity Scan CID 60357 (Handle variable sfd going out of scope leaks the handle.) 2019-06-20 12:36:38 +09:00
Dong Anyuan
42f481b51e Fix Coverity Scan CID 60369 (Variable plain_msg going out of scope leaks the storage it points to.) 2019-06-20 12:36:02 +09:00
Dong Anyuan
d7f9a3578d Fix Coverity Scan CID 60371 (Handle variable fd going out of scope leaks the handle.) 2019-06-20 12:35:33 +09:00
Dong Anyuan
1d017a3625 Fix Coverity Scan CID 60372 (Handle variable sd going out of scope leaks the handle.) 2019-06-20 12:35:04 +09:00
Dong Anyuan
65d168143f Fix Coverity Scan CID 60387 (Using uninitialized value ulp. Field ulp.hUlp is uninitialized when calling nwGtpv1uSetUlpEntity.) 2019-06-20 12:34:27 +09:00
Dong Anyuan
db137bf1d5 Fix Coverity Scan CID 60393 (Using uninitialized value pid when calling esm_ebr_context_release.) 2019-06-20 12:33:52 +09:00
Dong Anyuan
47758322b6 Fix Coverity Scan CID 60394 (Using uninitialized value addr6. Field addr6.sin6_flowinfo is uninitialized when calling bind.) 2019-06-20 12:33:09 +09:00
Dong Anyuan
8084d6d247 Fix Coverity Scan CID 60413 (Using uninitialized value udp. Field udp.hUdp is uninitialized when calling nwGtpv1uSetUdpEntity.) 2019-06-20 12:32:36 +09:00
Dong Anyuan
76fbb7c0b1 Fix Coverity Scan CID 60430 (Using uninitialized value meas2. Field meas2.ext1 is uninitialized.) 2019-06-20 12:32:07 +09:00
Dong Anyuan
5275b4c7c6 Fix Coverity Scan CID 60435 (Using uninitialized value bid when calling esm_ebr_context_release.) 2019-06-20 12:31:35 +09:00
Dong Anyuan
731d10d9fa Fix Coverity Scan CID 60469 (Using uninitialized value log. Field log.logMgrHandle is uninitialized when calling nwGtpv1uSetLogMgrEntity.) 2019-06-20 12:30:49 +09:00
Dong Anyuan
c4d56a9331 Fix Coverity Scan CID 60471 (Function memory_read does not terminate string *user->nas_user_nvdata.) 2019-06-20 12:02:32 +09:00
Dong Anyuan
88042616cd Fix Coverity Scan CID 140733 (Calling strncpy with a maximum size argument of 16 bytes on destination array ifr.ifr_ifrn.ifrn_name of size 16 bytes might leave the destination string unterminated.) 2019-06-20 12:01:46 +09:00
Dong Anyuan
8fe94b2f2c Fix Coverity Scan CID 261458 (Variable message_p going out of scope leaks the storage it points to.) 2019-06-20 12:00:51 +09:00
Dong Anyuan
6986cbdd2a Fix Coverity Scan CID 261468 (Using variable UE_id as an index to array UE_list->UE_sched_ctrl.) 2019-06-20 12:00:10 +09:00
Dong Anyuan
5388598f80 Fix Coverity Scan CID 261470 (Using uninitialized value tmp. Field tmp.elems is uninitialized when calling _mm256_insert_epi8.) 2019-06-20 11:44:47 +09:00
Dong Anyuan
325e6e525c Fix Coverity Scan CID 261481 (Overwriting message_p in message_p = NULL leaks the storage that message_p points to.) 2019-06-20 11:35:46 +09:00
Dong Anyuan
5fbea5caf1 Fix Coverity Scan CID 261489 (Overrunning array cc->mbsfn_SubframeConfig of 8 8-byte elements at element index 65535 (byte offset 524280) using index j (which evaluates to 65535).) 2019-06-20 11:34:46 +09:00
Dong Anyuan
00c10b7706 Fix Coverity Scan CID 261498 (Overrunning array eutra_bandtable of 48 24-byte elements at element index 48 (byte offset 1152) using index i (which evaluates to 48).) 2019-06-20 11:31:42 +09:00
Dong Anyuan
ac6f5dceb0 Fix Coverity Scan CID 261499 (Overrunning array sqn_ms of 6 bytes at byte offset 6 using index 6 - i (which evaluates to 6).) 2019-06-20 11:28:22 +09:00
Dong Anyuan
ab06b52486 Fix Coverity Scan CID 261506 (Overrunning array eutra_bandtable of 48 24-byte elements at element index 48 (byte offset 1152) using index i (which evaluates to 48).) 2019-06-20 11:21:07 +09:00
Dong Anyuan
a907b35001 Fix Coverity Scan CID 261519 (Using uninitialized value tmp. Field tmp.elems is uninitialized when calling _mm256_insert_epi16.) 2019-06-20 11:18:58 +09:00
Dong Anyuan
dbcfda529d Fix Coverity Scan CID 261543 (Overrunning array usim_data->usim_sqn_data.sqn_ms of 6 bytes at byte offset 6 using index 6 - i (which evaluates to 6).) 2019-06-20 11:17:33 +09:00
Dong Anyuan
1e14bee4f3 Fix Coverity Scan CID 261548 (Overrunning array eutra_bandtable of 48 24-byte elements at element index 48 (byte offset 1152) using index i (which evaluates to 48).) 2019-06-20 11:15:26 +09:00
Dong Anyuan
6c99431942 Fix Coverity Scan CID 261563 (Overrunning array ue_context_p->ue_context.enb_gtp_ebi of 11 2-byte elements at element index 13 (byte offset 26) using index i (which evaluates to 13).) 2019-06-20 11:13:37 +09:00
Dong Anyuan
39e3769e9a Fix Coverity Scan CID 261570 (Overwriting DRB_config in DRB_config = calloc(1UL, 96UL) leaks the storage that DRB_config points to.) 2019-06-20 11:12:44 +09:00
Dong Anyuan
91dcaae357 Fix Coverity Scan CID 261623 (Variable msg_p going out of scope leaks the storage it points to.) 2019-06-20 11:11:41 +09:00
Dong Anyuan
0d7fa51405 Fix Coverity Scan CID 261633 (Overrunning array reestablish_rnti_map of 16 4-byte elements at element index 16 (byte offset 64) using index i (which evaluates to 16).) 2019-06-20 11:09:57 +09:00
Dong Anyuan
3f327f8650 Fix Coverity Scan CID 261637 (Using uninitialized value timestamp[0].) 2019-06-20 11:09:05 +09:00
Dong Anyuan
f71a53e82d Fix Coverity Scan CID 261649 (Variable rx_buffer going out of scope leaks the storage it points to.) 2019-06-20 11:07:03 +09:00
Dong Anyuan
0e23059320 Fix Coverity Scan CID 261663 (Overrunning array reestablish_rnti_map of 16 4-byte elements at element index 16 (byte offset 64) using index i (which evaluates to 16).) 2019-06-20 11:05:52 +09:00
Dong Anyuan
864e5df407 Fix Coverity Scan CID 300370 (Variable reconf_param going out of scope leaks the storage it points to.) 2019-06-20 11:04:43 +09:00
Dong Anyuan
c65e3d2eea Fix Coverity Scan CID 300371 (Overrunning array rb_table of 34 bytes at byte offset 255 using index rb_table_index (which evaluates to 255).) 2019-06-20 11:03:41 +09:00
Dong Anyuan
ca1e83187f Fix Coverity Scan CID 300377 (Variable p_info going out of scope leaks the storage it points to.) 2019-06-20 11:02:10 +09:00
Dong Anyuan
525e0da714 Fix Coverity Scan CID 300379 (Variable csi_reports going out of scope leaks the storage it points to.) 2019-06-20 11:01:19 +09:00
Dong Anyuan
fdb47bed67 Fix Coverity Scan CID 300383 (Variable sl_CommConfig going out of scope leaks the storage it points to.) 2019-06-20 10:59:59 +09:00
Dong Anyuan
4010027380 Fix Coverity Scan CID 300384 (Variable rrc_measurements going out of scope leaks the storage it points to.) 2019-06-20 10:58:21 +09:00
Dong Anyuan
db3cfa8b7b Fix Coverity Scan CID 300387 (Using freed pointer req_msg.) 2019-06-20 10:56:43 +09:00
Dong Anyuan
42e3a1394d Fix Coverity Scan CID 300388 (Variable destinationInfoList going out of scope leaks the storage it points to.) 2019-06-20 10:55:36 +09:00
Dong Anyuan
a9e9488cd2 Fix Coverity Scan CID 300392 (Variable dl_report going out of scope leaks the storage it points to.) 2019-06-20 10:54:34 +09:00
Dong Anyuan
097d78cab1 Fix Coverity Scan CID 300393 (Variable copy going out of scope leaks the storage it points to.) 2019-06-20 10:51:06 +09:00
Dong Anyuan
d0f3c98b26 Fix Coverity Scan CID 300460 (Using uninitialized value fp->eutra_band when calling from_earfcn.) 2019-06-20 10:45:00 +09:00
Dong Anyuan
4ab9c49a13 Fix Coverity Scan CID 300464 (Using hi as an array. This might corrupt or misinterpret adjacent memory locations.) 2019-06-20 10:44:05 +09:00
Dong Anyuan
03cc588652 Fix Coverity Scan CID 300471 (Using uninitialized value queue->mutex when calling free.) 2019-06-20 10:42:57 +09:00
Dong Anyuan
7ddaa8ed1b Fix Coverity Scan CID 300489 (Variable neigh_meas going out of scope leaks the storage it points to.) 2019-06-20 10:41:17 +09:00
Florian Kaltenberger
2bb1477197 Merge remote-tracking branch 'origin/develop-nr' into nr_ue_fapi_improvements 2019-06-19 22:22:38 +02:00
Florian Kaltenberger
c7575f71a7 Revert "reducing number of UEs to save memory"
This reverts commit 3574481b7f.
2019-06-19 22:18:41 +02:00
Florian Kaltenberger
ea20869372 fixing nr_pbchsim 2019-06-19 22:15:56 +02:00
yilmazt
ffebd6b403 Raphael's patch + minor changes in build_oai 2019-06-19 15:00:09 +02:00
Raphael Defosseux
12e371f0fe Merge remote-tracking branch 'origin/develop-nr' into develop-nr-merge
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-06-19 12:23:03 +02:00
Raphael Defosseux
ffa43c1f00 CI: a few cosmetics fixes on python
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-06-19 12:15:27 +02:00
Dr.-Ing. Javier Morgade
ae714ca933 Update FEATURE_SET.md 2019-06-19 09:23:35 +02:00
yilmazt
7faabbc02f build_oai is thoroughly checked 2019-06-18 21:51:13 +02:00
Raphael Defosseux
633551dbed CI: a few cosmetics fixes on python
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-06-18 16:30:22 +02:00
Raphael Defosseux
e16d9f3a2b fix compilation issues
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-06-18 15:14:18 +02:00
Raphael Defosseux
2835b8697a Merge remote-tracking branch 'origin/eMTC-configuration_fix' into develop_integration_2019_w25 2019-06-18 14:43:28 +02:00
Raphael Defosseux
0c8618987d CI: fixes after peer review
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-06-18 14:41:01 +02:00
Raphael Defosseux
c6d43476d8 Merge remote-tracking branch 'origin/enhance_CI_extEPC' into develop_integration_2019_w25 2019-06-18 14:22:12 +02:00
Raphael Defosseux
8f68d596f1 Merge remote-tracking branch 'origin/develop-entv' into develop_integration_2019_w25 2019-06-18 13:42:50 +02:00
Raphael Defosseux
56eb818d08 Merge remote-tracking branch 'origin/ru_rau_enhancement_L1_renaming' into develop_integration_2019_w25 2019-06-18 13:40:42 +02:00
Wu Jing
e0a670e9fe fix C-Plane NG because of the size of MSG4 and cqi struct 2019-06-18 20:15:42 +09:00
Hongzhi Wang
973a0795b4 update ue dlsch decoding multi-threading 2019-06-17 16:51:50 +02:00
yilmazt
ce9c9ec88f develop and develop-nr are now current as of 14.6.19 2019-06-17 16:11:52 +02:00
yilmazt
420e6194d4 All 4 nr&lte-(ue)softmodems are compiling 2019-06-16 19:46:11 +02:00
Raphael Defosseux
08e91003f1 CI: add missing built physical simulators to HTML report
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-06-14 16:38:40 +02:00
Raphael Defosseux
8857905ab0 CI: fix cosmetics on HTML report
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-06-14 12:20:27 +02:00
Florian Kaltenberger
aff80ba198 Merge branch 'integration_develop-nr_2019w24' into 'develop-nr'
Integration develop nr 2019w24

See merge request oai/openairinterface5g!615
2019-06-14 11:58:10 +02:00
Wu Jing
91ffcd1fce fix issue that rru cannot release ue if doing attach/detach in nfapi mode 2019-06-14 14:08:29 +09:00
Raymond Knopp
dd2d49f191 fixed rar_Hopping configuration for eMTC. The value in configuration file was a string, but libconfig was told it was an int. changed the configura
tion file to '1' for this parameter and put default value to '1' which means off. Added AssertFatal, if this value is '0', which we don't suppor fo
r now.

_Please enter the commit message for your changes. Lines starting
2019-06-14 00:15:32 +02:00
Florian Kaltenberger
99fa6a9ff4 Merge remote-tracking branch 'origin/uhd_set_thread_prio' into integration_develop-nr_2019w24 2019-06-13 23:01:13 +02:00
Florian Kaltenberger
b711be863b update documentation 2019-06-13 22:59:34 +02:00
Florian Kaltenberger
07f0876aef Merge remote-tracking branch 'origin/documentation-nr' into integration_develop-nr_2019w24 2019-06-13 22:53:32 +02:00
Florian Kaltenberger
34b261264e Merge remote-tracking branch 'origin/rfsimulator-simulate-channel' into integration_develop-nr_2019w24 2019-06-13 22:52:06 +02:00
Florian Kaltenberger
a16829e955 fixing dlsim after recent changes to FAPI 2019-06-13 22:36:11 +02:00
frtabu
983f759739 Fix typo when using trigger option in report commands 2019-06-13 19:43:55 +02:00
Raphael Defosseux
79016d3c3b Fixes to pass basic-sim in TDD and OAI-UE + USRP test
-- cell synchronization was successful on the 1st try (in OAI UE + USRP) test
2019-06-13 19:14:26 +02:00
Raphael Defosseux
490f0d61e7 fixing compilation warnings 2019-06-13 17:11:32 +02:00
Raphael Defosseux
433706a7a2 CI: better handling when UE does not connect properly in USRP condition
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-06-13 16:46:12 +02:00
Florian Kaltenberger (Italie)
99e62a44a7 bugfix 2019-06-13 16:26:16 +02:00
frtabu
7982580861 Automate help message using variants and options arrays. Fix wrong arithmetic used to set the mask used to check options 2019-06-13 15:29:11 +02:00
Wu Jing
dc604f6ff1 add TAG in uci_harq_pdu in generate_Msg4 2019-06-13 11:37:08 +09:00
Wu Jing
f8dc571bd9 fix assert issue when uci array is full if doing Attach/Detach 2019-06-13 11:34:08 +09:00
laurent
a5b30c07bc add channel sim 2019-06-12 16:45:52 +02:00
frtabu
05e7e3e0a8 Fix report problem, improve option flexibility 2019-06-11 19:58:47 +02:00
WANG Tsu-Han
a6ecd29f90 Merge branch 'develop-nr' into uhd_set_thread_prio
Conflicts:
	openair1/SCHED_NR/phy_procedures_nr_gNB.c
	targets/RT/USER/nr-ru.c
2019-06-11 17:00:39 +02:00
WANG Tsu-Han
bdc6aff4a0 adding tracer 2019-06-11 16:43:17 +02:00
frtabu
13a079c855 Modify main bash script in CI to ease addition of new variants. 2019-06-10 19:28:01 +02:00
Javier Morgade
8b4c23cf80 Merge remote-tracking branch 'origin/develop' into develop-entv 2019-06-10 15:21:51 +02:00
Wu Jing
28809cc98a donot start L1_thread_tx if it isnot L1_TRX_SPLIT 2019-06-08 13:41:28 +09:00
Wu Jing
2c7ee8cd20 avoid segfault in S1AP when doing ReleaseCommane s1ap_ue_context=NULL is possible 2019-06-08 13:40:19 +09:00
Wu Jing
4d66dba0d2 avoid segfault in RLC 2019-06-08 13:38:55 +09:00
Wu Jing
21d13ef419 fix the frame compute 2019-06-08 13:38:14 +09:00
Wu Jing
b878b15473 add frame and subframe before sending DL_req,TX_req,HI_DCI0_req,UL_req 2019-06-08 13:37:16 +09:00
Wu Jing
5ee6fe727c fix issue that output hoping not to have mis-match between CRC ind and RX in VNF-PNF mode 2019-06-08 13:36:16 +09:00
Wu Jing
be5bbbd86c clear rlc-am data after retransmission 5 times when doing rrcconnectionreestablishment 2019-06-08 13:34:58 +09:00
Wu Jing
e11cf1ab20 fix stack smashing detected error that occurs after SecurityModeCommand 2019-06-08 13:33:30 +09:00
Wu Jing
4cd5d80d98 add log-mem function to collect log 2019-06-08 13:32:12 +09:00
Wu Jing
d5d1c19588 add the tag in bch and dl in fairRR 2019-06-08 13:31:15 +09:00
Wu Jing
61fc53f851 skip crnti if c-plane is not completed 2019-06-08 13:30:09 +09:00
frtabu
b1d35dcf68 Make addition of new options and variants easier in the bash scripts
prepare for external EPC
2019-06-07 19:36:11 +02:00
Raphael Defosseux
71191fb9b7 Merge branch 'develop_integration_2019_w23' into 'develop'
Develop: integration 2019 week 23

See merge request oai/openairinterface5g!607
2019-06-07 16:53:01 +02:00
Raphael Defosseux
b5aac45a8f CI: testing all sim configurations (in basic/l2-nfapi simulators) even if no sync
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-06-07 13:51:35 +02:00
laurent
8467f2ebbc missed to add a new file 2019-06-07 13:03:05 +02:00
laurent
d2efadee73 merge develop-nr 2019-06-07 11:33:05 +02:00
Raphael Defosseux
3c62968e94 Updating the release notes
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-06-07 10:12:47 +02:00
jordan moore
ee944efd04 Update lms_lib.cpp 2019-06-07 10:12:47 +02:00
Raphael Defosseux
ff2e2cbc84 Merge remote-tracking branch 'origin/429-coverity-scan-fix-week22' into develop_integration_2019_w23 2019-06-07 10:03:17 +02:00
Thomas Schlichter
a40962cbbf CI: Increase NB_PATTERN_FILES to account for nr_ulsim 2019-06-07 09:28:16 +02:00
yilmazt
a2cad44f0f Merging latest develop-nr commits 2019-06-06 21:44:15 +02:00
matzakos
699cd2e9a3 Merge branch 'nr-ip-over-LTE-stack' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr-ip-over-LTE-stack 2019-06-06 19:14:12 +02:00
matzakos
88a09f0b58 Added Rx indication for DLSCH type and resolved issue with MIB decoding while sending DL IP traffic. Data packets still not parsed properly at the UE MAC layer. 2019-06-06 19:13:57 +02:00
laurent
8c16f16cbf add channel simulator in rfsimulator 2019-06-06 15:11:08 +02:00
laurent
cba073631f add channel simulator in rfsimulator 2019-06-06 14:29:06 +02:00
Florian Kaltenberger
2ed8aa4cd2 more changes to UE FAPI handling:
- dci_request and dl_indication for PBCH now also on stack
 - fixed type of nrUE_config (was using structure for gNB before)
 - added configuration of PBCH to phy_config_request and using this config now in phy_procedures_nr_ue
 - we need to add configuration of PDCCH and PDSCH also to phy_config_request (there are still some hardcoded parameters)
 - removed UL scheduling for now
2019-06-05 09:57:15 +02:00
Wang Tsu-Han
3720aa0583 assersion condition and timedlock overflow fix 2019-06-04 15:23:50 +02:00
Thomas Schlichter
2b7e04784e fix linker errors for phy_simulators and NR realtime 2019-06-04 13:43:21 +02:00
Thomas Schlichter
339bb9e410 fix some implicit declarations 2019-06-04 13:43:21 +02:00
Thomas Schlichter
e61cb078fc split refsig UE parts from gNB parts 2019-06-04 13:43:20 +02:00
Thomas Schlichter
3ccc9c99e9 move common parts of nr_dlsch.h to nr_transport_common_proto.h 2019-06-04 13:43:20 +02:00
Thomas Schlichter
fc8dd8baa1 replace usage of get_Qm() with nr_get_Qm() in NR code 2019-06-04 13:43:20 +02:00
Thomas Schlichter
225ecc50ad remove unused file nr_mcs.c 2019-06-04 13:43:20 +02:00
Ahmed Hussein
77ed36a7b8 Fixing segmentation fault in llr computation
- This was due to alignment problem in rxdataF_ext when odd number of RBs were assigned
2019-06-04 13:43:20 +02:00
Ahmed Hussein
c7a0c41191 removing "G" from "NR_UL_gNB_HARQ_t" and some printf's in "nr_ulsch_decoding" 2019-06-04 13:43:20 +02:00
Ahmed Hussein
10e3a299be Restructuring "nr_slot_fep_ul"
- Now it takes input and output pointers instead of gNB struct
2019-06-04 13:43:20 +02:00
Khalid Ahmed
3d9ae4227b Use nr_tti_tx instead of nr_slot_tx 2019-06-04 13:43:20 +02:00
Khalid Ahmed
3414cf31ed removing mac_pdu array 2019-06-04 13:43:20 +02:00
Khalid Ahmed
cb09bb9f84 Code review meeting clean ups
- remove printf in nr_ulsch_coding.c
- renaming test_input to mac_pdu
- using memcpy for mac_pdu instead of pointing to data
- remove temp_nfapi struct from header file
2019-06-04 13:43:20 +02:00
Khalid Ahmed
c0b4fcfbe4 Adding dummy definition of nr_ue_get_SR to ulsim and dlsim 2019-06-04 13:43:20 +02:00
Ahmed Hussein
4677c0abd7 Fixing ulschsim and applying minor change to ulsim
- Problem was related to UE_id and G
2019-06-04 13:43:20 +02:00
Khalid Ahmed
b1c6538783 Adding AWGN noise to ulsim 2019-06-04 13:43:19 +02:00
Ahmed Hussein
02e329a35d SC-FDMA working for 1 SNR loop (enabled using "NR_SC_FDMA" MACRO)
- Added nr_dft at UE side and nr_idft at gNB side
- NR_SC_FDMA can be found in "PHY/defs_nr_common.h"
- For 1 SNR loop, the code executes correctly
- For more loops, it gives a segmentation fault in the LDPC decoder
- The segmentation fault is caused when nr_idft is used
- The code works fine when the "NR_SC_FDMA" is disabled
2019-06-04 13:43:19 +02:00
Khalid Ahmed
d34868e693 adding phy_procedures_nrUE_TX to ulsim
- adding SCHED_NR_UE_LIB to ulsim compilation library
- fixing linking compilation problems
- using fapi_nr_dci_pdu_rel15_t struct to initialize PUSCH
- test_input random data is set in phy_procedures_nrUE_TX instead of ulsim
2019-06-04 13:43:19 +02:00
Khalid Ahmed
46968b1216 adding a temp nfapi_nr_ul_config and using it to initialize ulsch
- modifying generate_ue_ulsch_params to work with nfapi_nr_ul_config struct
- removing ulsim_params struct
2019-06-04 13:43:19 +02:00
Ahmed Hussein
176d873083 Shifting the QAM threshold by AMP, instead of shifting the data by AMP_SHIFT
This fixes the errors in bits introduced after LDPC decoding in case of mod_order = 6 and AMO_SHIFT = 9
2019-06-04 13:43:19 +02:00
Ahmed Hussein
63a2e61101 Minor fixes in "ulsim.c" and removing some warnings 2019-06-04 13:43:19 +02:00
Ahmed Hussein
5d0c0be1fe Fixing bug in "nr_ulsch_extract_rbs_single"
One of the function parameters was number of RBs, but instead number of REs was given
2019-06-04 13:43:19 +02:00
Ahmed Hussein
c8d0da0dcb Fixing "CRC OK" bug.
Sometimes CRC OK is printed, but there are bits in error at the LDPC decoder output
2019-06-04 13:43:19 +02:00
Ahmed Hussein
15417570aa Restructuring ulsim and introducing more functionalities in RX at gNB 2019-06-04 13:43:19 +02:00
Khalid Ahmed
749bb66988 putting phy procedures into compact functions (UE side)
implementing:
- generate_ue_ulsch_params (customized for ulsim only)
- nr_ue_ulsch_procedures
- nr_ue_pusch_common_procedures
2019-06-04 13:43:19 +02:00
Khalid Ahmed
4a841aa83d fixing pusch_transform_precoding 2019-06-04 13:43:19 +02:00
Ahmed Hussein
d9abc574fc Added RB extraction + FFT (completed with testing) 2019-06-04 13:43:19 +02:00
Khalid Ahmed
ff440a30c4 SC-FDMA implemented and compiling. (NOT TESTED)!! 2019-06-04 13:43:19 +02:00
Khalid Ahmed
c38a485949 adding signal_energy_amp_shift function 2019-06-04 13:43:18 +02:00
Khalid Ahmed
2628b7418d defining AMP_SHIFT 2019-06-04 13:43:18 +02:00
Khalid Ahmed
21b736cff3 Fixing DMRS generation in nr_ulsim 2019-06-04 13:43:18 +02:00
Khalid Ahmed
688acc4911 initializing txdataF_layer with zeros 2019-06-04 13:43:18 +02:00
Khalid Ahmed
e73c6c3eca Fixing signal_energy and noise varience calculation 2019-06-04 13:43:18 +02:00
Khalid Ahmed
962c769440 Fixing RE mapping 2019-06-04 13:43:18 +02:00
Khalid Ahmed
1ec87df5a6 adding UL dmrs funtionalities to dmrs_nr.c in NR_UE_TRANSPORT 2019-06-04 13:43:16 +02:00
Khalid Ahmed
9c447c18a0 Removing txdataF from NR_UE_PUSCH struct 2019-06-04 13:42:05 +02:00
Ahmed Hussein
66442aa42d Implementation of LLR computation for 4, 16, and 64 QAM (tested) 2019-06-04 13:42:05 +02:00
Khalid Ahmed
54ebd39b79 changing txdataF to contain one slot only 2019-06-04 13:42:05 +02:00
Khalid Ahmed
d9e077ead0 Adding AWGN channel to txdata 2019-06-04 13:42:05 +02:00
Khalid Ahmed
9edbe82dc8 UE IFFT 2019-06-04 13:42:05 +02:00
Khalid Ahmed
a536aa298f fixing bugs 2019-06-04 13:42:03 +02:00
Khalid Ahmed
bb4cf0df90 Data + DMRS RE mapping 2019-06-04 13:38:18 +02:00
Khalid Ahmed
714452baef fixing txdataF allocation in NR_gNB_DLSCH_t 2019-06-04 12:10:40 +02:00
Khalid Ahmed
566e603671 passing pointers to nr_generate_pdsch instead of structs 2019-06-04 12:10:40 +02:00
Khalid Ahmed
70b6ca6391 adding nr_layer_mapping to ulsim 2019-06-04 11:33:36 +02:00
Ahmed Hussein
ef3c6add13 Added "nr_ulsch_unscrambling" + Tested scrambling and unscrambling chain in "ulsim.c" (works)
- Added "nr_ulsch.c" file in NR_TRANSPORT
- Renamed "nr_ulsch.c" in NR_UE_TRANSPORT to "nr_ulsch_ue.c"
- Added "nr_ulsch_unscrambling" declaration to "nr_ulsch.h"
- Added "nr_ulsch_unscrambling" definition to "nr_ulsch.c"
- Added new test in "ulsim.c" to test encoding/decoding + scrambling/unscrambling
2019-06-04 11:33:36 +02:00
Ahmed Hussein
54c96644ae Bug fixes in "ulschsim.c" and "nr_ulsch_coding.c" + minor cleanups 2019-06-04 11:33:36 +02:00
Khalid Ahmed
73db162804 Renaming and moving nr_layer_mapping to a common liberary between UE and gNB 2019-06-04 11:33:36 +02:00
Khalid Ahmed
f1d4d5daf5 Using only one nr_modulation funtion across the code 2019-06-04 11:33:36 +02:00
Khalid Ahmed
f3ebd69477 PUSCH DMRS generation is implemented 2019-06-04 11:33:36 +02:00
Khalid Ahmed
9b58180c88 removing a duplicate declaration of nr_rx_pdsch 2019-06-04 11:33:36 +02:00
Ahmed
9fc657d85e Minor cleanups in "ulschsim.c" and "ulsim.c" 2019-06-04 11:33:36 +02:00
Ahmed
da6040b120 Transferred the "nr_pusch_codeword_scrambling" and "nr_pusch_codeword_modulation"
to ulsim.c and removed them from ulschsim.c

Also changed the linked libraries for the "ulsim.c" as it was causing linker problems
2019-06-04 11:33:36 +02:00
Khalid Ahmed
515e6955d8 PUSCH modulation 2019-06-04 11:33:35 +02:00
Khalid Ahmed
830bf07933 pusch scrambling 2019-06-04 11:33:35 +02:00
Khalid Ahmed
ac1682f94e Added ulsim with the same code of ulschim 2019-06-04 11:33:35 +02:00
Dong Anyuan
e62bc308b8 Fix Coverity Scan CID 341132 (Using freed pointer cell_report.) 2019-06-04 10:21:52 +09:00
Dong Anyuan
86d7a5cd69 ReFix Coverity Scan CID 341066 (Using freed pointer ue_report.) 2019-06-04 10:19:35 +09:00
Florian Kaltenberger
a404e190ab Merge branch 'develop-nr-fixes-2019w23' into 'develop-nr'
Develop nr fixes 2019w23

See merge request oai/openairinterface5g!601
2019-06-03 22:50:14 +02:00
Florian Kaltenberger
6cb25d778a making the dl_indication a local variable to avoid race conditions 2019-06-01 04:43:59 +02:00
Florian Kaltenberger
3574481b7f reducing number of UEs to save memory 2019-06-01 04:43:59 +02:00
Florian Kaltenberger
7e57a8428e fixing some more bad merges 2019-06-01 04:08:00 +02:00
Florian Kaltenberger
02a2f909da fixing a bug for gNB single thread operation (harmonizing with eNB) 2019-06-01 01:30:28 +02:00
Florian Kaltenberger
ed5749370f removing some more unused files 2019-05-31 20:36:10 +02:00
Florian Kaltenberger
8e77370dd8 removing nr-softmodem files from targets/RT/USER 2019-05-31 11:53:40 +02:00
Dong Anyuan
b75500ac79 Fix Coverity Scan CID 341066 (Using freed pointer ue_report.) 2019-05-31 12:10:12 +09:00
Dong Anyuan
04732d3a8b Fix Coverity Scan CID 341064 (Null-checking mac_MainConfig->phr_Config suggests that it may be null, but it has already been dereferenced on all paths leading to the check.) 2019-05-31 10:29:42 +09:00
Dong Anyuan
507c9cd2a4 Fix Coverity Scan CID 341071 (Null-checking mac_MainConfig->ul_SCH_Config suggests that it may be null, but it has already been dereferenced on all paths leading to the check.) 2019-05-31 10:27:17 +09:00
Dong Anyuan
3dae026c09 Fix Coverity Scan CID 341067 (Null-checking mac_MainConfig suggests that it may be null, but it has already been dereferenced on all paths leading to the check.) 2019-05-31 10:23:58 +09:00
Dong Anyuan
1de860bc89 Fix Coverity Scan CID 341070 (Null-checking quantityConfig->quantityConfigEUTRA suggests that it may be null, but it has already been dereferenced on all paths leading to the check.) 2019-05-31 10:13:11 +09:00
Dong Anyuan
b19f9d9c6e Fix Coverity Scan CID 341065 (Null-checking quantityConfig suggests that it may be null, but it has already been dereferenced on all paths leading to the check.) 2019-05-31 10:04:11 +09:00
Dong Anyuan
324da70ee1 ReFix Coverity Scan CID 300503 (Variable rlc_reports going out of scope leaks the storage it points to.) 2019-05-30 23:04:16 +09:00
Dong Anyuan
32bb6c9ebf ReFix Coverity Scan CID 300428 (Variable dl_info going out of scope leaks the storage it points to.) 2019-05-30 19:10:05 +09:00
Dong Anyuan
540e409b2e ReFix Coverity Scan CID 300508 (Variable ul_info going out of scope leaks the storage it points to.) 2019-05-30 19:01:02 +09:00
Dong Anyuan
983d208543 ReFix Coverity Scan CID 339937 (Overrunning array x2ap_messages_callback of 27 24-byte elements at element index 27 (byte offset 648) using index pdu.choice.successfulOutcome.procedureCode (which evaluates to 27).) 2019-05-30 18:40:27 +09:00
Wang Tsu-Han
7ed11406f0 fixes for error in if4p5 2019-05-29 15:48:33 +02:00
Dong Anyuan
ec2ac48d90 ReFix Coverity Scan CID 300459 (Using uninitialized value addr. Field addr.sin_zero is uninitialized when calling bind.) 2019-05-29 17:45:02 +09:00
Dong Anyuan
33eefa2e54 ReFix Coverity Scan CID 300452 (Using uninitialized value addr. Field addr.sin_zero is uninitialized when calling connect.) 2019-05-29 17:41:09 +09:00
Dong Anyuan
616ab18719 ReFix Coverity Scan CID 339948 (Using uninitialized value a. Field a.sin_zero is uninitialized when calling bind.) 2019-05-29 17:36:56 +09:00
SAWADA Kentaro
4acb50f99e ReFix Coverity Scan CID 340196 (Using uninitialized value prose_addr_len when calling recvfrom.) 2019-05-29 15:25:38 +09:00
SAWADA Kentaro
a8bd28cc8a ReFix Coverity Scan CID 340288 (Using uninitialized value slen when calling getsockname.) 2019-05-29 14:54:39 +09:00
SAWADA Kentaro
69f68d13f5 ReFix Coverity Scan CID 340273 (Using uninitialized value slen when calling recvfrom.) 2019-05-29 14:51:47 +09:00
yilmazt
3c1d1bffee Pushing changes before incorporating new merges into develop and develop-nr 2019-05-28 21:56:41 +02:00
Dong Anyuan
2d3d0f7ae7 Fix Coverity Scan CID 300396 (Variable mac_MainConfig going out of scope leaks the storage it points to.) 2019-05-28 22:21:04 +09:00
Dong Anyuan
8fcce371d8 Fix Coverity Scan CID 300402 (Variable header going out of scope leaks the storage it points to.) 2019-05-28 22:20:15 +09:00
Dong Anyuan
3c1f80f47b Fix Coverity Scan CID 300405 (Variable ue_state_change_msg going out of scope leaks the storage it points to.) 2019-05-28 22:19:33 +09:00
Dong Anyuan
554058d4b0 Fix Coverity Scan CID 300407 (Variable stats_reply_msg going out of scope leaks the storage it points to.) 2019-05-28 22:18:45 +09:00
Dong Anyuan
e65b702287 Fix Coverity Scan CID 300411 (Using uninitialized value reconf_param->report_amount when calling flexran_rrc_eNB_generate_defaultRRCConnectionReconfiguration.) 2019-05-28 22:17:55 +09:00
Dong Anyuan
4f55adf6e2 Fix Coverity Scan CID 300412 (Variable macstats going out of scope leaks the storage it points to.) 2019-05-28 22:16:38 +09:00
Dong Anyuan
1f752815cf Fix Coverity Scan CID 300414 (Variable lib going out of scope leaks the storage it points to.) 2019-05-28 22:04:20 +09:00
Dong Anyuan
71a7ba5738 Fix Coverity Scan CID 300415 (Variable ul_report going out of scope leaks the storage it points to.) 2019-05-28 22:03:19 +09:00
Dong Anyuan
e04f4c15c0 Fix Coverity Scan CID 300419 (Variable cell_conf going out of scope leaks the storage it points to.) 2019-05-28 22:02:04 +09:00
Dong Anyuan
ddf6cfe002 Fix Coverity Scan CID 300420 (Variable ul_mac_config_msg going out of scope leaks the storage it points to.) 2019-05-28 21:47:40 +09:00
Dong Anyuan
5877ee80c7 Fix Coverity Scan CID 300421 (Variable eutra_meas going out of scope leaks the storage it points to.) 2019-05-28 21:46:15 +09:00
Dong Anyuan
542bd49c96 Fix Coverity Scan CID 300425 (Using uninitialized value req_msg when calling flexran_agent_stats_request.) 2019-05-28 21:43:58 +09:00
Dong Anyuan
a7585c3fd4 Fix Coverity Scan CID 300427 (Variable ue_report going out of scope leaks the storage it points to.) 2019-05-28 21:43:05 +09:00
Dong Anyuan
4e1beaa6e4 Fix Coverity Scan CID 300428 (Variable dl_info going out of scope leaks the storage it points to.) 2019-05-28 21:41:45 +09:00
Dong Anyuan
3cbb53e069 Fix Coverity Scan CID 300429 (Overrunning array buffer of 255 bytes by passing it to a function which accesses it at byte offset 65534 using argument size (which evaluates to 65535).) 2019-05-28 21:40:35 +09:00
Dong Anyuan
f8a9d517af Fix Coverity Scan CID 300430 (Using uninitialized value msg when calling flexran_agent_mac_sr_info.) 2019-05-28 21:38:38 +09:00
Dong Anyuan
29081f0a16 Fix Coverity Scan CID 300431 (Overrunning array pdu_info_pP->li_list of 128 2-byte elements at element index 128 (byte offset 256) using index pdu_info_pP->num_li (which evaluates to 128).) 2019-05-28 21:37:30 +09:00
Dong Anyuan
af0e318a82 Fix Coverity Scan CID 300435 (Variable channel going out of scope leaks the storage it points to.) 2019-05-28 21:35:13 +09:00
Dong Anyuan
0b328f3315 Fix Coverity Scan CID 300448 (Using uninitialized value sl_DiscConfig. Field sl_DiscConfig.ext1 is uninitialized.) 2019-05-28 21:34:20 +09:00
Dong Anyuan
8dc8a1627d Fix Coverity Scan CID 300452 (Using uninitialized value addr. Field addr.sin_zero is uninitialized when calling connect.) 2019-05-28 21:33:22 +09:00
Dong Anyuan
91be65e8a8 Fix Coverity Scan CID 300455 (Using uninitialized value msg when calling flexran_agent_mac_sf_trigger.) 2019-05-28 21:32:28 +09:00
Dong Anyuan
bf3db975bb Fix Coverity Scan CID 300456 (Variable full_ul_report going out of scope leaks the storage it points to.) 2019-05-28 21:31:17 +09:00
Dong Anyuan
0398f964bb Fix Coverity Scan CID 300459 (Using uninitialized value addr. Field addr.sin_zero is uninitialized when calling bind.) 2019-05-28 21:29:44 +09:00
Dong Anyuan
156726875a Fix Coverity Scan CID 300461 (Variable stats_reply_msg going out of scope leaks the storage it points to.) 2019-05-28 21:27:46 +09:00
Dong Anyuan
64e0df286c Fix Coverity Scan CID 300465 (Variable header going out of scope leaks the storage it points to.) 2019-05-28 21:25:59 +09:00
Dong Anyuan
c91bfb228b Fix Coverity Scan CID 300472 (Variable header going out of scope leaks the storage it points to.) 2019-05-28 21:25:02 +09:00
Dong Anyuan
c6a7f9d58f Fix Coverity Scan CID 300474 (Using freed pointer timer_msg.) 2019-05-28 21:21:59 +09:00
Dong Anyuan
9176f90a3d Fix Coverity Scan CID 300476 (Variable dl_mac_config_msg going out of scope leaks the storage it points to.) 2019-05-28 21:19:17 +09:00
Dong Anyuan
5e000215a3 Fix Coverity Scan CID 300477 (Using uninitialized value err_code.) 2019-05-28 21:18:19 +09:00
Dong Anyuan
c3854df16e Fix Coverity Scan CID 300478 (Variable dl_report going out of scope leaks the storage it points to.) 2019-05-28 21:16:57 +09:00
Dong Anyuan
130c8d3da0 Fix Coverity Scan CID 300490 (Variable copy going out of scope leaks the storage it points to.) 2019-05-28 21:15:24 +09:00
Dong Anyuan
ba81c62eb7 Fix Coverity Scan CID 300496 (Variable header going out of scope leaks the storage it points to.) 2019-05-28 21:14:05 +09:00
Dong Anyuan
f4def402b5 Fix Coverity Scan CID 300497 (Using uninitialized element of array cpuset.__bits.) 2019-05-28 21:13:11 +09:00
Dong Anyuan
736c3b988b Fix Coverity Scan CID 300499 (Variable paging_report going out of scope leaks the storage it points to.) 2019-05-28 21:12:16 +09:00
Dong Anyuan
f6b615636f Fix Coverity Scan CID 300500 (Variable p_info going out of scope leaks the storage it points to.) 2019-05-28 21:10:25 +09:00
Dong Anyuan
e5a0b98ee4 Fix Coverity Scan CID 300502 (Variable quantityConfig going out of scope leaks the storage it points to.) 2019-05-28 21:07:26 +09:00
Dong Anyuan
5cb42d56f6 Fix Coverity Scan CID 300503 (Variable rlc_reports going out of scope leaks the storage it points to.) 2019-05-28 21:06:33 +09:00
Dong Anyuan
28ad281944 Fix Coverity Scan CID 300504 (Using uninitialized value timer_msg when calling flexran_agent_stats_request.) 2019-05-28 21:05:31 +09:00
Dong Anyuan
ddb9b21878 Fix Coverity Scan CID 300506 (Variable full_ul_report going out of scope leaks the storage it points to.) 2019-05-28 21:04:15 +09:00
Dong Anyuan
a4a51eb9c7 Fix Coverity Scan CID 300507 (Variable lc_ue_config going out of scope leaks the storage it points to.) 2019-05-28 20:59:50 +09:00
Dong Anyuan
ccdd9f0495 Fix Coverity Scan CID 300508 (Variable ul_info going out of scope leaks the storage it points to.) 2019-05-28 20:32:21 +09:00
Dong Anyuan
8c0db8086d Fix Coverity Scan CID 339892 (Overrunning array msg_p->ittiMsg.rrc_mac_ccch_data_ind.sdu of 512 bytes by passing it to a function which accesses it at byte offset 1022 using argument msg_p->ittiMsg.rrc_mac_ccch_data_ind.sdu_size (which evaluates to 1023).) 2019-05-28 20:31:03 +09:00
Dong Anyuan
0b48bb46be Fix Coverity Scan CID 339921 (Using uninitialized value tokctx when calling __strtok_r_1c.) 2019-05-28 20:29:38 +09:00
Dong Anyuan
c41af020a2 Fix Coverity Scan CID 339932 (Overrunning array messages_callback of 48 24-byte elements at element index 48 (byte offset 1152) using index pdu.choice.initiatingMessage.procedureCode (which evaluates to 48).) 2019-05-28 20:14:25 +09:00
Dong Anyuan
5d1500cbdc Fix Coverity Scan CID 339937 2019-05-28 19:42:34 +09:00
Dong Anyuan
7dc6547479 Fix Coverity Scan CID 339944 2019-05-28 19:41:59 +09:00
Dong Anyuan
1e4ca86184 Fix Coverity Scan CID 339948 2019-05-28 19:40:07 +09:00
Dong Anyuan
f19c72f785 Fix Coverity Scan CID 339951 2019-05-28 19:38:22 +09:00
SAWADA Kentaro
3cfe9636ab Fix Coverity Scan CID 340291 2019-05-28 19:33:00 +09:00
SAWADA Kentaro
ef9c227746 Fix Coverity Scan CID 340288 2019-05-28 19:32:32 +09:00
SAWADA Kentaro
4085349be3 Fix Coverity Scan CID 340276 2019-05-28 19:31:53 +09:00
SAWADA Kentaro
5fe7940ef4 Fix Coverity Scan CID 340273 2019-05-28 19:31:19 +09:00
SAWADA Kentaro
3a92f18eca Fix Coverity Scan CID 340266 2019-05-28 19:30:36 +09:00
SAWADA Kentaro
228ad9c824 Fix Coverity Scan CID 340255 2019-05-28 19:30:12 +09:00
SAWADA Kentaro
6fa16963cb Fix Coverity Scan CID 340253 2019-05-28 19:28:45 +09:00
SAWADA Kentaro
78b5f9da53 Fix Coverity Scan CID 340246 2019-05-28 19:28:08 +09:00
SAWADA Kentaro
72a6bbe22f Fix Coverity Scan CID 340231 2019-05-28 19:27:30 +09:00
SAWADA Kentaro
e241a74ae6 Fix Coverity Scan CID 340229 2019-05-28 19:26:59 +09:00
SAWADA Kentaro
80c7f25efd Fix Coverity Scan CID 340227 2019-05-28 19:25:16 +09:00
SAWADA Kentaro
c28d157dc4 Fix Coverity Scan CID 340226 2019-05-28 19:24:44 +09:00
SAWADA Kentaro
880432cafd Fix Coverity Scan CID 340222 2019-05-28 19:24:10 +09:00
SAWADA Kentaro
304c4842aa Fix Coverity Scan CID 340210 2019-05-28 19:23:28 +09:00
SAWADA Kentaro
550ac9841f Fix Coverity Scan CID 340203 2019-05-28 19:23:01 +09:00
SAWADA Kentaro
4939f38a57 Fix Coverity Scan CID 340196 2019-05-28 19:22:24 +09:00
SAWADA Kentaro
9b10599186 Fix Coverity Scan CID 340192 2019-05-28 19:20:52 +09:00
SAWADA Kentaro
95c8693181 Fix Coverity Scan CID 340000 2019-05-28 19:18:27 +09:00
SAWADA Kentaro
95b5f2baba Fix Coverity Scan CID 339973 2019-05-28 19:16:50 +09:00
SAWADA Kentaro
a51fb55f8a Fix Coverity Scan CID 339968 2019-05-28 19:10:16 +09:00
Dong Anyuan
f4ab9af045 Fix Coverity Scan CID 339961 2019-05-28 18:41:18 +09:00
He Shanyun
c227a34da1 fix tbs calculation error in ul scheduler 2019-05-28 16:21:03 +09:00
He Shanyun
48e2d78fd6 cut down the usage of memory when using rcc and rru 2019-05-28 16:06:17 +09:00
He Shanyun
3cc917ab38 set cqi request on the correct subframe 2019-05-28 14:25:51 +09:00
He Shanyun
72aa68137d fix mcs while nfapi mode because it is not correct if setting mcs to 10 2019-05-28 13:54:23 +09:00
Wu Jing
6b1ab26cea fix issue that RRCConnectionSetupComplete does not come in nFAPI mode and fairRRSCD 2019-05-28 12:17:29 +09:00
Wu Jing
a7bce4abd5 fix assertfatal cause by ue_type!=NOCE 2019-05-28 12:11:53 +09:00
Wu Jing
236c416fe2 fix segfault issue cause by num_pdcch_symbols=0 in nFAPI mode 2019-05-28 12:05:56 +09:00
Wang Tsu-Han
173f10e51d adding uhd priority setting in ru_thread_tx 2019-05-27 18:05:03 +02:00
Florian Kaltenberger
e6792d7576 Merge branch 'integration-nr-2019-w21' into 'develop-nr'
Integration nr 2019 w21

See merge request oai/openairinterface5g!598
2019-05-27 09:35:06 +02:00
Florian Kaltenberger
e0b7efb596 fixing regression in dlsim 2019-05-27 00:28:58 +02:00
Javier Morgade
943e480b6e BUGFIX (wrong fembms pbch call in UE procedures) 2019-05-24 14:21:17 +02:00
Wang Tsu-Han
9125074562 fixed bug created while merge conflict remove 2019-05-24 13:17:51 +02:00
Wang Tsu-Han
f874d6a655 Changing back cmake virsion to 3.0 2019-05-24 10:36:19 +02:00
Francois TABURET
55700fc99e Update BUILD.md 2019-05-24 10:31:42 +02:00
Francois TABURET
3b9fabe1b3 Update BUILD.md 2019-05-24 10:26:55 +02:00
Francois TABURET
fc86788a8e Update BUILD.md, fixing broken link, typo and clarifying some points 2019-05-24 10:18:10 +02:00
yilmazt
f6a4a6b99a phy_simulators do compile, but dlsim&nr_(ulsch/dlsch/pbch)sims do not pass tests + Raphael's CI patch applied. 2019-05-23 21:47:49 +02:00
Wang Tsu-Han
6b2e064216 Merge branch 'develop' into ru_rau_enhancement_L1_renaming
Conflicts:
	ci-scripts/xml_files/enb_ue_usrp210_band7_test_05mhz_tm1.xml
	cmake_targets/CMakeLists.txt
	cmake_targets/build_oai
	openair1/PHY/LTE_UE_TRANSPORT/initial_sync.c
	targets/PROJECTS/CENTOS-LTE-EPC-INTEGRATION/CONF/enb.centos.calisson.conf
	targets/PROJECTS/CENTOS-LTE-EPC-INTEGRATION/CONF/enb.centos.memphis.conf
	targets/PROJECTS/CENTOS-LTE-EPC-INTEGRATION/CONF/enb.centos.nord.conf
	targets/RT/USER/lte-softmodem.c
	targets/RT/USER/lte-ue.c
2019-05-23 18:29:01 +02:00
Wang Tsu-Han
f35d9f2044 adding assertion for lte-ru 2019-05-23 17:53:29 +02:00
Javier Morgade
b1c1c4545a Merge remote-tracking branch 'origin/develop' into develop-entv 2019-05-23 16:51:30 +02:00
Wang Tsu-Han
cec3f0ae89 adding assertion to lock and adding timedwait with other realtime threading handel 2019-05-23 16:45:25 +02:00
Raphael Defosseux
ebd40e8d4e Merge branch 'develop_integration_2019_w21' into 'develop'
See merge request oai/openairinterface5g!595

The following Merge Requests are included:

* MR 544: RRC Inactivity Timer testing
* MR 581: Remove deprecated build options
* MR 583: RRC: add an option to enable measurement reports
* MR 590: bugfix UE realtime bug
2019-05-23 14:37:10 +02:00
Wu Jing
4f2f0f11ee fix issue that RCC calls phy_procedures_eNB_TX if PARALLEL_RU_L1_SPLIT 2019-05-23 18:08:21 +09:00
Wu Jing
e9d04428ff fix segfault because RRU uses RC.mac 2019-05-23 18:07:01 +09:00
Wu Jing
2700c3aef9 fix NFAPI_MODE mistake when it is PNF because enum is NFAPI_MODE_PNF not NFAPI_PNF 2019-05-23 18:05:58 +09:00
Wu Jing
ea40eeebdf start L1_thread and ru_thread if it is RCC or RRU by adding if(NFAPI==NFAPI_MODE_VNF||NFAPI_MODE_PNF) 2019-05-23 18:04:07 +09:00
Wu Jing
80e7531cfa fix segfault when using RC.rrc if it is RRU 2019-05-23 18:02:34 +09:00
Wu Jing
adbe183166 fix issue when exchange NFAPI_TRACE level to OAI LOG level 2019-05-23 17:58:55 +09:00
Louis-Adrien DUFRENE (Orange Labs)
afdeaa631c update feature list with RRC inactivity timer 2019-05-23 07:58:00 +02:00
Florian Kaltenberger
21abb9a4b9 attempting to fix regression problems 2019-05-23 06:50:24 +02:00
Florian Kaltenberger
9c8fbb4950 Merge remote-tracking branch 'origin/nr_pucch_format0_receiver' into integration-nr-2019-w21 2019-05-22 23:28:50 +02:00
Florian Kaltenberger
9574efbf19 Merge remote-tracking branch 'origin/nr_ssb_periodicity' into integration-nr-2019-w21 2019-05-22 23:27:27 +02:00
yilmazt
6db969f385 Merge branch 'develop-nr-merge' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-nr-merge 2019-05-22 21:51:09 +02:00
yilmazt
2b05aba106 --phy_simulators compile up to nr_dlsim 2019-05-22 21:49:19 +02:00
Raphael Defosseux
3c322792ba CI: fixig failing OAI UE + USRP + OAI eNB test
-- scenarios were using FDD 5MHz conf file w/ active RRC inactivity timeout
  -- since we are waiting very long that UE is sync'ed w/ eNB, timeout occurs and UE is released
  -- solution is to disable timeouts in command line in scenario
  -- also python is fixed to handle properly wrong ping exits

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-05-22 15:39:03 +02:00
matzakos
1643fb242c Alldownlink IP traffic is transferred consistently from the gNB to the PHY of the UE now based on testing with the RFSIMULATOR. Slight extension in FAPI interface required to move the received data to the MAC layer of the UE. 2019-05-22 14:38:44 +02:00
prasanth
e0c76c5a6b CI fix 2019-05-22 16:23:23 +05:30
Raphael Defosseux
a65d09cbda CI: adding support to build for coverity-scan
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-05-22 12:08:42 +02:00
Raphael Defosseux
28840df8f2 CI: fixing incorrect space indentation
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-05-22 12:04:26 +02:00
Raphael Defosseux
7d1956b674 Merge remote-tracking branch 'origin/bugfix-ue-realtime' into develop_integration_2019_w21 2019-05-22 11:39:00 +02:00
Raphael Defosseux
e40ec9578f Merge remote-tracking branch 'origin/enable-measurement-reports' into develop_integration_2019_w21 2019-05-22 11:38:10 +02:00
Raphael Defosseux
9466105ddc Merge remote-tracking branch 'origin/issue425_buildsimplification' into develop_integration_2019_w21 2019-05-22 11:34:15 +02:00
Raphael Defosseux
286956a04d Merge remote-tracking branch 'origin/RRC-Inactivity-timers-testing' into develop_integration_2019_w21 2019-05-22 11:33:49 +02:00
Raphael Defosseux
4c69e52c99 CI: proper merge on ci scripts.
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-05-22 11:25:24 +02:00
prasanth
a4426236f1 Fixing critical warnings in pucchsim 2019-05-22 13:19:08 +05:30
prasanth
06dcc1095a fix for nr_pucchsim 2019-05-22 11:26:21 +05:30
prasanth
026ace2c95 Resolved merge conflict 2019-05-21 23:26:26 +05:30
prasanth
e84a73f66c this commit includes pucch format0 receiver and testbench for pucch format0 without ofdm. Also it has some fixes to pucch_nr.c 2019-05-21 23:18:20 +05:30
Raymond Knopp
4cd3d635f7 more pthread protection in nr-gnb.c 2019-05-21 19:25:02 +02:00
yilmazt
264725c57b Changes to fix errors #1 2019-05-21 17:08:10 +02:00
Raymond Knopp
aaa3afb722 fix in usrp_lib.cpp 2019-05-21 16:02:34 +02:00
Francesco Mani
acc88008d4 make dlsim compile again 2019-05-21 15:07:26 +02:00
Javier Morgade
642d6ee681 CI WARNING suppression 2019-05-21 12:23:59 +02:00
Javier Morgade
27a3cff798 BUGFIX and cppcheck/warning suppression 2019-05-21 10:59:17 +02:00
matzakos
d95ba666d2 Minor modifications to build UE in no-s1 mode successfully 2019-05-21 10:58:18 +02:00
Florian Kaltenberger
eaa83242a8 first try to add a function to the usrp_lib to set the thread priority 2019-05-21 07:14:56 +02:00
yilmazt
ccd60195e0 Merging test-x310, ci-dev-nr-add-gnb-nr-ur-uspr-testing and nr-mimo-mode-clean branches 2019-05-20 21:32:34 +02:00
Javier Morgade
6ba8cd7029 DCI Format1A 0xfff9 false decoding 2019-05-20 17:27:19 +02:00
Francesco Mani
ef0056f1ea merged with test-x310 and conflicts resolved 2019-05-20 17:16:13 +02:00
Raphael Defosseux
cbf1e1f7f2 CI: adding high throughput DL iperf tests w/ OAI UE
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-05-20 16:37:19 +02:00
Javier Morgade
fe89f107e3 Code cleanup & CI F1 CD/DU Bugfix 2019-05-20 13:14:51 +02:00
laurent
cfcd6c37f0 Merge remote-tracking branch 'origin/develop-nr' into test-x310 2019-05-20 12:49:33 +02:00
Cedric Roux
1efbfa5304 bugfix: fix UE realtime bug
When pushing traffic with iperf the UE was crashing.

The argument passed to pthread_mutex_timedlock is absolute time based
on the CLOCK_REALTIME timer, not relative time. That seems to be the
root cause of the bug. (That there is a timeout is another story.)

This commit uses absolute value.

Also we separate cases between IS_SOFTMODEM_BASICSIM / IS_SOFTMODEM_RFSIM
and standard realtime UE. In the 'sim' modes we don't care about
timeout and just call pthread_mutex_lock. It seems to be the idea
of the original work. If not, then to be fixed.
2019-05-20 11:26:06 +02:00
matzakos
c91a1fc4f1 unitary simulator compilatio (ulsim) 2019-05-20 08:45:17 +02:00
matzakos
69d3a8f09e fixed compilation of nr-softmodem after LTE modifications 2019-05-20 07:54:46 +02:00
Raymond Knopp
38a2762d18 UHD transpor parameters for USB3 (like develop now) 2019-05-20 00:12:48 +02:00
Raymond Knopp
c59c85dfdb modifications applied to lte-ru because of common interface changes with nr-ru 2019-05-19 23:44:55 +02:00
matzakos
07d6d0ab02 fixed unwanted modification on ue NAS configuration. cleanup of commented code in usrp_lib.cpp 2019-05-19 21:18:20 +02:00
matzakos
475242c6f5 unitary simulation compilation errors resolved 2019-05-19 18:38:28 +02:00
Raymond Knopp
c1152f30d3 testing merge with develop-nr. removal of pthread_mutex_timedlock, we were using the wrong time argument (needed to be absolute). 2019-05-19 01:23:03 +02:00
Raymond Knopp
b447f0b913 minor changes 2019-05-18 17:07:24 +02:00
Javier Morgade
c3d9e779aa missing dummy function for LTE phy simulation build 2019-05-18 16:54:33 +02:00
Javier Morgade
3056343c5b Remove test code before CI 2019-05-18 16:11:55 +02:00
Raymond Knopp
da9b879112 Merge remote-tracking branch 'origin/develop-nr' into develop-nr-less-logging
Conflicts:
	openair1/SCHED_NR/sched_nr.h
2019-05-18 15:49:13 +02:00
yilmazt
9e199494b8 Minor changes 2019-05-18 15:31:43 +02:00
laurent
cc239de2c7 fix UE switch from read only to R+W 2019-05-18 15:03:23 +02:00
laurent
f1539df7f1 fix UE switch from read only to R+W 2019-05-18 14:31:41 +02:00
Florian Kaltenberger
19558fda43 Merge branch 'test-x310' into 'develop-nr'
Test x310

See merge request oai/openairinterface5g!585
2019-05-17 20:44:17 +02:00
Florian Kaltenberger
ee99817dff Merge branch 'ci-dev-nr-add-gnb-nr-ur-uspr-testing' into 'develop-nr'
CI: adding support for the N300 gNB + NR-UE testing

See merge request oai/openairinterface5g!586
2019-05-17 20:42:42 +02:00
Javier Morgade
786895dcd9 Merge remote-tracking branch 'origin/develop' into develop-entv 2019-05-17 18:11:55 +02:00
yilmazt
a38ccc8c37 Merge remote-tracking branch 'origin/develop-nr' into develop-nr-merge 2019-05-17 17:13:53 +02:00
yilmazt
7719314983 Merge branch 'develop' into develop-nr 2019-05-17 17:11:31 +02:00
Florian Kaltenberger
d54ea501a7 Merge branch 'nr-mimo-mode-clean' into 'develop-nr'
removing old mimo mode

See merge request oai/openairinterface5g!587
2019-05-17 16:35:32 +02:00
laurent
290ca22dbb fix rfsimulator initialized variable, first pass on gNB scope, bugs 2019-05-17 15:21:27 +02:00
Hongzhi Wang
7d29023c00 removing old mimo mode 2019-05-17 11:12:08 +02:00
Boris Djalal
e5bef5f98a Fix
Signed-off-by: Boris Djalal <boris.djalal@eurecom.fr>
2019-05-17 09:34:44 +02:00
Raphael Defosseux
cba1659c1d CI: fix the formatting on build HTML report for basic-sim
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-05-16 16:21:46 +02:00
Boris Djalal
d2fe8cfa0a Fixing footer and tab ref names.
Signed-off-by: Boris Djalal <boris.djalal@eurecom.fr>
2019-05-16 16:20:00 +02:00
Raphael Defosseux
aceb3a83ea Hack to break infinite loop when UE is released during RRC inactivity timeout
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-05-16 15:54:03 +02:00
Boris Djalal
db9e181d40 CI: adding support for the N300 gNB + NR-UE testing
-- pipeline is polling the develop-nr branch
  -- new conf file / new scenario files
  -- main python now supports LTE and 5G-NR executables in a Ubuntu/CentOS env
2019-05-16 11:17:22 +02:00
frtabu
ae2885b28c Merge branch 'develop' into issue425_buildsimplification 2019-05-15 23:57:57 +02:00
frtabu
03ba3b7611 update telnet server documentation (build procedure modification, add measur command)
# Please enter the commit message for your changes. Lines starting
2019-05-15 19:24:51 +02:00
frtabu
f47f3f65ba More build_oai cleanup, add a generic option "--build-lib" to build optional shared libraries (telnet server for example) 2019-05-15 18:20:16 +02:00
frtabu
83c2d32883 fix crash when attempting to use -d legacy softscope. Doesn't fix all problems but at least no crash and ready for anybody to fix diplay problems 2019-05-15 16:28:56 +02:00
frtabu
e19c0ab851 Remove deprecated build options, now available as config options: noS1, basic_simulator. Remove DISABLE_LOG_X macros, disabling logs now available via disabling the T_TRACER 2019-05-15 16:22:15 +02:00
Raphael Defosseux
df90d4bc49 CI: little scripts improvements
-- in python: detection of a build failure, the tab should close nicely
  -- L2-nFAPi simulator: adding the num-ue-thread option
  -- Moved the VM destroy stage into the "VM-based test" branch.
  -- On "slave" job pipeline, moved the XML parsing after the git merge step so new test-cases are nicely taken care of.

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-05-15 16:08:00 +02:00
laurent
b6c2f9c1df trace in case tx/rx mismatch 2019-05-15 16:05:05 +02:00
Raphael Defosseux
dfd5f316fc CI: fix in path
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-05-15 15:58:59 +02:00
Raphael Defosseux
5d455fb57b CI: little scripts improvements
-- in python: detection of a build failure, the tab should close nicely
  -- L2-nFAPi simulator: adding the num-ue-thread option
  -- Moved the VM destroy stage into the "VM-based test" branch.
  -- On "slave" job pipeline, moved the XML parsing after the git merge step so new test-cases are nicely taken care of.

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-05-15 10:44:25 +02:00
Laurent
7a5214c6b4 fix 4G merge issues 2019-05-14 16:16:57 +02:00
Francesco Mani
c254ce07a0 a unnotified conflict resolved 2019-05-14 14:39:39 +02:00
Francesco Mani
a81eafd0ae merged with develop-nr and conflicts resolved 2019-05-14 14:00:39 +02:00
Florian Kaltenberger
b472d97b27 Merge remote-tracking branch 'origin/develop-nr' into test-x310 2019-05-14 09:47:39 +02:00
Florian Kaltenberger
01879c3e2b Merge remote-tracking branch 'origin/develop-nr' into develop-nr-less-logging 2019-05-14 09:20:16 +02:00
Cedric Roux
cd667e5563 RRC: add an option to enable measurement reports
In the configuration file, to enable measurements, add:

    enable_measurement_reports = "yes";

Note that if x2 is enabled then the option 'enable_measurement_reports'
is not taken into account and the measurements are enabled.
2019-05-13 15:52:54 +02:00
Raymond Knopp
335842c1be removed race condition in ru_thread_tx when signaled from L1_thread_tx 2019-05-13 01:08:59 +02:00
Raymond Knopp
069ce10a2e NR FAPI interface additions for DLSCH (SDU pointer now does down to L1) 2019-05-11 23:57:11 +02:00
matzakos
589ced9c7a Downlink IP traffic flow using LTE RAN stack over NR-PHY. Downlink traffic reaching PHY of gNB now using the noS1 mode. Extensions required for the reception through the LTE RAN stack at the UE side. 2019-05-10 18:27:25 +02:00
frtabu
da71492f25 fix dlsim build, (dlsim has it's own scope start method...) 2019-05-09 12:13:39 +02:00
frtabu
00d9060711 remove XFORM macro, move XFORM code in optional library 2019-05-09 02:03:56 +02:00
Raymond Knopp
95e54e3b26 added real-time parametrization to L1_thread and L1_thread_tx 2019-05-08 18:06:01 +02:00
matzakos
d44479ffec tuning on laptops and fix of race condition between L1_RX -> L1_TX 2019-05-08 10:53:00 +02:00
Florian Kaltenberger
7e99e1f6b1 small fix 2019-05-07 22:25:14 +02:00
Florian Kaltenberger
905cc80b42 Merge branch 'integration_2019_w18' into 'develop-nr'
Integration 2019 w18

See merge request oai/openairinterface5g!582
2019-05-07 21:34:27 +02:00
Javier Morgade
07b25f9e8e -3GPP spec TS 36.321 table 7.1-1 RNTI values for MBMS dedicated carrier
-FFF9 RNTI also enabled for MBMS dedicated carrier
2019-05-07 17:19:48 +02:00
Florian Kaltenberger
3cafcd72b9 fixing a bad merge 2019-05-07 16:19:06 +02:00
Raphael Defosseux
296560f477 CI: adding TDD-5MHz TM2 test-cases
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-05-07 15:37:55 +02:00
frtabu
28a4f53356 Fix basic simu problem, due to remaining #if OAI_USRP... macros in UE 2019-05-06 19:17:40 +02:00
Raymond Knopp
8c1f9c9e75 modifications to synchronization between RU_TX and L1_TX (timed cond wait to drop slots)
tested on both 40 and 80 MHz channels
2019-05-06 16:04:04 +02:00
Raymond Knopp
c3b3b39ef8 :wqMerge branch 'develop-nr-less-logging' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-nr-less-logging 2019-05-05 21:57:33 +02:00
Raymond Knopp
317cbfd601 minor changes to thread synchronization after testing with N310 @ 122.88 Ms/s 2019-05-05 21:52:03 +02:00
Raymond Knopp
c66fc1fd28 Merge branch 'develop-nr-less-logging' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-nr-less-logging
Conflicts:
	openair1/SCHED_NR/phy_procedures_nr_gNB.c
2019-05-03 13:38:16 +02:00
Raymond Knopp
26d5eb90b6 intermediate commit to synch machine 2019-05-03 13:37:22 +02:00
Raymond Knopp
4c3c8f2c6c more logging removal 2019-05-03 13:33:07 +02:00
Florian Kaltenberger
fa710aa01b Merge remote-tracking branch 'origin/update_asn1c_commit' into integration_2019_w18 2019-05-03 02:09:38 +02:00
Florian Kaltenberger
a1c9d50ed4 Merge remote-tracking branch 'origin/Develop-nr-threequarter_fs-80mhz-x310' into integration_2019_w18 2019-05-03 02:09:08 +02:00
Florian Kaltenberger
19523555d1 Merge remote-tracking branch 'origin/shortBlockCoding' into integration_2019_w18 2019-05-03 02:08:38 +02:00
laurent
0061daeb9d some warnings 2019-05-02 21:21:53 +02:00
laurent
7368e4bfc4 fix compilation tests 2019-05-02 12:17:31 +02:00
Raphael Defosseux
711f7dd228 CI: fix when OAI-UE IP address is not retrievable
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-05-02 12:04:49 +02:00
laurent
ba6d47a758 rework threads in 5G 2019-04-30 21:46:49 +02:00
Raymond Knopp
c5d1a8b8dc fixed IF4p5 2x2 functionality (especially PRACH was broken on both ends)
configuration files for CU/DU (thread policy)
2019-04-30 20:26:17 +02:00
frtabu
fad83e4724 Update doc, remove color escape sequences from logs (use character to identify message level), try to fix basic simu Pb 2019-04-30 19:08:37 +02:00
frtabu
d205c806de fix remaining deprecated commands in CI 2019-04-30 15:40:13 +02:00
Laurent
4d787625ab still to compile 2019-04-30 14:25:42 +02:00
frtabu
582c6dd076 Try basic_simulator build failure (log file pattern Pb?) 2019-04-30 10:54:16 +02:00
frtabu
9f3bd99c52 Fix NB_PATTERN_FILES and BUILD_OPTIONS in oai-ci-vm-tool, remove useless options (-t, basic_simulator, rf_simulator) as corresponding libraries always built 2019-04-30 10:24:20 +02:00
laurent
8a92138086 rework threads in 5G 2019-04-30 10:17:08 +02:00
frtabu
d30776912e Rebase fixes 2019-04-29 18:51:03 +02:00
frtabu
0bf3d8f6bc Remove deprecated build options, now available as config options: noS1, basic_simulator. Remove DISABLE_LOG_X macros, disabling logs now available via disabling the T_TRACER 2019-04-29 18:46:55 +02:00
frtabu
615a56fff6 Remove deprecated build options, now available as config options: noS1, basic_simulator. Remove DISABLE_LOG_X macros, disabling logs now available via disabling the T_TRACER 2019-04-29 18:33:59 +02:00
Raymond Knopp
9fb2f7365c fronthaul bugfixes for IF4p5 2x2 antenna configuration, testing with TM2 2019-04-28 20:27:10 +02:00
Raymond Knopp
e47829af6c removal of EXPRESS MIMO HW drivers/libraries, same for mobipass. 2019-04-28 11:11:11 +02:00
Raymond Knopp
17eb5eedaf Merge remote-tracking branch 'origin/develop' into ru_rau_enhancement_L1_renaming
also:
removed XFORMS from lte-softmodem target and associated extra functions in lte-softmodem.c
Conflicts:
	common/utils/T/T_defs.h
	targets/RT/USER/lte-softmodem.c
2019-04-28 10:30:56 +02:00
Raphael Defosseux
81d4202b9b Merge branch 'develop_integration_2019_w17' into 'develop'
The following Merge Requests are included:

* MR 557 : Implement CDRX in FDD mode
* MR 571 : Improvement on documentation
* MR 572 : Fix CU/DU protocol split
* MR 574 : Fix a flexran free issue
* MR 578 : CI -- Improve OAI UE testing with USRP
2019-04-26 16:17:41 +02:00
Raphael Defosseux
f31694533e fix a few cppcheck errors.
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-04-26 13:53:06 +02:00
Raphael Defosseux
d8096787c3 CI: forced marker output by fflush at the end of eNB initialization
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-04-26 11:12:55 +02:00
Raphael Defosseux
96c11ff539 Merge remote-tracking branch 'origin/421-cdrx-for-lte' into develop_integration_2019_w17 2019-04-26 11:10:04 +02:00
Louis Adrien Dufrene
e5eb58d227 Fix for CU/DU split error. To test. 2019-04-26 08:37:46 +02:00
Raymond Knopp
269527f321 removal of residual warnings 2019-04-25 20:51:54 +02:00
Raphael Defosseux
5261ccd34d CI: making sure in all test scenarios that eNB/UE are OFF
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-04-25 17:54:47 +02:00
Raphael Defosseux
0701784daa CI: adding EPC log collection in the OAI-UE + OAI-eNB USRP pipeline template
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-04-25 17:44:53 +02:00
Raphael Defosseux
b40e2459a9 Merge remote-tracking branch 'origin/fix-flexran-test-free' into develop_integration_2019_w17 2019-04-25 17:31:37 +02:00
Raphael Defosseux
fef0f7320d CI: separate 2 stages
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-04-25 17:08:37 +02:00
Raphael Defosseux
96ed6a75fd Merge remote-tracking branch 'origin/ci-improve-oai-ue-testing' into develop_integration_2019_w17 2019-04-25 17:07:27 +02:00
Raphael Defosseux
d312a9d797 Merge remote-tracking branch 'origin/fix-cudu' into develop_integration_2019_w17 2019-04-25 17:07:00 +02:00
Raphael Defosseux
35705578e7 Merge remote-tracking branch 'origin/develop-improved-doc' into develop_integration_2019_w17 2019-04-25 17:06:44 +02:00
Raphael Defosseux
ebb30df8f7 Merge remote-tracking branch 'origin/421-cdrx-for-lte' into develop_integration_2019_w17 2019-04-25 17:06:17 +02:00
Raymond Knopp
14374c1473 fixed cppcheck errors and warnings. Removal of oaisim files tha came back during merge. 2019-04-25 11:53:52 +02:00
Raymond Knopp
31cf3ac05c removal of warnings 2019-04-24 23:17:05 +02:00
Raphael Defosseux
4ecc3c1e1f CI: OAI-UE USRP testing supports S1 configuration and testing
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-04-24 18:03:31 +02:00
Bi-Ruei, Chiu
b11f6b07f2 Update asn1c commit to solve three issues
1. Fix code generated from ASN.1 of F1AP v15.4.0 failed to be compiled
2. Fix incorrect UPER encoding for empty extensible SEQUENCE in 38.331
3. Fix the problem that duplicate type names exist in OPEN TYPE
2019-04-24 23:54:00 +08:00
Raphael Defosseux
52023590e4 DOC: remeasured TDD performances
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-04-24 13:44:22 +02:00
Raymond Knopp
c245e426d2 made "is_slave" RRU parameter default to "no" instead of "yes". 2019-04-24 11:37:13 +02:00
Raymond Knopp
8ea46f8f95 changed CI configuration files so that the scheduling paramter for TDD and TM2 is "PARALLEL_SINGLE_THREAD" 2019-04-24 07:40:35 +02:00
Raymond Knopp
b9363eef70 insert check on "ru->do_precoding" in RU TX chain for basic behaviour in monolithic eNB case 2019-04-23 19:54:12 +02:00
Raphael Defosseux
489726d0de CI: fixing some gains in the CI bench conf files for TDD
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-04-23 17:21:58 +02:00
Raphael Defosseux
9bf9c2fe97 CI: made UE cell synchro more reliable
--> looping during the initOAIUE stage

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-04-23 15:41:46 +02:00
Laurent
db79d72b37 fix test replay 2019-04-23 12:24:20 +02:00
laurent
a55f4006b4 change thread/core assignment, initial commit of replay IQ 2019-04-23 10:07:30 +02:00
Raymond Knopp
a64e7eef7d tested compilation and execution with --simL1 and --rfsim. 2019-04-22 21:20:43 +02:00
Raymond Knopp
ed08f3ab1b Merge remote-tracking branch 'origin/signal-delay' into ru_rau_enhancement_L1_renaming
Conflicts:
	openair1/PHY/defs_eNB.h
	openair1/SCHED/fapi_l1.c
	openair1/SCHED/phy_procedures_lte_eNb.c
	openair1/SCHED/prach_procedures.c
	openair2/LAYER2/MAC/eNB_scheduler.c
	openair2/LAYER2/MAC/eNB_scheduler_RA.c
	openair2/LAYER2/MAC/eNB_scheduler_primitives.c
	targets/RT/USER/lte-enb.c
	targets/RT/USER/lte-ru.c
	targets/RT/USER/lte-softmodem.c
	targets/RT/USER/lte-uesoftmodem.c
2019-04-20 08:28:43 +02:00
Rakesh Mundlamuri
65160704ab Declaration of openair0_cfg 2019-04-19 23:45:30 +05:30
Robert Schmidt
82db432191 Make separate func_ptr setters for PDCP Ind/RLC Req 2019-04-19 14:06:48 +02:00
Robert Schmidt
42713b95fc Configure complete PDCP in lte-(ue)softmodem
* Instead of partly initializing in read_config_and_init(), everything of
  PDCP is initialized in main() of lte-softmodem
* Omit RC.rrc access in RRU through checking of RC.nb_inst > 0
* Includes FlexRAN, i.e. do not start FlexRAN in RRU
* Function pointers to PDCP functions have to be set explicitly (avoid
  confusion of multiply setting function pointers)
2019-04-19 14:05:51 +02:00
Rakesh Mundlamuri
a531ea62fa The changes made in this branch is to enable -E(threequarter sampling rate) option for mu=1 and 217PRB(ie; 80 MHz) to run on USRP x310. 2019-04-19 17:24:18 +05:30
Raphael Defosseux
24b46f3f02 CI: running the RRC Inactivity Timer scenarion first once without flexran controller
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-04-19 12:17:02 +02:00
Raphael Defosseux
b39cb4e586 CI: fix end of scenario when UE IP address retrieving fails during ping tests
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-04-19 10:55:27 +02:00
Raymond Knopp
d1e27f4e8c changes in PARALLEL_RU_L!_TRX_SPLIT configuration. Correction of a few bugs related to passing of variables between threads 2019-04-19 03:18:06 +02:00
Raphael Defosseux
8418bec3a3 DOC: fix some page headers
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-04-18 17:20:01 +02:00
Raphael Defosseux
b5008bf48a DOC: fix links in GitLab
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-04-18 17:11:50 +02:00
Raphael Defosseux
151bbd0832 CI/DOC: more detailed documentation on how CI works
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-04-18 17:02:41 +02:00
Robert Schmidt
de1dc5c9d7 Correct if before call free() 2019-04-18 16:03:01 +02:00
Robert Schmidt
b4f462b9c8 Align PROTO_AGENT functions with PDCP/RLC function pointers 2019-04-18 13:42:20 +02:00
Louis Adrien Dufrene
fd30b205d9 Merge branch '421-cdrx-for-lte' of https://gitlab.eurecom.fr/oai/openairinterface5g into 421-cdrx-for-lte 2019-04-18 13:29:35 +02:00
Louis Adrien Dufrene
3f6ab59010 remove debug 2019-04-18 13:28:36 +02:00
Raphael Defosseux
f515213dbe CI: adding back TCP iperf tests in TDD
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-04-18 12:34:55 +02:00
Louis Adrien Dufrene
0e6431a7b9 Moved code for HARQ process from PHY layer to MAC layer 2019-04-18 11:51:20 +02:00
Louis Adrien Dufrene
fbcc7ad20c Merge branch '421-cdrx-for-lte' into orange_cdrx_test 2019-04-18 10:59:41 +02:00
Louis Adrien Dufrene
5da3dd5df6 Some formats + CDRX added to feature_set.md 2019-04-18 10:59:17 +02:00
Raphael Defosseux
363dc1cb6f CI: adding cdrx parameters to one scenario (FDD-Monolithic-10MHz)
-> slight increase on the ping RTT by 10 ms
  -> notification in the HTML report that CDRX was activated

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-04-17 15:06:32 +02:00
Francesco Mani
f6fbd72cae initialization of nr_tti_rx in initial sync 2019-04-17 12:15:27 +02:00
Louis Adrien Dufrene
34447c0eef build fix 2019-04-17 08:29:54 +02:00
Louis Adrien Dufrene
6751a39a03 Merge branch 'orange_cdrx_test' of https://gitlab.forge.orange-labs.fr/afyf6286/oai-orange into orange_cdrx_test 2019-04-17 08:12:07 +02:00
Louis Adrien Dufrene
71d56e78eb Remove MAC layer context from phy_procedures_lte_eNb.c to prevent phy-sim build from fail 2019-04-17 08:06:37 +02:00
yilmazt
5fa78b4d6e Final --phy_simulators warning removals for this branch, and former polar coding function corrections 2019-04-16 17:24:58 +02:00
Raphael Defosseux
2774e51664 DOC: fix some images broken links and also align formatting
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-04-16 14:52:29 +02:00
Raphael Defosseux
1fea702c68 CI: fix last failure in full-RAN pipeline
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-04-16 13:06:38 +02:00
Louis Adrien Dufrene
49ba4e5669 Fix phy_sim build 2019-04-16 11:51:28 +02:00
Raphael Defosseux
c153ee1204 CI: fix after bad merge in main.py
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-04-16 10:33:17 +02:00
Louis Adrien Dufrene
93fb04ea5f End of merge from develop 2019-04-16 09:29:20 +02:00
OAI-admin
7b6ac826ff End of merge from develop 2019-04-16 09:24:38 +02:00
Louis Adrien Dufrene
5ae494e974 merge from develop 2019-04-16 09:13:25 +02:00
Louis Adrien Dufrene
36cd05bcba Bug fix: dci0_ongoing timer ok, now impossible to set ul_SR when dci0 is ongoing. 2019-04-16 08:22:54 +02:00
Raphael Defosseux
ef42eb7181 CI: fix in full ran template pipeline
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-04-15 23:09:04 +02:00
yilmazt
75f131ad54 --phy_simulators warning removals, except for nr_dlsim. Polar coding old implementation's approximation and a priori information options needs to be corrected or removed 2019-04-15 21:49:28 +02:00
Raphael Defosseux
f8f19aa084 Merge remote-tracking branch 'origin/develop' into RRC-Inactivity-timers-testing 2019-04-15 21:21:07 +02:00
Raphael Defosseux
7b7718a126 CI: fix TerminateOAIUE standalone mode
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-04-15 21:11:41 +02:00
Raphael Defosseux
c7c104a6e7 CI: adding dummy skeleton stages in pipeline to run L1/RF simulators
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-04-15 17:28:44 +02:00
Francesco Mani
ca4627836f fixing compilation error 2019-04-15 15:46:37 +02:00
Francesco Mani
8897b3c88d conflicts solved after merge with develop-nr 2019-04-15 15:28:56 +02:00
Raphael Defosseux
8c7ed9f743 Merge branch 'develop_integration_2019_w15' into 'develop'
The following Merge Requests are included:

-  MR 553: L2-nFAPI-simulator improvements and nFAPI code clean-up
-  MR 554: Fixes on MAC scheduler
-  MR 558: T: minor fix: ensure printing is inside the widget 
-  MR 559: UE T Tracer: bug fixes
-  MR 561: Adding OAI UE + USRP test scenarios
-  MR 567: Adding F1 - CU/DU test scenarios
2019-04-15 15:19:31 +02:00
Raphael Defosseux
815f97d6bc CI: fix typo in main.py file
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-04-15 13:30:38 +02:00
Raphael Defosseux
fd956d7f0e CI: fix in PCPAP file recovering process
---> issue: /tmp was chmod'ed 666 on the EPC server

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-04-15 12:30:36 +02:00
Louis Adrien Dufrene
d7cddc2825 Bug fix of drx_config == PrNothing is now handled. Bug fix for dci0_ongoing not working. To investigate 2019-04-15 10:57:39 +02:00
Cedric Roux
9ea7073c68 Merge remote-tracking branch 'origin/fixes-mac-scheduler-2019-w13' into develop_integration_2019_w15
Conflicts:
	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
2019-04-15 10:50:38 +02:00
Raphael Defosseux
1f504284b8 Merge remote-tracking branch 'origin/add-f1-cu-du-tests' into develop_integration_2019_w15 2019-04-15 10:20:42 +02:00
Raphael Defosseux
44e1b6aec3 Merge remote-tracking branch 'origin/add-oai-ue-noS1-testing' into develop_integration_2019_w15 2019-04-15 10:19:10 +02:00
Raphael Defosseux
335e894ce3 Merge remote-tracking branch 'origin/T-ue-fixes-2019-w14' into develop_integration_2019_w15 2019-04-15 10:18:47 +02:00
Raphael Defosseux
3ce2861864 Merge remote-tracking branch 'origin/T-minor-fix-2019-w14' into develop_integration_2019_w15 2019-04-15 10:18:27 +02:00
Raphael Defosseux
9e247f3fb3 Merge remote-tracking branch 'origin/ci-improve-l2-sim' into develop_integration_2019_w15 2019-04-15 10:18:01 +02:00
Louis Adrien Dufrene
4c931888e6 Add dci0_ongoing_timer. Commit to build and test. 2019-04-15 08:54:00 +02:00
Raymond Knopp
ca111641d4 Merge remote-tracking branch 'origin/develop' into ru_rau_enhancement_L1_renaming
Conflicts:
	cmake_targets/build_oai
	cmake_targets/oaisim_build_oai/CMakeLists.template
	cmake_targets/oaisim_mme_build_oai/CMakeLists.template
	cmake_targets/oaisim_noS1_build_oai/CMakeLists.template
	openair1/PHY/LTE_ESTIMATION/lte_sync_time.c
	openair1/PHY/LTE_ESTIMATION/lte_ul_channel_estimation.c
	openair1/PHY/LTE_TRANSPORT/dci_tools.c
	openair1/PHY/LTE_TRANSPORT/if4_tools.c
	openair1/PHY/LTE_TRANSPORT/prach.c
	openair1/PHY/LTE_TRANSPORT/pucch.c
	openair1/PHY/LTE_UE_TRANSPORT/dlsch_demodulation.c
	openair1/PHY/impl_defs_lte.h
	openair1/SCHED/fapi_l1.c
	openair1/SCHED/phy_procedures_lte_eNb.c
	openair1/SIMULATION/LTE_PHY/dlsim.c
	openair2/ENB_APP/enb_config.c
	openair2/ENB_APP/enb_paramdef.h
	openair2/LAYER2/MAC/eNB_scheduler_RA.c
	openair2/LAYER2/MAC/eNB_scheduler_primitives.c
	targets/ARCH/ETHERNET/USERSPACE/LIB/eth_udp.c
	targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c
	targets/RT/USER/lte-enb.c
	targets/RT/USER/lte-ru.c
	targets/RT/USER/lte-softmodem.c
	targets/RT/USER/lte-softmodem.h
2019-04-14 20:34:03 +02:00
Raphael Defosseux
796bdaec77 CI: increasing timeout limit for UHD commands
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-04-13 15:04:43 +02:00
Rohit Gupta
a05255d246 increased size of maximum SI allocation (to mcs 9 with 3 PRBs) Fixes issues with SI message using eMTC information elementswq 2019-04-13 01:12:33 +02:00
Dr.-Ing. Javier Morgade
aecd1ee1d3 Bug fix remove test code 2019-04-12 16:35:31 +02:00
Raphael Defosseux
818b8d82f1 CI: full report on L2 nFAPI simulator testing
-- Also added support for RF simulator

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-04-12 15:47:18 +02:00
Raphael Defosseux
7cf543f7fb CI: forcing the --nokrnmod 1 option on the UE
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-04-12 15:22:43 +02:00
Javier Morgade
db42be5db9 FeMBMS PBCH Initial Scan Procedures 2019-04-12 10:59:50 +02:00
Javier Morgade
8a67e0e5f0 FeMBMS PBCH Physical Layer Procedures 3GPP TS 36.213 version 14.2.0 Release 14 2019-04-12 09:46:39 +02:00
Javier Morgade
23e63be717 FeMBMS PBCH (Physical Broadcast Channel) 3GPP TS 36.211 version 14.2.0 Release 14 Section 6.6
Code cleanup
2019-04-12 09:13:09 +02:00
Florian Kaltenberger
2624dca2fe fixing test_case_list 2019-04-12 02:56:31 +02:00
Florian Kaltenberger
52a420bbed increasing NB_PATTERN_FILES in ci script to account for new smallblocktest 2019-04-11 22:45:42 +02:00
Raymond Knopp
463164a4c3 removal of unnecessary include files in fapi_nr_l1.h. 2019-04-14 22:41:39 +02:00
yilmazt
0aec6f7aa1 A couple minor warning removals 2019-04-14 18:39:35 +02:00
yilmazt
c990cbc851 Added clean_gNB_ulsch, polartest fully working for all options and other minor warning removals. 2019-04-14 18:11:42 +02:00
yilmazt
b2add95524 Added clean_gNB_ulsch, fully working polartest, and many other minor warning removals. 2019-04-14 17:38:52 +02:00
Raymond Knopp
99c6c9227e cleanup after merge with develop-nr 2019-04-12 13:27:20 +02:00
Raymond Knopp
231836ebbd Merge remote-tracking branch 'origin/develop-nr' into shortBlockCoding
Conflicts:
	openair1/SIMULATION/NR_PHY/dlsim.c
2019-04-12 08:56:49 +02:00
Raymond Knopp
d091be51b8 added backtrace.c to smallblocktest executable 2019-04-12 08:55:10 +02:00
Raymond Knopp
27ef071b81 polartest changes for DCI parameters 2019-04-12 07:57:34 +02:00
Javier Morgade
a25f4b08bb FeMBMS UE Physical Layer Procedures implemented/validated -> 3GPP TS 36.213 version 14.2.0 Release 14 (Section 11) 2019-04-11 22:08:30 +02:00
Javier Morgade
f1fa1e1f53 FeMBMS UE RRC<->MAC Procedures SI-MBMS and SIB1-MBMS(sib13, LTE_NonMBSFN_Subframe) 2019-04-11 22:04:40 +02:00
Javier Morgade
35421860f9 Bugfix RLC/PDCP MBMS Bearer settings 2019-04-11 22:01:24 +02:00
Javier Morgade
23fa1ee31f FeMBMS PMCH (Physical Multicast Channel) procedures implemented/validated
3GPP TS 36.211 version 14.2.0 Release 14 Section 6.5
	3GPP TS 36.211 version 14.2.0 Release 14 Section 6.10.2
2019-04-11 21:53:43 +02:00
Javier Morgade
0a4dd14009 FeMBMS 1.25KHz Carrier Spacing OFDM demodulation and Channel Estimation Procedures 2019-04-11 21:50:21 +02:00
Javier Morgade
e58b56548d Comment LOG_M function 2019-04-11 21:48:10 +02:00
Javier Morgade
2566048e7c FeMBMS 1.25KHz Pilots (MBSFN Gold psequences) 2019-04-11 21:45:50 +02:00
Javier Morgade
fe6fd8b7dc Bugfix 2019-04-11 21:44:51 +02:00
Javier Morgade
a05f3b3508 Missing files 2019-04-11 21:43:50 +02:00
Javier Morgade
28b33ac048 Adding some basic prototypes 2019-04-11 21:42:23 +02:00
Javier Morgade
bffa7ca056 Implemented FeMBMS Channel Estimation (1.25 KHz @ 25 RB) 2019-04-11 21:39:33 +02:00
Javier Morgade
42db242189 Cubic Interpolation Lookup Tables for 1.25KHz MBSFN Carrier Spacing 2019-04-11 21:37:21 +02:00
Javier Morgade
a3f2ce1b2c VCD FeMBMS Prototypes 2019-04-11 21:32:32 +02:00
Raphael Defosseux
0ed77d6304 CI: simplify master pipeline
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-04-11 17:18:08 +02:00
Raphael Defosseux
191f11a01a CI: adding new slave job to pipeline
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-04-11 17:18:08 +02:00
Raphael Defosseux
a7678b337b CI: better iperf syntax
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-04-11 17:06:13 +02:00
nepes
7efa1921b6 check for LTE-M PDSCH in call to pdsch_procedures() to avoid unset dlsch1 structure 2019-04-11 16:09:29 +02:00
Hongzhi Wang
29e058df17 ue pdsch config from fapi removing hardcoded values 2019-04-11 14:45:03 +02:00
laurent
2e6d9d7d4a Remove table of thread_id in the main UE thread 2019-04-11 13:44:08 +02:00
OAI-admin
7dc2b23115 minor modification in print info 2019-04-11 08:45:27 +02:00
OAI-admin
58082d84b8 Clean version. Check if there is a bug to fix. 2019-04-11 08:37:52 +02:00
OAI-admin
85ebe2d261 Build fix 2019-04-11 08:16:41 +02:00
Louis Adrien Dufrene
46b0a9fb38 Remove bypass_cdrx variable and add cdrx_waiting_ack. The CDRX is now activated at RRC COnnection Reconfiguration Complete reception. To Test 2019-04-11 07:36:05 +02:00
laurent
7b3615de64 fix bugs 2019-04-10 18:23:12 +02:00
Raphael Defosseux
95a71eeef6 CI: adding iperf tests to L2-nFAPI sim
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-04-10 16:41:39 +02:00
Louis Adrien Dufrene
62fba7c03d To clean and test: in rrc_eNB.c RRC Connection reconfiguration: CAT-M1 should not be configured 2019-04-10 10:19:36 +02:00
Louis Adrien Dufrene
3406634b6b This is version 1.0. To test. Cleanup of phy_procedures_lte_eNb.c eNB_scheduler_dlsch.c eNB_scheduler_ulsch.c pre_processor.c and asn1_msg.c 2019-04-10 08:48:37 +02:00
Raphael Defosseux
ba3f18ded9 Merge branch 'ci-improve-l2-sim' of https://gitlab.eurecom.fr/oai/openairinterface5g into ci-improve-l2-sim 2019-04-09 23:21:23 +02:00
Raphael Defosseux
aaa07960f3 CI: initial support for RF simulator
-- also parallel pings on L2 nFAPI simulator

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-04-09 23:19:40 +02:00
Raphael Defosseux
2390b8aeed CI: adding support for F1 CU/DU split testing
-- Only FDD for the moment

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-04-09 14:54:14 +02:00
laurent
bc53a9afee fix number of parallel slots processing limit 2019-04-09 10:17:12 +02:00
Louis Adrien Dufrene
a73f639d8a Cleanup of rrc_eNB.c 2019-04-09 10:01:48 +02:00
Florian Kaltenberger
2da6fb8efb fixing a bug in adjust_sync
removing printfs
2019-04-09 09:06:00 +02:00
Florian Kaltenberger
0ce2124a0a Merge branch 'integration_develop-nr_2019w15' into 'develop-nr'
Integration develop nr 2019w15

See merge request oai/openairinterface5g!565
2019-04-08 20:53:31 +02:00
frtabu
3535263cc3 Add a LOG in nas_config.c, apply astyle for the 6 files CI mentioned as not well formatted 2019-04-08 18:21:03 +02:00
Francesco Mani
09cca53829 using only one structure for rxdata 2019-04-08 17:17:48 +02:00
Raphael Defosseux
064d7fd917 CI: fixing the build report and a few warnings
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-04-08 11:54:03 +02:00
Hongzhi Wang
69489f959d bug fix for compilation error 2019-04-08 10:59:21 +02:00
Florian Kaltenberger
329242c7e6 Merge branch 'integration_nr_IA_receiver' into fix-frame-rx-and-memory 2019-04-07 20:56:38 +02:00
Florian Kaltenberger
ff38866130 Merge remote-tracking branch 'origin/develop-nr' into integration_nr_IA_receiver 2019-04-07 20:44:37 +02:00
Florian Kaltenberger
d208283327 Merge branch 'nr_pdsch_debug' into fix-frame-rx-and-memory
Conflicts:
	executables/nr-ue.c
2019-04-07 11:25:06 +02:00
Florian Kaltenberger
bdca3e4832 moving BWP config to MAC. 2019-04-07 08:12:13 +02:00
Florian Kaltenberger
71fc1b6890 makeing pdsch parameters dependent on DCI 2019-04-06 18:37:00 +02:00
frtabu
30b7c973e0 merge nfapi_cleanup 2019-04-05 18:43:40 +02:00
Francesco Mani
f5d6aa4ca6 fix on pbchsim without -I 2019-04-05 18:18:49 +02:00
Francesco Mani
43a98185db fix on pbchsim for -I but still not working without initial sync 2019-04-05 18:02:26 +02:00
Raphael Defosseux
6c475f8fc2 CI: final python fixes for OAI-UE <-> OAI-eNB connection test
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-04-05 15:10:54 +02:00
Francesco Mani
91121c6bd3 default ssb periodicity 5ms and function to compute if ssb is in slot 2019-04-05 11:57:20 +02:00
Louis Adrien Dufrene
7817358197 Cleanup of enb_config.c config.c asn1_msg.c asn1_msg.h 2019-04-05 11:56:29 +02:00
Florian Kaltenberger
e0f4a9c5f7 Merge remote-tracking branch 'origin/nr_pdsch_debug' into fix-frame-rx-and-memory
Conflicts:
	openair1/PHY/NR_UE_TRANSPORT/nr_pbch.c
2019-04-05 11:35:14 +02:00
Louis Adrien Dufrene
8359b9684e Cleanup of mac.h and mac_proto.h 2019-04-05 08:28:23 +02:00
Louis Adrien Dufrene
ca11800087 Cleanup of eNB_scheduler.c 2019-04-05 08:14:27 +02:00
Florian Kaltenberger
e85cd9b79f gNB was not taking into account rnti for PDSCH. This code has to be revised once we start using dataScrambilngIdendityPDSCH 2019-04-05 00:55:05 +02:00
Florian Kaltenberger
645514e1c4 fixing pbchsim 2019-04-04 22:55:05 +02:00
Raphael Defosseux
25a3f1cdfe CI: fix on build
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-04-04 22:06:10 +02:00
Raphael Defosseux
69c4acfb85 CI: fix on detach
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-04-04 20:55:41 +02:00
Francesco Mani
2feed73050 fixing counter of trashed frames for two frames synchronization 2019-04-04 18:36:31 +02:00
Francesco Mani
e0986d2de3 removing my trashed frames 2019-04-04 18:01:13 +02:00
Raphael Defosseux
a65b4c087c CI: auto-termination, check on all processes
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-04-04 17:50:17 +02:00
Francesco Mani
2ff8bb2012 merged with branch fix-frame-rx-and-memory and conflicts solved 2019-04-04 16:33:46 +02:00
Raphael Defosseux
d99dc5af17 CI: adding iperf UDP skeleton
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-04-04 11:40:03 +02:00
Stefan Schaffelder
42e0929a0c apply last diff from ssr to local orange_cdrx branch. Remove SSR comments 2019-04-04 10:15:38 +02:00
Raymond Knopp
1ca00e40b5 Merge remote-tracking branch 'origin/develop-nr' into shortBlockCoding
Conflicts:
	cmake_targets/CMakeLists.txt
	cmake_targets/autotests/test_case_list.xml
	cmake_targets/build_oai
	openair1/PHY/CODING/TESTBENCH/polartest.c
	openair1/PHY/CODING/nrPolar_tools/nr_polar_decoder.c
	openair1/PHY/CODING/nrPolar_tools/nr_polar_decoding_tools.c
	openair1/PHY/CODING/nrPolar_tools/nr_polar_defs.h
	openair1/PHY/CODING/nrPolar_tools/nr_polar_encoder.c
	openair1/PHY/CODING/nr_polar_init.c
	openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
	openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
	openair1/SIMULATION/NR_PHY/dlschsim.c
	openair1/SIMULATION/NR_PHY/dlsim.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
2019-04-04 09:14:37 +02:00
Louis Adrien Dufrene
81f04d2982 Apply diff between ssr (CDRX) branch and develop 2019-04-04 08:17:26 +02:00
laurent
48a103ea82 fixes 2019-04-03 22:12:10 +02:00
Raphael Defosseux
5f5cef7a20 CI: supporting ping in noS1 configuration in python
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-04-03 21:42:24 +02:00
Florian Kaltenberger
67e1afd3ac reactivating timing correction 2019-04-03 17:47:00 +02:00
Francesco Mani
a08e120c1c Removing an unwanted printf 2019-04-03 17:16:54 +02:00
Florian Kaltenberger
05dd8743e9 first version of UE FAPI handling for DLSCH. paramters from DCI are now handled by MAC and passed back to the PHY to program PDSCH. Still need to check parameters and take them into account in PHY. 2019-04-03 17:16:00 +02:00
Francesco Mani
e5a682c690 Update pss_nr.c 2019-04-03 17:14:47 +02:00
Francesco Mani
ecaa424cbb fixes in how sync for two frames is handled in pss functions, it works 2019-04-03 17:11:56 +02:00
Francesco Mani
385dcea7eb intial sync over two frames (not working, still need to debug) 2019-04-03 15:07:45 +02:00
Raphael Defosseux
ee547c1d5a CI: fix address from committer in Merge Request case
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-04-03 13:53:39 +02:00
Cedric Roux
4905a5e8e8 bugfixes for the ue T tracer
Not much major changes. In openair1/PHY/LTE_UE_TRANSPORT/dci_tools_ue.c,
in the function generate_ue_dlsch_params_from_dci,
'harq_pid' was removed and dci_info_extarcted.harq_pid is now used for
all cases.

The ue T tracer only deals with PHY signals (no MAC, RLC, PDCP, RRC).
2019-04-03 12:44:17 +02:00
Cedric Roux
b937983449 T: minor fix: ensure printing is inside the widget 2019-04-03 12:27:31 +02:00
Florian Kaltenberger
f0fe613130 fixing warning 2019-04-03 11:51:08 +02:00
Florian Kaltenberger
35df00e02a Merge remote-tracking branch 'origin/develop-nr' into nr_pdsch_debug 2019-04-03 11:43:24 +02:00
Florian Kaltenberger
6db55b2f24 - UE channel estimation no longer done in slot_fep. Also created dedicated memory for channel estimates of different channels
- using nr_extract_dci_info instead of nr_generate_ue_ul_dlsch_params_from_dci as in phy_procedures_nr_ue. The latter was only a (poor) wrapper and not doing what the name suggests. also with FAPI things have to be done differently now. This will come in a next commit.
- other minor changes to remove warning
prepreatory changes
2019-04-03 11:40:26 +02:00
Raphael Defosseux
b39bf79bab CI: pipeline is too big
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-04-02 18:38:27 +02:00
Raphael Defosseux
f53d025e0d CI: better email reporting
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-04-02 18:19:31 +02:00
Francesco Mani
a8e8d55f29 changing calls to slot fep and ch estimation in procedure_nr_ue for slot based processing 2019-04-02 10:02:32 +02:00
Florian Kaltenberger
2df82e34c6 Merge branch 'nr_pdsch_debug' into 'develop-nr'
Nr pdsch debug

See merge request oai/openairinterface5g!556
2019-04-02 09:14:13 +02:00
Florian Kaltenberger
07fd510770 Merge branch '420-add-autotest-for-nr_ulschsim' into 'develop-nr'
Resolve "Add autotest for nr_ulschsim"

See merge request oai/openairinterface5g!555
2019-04-02 09:13:07 +02:00
Florian Kaltenberger
10674d9ba9 fixing PDSCH RB offset at gNB 2019-04-01 16:44:08 +02:00
Raphael Defosseux
b40335613f CI: after Radio Setup modification, increase on the max Rx gain for UE scenario
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-04-01 16:28:33 +02:00
Thomas Schlichter
e613294c67 Add nr_ulschsim Test cases to autotests 2019-04-01 16:27:51 +02:00
Florian Kaltenberger
1fcd5aaae2 adding loglevel as command line option 2019-04-01 14:28:20 +02:00
Florian Kaltenberger
efe25b728d setting nb_symb to 9 at UE like in gNB 2019-04-01 14:27:51 +02:00
Florian Kaltenberger
02f39f140c hardcoding tbs_table=1 as UE only supports that. 2019-04-01 14:26:27 +02:00
Raphael Defosseux
cc4aeb6a0c CI: hack to running l2-nfapi-sim in current pipeline
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-04-01 13:33:45 +02:00
Florian Kaltenberger
4178da5af8 bugfixing hardcoded value 2019-04-01 13:29:28 +02:00
Florian Kaltenberger
21a2f12a0a removing next_thread business (not needed for now)
removing unused code
activating pdsch detection
2019-04-01 10:34:38 +02:00
Cedric Roux
a5a1690394 bugfixes for UL scheduling
- size of PUCCH has been fixed to:
    - 2 RBs for N_RB_UL = 25 (1 RB at top of resource grid, 1 RB at bottom)
    - 4 RBs for N_RB_UL = 50
    - 6 RBs for N_RB_UL = 100
  this is arbitrary and will need some rework at some point.
  This may be also wrong. PUCCH size actually depends on DL traffic
  (if the ack/nack is not done in PUSCH) and scheduling request
  configurations.
- add sched_frame %= 1024 at one needed place
- reserve RBs for retransmission
  this was not done so new transmissions were scheduled in the same
  RBs. Since the code works with the notion of 'first_rb' only, it
  was decided to skip all RBs lower than those retransmitted. This
  works but is not correct (imagine we have to retransmit RB 23, then
  all RBs < 23 will not be used for new transmission). The work to
  fix this properly is complex, a lot has to change, so let's do it
  this simple way for now.
- sort_ue_ul was not correct
  - add the function maxround_ul to use the correct 'round' (the one
    from DL was used, which is totally wrong)
  - be sure to use the correct frame/subframe to get the correct HARQ pid
2019-03-30 15:19:27 +01:00
Cedric Roux
0e38852b05 bugfix: access correctly round_UL 2019-03-30 15:18:18 +01:00
Cedric Roux
26118ed860 bugfix: fix cqi_req usage in UL scheduler
For retransmission, let's use cqi_req used for the 1st transmission.

Maybe incorrect, should check the specs. (In the worst case, we
simply won't decode this transmission at all. No big deal.)
2019-03-30 15:18:18 +01:00
Cedric Roux
9565544e3f bugfix: test free RBs and CCE allocation feasible only for new transmissions 2019-03-30 15:18:18 +01:00
Cedric Roux
04c24ff698 minor cleanup 2019-03-30 15:13:37 +01:00
Cedric Roux
daee800e3e bugfix: keep frame in [0..1023] 2019-03-30 15:13:37 +01:00
Cedric Roux
35a38fbee8 bugfix: fix T_ENB_MAC_UE_UL_SCHEDULE_RETRANSMISSION parameters 2019-03-30 15:13:37 +01:00
Francesco Mani
9f5140ae76 Merge branch 'develop-nr' into nr_ssb_periodicity 2019-03-29 16:51:49 +01:00
Raphael Defosseux
802f4c6158 CI: separating the OSA, non-OSA build variants from the test variants
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-03-29 16:41:11 +01:00
Florian Kaltenberger
5db1b11613 Merge branch 'thread-pool2' into 'develop-nr'
Thread pool2

See merge request oai/openairinterface5g!552
2019-03-29 15:54:37 +01:00
Raphael Defosseux
92ca8a5e34 Merge remote-tracking branch 'origin/develop' into ci-improve-l2-sim
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-03-29 15:02:39 +01:00
Raphael Defosseux
2222829bd9 Merge remote-tracking branch 'origin/develop' into RRC-Inactivity-timers-testing
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-03-29 15:00:20 +01:00
Raphael Defosseux
118418cdc5 Merge branch 'develop_integration_2019_w13' into 'develop'
Develop Integration Branch 2019 week 13

The following MRs have been integrated:

* MR 524 : Feature 127 -- Protocol Split F1 -- CU/DU
* MR 539 : Documentation on the new build/simulation system
* MR 542 : TDD fixes
* MR 545 : Initial framework testing for OAI UE testing over-the-air
* MR 546 : Fix in FlexRan code
* MR 548 : new Thread Pool feature
2019-03-29 12:24:41 +01:00
Raphael Defosseux
8c5d67a8f3 CI: fix long standing typo
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-03-28 18:54:58 +01:00
Raphael Defosseux
9fc69ea197 CI: putting back stronger constraints on TDD-5MHz tests
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-03-28 17:55:12 +01:00
Raphael Defosseux
34b4f693e1 CI: proper factorisation on basic-sim and l2-sim tests
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-03-28 17:49:55 +01:00
Florian Kaltenberger
19d9693c04 adding get_band to new nr-ue executable 2019-03-28 17:48:34 +01:00
Raphael Defosseux
046089ac27 CI: fixing image links in documentation
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-03-28 15:01:25 +01:00
Raphael Defosseux
2d58f3541e CI: adding noS1 test on L2-simulator
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-03-28 14:54:43 +01:00
Raphael Defosseux
0a05acc29f CI: fix reporting for L2-simulator
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-03-28 10:34:53 +01:00
Raphael Defosseux
7d44d4dde9 Merge remote-tracking branch 'origin/feature-thread-pool' into develop_integration_2019_w13 2019-03-28 10:24:51 +01:00
Raphael Defosseux
cf2996f403 Merge remote-tracking branch 'origin/fix-flexran-ul-mac-sdus' into develop_integration_2019_w13 2019-03-28 10:24:27 +01:00
Raphael Defosseux
5c8b5780bf Merge remote-tracking branch 'origin/add-oai-ue-testing' into develop_integration_2019_w13 2019-03-28 10:24:04 +01:00
Raphael Defosseux
1008be908c Merge remote-tracking branch 'origin/tdd-fixes-2019-w11' into develop_integration_2019_w13 2019-03-28 10:23:46 +01:00
Raphael Defosseux
7dd91db2bd Merge remote-tracking branch 'origin/issue414_doc' into develop_integration_2019_w13 2019-03-28 10:23:23 +01:00
Florian Kaltenberger
0929292a72 Merge remote-tracking branch 'origin/develop-nr' into thread-pool 2019-03-27 21:44:27 +01:00
Florian Kaltenberger
9bac5338c8 Merge branch '409-merge-ulschsim-containing-pusch-encoding-and-decoding' into 'develop-nr'
Resolve "Merge ulschsim containing PUSCH encoding and decoding"

See merge request oai/openairinterface5g!532
2019-03-27 20:16:34 +01:00
Raphael Defosseux
6271ca3705 CI: Improvement to 4 users
-- EPC lists are expended to 16 users
 -- UE .u* files are regenerated on demand
 -- ping still one UE from EPC
CI: pipeline improvement
 -- L2-Sim is no more a build variant
    One VM less to be created

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-03-27 17:37:10 +01:00
Francesco Mani
16fbe03394 merging in develop-nr and resolving conficts 2019-03-27 16:26:49 +01:00
Thomas Schlichter
4af9f321cf Fix multiple SSB support for PUSCH 2019-03-27 16:10:51 +01:00
Raphael Defosseux
783583880d CI: improved HTML reporting on OAI UE
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-03-27 15:06:01 +01:00
Florian Kaltenberger
d7403d4e61 Merge remote-tracking branch 'origin/develop-nr' into 409-merge-ulschsim-containing-pusch-encoding-and-decoding 2019-03-27 13:30:44 +01:00
Florian Kaltenberger
aef2d908f7 Merge branch 'multiple-ssb-detection' into 'develop-nr'
Multiple ssb detection

See merge request oai/openairinterface5g!530
2019-03-27 13:29:59 +01:00
Raphael Defosseux
cce291c5fc CI: fixing the cppcheck assertion non-check.
fixed also new warnings

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-03-27 11:10:35 +01:00
Francesco Mani
e6fa2079b7 ssb periodicity in UE and initialized at nr_ue_init 2019-03-27 10:29:51 +01:00
Francesco Mani
ab299dd2e2 modification to pbchsim without initial sync 2019-03-27 09:43:09 +01:00
Florian Kaltenberger
97f4ec965e desparate to get the get_band function to work for all targets 2019-03-26 18:19:36 +01:00
Florian Kaltenberger
f8b03ef045 Merge remote-tracking branch 'origin/develop-nr' into 409-merge-ulschsim-containing-pusch-encoding-and-decoding 2019-03-26 16:22:45 +01:00
Florian Kaltenberger
40b52195fc redefining max number of UEs for memory allocation. Using the PHYSIM macro, different allocations are used for phy_simulators and real-time modem. 2019-03-26 16:16:34 +01:00
Florian Kaltenberger
dea3125734 moving nr_bandtable back to MAC 2019-03-26 14:48:30 +01:00
Raphael Defosseux
551319ef87 Fix segmentation fault. The si_Periodicity value was taking very lage values.
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-03-26 13:52:53 +01:00
Florian Kaltenberger
3554fb9b00 adding testcases for smallblocktest 2019-03-26 13:48:20 +01:00
Robert Schmidt
896ea4a72a Fix: Check for node type in L2_interface only when not UE 2019-03-26 13:37:14 +01:00
Robert Schmidt
024007716a Check type of node using NODE_IS_CU/DU/MONOLITHIC macros 2019-03-26 13:15:02 +01:00
Hongzhi Wang
f421e73006 Adding channel compensation dual stream correlation and layer demapping for nr IA decoder 2019-03-26 11:47:31 +01:00
Robert Schmidt
f0fced85f2 Execute pdcp_run from rrc_data_req only when in CU mode 2019-03-26 10:50:11 +01:00
Robert Schmidt
dc9a68ff30 Correct condition to read MIB/SIB1 params only when not CU 2019-03-26 10:49:47 +01:00
Francesco Mani
a3049674c6 warning fixed in get_band 2019-03-26 10:27:12 +01:00
Francesco Mani
d5d5c61a70 Merge branch 'develop-nr' into multiple-ssb-detection 2019-03-26 09:41:05 +01:00
Francesco Mani
52a142d0df bugfix in pbch correlation 2019-03-26 09:39:11 +01:00
Cedric Roux
bc234f200f bugfix: initialize SRB1 data even for monolithic eNB 2019-03-26 09:21:06 +01:00
Javier Morgade
ac185617a2 -a 2019-03-25 17:11:54 +01:00
Boris Djalal
27a8abfe51 Removing a wrong change in match TerminateUE. Code cleaning.
Signed-off-by: Boris Djalal <boris.djalal@eurecom.fr>
2019-03-25 15:50:19 +01:00
laurent
0f9fbef24d add thread pool feature 2019-03-25 10:09:04 +01:00
laurent
e492b971e1 Merge remote-tracking branch 'origin/develop' into feature-thread-pool 2019-03-25 10:07:51 +01:00
Florian Kaltenberger
14ae2b54bd renaming band_info_s ton nr_band_info_s to avoid confusion with LTE 2019-03-25 09:50:03 +01:00
Robert Schmidt
cdc2d921c1 FlexRAN: fix total_size_ul_mac_sdus parameter 2019-03-24 16:45:32 +01:00
Robert Schmidt
c1f142cc44 Fix warnings: space between literal and identifier in macro
This resolves the following warning:
"error: invalid suffix on literal; C++11 requires a space between literal and
identifier"
Since this file might be included from a C++11 file. It only adds spaces.
2019-03-23 17:32:28 +01:00
Robert Schmidt
4f6b1e46a5 Remove warnings for DU_send_INITIAL_UL_RRC_MESSAGE_TRANSFER() include 2019-03-23 17:10:43 +01:00
Robert Schmidt
10a5e5fd75 Use OAI NUM_ENB/UE defines for F1U (removes warnings) 2019-03-23 16:57:26 +01:00
Robert Schmidt
9611a22a65 Remove warnings in RRC 2019-03-23 16:40:47 +01:00
Robert Schmidt
7519b8e061 Free UE in RRC/S1/GTP if not DU 2019-03-23 16:20:43 +01:00
Florian Kaltenberger
0d91083ead trying to harmonize the nr_bandtable 2019-03-22 17:40:47 +01:00
Raphael Defosseux
dac4ceb7cb CI: adding call to new slave UE job from master pipeline
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-03-22 16:48:58 +01:00
Raphael Defosseux
db4bce547f CI: running l2-nfapi-simulator on 2 separate VM
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-03-22 16:34:44 +01:00
Boris Djalal
ee06bb4fd1 typo
Signed-off-by: Boris Djalal <boris.djalal@eurecom.fr>
2019-03-22 16:29:08 +01:00
Boris Djalal
20b13d64fb Replacing N/A with success message in cell.
Signed-off-by: Boris Djalal <boris.djalal@eurecom.fr>
2019-03-22 16:17:42 +01:00
Florian Kaltenberger
0f04910f2f moving get_band to separate function 2019-03-22 15:29:30 +01:00
Boris Djalal
a7f841ad74 Printing UE in report and eNB by default.
Signed-off-by: Boris Djalal <boris.djalal@eurecom.fr>
2019-03-22 15:24:12 +01:00
laurent
30e06d16ce revised doc 2019-03-22 14:03:27 +01:00
Boris Djalal
b15ad72f84 fix
Signed-off-by: Boris Djalal <boris.djalal@eurecom.fr>
2019-03-22 13:54:50 +01:00
Boris Djalal
a282bea31c fix
Signed-off-by: Boris Djalal <boris.djalal@eurecom.fr>
2019-03-22 13:42:05 +01:00
Boris Djalal
290a22e1ba Adapting log collection in Jenkins script.
Signed-off-by: Boris Djalal <boris.djalal@eurecom.fr>
2019-03-22 13:26:39 +01:00
Francesco Mani
aab238173f taking into account trashed frames (and commenting ghost frame addition) 2019-03-22 13:07:26 +01:00
Raphael Defosseux
2c2d34dc85 CI: fix when XML file is missing during HtmlInit
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-03-22 12:05:19 +01:00
Raphael Defosseux
0ba1958e39 CI: fix when XML file is missing during HtmlInit
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-03-22 11:59:22 +01:00
Boris Djalal
b53e7e6546 Removing 2 frequencies.
Signed-off-by: Boris Djalal <boris.djalal@eurecom.fr>
2019-03-22 11:38:05 +01:00
Boris Djalal
0146f8bf59 Renamed xml_files/ue_band20_test_10mhz.xml to xml_files/ue_band20_build.xml.
Signed-off-by: Boris Djalal <boris.djalal@eurecom.fr>
2019-03-22 11:34:53 +01:00
Boris Djalal
ad694026d9 Merge branch 'add-oai-ue-testing' of https://gitlab.eurecom.fr/oai/openairinterface5g into add-oai-ue-testing 2019-03-22 11:07:15 +01:00
Boris Djalal
d8bc658ab4 Adding CollectOAIUE mode.
Signed-off-by: Boris Djalal <boris.djalal@eurecom.fr>
2019-03-22 10:51:11 +01:00
Francesco Mani
ae02c9a6fd conflicts resolved after merge with develop-nr 2019-03-22 10:34:34 +01:00
Raphael Defosseux
c3e567bb33 CI: removing TDD 20MHz scenarios from CI test-suite temporarly
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-03-22 10:17:03 +01:00
Boris Djalal
f4bdf53c4e Splitting two xml files into three xml files.
Signed-off-by: Boris Djalal <boris.djalal@eurecom.fr>
2019-03-22 09:40:09 +01:00
Florian Kaltenberger
fe6ff2d8da Merge branch 'develop-nr-integration-2019w12' into 'develop-nr'
Develop nr integration 2019w12

See merge request oai/openairinterface5g!543
2019-03-21 17:24:52 +01:00
Raphael Defosseux
8bd3075a3b CI: more details on the UE status
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-03-21 16:18:16 +01:00
Raphael Defosseux
77582d06c5 fix again
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-03-21 16:03:26 +01:00
Raphael Defosseux
82b742368e fix
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-03-21 15:57:14 +01:00
Boris Djalal
982aa940a7 First test of the pipeline.
Signed-off-by: Boris Djalal <boris.djalal@eurecom.fr>
2019-03-21 15:50:00 +01:00
Florian Kaltenberger
fb4a8b1327 Merge remote-tracking branch 'origin/some-crirical-warnings' into develop-nr-integration-2019w12 2019-03-21 15:41:05 +01:00
Florian Kaltenberger
7ca8fc9de1 increasing timeout on trx_read for x300/n300 in usrp_lib.cpp
removing unncesessary sleeps and mallocs, improving error messages in nr-ue.c
2019-03-21 15:40:36 +01:00
Florian Kaltenberger
c4188d8013 moving adjust sync out of measurement procedures and making it dependent on successfull decoding of DCI 2019-03-21 15:39:44 +01:00
Florian Kaltenberger
02de5fd078 disabling debug messages 2019-03-21 15:39:44 +01:00
Florian Kaltenberger
8e5c8ad2df adding external ref to config file 2019-03-21 15:39:44 +01:00
Florian Kaltenberger
b68366e54a bugfix 2019-03-21 15:39:44 +01:00
laurent
71bc14d0d9 new thread model - make affinity optional 2019-03-21 14:33:25 +01:00
laurent
d9c68d8b30 new thread model 2019-03-21 14:15:26 +01:00
Boris Djalal
e360232e56 Fixing a typo.
Signed-off-by: Boris Djalal <boris.djalal@eurecom.fr>
2019-03-21 13:58:20 +01:00
Boris Djalal
61bda22269 Merge remote-tracking branch 'origin/develop' into add-oai-ue-testing 2019-03-21 12:14:02 +01:00
Boris Djalal
c396e42ab2 Adding the reset procedure using b2xx_fx3_utils.
Signed-off-by: Boris Djalal <boris.djalal@eurecom.fr>
2019-03-21 12:01:16 +01:00
Boris Djalal
dccf64ac57 Deleting ue_sfr_796.xml.
Signed-off-by: Boris Djalal <boris.djalal@eurecom.fr>
2019-03-21 12:01:16 +01:00
Boris Djalal
32be9dcbb8 Testing 2 frequencies for each operator (Orange and SFR).
Signed-off-by: Boris Djalal <boris.djalal@eurecom.fr>
2019-03-21 12:01:16 +01:00
Boris Djalal
1affd5ff59 Printing information from the UE log file.
Signed-off-by: Boris Djalal <boris.djalal@eurecom.fr>
2019-03-21 12:01:16 +01:00
Boris Djalal
6d93c9c522 Using os.getcwd() instead of sys.path[0] to work with pdb.
Signed-off-by: Boris Djalal <boris.djalal@eurecom.fr>
2019-03-21 12:01:16 +01:00
Boris Djalal
df49d8a908 No more 'none' value.
Successfully writing the log file ue_080101.log and finding the sync marker.
Initialize OAI UE is working.
BuildOAIUE action seems ok. Must fix the log file path for the InitializeOAIUE action.
Doing the work in /tmp, not in the repository of the main.py script being executed.

Signed-off-by: Boris Djalal <boris.djalal@eurecom.fr>
2019-03-21 12:00:36 +01:00
Cedric Roux
b7155f0276 cleanup: remove a file that should not be here 2019-03-21 10:49:32 +01:00
Raphael Defosseux
5d82287fa5 CI: fully testing RRC Inactivity timers
-- Connecting eNB to a Flexran Ctrler
  -- Checking eNB status for UEs through flexran

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-03-20 21:47:56 +01:00
Raphael Defosseux
9b7367c0ce Adding a parameter in configuration file to enable RRC Inactivity timers
-- rrc_inactivity_threshold in seconds
Adding support in CI to test it
  -- disable/enable data service on UEs
  -- no automatic check yet on the UE status
     certainly should be done w/ a Flexran controller command

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-03-19 17:52:14 +01:00
Robert Schmidt
9fd0f9f8bf Re-comment Assert for unconfigured RLC as in current develop 2019-03-19 15:48:00 +01:00
Robert Schmidt
1f590efe2b Merge branch 'develop' into feature-127-protocol-split 2019-03-19 14:49:07 +01:00
Cedric Roux
275e5b3a64 PHY: add parameter end_of_burst_delay for TDD
end_of_burst_delay is used to stop TX only "after a while".
If we stop right after effective signal, with USRP B210 and
B200mini, we observe a high EVM on the S subframe (on the
PSS).
A value of 400 (for 30.72MHz) solves this issue. This is
the default.

This default value can be changed in the configuration file.
For example:

RUs = (
    {
       local_rf       = "yes"
         nb_tx          = 1
         nb_rx          = 1
         att_tx         = 20
         att_rx         = 0;
         bands          = [7];
         max_pdschReferenceSignalPower = -27;
         max_rxgain                    = 105;
         eNB_instances  = [0];
         sf_extension = 312;
         end_of_burst_delay = 200;
    }
);

Here we would set a value of 200.

The value to put in the configuration file is for
30.72MHz. The value is scaled accordingly at runtime
(thus only one value to set for every RB configuration,
25, 50 or 100, leading to less problems when adapting
configuration files).

This option is for experts and should not be changed
randomly.
2019-03-19 09:25:43 +01:00
Cedric Roux
a05753dff3 PHY: bugfix: compute start/end of burst correctly for TDD
Start of burst is to start TDD DL transmission in the driver
(tested with USRP for the moment).

End of burst is to stop DL transmission.

Start of burst can only happen for a DL subframe when the
previous subframe was an UL subframe.

End of burst can only happen for an S subframe.

It's impossible for a subframe to be both the start of a burst
and the end of a burst.

This can be checked with eg. http://niviuk.free.fr/lte_resource_grid.html
(or reading the specs).
2019-03-19 09:25:43 +01:00
Cedric Roux
1e71749cdf PHY: bugfix: use correct count of samples for TDD DL S-subframe 2019-03-19 09:25:43 +01:00
Cedric Roux
ee5b739019 PHY: make sf_extension a parameter
This parameter is meaningful in TDD, to decide
when to start DL at eNB side. Since there is a
need for the PA to be operational, we need to
transmit a bit before the DL subframe coming
after an UL subframe. (We transmit zeros.)

We used to use N_TA_offset which may be too much.
Default value is now N_TA_offset/2 and can be
changed in the configuration file, in the RUs
section, like:

RUs = (
    {
       local_rf       = "yes"
         nb_tx          = 1
         nb_rx          = 1
         att_tx         = 0
         att_rx         = 0;
         bands          = [7];
         max_pdschReferenceSignalPower = -27;
         max_rxgain                    = 105;
         eNB_instances  = [0];
         sf_extension = 312;
    }
);

N_TA_offset is 624 (for 30.72MHz). In the example
above, we set sf_extension = 312, which is also
the default.

The value to put in the configuration file is for
30.72MHz. The value is scaled accordingly at runtime
(thus only one value to set for every RB configuration,
25, 50 or 100, leading to less problems when adapting
configuration files).

This option is for experts and should not be changed
randomly.
2019-03-19 09:25:43 +01:00
Cedric Roux
69ccf51f96 bugfix: fix compilation
T has to be generated before compiling targets SCHED_RU_LIB and SCHED_UE_LIB.
2019-03-19 09:25:43 +01:00
Raphael Defosseux
afb40cf509 CI: trying to increase the RAM size on the phy-sim VM
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-03-18 17:13:19 +01:00
laurent
d13644773d some critical warnings 2019-03-18 13:30:25 +01:00
Raphael Defosseux
b56aef4f2a Merge branch 'develop_integration_2019_w11' into 'develop'
Develop integration 2019 week 11

See merge request oai/openairinterface5g!538

Following Merge Requests were merged:

- MR 527: eMTC testing
- MR 537: x2ap: timers and cleanup
2019-03-18 13:14:30 +01:00
Raphael Defosseux
b685774ca1 Merge branch 'develop_integration_2019_w11' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop_integration_2019_w11 2019-03-18 11:41:22 +01:00
Raphael Defosseux
2fcd4fcec1 Fixing error in LTE-M MAC scheduling 2019-03-18 11:40:38 +01:00
frtabu
c7d7f88da0 doc update 2019-03-17 23:26:10 +01:00
frtabu
53c7c4c1b0 fix file name typo 2019-03-17 23:09:41 +01:00
frtabu
77bd7b0790 fix file name problem 2019-03-17 23:01:51 +01:00
frtabu
07375a04be move some doc to gitlab 2019-03-17 22:50:51 +01:00
frtabu
44e30b4d95 add links to new pages 2019-03-16 02:15:17 +01:00
frtabu
4cb1b9cefc update rf simulator doc, add lte usage doc 2019-03-16 01:33:26 +01:00
frtabu
777be28189 Build documentation update, moved to gitlab 2019-03-15 18:39:12 +01:00
Raphael Defosseux
14a9104694 Removing debug printf
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-03-15 17:14:11 +01:00
Francesco Mani
02d3decd6d another bugfix nr_initial_sync 2019-03-15 12:43:47 +01:00
Raphael Defosseux
574e8d6da9 CI: Adding LTE-M testing to the continuous integration
-- Master has now a stage calling the Band 13 job
 -- Pipeline executor is now a parameter

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-03-15 11:36:27 +01:00
Raphael Defosseux
cf55b03fad CI: rru command line options are checked if applied
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-03-14 21:58:46 +01:00
Raphael Defosseux
872a99fbec Merge remote-tracking branch 'origin/eMTC-testing' into develop_integration_2019_w11 2019-03-14 21:48:02 +01:00
Raphael Defosseux
cb4e2c55ed Merge remote-tracking branch 'origin/x2' into develop_integration_2019_w11 2019-03-14 21:47:24 +01:00
Javier Morgade
d62de3565c FeMBMS preliminary PMCH procedures (de-mapper) 2019-03-14 17:42:39 +01:00
Francesco Mani
cc847e9c5c bugfix in nr_initial_sync 2019-03-14 17:29:17 +01:00
Konstantinos Alexandris
0a459545cb Update FEATURE_SET.md 2019-03-14 15:49:47 +01:00
Cedric Roux
1fa9c322fb x2: update feature set 2019-03-14 14:58:30 +01:00
Robert Schmidt
13857c67e8 fix segfault RRU: check for nb_inst >0 before node_type 2019-03-14 14:24:16 +01:00
Robert Schmidt
62d9b8cf36 Merge branch 'develop' into feature-127-protocol-split 2019-03-14 13:10:21 +01:00
Raphael Defosseux
6bdd4e75f4 CI: optimizations
-- RRU max rx gain is given in command line
  -- USRP reset is only done once in protocol split scenarios

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-03-14 11:59:17 +01:00
Raphael Defosseux
c6b2ca2460 CI: fix when slave jobs fails, email status is SUCCESS.
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-03-13 17:56:03 +01:00
Francesco Mani
2c75720d79 multiple ssb detection via pbch dmrs (ordered list) 2019-03-13 17:48:23 +01:00
Cedric Roux
9456fe584a x2ap: timers, cleanup
This commit introduces X2AP timers (t_reloc_prep, tx2_reloc_overall).
You need to set the values in the configuration file.

X2AP can be enabled or disabled in the configuration file too (disabled
by default).

Some deadcode was removed.
2019-03-13 15:28:37 +01:00
Raphael Defosseux
d8e16e37a5 Merge remote-tracking branch 'origin/develop' into eMTC-testing
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-03-13 14:17:24 +01:00
Raphael Defosseux
e1d4079145 Merge branch 'develop_integration_2019_w10' into 'develop'
Develop integration 2019 week 10

See merge request oai/openairinterface5g!534
2019-03-13 14:11:21 +01:00
Raphael Defosseux
cd5e140eb7 Fixes for FDD attachment
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-03-13 12:07:17 +01:00
yilmazt
f070801d0a AVX512F intrinsics added for shortBlockCoding 2019-03-12 15:36:24 +01:00
Raymond Knopp
f96aab57cf parameters for PRACH/PUCCH in configuration file. Default values are those used for Band 7. eMTC configuration file for eMTC changed to reflect modification made for Band 13 operation. 2019-03-12 15:31:05 +01:00
Raphael Defosseux
a299d6e248 CI: fix RHEL build status
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-03-12 14:12:30 +01:00
Raphael Defosseux
d4495ec78e CI: Lower iperf constraints on basic-simulator
Simplify HSS configuration in VM-based testing

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-03-12 12:52:58 +01:00
Francesco Mani
3fc4c6a464 multiple ssb detection via pbch dmrs (selection of best ssb only, working in pbchsim for SNR>=0) 2019-03-12 12:51:01 +01:00
Raphael Defosseux
a4361e3291 CI: adding LTE-M testing support
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-03-11 19:23:26 +01:00
Francesco Mani
41b18e210b UE SSB periodicity (hardcoded) 2019-03-11 17:22:59 +01:00
Raphael Defosseux
d67d435a49 Fixing last cppcheck warnings
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-03-11 14:41:49 +01:00
Francesco Mani
aa12c954c1 bugfix 2019-03-11 12:36:57 +01:00
laurent
590c99e79e add license 2019-03-11 11:22:27 +01:00
Francesco Mani
6e33fcfe28 SSB periodicity at gNB from config file 2019-03-11 10:54:20 +01:00
Raphael Defosseux
95569173d5 Merge remote-tracking branch 'origin/issue407_nos1_siml1_datapath' into develop_integration_2019_w10 2019-03-11 10:37:42 +01:00
laurent
718e0fe894 thread pool 2019-03-11 09:56:47 +01:00
Boris Djalal
a22102bf34 Temporary hack to make main.py command work with the new xml file, ue_band20_test_10mhz.xml.
Signed-off-by: Boris Djalal <boris.djalal@eurecom.fr>
2019-03-11 09:37:28 +01:00
frtabu
c68d15d1d6 Merge branch 'issue407_nos1_siml1_datapath' of https://gitlab.eurecom.fr/oai/openairinterface5g into issue407_nos1_siml1_datapath 2019-03-10 00:14:35 +01:00
frtabu
753c2f446d apply astyle, fix compilation warnings in raw aeth transport and kernel modules 2019-03-10 00:04:12 +01:00
frtabu
49f4bdc2e5 try to fix build failure due to increased number of build files on some build commands (=> more log files) 2019-03-08 19:38:21 +01:00
Raphael Defosseux
f922c8d917 CI: temp fix for CI build
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-03-08 19:30:23 +01:00
Francesco Mani
8950a77999 SSB periodicity at gNB hardcoded in config_common and passed down, to be taken from config file in next commit 2019-03-08 18:21:44 +01:00
Florian Kaltenberger
2d39da3b57 inc no physim exectuables in CI script 2019-03-08 17:12:23 +01:00
Robert Schmidt
7edf4387f9 Fix bug in eNB: correctly set brOption for RRC R14 2019-03-08 16:58:45 +01:00
Robert Schmidt
20c35748ca Fix lte-uesoftmodem: segfaults & logic errors
* prevent segfault: guard access to RC.rrc with UETARGET
* in rlc_data_ind(): correct logic to test for all cases eNB, CU, DU, UE
2019-03-08 16:52:34 +01:00
Robert Schmidt
05ebea4a24 Reduce PHY layer logging (as in current develop) 2019-03-08 16:51:57 +01:00
frtabu
c9dcaa53af noS1 woking with tun interfaces and basic simu 2019-03-08 16:00:09 +01:00
yilmazt
dd61e5a717 Working short block coding and various warning removals in --phy_simulators 2019-03-08 15:44:50 +01:00
Raphael Defosseux
99fcdfd0f7 CI: reduce failure constraint on TDD-5MHz in unbalanced UL iperf test
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-03-08 15:22:21 +01:00
Raphael Defosseux
069e5973eb Merge remote-tracking branch 'origin/T-typo-fix-2019-w10' into develop_integration_2019_w10 2019-03-08 13:36:03 +01:00
Raphael Defosseux
067a4129e2 CI: minor fixes:
-- Moved the Gitlab notification within the try:
     As a result, when fails, the notification will be a fail
  -- Changed all exit by return in the runTest script

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-03-08 13:34:16 +01:00
Raphael Defosseux
f83c92d799 CI: add a procedure to reset B2xx boards before running
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-03-08 10:52:12 +01:00
Cedric Roux
63989f579b T: minor: fix typo 2019-03-08 10:28:59 +01:00
Boris Djalal
c2b51255d6 WIP for adding OAI UE Testing.
Signed-off-by: Boris Djalal <boris.djalal@eurecom.fr>
2019-03-08 09:42:33 +01:00
Raphael Defosseux
52cc57fa55 Merge remote-tracking branch 'origin/fix-configuration-parameter' into develop_integration_2019_w10 2019-03-07 16:54:54 +01:00
Raphael Defosseux
9b1274829f Merge remote-tracking branch 'origin/x2' into develop_integration_2019_w10 2019-03-07 16:54:34 +01:00
Francesco Mani
980d20c8b8 i_ssb detection message added in pbchsim 2019-03-07 15:45:52 +01:00
Robert Schmidt
02d99edf23 Fix cppcheck errors: RRC, F1AP 2019-03-07 14:16:16 +01:00
Robert Schmidt
ede37e56b8 Use correct RNTI for RRC data req 2019-03-07 12:46:34 +01:00
Khalid Ahmed
af59ee996d Add build directories to .gitignore 2019-03-07 11:35:18 +01:00
Ahmed Hussein
a1da7a2f95 Applying LDPC code fix at "nr_ulsch_decoding.c" (works for mcs 4 to 28) 2019-03-07 11:35:18 +01:00
Khalid Ahmed
d7abeed6ab Applying LDPC code rate fix at nr_ulsch_encoding 2019-03-07 11:35:18 +01:00
Ahmed
bc53a0a771 indentation + some comments 2019-03-07 11:28:08 +01:00
Ahmed
e5fd0fcd00 added the ulsch decoding functions to ulschsim.c
now ulschsim.c is uplink only with no downlink decoding functions or variables
2019-03-07 11:20:09 +01:00
Ahmed
9947a6bccd ULSCH decoding functionality at gNB side
Added the following structs and enums in "defs_gNB.h"
- NR_UL_gNB_HARQ_t
- NR_gNB_ULSCH_t
- NR_SCH_status_t

added the following structs in "nfapi_nr_interface.h"
- nfapi_nr_ul_config_ulsch_pdu
- nfapi_nr_ul_config_ulsch_pdu_rel15_t
- nfapi_nr_ul_srs_config_t
- nr_pusch_freq_hopping_t

added nr_ulsch.h for the ulsch decoding function declarations
- free_gNB_ulsch
- new_gNB_ulsch
- nr_ulsch_decoding

added nr_ulsch_decoding.c for the implementation of the ulsch decoding functions
- free_gNB_ulsch
- new_gNB_ulsch
- nr_ulsch_decoding
2019-03-07 11:20:09 +01:00
Khalid Ahmed
a7fc22c807 Adding harq_pid as an input to nr_ulsch_encoding 2019-03-07 11:20:09 +01:00
Khalid Ahmed
ea2bc826f1 minor clean ups 2019-03-07 11:20:09 +01:00
Khalid Ahmed
3d3f49c5c0 nr_ulsch_encoding is implemented and tested 2019-03-07 11:17:59 +01:00
Khalid Ahmed
009b195d57 Initializing and freeing NR_UE_ULSCH_t. Creating nr_ulsch_coding.c 2019-03-07 11:17:23 +01:00
Thomas Schlichter
ad402982fe [ulschsim] Add support fo perfect channel (no noise)
Also print the uncoded error bits
2019-03-07 11:17:23 +01:00
Thomas Schlichter
aadc282570 [ulschsim] Initial version (copy of dlschsim) 2019-03-07 11:17:23 +01:00
Francesco Mani
6ce8c3742a minor fixes in pbchsim 2019-03-07 10:10:06 +01:00
Robert Schmidt
bbedd315e7 Correctly link lte-uesoftmodem(-nos1) (hack)
Although not used in the UE, we currently need to link the F1 library into it.
This is because we do not define ASN_DISABLE_OER_SUPPORT (otherwise, F1 has
compilation problems). In this case, some functions are apparently not
correctly defined, giving linker errors in the UE. Linking F1 in solves the
problem.

This is a hack. It would be better to be able to define ASN_DISABLE_OER_SUPPORT
and have no compilation errors or compile everything with
ASN_DISABLE_OER_SUPPORT except F1. I did not do this because I did not find
another way than add target_compile_definitions() to every target except F1
which adds many lines just so that one target (F1 ASN.1) compiles correctly (in
other words, F1 needs to be fixed).
2019-03-06 19:28:12 +01:00
Raphael Defosseux
ea0e313f81 CI: issue #410 --> command options are displayed in build HTML report
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-03-06 17:59:06 +01:00
Robert Schmidt
275b559fbf Fix linker error: link F1-U protobuf for eNB noS1 case 2019-03-06 14:18:54 +01:00
Robert Schmidt
7a7c2afa11 Handle cppcheck errors in ASYNC_IF 2019-03-06 13:59:39 +01:00
Robert Schmidt
66d4c4e92d Fix cppcheck issues in PROTO_AGENT 2019-03-06 13:43:09 +01:00
Francesco Mani
bacd48a4d7 Merge branch 'multiple-ssb-detection' of https://gitlab.eurecom.fr/oai/openairinterface5g into multiple-ssb-detection 2019-03-06 08:52:14 +01:00
Francesco Mani
ab825dd68a bugfix in pbch channel estimation and dci debug comment mode restored 2019-03-06 08:50:30 +01:00
Florian Kaltenberger
94cca3213e Merge branch 'nr_ldpc_code_rate' into 'develop-nr'
adding ldpc decoder code rate adaptation

See merge request oai/openairinterface5g!529
2019-03-05 21:10:14 +01:00
Robert Schmidt
56af9c60e4 Fix compilation/linking errors in lte-uesoftmodem 2019-03-05 18:47:29 +01:00
Robert Schmidt
e3bb3ab7d3 Change integer based conf parameter from string 2019-03-05 18:27:54 +01:00
Raphael Defosseux
5bf595a0ad fixing added cppcheck errors
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-03-05 14:56:42 +01:00
Cedric Roux
78b6fef63c fix compilation in nos1 mode
Some #if defined(ENABLE_USE_MME)/#endif were added here and there.
The nos1 softmodem has not been tested, maybe this commit breaks
things.
2019-03-05 14:56:42 +01:00
Cedric Roux
c394188e73 x2: first implementation of ID management, some cleanup
Some deadcode was removed.

The implementation of the ID management is not finished.
It will only work if the handover is successful. No error
recovery has been done. For error recovery, we need to
implement the X2AP timers. As it is, in case of error, an ID
might very well never be released.

It has been tested with 1 and 2 UEs doing handover more or less
at the same time.
2019-03-05 14:56:42 +01:00
Konstantinos Alexandris
02193f4bab x2: some cleanup in instance management
- manage target eNB based on target cell id received by measurement report
  for Handover Request
- manage source eNB based on association id for Handover Request Ack
- use only x2ap instance and not x2ap data instance points to x2ap instance
2019-03-05 14:56:42 +01:00
Konstantinos Alexandris
a8eefbcf58 sctp: bugfix: use correct instance (not default) for sctp_itti_send_new_message_ind 2019-03-05 14:56:42 +01:00
Konstantinos Alexandris
f76f1f1e1c x2: bugfix: pass correct rach resource type 2019-03-05 14:56:42 +01:00
Konstantinos Alexandris
3179722161 x2: bug fixes
- free correctly in rrc_eNB_free_mem_UE_context
- check for existence of ue_context.handover_info in rrc_enb_process_itti_msg
- check return value sctp_peeloff in sctp_handle_new_association_req_multi
  and exit in case of failure
2019-03-05 14:56:42 +01:00
Konstantinos Alexandris
52a52eefb9 X2AP UE Context Release (generate/handle message), Release eNB resources 2019-03-05 14:53:00 +01:00
Konstantinos Alexandris
4b5c42115d bugfix: Path switch request ack (manage re-established/released E-RABs) 2019-03-05 14:46:21 +01:00
Konstantinos Alexandris
ca19953200 x2ap: bugfixes Store UE Capability at target, Key derivation (keNB star) at source 2019-03-05 14:22:40 +01:00
Konstantinos Alexandris
eb59c2cd68 bugfix: fix realtime issues with RRC (race condition)
When testing x2 handover, we found a race issue between the
RRC thread and the phy/mac thread (which is calling rrc_rx_tx).

The UE context was updated by the RRC thread but in the middle of
the update (which consists of several function calls and variables'
updates) the context was accessed by rrc_rx_tx. At this point, the
context was in an inconsistent state.

The solution is to access RRC data in the RRC thread only.
The function rrc_rx_tx now just sends an ITTI message to the
RRC thread. When receiving this message, the RRC thread does
the processing that was done by the function rrc_rx_tx (in
the new function rrc_subframe_process).

This way, the race condition disappears.

However we now send an ITTI message from the phy/mac thread to
the RRC thread at each subframe. That might increase the processing
time of the eNB. So maybe it's not the best solution. It may also
improve the realtime performance because less work is done by the
phy/mac realtime thread. To be checked somehow.

Also, it may be possible that some other RRC functions are still
called by the phy/mac thread, which should also be checked and
replaced by ITTI messages (if this solution is considered to be
correct).
2019-03-05 14:22:40 +01:00
Robert Schmidt
f9c4c501e3 Merge branch 'develop' into feature-127-protocol-split 2019-03-05 14:17:38 +01:00
frtabu
17e36b3a65 add ocp/frf/enhanced basic simulator sources 2019-03-05 08:06:23 +01:00
frtabu
87a8cb28a5 basic and rf simulators as config option to allow noS1 datapath debug. 2019-03-04 22:07:32 +01:00
Florian Kaltenberger
314d9f1479 Merge remote-tracking branch 'origin/develop-nr' into multiple-ssb-detection 2019-03-04 20:49:16 +01:00
Hongzhi Wang
39fa3e001c adding ldpc decoder code rate adaptation 2019-03-04 16:54:56 +01:00
Raphael Defosseux
458019d89a CI: the slave job should have the correct target branch when running on MR
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-03-04 15:48:56 +01:00
Francesco Mani
2aa32eff67 brute force multiple ssb detection works in pbchsim 2019-03-04 15:32:43 +01:00
Raphael Defosseux
232efe7860 CI: slave jobs will run with their dedicated test-suite (in develop, master and develop-nr)
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-03-04 12:23:39 +01:00
Raphael Defosseux
e66787fb07 CI: no IF4.5 test in TDD10/20MHz
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-03-04 12:19:43 +01:00
Raphael Defosseux
1546fc0eb8 CI: slave jobs will run with their dedicated test-suite (in develop, master and develop-nr)
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-03-04 12:05:25 +01:00
Raphael Defosseux
fb885ad4b0 CI: no IF4.5 test in FDD10/20MHz
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-03-04 11:54:10 +01:00
Raphael Defosseux
4d360ea4e1 CI: aligning the CI slave jobs framework into develop-nr
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-03-04 10:50:36 +01:00
nepes
22e13cb64c resolving conflicts 2019-03-02 23:28:49 +01:00
nepes
40cb79e44f Merge remote-tracking branch 'origin/develop' into eMTC-testing 2019-03-02 22:41:48 +01:00
nepes
4c505b8639 log removal and testing for Cat-M1 2019-03-02 15:34:48 +01:00
Francesco Mani
62e56f212e some hardcoding removed in pbch detection still some left 2019-03-01 17:57:53 +01:00
Florian Kaltenberger
568fa2375c adding loop over slots in nr_pbchsim 2019-03-01 15:41:17 +01:00
Raphael Defosseux
b6296d8d8d Merge branch 'develop_integration_2019_w09' into 'develop'
Develop integration 2019 week 09

See merge request oai/openairinterface5g!522
2019-03-01 13:39:40 +01:00
Francesco Mani
49e9baee5b brute force ssb detection 2019-03-01 13:04:23 +01:00
Raphael Defosseux
831044de25 CI: adding notification when added CPPCHECK errors/warnings are detected.
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-03-01 12:03:26 +01:00
nepes
1d2ee01b6c removal of logs 2019-02-28 18:28:35 +01:00
Raphael Defosseux
5887787734 CI: same fix as previous
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-02-28 17:16:50 +01:00
Raphael Defosseux
5fe6bea1ea CI: fix to handle keyword commit in commit message
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-02-28 17:13:47 +01:00
Raphael Defosseux
69dfd020b0 CI: even in sequential mode, all VM-based are run.
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-02-28 16:07:49 +01:00
Raphael Defosseux
f62580de4f CI: VM-based tests are now sequential to prevent too much stress
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-02-28 14:50:28 +01:00
Raphael Defosseux
0f11865fa4 Merge remote-tracking branch 'origin/issue-404-pdcp-integrity' into develop_integration_2019_w09
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-02-28 14:37:10 +01:00
Javier Morgade
b052dbb9b5 Revert changes from commmit 8fa685f0 2019-02-28 11:33:29 +01:00
Javier Morgade
56f7e2e26c Revert build_oai changes from commit a89a9ae3 2019-02-28 11:27:13 +01:00
Javier Morgade
65e485642e NFAPI bindings for FeMBMS-CAS 2019-02-28 10:44:44 +01:00
Robert Schmidt
1e3d0c9a16 Update F1 CU/DU configuration (tested, formatted) 2019-02-27 15:31:52 +01:00
Schultze
8fa685f0db Merge branch 'develop-entv' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-entv 2019-02-27 13:35:41 +01:00
Schultze
a89a9ae311 --build-codeblocks switch added, command line parser fixed. 2019-02-27 12:55:28 +01:00
Cedric Roux
e3782b5ca2 bugfix: fix PDCP sequence management (plus some cleanup)
With the introduction of X2AP into develop, the UEs now have to regularly
send measurement reports.

In the logs of the eNB, we see:

[OSA]   Mismatch found in integrity for algorithm 2,
        got e0.a0.c2.66, expecting a5.9c.cb.57
[PDCP]   [OSA][RB 1] eNB failed to validate MAC-I of incoming PDU

This is a bug in the PDCP layer that uses wrong parameters to compute the
integrity.

This commit fixes this bug.

The function pdcp_is_rx_seq_number_valid was removed. Its processing
has been directly integrated into the function pdcp_data_ind.

The function pdcp_mark_current_pdu_as_received is not called anymore.
Its processing was not used later on, so as of today, not calling it does
not introduce any functional change.

The function pdcp_validate_security takes now as parameters both
SN and HFN. Same for the function pdcp_get_next_count_rx.

Useless constants PDCP_SN_5BIT, PDCP_SN_7BIT and PDCP_SN_12BIT have been
removed.

The compilation option ENABLE_SECURITY has been removed. It's now always
on. (This may impact some use cases.)

The PDCP for DRB using RLC AM is not correct. It was not correct before
this commit (apart from the integrity bug). We should deal with a list
of PDUs and transmit packets to upper layers as detailed in the specs.
Today we transmit the PDU as soon as we get it. We don't care about
duplicates, in-order delivery, timeouts.

Also, we don't deal with "PDCP re-establishment". Not sure how that impacts
the software.

And, last but not least, there is still no ROHC.
2019-02-27 12:33:04 +01:00
Javier Morgade
39fe25a44d FeMBMS RRC->MAC config request protypes 2019-02-27 11:01:47 +01:00
Raphael Defosseux
53f5f6685a Merge remote-tracking branch 'origin/T-tracer-hack-2019-w9' into develop_integration_2019_w09 2019-02-27 10:25:31 +01:00
Francesco Mani
353f153353 slot_fep for ssb done once before sss and pbch channel estimation moved out of slot_fep 2019-02-26 18:06:43 +01:00
frtabu
43f827351f Fix basic-simulator (pdcp.c) 2019-02-26 16:49:55 +01:00
Florian Kaltenberger
04e5298a93 Merge branch '405-use-of-uninitialized-variables-in-dlschsim' into 'develop-nr'
Resolve "Use of uninitialized variables in dlschsim"

See merge request oai/openairinterface5g!520
2019-02-26 16:38:37 +01:00
Cedric Roux
f425113044 T: hack: add a multi rru cleaner program
This is for internal use at eurecom. No documentation provided.
2019-02-26 15:08:32 +01:00
OAI-admin
c22f10aa72 Add PHR/BSR to RRCConnectionSetup + add some debug for DLSCH scheduling 2019-02-26 12:44:59 +01:00
Louis Adrien Dufrene
9b9ef32a20 Fix RRC version variable to allow dlsch scheduling for eMTC 2019-02-26 11:04:55 +01:00
Louis Adrien Dufrene
4e176e112e Merge branch 'eMTC-testing' into eMTC-testing-orange 2019-02-26 07:21:15 +01:00
nepes
a4b57f3150 loggin reduction for LTE-M. 2019-02-26 01:43:56 +01:00
Raymond Knopp
dd35208c26 debugging trace 2019-02-25 23:14:04 +01:00
nepes
282985eb2b RRC bugfix 2019-02-25 21:52:47 +01:00
Robert Schmidt
544d80c40d Merge branch 'develop' into feature-127-protocol-split 2019-02-25 18:06:35 +01:00
nepes
67aa968001 Merge branch 'eMTC-testing' of https://gitlab.eurecom.fr/oai/openairinterface5g into eMTC-testing 2019-02-25 17:55:16 +01:00
nepes
d74f2da9a8 changes to configuration file for eMTC (pucch parameters) 2019-02-25 17:54:44 +01:00
frtabu
79d0042c4a Merge branch 'develop' into issue392-simplify-s1-nos1step2 2019-02-25 17:37:20 +01:00
Francesco Mani
2156ba10d5 config files changed and pdcch/pdsch enabled 2019-02-25 16:51:41 +01:00
frtabu
fb46545526 Fix corrupted LOGs in L1L2simulator, introducing two new components NFAPI_VNF and NFAPI_pnf. Integrate Fujitsu fix for up to 50 UEs. Apply astyle to all modified files in the branch 2019-02-25 16:50:03 +01:00
Robert Schmidt
97126eb57e Fix carrierFreq MeasObj calculation to handle F1 case 2019-02-25 16:33:02 +01:00
Robert Schmidt
cc2a507d59 Unify and comment RRC container print of F1 2019-02-25 16:23:42 +01:00
Louis Adrien Dufrene
22656b65ce fix RA_id again for add_new_ue() 2019-02-25 15:59:07 +01:00
Francesco Mani
c49f91444e Conflicts solved after merge with develop-nr and modifications to simulators to compile 2019-02-25 15:03:32 +01:00
Louis Adrien Dufrene
90c53b11c3 Merge branch 'eMTC-testing' into eMTC-testing-orange 2019-02-25 14:03:14 +01:00
Louis Adrien Dufrene
27d01dcea9 remove some debug 2019-02-25 14:02:05 +01:00
nepes
669724c100 Merge branch 'eMTC-testing' of https://gitlab.eurecom.fr/oai/openairinterface5g into eMTC-testing 2019-02-25 13:30:14 +01:00
nepes
b28b14411e modifications for LTE-M testing 2019-02-25 13:29:43 +01:00
Khalid Ahmed
3ef3ef64bd Fixing bugs introduced as a result of uninitialized variables 2019-02-25 12:02:39 +01:00
Louis Adrien Dufrene
f552fd73ba Merge branch 'eMTC-testing' into eMTC-testing-orange 2019-02-25 11:28:41 +01:00
Louis Adrien Dufrene
87f415d2dd Fix wrong RA_id index in rx_sdu for add_new_ue 2019-02-25 11:21:53 +01:00
Louis Adrien Dufrene
a4259b9071 Fix build error 2019-02-25 10:34:30 +01:00
Louis Adrien Dufrene
1e374fdf60 Add some debug in eNB_scheduler_primitives to test 2019-02-25 10:21:47 +01:00
Louis Adrien Dufrene
46bbfb820c remove some debug 2019-02-25 10:06:31 +01:00
Louis Adrien Dufrene
cddba97c21 remove CDRX related stuff 2019-02-25 10:03:19 +01:00
Louis Adrien Dufrene
ad511a4a3d some format in generate_Msg4() 2019-02-25 09:51:21 +01:00
Louis Adrien Dufrene
55460eafe1 some format for eMTC schedulers 2019-02-25 09:45:58 +01:00
Florian Kaltenberger
43ff9ccf8b Merge branch '403-memory-leak-in-polar_init' into 'develop-nr'
Resolve "memory leak in polar_init"

See merge request oai/openairinterface5g!518
2019-02-25 09:08:49 +01:00
Louis Adrien Dufrene
0ead4bdb12 some format for eNB_scheduler_RA.c and rar_tools.c + some fix in RAR PDU 2019-02-25 08:16:23 +01:00
Louis Adrien Dufrene
a3d3b0cde7 Merge branch 'eMTC-testing' of https://gitlab.eurecom.fr/oai/openairinterface5g into eMTC-testing 2019-02-25 08:06:12 +01:00
tomita.y
f3dc8d446d Fixed a problem of double free. 2019-02-25 15:55:02 +09:00
tomita.y
2e49f833a3 Modified for L2 simulator with using TUN. 2019-02-25 13:34:23 +09:00
nepes
71bd6e863b bugfix in harq_handling for eMTC 2019-02-23 00:22:02 +01:00
Raphael Defosseux
f6cab340e1 Merge branch 'develop_integration_2019_w08' into 'develop'
Develop integration 2019 week 08

See merge request oai/openairinterface5g!517
2019-02-22 23:24:19 +01:00
Robert Schmidt
80b6245213 Remove comments left after merge 2019-02-22 18:38:34 +01:00
Robert Schmidt
eab78405cc Log received F1 messages correctly 2019-02-22 18:33:12 +01:00
laurent
9a46d48763 fix CI result in polartest 2019-02-22 16:45:20 +01:00
Robert Schmidt
549e72d001 Trigger UL RRC Message through ITTI Message 2019-02-22 16:36:26 +01:00
Robert Schmidt
c75fd52e3a Remove many warnings 2019-02-22 15:22:13 +01:00
Robert Schmidt
bd36a9ef0c Gracefully handle different numbers of UE in MAC and RRC 2019-02-22 15:22:09 +01:00
Raymond Knopp
078e692319 correction of parameter syntax 2019-02-22 14:38:10 +01:00
laurent
838d6b86f2 issue 403 -> astyle on modified files 2019-02-22 13:42:50 +01:00
laurent
e1fa6be7dd issue 403 2019-02-22 13:39:57 +01:00
Raphael Defosseux
929d71d06d Merge remote-tracking branch 'origin/uhd_3131_fix' into develop_integration_2019_w08 2019-02-22 12:14:12 +01:00
Raphael Defosseux
c1308c61a8 Merge remote-tracking branch 'origin/second_pass_on_cppcheck' into develop_integration_2019_w08 2019-02-22 12:14:06 +01:00
Raphael Defosseux
7caea35158 Merge remote-tracking branch 'origin/393-dlsch-scheduler-optimization' into develop_integration_2019_w08 2019-02-22 12:14:00 +01:00
Raphael Defosseux
8fc1a61e6a Putting correct license banner on file
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-02-22 12:10:15 +01:00
Raphael Defosseux
fd5238e478 Updated release notes
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-02-22 11:44:42 +01:00
Robert Schmidt
a4d909bca8 Initialize variables to prevent illegal free() 2019-02-22 10:51:40 +01:00
Robert Schmidt
1a07a1e067 Replace redundant CU_F1AP/DU_F1AP with F1AP 2019-02-22 10:26:41 +01:00
Florian Kaltenberger
d383cd5208 Merge branch 'nr_pdcch_updates' into 'develop-nr'
Nr pdcch updates

See merge request oai/openairinterface5g!516
2019-02-21 22:22:25 +01:00
Florian Kaltenberger
f1e30d5756 Merge branch 'ocp_nrsimulator' into 'develop-nr'
Critical bugs from compilation, Ocp nrsimulator

See merge request oai/openairinterface5g!512
2019-02-21 22:22:01 +01:00
Robert Schmidt
030e11ba9a Merge branch 'develop' into feature-127-protocol-split 2019-02-21 20:18:35 +01:00
Francesco Mani
5a9fb475f2 Lmax in frame_parms and nr_band number from freq at UE 2019-02-21 17:29:15 +01:00
Guy De Souza
bad87bd130 Merge remote-tracking branch 'origin/develop-nr' into nr_pdcch_updates 2019-02-21 15:34:15 +01:00
Francesco Mani
fe37f24f42 Merge branch 'nr-multiple-ssb' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr-multiple-ssb 2019-02-21 15:33:59 +01:00
Guy De Souza
bb398adb49 DCI payload fixes 2019-02-21 15:33:18 +01:00
Francesco Mani
a5025d4c4f SSB positions in burst from config file 2019-02-21 15:30:09 +01:00
Florian Kaltenberger
7fd089fe3f putting back uhd transport args for b200 with a reduced frame size. This is still compatible with uhd 3.13.1 and above. 2019-02-21 13:36:38 +01:00
Francesco Mani
15f07d2bb1 multiple SSB generation in pbchsim 2019-02-21 13:33:19 +01:00
Florian Kaltenberger
f7583ef496 Update test_case_list.xml 2019-02-21 12:17:46 +01:00
Florian Kaltenberger
165c39da2f commenting out call to dl_indication(&ue->dl_indication); as this is not finished and makes UE crash. 2019-02-21 09:54:22 +01:00
Florian Kaltenberger
c06a639065 reverting changes to lte_phy_scope.c + commenting out call to phy_scope_eNB in nr-softmodem. The function phy_scope_gNB does not exist yet. 2019-02-21 09:54:08 +01:00
Florian Kaltenberger
4c9c6f68fa Merge remote-tracking branch 'origin/develop-nr' into ocp_nrsimulator 2019-02-21 09:04:02 +01:00
Florian Kaltenberger
985418139c adding testcases for nr_dlschsim and nr_dlsim 2019-02-21 08:55:02 +01:00
Florian Kaltenberger
be5f62a90c Merge branch 'nr_pdcch_updates' into 'develop-nr'
Nr pdcch updates

See merge request oai/openairinterface5g!514
2019-02-21 08:53:44 +01:00
Raphael Defosseux
5bb6985f34 CI: adding much needed lock mechanism when creating VM.
-- should prevent VM-creation crashes during test stages

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
(cherry picked from commit eeffdfa200)
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-02-21 07:33:56 +01:00
Raphael Defosseux
92076ea8a8 CI: adding much needed lock mechanism when creating VM.
-- should prevent VM-creation crashes during test stages

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
(cherry picked from commit eeffdfa200)
2019-02-20 22:28:39 +01:00
Raphael Defosseux
eeffdfa200 CI: adding much needed lock mechanism when creating VM.
-- should prevent VM-creation crashes during test stages

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-02-20 18:13:43 +01:00
matzakos
c1364f0117 changes to make oai work with UHD 3.13.1 2019-02-20 16:45:39 +01:00
Raphael Defosseux
9286b58fb6 CI: adding commit message to HTML slave reports
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-02-20 15:49:07 +01:00
Florian Kaltenberger
812f97f0f1 Merge branch 'nr_fix_pucch_dmrs' into 'develop-nr'
issue401-nr-pucch-dmrs-format_2

See merge request oai/openairinterface5g!510
2019-02-20 14:52:28 +01:00
Florian Kaltenberger
8c983da4eb fixes after merge 2019-02-20 14:46:57 +01:00
Raphael Defosseux
a82342298e changed back some cppcheck "fixes" and updated the cppcheck suppression list
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-02-20 14:42:17 +01:00
Florian Kaltenberger
b8c127050c Merge remote-tracking branch 'origin/develop-nr' into nr_pdcch_updates
Conflicts:
	openair1/PHY/MODULATION/slot_fep_nr.c
	openair1/PHY/NR_UE_ESTIMATION/nr_dl_channel_estimation.c
	targets/RT/USER/nr-ue.c
2019-02-20 10:10:25 +01:00
Florian Kaltenberger
a0473b4dd1 Revert "adding detection of multiple PSS."
This partially reverts commit 449da9ac17.
2019-02-20 10:08:14 +01:00
frtabu
e758a32ff7 change ethernet interface name from oip<n> to oaitun_ue<n> in ci script to take into accont corresponding code modif. 2019-02-19 21:56:08 +01:00
Raphael Defosseux
f4bf32d7e7 Forgot one file
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-02-19 21:34:06 +01:00
frtabu
eb26975451 attempt to fix l2 simulator issue 2019-02-19 19:50:44 +01:00
Raphael Defosseux
9aab83c509 Fixing a few last cppcheck errors/warnings
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-02-19 17:42:27 +01:00
Hongzhi Wang
1a27089fc9 bug fixes ue fapi 2019-02-19 11:13:21 +01:00
Louis Adrien Dufrene
db51a61c2e Fix to remove cppcheck warnings 2019-02-19 07:56:32 +01:00
laurent
9021be8cd5 critical compilation warnings 2019-02-18 19:15:01 +01:00
Louis Adrien Dufrene
0f52ce5031 remove previous X2AP fix after update of asn files 2019-02-18 15:36:02 +01:00
Hongzhi Wang
4c5d5ea41d ue switch to slot based processing 2019-02-18 15:20:55 +01:00
laurent
21e1580be6 critical compilation warnings 2019-02-18 11:59:20 +01:00
Louis Adrien Dufrene
f8ab4080f7 Merge from develop + modification of a X2AP file for code to compile 2019-02-18 10:46:13 +01:00
Florian Kaltenberger
682ca5ebaf writing rxdata_F to file in dlsim 2019-02-18 09:57:28 +01:00
frtabu
3f61d5f720 fix compilation warning 2019-02-17 23:46:45 +01:00
frtabu
38d772d8a2 nos1 et s1 execs identical, nos1 enforced based on exec name or --noS1 option 2019-02-17 23:46:45 +01:00
Raymond Knopp
3c8a4c871b robustified fronthaul a bit for out-of-order packets (PULTICK during PULFFT stream) 2019-02-17 22:26:28 +01:00
Raymond Knopp
9cb461ec75 reduced computations for TX during S subframe 2019-02-17 22:25:40 +01:00
Raphael Defosseux
6a47f9e775 Merge branch 'develop_integration_2019_w07_v2' into 'develop'
Develop integration 2019 week 07 v2

See merge request oai/openairinterface5g!508
2019-02-17 21:53:55 +01:00
yilmazt
9cbfe2e3fa More warning removals 2019-02-17 17:43:33 +01:00
laurent
38f68522fe merge develop-nr 2019-02-17 16:48:25 +01:00
laurent
e795ad8c68 merge devlop-nr 2019-02-17 16:06:17 +01:00
Raymond Knopp
f773b4291a Merge branch 'ru_rau_enhancement_L1_renaming' of https://gitlab.eurecom.fr/oai/openairinterface5g into ru_rau_enhancement_L1_renaming 2019-02-17 10:54:55 +01:00
Raymond Knopp
ba5b70ab51 log removal 2019-02-17 10:54:27 +01:00
Raymond Knopp
cfea040e8a ulsim / dlsim modifications 2019-02-17 10:50:29 +01:00
Javier Morgade
fb435f2d48 Bugfix MBMS Initialization 2019-02-16 13:17:14 +01:00
Raphael Defosseux
d14ad6797e Applying the cppcheck fix on last files
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-02-15 19:18:24 +01:00
Francesco Mani
688830e83e SSB pattern now hardcoded in rrc, to be taken from config file in the next commit 2019-02-15 17:01:58 +01:00
Raphael Defosseux
db51efa887 CI: comment message is now in HTML reports
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-02-15 15:44:15 +01:00
Javier Morgade
74aee78635 MBMS Dedicated Serving Cell Params added 2019-02-15 13:03:31 +01:00
Raphael Defosseux
341fedd468 Merge branch 'issue394_fix_cppcheck' into develop_integration_2019_w07_v2
--> openair2/LAYER2/MAC/eNB_scheduler_primitives.c is still old (not from issue394_fix_cppcheck branch)

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-02-15 12:24:19 +01:00
Javier Morgade
11dffe80b4 Basic SIB1-MBMS Initilization added 2019-02-15 11:55:20 +01:00
Raphael Defosseux
66f654cd0a CI: astyle trying to help merge
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-02-15 11:52:25 +01:00
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
yilmazt
380bac3e98 Warning removals and first update of small block coding 2019-02-15 11:06:30 +01:00
HOAI SON DANG
73c4d95c27 Change chmod astyle back to normal 2019-02-15 16:57:00 +07:00
HOAI SON DANG
001837120c Remove redundant built file 2019-02-15 16:54:21 +07:00
HOAI SON DANG
4df26768b8 Format astyle for modified file 2019-02-15 16:44:13 +07:00
Raphael Defosseux
ee3b650904 Compilation fix
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-02-15 10:40:06 +01:00
HOAI SON DANG
beb30f1e05 Merge branch 'nr_fix_pucch_dmrs' into develop-nr
Signed-off-by: HOAI SON DANG <sondh8@viettel.com.vn>
2019-02-15 16:13:18 +07: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
Javier Morgade
1bca870d61 Setting CFI region with two OFDM symbols (default)
Code cleanup
2019-02-15 08:50:44 +01:00
Francesco Mani
5c2f57369d Implementation of SS block pattern choice 2019-02-14 16:29:35 +01:00
Florian Kaltenberger
1f9cadc7b8 Merge branch 'nr_pdcch_updates' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr_pdcch_updates 2019-02-14 16:09:12 +01:00
Javier Morgade
46a8c83b6c UE procedures for FeMBMS SIB1-MBMS (SystemInformationBlockType1-MBMS message)
-- asn1 dissectors ETSI TS 136 331 V14.2.2 (2017-05)
	-- schedule_SI_MBMS
	-- ue_decode_si_mbms
2019-02-14 15:35:00 +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
Francesco Mani
db1eb5d921 CellID taken from config file 2019-02-13 17:49:16 +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
Florian Kaltenberger
b4d7c62d92 Merge branch 'nr-cfo-estimation' into 'develop-nr'
Nr cfo estimation

See merge request oai/openairinterface5g!499
2019-02-13 16:03:16 +01:00
Florian Kaltenberger
0e531a0596 Merge branch 'develop-nr-fixes' into 'develop-nr'
Develop nr fixes

See merge request oai/openairinterface5g!505
2019-02-13 16:02:47 +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
Florian Kaltenberger
af42c10945 added visualization of PDCCH channel estimate to phy_scope_UE. 2019-02-13 11:47:45 +01:00
Florian Kaltenberger
7cb58c9a31 reverting some changes in the UE that were introduced by nr_polar_encoder_optimizations to make UE work again on real-time testbench. Now at least the PDCCH can be detected and used for time tracking. However, the DCI is not yet decoded (this will be fixed on branch nr_pdcch_fixes). The reverted changes are most notably passing the correct slot number to slot_fep in phy_procedures_nrUE. This will have to be changed as well in the future when we pass to slot-based processing at the UE. 2019-02-13 11:47:26 +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
Guy De Souza
7ee8af50e9 Arithmetic exception fix 2019-02-13 10:24:15 +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
c7bce0f8d7 Merge from develop 2019-02-13 09:01:51 +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
Raphael Defosseux
a4dd3fdb07 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>
2019-02-12 16:33:30 +01:00
Francesco Mani
186269cd5d removed pbch_configured issue for frames multiple of 8 2019-02-12 15:37:24 +01:00
Raphael Defosseux
d97ba1e2fc CI: adding longer tempos for L2-nFAPI simulator
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-02-12 15:21:57 +01:00
Raphael Defosseux
b88c1458a5 CI: my bad. Forgot to apply the suppression list to the variant used in Jenkins pipeline file
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-02-12 13:40:41 +01:00
Francesco Mani
0348ce1598 bug fix in nr gold for pbch 2019-02-12 11:50:21 +01:00
frtabu
2fcc6333b3 Fix compil warnings after rebase 2019-02-12 10:32:57 +01:00
Francesco Mani
0a9ea26b9e bit-wise choice of SSB to transmit 2019-02-12 10:28:57 +01:00
frtabu
a50596af80 test for UE pucch and supression list update 2019-02-12 10:12:07 +01:00
frtabu
60defa245d more fixes for cppcheck 2019-02-12 10:12:07 +01:00
frtabu
d0a3788ca8 re-apply fixes lost with last rebase 2019-02-12 10:12:07 +01:00
frtabu
efe116abe5 rebase on develop (w04 - new master) 2019-02-12 10:12:07 +01:00
frtabu
299f627d8a more fixes for cppcheck, soon all the easiest ones completed (invalid printf format...) 2019-02-12 10:12:07 +01:00
frtabu
38bae9cc0e fix wrong AssetFatal test in prach.c 2019-02-12 10:12:07 +01:00
frtabu
a97dcd6201 attempt to fix prach.c wrong ru/eNB test 2019-02-12 10:12:07 +01:00
frtabu
824d2b478a new set of cppcheck fixes 2019-02-12 10:12:07 +01:00
frtabu
63143b87a7 Go on removing printf arguments warnings, add a suppression file to be used with cppcheck command 2019-02-12 09:57:47 +01:00
frtabu
875bdaf282 cppcheck fixes (2) 2019-02-12 09:46:02 +01:00
frtabu
227a0640e5 first set of cppcheck fixes 2019-02-12 09:46:02 +01:00
frtabu
501ae74cb5 first set of cppcheck fixes 2019-02-12 09:46:02 +01:00
Francesco Mani
102ec93096 first implementation of multiple ssb at gnb 2019-02-11 18:45:28 +01:00
Guy De Souza
932ad9ed64 Revert "DMRS shift disabling on gNB"
This reverts commit 61e36839e5.
2019-02-11 16:08:15 +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
Guy De Souza
e210f61452 Merge branch 'pbch_runel' into nr_pdcch_updates 2019-02-11 11:19:51 +01:00
Guy De Souza
61e36839e5 DMRS shift disabling on gNB 2019-02-11 10:34:25 +01:00
Florian Kaltenberger
151fced6d3 Merge branch '398-nr-pdsch-deinterleaving-and-rate-matching-are-in-wrong-order' into 'develop-nr'
Resolve "NR PDSCH: Deinterleaving and rate-matching are in wrong order"

See merge request oai/openairinterface5g!502
2019-02-11 10:27:54 +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
laurent
3b31b8a77d small fix for -w SIMU 2019-02-10 21:01:54 +01:00
laurent
0b203cb71f small fix for -w SIMU 2019-02-10 20:57: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
Robert Schmidt
2f23047900 Restructure F1AP UE list
* Restructure the code handling the UEs F1AP knows
* This fixes a bug that only two phones can be connected
2019-02-08 19:42:25 +01:00
laurent
eceafdd06d Merge remote-tracking branch 'origin/develop-nr' into ocp_nrsimulator 2019-02-08 18:26:45 +01:00
laurent
ae44bc0651 pbch displays in the scope 2019-02-08 18:22:21 +01:00
Robert Schmidt
032fc48ac0 Remove unused, commented F1AP code 2019-02-08 18:01:56 +01:00
Florian Kaltenberger
2c239d7083 removing Nid_cell from pbchsim CI test as its not working 2019-02-08 15:56:41 +01:00
Florian Kaltenberger
c0a79f6a57 increasing size of memory in VM for CI of phy-sim 2019-02-08 15:55:48 +01:00
Raymond Knopp
dd63e5239c minor change for CI with L2 emulator (NFAPI) 2019-02-08 15:14:39 +01:00
Florian Kaltenberger
9eecd211b5 changing parameters in dci_req to match gNB 2019-02-08 14:55:41 +01:00
Guy De Souza
550751fc8a Aggregation levels activation 2019-02-08 09:44:48 +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
Robert Schmidt
36f192e873 Fix test of socket_link.c after interface change
link_send_packet() has been extended to use for multiple protocols (added UDP,
SCTP after TCP). The test was not update, though, which is fixed in this
commit.
2019-02-07 18:03:18 +01:00
Robert Schmidt
9fd4b45226 Remove F1-related flags from build_oai script 2019-02-07 18:03:17 +01:00
Robert Schmidt
822f9849a2 Stop CU's PROTO_AGENT when DU disconnects
This adds an exit flag as well as the proto_agent_async_msg_recv_unlock()
function to unlock and release the proto_agent worker thread correctly.
2019-02-07 18:00:20 +01:00
Robert Schmidt
beec74b01a Correctly stop link_manager sender and receiver threads
This changes the destroy_link_manager() function to:
* call a new function message_get_unlock() to unlock the sending thread from
  its blocking message_get()
* calls pthread_cancel() on the receiving thread, because this unlocks any
  blocking read from a file descriptor

The same message_get_unlock() function has been added ringbuffer_queue to keep
the interfaces the same (it does nothing, because ringbuffer_queue is
non-blocking).
2019-02-07 17:56:56 +01:00
Francesco Mani
682bc15117 FFO estimation and compensation optional via command line 2019-02-07 17:06:46 +01:00
Guy De Souza
6377d5a73a PDCCH procedure debugs 2019-02-07 14:18:21 +01:00
Thomas Schlichter
268d1c8d17 Fix order of DLSCH deinterleaving and rate matching
On the gNB side tha data are first rate-matched and then interleaved.
So on the UE side, the received LLRs have to be deinterleaved first before rate-matching.

This significantly improved the performance, especially for MCS values > 3.
2019-02-07 11:53:24 +01:00
Thomas Schlichter
df0b95536d Fix debugging of nr_dlsch_coding 2019-02-07 11:52:54 +01:00
Florian Kaltenberger
edce788171 Merge remote-tracking branch 'origin/develop-nr' into nr-cfo-estimation 2019-02-07 10:22:04 +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
Francesco Mani
5c1c45dfe7 digital compensation of FFO moved before SSS detection 2019-02-06 17:03:09 +01:00
laurent
e9ac05d438 rfsimulator merge with develop 2019-02-06 10:22:01 +01:00
laurent
a78588cd04 Merge remote-tracking branch 'origin/develop-nr' into ocp_nrsimulator 2019-02-06 10:18:22 +01:00
laurent
b8ccf3f280 initial rfsimulator commit 2019-02-06 10:18:20 +01:00
Florian Kaltenberger
8f96cd503c Merge branch 'develop-nr' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-nr 2019-02-04 15:16:01 +01:00
Florian Kaltenberger
10ec0d353a N_id_cell also initialized for UE 2019-02-04 15:15:28 +01:00
Raphael Defosseux
cfa2f794c1 CI: adding new lib to phy-sim build check
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-02-04 11:56:16 +01:00
Francesco Mani
832eb3dc50 digital compensation of FFO on PBCH symbols (works only for FFO less than 0.5) 2019-02-01 16:42:11 +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
Florian Kaltenberger
89529d601a chaning SNR computation in nr_pbchsim and changing test_case_list.xml accordingly 2019-01-31 09:59:18 +01:00
Florian Kaltenberger
de3461c8ee fixing dlsim and adding it to build_oai 2019-01-31 09:57:37 +01:00
Raymond Knopp
b2921eadfe Merge branch 'ru_rau_enhancement_L1_renaming' of https://gitlab.eurecom.fr/oai/openairinterface5g into ru_rau_enhancement_L1_renaming 2019-01-30 11:44:55 +01:00
Raymond Knopp
1b013ece30 Merge remote-tracking branch 'origin/ru_rau_enhancement-external-timing' into ru_rau_enhancement_L1_renaming 2019-01-30 11:42:54 +01:00
Raymond Knopp
0c21813fa4 Merge remote-tracking branch 'origin/ru_rau_enhancement-external-timing' into ru_rau_enhancement_L1_renaming 2019-01-30 11:41:51 +01:00
Raymond Knopp
f8cb661953 Merge branch 'ru_rau_enhancement-external-timing' of https://gitlab.eurecom.fr/oai/openairinterface5g into ru_rau_enhancement-external-timing 2019-01-30 10:52:41 +01:00
Raymond Knopp
96ee719330 minor changes for RRU 2019-01-30 10:51:55 +01:00
Raymond Knopp
23575ae41e logging removal 2019-01-30 10:25:23 +01:00
Raymond Knopp
a13f70beee removal of warnings after merge 2019-01-29 17:09:49 +01:00
Robert Schmidt
0643d6b561 Make queue_recv() functions return size, not as out-param 2019-01-29 16:55:15 +01:00
Robert Schmidt
63c4a90eb7 Remove unused PROTO_AGENT code 2019-01-29 16:55:15 +01:00
Florian Kaltenberger
35767511f8 Merge branch 'nr-polar-encoder-optimizations' into 'develop-nr'
Nr polar encoder optimizations

See merge request oai/openairinterface5g!463
2019-01-29 16:05:44 +01:00
Florian Kaltenberger
626cf62cd8 Merge remote-tracking branch 'origin/develop-nr' into nr-polar-encoder-optimizations 2019-01-29 16:04:27 +01:00
Florian Kaltenberger
463cf306c4 temporarily disabling PDSCH decoding while finding the problem that makes nr-ue crash when used in real-time 2019-01-29 16:01:51 +01:00
Guy De Souza
ab5626de39 UE config changes/DMRS length fixed 2019-01-29 15:07:54 +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
Stefan
0eb430c508 forme eNB_scheduler_primitives < 5500 2019-01-28 16:02:13 +01:00
Guy De Souza
71e28181a5 Merge with nr-polar-encoder-optimizations 2019-01-28 11:25:11 +01:00
Guy De Souza
bc46624853 Physical channel/ Scheduling changes 2019-01-28 10:39:48 +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
Robert Schmidt
8c0ebfadda Add FlexRAN PLMN ID list and remove defunct cell_id 2019-01-28 08:36:32 +01:00
Louis Adrien Dufrene
ed1401ac00 Merge branch 'develop' into dlsch_scheduler_opti 2019-01-28 08:36:21 +01:00
Florian Kaltenberger
70e7e661c7 Merge remote-tracking branch 'origin/develop-nr' into nr-polar-encoder-optimizations 2019-01-27 22:07:11 +01:00
Florian Kaltenberger
9e04a4916f adding nr_ue_scheduled_response to UE and fixed paramters in nr_ue_dcireq. Now DCI decoded again by UE. 2019-01-27 21:37:46 +01:00
Raymond Knopp
72b5745abb Merge remote-tracking branch 'origin/develop' into ru_rau_enhancement-external-timing
Conflicts:
	openair1/PHY/LTE_TRANSPORT/if4_tools.c
	openair1/PHY/LTE_TRANSPORT/prach.c
	openair1/PHY/defs_eNB.h
	openair1/SCHED_UE/phy_procedures_lte_ue.c
	openair1/SIMULATION/LTE_PHY/dlsim.c
	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
	targets/RT/USER/lte-enb.c
	targets/RT/USER/lte-ru.c
	targets/RT/USER/lte-softmodem.c
	targets/RT/USER/lte-softmodem.h
	targets/RT/USER/lte-uesoftmodem.c
	targets/RT/USER/rfsim.c
2019-01-26 11:54:10 +01:00
Stefan
b5fb496882 forme eNB_scheduler_primitives < 3900 2019-01-25 17:17:30 +01:00
Robert Schmidt
d9d6ce374f Perform S1 UE Context Release Complete after corresponding F1 message
This commits isolates the S1 UE Ctxt Rel Complete and GTP Tunnel Delete
Requests in functions and calls these function in the original place
(rrc_rx_tx()). The same functions are then used in the F1 UE Ctxt Rel
Complete handler to perform the same functionality, i.e. forward the UE
Ctxt Rel Complete message to the MME and free outstanding resources (RRC
context, GTP tunnels, S1 context).
2019-01-25 16:37:57 +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
Nguyen Thi Thanh Tu
4255f4e448 revert the original params for OAI 2019-01-25 18:07:15 +07:00
Stefan
d0b5dfa484 forme eNB_scheduler_primitives < 3000 2019-01-25 11:26:45 +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
9498f8f6dd CI: killing the ethernet-based VM after build
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-01-24 23:24:18 +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
Stefan
0a7e800077 forme eNB_scheduler_primitives < 2000 2019-01-24 16:26:21 +01:00
Konstantinos Alexandris
6f0267c4fa x2: fix UE measurement report 2019-01-24 15:55:26 +01:00
Florian Kaltenberger
612c8632e3 fixing memory leaks in PBCH RX and FAPI
adding function dci_req for UE
disabling handle_dci for now
2019-01-24 15:35:14 +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
Stefan
169ba6011e forme eNB_scheduler_primitives < 1000 2019-01-24 11:19:13 +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
Stefan
1074a2cdc7 forme eNB_scheduler_dlsch 2019-01-23 16:22:55 +01:00
Francesco Mani
0234a5c21a conflicts resolved after merging with nr-polar-encoder-optimizations 2019-01-23 14:36:52 +01:00
Louis Adrien Dufrene
f0eaad5c1c Merge from develop 2019-01-23 14:15:21 +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
OAI-admin
1c26da5ad5 Some corrections: commit test is ok! 2019-01-23 13:56:43 +01:00
Guy De Souza
cf22a2146e DCI configuration by PDCCHConfig 2019-01-23 13:44:35 +01:00
Louis Adrien Dufrene
aac0a56116 Merge from develop 2019-01-23 13:27:56 +01:00
Florian Kaltenberger
449da9ac17 adding detection of multiple PSS. 2019-01-23 12:15:54 +01:00
Stefan
2a8e7f3f6f modif fill_nfapi_uci_acknaks 2019-01-23 11:56:31 +01:00
Raymond Knopp
7405eec0f1 USRP now takes ffo estimation into account 2019-01-23 11:40:52 +01:00
Raphael Defosseux
869d58fd4b Merge remote-tracking branch 'origin/patch-1' into x2 2019-01-23 10:27:57 +01:00
Stefan
485e83f9e6 modif scheduler_dlsch + primitives 2019-01-23 08:50:59 +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
frtabu
1cb484f1b6 fix more trivial cppcheck errors and warnings 2019-01-22 22:43:33 +01:00
frtabu
d171e18c1e fix some cppcheck errors and warnings in config module and T Tracer 2019-01-22 22:43:33 +01:00
frtabu
974167b51c update documentation and improve help text display 2019-01-22 22:43:33 +01:00
frtabu
e329ba787c fix command line parsing for config_getlist, also improve help processing and fix probe (opt) parameters processing 2019-01-22 22:43:33 +01:00
Raphael Defosseux
8260607ed6 CI: fix in L2-simulator VM build start script
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-01-22 21:37:40 +01:00
Raphael Defosseux
e13b29d38a Merge branch 'issue_345_l2_fapi_simulator_new_jan2019' into 'develop'
Issue 345 l2 fapi simulator new

See merge request oai/openairinterface5g!487 and oai/openairinterface5g!432
2019-01-22 21:15:10 +01:00
Raphael Defosseux
9fbc3e8620 CI: the timeout of eNB log file copy is due to the huge size of said-file
--> increase the timeout of copyin/copyout functions to 100 sec
   Also changed the UHD driver version retrieval

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-01-22 18:53:35 +01:00
Robert Schmidt
2cdcb6466b Move PDCP stats recording out from non-applying packet_forwarded FALSE case 2019-01-22 16:11:37 +01:00
Florian Kaltenberger
f2d5cfae0c fixing ssb_subcarrier_offset computation for odd N_PRB in gNB and UE
adding Nid_cell to nr_pbchsim
2019-01-22 14:36:14 +01:00
Konstantinos Alexandris
58a448c759 Update FEATURE_SET.md 2019-01-22 11:49:05 +01:00
Francesco Mani
35dc0857c4 working version of FFO estimation 2019-01-22 10:46:45 +01:00
frtabu
9d0c70c9fe remove L1L2 task, also remove some call to send messages to UNKNOWN_TASK, removed in new itti. Align LOG in rlc sources with new LOG code (remove DEBUG_RLC...) 2019-01-21 19:43:19 +01:00
Raphael Defosseux
f43bbe670b CI: adding support for L2 NFAPI simulation
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-01-21 17:34:46 +01:00
Cedric Roux
3ee6ccbeb5 fix enb nos1 ethernet compilation 2019-01-21 17:27:57 +01:00
Cedric Roux
1c4ec9e90b fix dlsim compilation 2019-01-21 17:24:26 +01:00
Konstantinos Alexandris
83c414fc83 remove warnings (nb_e_rabs_tobeswitched not in use) 2019-01-21 16:34:52 +01:00
Konstantinos Alexandris
80cf53a3c0 minor: fix spacing 2019-01-21 10:54:21 +01:00
Louis Adrien Dufrene
a36510d304 Merge branch 'develop' into dlsch_scheduler_opti 2019-01-21 08:54:49 +01:00
Raymond Knopp
f84e52bad5 replaced AssertFatal with LOG_E and RA procedure cancellation 2019-01-20 15:39:58 +01:00
Raymond Knopp
7f3402f648 Merge branch 'enhancement-ltem' of https://gitlab.eurecom.fr/oai/openairinterface5g into enhancement-ltem 2019-01-20 15:26:09 +01:00
Raymond Knopp
b2748da3c9 removal of warnings and excessive logging 2019-01-20 13:18:49 +01:00
Robert Schmidt
03b52216a0 FlexRAN: Access PDCP stats through RNTI 2019-01-19 18:22:43 +01:00
Robert Schmidt
767eaf5ba2 Initialize PDCP stats when UE is added 2019-01-19 18:22:40 +01:00
Robert Schmidt
6f9f2d8992 Correct PDCP stats defining constant to MAX_eNB from CC 2019-01-19 16:59:33 +01:00
Robert Schmidt
ad9778be76 FlexRAN fix: correct array index var in loop 2019-01-19 16:13:38 +01:00
Raymond Knopp
f3a79f4be5 Merge remote-tracking branch 'origin/develop' into enhancement-ltem 2019-01-19 16:07:34 +01:00
haswell
023b6ebc29 testing LTE-M configuration 2019-01-19 16:02:59 +01:00
Raymond Knopp
c47e1fc97f Merge remote-tracking branch 'origin/develop' into enhancement-ltem 2019-01-19 12:14:23 +01:00
Stefan
151873e987 pre_processor improvements 2019-01-18 17:04:57 +01:00
Robert Schmidt
ca2f91072a F1AP: on UEContextRelCmd, DU distinguishes whether UE is out of sync 2019-01-18 16:44:00 +01:00
Robert Schmidt
7df8257526 F1AP: when UL_sync failure, send UEContextRelReq
When a phone loses connection, it should not simply be removed but first
CU should be informed which will send a ContextRelCmd. Correspondingly,
when the RRC releases the UE, it does not send a UE Context Release Req
2019-01-18 16:44:01 +01:00
Raphael Defosseux
458a50fb36 CI: fixing finally the copyin network issue when retrieving eNB log file
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-01-18 13:59:53 +01:00
Cedric Roux
7d481c5734 Merge remote-tracking branch 'origin/develop' into x2 2019-01-18 10:40:01 +01:00
Cedric Roux
246abce5d1 Merge remote-tracking branch 'origin/develop' into x2
Conflicts:
	openair2/ENB_APP/enb_config.c
	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
	openair2/RRC/LTE/MESSAGES/asn1_msg.c
	openair2/RRC/LTE/MESSAGES/asn1_msg.h
	openair2/RRC/LTE/rrc_defs.h
	openair2/RRC/LTE/rrc_eNB.c
	openair2/RRC/LTE/rrc_eNB_S1AP.c
	openair2/RRC/LTE/rrc_proto.h
	openair3/GTPV1-U/gtpv1u_eNB.c
	openair3/S1AP/s1ap_eNB_handlers.c
2019-01-18 10:35:39 +01:00
tuntt3
6cd3e5faf5 fix bugs related to using lte_gold_generic to generate uci 2019-01-17 15:58:55 -07:00
Raphael Defosseux
d0190899d2 Try out to comment added lines
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-01-17 23:09:10 +01:00
yilmazt
3978c84f0c Merge branch 'nr-polar-encoder-optimizations' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr-polar-encoder-optimizations 2019-01-17 21:07:14 +01:00
yilmazt
b44e15fd06 More warning removals but nr_dlschsim still not working 2019-01-17 21:06:15 +01:00
Robert Schmidt
0699e539fe Put RRC S1AP UEContextReleaseReq message inside corresponding if 2019-01-17 18:21:47 +01:00
Raphael Defosseux
4075fbc86a Merge remote-tracking branch 'origin/develop' into issue_345_l2_fapi_simulator_new_jan2019
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-01-17 18:19:46 +01:00
Raphael Defosseux
24bde5d635 Merge branch 'develop_integration_2019_w03' into 'develop'
See merge request oai/openairinterface5g!486

Integration Branch: 2019 week 03

* MR 477: Resolve "384 obsolete files to delete"
* MR 479: Fix on allow remote connection in tcpbridge
* MR 480: Ue hotfix u emode during initial connection
* MR 484: Fix on T early logs
* MR 485: Fix on exit softmodem when a command line option requiring an argument is specified
2019-01-17 17:44:39 +01:00
matzakos
eb92fa917b Fixed eNB threading issues creating problems for nfapi emulator. 2019-01-17 15:29:15 +01:00
Raphael Defosseux
d62f8f9349 Fix merge: removed very old code
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-01-17 13:07:07 +01:00
Guy De Souza
6526bf3b6e Optimizations/ Floating point fix 2019-01-17 12:17:49 +01:00
Raphael Defosseux
c5f17fa7fd Merge remote-tracking branch 'origin/ue-hotfix-UEmode-during-initial-connection' into develop_integration_2019_w03 2019-01-17 11:54:05 +01:00
Francesco Mani
70f973b57f 1st version of CFO estimation 2019-01-17 11:29:44 +01:00
Florian Kaltenberger
34546f7a55 Merge branch 'nr-polar-encoder-optimizations' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr-polar-encoder-optimizations 2019-01-17 09:12:25 +01:00
yilmazt
86531d2e70 Warning fixes for phy_simulators 2019-01-16 21:02:46 +01:00
Raphael Defosseux
49b4e4128d Merge remote-tracking branch 'origin/issue-389-fix-missing-option-value-not-reported' into develop_integration_2019_w03 2019-01-16 20:23:06 +01:00
Raphael Defosseux
cbb21c108e Merge remote-tracking branch 'origin/issue-388-fix-missing-logs-at-startup' into develop_integration_2019_w03 2019-01-16 20:22:43 +01:00
Raphael Defosseux
a2307ebc11 Merge remote-tracking branch 'origin/issue386_tcpbrige_remoteconnection' into develop_integration_2019_w03 2019-01-16 19:42:21 +01:00
Florian Kaltenberger
be40637380 hardcoding N_PRB of PDCCH in UE MAC (was in UE PHY before). This is still a temporary solution until UE FAPI is correctly done. But at least it decodes the DCI again.
fixing some warinings
2019-01-16 18:00:18 +01:00
frtabu
161aeebaaa attempt to fix TDD basic_simulator failure 2019-01-16 17:57:54 +01:00
Guy De Souza
1e85683de5 Type 0 PDCCH missing configurations 2019-01-16 17:45:42 +01:00
Raphael Defosseux
bf25aba227 CI: adding eNB characteristics to HTML report
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-01-16 17:24:04 +01:00
Raphael Defosseux
c12dfe19db Fix in the UE side
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-01-16 15:54:39 +01:00
Robert Schmidt
a26fad9e47 F1AP: Correct UEContextReleaseReq path, send corresp. S1AP message 2019-01-16 14:45:06 +01:00
Raphael Defosseux
6bb7674877 Fixing usage of old structure/field names
--> temporary as old code is kept in comment

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-01-16 14:25:38 +01:00
Louis Adrien Dufrene
838f50a0ee Merge branch 'ulsch_scheduler_opti' into 383-ulsch-scheduler-optimization 2019-01-16 11:55:04 +01:00
Louis Adrien Dufrene
f034b6933f unused variable added in the commented bloc, remove build warnings 2019-01-16 11:54:50 +01:00
Cedric Roux
4cd58ac80a apply astyle 2019-01-16 11:44:38 +01:00
Raphael Defosseux
d73685933c Merge remote-tracking branch 'origin/develop' into issue_345_l2_fapi_simulator_new
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-01-16 11:21:27 +01:00
Konstantinos Alexandris
2f145a62a8 Minor fix for MME (error in connect) 2019-01-16 11:00:03 +01:00
Konstantinos Alexandris
0e4da18f39 Minor fix on X2AP HO Req ACK and X2AP UE Context Release 2019-01-16 10:53:02 +01:00
Raphael Defosseux
4e4e542f50 Merge remote-tracking branch 'origin/issue386_tcpbrige_remoteconnection' into develop_integration_2019_w03 2019-01-16 10:24:22 +01:00
Raphael Defosseux
bddb945889 Merge remote-tracking branch 'origin/384-obsolete-files-to-delete' into develop_integration_2019_w03 2019-01-16 10:13:26 +01:00
Louis Adrien Dufrene
25418e98a0 merge from local dev branch 2019-01-16 09:00:33 +01:00
Louis Adrien Dufrene
0aff104545 Debug removed and first fix added for false RA caused by UL scheduling on PRACH resources 2019-01-16 08:58:53 +01:00
Raymond Knopp
cae1ed0b11 changed some AssertFatal into LOG_E + return(-1) 2019-01-15 21:31:29 +01:00
Raphael Defosseux
fd97183944 Merge branch 'ci-settings-improvements' into 'develop'
CI: adapt parameters for better FDD performances

See merge request oai/openairinterface5g!481
2019-01-15 20:29:48 +01:00
Stefan
c638d16a04 pre_processor improvements 2019-01-15 17:59:40 +01:00
Cedric Roux
7d715cd4bc fix UE configuration file (for CI) 2019-01-15 17:34:59 +01:00
Raphael Defosseux
4e74773d3c CI: modified also RRU config
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-01-15 16:36:31 +01:00
Raphael Defosseux
28e4486c07 CI: updating the IF4p5 conf files w/ same values as in monolithic
also disabling LLL realtime issues as an error until PRACH allocation is fixed

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-01-15 16:35:09 +01:00
Cedric Roux
8f0fd7387b CI: adapt parameters for better FDD performances 2019-01-15 16:32:40 +01:00
Raphael Defosseux
1de4a57e7b CI: modified also RRU config
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-01-15 16:26:31 +01:00
Raphael Defosseux
7308f1da98 CI: updating the IF4p5 conf files w/ same values as in monolithic
also disabling LLL realtime issues as an error until PRACH allocation is fixed

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-01-15 12:12:21 +01:00
Stefan
d5841cbe9e Merge branch 'ulsch_scheduler_opti' of https://gitlab.forge.orange-labs.fr/afyf6286/oai-orange into ulsch_scheduler_opti 2019-01-15 09:00:45 +01:00
Raymond Knopp
38fa452359 Merge remote-tracking branch 'origin/ci-settings-improvements' into enhancement-ltem 2019-01-15 00:10:02 +01:00
frtabu
e179213be0 exit softmodem when a command line option requiring an argument is specified without an option value. Previous behavior was to print a message and ignore the option 2019-01-14 19:13:12 +01:00
Francesco Mani
4e55c9da6d CFO included in pbchsim 2019-01-14 18:16:20 +01:00
Louis Adrien Dufrene
7aa89331e7 Tested, ready to merge 2019-01-14 16:58:40 +01:00
Louis Adrien Dufrene
fb1ccbaf6b prach taken into account in ulsch scheduler + resolve UE_id = -1 in rx_sdu (to test before push) 2019-01-14 16:43:04 +01:00
Cedric Roux
0019707cd1 T: fix early logs
The variable T_stdout needs to be 1 at startup to avoid missing logs.
2019-01-14 16:28:16 +01:00
Cedric Roux
942a5cf2db CI: adapt parameters for better FDD performances 2019-01-14 16:18:31 +01:00
Stefan
1750057376 SSR 2019-01-14 2019-01-14 14:00:47 +01:00
Raymond Knopp
0a7934d1fb minor change for simulation targets 2019-01-14 12:18:56 +01:00
Louis Adrien Dufrene
28902bcd57 add some debug 2019-01-14 11:59:15 +01:00
Florian Kaltenberger
c35157c439 making nr_dlschsim compile again 2019-01-11 21:02:26 +01:00
Louis Adrien Dufrene
0269f07ad5 Merge branch 'ulsch_scheduler_opti' into 383-ulsch-scheduler-optimization 2019-01-11 17:41:28 +01:00
Louis Adrien Dufrene
5431c6f8a3 Merge branch 'develop' into ulsch_scheduler_opti 2019-01-11 17:40:29 +01:00
Louis Adrien Dufrene
a748262e0a remove some debug before merge develop 2019-01-11 17:40:01 +01:00
Louis Adrien Dufrene
a2ef8b7b50 Some formatting + RAPROC fix (to test) 2019-01-11 17:25:13 +01:00
Florian Kaltenberger
49b7d7454b bit endianes reversal also at the pbch rx. 2019-01-11 14:14:18 +01:00
magounak
e1a07c2f41 cosmetic changes 2019-01-11 13:23:33 +01:00
Raymond Knopp
f0c6b74de1 initialization of transport channels in nr_dlsim 2019-01-11 13:15:11 +01:00
Florian Kaltenberger
a85e8a8f68 Merge branch '376-make-ldpc-decoder-threadsave' into 'develop-nr'
Resolve "Make LDPC decoder threadsave"

See merge request oai/openairinterface5g!465
2019-01-11 13:01:48 +01:00
Louis Adrien Dufrene
6614916bc4 debug for test 2019-01-11 11:25:01 +01:00
Louis Adrien Dufrene
f99d40c10e add debug in eNB_scheduler_ulsch.c 2019-01-11 10:14:56 +01:00
Louis Adrien Dufrene
bfcefd9f99 Merge branch 'ulsch_scheduler_opti' into 383-ulsch-scheduler-optimization 2019-01-11 08:49:14 +01:00
Louis Adrien Dufrene
2f95d409cf Merge branch 'ulsch_scheduler_opti' of https://gitlab.forge.orange-labs.fr/afyf6286/oai-orange into ulsch_scheduler_opti 2019-01-11 08:48:19 +01:00
Louis Adrien Dufrene
8bc548a22c no modifications before pull 2019-01-11 08:48:06 +01:00
Stefan
7db6ac9314 eNB_scheduler_primitives improvements-2 2019-01-11 08:35:25 +01:00
Raymond Knopp
95746536c0 Fix for the Internet connectivity issue 2019-01-10 18:39:07 +01:00
Robert Schmidt
05e08d5094 Remove DU's UE RRC, MAC, RLC contexts correctly on UE RELEASE COMMAND 2019-01-10 16:51:04 +01:00
Robert Schmidt
be17b9b655 Correctly handle UE RELEASE COMPLETE in CU
* remove PDCP/RRC contexts
* inform the FlexRAN controller
2019-01-10 16:50:17 +01:00
Louis Adrien Dufrene
9d5557f53b Merge branch 'ulsch_scheduler_opti' into 383-ulsch-scheduler-optimization 2019-01-10 16:48:18 +01:00
Raphael Defosseux
ce7067c7b8 CI: fixing scp timeout failure like the ssh session timeout failure
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-01-10 16:35:13 +01:00
Louis Adrien Dufrene
8165233723 More formatting 2019-01-10 16:29:56 +01:00
Robert Schmidt
29f23e161e Fix socket type to IPv4 in case of no-multi usage
sctp_create_new_listener() takes a parameter server_type which is NOT
the IP version but whether it is an SCTP multihoming server. There was a
bug that when multihoming is not wanted, it created an IPv6 socket
instead of IPv4. This commit fixes this.

IPv6 is not supported yet.
2019-01-10 14:28:25 +01:00
Hongzhi Wang
454c552de2 Test passed for multithreading dlsch_decoding 2019-01-10 10:16:36 +01:00
Louis Adrien Dufrene
2b070e7a4f Merge branch 'develop' into ulsch_scheduler_opti 2019-01-10 09:52:21 +01:00
Louis Adrien Dufrene
227a4347e4 Merge branch 'ulsch_scheduler_opti' of https://gitlab.forge.orange-labs.fr/afyf6286/oai-orange into ulsch_scheduler_opti 2019-01-10 09:51:22 +01:00
Louis Adrien Dufrene
9805b053de formatting eNB_scheduler_ulsch.c 2019-01-10 09:51:06 +01:00
Stefan
0d980deaca eNB_scheduler_primitives improvements 2019-01-10 09:45:31 +01:00
Raymond Knopp
655508a686 Merge remote-tracking branch 'origin/develop' into ue-hotfix-UEmode-during-initial-connection 2019-01-09 23:55:59 +01:00
Raymond Knopp
29064e6d49 corrected bug in handling of UE_mode during initial connection once timing synchronization condition (hysteresis count) is satisfied. 2019-01-09 23:30:13 +01:00
Florian Kaltenberger
fb35247c6b Merge branch 'nr_cpu_affinity2' into 'develop-nr'
Nr cpu affinity2

See merge request oai/openairinterface5g!478
2019-01-09 20:49:15 +01:00
Florian Kaltenberger
73178c8153 Nr cpu affinity2 2019-01-09 20:49:15 +01:00
Guy De Souza
09a481d914 PBCH and modulation bugs 2019-01-09 16:08:53 +01:00
Raphael Defosseux
a975014beb CI: disabling basic-sim test at TDD-20MHz in order to stop getting false negatives
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-01-08 15:54:28 +01:00
Sebastian Wagner
9548ab863d Fixed bug in memory allocation 2019-01-08 11:07:49 +01:00
Raymond Knopp
109f6ef426 Merge remote-tracking branch 'origin/develop-nr' into nr-polar-encoder-optimizations 2019-01-08 10:48:43 +01:00
frtabu
718f754c07 modify tcp_bridge_oai.c to support remote connections, old behavior is maintained, define TCPBRIDGE environment variable to the enb ip address on ue side. 2019-01-07 19:36:24 +01:00
Florian Kaltenberger
78b9014624 Merge branch 'nr_pdsch' into 'develop-nr'
Nr pdsch

See merge request oai/openairinterface5g!475
2019-01-07 16:22:56 +01:00
Cedric Roux
aea6b4b5a6 fix a lot of file mode
For whatever reason most of the files had their permission
changed from 644 to 755, which is not wanted.
2019-01-07 16:22:28 +01:00
Raymond Knopp
44a225c6b7 Merge remote-tracking branch 'origin/develop' into enhancement-ltem
Conflicts:
	openair1/PHY/LTE_TRANSPORT/dci_tools.c
	openair1/SCHED/fapi_l1.c
	openair1/SCHED/phy_procedures_lte_eNb.c
	openair2/COMMON/rrc_messages_types.h
	openair2/ENB_APP/enb_config.c
	openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
	openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
	openair2/LAYER2/MAC/eNB_scheduler_primitives.c
	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
	openair2/LAYER2/MAC/mac.h
	openair2/RRC/LTE/L2_interface.c
	openair2/RRC/LTE/MESSAGES/asn1_msg.c
	openair2/RRC/LTE/MESSAGES/asn1_msg.h
	openair2/RRC/LTE/rrc_eNB.c
	openair2/RRC/LTE/rrc_eNB_S1AP.c
	targets/RT/USER/lte-enb.c
2019-01-05 23:28:31 +01:00
Raymond Knopp
cb9321c65d Merge remote-tracking branch 'origin/nr_pdsch' into nr-polar-encoder-optimizations
Conflicts:
	cmake_targets/CMakeLists.txt
	openair1/PHY/CODING/TESTBENCH/ldpctest.c
	openair1/PHY/CODING/nrLDPC_encoder/ldpc_encoder2.c
	openair1/PHY/CODING/nrLDPC_encoder/ldpc_generate_coefficient.c
	openair1/PHY/CODING/nr_compute_tbs.c
	openair1/PHY/CODING/nr_segmentation.c
	openair1/PHY/MODULATION/slot_fep_nr.c
	openair1/PHY/NR_REFSIG/nr_dmrs_rx.c
	openair1/PHY/NR_TRANSPORT/nr_dci_tools.c
	openair1/PHY/NR_UE_ESTIMATION/nr_dl_channel_estimation.c
	openair1/PHY/NR_UE_TRANSPORT/dci_nr.c
	openair1/SCHED_NR/fapi_nr_l1.c
	openair1/SCHED_NR/nr_ru_procedures.c
	openair1/SCHED_NR/phy_procedures_nr_common.c
	openair1/SCHED_NR/phy_procedures_nr_gNB.c
	openair1/SCHED_NR_UE/defs.h
	openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
	openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
	targets/RT/USER/nr-gnb.c
	targets/RT/USER/nr-ru.c
	targets/RT/USER/nr-ue.c
2019-01-04 16:46:50 +01:00
Cedric Roux
27b7431cf4 bugfix: fix some merge error 2019-01-04 15:41:34 +01:00
laurent
824f98b125 add dirty -I in Makefile 2019-01-04 14:25:01 +01:00
Raphael Defosseux
1e0d816131 CI: little fix when assessing build status
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-01-04 10:42:31 +01:00
ISIP_NCTU
c73c0e3fc4 add nr_configure_css_dci_from_pdcch_config for coreset and search space 2019-01-03 21:51:34 +08:00
Raymond Knopp
3c22d7e2d0 error statistics for nr_pbchsim 2019-01-02 20:32:40 +01:00
Raymond Knopp
81c1e1b309 tested with slot-based processing for 40 and 80 MHz channels 2018-12-30 00:32:57 +01:00
laurent
4753f92bad remove more files, add a LOG_E() for UE not developped use case 2018-12-26 10:25:56 +01:00
laurent
80ac9ece17 issue 384 2018-12-23 18:05:51 +01:00
laurent
b3f1440249 issue 384 2018-12-23 17:55:07 +01:00
magounak
3c328263ab mask filling mechanism adjustment and VCD adding for 3rd RU 2018-12-21 15:47:30 +01:00
Raymond Knopp
ae18029192 optimized polar encoder in pbch_nr.c 2018-12-21 09:14:37 +01:00
Louis Adrien Dufrene
bee68859cd UE_id overflow corrected + merge from develop 2018-12-21 07:11:14 +01:00
Louis Adrien Dufrene
17e70e1de7 Merge branch 'develop' into ulsch_scheduler_opti 2018-12-20 17:08:32 +01:00
Stefan
a1d5fbea9d SSR 21/12/18 ulsch_scheduler_pre_processor2 2018-12-20 16:52:06 +01:00
Florian Kaltenberger
0a183d0ebd Merge remote-tracking branch 'origin/develop-nr' into nr_pdsch 2018-12-20 16:44:55 +01:00
Florian Kaltenberger
2fe820532f Merge branch 'nr_ue_pbch_fixes' into 'develop-nr'
SFN bug and cell ID above 255

See merge request oai/openairinterface5g!473
2018-12-20 16:40:22 +01:00
Florian Kaltenberger
3d4f64629d nr_pbchsim should use less memory now. also fixed some error messages. 2018-12-20 16:37:13 +01:00
Raphael Defosseux
001163f63b Merge branch 'develop_integration_2018_w51' into 'develop'
Develop integration 2018 week 51

See merge request oai/openairinterface5g!470

Integration branch for week 51 (2018). Last of the year
The following MRs have been merged:

- 440 : L1 renaming
- 459 : dlsim format1A testing
- 464 : Iris HW support
- 466 : Workshop demo
- 467 : compilation make fix for ASN1C
- 468 : limeSDR compilation fix

In addition: added support for multi-XML scenarios on slave CI jobs
2018-12-20 16:10:20 +01:00
Louis Adrien Dufrene
32eafc1332 Some format before testing locally 2018-12-20 15:20:10 +01:00
Raymond Knopp
96481468a3 testing 2018-12-20 15:11:36 +01:00
Louis Adrien Dufrene
393f30a2b1 triggering CI 2018-12-20 11:51:22 +01:00
Louis Adrien Dufrene
57a5a26e5c some format in eNB_scheduler_ulsch.c + break removed in schedule_ulsch() 2018-12-20 11:39:10 +01:00
Stefan
ffed6b7115 SSR 20/12/18 ulsch_scheduler_pre_processor 2018-12-20 11:04:21 +01:00
Raphael Defosseux
8c2bb9693a Merge remote-tracking branch 'origin/enhancement-dlsim-format1A-testing' into develop_integration_2018_w51 2018-12-20 10:49:02 +01:00
Guy De Souza
a5a3ff3721 UE Nid fix 2018-12-20 10:45:35 +01:00
Raphael Defosseux
81e81ab469 Merge remote-tracking branch 'origin/iris_hw_new' into develop_integration_2018_w51 2018-12-20 10:43:46 +01:00
Guy De Souza
cefd7cee79 Merge with develop-nr 2018-12-20 10:32:10 +01:00
Guy De Souza
a9f98bd9f5 Modulation scaling 2018-12-20 09:04:05 +01:00
Raymond Knopp
0334a2a909 fixing after merge with develop-nr. nr_pbchsim not functional 2018-12-20 08:49:28 +01:00
Raymond Knopp
a653258cc0 Merge remote-tracking branch 'origin/develop-nr' into nr-polar-encoder-optimizations 2018-12-20 08:04:18 +01:00
Raymond Knopp
956fced146 slot-based processing in nr-ru. All compilations and unitary simulators ok. 2018-12-20 08:02:46 +01:00
Louis Adrien Dufrene
076d4e1280 LA: some format + cc = &mac->common_channels[CC_id]; added in schedule_ulsch 2018-12-20 07:38:20 +01:00
Rahman Doost
c76bbd13f1 iris soapy0.7 support 2018-12-19 14:49:56 -06:00
Florian Kaltenberger
732829f349 Merge branch 'nr_ue_pbch_fixes' into 'develop-nr'
Scrambling issue/ cell ID above 255

See merge request oai/openairinterface5g!471
2018-12-19 21:00:52 +01:00
Stefan
da7d2a8ce5 SSR 2018-12-19 2018-12-19 17:00:18 +01:00
Raphael Defosseux
3b915b37ff Downgrading log message to DEBUG for better RT
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-12-19 16:05:09 +01:00
Raymond Knoppp
69a126909b final changes at slave RRU 2018-12-19 13:01:01 +01:00
Raymond Knoppp
2a279bc723 final changes at slave RRU 2018-12-19 12:36:42 +01:00
magounak
1723c22558 RU_mask final changes 2018-12-19 12:34:26 +01:00
Raphael Defosseux
77f2879620 CI: typo in report build script
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-12-19 10:10:33 +01:00
Guy De Souza
e3bbfe7712 Scrambling issue/ cell ID above 255 2018-12-18 17:36:26 +01:00
Raphael Defosseux
37da1d72b7 Merge remote-tracking branch 'origin/develop-ci-multi-xml-scenarios-support' into develop_integration_2018_w51 2018-12-18 14:49:23 +01:00
Raphael Defosseux
f3488567c3 Merge remote-tracking branch 'origin/381-limesdr-compilation-fail' into develop_integration_2018_w51 2018-12-18 14:48:24 +01:00
Raphael Defosseux
c5a2be4c7e Merge remote-tracking branch 'origin/379-make' into develop_integration_2018_w51 2018-12-18 14:46:29 +01:00
Raphael Defosseux
70ed71a076 Merge remote-tracking branch 'origin/demo-workshop-dec-2018' into develop_integration_2018_w51 2018-12-18 14:45:55 +01:00
Raphael Defosseux
ee9f8d8fa7 Merge remote-tracking branch 'origin/iris_hw_new' into develop_integration_2018_w51 2018-12-18 14:44:50 +01:00
Raphael Defosseux
101ed01277 Merge remote-tracking branch 'origin/L1_renaming' into develop_integration_2018_w51 2018-12-18 14:42:41 +01:00
Konstantinos Alexandris
ea105c39b1 X2AP MOBILITY PROCEDURES (X2AP HANDOVER REQUEST/REQUEST ACK)
S1AP PATH SWITCH REQUEST/REQUEST ACK/FAILURE
RRC MEASUREMENT REPORT
MINOR CHANGES IN MAC LAYER
2018-12-18 13:45:03 +01:00
rdoost
6c41b6d77a parametrized gains 2018-12-17 20:24:14 -06:00
Florian Kaltenberger
fe00c55979 Merge branch 'nr_pbchsim_payload_check' into 'develop-nr'
Nr pbchsim payload check

See merge request oai/openairinterface5g!469
2018-12-17 16:44:35 +01:00
Florian Kaltenberger
4faf96d689 fixed to previous commit 2018-12-17 16:43:43 +01:00
Florian Kaltenberger
b6b2531d98 fix payload check in nr_pbchsim for >1 iterations 2018-12-17 16:28:36 +01:00
Guy De Souza
70d241fb0f PBCH encoding debug deactivated 2018-12-17 15:59:44 +01:00
magounak
e170ba24fb RU_mask changes 2018-12-17 15:50:23 +01:00
Guy De Souza
1a6331ceea Log disabling 2018-12-17 14:16:20 +01:00
Guy De Souza
91a47eb94a Payload check in pbchsim 2018-12-17 14:12:54 +01:00
Hongzhi Wang
4b373dd1c6 more fixes for ue dlsch 2018-12-17 13:32:29 +01:00
Florian Kaltenberger
b12d6b7340 adding payload check to nr_pbchsim 2018-12-17 10:26:40 +01:00
Raphael Defosseux
df6cc9efc0 CI: splitting all xml scenarios
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-12-14 15:37:55 +01:00
Raymond Knopp
adaa8e1337 debugging of DCI indication and UE-FAPI interface 2018-12-14 06:21:40 +01:00
Raphael Defosseux
d318ed26cd CI: fixing the name of the tree icon
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-12-13 16:07:59 +01:00
Raphael Defosseux
a12ccf1db3 CI: splitting the IF4p5 FDD scenario into several files
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-12-13 14:42:21 +01:00
Laurent
aacbd7577c fix 381 2018-12-13 13:45:59 +01:00
Raphael Defosseux
25b60e0c95 CI: missing detection of UE for TAB header
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-12-13 10:55:39 +01:00
Hongzhi
08f90879df pdcch and pdsch fix in phy_scope 2018-12-13 10:13:03 +01:00
Raphael Defosseux
70711c3469 CI: adding support for multiple XML scenario files
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-12-13 10:02:02 +01:00
Laurent
89229ac59a fix issue 379 2018-12-12 14:49:54 +01:00
Laurent
1b659b936c fix issue 379 2018-12-12 14:21:00 +01:00
Sebastian Wagner
9727801417 WIP: Version to be tested 2018-12-12 09:42:06 +01:00
Raphael Defosseux
5dc5f6bc79 CI: missing OSA banners
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-12-10 14:49:48 +01:00
Guy De Souza
34699e3244 Merge branch 'nr_pdsch' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr_pdsch 2018-12-10 14:47:19 +01:00
Guy De Souza
815658b0f0 check_crc fix 2018-12-10 14:47:05 +01:00
magounak
4c95e295d1 Merge branch 'ru_rau_enhancement_L1_renaming' of https://gitlab.eurecom.fr/oai/openairinterface5g into ru_rau_enhancement_L1_renaming 2018-12-10 14:41:25 +01:00
magounak
0dfdf66f8a vcd changes for RU_mask_tx 2018-12-10 14:26:44 +01:00
Raymond Knopp
597519f6ba removed trace 2018-12-10 14:19:54 +01:00
Raymond Knopp
643507634c DCI extraction validated for format 1-0 (273 PRBs) 2018-12-10 14:04:41 +01:00
Sebastian Wagner
f187b0e17c WIP: integrated changes to softmodem, TODO: not sure where to free memory 2018-12-10 10:34:47 +01:00
Raymond Knopp
303a463a4d Merge branch 'nr-polar-encoder-optimizations' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr-polar-encoder-optimizations 2018-12-10 08:19:58 +01:00
Guy De Souza
173801704e Bit reversal.
Working PBCH version
2018-12-07 21:06:16 +01:00
Florian Kaltenberger
826b7304e6 Revert "PBCH new format"
This reverts commit a63c08d37c.
2018-12-07 21:05:57 +01:00
Sebastian Wagner
eb5c33ded1 WIP: Replacing buffers, ldpctest passes, free does not work, TODO: implementation into softmodem 2018-12-07 18:18:17 +01:00
Florian Kaltenberger
e82d61e602 small improvements to UE scope 2018-12-07 17:16:29 +01:00
Florian Kaltenberger
1558d7990b fixing phy_adjust_sync 2018-12-07 17:16:03 +01:00
Robert Schmidt
e389b79818 F1 handlers: Improve error message if RNTI obtained through CU/DU ID differ 2018-12-07 16:32:42 +01:00
Robert Schmidt
58850e3c86 Send F1 UE CONTEXT RELEASE REQ when RRC detects radio failure 2018-12-07 16:31:36 +01:00
Robert Schmidt
6f19bc4b8f Add F1AP_UE_CONTEXT_RELEASE_COMPLETE, tx in DU, correctly rx in CU 2018-12-07 15:49:04 +01:00
Robert Schmidt
ae3ef27059 Move F1 UE ctxt release req to function mac_eNB_rrc_ul_failure() 2018-12-07 15:37:32 +01:00
Robert Schmidt
412caafd31 F1AP_UE_CONTEXT_RELEASE_COMMAND: Implement in DU, don't send COMPLETE 2018-12-07 14:17:33 +01:00
Robert Schmidt
956fafb51c F1AP_UE_CONTEXT_RELEASE_REQUEST/COMPLETE: Implement in CU 2018-12-07 14:16:42 +01:00
Robert Schmidt
707048c551 F1AP_UE_CONTEXT_RELEASE_REQUEST: Handle in CU, don't send CMD 2018-12-07 14:16:18 +01:00
Robert Schmidt
f3f2bc584f F1AP_UE_CONTEXT_RELEASE_REQ: implement in DU
* MAC differentiates between DU/eNB
* sends ITTI message to DU task for F1AP_UE_CONTEXT_RELEASE_REQ
* message is dispatched to correctly in DU_TASK
* sender correctly fills IDs and cause and sends
2018-12-07 14:16:12 +01:00
Raymond Knopp
0ab61e1bab Merge branch 'nr-polar-encoder-optimizations' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr-polar-encoder-optimizations 2018-12-07 11:07:09 +01:00
Raymond Knopp
94b0a687a8 default logging turned off 2018-12-07 11:06:03 +01:00
Guy De Souza
d87e131caf PBCH corrections 2018-12-07 10:47:50 +01:00
Guy De Souza
a63c08d37c PBCH new format 2018-12-07 10:46:11 +01:00
Raymond Knopp
58f1dd5e49 debugging of DCI reception up to extraction of DCI fields in UE.
Merge branch 'nr-polar-encoder-optimizations' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr-polar-encoder-optimizations

Conflicts:
	openair1/PHY/NR_TRANSPORT/nr_dci_tools.c
2018-12-07 08:31:39 +01:00
Florian Kaltenberger
9c1be1b41e Merge remote-tracking branch 'origin/develop-nr' into nr_pdsch 2018-12-06 10:07:40 +01:00
Raymond Knopp
7ad45679a9 gNB DCI encoding output matches UE decoding input. DCI Channel decoding fails in UE. 2018-12-05 19:57:20 +01:00
Clayton Shepard
5832204fe1 Added Iris hardware support.
Signed-off-by: Rahman Doost <doost@rice.edu>
2018-12-05 09:47:15 -06:00
Florian Kaltenberger
fa1ee1b3e9 fixing pbch in phy_scope 2018-12-05 15:01:17 +01:00
Robert Schmidt
d9bf26b9e8 Sort FlexRAN statistics by user before sending 2018-12-05 11:46:54 +01:00
Robert Schmidt
62b89f828a FlexRAN: Circumvent different RRC/MAC layer user ID sorting
* RRC and MAC might sort users differently
* therefore, we have to "reverse lookup" the MAC ID from the RNTI when filling
  user info
* For this purpose, add RAN API function flexran_get_mac_ue_id_rnti()
2018-12-05 11:46:26 +01:00
Raymond Knopp
ee1c5cbdbd pdcch channel estimation in UE is ok (273 PRBs) 2018-12-05 11:44:44 +01:00
Raphael Defosseux
b805cfc628 CI: HTML report improvements
-- typos correction

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-12-04 19:47:44 +01:00
Raphael Defosseux
5012faa105 CI: HTML reporting improvements with bootstrap usage
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-12-04 16:11:02 +01:00
Florian Kaltenberger
718417aaa1 fixing bug in adjust_sync, log cleanup 2018-12-04 08:58:30 +01:00
Raphael Defosseux
81a4d5d3be CI: syntax error
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-12-03 20:28:01 +01:00
Raphael Defosseux
a36c1e4c62 CI: building not testing the flexran controller VM
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-12-03 18:43:32 +01:00
Guy De Souza
5e9af20419 more DCI changes 2018-12-03 18:40:57 +01:00
Guy De Souza
0332a773b1 DCI PDU change 2018-12-03 17:39:41 +01:00
Raphael Defosseux
e6ef20e1f9 CI: missing building code for flexran controller
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-12-03 16:25:02 +01:00
Raphael Defosseux
b474d4a7f3 CI: typo
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-12-03 16:09:36 +01:00
Raphael Defosseux
41343e7119 CI: initial testing on FlexRan integration
-- Connection w/ basic simulator

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-12-03 16:00:34 +01:00
Raymond Knopp
e7c63993d6 changed name of function initial pdcch scheduling parameters. Currently we set the BWP information to be the full bandwidth of the NR cell. This should be changed to include the CellGroupConfigCommon initial BWP information either from SIB or from LTE RRC.
DCI still not updated to start from MSB. Will be in next commit
2018-12-03 12:25:55 +01:00
Florian Kaltenberger
751ad8e925 adding some visuals 2018-12-03 10:21:57 +01:00
Raymond Knopp
d31bf6f962 Merge remote-tracking branch 'origin/develop-nr' into nr-polar-encoder-optimizations
Conflicts:
	openair1/PHY/NR_TRANSPORT/nr_pbch.c
2018-12-03 05:39:46 +01:00
Raymond Knopp
1d97d9cb58 Merge branch 'nr-polar-encoder-optimizations' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr-polar-encoder-optimizations 2018-12-03 04:48:29 +01:00
Raymond Knopp
bacab65171 NR band information
BWP information in NFAPI gNB/UE
dci encoding / decoding integrated
DCI decoding still fails
2018-12-03 04:47:19 +01:00
Florian Kaltenberger
eb381216c8 adding check_crc. to be tested 2018-11-30 16:55:18 +01:00
Florian Kaltenberger
ce264164c8 Merge branch 'nr_mib_fix' into 'develop-nr'
Nr mib fix

See merge request oai/openairinterface5g!461
2018-11-30 15:47:30 +01:00
Florian Kaltenberger
a06671df9c fixing some warnings and bugs. 2018-11-30 15:34:28 +01:00
Wang Tsu-Han
1c025c2dfa Merge branch 'develop' into L1_renaming
Conflicts:
	common/utils/LOG/log.c
	targets/RT/USER/lte-enb.c
	targets/RT/USER/lte-softmodem.c
2018-11-30 14:52:56 +01:00
Guy De Souza
38dc0d8745 Merge branch 'nr_mib_fix' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr_mib_fix 2018-11-30 11:50:53 +01:00
Guy De Souza
31d9cf59df Warning fixes 2018-11-30 11:50:50 +01:00
Guy De Souza
a044ec2627 scrambling fixes gNB/UE 2018-11-30 11:33:43 +01:00
Raphael Defosseux
fb5739dcf7 Merge branch 'develop_integration_w48' into 'develop'
Develop integration 2018 week 48

See merge request oai/openairinterface5g!462

Integration of the following MRs:

 - MR 448: Missing RRC inactivity timer
 - MR 458: Adding MAC main config to RRC connection setup
 - MR 457: Resolving "parallelization not working correctly in phy simulators"
 - MR 460: Fixing RU DFT initialization
2018-11-30 08:03:04 +01:00
Raphael Defosseux
84d66914f0 Removed dead code
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-11-29 21:47:15 +01:00
Florian Kaltenberger
a1c3f6ae47 removing LOG_D again from polar_init.c since polartest does not like it.
adding polartest for DCI to CI
2018-11-29 21:35:20 +01:00
Florian Kaltenberger
6ddb3c57fd minor changes in logs 2018-11-29 17:09:17 +01:00
Florian Kaltenberger
c9e741e0fe Merge remote-tracking branch 'origin/nr-polar-encoder-optimizations' into nr-polar-encoder-optimizations
Conflicts:
	nfapi/open-nFAPI/nfapi/public_inc/fapi_nr_ue_interface.h
2018-11-29 16:52:35 +01:00
Florian Kaltenberger
cceab3e860 cleaning up PBCH procedures 2018-11-29 16:40:00 +01:00
Wang Tsu-Han
f88a43ca60 fixes for getting config by command line 2018-11-29 16:11:58 +01:00
Wang Tsu-Han
e7f0701aa7 fixes for getting config by command line 2018-11-29 16:03:07 +01:00
Raymond Knopp
6868e745f5 compilation of all NR targets, addition of interface for DCI request in NR-UE 2018-11-29 15:53:51 +01:00
Florian Kaltenberger
3ae239a185 Merge remote-tracking branch 'origin/develop-nr' into nr-polar-encoder-optimizations 2018-11-29 10:28:05 +01:00
Florian Kaltenberger
d2df2f00e6 Merge branch 'nr_pdsch' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr_pdsch
Conflicts:
	openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
2018-11-29 10:25:21 +01:00
Florian Kaltenberger
7124e685cc re-activating optimized lpdc encoder 2018-11-29 10:20:38 +01:00
Florian Kaltenberger
eff757f31d resetting num_dci to 0 in PHY 2018-11-29 10:19:47 +01:00
Raymond Knopp
f1774b6c41 removed some logging and warnings 2018-11-28 22:59:29 +01:00
Raymond Knopp
1c68695655 bit endian corrections for a,b sequences in polar encoder/decoder. CRC computations need to be compared to reference models 2018-11-28 22:53:52 +01:00
Raphael Defosseux
5d0fe4cea7 Fixing some compilation errors/warnings
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-11-28 20:31:24 +01:00
Hongzhi
b615147488 minor fix in phy procedures 2018-11-28 20:03:51 +01:00
Raphael Defosseux
0db0249057 Merge remote-tracking branch 'origin/373-parallelization-not-working-correctly-in-phy-simulators-and-bad-implementation-2' into develop_integration_w48
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-11-28 18:27:55 +01:00
Raphael Defosseux
d109ffa112 Merge remote-tracking branch 'origin/hotfix-RU-dft-initialization' into develop_integration_w48 2018-11-28 18:12:32 +01:00
Raphael Defosseux
0d67854ce0 Merge remote-tracking branch 'origin/add-mac_MainConfig-to-RRCConnectionSetup' into develop_integration_w48 2018-11-28 18:10:56 +01:00
Raphael Defosseux
f14023ec16 Merge remote-tracking branch 'origin/374-missing-rrc-inactivity-timer-missing-default-drx-ie-in-s1-setup-ue-s1-id-unknown-after-detach-for-switch-off' into develop_integration_w48 2018-11-28 18:04:34 +01:00
Hongzhi Wang
b1de22736f bug fix for nr_pbchsim compilation issue 2018-11-28 17:19:27 +01:00
Wang Tsu-Han
b25a592ced Merge branch 'develop' into L1_renaming
Conflicts:
	common/utils/LOG/log.c
	targets/RT/USER/lte-softmodem.c
	targets/RT/USER/lte-uesoftmodem.c
2018-11-28 13:51:36 +01:00
Wang Tsu-Han
6aadf8312a Merge branch '373-parallelization-not-working-correctly-in-phy-simulators-and-bad-implementation-2' into L1_renaming 2018-11-28 11:59:31 +01:00
Hongzhi Wang
a7bdbc4d6f activate nr pbch procedure 2018-11-28 10:47:52 +01:00
Hongzhi Wang
c635785097 update dlsch decoding worker threads 2018-11-28 09:57:55 +01:00
Florian Kaltenberger
cc02425681 Merge branch 'nr_pdsch' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr_pdsch 2018-11-28 09:37:16 +01:00
Florian Kaltenberger
2bfbad9275 removed some debug messages. re-activated PDCCH decoding. fixed some warinings. 2018-11-28 09:36:07 +01:00
Florian Kaltenberger
b16cab0884 adding thank you note to Son Dang for valuable contributions and testing 2018-11-28 09:00:02 +01:00
Florian Kaltenberger
24f50d665d Merge branch 'develop-nr' into 'nr_mib_fix'
# Conflicts:
#   targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpn300.conf
2018-11-27 21:58:44 +01:00
Hongzhi Wang
252a1fbc61 Merge branch 'nr_pdsch' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr_pdsch 2018-11-27 15:48:26 +01:00
Hongzhi Wang
37a354a105 revert previous commit for ADRV9371 driver 2018-11-27 15:47:38 +01:00
Raphael Defosseux
15314aebff CI: after fix, adding 10/20MHz testing to IF4p5 scenarios
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-11-27 15:45:36 +01:00
Raymond Knoppp
14e633231b minor change a slave RRU 2018-11-27 12:36:09 +01:00
Raymond Knoppp
6f148b9111 Merge branch 'ru_rau_enhancement_L1_renaming' of https://gitlab.eurecom.fr/oai/openairinterface5g into ru_rau_enhancement_L1_renaming 2018-11-27 12:30:51 +01:00
Raymond Knoppp
d8c35774aa modifications at slave RRU 2018-11-27 12:30:10 +01:00
Raymond Knopp
c7e611ead1 compilation ok. 2018-11-27 12:26:51 +01:00
Raymond Knopp
a24001bfb4 Merge branch 'ru_rau_enhancement_L1_renaming' of https://gitlab.eurecom.fr/oai/openairinterface5g into ru_rau_enhancement_L1_renaming 2018-11-27 12:25:59 +01:00
Raymond Knopp
fb0132e23b minor changes at sirius 2018-11-27 12:21:59 +01:00
magounak
eebb19d9eb added some extra vcd signals 2018-11-27 12:17:39 +01:00
Guy De Souza
1fc33b3bbb TBS calculation fixes 2018-11-27 11:55:11 +01:00
Raymond Knopp
4d934dacfb initializations of dfts for UE (bad order in call to init_dfts from lte_init_ue_signal() ) 2018-11-27 11:26:20 +01:00
Raymond Knopp
ffea699962 change of log level on trace in fapi_l1.c 2018-11-27 11:03:00 +01:00
Guy De Souza
858502c16b MIB decoding fixes UE 2018-11-27 10:23:43 +01:00
Raymond Knopp
134a39fa34 Merge remote-tracking branch 'origin/add-mac_MainConfig-to-RRCConnectionSetup' into enhancement-ltem
Conflicts:
	cmake_targets/CMakeLists.txt
2018-11-26 23:02:29 +01:00
Raymond Knopp
552bd6979d Merge remote-tracking branch 'origin/develop' into enhancement-ltem
Conflicts:
	openair2/RRC/LTE/MESSAGES/asn1_msg.c
2018-11-26 23:01:47 +01:00
Florian Kaltenberger
2810dd50fb Merge remote-tracking branch 'origin/develop-nr' into nr_pdsch 2018-11-26 21:07:48 +01:00
Raymond Knopp
fb5201ba97 initialization of dfts for RU. moved init_dfts out from lte_init_top into lte_init_RU() and lte_init_ue_signal() 2018-11-26 21:02:41 +01:00
Florian Kaltenberger
f0c413e6ae fixed some warnings + minor changes to logs 2018-11-26 20:56:47 +01:00
Raphael Defosseux
814b967cce CI: more T tracer during run
-- RAW record file is parsed and replayed
  -- Replayed log file is parsed instead of normal eNB file during terminate

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-11-26 15:19:01 +01:00
nepes
131986282a removed some logging in UE and tested TM2 reception on Band 20 cells. 2018-11-25 21:22:02 +01:00
Raymond Knopp
5bf45e014a addition of testing procedures for format 1A transmission in dlsim (nb RB > 2 or 3 which is used for TBS calculation).
bugfix in UE receiver (leftover nb_antennas_tx => nb_antenna_ports_eNB)
2018-11-25 18:34:48 +01:00
Raymond Knopp
446fb23eaf intermediate commit 2018-11-24 08:39:05 +01:00
Florian Kaltenberger
5144d1f50b disabling profiling for LDPC decoder as this seems to cause a segfault in ldpctest (although I am pretty sure this fixes just the symptoms and not the real cause) 2018-11-23 16:44:55 +01:00
Florian Kaltenberger
8830833861 Merge branch 'nr_pdsch' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr_pdsch 2018-11-23 14:34:57 +01:00
Florian Kaltenberger
04835cde67 Merge remote-tracking branch 'origin/develop-nr' into nr_pdsch 2018-11-23 14:33:50 +01:00
Raphael Defosseux
f8ccd284a0 Merge remote-tracking branch 'origin/develop' into 374-missing-rrc-inactivity-timer-missing-default-drx-ie-in-s1-setup-ue-s1-id-unknown-after-detach-for-switch-off
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-11-23 14:10:50 +01:00
Florian Kaltenberger
32eb84f120 Merge branch '375-syrtem-sdr-platform' into 'develop-nr'
Resolve "syrtem-sdr-platform"

See merge request oai/openairinterface5g!450
2018-11-23 11:56:27 +01:00
Florian Kaltenberger
c0b9a45ac0 Merge branch 'develop-nr-pucch-validation' into 'develop-nr'
NR development PUCCH bug fixes

See merge request oai/openairinterface5g!454
2018-11-23 11:55:28 +01:00
Hongzhi
fbf0a42c9f ue fix thread id 2018-11-23 10:04:32 +01:00
Florian Kaltenberger
735af150d3 Merge remote-tracking branch 'origin/develop-nr' into develop-nr-pucch-validation 2018-11-23 09:03:50 +01:00
Florian Kaltenberger
b5def5b1ae Merge branch 'nr_pdsch' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr_pdsch 2018-11-22 21:27:04 +01:00
Florian Kaltenberger
f2839eaf8e some fixes in dlschsim + nr_dlsch_decoding 2018-11-22 21:26:06 +01:00
Raphael Defosseux
4f0fd0612a Merge branch 'develop_integration_2018_w47' into 'develop'
Develop integration 2018 week 47

See merge request oai/openairinterface5g!456
2018-11-22 18:02:03 +01:00
Raphael Defosseux
5962870800 CI: adding a LTE-M conf file
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-11-22 15:39:54 +01:00
Raphael Defosseux
55732deb80 Astyling the common files
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-11-22 15:03:27 +01:00
Raphael Defosseux
4fdccd3b4d CI: adding support for T tracing
-- tracing is done w/ a single UE attach / detach
  -- traffic b/ EPC and eNB is captured by tshark

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-11-22 14:28:06 +01:00
Hongzhi
89eb94ecce sdr_addrs commented temporarily for ADRV9371 2018-11-22 09:28:59 +01:00
Raymond Knopp
b89f9284dd adds a mac_MainConfig information element to RRCConnectionSetup. This is to configure PHR reporting during the first part of the Attach procedure. 2018-11-21 20:24:24 +01:00
Louis Adrien Dufrene
ed61d774f6 add test on ue_context 2018-11-21 17:03:52 +01:00
Raymond Knopp
cd07961aa5 intermediate commit 2018-11-21 15:40:30 +01:00
Louis Adrien Dufrene
e77d910398 Macro removed in enb_config.c, but rrc timer thresh still set to 0 (deactivated) 2018-11-21 13:26:12 +01:00
yoshio.inoue
0fb80c0cff Fixed problem that u-plane does not transferr with noS1 in L2 nFAPI Simulator 2018-11-21 11:44:18 +09:00
Louis Adrien Dufrene
cf07c4d394 astyle applied 2018-11-20 16:39:05 +01:00
Louis Adrien Dufrene
d082b50896 add MACRO for timer threshold 2018-11-20 16:19:37 +01:00
hongzhi wang
4a218386fd add missing file for adjust synch 2018-11-20 16:10:12 +01:00
OAI-admin
1094835db1 RRC timer fixed and tested 2018-11-20 15:07:43 +01:00
Louis Adrien Dufrene
c194956da3 RRC timer thres removed from UE context and added to eNB RRC context, value 0 of thres equivalent to infinity 2018-11-20 14:15:50 +01:00
Raphael Defosseux
df5fe4fffd Merge remote-tracking branch 'origin/T-minor-typo-2018-w47' into develop_integration_2018_w47 2018-11-20 13:19:07 +01:00
Raphael Defosseux
00c230ba47 Merge remote-tracking branch 'origin/issue372_loggingdoc' into develop_integration_2018_w47 2018-11-20 13:18:37 +01:00
Raphael Defosseux
c7dbada527 Merge remote-tracking branch 'origin/issue362_getoptions_errorhandling' into develop_integration_2018_w47 2018-11-20 13:10:25 +01:00
Cedric Roux
e6cd6ba21f T: minor: fix typo 2018-11-20 13:03:31 +01:00
hongzhi wang
8e10cd3363 adding adjust sync 2018-11-20 10:03:13 +01:00
Agustin
854c61dffa NR development PUCCH bug fixes 2018-11-20 09:11:56 +01:00
Raymond Knopp
c88d3e062c fixed call to check_band_frequencies in enb_config.c (order was was wrong). 2018-11-19 20:56:49 +01:00
Raymond Knopp
7900864fe4 testing after integration of eMTC 2018-11-19 18:01:36 +01:00
Guy De Souza
6143fc3023 PBCH payload restructuring gNB 2018-11-19 16:14:09 +01:00
Francois TABURET
117e2a145e Update arch.md 2018-11-19 13:20:14 +01:00
Francois TABURET
a86ca81541 Update arch.md 2018-11-19 13:17:23 +01:00
Raymond Knopp
55ed97ebfa correction to include file name. 2018-11-19 12:53:20 +01:00
Raymond Knopp
00fc815cbd Merge remote-tracking branch 'origin/develop-nr' into nr-polar-encoder-optimizations 2018-11-19 12:02:57 +01:00
Francois TABURET
0f0665e9e7 fix broken link 2018-11-19 11:35:37 +01:00
Francois TABURET
884d4b631d fix broken link 2018-11-19 11:34:38 +01:00
Francois TABURET
3df8f96bba fix wrong formatting 2018-11-19 11:30:54 +01:00
frtabu
682be3e2b4 completing logging facility doc 2018-11-19 11:27:43 +01:00
Raymond Knopp
7474b69c29 added missing files. updates for testing in eMTC configuration after merge. 2018-11-19 09:26:03 +01:00
Florian Kaltenberger
6180c752d5 Merge branch 'nr_dlsim' into 'develop-nr'
adding nr_dlsim (doing pdcch for the moment only)

See merge request oai/openairinterface5g!449
2018-11-19 09:13:43 +01:00
Raymond Knopp
6266d5c389 Merge remote-tracking branch 'origin/develop' into enhancement-ltem
Conflicts:
	openair1/PHY/INIT/lte_init.c
	openair1/PHY/LTE_TRANSPORT/dci.c
	openair1/PHY/LTE_TRANSPORT/edci.c
	openair1/PHY/LTE_TRANSPORT/prach.c
	openair1/PHY/LTE_TRANSPORT/transport_eNB.h
	openair1/SCHED/fapi_l1.c
	openair1/SCHED/phy_procedures_lte_eNb.c
	openair2/COMMON/rrc_messages_types.h
	openair2/ENB_APP/enb_config.c
	openair2/LAYER2/MAC/config.c
	openair2/LAYER2/MAC/eNB_scheduler_RA.c
	openair2/LAYER2/MAC/eNB_scheduler_bch.c
	openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
	openair2/LAYER2/MAC/mac.h
	openair2/RRC/LTE/MESSAGES/asn1_msg.c
	openair2/RRC/LTE/rrc_defs.h
	openair2/RRC/LTE/rrc_eNB.c
	openair2/RRC/LTE/rrc_eNB_S1AP.c
2018-11-19 00:43:49 +01:00
Raymond Knopp
246ee327fb rework of configuration for eMTC/Sidelink. Removal of warnings introduced by eMTC code. Validation of configuration component for eMTC and regular LTE. Sidelink is still not configured. 2018-11-18 20:17:18 +01:00
Francois TABURET
220080741e Update devusage.md 2018-11-16 19:31:58 +01:00
Francois TABURET
382981b757 fix broken link 2018-11-16 18:05:54 +01:00
Francois TABURET
2f8c3d6eaa fix broken links 2018-11-16 18:04:49 +01:00
frtabu
00f4890b14 write logging tool documentation 2018-11-16 17:53:51 +01:00
Raphael Defosseux
d7b80ffb13 CI: adding NR DLSCH phy-sim test to build / report
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-11-16 17:23:22 +01:00
Florian Kaltenberger
fd1ca9cff7 fixing a bug in nr_pbch_extract 2018-11-16 17:15:07 +01:00
frobinet
bea2318921 targets/ARCH/ADRV9371_ZC706/SYRTEM_IQ_QuickStart.readme update 2018-11-16 16:16:51 +01:00
Florian Kaltenberger
5daf21683c making things compile again 2018-11-16 15:54:34 +01:00
frobinet
c73a922c8d SYRTEM SDR platform :
- remove size limitation of 307200 in trx_read_func (SYRIQ library)
- update to new openair0 interface  (./targets/ARCH/COMMON/common_lib.h)
- add gNB band22 configuration file (./targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band22.tm1.106PRB.adrv9371zc706.conf)

please read ./targets/ARCH/ADRV9371_ZC706/SYRTEM_IQ_QuickStart.readme for more details
2018-11-16 15:40:32 +01:00
Raphael Defosseux
b09e94542d CI: initial python support for CAT-M devices
-- Works for a Skywire 4G LTE CAT M1 device
     Single-module environment

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-11-16 15:12:55 +01:00
Louis Adrien Dufrene
04a3cda0b2 wrong manipulation had modified lte-enb.c 2018-11-16 11:42:13 +01:00
Louis Adrien Dufrene
bfb65b57f7 astyle applied 2018-11-16 11:36:44 +01:00
Florian Kaltenberger
6bebff3681 Merge remote-tracking branch 'origin/develop-nr' into nr_pdsch
Conflicts:
	openair1/SCHED_NR/fapi_nr_l1.c
	openair1/SCHED_NR/fapi_nr_l1.h
2018-11-16 11:24:58 +01:00
hongzhi wang
667543b6df Merge branch 'nr_pdsch' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr_pdsch 2018-11-16 10:21:07 +01:00
hongzhi wang
dd55d0f628 pdsch unscrambling fix 2018-11-16 10:20:11 +01:00
Louis Adrien Dufrene
6a3687fe28 astyle applied 2018-11-16 10:15:30 +01:00
Louis Adrien Dufrene
700437f184 astyle applied 2018-11-16 08:49:28 +01:00
Florian Kaltenberger
e2fceb52e7 adding nr_dlsim (doing pdcch for the moment only) 2018-11-15 22:25:53 +01:00
Louis Adrien Dufrene
22e44306f8 RRC inactivity timer deactivated 2018-11-15 13:28:59 +01:00
Louis Adrien Dufrene
0cf8515882 Merge branch 'DRX_develop' into 374-missing-rrc-inactivity-timer-missing-default-drx-ie-in-s1-setup-ue-s1-id-unknown-after-detach-for-switch-off 2018-11-15 13:22:59 +01:00
Louis Adrien Dufrene
2f11541973 test commit 2018-11-15 13:21:48 +01:00
Hongzhi Wang
7abda1ec4d nr_dlschsim update 2018-11-15 11:57:19 +01:00
hongzhi wang
25e9141e0a missing changes for nr dlschsim 2018-11-15 09:22:50 +01:00
laurent
af892cc058 start fixing parallel threads 2018-11-14 20:51:41 +01:00
hongzhi wang
3b102319f6 make nr_dlschsim compile again 2018-11-14 17:12:17 +01:00
Guy De Souza
fd92827a0f Merge remote-tracking branch 'origin/develop-nr' into nr_mib_fix 2018-11-14 14:42:59 +01:00
Guy De Souza
38793cbca5 scrambling size correction 2018-11-14 12:07:49 +01:00
Guy De Souza
aeceb2484a Merge branch 'nr_pdsch' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr_pdsch 2018-11-14 10:40:52 +01:00
Guy De Souza
1197c561d4 Payload emulation/scrambling update 2018-11-14 10:40:43 +01:00
Raymond Knopp
edeffee62c Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop 2018-11-13 20:24:04 +01:00
hongzhi wang
5f22cfb360 nr ue pdsch bug fix 2018-11-13 18:04:56 +01:00
Louis Adrien Dufrene
9a080adec5 RRC inactivity timer: first commit to DRX_master 2018-11-13 14:20:16 +01:00
Florian Kaltenberger
377bbaef4e Merge branch 'develop-nr-merge2-parallel' into 'develop-nr'
Develop nr merge2 parallel

See merge request oai/openairinterface5g!443
2018-11-13 12:09:58 +01:00
Louis Adrien Dufrene
961a70a04e Fusion wasn't ok, needed some modifications 2018-11-13 11:20:14 +01:00
Louis Adrien Dufrene
a409614185 Merge develop done, conflicts resolved 2018-11-13 10:49:20 +01:00
Louis Adrien Dufrene
287010f82f RRC timer: last format done. Timer reset in scheduling of DTCH (DL/UL). Commit to test. 2018-11-13 10:21:38 +01:00
Florian Kaltenberger
60ae0c15a2 replacing absolute with relative path to save results of ldpctest 2018-11-13 09:25:13 +01:00
Florian Kaltenberger
67bf363d60 making nr_pbchsim compile again 2018-11-12 21:56:51 +01:00
Louis Adrien Dufrene
76e1636258 RRC timer reset in scheduler: format of some functions before first test 2018-11-12 17:38:19 +01:00
Wang Tsu-Han
d849dbd053 putting back variable needed for eNB 2018-11-12 17:12:45 +01:00
Wang Tsu-Han
c9ab59fc4d fixes for misplacing L1_rxtx_proc_t with L1_proc_t 2018-11-12 15:58:56 +01:00
Wang Tsu-Han
a272960353 adding parallel function for nrUE and fixes for commenadline option 2018-11-12 15:22:38 +01:00
Wang Tsu-Han
17bb5db352 renaming change for UE and simulation 2018-11-12 14:48:18 +01:00
Raphael Defosseux
c1f7678e5b Merge branch 'develop_integration_2018_w46' into 'develop'
Develop integration 2018 w46

See merge request oai/openairinterface5g!445
2018-11-12 13:18:04 +01:00
Cedric Roux
18a099fa76 Merge remote-tracking branch 'origin/t-tracer-2018-w46' into develop_integration_2018_w46 2018-11-12 11:04:35 +01:00
Cedric Roux
7c71d8306e Merge remote-tracking branch 'origin/issue370-movesomedocs' into develop_integration_2018_w46 2018-11-12 11:04:19 +01:00
Cedric Roux
f81cf69985 Merge remote-tracking branch 'origin/bladerf-support-fix-2018-w45' into develop_integration_2018_w46 2018-11-12 11:03:49 +01:00
Cedric Roux
d6ce682b56 Merge remote-tracking branch 'origin/issuePHR' into develop_integration_2018_w46 2018-11-12 11:03:04 +01:00
Cedric Roux
4931a300ad T: macpdu2wireshark: run live, limit MIB/SIBs recording, cleanup
A new option -live has been added to run live (ie. like the 'enb' tracer)
and options -live-ip and -live-port to select IP/port of the machine running
the eNodeB.

Some new options to control MIB and SIBs recording have been added.

Some global variables have been removed.
2018-11-12 10:49:20 +01:00
OAI-admin
d3f8f9d65b End of bug fix: S1 id unknown after detach request for switch off in idle 2018-11-12 07:46:32 +01:00
Raymond Knopp
fb65ca001a Merge remote-tracking branch 'origin/develop-nr' into nr-polar-encoder-optimizations 2018-11-11 12:26:27 +01:00
Raymond Knopp
5c2a411a5b added optimized polar decoding to UE DCI processing. Still to be tested. Changed decoder API to return XOR(CRC,rxCRC) which can be used to check for RNTI at receiver. For PBCH it returns 0 on positive CRC, !=0 on CRC mismatch. 2018-11-11 12:24:26 +01:00
Raymond Knopp
2da40731dd Merge branch 'nr-polar-encoder-optimizations' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr-polar-encoder-optimizations
Conflicts:
	openair1/PHY/CODING/TESTBENCH/polartest.c
	openair1/PHY/CODING/nrPolar_tools/nr_polar_encoder.c
	openair1/PHY/CODING/nr_compute_tbs.c
	openair1/PHY/CODING/nr_segmentation.c
	openair1/PHY/INIT/nr_parms.c
	openair1/PHY/NR_TRANSPORT/nr_pbch.c
2018-11-11 09:20:55 +01:00
Raymond Knopp
7a4dc8644c optimized polar encoder/decoder functions for PBCH and 41-bit DCI 2018-11-11 09:07:22 +01:00
Raymond Knopp
7bc96c6158 addition of up to 128-bit polar decoding, tested up to 64-bit 2018-11-10 11:42:41 +01:00
Raymond Knopp
a25d97bc31 added polar encoding for up to 128 bit payloads. Tested with decoder up to 64 2018-11-09 23:55:39 +01:00
Guy De Souza
9364125813 Freq shift correction/Various cleanups 2018-11-09 18:56:19 +01:00
Florian Kaltenberger
bad3c77098 Merge remote-tracking branch 'origin/develop-nr' into develop-nr-merge2-parallel
Conflicts:
	targets/RT/USER/nr-ru.c
2018-11-09 17:03:36 +01:00
WANG Tsu-Han
b6dc14f4e8 adding config file for 80MHz 2018-11-09 16:52:43 +01:00
Wang Tsu-Han
48e7b9be45 adding adjustable sf_ahead 2018-11-09 16:41:59 +01:00
Raphael Defosseux
e278f6e919 Doc: adding functional split
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-11-09 15:50:49 +01:00
Raphael Defosseux
0db8b51ae4 Update FEATURE_SET.md with 5G/NR features 2018-11-09 14:57:27 +01:00
Guy De Souza
42ce8735eb cleanup 2018-11-09 14:51:00 +01:00
Raphael Defosseux
328b6d8075 Update FEATURE_SET.md for the UE features 2018-11-09 14:34:24 +01:00
Raphael Defosseux
767747015a Update FEATURE_SET.md with latest measurements from CI 2018-11-09 14:34:24 +01:00
Florian Kaltenberger
7e58b8610e removing outdated documentation 2018-11-09 14:34:24 +01:00
Konstantinos Alexandris
71daea4cd5 Update FEATURE_SET.md 2018-11-09 14:34:24 +01:00
Raphael Defosseux
270a3e0c8a Adding S1-flex support 2018-11-09 14:34:24 +01:00
Raphael Defosseux
c4b2e961fa Doc: initial commit of feature set document
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-11-09 14:34:24 +01:00
Raphael Defosseux
d00f80b5dd Update FEATURE_SET.md for the UE features 2018-11-09 13:47:28 +01:00
Raphael Defosseux
d8cf8104fb Update FEATURE_SET.md with latest measurements from CI 2018-11-09 13:47:28 +01:00
Florian Kaltenberger
d48c7eaef1 removing outdated documentation 2018-11-09 13:47:28 +01:00
Konstantinos Alexandris
9140839f75 Update FEATURE_SET.md 2018-11-09 13:47:28 +01:00
Raphael Defosseux
e73169a232 Adding S1-flex support 2018-11-09 13:47:28 +01:00
Raphael Defosseux
a803adea2a Doc: initial commit of feature set document
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-11-09 13:47:28 +01:00
Raphael Defosseux
4edc42a4b7 CI: unified VM scripting for option management
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-11-09 13:45:26 +01:00
Raphael Defosseux
01aead2b86 CI: proper description of the phy-sim test-cases
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-11-09 11:55:44 +01:00
hongzhi wang
0e9443880e changes for pdsch test 2018-11-09 09:58:36 +01:00
Francois TABURET
9b4d01f48f Update rtusage.md 2018-11-09 08:42:16 +01:00
Francois TABURET
9db199269d Update struct.md 2018-11-09 08:40:48 +01:00
Francois TABURET
36612d8c5d Update arch.md 2018-11-08 20:27:10 +01:00
Francois TABURET
d49d0b10a6 Update api.md 2018-11-08 20:26:44 +01:00
Francois TABURET
eb6afba809 Update api.md 2018-11-08 20:25:54 +01:00
Francois TABURET
894fc6072c Update rtusage.md 2018-11-08 20:24:27 +01:00
Francois TABURET
91ba760a02 Update loader.md 2018-11-08 20:21:17 +01:00
Francois TABURET
6ce4b9ad66 Update arch.md 2018-11-08 20:18:13 +01:00
frtabu
83dde26914 fix broken links 2018-11-08 20:16:14 +01:00
Francois TABURET
f08ef335b4 fix broken links in telnetusage.md 2018-11-08 19:51:27 +01:00
Francois TABURET
337c068d22 fix broken links in telnetsrv.md 2018-11-08 19:49:41 +01:00
Francois TABURET
95dc47cc07 fix broken link in struct.md 2018-11-08 19:41:36 +01:00
Francois TABURET
d4092a32f9 fix typo.... 2018-11-08 19:40:17 +01:00
Francois TABURET
59a690bb4b fix broken link in addparamset.md 2018-11-08 19:38:38 +01:00
Francois TABURET
a9de514b7c fix broken links in addaparam.md 2018-11-08 19:36:06 +01:00
Francois TABURET
a149d1cbfd fix broken links in api.md 2018-11-08 19:34:07 +01:00
Francois TABURET
ef20881664 fix config doc broken links 2018-11-08 19:32:32 +01:00
Francois TABURET
65fd02b1b6 fix config doc broken links 2018-11-08 19:29:37 +01:00
Francois TABURET
736febd064 fix broken link 2018-11-08 19:26:24 +01:00
Francois TABURET
7df76dfbfc fix config doc broken link 2018-11-08 19:24:01 +01:00
Francois TABURET
c570ad63fe fix config DOC broken links 2018-11-08 19:21:33 +01:00
Raphael Defosseux
ec1fc635c0 CI: normalize IPv4 addresses for scripts
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-11-08 19:15:37 +01:00
frtabu
3515d4316f doc for config module moved from wiki 2018-11-08 19:10:49 +01:00
Guy De Souza
2ff7bfc462 Merge with develop-nr 2018-11-08 16:49:41 +01:00
Guy De Souza
0f897a8c26 UE interleaving pattern 2018-11-08 16:44:51 +01:00
Raphael Defosseux
b4b8db6389 CI: adding support for slave jobs to support non-develop branch targets
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-11-08 16:35:44 +01:00
hongzhi wang
6d760fe41d fix nr ue pdsch 2018-11-08 16:22:52 +01:00
Wang Tsu-Han
e498a37e0d print mark out and adding gtkw file for gnb 2018-11-08 15:23:58 +01:00
Wang Tsu-Han
a0844822d4 fix for multiple RU_TX process 2018-11-08 15:16:25 +01:00
Guy De Souza
66ea7db1b4 Debug clearing 2018-11-08 14:14:53 +01:00
Guy De Souza
603adf6a57 ilv init update 2018-11-08 14:13:35 +01:00
Raphael Defosseux
7c6a5ef288 CI: adding a TM2 - FDD configuration file for testing
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-11-08 13:03:29 +01:00
Raphael Defosseux
03217fbad2 CI: fix HTML reporting for CentOS build
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-11-08 12:42:24 +01:00
Raphael Defosseux
3a294a246a CI: normalize IPv4 addresses for scripts
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-11-08 12:42:23 +01:00
Raphael Defosseux
d2b9f0f4f8 CI: added support for MR target branch other than 'develop'
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-11-08 12:42:14 +01:00
Wang Tsu-Han
bc1abcd86f Merge branch 'develop' into L1_renaming
Conflicts:
	targets/RT/USER/lte-enb.c
2018-11-08 12:16:13 +01:00
Guy De Souza
a0af8180a1 Merge branch 'nr_pdsch' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr_pdsch 2018-11-08 12:02:14 +01:00
Guy De Souza
8f45c70273 DMRS seq slot idx 2018-11-08 12:01:54 +01:00
Wang Tsu-Han
045f2bfd31 unused veriable remove 2018-11-08 11:42:44 +01:00
Guy De Souza
0969177941 ilv j indexes increment 2018-11-08 11:23:42 +01:00
Wang Tsu-Han
5c9b76f1e9 bugfix for parameter passing 2018-11-08 11:09:58 +01:00
Florian Kaltenberger
e1757a8ad9 Merge branch 'nr-ue-loop-memory-fixes' into 'develop-nr'
Nr ue loop memory fixes

See merge request oai/openairinterface5g!439
2018-11-08 10:05:10 +01:00
Raymond Knopp
136ed51512 Merge remote-tracking branch 'origin/develop-nr' into nr-polar-encoder-optimizations
Conflicts:
	openair1/PHY/CODING/nrPolar_tools/nr_polar_decoder.c
	openair1/PHY/CODING/nrPolar_tools/nr_polar_encoder.c
	openair1/PHY/CODING/nr_polar_init.c
2018-11-08 09:41:02 +01:00
Louis Adrien Dufrene
94bf32b0d4 Bug fix: S1 id unknown after Detach Request (need to test) 2018-11-08 08:31:23 +01:00
Florian Kaltenberger
d348c414a8 nr_pbchsim CI improvements 2018-11-07 18:34:56 +01:00
Raphael Defosseux
44fe00d018 CI: unified VM scripting for option management
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-11-07 17:57:01 +01:00
Wang Tsu-Han
8273680d7d bug fix for initialization 2018-11-07 17:40:08 +01:00
Guy De Souza
d5893eeae8 Interleaving init fix 2018-11-07 17:02:01 +01:00
Guy De Souza
b6de2aeaaf MIB interleaving correction 2018-11-07 16:20:38 +01:00
Robert Schmidt
8d862dace4 F1 test: fixes after merge 2018-11-07 16:13:04 +01:00
Robert Schmidt
f3a5720dd9 FlexRAN: Apply slicing configuration if MAC CM present 2018-11-07 16:13:03 +01:00
Robert Schmidt
f0c5f57159 Do not free mem_block in PDCP, it is freed in F1 or RLC 2018-11-07 16:13:03 +01:00
Robert Schmidt
c32094685e Deliver SCTP ITTI messages with instance I 2018-11-07 16:13:03 +01:00
Robert Schmidt
a477043a24 Add some useful LOG statements 2018-11-07 16:13:03 +01:00
Robert Schmidt
6c33f79095 Fix bugs after merge
* F1AP has to read MCC/MNC from list
* Do not stop if MACRLC list is not present in conf, it might be a CU
2018-11-07 16:13:03 +01:00
Robert Schmidt
04126f7bdc Do not compile with mem_block.c 2018-11-07 16:13:03 +01:00
Robert Schmidt
07d9c6a3be Cast malloc() to type 2018-11-07 16:13:03 +01:00
Robert Schmidt
6bd69d6eaa Leave OER support in asn1c enabled
OER can be disable with the switch -DASN_DISABLE_OER_SUPPORT. In F1AP,
disabling OER leads to a typedef void a_type; leading to lots of compilation
errors because of illegal void variable declarations. This commit leaves OER
support enabled, avoiding this error.
2018-11-07 16:13:03 +01:00
Robert Schmidt
397d2f4815 Merge commit 'develop' into feature-127-protocol-split
* remove a lot of white spaces
* many conflicts in enb_config.c
2018-11-07 16:07:59 +01:00
Florian Kaltenberger
eb484b8039 changing n_ssb_crb to n_rb_dl-20 re-centers the SSB and PDCCH and UE can decode PDCCH again 2018-11-07 15:16:01 +01:00
Florian Kaltenberger
bf85f18008 nr_pbchsim will exit when error rate <0.01 2018-11-07 13:28:52 +01:00
yoshio.inoue
11df1684b7 cleanup warnings 2018-11-07 21:04:12 +09:00
Florian Kaltenberger
c8b9ca55b7 nr-uesoftmodem: moving phy_procedures_nrUE into main thread when --loop-memory is used. 2018-11-07 12:00:52 +01:00
desouza
2aca1cdbb7 Merge branch 'develop-nr' into 'nr_pdsch'
# Conflicts:
#   cmake_targets/CMakeLists.txt
2018-11-07 11:16:25 +01:00
Raphael Defosseux
3d845a3708 CI: increasing the phy-sim time-out to 45 minutes
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-11-07 11:06:19 +01:00
Robert Schmidt
c1e680dd89 FlexRAN: free memory of statistics reports 2018-11-07 10:58:09 +01:00
Robert Schmidt
836f6c6374 Include statistics flag only when values are written 2018-11-07 10:54:35 +01:00
Robert Schmidt
f02b539234 Correct init_cont_stats_update(), test for result 2018-11-07 10:54:35 +01:00
Robert Schmidt
2cf4060680 Implement stats_reply-specific destroy function 2018-11-07 10:54:35 +01:00
Robert Schmidt
86d8e21445 Test for CMs before taking CM-specific stats 2018-11-07 10:54:34 +01:00
Robert Schmidt
23650bdea3 Make flexran_agent_handle_stats() respect presence of MAC, RRC CMs 2018-11-07 10:54:34 +01:00
Robert Schmidt
3b3c9daefb Reformat flexran_agent_handle_stats() for better readability 2018-11-07 10:54:34 +01:00
Robert Schmidt
328448e875 Remove flexran_agent_send_update_stats() which is unnecessary 2018-11-07 10:54:34 +01:00
Robert Schmidt
70f74777f3 Correctly implement proto_agent_stop(), call it 2018-11-07 10:54:34 +01:00
Robert Schmidt
920a4abb6d Make link_manager threads joinable
This makes it possible to stop the link_manager by joining its threads.
2018-11-07 10:53:59 +01:00
Robert Schmidt
e71adffcfd Correct logging messages in FlexRAN & PROTO_AGENT 2018-11-07 10:53:52 +01:00
Robert Schmidt
f01c78e532 Set thread names for FlexRAN and PROTO rx_thread 2018-11-07 10:53:52 +01:00
Robert Schmidt
1290552647 Introduce LOG_W logger for PROTO_AGENT 2018-11-07 10:53:52 +01:00
Robert Schmidt
54da66eeac Bugfix: Rename proto_agent global channel variable
The PROTO_AGENT variable holding the channel for various was named as the same
one for FlexRAN. In C, global variables with the same name are merged into one,
which had the effect that the same queues where used for PROTO_AGENT and
FlexRAN, locking the FlexRAN RX thread. Renaming the PROTO_AGENT variable (it
was introduced second) resolves this issue.
2018-11-07 10:53:52 +01:00
Robert Schmidt
eaff77695b Correct malloc in proto_agent_async_channel_info 2018-11-07 10:53:52 +01:00
Robert Schmidt
44b29d04c3 Read config before starting FlexRAN for node_type and ID 2018-11-07 10:53:52 +01:00
Robert Schmidt
0efde02161 Sanitize link_manager interface, correct in FlexRAN/PROTO_AGENT
This commit cleans up the link_manager interface:
* don't provide peer_addr/port in create_link_manager() (for TCP/SCTP it is not
  needed, so in the UDP case in needs to be set explicitly)
* Make FlexRAN connect again (correct hardcoded address)
* Fix FlexRAN: retain the manager pointer
* Fix FlexRAN: store receive_queue pointer
* the link_manager's sender thread passes the correct peer_addr/port for the
  UDP case
2018-11-07 10:48:36 +01:00
Robert Schmidt
34adfd2af8 ASYNC_IF link_{send,receive}_packet(): infer socket type automatically 2018-11-07 10:48:36 +01:00
Robert Schmidt
ec9e70a023 FlexRAN: provide better error messages in async channel 2018-11-07 10:48:36 +01:00
Robert Schmidt
d7948d04b4 Always fill RRC part of ue_config with all parameters 2018-11-07 10:48:36 +01:00
Robert Schmidt
2fa8c29fd4 Put ue_config MAC and RRC parts in resp. CMs 2018-11-07 10:48:36 +01:00
Robert Schmidt
1fc631e2a4 RAN API RRC part: Change interface to RNTI, change flexran_get_aperiodic_cqi_rep_mode()
* the RAN API RRC part now takes rnti and does not look it up in the MAC every
  time again
* the function flexran_get_aperiodic_cqi_rep_mode() has been changed to return
  a proper protobuf variable, not OAI typedef
2018-11-07 10:48:36 +01:00
Robert Schmidt
fdd47e5701 RAN API: add functions for getting UE RNTIs directly from RRC 2018-11-07 10:48:36 +01:00
Robert Schmidt
e0742be747 RAN API flexran_get_num_ues() belongs to MAC, change name 2018-11-07 10:48:36 +01:00
Robert Schmidt
3035781485 Move ue_lc_config message filling into MAC CM 2018-11-07 10:48:36 +01:00
Robert Schmidt
369e89ee2a Create RAN API flexran_get_num_ue_lcs() [no dedicated bearers detection] 2018-11-07 10:48:35 +01:00
Robert Schmidt
89d8afb612 Remove MAC presence checking from scheduler primitives 2018-11-07 10:48:35 +01:00
Robert Schmidt
a7b114c4ec RAN API: Check for MAC presence 2018-11-07 10:48:35 +01:00
Robert Schmidt
fa7168a097 FlexRAN enb_config_reply destroy message update 2018-11-07 10:48:35 +01:00
Robert Schmidt
b702b415a7 Split enb_config_reply->cell_conf message to PHY, MAC, RRC 2018-11-07 10:48:35 +01:00
Robert Schmidt
2623e3f298 Improve interface of FlexRAN RAN API: Return protobuf types
The functions of the RAN API should not return the types of OAI, but protobuf
types. Previously, they would return OAI types and the calling code "marshals"
this into Protobuf type. This commit changes the following functions and
modifies the calling code to directly store the protobuf type:
* flexran_get_hopping_mode()
* flexran_get_phich_resource()
* flexran_get_phich_duration()
* flexran_get_ul_cyclic_prefix_length()
* flexran_get_dl_cyclic_prefix_length()
* flexran_get_duplex_mode() usage
* flexran_get_enable64QAM()
2018-11-07 10:48:35 +01:00
Robert Schmidt
9a2aab34f6 Remove lots of warnings in F1AP 2018-11-07 10:48:35 +01:00
Robert Schmidt
be750619dc Remove warning of uninitialized use in RLC 2018-11-07 10:48:35 +01:00
Robert Schmidt
e8af3bd464 Selectively load FlexRAN CMs depending on BS capability 2018-11-07 10:48:32 +01:00
Robert Schmidt
c81535a8b0 Add FlexRAN PHY CM 2018-11-07 10:40:17 +01:00
Robert Schmidt
391320b992 Simplify PDCP FlexRAN agent interface 2018-11-07 10:40:17 +01:00
Robert Schmidt
5e0088fa52 Simplify RRC FlexRAN agent interface 2018-11-07 10:40:17 +01:00
Robert Schmidt
33d0ac4982 Simplify MAC FlexRAN agent interface 2018-11-07 10:40:17 +01:00
Robert Schmidt
608a14591e Add BS ID and Capabilities to FlexRAN Hello Msg
* Hello msg agent->RTC carries ID and capabilities this agent supports
* RAN API provides ID and capabilities:
    - flexran_get_bs_id()
    - flexran_get_capabilities() // protobuf list of capabilities
    - flexran_get_capabilities() // capabilities as bit mask

Add FlexRAN capabilities mask RAN API function
2018-11-07 10:40:07 +01:00
Robert Schmidt
eb577d11dd Remove warnings in enb_config.c and rrc_eNB.c 2018-11-07 10:26:41 +01:00
Robert Schmidt
1114efad1c Remove capabilities+agent_id from FlexRAN conf/RCconfig_flexran() 2018-11-07 10:26:08 +01:00
Raphael Defosseux
2a48796406 CI: removing obsolete options from CI scenarios
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-11-07 10:16:48 +01:00
Florian Kaltenberger
e9a5ac204d initializing log properly for ulsim 2018-11-07 09:40:17 +01:00
Raymond Knopp
f8d7ce3276 regular LTE functional (simulation) 2018-11-07 00:37:40 +01:00
Cedric Roux
74dc481133 bladeRF: have it functional with libbladerf 2.0
Not much has been changed in the driver (that used libbladerf 1.0).
Some bugs have been fixed. Documentation has been added. A configuration
file has been added too, put in the directory ./configuration/bladeRF.

To use a bladeRF device, see documentation in targets/ARCH/BLADERF/README.

Only the BladeRF x40 has been tested.

Performance is not too bad at 5MHz, a bit worse at 10MHz and on the test
machine I used I face realtime problems at 20MHz when I push downlink
throughput.

So, there is still some work to do to have a good support of bladeRF.
2018-11-06 16:50:48 +01:00
Guy De Souza
0f8bc0ecb2 Print bug fix 2018-11-06 16:11:53 +01:00
Guy De Souza
2665d6b12e Merge branch 'nr_pdsch' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr_pdsch 2018-11-06 15:57:27 +01:00
Guy De Souza
14b98a093a Phytest scheduler log 2018-11-06 15:57:21 +01:00
Hongzhi Wang
568a9b29ad adding dlsch unscrambling 2018-11-06 15:53:02 +01:00
Guy De Souza
63b8be3296 DMRS sequence generation 2018-11-06 15:38:04 +01:00
Wang Tsu-Han
aa232879a3 adding VCD log in file 2018-11-06 15:15:56 +01:00
Guy De Souza
fea11c173e Merge with develop-nr 2018-11-06 14:46:16 +01:00
Raphael Defosseux
0a829e3eeb CI: removing obsolete options from CI scenarios
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-11-06 11:37:49 +01:00
Louis Adrien Dufrene
b8ce24febb add changes to s1ap_eNB.c 2018-11-06 07:42:04 +01:00
Haruki NAOI
7d9898a5bb Merge remote-tracking branch 'remotes/origin/develop' into issue_345_l2_fapi_simulator_new
# Conflicts:
#	openair2/LAYER2/PDCP_v10.1.0/pdcp.c
#	openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
#	openair2/LAYER2/RLC/rlc.c
2018-11-06 15:03:54 +09:00
Florian Kaltenberger
80e0c46bc6 fixing nr_pbchsim dependencies and adding parameter for logging 2018-11-05 21:58:34 +01:00
Florian Kaltenberger
3a8fe0f31d Merge branch 'develop-nr' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-nr 2018-11-05 20:59:40 +01:00
Florian Kaltenberger
737ad46a29 fixing a bug when -d option is not used in nr-uesoftmodem 2018-11-05 20:58:28 +01:00
Florian Kaltenberger
927c3102cd enabling T tracer for dlsim to get control of log messages 2018-11-05 20:57:38 +01:00
Wang Tsu-Han
2c5e5c7a0c print removel and config file chenge back to one RU 2018-11-05 18:41:04 +01:00
frtabu
d151ce6feb Add a parameter to load_configmodule API to allow an exec to specify that it may be run with only command line options 2018-11-05 17:28:00 +01:00
Louis Adrien Dufrene
1c196a9eff rrc inactivity timer reset in RRC Connection Release generation 2018-11-05 16:48:50 +01:00
Guy De Souza
5a98bcd529 type fix 2018-11-05 16:38:13 +01:00
Raphael Defosseux
9d30c9b027 CI: lock mechanism improvement
-- in slave job, the lock is now properly done for the whole job
 -- in master job, all slave jobs are really sent in parallel
    they should now now appear as failed (if fails)
 cherry-picked from develop (47437903f9)

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-11-05 16:11:57 +01:00
Raphael Defosseux
47437903f9 CI: lock mechanism improvement
-- in slave job, the lock is now properly done for the whole job
 -- in master job, all slave jobs are really sent in parallel
    they should now now appear as failed (if fails)

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-11-05 15:33:29 +01:00
Guy De Souza
25094740fb DMRS mapping fix 2018-11-05 15:19:02 +01:00
Wang Tsu-Han
b1a4d4ead4 adding parallel structure 2018-11-05 15:04:32 +01:00
frtabu
df6030540a reduce compilation warnings in noS1 build to try to pass CI 2018-11-05 11:28:25 +01:00
Raphael Defosseux
5eb2bd7d47 CI: fix basic simulator run
cherry-picked from 5d4cde099e

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-11-05 11:07:03 +01:00
Raphael Defosseux
519708b6ec CI: optimization to build incrementally in time
--- cherry-picked from develop-nr (d354ededf4)

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-11-05 11:03:14 +01:00
Florian Kaltenberger
cfef9ef06e Merge branch 'nr-fix-ue-usrp' into 'develop-nr'
Nr fix ue usrp

See merge request oai/openairinterface5g!436
2018-11-05 09:07:33 +01:00
Raymond Knopp
374d00d857 removal of warnings during configuration 2018-11-04 00:03:44 +01:00
Raymond Knopp
b27ed63fa9 lte-softmodem compiles, many memory faults during configuration ... 2018-11-03 22:51:24 +01:00
frtabu
8dd62b32e3 fix bad build_oai directive to compile libconfig for phy-simulators, fix load_configmodule crash because config source not set. 2018-11-02 18:17:11 +01:00
frtabu
18ec5d8047 abort execution when an unknown option is passed via the command line: add config_check_cmdlineopt API to config module, create lte-softmodem-common.c source to remove duplicate code in lte-softmodem.c and lte-uesoftmodem.c, fix segfaults in exec_function of lte-uesoftmodem 2018-11-02 18:17:11 +01:00
magounak
38e9231a53 adding ru_state at ru_thread_tx for RU_mask_tx 2018-11-02 18:06:21 +01:00
Florian Kaltenberger
2811dc7c0d adding params_libconfig to compilation of phy_simulators 2018-11-02 17:31:54 +01:00
Florian Kaltenberger
d7e7d00806 removing use of a default config file 2018-11-02 17:31:54 +01:00
Wolfgang A. Mozart
49f69810e9 removing reference to uesoftmodem from load_configmodule (don't understand why this dependence is there in fist place. Also makes unitary sims break) 2018-11-02 17:31:54 +01:00
Cedric Roux
cf1db86665 Merge remote-tracking branch 'origin/develop_integration_2018_w44' into develop 2018-11-02 17:02:21 +01:00
Louis Adrien Dufrene
1bb53286bb Bug fixed: S1 setup requst sends the correct default DRX value 2018-11-02 16:23:32 +01:00
Florian Kaltenberger
02e8dac00b Merge branch 'develop-nr-merge2' into 'develop-nr'
Merging develop into develop-nr

See merge request oai/openairinterface5g!433
2018-11-02 15:49:14 +01:00
Florian Kaltenberger
53417ed1ab init dumpframe, phy_scope_ue during initial_sync, fixes to loop_through_memory 2018-11-02 15:18:58 +01:00
Wolfgang A. Mozart
ec4429c171 gNB: making n_ssb_crb a function of n_rb_dl (this should become a config paramerter later)
nr-UE: bugfixes
pbchsim: adding options to input/output signal files
2018-11-02 13:46:46 +01:00
yoshio.inoue
64b395c64a Fixed overflow related to oip generation 2018-11-02 19:28:15 +09:00
Raphael Defosseux
b687376fd1 CI: increasing timeout for phy-sim tests to 30 minutes
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-11-02 10:38:16 +01:00
Cedric Roux
9b8e4e4cbe Merge remote-tracking branch 'origin/update-asn1c-0a7524184f16e7093990a31d8d4db487a16e5782' into develop_integration_2018_w44 2018-11-02 10:31:45 +01:00
Cedric Roux
d89bfa72a0 Merge remote-tracking branch 'origin/T-fixes-w43' into develop_integration_2018_w44 2018-11-02 10:31:21 +01:00
Cedric Roux
e46031fec7 Merge remote-tracking branch 'origin/T-tracer-macpdu2wireshark_w43' into develop_integration_2018_w44 2018-11-02 10:31:04 +01:00
Cedric Roux
e4b0b3a7d6 Merge remote-tracking branch 'origin/multi-ue-fix-w42' into develop_integration_2018_w44 2018-11-02 10:30:47 +01:00
Cedric Roux
355f47fb1e Merge remote-tracking branch 'origin/develop-adding-prefix-to-LTE-RRC' into develop_integration_2018_w44 2018-11-02 10:30:35 +01:00
Cedric Roux
28b0c07df7 Merge remote-tracking branch 'origin/359-dlsim-performance-counters' into develop_integration_2018_w44 2018-11-02 10:30:19 +01:00
Cedric Roux
a7cf0cfa1f Merge remote-tracking branch 'origin/352-support-for-n300' into develop_integration_2018_w44 2018-11-02 10:30:01 +01:00
Cedric Roux
633534c2f0 T: extract: add time and count criteria 2018-11-02 09:50:45 +01:00
yoshio.inoue
3ec3a1af34 Add comment 2018-11-02 16:55:13 +09:00
yoshio.inoue
e13c962d24 Fixed bug that u-plane is not transferred with multiple UEs 2018-11-02 16:54:19 +09:00
Wolfgang A. Mozart
cf8b9fed4f adding correlation output to scope 2018-11-01 16:51:01 +01:00
Wolfgang A. Mozart
00c32c90d7 adding phy_scope to UE
bugfixes
2018-11-01 16:50:41 +01:00
Wang Tsu-Han
818b27c1f8 renaming for gNB 2018-10-31 18:18:51 +01:00
Raymond Knopp
2aae8723ab ulsim is functional 2018-10-31 17:46:04 +01:00
OAI-admin
6ae27efac0 minor update in format, variable ctxt removed in rrc_eNB_free_UE() 2018-10-31 16:24:29 +01:00
magounak
85b6f0183a changes at wakeup_L1s() for RU_mask 2018-10-31 15:45:22 +01:00
Cedric Roux
a46443b2a9 T: textlog: add option to dump 'raw time'
'raw time' is the tv_sec element in the struct tm
as returned by 'localtime'.

This can be useful to extract events from a dump based on their time.
2018-10-31 12:07:16 +01:00
Guy De Souza
588a01d5ac DMRS idx fix 2018-10-31 11:05:50 +01:00
Raphael Defosseux
7dbcd1ffb5 CI: adding back all FDD/TDD tests for basic-simulator
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-10-31 10:58:44 +01:00
root
bba23c7814 Merge remote-tracking branch 'eurecom_gitlab/develop' into DRX_develop 2018-10-31 08:08:30 +01:00
magounak
470c664f93 Changes after the merge with L1_renaming in order to work at least in FDD mode. We need to handle the RU_mask_tx for TDD mode. 2018-10-30 19:14:34 +01:00
Guy De Souza
f18e6e42ab Payload fixing 2018-10-30 18:17:53 +01:00
Florian Kaltenberger
d81cd6dab7 replacing nr_tti with nr_subframe 2018-10-30 18:02:45 +01:00
Wang Tsu-Han
12b81a5b77 fixes after the raneming of eNB_proc_t and eNB_rxtx_proc_t 2018-10-30 17:29:20 +01:00
Florian Kaltenberger
915d69ae52 removing write_output and printf for real-time performance 2018-10-30 17:25:44 +01:00
Florian Kaltenberger
4929acc0fb removing unused duplicate file 2018-10-30 17:25:10 +01:00
Guy De Souza
a66a1cf772 Write to file debug 2018-10-30 17:14:57 +01:00
Guy De Souza
3a072ba378 Number of mod symbols addition in fapi 2018-10-30 16:52:29 +01:00
Raphael Defosseux
5d4cde099e CI: fix basic simulator run
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-10-30 16:07:33 +01:00
Guy De Souza
065b24e507 Scheduling subframe change 2018-10-30 14:46:39 +01:00
Raphael Defosseux
3fa0f5a93f CI: workaround to allow running slave jobs from develop-nr
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-10-30 14:18:49 +01:00
Raphael Defosseux
d354ededf4 CI: optimization to build incrementally in time
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-10-30 12:26:05 +01:00
Guy De Souza
a5d187885f mapping fix 2018-10-30 12:08:32 +01:00
Guy De Souza
a81ec38466 Debug info 2018-10-30 12:00:18 +01:00
yilmazt
1da3a24c41 Warning removals. 2018-10-30 11:25:50 +01:00
Guy De Souza
fbca3fa675 NR transport init fix 2018-10-30 11:09:13 +01:00
Guy De Souza
9a45167bd2 New mallocs for dlsch struct 2018-10-30 10:42:31 +01:00
Guy De Souza
e7ff833751 Missing cast 2018-10-30 09:39:42 +01:00
Florian Kaltenberger
a3c7644992 adding thread config to gNB 2018-10-29 21:37:39 +01:00
Florian Kaltenberger
99069f4a0d updating eNB_usrp.gtkw 2018-10-29 12:51:03 -07:00
Florian Kaltenberger
d4ae319f9f adding some error checks on trx_read 2018-10-29 12:50:58 -07:00
Guy De Souza
5e3fb991e2 type fix 2018-10-29 18:42:27 +01:00
Raymond Knopp
007b003d0c dlsim functional after develop->enhancement-ltem 2018-10-29 18:33:02 +01:00
Guy De Souza
f3159e6884 nsymbs 2 2018-10-29 16:17:56 +01:00
Guy De Souza
25e9f02e8c n_symbs update 2018-10-29 16:13:19 +01:00
Guy De Souza
afd3481698 Debug info 2018-10-29 15:58:10 +01:00
Florian Kaltenberger
d9c721fb90 Merge branch 'nr_pbchsim' into 'develop-nr'
Nr pbchsim

See merge request oai/openairinterface5g!431
2018-10-29 14:58:31 +01:00
Guy De Souza
8855ca03d3 new scheduling params 2018-10-29 14:36:12 +01:00
Guy De Souza
fe0ae01419 Write to file removals 2018-10-29 12:25:43 +01:00
Guy De Souza
8596ae69e8 Subframe 0 Tx 2018-10-29 12:22:40 +01:00
Guy De Souza
1c2c853b8e DCI alloc fix 2018-10-29 12:21:32 +01:00
magounak
5ac4ced133 Merge branch 'ru_rau_enhancement-external-timing' of https://gitlab.eurecom.fr/oai/openairinterface5g into ru_rau_enhancement_L1_renaming 2018-10-29 12:15:29 +01:00
magounak
36a92f4614 renaming eNB_proc_t -> L1_proc_t and eNB_rxtx_proc_t -> L1_rxtx_proc_t 2018-10-29 12:11:07 +01:00
Raymond Knoppp
55d2ef72e5 Merge branch 'ru_rau_enhancement-external-timing' of https://gitlab.eurecom.fr/oai/openairinterface5g into ru_rau_enhancement-external-timing 2018-10-29 12:08:08 +01:00
Raymond Knoppp
4f7b4d5bdc minor changes at aquila 2018-10-29 12:07:16 +01:00
Raphael Defosseux
6bc86f88b3 CI: executable has moved for python script
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-10-29 12:05:39 +01:00
Raymond Knopp
18fb29eca4 minor changes at sirius 2018-10-29 12:05:01 +01:00
Raphael Defosseux
63cb7dd5b5 CI: missing log files in zip for artifact
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-10-29 11:02:00 +01:00
Raphael Defosseux
0ecbefd213 CI: disabled all but FDD-5MHz on basic simulator
fixed pipeline syntax

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-10-29 10:16:52 +01:00
Raphael Defosseux
ba41a46099 Merge branch 'nr_pbchsim' into develop-nr-merge2 2018-10-29 10:08:16 +01:00
Raphael Defosseux
915113ab54 CI: fix scripting for physical simulators
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-10-29 09:15:44 +01:00
Raymond Knopp
d24f521a5a Merge remote-tracking branch 'origin/develop' into enhancement-ltem
Conflicts:
	openair1/PHY/INIT/lte_init.c
	openair1/PHY/LTE_ESTIMATION/lte_ul_channel_estimation.c
	openair1/PHY/LTE_TRANSPORT/dci.c
	openair1/PHY/LTE_TRANSPORT/dci_tools.c
	openair1/PHY/LTE_TRANSPORT/dlsch_coding.c
	openair1/PHY/LTE_TRANSPORT/edci.c
	openair1/PHY/LTE_TRANSPORT/if4_tools.c
	openair1/PHY/LTE_TRANSPORT/prach.c
	openair1/PHY/LTE_TRANSPORT/print_stats.c
	openair1/PHY/LTE_TRANSPORT/pucch.c
	openair1/PHY/LTE_TRANSPORT/transport_eNB.h
	openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c
	openair1/PHY/LTE_UE_TRANSPORT/transport_proto_ue.h
	openair1/PHY/impl_defs_lte.h
	openair1/SCHED/fapi_l1.c
	openair1/SCHED/phy_procedures_lte_eNb.c
	openair2/COMMON/rrc_messages_types.h
	openair2/ENB_APP/enb_config.c
	openair2/ENB_APP/enb_paramdef.h
	openair2/LAYER2/MAC/config.c
	openair2/LAYER2/MAC/defs.h
	openair2/LAYER2/MAC/eNB_scheduler.c
	openair2/LAYER2/MAC/eNB_scheduler_RA.c
	openair2/LAYER2/MAC/eNB_scheduler_bch.c
	openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
	openair2/LAYER2/MAC/eNB_scheduler_primitives.c
	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
	openair2/LAYER2/MAC/pre_processor.c
	openair2/LAYER2/MAC/rar_tools.c
	openair2/LAYER2/MAC/ue_procedures.c
	openair2/PHY_INTERFACE/IF_Module.c
	openair2/RRC/LITE/rrc_common.c
	openair2/RRC/LTE/L2_interface_ue.c
	openair2/RRC/LTE/MESSAGES/asn1_msg.c
	openair2/RRC/LTE/rrc_eNB.c
	targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
	targets/RT/USER/lte-enb.c
	targets/RT/USER/lte-ru.c
2018-10-29 07:54:17 +01:00
Florian Kaltenberger
a17ccf0646 adding N_RB_DL to nr_init_params, as it is needed in the gNB and the function is shared between gNB and UE. This should be revisited. 2018-10-28 13:09:12 -07:00
Florian Kaltenberger
2b5e9f3bbb fixing --loop-memory options plus a few other things 2018-10-28 13:08:01 -07:00
Florian Kaltenberger
7b5152267a fixing/simplifying slot_fep for single thread, adding support extended CP
removing warnings for --emulate-rf mode, tx_frame now also written to binary file so that it can be read by UE in mode --loop-memory
2018-10-28 13:03:16 -07:00
Raymond Knopp
49d6f33335 renaming eNB_rxtx_proc_t -> L1_rxtx_proc_t 2018-10-28 20:19:39 +01:00
Raymond Knopp
c8e686396f renaming of eNB_proc_t -> L1_proc_t 2018-10-28 19:33:51 +01:00
Raymond Knopp
29c5908731 fixed dlsim/ulsim for L1-renaming 2018-10-28 19:24:19 +01:00
magounak
0da8e5cc4f merge with L1_renaming (RU_mask_tx) 2018-10-28 16:47:50 +01:00
Raymond Knopp
c660a1e5be made original polar encoder/decoder work again in polartest. 2018-10-28 15:00:16 +01:00
magounak
872839d1e7 minor changes at wakeup_txfh 2018-10-28 14:33:47 +01:00
Guy De Souza
2733425f56 HARQ PDU malloc 2018-10-28 14:22:16 +01:00
Raymond Knopp
df8b32b8ea fast polar encoder functional only for 32-64 bit input (B, payload+crc) 2018-10-28 14:14:58 +01:00
Wolfgang A. Mozart
411d0d6ef0 fixing lots of warnings, but nr-uesoftmodem still crashes 2018-10-27 18:02:17 +02:00
Wolfgang A. Mozart
3545e13947 removing dependence on nr from dlsim 2018-10-27 16:43:35 +02:00
Wolfgang A. Mozart
6ef81eea66 removing reference to uesoftmodem from load_configmodule (don't understand why this dependence is there in fist place. Also makes unitary sims break) 2018-10-27 16:35:04 +02:00
Wolfgang A. Mozart
6d1aae61a8 adding support for USRP to nr-uesoftmodem 2018-10-27 15:26:36 +02:00
Florian Kaltenberger
863e3abf09 Merge branch 'nr_pbchsim' into develop-nr-merge2 2018-10-27 01:47:19 -07:00
Florian Kaltenberger
20c1746666 fixing linking order of nr_pbchsim 2018-10-26 14:01:26 -07:00
Florian Kaltenberger
4bc8c6aaa0 Merge branch 'nr_pbchsim' into develop-nr-merge2 2018-10-26 11:59:35 -07:00
Florian Kaltenberger
5b939f68f3 fixing autotests for nr_pbchsim 2018-10-26 11:34:37 -07:00
Wang Tsu-Han
1d24208370 bug fix for RU_mask_tx 2018-10-26 17:33:46 +02:00
Wang Tsu-Han
265f110691 using mask for ru_thread_tx 2018-10-26 16:49:50 +02:00
Guy De Souza
ff85313978 Transport init 2018-10-26 16:33:09 +02:00
magounak
37df6df9c3 minor fixes after merging with L1_renaming 2018-10-26 16:32:23 +02:00
Florian Kaltenberger
fcca13996e fixing compilation of nr-uesoftmodem 2018-10-26 07:29:23 -07:00
magounak
bc2ee09774 Merge remote-tracking branch 'origin/L1_renaming' into ru_rau_enhancement_L1_renaming 2018-10-26 14:49:44 +02:00
magounak
42687dfec1 changes at wakeup_rxtx for the RU mask 2018-10-26 13:44:50 +02:00
Y_Tomita
bb7d63e97e Fix timing setting in L2 FAPI simulator. 2018-10-26 18:07:03 +09:00
Florian Kaltenberger
913dfefd70 adding nr_pbchsim to testcaselist. 2018-10-26 01:51:18 -07:00
Guy De Souza
ddccc3d280 minor fix 2018-10-26 10:45:29 +02:00
Florian Kaltenberger
a4ee904009 bugfix: nr_init_ue.c was still using symbols_per_tti at some places, which was 0 2018-10-26 01:36:41 -07:00
Florian Kaltenberger
c27f0f2232 Merge remote-tracking branch 'origin/develop-nr' into nr_pbchsim 2018-10-26 00:58:32 -07:00
Florian Kaltenberger
47df7e51d4 Merge branch 'nr_pbchsim' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr_pbchsim 2018-10-26 00:57:36 -07:00
root
266645d98d Minor corrections, compilation ok 2018-10-26 09:50:01 +02:00
Raymond Knopp
123f874561 addition of initialization of first two polar encoder tables (up to rate matching) 2018-10-26 08:33:25 +02:00
Louis Adrien Dufrene
78051a314a RRC inactivity timer on RRC connection setup: to be tested 2018-10-26 08:14:47 +02:00
Guy De Souza
d0b86ede3c dlsch struct fix 2018-10-26 05:42:45 +02:00
Guy De Souza
541e43d94e transport init fix 2018-10-26 04:52:12 +02:00
Raymond Knopp
7d03e935a6 added crcmask and removed some warnings 2018-10-26 01:57:02 +02:00
Raymond Knopp
c5c3c325f0 added all optimizations except rate matching for N=512 polar-encoder. 2018-10-26 01:40:31 +02:00
Raymond Knopp
6f38c94d7b error statistics for nr_pbchsim 2018-10-25 23:17:42 +02:00
Raymond Knopp
d7c71252f0 nr_pbchsim: added -I option which runs initial synchronization. without, it just runs pbch decoding
Still a remaining issue with the SNR normalization, way too low to get errors.
2018-10-25 22:50:35 +02:00
Guy De Souza
952ccec17d scheduler corrections 2018-10-25 19:55:48 +02:00
Wang Tsu-Han
de32c38987 applying new mechanism for communication between threads 2018-10-25 17:48:07 +02:00
Louis Adrien Dufrene
a321e160cf rrc inactivity timer created, S1 ue context release request sent on timeout, timer set at RRC connection complete reception 2018-10-25 16:03:38 +02:00
Y_Tomita
dcfe6b32e2 Fix for TDD L2 FAPI simulator. 2018-10-25 22:10:57 +09:00
Y_Tomita
b60e861b14 Add --musim option for L2 FAPI simulator. 2018-10-25 22:09:33 +09:00
Guy De Souza
b0b5068e1d ULSCH struct assertion 2018-10-25 14:29:08 +02:00
Guy De Souza
64b361aa4a Minor fixes 2018-10-25 14:18:10 +02:00
Florian Kaltenberger
aff8b57cce adding support for N300 to gNB config 2018-10-25 04:28:24 -07:00
Florian Kaltenberger
83e9908adb merging develop with develop-nr 2018-10-25 03:15:09 -07:00
Guy De Souza
6de60def68 L2 interface changes 2018-10-25 10:54:08 +02:00
Bi-Ruei, Chiu
342972c2ea Update asn1c to commit 0a7524184f16e7093990a31d8d4db487a16e5782
Fix the problem that duplicate type names exist in OPEN TYPE.

The following excerpt of ASN.1 of X2AP is one example.

  HandoverRequestAcknowledge-IEs X2AP-PROTOCOL-IES ::= {
    { ID id-Old-eNB-UE-X2AP-ID  CRITICALITY ignore  TYPE UE-X2AP-ID  PRESENCE mandatory}|
    { ID id-New-eNB-UE-X2AP-ID  CRITICALITY ignore  TYPE UE-X2AP-ID  PRESENCE mandatory}|
    ...
  }
2018-10-25 10:59:13 +08:00
Raymond Knopp
8d78c0c98f Changes:
0. unwiring of 40 MHz channel hard-coding and general SSB location
1. PSS dynamic range improvement and DC carrier fix
2. SSS channel estimation and detection corrected
3. PBCH channel estimation fixed
4. PBCH channel extraction/compensation reworked for the general case
5. fixed-point low-complexity polar decoder integrated to PBCH decoding chain

works by default (nr_pbchsim) at 100 MHz / 30 kHz SCS and SSB wherever (but known to UE)
2018-10-25 02:32:47 +02:00
Florian Kaltenberger
d85d0af2ed Merge branch 'nr_pdcch' into 'develop-nr'
Nr pdcch

See merge request oai/openairinterface5g!427
2018-10-24 21:30:22 +02:00
Wang Tsu-Han
2104817a50 name changing for L1 2018-10-24 16:07:21 +02:00
Y_Tomita
cfab313905 Remove a change about rrc_sdu_length.(because I don't know this modification is correct or not.) 2018-10-24 19:24:16 +09:00
Y_Tomita
fd1054598d Change the conditional expression about init_eNB and add comment. 2018-10-24 19:14:00 +09:00
Y_Tomita
9e1f39ffec Add comments. 2018-10-24 18:58:05 +09:00
Y_Tomita
0b55ecab37 Fix lack of initialize a valuable. 2018-10-24 18:44:18 +09:00
Y_Tomita
66dad294a5 Change define NUMBER_OF_UE_MAX to avoid unexpected access. 2018-10-24 18:26:24 +09:00
Florian Kaltenberger
f755654918 Merge branch 'develop-nr' into nr_pdcch 2018-10-24 02:06:20 -07:00
Florian Kaltenberger
861f8107ba Merge branch 'develop-nr-ci' into 'develop-nr'
adding Test FDD - Band 7 - B210 to CI

See merge request oai/openairinterface5g!424
2018-10-24 10:52:27 +02:00
Guy De Souza
4ff649ac2b Merge with develop-nr 2018-10-24 10:33:09 +02:00
Y_Tomita
58c6520218 Remove a change about MSG2 and MSG4 because this is used not only in L2 FAPI simulator but also in real eNB. 2018-10-24 10:00:33 +09:00
Y_Tomita
f7bf5905a0 Refactoring for L2 FAPI simulator. 2018-10-24 09:48:09 +09:00
Cedric Roux
f6f6570d6e T: minor: don't abort() in textlog.c
This leads to some logs missing in some situations.
Plus it's not user-friendly.
2018-10-23 18:05:40 +02:00
Cedric Roux
387b4ff215 T: fix compilation of tracers
If you run 'make' in common/utils/T/tracer
just after a clone of the repository then the
compilation will fail because the file ../T_IDs.h
was not generated.

Let's add a simple dependency to fix this.
2018-10-23 18:03:22 +02:00
Cedric Roux
bbacffa7fd T: T_messages.txt: create a new group 'WIRESHARK'
It is to ease the life of people wanting to record traces to be
consumed later on by wireshark.

You just run: ./record -d ../T_messages.txt -o /tmp/record.raw -on WIRESHARK
and you're good.
2018-10-23 17:32:36 +02:00
Louis Adrien Dufrene
2966cdf1c0 Format rrc_eNB_send_S1AP_UE_CONTEXT_RELEASE_REQ() 2018-10-23 17:12:45 +02:00
Louis Adrien Dufrene
57a383e77c Format rrc_eNB_process_S1AP_UE_CONTEXT_RELEASE_COMMAND() and rrc_eNB_free_UE() 2018-10-23 16:51:55 +02:00
Cedric Roux
9a6d30d716 T: macpdu2wireshark: cleanup
- factorize
- harmonize
- simplify
2018-10-23 16:39:04 +02:00
Louis Adrien Dufrene
2e5ae1eac6 Format of function rrc_rx_tx() 2018-10-23 16:20:14 +02:00
Cedric Roux
35a7e3a180 T: macpdu2wireshark: add RA preamble and RAR tracing 2018-10-23 16:08:29 +02:00
Florian Kaltenberger
725ba5ec07 adding Test FDD - Band 7 - B210 to CI 2018-10-23 06:28:55 -07:00
Robert Schmidt
9d2637557c Add BS capability protobuf message in FlexRAN 2018-10-23 14:59:19 +02:00
Robert Schmidt
5e1f344199 Add Disconnect protobuf message description in FlexRAN 2018-10-23 14:58:30 +02:00
Florian Kaltenberger
1e5c9313f2 update README.txt 2018-10-23 04:52:47 -07:00
Florian Kaltenberger
f841174fce Merge branch 'develop-nr' into nr_pbchsim 2018-10-23 04:49:42 -07:00
Guy De Souza
79c8d93228 ceil/round macros- TBS calculation corrections 2018-10-23 12:14:40 +02:00
Y_Tomita
f39f321d3b Compiling error fix. 2018-10-23 18:50:46 +09:00
Cedric Roux
fdb16fae7d T: macpdu2wireshark: add SIBs tracing
Only schedule_SI is done, not schedule_SIB1_BR and not schedule_SI_BR.
2018-10-23 10:19:51 +02:00
Y_Tomita
6d97a7358b Add sudo to enable init_nas_S1. 2018-10-23 15:31:13 +09:00
Y_Tomita
35e81d8a66 Add virtual NIC setting for L2 FAPI simulator. 2018-10-23 15:28:04 +09:00
Y_Tomita
31d6783d60 Modify setting of new_sdu_p->data->inst to avoid unexpected setting in case of UE. 2018-10-23 15:23:11 +09:00
Louis Adrien Dufrene
a073e84369 Merge remote-tracking branch 'eurecom_gitlab/develop' into DRX_develop 2018-10-23 08:00:00 +02:00
Y_Tomita
6404eddfc1 Fix easy mistatke. 2018-10-23 13:19:33 +09:00
Y_Tomita
2ed0722544 Changed difinition of some valuables to add initialization. 2018-10-23 13:15:09 +09:00
Y_Tomita
ff312b1b97 Fix to set message_id in VNF.(Failed to commit 2151da7b.) 2018-10-23 12:56:56 +09:00
Florian Kaltenberger
ae3f0f6b2f Merge branch 'nr-emulate-rf' into 'develop-nr'
Nr emulate rf

See merge request oai/openairinterface5g!417
2018-10-22 21:28:21 +02:00
Florian Kaltenberger
5a3b657f58 small fix 2018-10-22 12:27:29 -07:00
Florian Kaltenberger
6bb34495ee Merge remote-tracking branch 'origin/develop-nr' into nr-emulate-rf 2018-10-22 11:58:19 -07:00
Florian Kaltenberger
cf2459dadd Merge branch 'nr-emulate-rf' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr-emulate-rf 2018-10-22 11:56:45 -07:00
Florian Kaltenberger
c43b8acb9c Merge branch 'develop-nr-fix' into 'develop-nr'
adding crcTableInit to make lte-softmodem work again. some code cleanup.

See merge request oai/openairinterface5g!423
2018-10-22 20:52:14 +02:00
Cedric Roux
7b264ac923 T: macpdu2wireshark: add MIB logging
The tracer macpdu2wireshark can send MIBs to wireshark.
This can be disabled by passing the new -no-mib option.

openair1/SCHED/phy_procedures_lte_eNb.c has been modified
to have a new T trace with the MIB.
2018-10-22 17:23:53 +02:00
Florian Kaltenberger
83b3631785 cleaning up some unused code + adding crcTableInit everywhere 2018-10-22 08:23:44 -07:00
Florian Kaltenberger
f32ab81934 more fixes 2018-10-22 07:44:41 -07:00
Hongzhi Wang
8765bd9ab1 adding nr_dlschsim for dlsch coding/decoding 2018-10-22 16:39:59 +02:00
Wang Tsu-Han
d3ed2382da chaning the print out funtion to frame 2 2018-10-22 12:37:06 +02:00
Wang Tsu-Han
b921d3319d Merge branch 'nr-emulate-rf' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr-emulate-rf 2018-10-22 11:15:32 +02:00
Y_Tomita
05fb6c9192 bugfix about MSG4 in L2 FAPI simulator. 2018-10-22 17:59:24 +09:00
Y_Tomita
20a2e83c39 Add multiple UE's L2 FAPI simulator's function. 2018-10-22 17:21:30 +09:00
magounak
4c83082e52 Merge branch 'ru_rau_enhancement-external-timing' of https://gitlab.eurecom.fr/oai/openairinterface5g into ru_rau_enhancement-external-timing 2018-10-22 10:17:34 +02:00
Y_Tomita
eb0ebc588f Add some valuables initialization to avoid unexpected exit. 2018-10-22 16:56:51 +09:00
Florian Kaltenberger
d8a921311f fix to previous commit 2018-10-22 00:55:28 -07:00
Y_Tomita
bf8706d2c0 Modify to keep ulsch_buffer's value. 2018-10-22 16:48:31 +09:00
Y_Tomita
04691fb04c Add checking pdu_index is enough in function of dl_config_req_UE_MAC. 2018-10-22 16:39:44 +09:00
Florian Kaltenberger
703d18988a Merge remote-tracking branch 'refs/remotes/origin/develop-nr' into develop-nr 2018-10-22 00:30:54 -07:00
Florian Kaltenberger
9f699a8b0f deleting some duplicate files 2018-10-22 00:30:25 -07:00
Y_Tomita
da3e4ced9d Fix for TDD's ULSCH HARQ in L2 FAPI simulator. 2018-10-22 16:15:24 +09:00
Y_Tomita
7f826450df Add definition about mutex for multiple UE's L2 FAPI simulator. 2018-10-22 16:09:34 +09:00
Y_Tomita
2b0097a8d4 Add UE's thread ID for L2 FAPI simulator. 2018-10-22 16:01:15 +09:00
Y_Tomita
0e0a04fbc1 Fix for 256UEs. 2018-10-22 15:35:34 +09:00
Raymond Knopp
f43149e1a7 Merge branch 'ru_rau_enhancement-external-timing' of https://gitlab.eurecom.fr/oai/openairinterface5g into ru_rau_enhancement-external-timing 2018-10-22 08:07:23 +02:00
Raymond Knopp
d488ddb6b4 OTA synchronization debugging (phoenix) 2018-10-22 08:06:53 +02:00
Raymond Knoppp
9ec5b6c22f Merge branch 'ru_rau_enhancement-external-timing' of https://gitlab.eurecom.fr/oai/openairinterface5g into ru_rau_enhancement-external-timing 2018-10-22 08:05:40 +02:00
Raymond Knoppp
de284e9e8e OTA synchronization debugging (aquila) 2018-10-22 08:04:21 +02:00
Raymond Knopp
9b3e36a79d debugging of OTA synchronization (sirius) 2018-10-22 08:01:40 +02:00
Y_Tomita
564f2cbfd4 Modify not to assert a part in L2 FAPI simulator because it's possible to differ timing(frame, subframe) between eNB and UE. 2018-10-22 14:43:22 +09:00
Y_Tomita
d9d204a5d3 Modify RRC SDU length is not enough when UE received it. 2018-10-22 14:20:51 +09:00
Y_Tomita
d43dd64b94 Change not to watch timing in MSG2 and MSG4 procedure in L2 FAPI simulator because it's possible to differ timing(frame, subframe) between eNB and UE. 2018-10-22 14:12:41 +09:00
Y_Tomita
f4aa4ee918 Fix for setting of harq_information->harq_information_rel10.tl.tag 2018-10-22 14:06:01 +09:00
Y_Tomita
ac0d6cc1f3 Add NAS initialization in L2 FAPI simulator. 2018-10-22 14:00:47 +09:00
Y_Tomita
2151da7b33 Fix to set message_id in VNF. 2018-10-22 13:47:05 +09:00
Y_Tomita
50df0f683f Temporary Fix: disabling FAPI log to avoid Segmentation Fault. 2018-10-22 13:42:43 +09:00
Y_Tomita
f0274ed337 Modify to use Mod_id = 0 in L2 FAPI simulator's eNB to avoid Segmentation Fault 2018-10-22 13:33:24 +09:00
Y_Tomita
7a755d8df6 Modify not to use initializations of usual test in L2 FAPI simulator. 2018-10-22 13:30:09 +09:00
Y_Tomita
d27a0cbb23 Move initialization of ru pointer before it's accessed. 2018-10-22 13:26:51 +09:00
magounak
d24be4d61f Merge branch 'ru_rau_enhancement-external-timing' of https://gitlab.eurecom.fr/oai/openairinterface5g into ru_rau_enhancement-external-timing 2018-10-21 16:50:20 +02:00
magounak
769992442d deleting prints 2018-10-21 16:46:04 +02:00
Raymond Knopp
22eccb1c2e simulation ok. fixes after merge with develop 2018-10-20 17:46:28 +02:00
Raymond Knopp
b7e0f7c01a Merge remote-tracking branch 'origin/develop' into ru_rau_enhancement-external-timing 2018-10-20 15:37:13 +02:00
Raymond Knopp
bab10e2748 Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop 2018-10-20 15:31:25 +02:00
Raymond Knopp
c8cef9e1fb fixes after merge with develop 2018-10-20 15:30:48 +02:00
Raymond Knopp
506edcaec2 lowered debug level for RF simulator 2018-10-20 09:16:24 +02:00
Florian Kaltenberger
a7518f0557 adding write to file to lte-ru.c 2018-10-19 20:53:50 +02:00
Robert Schmidt
0a4ffade77 Don't malloc() context_t in F1U, stack is sufficient 2018-10-19 18:54:17 +02:00
Wang Tsu-Han
10e432174d modifing emulate-rf write function the same as lte-ru.c 2018-10-19 18:51:15 +02:00
Guy De Souza
4e4850191e temp commit/ not compiling 2018-10-19 17:09:44 +02:00
Florian Kaltenberger
27f58c25b7 Merge branch 'develop-nr-adding-2018-09-asn1-only' into 'develop-nr'
Develop nr adding 2018 09 asn1 only

See merge request oai/openairinterface5g!420
2018-10-19 16:15:00 +02:00
Raymond Knopp
ea11edadb3 Merge remote-tracking branch 'origin/develop' into ru_rau_enhancement-external-timing 2018-10-19 09:50:42 +02:00
Raymond Knopp
5e9da7c54c temporary commit 2018-10-18 23:32:51 +02:00
Robert Schmidt
86fcea8dd5 Call free_mem_block() after sending F1U packet 2018-10-18 16:47:44 +02:00
Cedric Roux
075a713de9 hotfix: fix a problem with multiple UEs
The symptom: when two UEs do uplink traffic at the same time, the
eNB fails to decode data sometimes. This has been seen with FDD
and 50 RBs. This generates a cascade of other problems leading to
disconnection/reconnection events seen in the log.

The problem: there are probably many, but one obvious bug was found
while analyzing some logs. Scheduling in the same TTI one UE's uplink
traffic and random access (msg3) was done in the same RB.

This commit fixes this simple case. It is probably not the end of
the story.

This is a hotfix, that does not change the code much.

We need to use vrb_map_UL properly all over the places. Today is
not used, but this is the way to go (most probably).
2018-10-18 16:42:32 +02:00
Robert Schmidt
5862a10274 Don't spam with some PROTO_AGENT and PDCP messages, correct two other 2018-10-18 09:49:14 +02:00
magounak
f1dbbd08c8 Merge branch 'ru_rau_enhancement-external-timing' of https://gitlab.eurecom.fr/oai/openairinterface5g into ru_rau_enhancement-external-timing 2018-10-17 17:07:08 +02:00
magounak
c8c6b9e9be dumb received signal at slave RRU 2018-10-17 17:02:43 +02:00
magounak
f97c7b952a fixing bugs on dmrs symbol 2018-10-17 16:56:57 +02:00
Bi-Ruei, Chiu
c35867e910 Upgrade ASN.1 of S1AP and X2AP to 15.3.0 2018-10-17 20:37:33 +08:00
Bi-Ruei, Chiu
c7aa94c3fa Upgrade ASN.1 of NR-RRC to 15.3.0 2018-10-17 19:17:20 +08:00
Bi-Ruei, Chiu
99e8dea6d4 Upgrade ASN.1 of LTE-RRC to 15.3.0 2018-10-17 19:17:20 +08:00
Bi-Ruei, Chiu
d4eb822615 Update asn1c to commit d3aed06bb2bec7df1b5c6d0333f8c7dfc5993372
1. Fix the problem of compiling NR_RangeToBestCell.c of NR-RRC 15.3.0
2. Fix the problem that default OCTET/BIT STRING value not used in APER
3. Add support of extension group inside CHOICE type used in LTE-RRC 15.3.0
4. Fix the problem that NGAP 15.0.0 ASN.1 can not generate C files
2018-10-17 16:14:57 +08:00
Bi-Ruei, Chiu
f58ad3c39f Add prefix LTE_ to LTE-RRC generated data types by ASN1C_PREFIX=LTE_
1. Modify all expressions using original LTE-RRC data types for new generated ones
2. Does not change any program logic
2018-10-17 15:46:12 +08:00
Y_Tomita
4249ebbf8b Add function to create pre_scd_thread in case of L2sim. 2018-10-17 10:05:41 +09:00
Y_Tomita
33e8577f94 Fix for problems that L2sim finishes in case of multiple UEs and UE L2sim keeps wating for a signal. 2018-10-17 10:01:05 +09:00
Y_Tomita
53d6f992c9 Fix for problems that eNB keeps waiting for signal of unused thread and eNB_thread_rxtx isn't created. 2018-10-17 09:55:27 +09:00
Y_Tomita
1f4a9f3439 Fix for abnormal exit because L2sim doesn't use pointer of D2D test. 2018-10-17 09:54:08 +09:00
Y_Tomita
1791574de5 Missing RRC_VERSION and sourceL2Id, destinationL2Id. 2018-10-17 09:52:53 +09:00
Y_Tomita
0d58ed224f Change type for 256UEs test , abnormal exit and add definition of UE's thread ID for multiple UEs simulation. 2018-10-17 09:48:15 +09:00
magounak
34f3422b44 fixing generate_ul_ref_sigs() 2018-10-16 14:17:16 +02:00
Wolfgang A. Mozart
006af69782 write out for txdataF_BF and txdata and minor fix for uhd load 2018-10-16 12:26:39 +02:00
Florian Kaltenberger
016185c131 polartest will now create output files in current directory (otherwise it will not run on CI bench) 2018-10-16 01:05:58 -07:00
Florian Kaltenberger
4b1c9d83c8 fixing T_TRACER dependencies in CMakelists.txt 2018-10-15 23:33:23 -07:00
Florian Kaltenberger
471e537d38 adding polartest to CI 2018-10-15 04:32:48 -07:00
laurent
97ac780972 fix test case options style for getopts_long() 2018-10-15 10:39:28 +02:00
Florian Kaltenberger
918d1fd1c0 Merge branch 'polar-decoder-optimizations' into 'develop-nr'
Polar decoder optimizations

See merge request oai/openairinterface5g!413
2018-10-14 22:07:00 +02:00
Raymond Knopp
785b4799d8 Merge remote-tracking branch 'origin/polar-decoder-optimizations' into nr_pbchsim
Conflicts:
	openair1/PHY/NR_UE_TRANSPORT/nr_initial_sync.c
	openair1/PHY/NR_UE_TRANSPORT/nr_pbch.c
	openair1/PHY/defs_NR.h
2018-10-14 13:04:18 +02:00
Raymond Knopp
76ebc5adeb addition of ARM NEON intrinsics 2018-10-14 10:10:56 +02:00
Raymond Knopp
88d5bf42f8 16-bit llr decoder integrated 2018-10-13 16:05:43 +02:00
Raymond Knopp
fa4a73bb1c Merge remote-tracking branch 'origin/develop-nr' into polar-decoder-optimizations
Conflicts:
	cmake_targets/CMakeLists.txt
	openair1/PHY/CODING/TESTBENCH/polartest.c
	openair1/PHY/CODING/nrPolar_init.c
	openair1/PHY/CODING/nrPolar_tools/nr_polar_decoder.c
	openair1/PHY/CODING/nrPolar_tools/nr_polar_decoding_tools.c
	openair1/PHY/CODING/nrPolar_tools/nr_polar_defs.h
	openair1/PHY/CODING/nrPolar_tools/nr_polar_rate_match.c
	openair1/PHY/NR_TRANSPORT/nr_pbch.c
2018-10-13 12:00:35 +02:00
laurent
63d3bf148e a printf with a removed variable in last commit 2018-10-12 19:29:58 +02:00
laurent
bd1c609ca8 issue 359 dlsim CPU measurements 2018-10-12 18:17:57 +02:00
Wang Tsu-Han
26418275e8 adding file log in emulation mode 2018-10-12 14:47:04 +02:00
Agustin
9b3fc8b3d2 Merge branch 'develop-nr-prach-integration' into develop-nr
NR PRACH development integration
2018-10-12 09:18:22 +02:00
Raymond Knopp
2b50af4c21 Merge branch 'polar-decoder-optimizations' of https://gitlab.eurecom.fr/oai/openairinterface4g into polar-decoder-optimizations
Conflicts:
	openair1/PHY/CODING/nrPolar_tools/nr_polar_defs.h
2018-10-12 07:26:31 +02:00
Raymond Knopp
6a2dc297c7 compilation of nr-uesoftmodem fixed (polar_decoder parameter list) 2018-10-12 07:21:05 +02:00
Guy De Souza
291a948312 PDSCH generation start 2018-10-12 02:07:47 +02:00
Hongzhi
a8f94e7a84 Bug fixes 2018-10-11 17:43:41 +02:00
Florian Kaltenberger
ee6239a838 fixing merge 2018-10-11 07:45:54 -07:00
Agustin
dbbc9c41af NR PRACH development integration 2018-10-11 16:03:15 +02:00
yilmazt
97c65436f6 Merge branch 'nr_pdcch' into develop-nr 2018-10-11 15:37:50 +02:00
Raymond Knopp
496eae672e minor changes in initial synchronization 2018-10-11 15:36:48 +02:00
Raymond Knopp
5f30031d29 fixing merge conflict at slave RRU 2018-10-11 15:28:20 +02:00
Raymond Knopp
05ff7b9e0e counter to track sync process at slave RRU 2018-10-11 15:22:37 +02:00
Guy De Souza
434c9b98f5 DLSCH support functions/ physical channel up to layer mapping 2018-10-11 15:09:38 +02:00
magounak
cdb3f2afee deleting logs 2018-10-11 15:07:20 +02:00
Florian Kaltenberger
7240604115 changing default uhd version when installing from source
this is the one that also works with the n310
2018-10-11 06:05:59 -07:00
Florian Kaltenberger
077905a66e undoing previous changes that should not have been committed 2018-10-11 01:14:19 -07:00
Raymond Knopp
a780c31d0a changes to integrate fixed-point polar decoder 2018-10-10 17:19:57 +02:00
Florian Kaltenberger
3bae35c67e Merge branch 'nr_pdsch' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr_pdsch 2018-10-10 03:16:45 -07:00
Florian Kaltenberger
c5e94d9bc3 small fix after merge 2018-10-10 03:16:24 -07:00
Raymond Knopp
80060d9e56 Merge remote-tracking branch 'origin/polar-decoder-optimizations' into nr_pbchsim 2018-10-10 10:32:53 +02:00
Hongzhi Wang
64ae2d5de7 update pdsch dmrs 2018-10-10 09:12:06 +02:00
Raymond Knopp
ffc5faf30a removal of warnings 2018-10-10 08:33:33 +02:00
Florian Kaltenberger
874c165fce WIP 2018-10-09 06:33:09 -07:00
Raymond Knopp
9d9aadd420 more SIMD modifications 2018-10-09 15:08:59 +02:00
Raymond Knopp
22dae457b7 additional SIMD optimizations 2018-10-09 13:32:43 +02:00
magounak
262f221787 Merge branch 'ru_rau_enhancement-external-timing' of https://gitlab.eurecom.fr/oai/openairinterface5g into ru_rau_enhancement-external-timing 2018-10-09 11:36:08 +02:00
magounak
af75d546df fixing bugs for dmrssync 2018-10-09 11:22:16 +02:00
magounak
8649f178d6 fixing bugs for tdd mode 2018-10-09 11:02:27 +02:00
Raymond Knopp
b336ddc630 Merge remote-tracking branch 'origin/develop-nr' into polar-decoder-optimizations 2018-10-09 08:50:59 +02:00
Raymond Knopp
061fb00fea added new polar decoder implementation 2018-10-09 08:46:43 +02:00
Agustin
3f48a5d9ac NR PDCCH development code clean up 2018-10-05 17:39:34 +02:00
Navid Nikaein
fec4f5cd04 Merge branch 'feature-127-protocol-split' of https://gitlab.eurecom.fr/oai/openairinterface5g into feature-127-protocol-split 2018-10-05 17:04:48 +02:00
Navid Nikaein
403db5b544 Fix the issue in sending UE Initial Context Setup Response 2018-10-05 17:03:24 +02:00
Florian Kaltenberger
698dfac070 Merge branch 'nr_pdsch' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr_pdsch 2018-10-05 05:11:42 -07:00
Florian Kaltenberger
bc5cb28d03 fixing nr_mod_table 2018-10-05 05:11:04 -07:00
Agustin
39fd459466 NR PDCCH development warning clean up 2018-10-04 18:03:31 +02:00
Hongzhi Wang
6fc37985b9 update dlsch available bits 2018-10-04 09:55:55 +02:00
Hongzhi Wang
fac57fd7d7 update dlsch coding and decoding 2018-10-04 09:33:45 +02:00
Florian Kaltenberger
5f0feaac51 Merge branch 'nr_pbchsim' into nr_pdsch 2018-10-03 08:40:27 -07:00
hongzhi wang
70e0bba3d7 NR PDCCH development: validation modification dci_nr.c file 2018-10-03 15:31:34 +02:00
hongzhi wang
1f1160ae37 NR PDCCH development: validation modifications 2018-10-03 15:00:17 +02:00
Florian Kaltenberger
eba2c60c7f fixing merge 2018-10-03 02:19:08 -07:00
Raymond Knopp
7aad1584e6 removed logging 2018-10-03 09:31:16 +02:00
Hongzhi Wang
fae74fb8d4 add dlsch llr computation 2018-10-02 09:24:28 +02:00
Florian Kaltenberger
f047570254 Merge branch 'develop-nr' into nr_pdsch 2018-10-01 13:37:58 -07:00
Raymond Knopp
59c4ddef24 completed most of code generation tool for polar decoder integrated into "polartest" 2018-10-01 02:30:29 +02:00
Raymond Knopp
8cda0a0f7b 16-bit integer optimization, reduced memcpy after list sorting 2018-09-30 23:38:07 +02:00
Bing-Kai Hong
be661cce1a turn off debug print with F1AP 2018-09-28 16:44:14 +02:00
Bing-Kai Hong
3d41f5cb03 add msc trace for F1AP 2018-09-28 11:51:11 +02:00
hongzhi wang
41809d5d65 NR PDCCH validation: modifications for pdcch validation 2018-09-27 17:22:53 +02:00
Agustin
cf99ea1937 NR PDCCH development: modifications for interpreting DCI formats 0_1 and 1_1 2018-09-27 15:21:30 +02:00
hongzhi wang
926b7a49d5 NR PDCCH development: polar decoder integration 2018-09-27 14:57:27 +02:00
Guy De Souza
a5a5e85fb5 Merge branch 'nr_pdsch' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr_pdsch 2018-09-27 12:39:28 +02:00
Guy De Souza
fc53139f66 MOdulation order and code rate 2018-09-27 12:39:02 +02:00
Turker YILMAZ
6177e2d881 Update nr_dci.c 2018-09-26 18:07:26 +02:00
Turker YILMAZ
b6b86cce41 Removing #include "SIMULATION/TOOLS/sim.h" in nr_polar_defs.h 2018-09-26 16:20:12 +02:00
yilmazt
34deaae4b8 Working but uncleaned polar_decoder_dci and related code 2018-09-26 16:14:49 +02:00
Raymond Knopp
8b8e6e1209 new data strucure for list management (decoding ok) 2018-09-26 15:04:58 +02:00
Hongzhi Wang
25a84789f7 Merge branch 'nr_pdsch' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr_pdsch 2018-09-26 11:46:02 +02:00
Hongzhi Wang
6a62072c98 nr ue update filler bits 2018-09-26 11:45:06 +02:00
Guy De Souza
6e9bac8b7f Merge branch 'nr_pdsch' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr_pdsch 2018-09-26 11:33:05 +02:00
Guy De Souza
4a6e8b7281 PRB bundling 2018-09-26 11:33:00 +02:00
Hongzhi Wang
e99f23d01d ue adding dlsch deinterleaver 2018-09-26 08:56:50 +02:00
Bing-Kai Hong
c017b8b489 Add handle UE CONTEXT RELEASE message procedure 2018-09-25 17:27:43 +02:00
Bing-Kai Hong
ecd6d673ea Update complete elements with ue context setup response 2018-09-25 16:21:01 +02:00
Bing-Kai Hong
5d8f17f392 Add send UE CONTEXT RELEASE message procedure 2018-09-25 15:36:00 +02:00
Rajeev Gangula
753a664c06 Corrected PHR calculation. 2018-09-25 15:07:22 +02:00
Florian Kaltenberger
0613a01f8d WIP: mostly debug messages 2018-09-25 03:41:04 -07:00
Florian Kaltenberger
8c2df1d34f moving set_default_frame_parms_single() from nr-uesoftmodem to nr_init_ue.c to avoid having to include nr-uesoftmodem.c in the compilation of the nr_pbchsim 2018-09-25 03:39:30 -07:00
Navid Nikaein
374c1087a1 Add some comments 2018-09-25 11:36:36 +02:00
Navid Nikaein
d4f0e50d4f send the S1SP initial context response if it is not sent with the attach complete message 2018-09-25 11:36:36 +02:00
Raymond Knopp
345989a975 remove info traces in PDCP, one still remains 2018-09-25 04:07:52 -04:00
Navid Nikaein
8ab24646f2 Proper setting for dedicated_DRB flag so as to sent the S1AP InitialContextSetupRequest 2018-09-25 07:12:35 +02:00
Bing-Kai Hong
7f70860c24 Fix tag typo of PROTO_AGENT 2018-09-24 17:48:57 +02:00
Wang Tsu-Han
2f66c11db3 adding emulate-rf feature in nr 2018-09-24 15:56:24 +02:00
Navid Nikaein
6d16bf5243 Add log to trace proto_agent pdcp_data_ind operation 2018-09-24 12:32:41 +02:00
Navid Nikaein
e4ac90238e Fix F1-U srb and drb function calls (not tested). 2018-09-24 09:28:57 +02:00
Raymond Knopp
ddb238b808 removal of logging
preparation for UE CONTEXT Release from CU
2018-09-23 18:05:57 -04:00
Raymond Knopp
6bbc81694b Control plane is functional. Still need to handle RRCConnectionRelease in DU 2018-09-23 16:06:40 -04:00
Raymond Knopp
31fe819c7d extra logging 2018-09-23 14:30:37 -04:00
Raymond Knopp
f2c5c0f753 warning removal in rrc_eNB.c 2018-09-23 09:06:39 -04:00
Raymond Knopp
d27e6f21b0 bugfix in F1 module_id handling for transaction idntifiers 2018-09-23 03:11:39 -04:00
Bing-Kai Hong
57755e2773 Check node type for the MAC API calls (find_UE) 2018-09-22 16:44:45 +02:00
Bing-Kai Hong
ba609ca94f Set the RRC status in DU, Reconfigure SRB2, Manage RRC/NAS UL message in DU 2018-09-22 16:01:31 +02:00
Raymond Knopp
f6c28fad62 extra log in F1AP receiver for DL_RRC_MESSAGE_TRANSFER to identify RRC message type 2018-09-22 04:55:57 -04:00
Raymond Knopp
1cf564a74f Merge branch 'feature-127-protocol-split' of https://gitlab.eurecom.fr/oai/openairinterface5g into feature-127-protocol-split 2018-09-22 04:28:48 -04:00
Raymond Knopp
45eda99583 conditions for configuration in DU 2018-09-22 04:28:29 -04:00
Raymond Knopp
ac1496c212 conditions for rlc_config_asn in CU 2018-09-22 04:26:05 -04:00
Raymond Knopp
c43281a7c9 Merge branch 'feature-127-protocol-split' of https://gitlab.eurecom.fr/oai/openairinterface5g into feature-127-protocol-split 2018-09-21 16:46:40 -04:00
Raymond Knopp
876e9efd99 Merge branch 'feature-127-protocol-split' of https://gitlab.eurecom.fr/oai/openairinterface5g into feature-127-protocol-split 2018-09-21 16:39:46 -04:00
Raymond Knopp
5de7f61fd5 monolithic is functional with EPC and COTS UE (full connection) 2018-09-21 16:38:06 -04:00
Bing-Kai Hong
1181790b86 Partially update the node_type check 2018-09-21 22:07:39 +02:00
Raymond Knopp
a1b60957a1 reworking logic for selection of configuration parameters as a function of node (CU/DU/eNB) 2018-09-21 21:19:27 +02:00
Raymond Knopp
360e2e77a9 monolithic ok (RRCConnectionSetupComplete) 2018-09-21 18:07:47 +02:00
Raymond Knopp
1e5f95cd95 fixes for monolithic case. Still doesn't work to RRCConnectionSetup, context allocation problem. 2018-09-21 17:23:08 +02:00
Raymond Knopp
34172c7a4c Merge branch 'feature-127-protocol-split' of https://gitlab.eurecom.fr/oai/openairinterface5g into feature-127-protocol-split 2018-09-21 07:59:04 +02:00
Raymond Knopp
8a11e8dd52 protection of RLC configuration in case of CU 2018-09-21 07:58:25 +02:00
Raymond Knopp
4cdc01384d Merge branch 'feature-127-protocol-split' of https://gitlab.eurecom.fr/oai/openairinterface5g into feature-127-protocol-split
Conflicts:
	cmake_targets/tools/build_helper
2018-09-20 16:25:05 -04:00
Raymond Knopp
05c7681b5a cu machine @ RH 2018-09-20 16:23:35 -04:00
Raymond Knopp
461bfa5fae Merge branch 'feature-127-protocol-split' of https://gitlab.eurecom.fr/oai/openairinterface5g into feature-127-protocol-split 2018-09-20 16:15:20 -04:00
Raymond Knopp
5a8622960e partial removal of warning 2018-09-20 16:13:59 -04:00
Robert Schmidt
a8bd9df3eb Remove local_interface from F1U/UDP parameters 2018-09-20 20:07:01 +02:00
Bing-Kai Hong
0372c9b289 Generate the DCCH and send from pdcp 2018-09-20 19:12:05 +02:00
Bing-Kai Hong
53d741f20d Generate the DCCH and send from pdcp 2018-09-20 18:58:59 +02:00
Robert Schmidt
7ed0aa1d6a Add F1U proto_agent calls, remove old code 2018-09-20 17:13:18 +02:00
Raymond Knopp
dbb42319c2 Merge branch 'nr_pdcch' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr_pdcch 2018-09-20 16:56:46 +02:00
Raymond Knopp
90ccc5034e PBCH debug changes 2018-09-20 16:56:27 +02:00
Wolfgang A. Mozart
36d7f21e1b nr pbch working with format change 2018-09-20 16:41:31 +02:00
Robert Schmidt
eacd1cfbf0 PROTO_AGENT test program changes 2018-09-20 15:03:47 +02:00
Robert Schmidt
b564b116d3 Fix memory leaks in PROTO_AGENT 2018-09-20 15:03:47 +02:00
Robert Schmidt
7f40bf76fb ASYNC_IF: join threads when destroying link manager 2018-09-20 15:03:47 +02:00
Robert Schmidt
4318072bb7 PROTO_AGENT: don't send ACKs, formatting 2018-09-20 15:03:47 +02:00
Robert Schmidt
d94ae11fe0 Add test programs to verify F1U 2018-09-20 15:03:47 +02:00
Robert Schmidt
278fc6d711 Improve PROTO_AGENT
* unified CU/DU in one PROTO_AGENT instance since they are symmetric from UDP POV
* delete a lot of unnecessary code
* better error handling
* can reciprocally send data
2018-09-20 15:03:47 +02:00
Robert Schmidt
f060385b6a Improve UDP support of ASYNC_IF
* peer_addr is now const
* new_link_udp_server() can bind to address or INADDR_ANY
* socket_udp_receive() happens without a loop
* socket_udp_send() happens without a loop
* sending in two packets (first size, then data) is only performed for TCP,
  SCTP, not for UDP anymore (it is unreliable, so we could miss something and
  will receive complete garbage)
2018-09-20 15:03:47 +02:00
ISIP CS/NCTU
c35ab1a239 add 1_0 rnti and test pdu bit 2018-09-20 14:36:49 +02:00
Turker YILMAZ
e785f296d7 Update nr_pbch.c 2018-09-20 11:58:06 +02:00
Florian Kaltenberger
0c66eb8120 adding OFDM modulation 2018-09-20 02:37:36 -07:00
Raymond Knopp
5f758074ef RRCConnectionSetupComplete received in CU! (needed to allocate mem_pool for pdcp. remaining transactions on SRB1 and then SRB2 need to use PDCP (DCCH). 2018-09-20 02:53:26 +02:00
Raymond Knopp
2acdfc14b2 UL_RRC_MESSAGE_TRANSFER correctly received in CU. But : it shouldn't go directly to RRC, it has to go through PDCP via pdcp_data_ind 2018-09-20 02:24:43 +02:00
Raymond Knopp
ac5e8cbdfc UL_RRC_MESSAGE_TRANSFER arrives in CU, which crashes :-( 2018-09-20 02:10:49 +02:00
Raymond Knopp
43def3d76c crashes inside DU_send_UL_RRC_MESSAGE_TRANSFER 2018-09-20 01:38:57 +02:00
Raymond Knopp
7ea6cb25a4 Merge branch 'feature-127-protocol-split' of https://gitlab.eurecom.fr/oai/openairinterface5g into feature-127-protocol-split
Conflicts:
	openair2/F1AP/f1ap_du_rrc_message_transfer.c
2018-09-20 00:15:45 +02:00
Raymond Knopp
a6d3efb9a4 minor changes for testing 2018-09-20 00:12:46 +02:00
Navid Nikaein
cee89cb389 Send the UL_RRC_MESSAGE over DCCH from CU to RRC 2018-09-19 21:22:24 +02:00
Raymond Knopp
578ce9ebe1 up to RRCConnectionSetupComplete Transmission in UE 2018-09-19 20:14:55 +02:00
Bing-Kai Hong
a7be0cc2a8 send F1AP_UL_RRC_MESSAGE from rrc 2018-09-19 19:47:11 +02:00
Bing-Kai Hong
24884bfb2b Update complete elements with ue context setup request 2018-09-19 18:57:48 +02:00
Raymond Knopp
3996241b17 Polar encoder entry fix 2018-09-19 15:47:00 +02:00
Hongzhi
e8780cb743 remove sim.h in nr_ploar_def.h 2018-09-19 15:15:58 +02:00
Hongzhi
44d31f0424 Merge branch 'nr_pdcch' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr_pdcch
Conflicts:
	openair1/PHY/NR_TRANSPORT/nr_pbch.c
2018-09-19 15:13:06 +02:00
Hongzhi
52bdf7e077 nr pbch format change 2018-09-19 15:10:43 +02:00
Hongzhi Wang
23dbc2ad3d nr adding filler bits and dlsch coding 2018-09-19 14:04:09 +02:00
Raymond Knopp
3d1faefad9 Merge branch 'feature-127-protocol-split' of https://gitlab.eurecom.fr/oai/openairinterface5g into feature-127-protocol-split 2018-09-19 12:32:23 +02:00
Raymond Knopp
0b81663408 Merge branch 'feature-127-protocol-split' of https://gitlab.eurecom.fr/oai/openairinterface5g into feature-127-protocol-split
Conflicts:
	openair2/F1AP/f1ap_du_rrc_message_transfer.c
2018-09-19 12:32:14 +02:00
Robert Schmidt
144a0a37e5 define display_backtrace() without void 2018-09-19 12:11:56 +02:00
Robert Schmidt
1cd43984c2 Remove PDCP/RLC code depending on old F1U/PROTO_AGENT 2018-09-19 11:56:54 +02:00
Robert Schmidt
3ad16e9806 minor fixes 2018-09-19 11:46:38 +02:00
Robert Schmidt
3b68376ad3 PROTO_AGENT: Restructure/simplify code, UDP only, no own configuration 2018-09-19 11:46:38 +02:00
Robert Schmidt
cf55a513d9 ASYNC_IF: peer addresses as const in interface 2018-09-19 11:46:38 +02:00
Robert Schmidt
c19bdb776f add UE Context Setup Req at CU/DU
- add message sender (CU) + handler (CU) and fill with data from ITTI message
- add PLMNID_TO_MCC_MNC and BIT_STRING_TO_TRANSPORT_LAYER_ADDRESS_IPv4 macros
- correct TRANSPORT_LAYER_ADDRESS_TO_BIT_STRING:
  change name to TRANSPORT_LAYER_ADDRESS_IPv4_TO_BIT_STRING, make it send 4B, not 5
2018-09-19 11:46:38 +02:00
Raymond Knopp
de205def25 added configuration of DU L2 functions upon RRCConnectionSetup reception 2018-09-19 10:46:36 +02:00
Navid Nikaein
d9661177fa Better management of cu/du ue ids
Fix for some variables
2018-09-19 02:01:08 +02:00
Raymond Knopp
0dea1969df Merge branch 'ru_rau_enhancement-external-timing' of http://gitlab.eurecom.fr/oai/openairinterface5g into ru_rau_enhancement-external-timing 2018-09-18 17:03:29 +02:00
Raymond Knopp
58800db24f removed MTU change for IF4p5 UDP 2018-09-18 16:27:26 +02:00
Bing-Kai Hong
c8742f26fb Normalized message output 2018-09-18 16:12:01 +02:00
Bing-Kai Hong
988d98a4e3 send UL RRC MESSAGE TRANSFER 2018-09-18 15:11:05 +02:00
Agustin
34b021e88e Merge branch 'develop-nr-pucch-modif' into develop-nr
PUCCH development: frequency hopping support for formats 1,3 &4
2018-09-18 15:08:50 +02:00
Guy De Souza
a287aa27e1 minor memcpy/memset fix 2018-09-18 15:06:36 +02:00
Agustin
f79262c933 PUCCH development: intra-frequency hopping support for formats 1,3 & 4 2018-09-18 15:05:47 +02:00
Hongzhi Wang
835034894c update nr segmentation 2018-09-18 13:34:15 +02:00
Raymond Knopp
b7fd875bed fix MTU to 1500 for UDP IF4p5 2018-09-18 10:45:19 +02:00
Florian Kaltenberger
df18f5933a adding first version of the pbchsim. so far only freq domain signal generated.
not all regression tests done (had to touch some header files)
2018-09-18 01:38:02 -07:00
yilmazt
2dec82b336 Working polartest 2018-09-18 10:12:34 +02:00
Raymond Knopp
4ff4481362 switch/case for handling DL_RRC_MESSAGE in DU 2018-09-17 22:56:01 +02:00
Raymond Knopp
b1313aaf04 DL_RRC_MESSAGE_TRANSFER goes to DU, and is received, but doesn't reconfigure L2/L1 yet. 2018-09-17 18:33:08 +02:00
Raymond Knopp
a2f914185d Merge branch 'feature-127-protocol-split' of https://gitlab.eurecom.fr/oai/openairinterface5g into feature-127-protocol-split
Conflicts:
	openair2/RRC/LTE/rrc_eNB.c
2018-09-17 18:20:07 +02:00
Raymond Knopp
9482568f74 F1AP_DL_RRC_MESSAGE destination change. 2018-09-17 18:13:36 +02:00
Bing-Kai Hong
a45d496c8c Update F1 DL RRC message transfer from DU to CU 2018-09-17 16:02:13 +02:00
Raymond Knopp
ebb9bbfae8 Merge branch 'feature-127-protocol-split' of https://gitlab.eurecom.fr/oai/openairinterface5g into feature-127-protocol-split
Conflicts:
	openair2/F1AP/f1ap_cu_rrc_message_transfer.c
2018-09-16 23:22:48 +02:00
Raymond Knopp
825c33df1b handling of nr_cellid and creation of context upon CCCH transmission.
Connection goes until generation of RRCConnectionSetup in CU which crashes (it calls rrc_mac_config_req. For DU this should be replaced with filling DL_RRC_MESSAGE_TRANSFER
2018-09-16 23:07:14 +02:00
Bing-Kai Hong
f7f7daf715 Restore some template files for CMake 2018-09-16 22:02:33 +08:00
Navid Nikaein
693a82a58d Add the instance id in the sctp_itti_send_new_message_ind 2018-09-16 16:36:45 +02:00
Navid Nikaein
7fcaf4f984 Update the SIB buffer as per earlier commits 2018-09-16 16:36:45 +02:00
Navid Nikaein
942d92cf7c send msg 4 in F1 DL RRC message transfer 2018-09-16 16:36:45 +02:00
Bing-Kai Hong
0e7887de76 Handle DL\UL RRC MESSAGE TRANSFER at f1ap_handlers 2018-09-16 21:51:15 +08:00
Raymond Knopp
ca9748eca7 corrections to RNTI coding/decoding in openair3/conversions.h 2018-09-16 11:03:53 +02:00
Raymond Knopp
eedc4226f0 modifications for SRB0 to allow multiple UE contexts in case of delayed CCCH reception in CU/DU split (moved SRB0 from carrier to UE context) 2018-09-15 22:42:10 +02:00
Raymond Knopp
6f11dc7741 removed assertion in MAC layer and adjusted generation of MSG4 to handle when CCCH message is not present. UL CCCH is now received in CU, but asserts. Need to add code in DU to handle scheduling of DL-CCCH in later subframe. In current state, DL-CCCH will only come out if it is ready for MSG$ transmission. 2018-09-15 16:10:58 +02:00
Raymond Knopp
fc6afc8116 simulation up to CCCH reception in DU is functional 2018-09-15 13:59:11 +02:00
Raymond Knopp
d670138b69 fixes for SIB2/3 handling in DU 2018-09-15 12:57:17 +02:00
Raymond Knopp
b683395df1 Merge branch 'feature-127-protocol-split' of https://gitlab.eurecom.fr/oai/openairinterface5g into feature-127-protocol-split
Conflicts:
	openair2/F1AP/f1ap_cu_interface_management.c
	openair2/F1AP/f1ap_du_interface_management.c
2018-09-14 19:08:36 +02:00
Raymond Knopp
91d4cd3cfd debugging of F1AP-Setup-Resp procedure in DU. DU configuration is ok now. 2018-09-14 18:58:46 +02:00
Robert Schmidt
eedfa4933d Correct header files for CU/DU UE context management 2018-09-14 18:23:31 +02:00
Robert Schmidt
f4633ba260 Correctly add headers for RRC message transfer, remove warnings 2018-09-14 17:16:04 +02:00
Robert Schmidt
911e738f0c Improve interface of functions CU/DU interface management 2018-09-14 17:16:04 +02:00
Bing-Kai Hong
62a5d9031d Update complete the NR_Mode_Info structure for F1 SETUP REQUEST 2018-09-14 16:45:15 +02:00
Florian Kaltenberger
e07570697e adding -O2 to build options. 2018-09-14 06:27:45 -07:00
Bing-Kai Hong
30977ecc12 Replace some dummy value with DU from exist define in f1ap_setup_req_t 2018-09-14 15:12:37 +02:00
Agustin
cfcd0d4bae NR PDCCH: dci field interpreting in FAPI / Adding DCI format 0_1 and 1_1 2018-09-14 14:56:15 +02:00
Bing-Kai Hong
cedc13d7ea Implement the F1_SETUP_FAILURE procedure 2018-09-14 11:04:50 +02:00
Florian Kaltenberger
262177f4f3 patch 2 from Milan Zivkovic (Nokia Bell Labs) 2018-09-14 00:58:05 -07:00
Florian Kaltenberger
471b5efe91 making UE unit tests compile 2018-09-14 00:15:53 -07:00
Florian Kaltenberger
7ff3705930 adding basic simulator support to nr softmodems. however, simulator not yet functional. 2018-09-14 00:13:19 -07:00
Bing-Kai Hong
5d06dcc306 fix Segmentation fault when f1ap_message_decoded_callback have not define instance_t for arguments 2018-09-13 20:12:04 +02:00
Bing-Kai Hong
d4b13691ee Merge branch 'feature-127-protocol-split' of https://gitlab.eurecom.fr/oai/openairinterface5g into feature-127-protocol-split 2018-09-13 19:56:46 +02:00
Bing-Kai Hong
ef1627fac7 INITIAL_UL_RRC_MESSAGE at DU and CU respectively is developped 2018-09-13 19:55:01 +02:00
Robert Schmidt
9a4fce6163 Unify headers for interface_management, remove some warnings 2018-09-13 18:59:47 +02:00
Hongzhi Wang
d6f3297f55 nr ue adding dlsch_decoding 2018-09-13 17:12:25 +02:00
Bing-Kai Hong
ab49f954c1 Merge branch 'feature-127-protocol-split' of https://gitlab.eurecom.fr/oai/openairinterface5g into feature-127-protocol-split 2018-09-13 16:29:10 +02:00
Bing-Kai Hong
f736213d09 Update F1AP new code structure to closer implementing all the procedures 2018-09-13 16:25:51 +02:00
Robert Schmidt
d454a95675 Reduce warnings in ASYNC_IF 2018-09-13 13:47:56 +02:00
Robert Schmidt
b27cd4dd1b Reduce warnings in PROTO_AGENT heavily 2018-09-13 13:47:56 +02:00
Hongzhi Wang
4ab303abb0 nr ue adding dlsch_modulation 2018-09-13 12:22:45 +02:00
Raymond Knopp
720d0d31cd some debugging of memory leaks 2018-09-13 10:22:20 +02:00
Bing-Kai Hong
e54f6305dc update f1 response with value from conf and request content 2018-09-13 10:13:05 +02:00
Hongzhi Wang
d651fe9c5d nr adding ratematching interleaving in header file 2018-09-13 09:17:53 +02:00
Hongzhi Wang
bbce7bc65a nr minor fix ldpc interleaving 2018-09-13 08:55:27 +02:00
Hongzhi Wang
5905e61ca4 nr adding rate matching interleaving 2018-09-13 08:47:09 +02:00
Bing-Kai Hong
bf0cef3fd1 Merge branch 'feature-127-protocol-split' of https://gitlab.eurecom.fr/oai/openairinterface5g into feature-127-protocol-split 2018-09-12 19:53:51 +02:00
Bing-Kai Hong
37b9e7b512 Handle the f1 setup request and send back f1 response with value from conf 2018-09-12 19:51:03 +02:00
Raphael Defosseux
d326da0d7d CI: importing from develop build and test on basic simulator
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-09-12 14:20:21 +02:00
Wolfgang A. Mozart
f1253ee7e9 UE compiles now 2018-09-12 08:34:24 +02:00
Bing-Kai Hong
44d0fa64e0 Merge branch 'feature-127-protocol-split' of https://gitlab.eurecom.fr/oai/openairinterface5g into feature-127-protocol-split 2018-09-11 20:13:02 +02:00
Raymond Knopp
00c0a3e5f8 compiles now 2018-09-11 19:55:32 +02:00
Bing-Kai Hong
ac3db89ec1 Remove the dummy value in DU, and store the payload data in DU 2018-09-11 17:53:16 +02:00
Raymond Knopp
66fc1bbd42 added F1/RRC interfaces for CU handling of F1Setup procedure
note: doesn't compile yet.
2018-09-11 17:25:42 +02:00
Wolfgang A. Mozart
2a3f45f8c5 changing printf to LOG_D 2018-09-11 09:42:39 +02:00
Wolfgang A. Mozart
bef9f790d9 downlink_frequency already set by config module (was overwritten)
setting UE_scan=0 by default (UE_scan==1 seems to be buggy and is not needed for now)
2018-09-11 09:40:55 +02:00
Raymond Knopp
d5e94b2ca0 decoder_list_t structure for in-place computations 2018-09-11 06:50:20 +02:00
Florian Kaltenberger
12ab91c900 enabling the T tracer for nr-uesoftmodem as this is required now for logs 2018-09-10 13:43:12 -07:00
Bing-Kai Hong
7732b49a34 Ignore config x2, if we are in F1 procedure 2018-09-10 16:20:54 +02:00
Bing-Kai Hong
9f098a3461 Merge remote-tracking branch 'origin/develop' into feature-127-protocol-split 2018-09-10 15:33:03 +02:00
Raymond Knopp
d4d2f8665e timing statistics and memory clearing 2018-09-10 14:50:30 +02:00
Guy De Souza
753d4b70b6 Minor debug changes 2018-09-10 13:44:44 +02:00
Bing-Kai Hong
ab412cb39d Normalization of the file names for CU and DU 2018-09-10 13:39:48 +02:00
Guy De Souza
ce0b626684 PBCH bitfield changes 2018-09-10 11:42:20 +02:00
Guy De Souza
68c07e2951 Merge branch 'nr_pdsch' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr_pdsch 2018-09-10 10:54:45 +02:00
Guy De Souza
3feb84ca79 DL freq type 1 2018-09-10 10:54:23 +02:00
Raymond Knopp
6d38327d85 memcpy instead of loop-based copy 2018-09-10 02:16:35 +02:00
Raymond Knopp
52669a0821 order of dimensions on llr array 2018-09-10 01:38:43 +02:00
Robert Schmidt
0fe608c292 Add TERMIATE_MESSAGE to DU/CU tasks, add warning/trace IDs 2018-09-09 16:00:19 +02:00
Raymond Knopp
ee1ea7e529 small simplification in computeLLR 2018-09-09 09:51:37 +02:00
Raymond Knopp
b4aa58e0c0 removed some computations which are repeated in a loop (updateLLR) 2018-09-09 09:18:15 +02:00
Raymond Knopp
84c3f70570 added prints for unrolling preparation
fixed issue for llr updates with the approximation
2018-09-09 08:59:26 +02:00
Robert Schmidt
c1249842d6 Initialize netlink when node_type is known 2018-09-08 18:58:27 +02:00
Robert Schmidt
5a74b790a2 Restructure code, CMakeLists fixes
- move the configuration reading code before task creation
- fix CMakeLists.txt so that lte-softmodem-nos1 compiles
2018-09-08 18:55:30 +02:00
Robert Schmidt
a1439effe3 Revert "Restructure create_tasks(): start tasks depending on RAN type, is read in RCconfig_RRC()"
This reverts commit 87093e1b55.
2018-09-08 15:21:47 +02:00
Bing-Kai Hong
5105766ec5 Remove unwanted files and function for sctp and f1 unit test 2018-09-07 19:14:12 +02:00
Bing-Kai Hong
021d7abf8a Create the F1 pingpong procedure with SCTP 2018-09-07 19:04:45 +02:00
hongzhi wang
a80f1cf2e7 ue clean more warnings 2018-09-07 17:04:41 +02:00
Florian Kaltenberger
6e29ff0872 patch from Milan Zivkovic (Nokia Bell Labs) 2018-09-07 06:48:09 -07:00
Florian Kaltenberger
e8f452dabe removing assertion from dci handling (could come from wrongly detected DCI) 2018-09-07 05:54:44 -07:00
Bing-Kai Hong
17cc510a3c add itti_receive_msg at CU and DU 2018-09-07 14:13:56 +02:00
Guy De Souza
5520c2ebd4 DL Freq alloc type 1 2018-09-07 13:39:33 +02:00
Robert Schmidt
c4370d9df0 Start CU/DU tasks in create_remaining_tasks() of ENB_APP 2018-09-07 12:17:03 +02:00
Robert Schmidt
2e453eff69 move F1AP_get_next_transaction_identifier() to f1ap_common.c 2018-09-07 12:17:03 +02:00
Robert Schmidt
54aa295eb4 Use f1ap_encoder.c file for F1AP encoding functionality 2018-09-07 12:15:35 +02:00
Bing-Kai Hong
e82cae08c3 fix wrong parameter when get ip address in DU 2018-09-07 12:07:26 +02:00
Bing-Kai Hong
b6295efd2a modify the ip address struct in f1 setup req for DU 2018-09-07 11:53:33 +02:00
Bing-Kai Hong
185c2fd46b Merge branch 'feature-127-protocol-split' of https://gitlab.eurecom.fr/oai/openairinterface5g into feature-127-protocol-split 2018-09-06 19:15:52 +02:00
Bing-Kai Hong
d0de98e067 Create SCTP request and response with ITTI procedure for F1 2018-09-06 19:13:09 +02:00
Guy De Souza
8a1005a136 Merge branch 'nr_pdsch' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr_pdsch 2018-09-06 18:33:23 +02:00
Guy De Souza
b7c7e30e99 Time alloc assertions/ Inline resource alloc params functions 2018-09-06 18:31:55 +02:00
Robert Schmidt
87093e1b55 Restructure create_tasks(): start tasks depending on RAN type, is read in RCconfig_RRC() 2018-09-06 18:12:47 +02:00
hongzhi wang
136ca508c5 nr ue clean warnings 2018-09-06 16:04:21 +02:00
ISIP CS/NCTU
c052e247dc check dmrs for pdsch 2018-09-06 15:41:08 +02:00
Raphael Defosseux
609e6521b0 CI: adding email notification
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-09-06 13:06:28 +02:00
Bing-Kai Hong
f19fa8ad47 Create ITTI procedure for F1 2018-09-06 11:56:15 +02:00
Guy De Souza
2f68515430 Merge branch 'nr_pdcch' into nr_pdsch 2018-09-06 11:14:40 +02:00
Robert Schmidt
9e5f9bdb94 Suppress warning "implicitly truncated to unsigned type" 2018-09-06 10:05:45 +02:00
Robert Schmidt
63a2fb0660 Handle warnings regarding undeclared functions for dec, enc, sctp 2018-09-06 10:03:55 +02:00
Robert Schmidt
14298413a4 Fix obvious warnings when building CU/DU tests 2018-09-06 09:25:10 +02:00
Raymond Knopp
b2583c6f23 CU is exectuable 2018-09-06 09:24:10 +02:00
Raymond Knopp
32a39e9a67 CU configuration modifications 2018-09-05 22:28:56 +02:00
hongzhi wang
2714854e6f Merge branch 'nr_pdcch' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr_pdcch 2018-09-05 15:36:22 +02:00
hongzhi wang
35c705787d UE nr pdcch update 2018-09-05 15:35:14 +02:00
Guy De Souza
a1ae155b4e Minor size fix 2018-09-05 15:06:48 +02:00
ISIP CS/NCTU
645a0a61e7 add 256QAM & dmrs_pdsch 2018-09-05 14:07:21 +02:00
Raymond Knopp
ce07a11ed8 Merge branch 'feature-127-protocol-split' of https://gitlab.eurecom.fr/oai/openairinterface5g into feature-127-protocol-split 2018-09-05 11:53:34 +02:00
Raymond Knopp
3e987bc143 update of cu configuration file 2018-09-05 11:53:08 +02:00
Bing-Kai Hong
cdfca6c00a F1:
1.create the f1ap handlers procedure
2.hide asn1c warning when in compile
2018-09-05 11:14:35 +02:00
Raymond Knopp
e2dd22b6ae added parsing of F1AP_SETUP_RESP message and subsequent RAN configuration in DU 2018-09-04 23:07:46 +02:00
Guy De Souza
326a40a9b7 All contiguous RB update 2018-09-04 17:42:44 +02:00
Florian Kaltenberger
f96de815b3 making NR nos1 versions compile again 2018-09-04 04:25:17 -07:00
Guy De Souza
854e0a6818 readded scrambling 2018-09-04 11:56:48 +02:00
Hongzhi
581605e8e8 minor fix nr tbs 2018-09-04 10:06:43 +02:00
Florian Kaltenberger
c548f4256a Merge branch 'nr-pdsch' into nr_pdsch 2018-09-04 01:05:30 -07:00
Hongzhi
0577eef498 fix compilation for nr compute_tbs and segmentation 2018-09-04 10:02:55 +02:00
Raymond Knopp
b584ddeda8 added configuration files for cu/du, ngran_types.h 2018-09-04 09:36:01 +02:00
Raymond Knopp
1daed67012 Merge branch 'feature-127-protocol-split' of https://gitlab.eurecom.fr/oai/openairinterface5g into feature-127-protocol-split
Conflicts:
	common/utils/T/T_IDs.h
	common/utils/T/T_messages.txt
2018-09-04 09:28:35 +02:00
Raymond Knopp
c8c8032358 initial DU part for F1AP_setup_resp 2018-09-04 09:25:02 +02:00
Raymond Knopp
c56eb9eda7 addition of configuration (DU) for F1AP and filling of F1AP_SET_REQ parameters 2018-09-04 07:40:04 +02:00
Guy De Souza
e8fa668ecb Merge branch 'nr_pdcch' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr_pdcch 2018-09-03 17:15:46 +02:00
Guy De Souza
5cd4046e6e Freq first mapping correction- debug mode 2018-09-03 17:15:26 +02:00
Guy De Souza
261b586e26 Time domain alloc type DLSCH 2018-09-03 11:06:30 +02:00
Hongzhi Wang
c8a6bbd528 ue add nr_compute_tbs in header 2018-08-31 17:53:50 +02:00
Hongzhi Wang
9d3980aa19 ue adding nr_compute_tbs and nr_segmentation 2018-08-31 17:32:17 +02:00
hongzhi wang
c631c064ec ue bug fix pdcch procedure 2018-08-31 17:29:34 +02:00
Florian Kaltenberger
246c3ac82d removing extra line break in test_case_list.xml 2018-08-31 07:41:30 -07:00
Bing-Kai Hong
3021cf114d F1 & MAC:
1. Fix UE_CONTEXT_SETUP_REQUEST and CONTEXT_MODIFICATION_REQUEST encode/decode
2. Add gNB_DU_CONFIGURATION_UPDATE and gNB_CU_CONFIGURATION_UPDATE procedure
3. Add C_RNTI_TO_BIT_STRING function
4. Add INITIAL_UL_RRC_MESSAGE_TRANSFER procedure and with mac_du_data_ind (MSG3)
5. Add GNB-CUSystemInformation extension part for the F1SetupResponse procedure
2018-08-31 15:55:42 +02:00
Florian Kaltenberger
d09f620101 adding ldpctest (BG1 rate 1/3) to autotests 2018-08-31 06:55:11 -07:00
Louis Adrien Dufrene
80920618e6 Code guidelines 2018-08-31 14:14:28 +02:00
Raphael Defosseux
15e0e861e6 CI: fix little syntax error in pipeline
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-08-31 11:33:02 +02:00
Raphael Defosseux
5f074bc40a CI: adding phy-sim simulator testing to pipeline
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-08-31 10:52:40 +02:00
Raphael Defosseux
57064c0d5a CI: Adapting scripts to new Rel15 extension on log files
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-08-31 09:37:41 +02:00
Jacques
e3e1fa2a9e Merge branch 'develop-nr' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-nr 2018-08-30 17:40:22 +02:00
Jacques
5f9fc55e45 nr ue : pucch cyclic shift for format 0 & 1 2018-08-30 17:40:01 +02:00
Florian Kaltenberger
d353b2bd87 Merge branch 'develop-nr' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-nr 2018-08-30 08:24:36 -07:00
Florian Kaltenberger
26251a1b7c disabling T TRACER for NR-UE. bugfix for eNB on exit 2018-08-30 08:23:53 -07:00
Raphael Defosseux
4e6ca116e1 CI: fix error
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-08-30 16:23:10 +02:00
Florian Kaltenberger
cc002b823f Merge branch 'develop-nr-merge' into develop-nr
lte-softmodem, lte-uesoftmodem, nr-softmodem, nr-uesoftmodem, polartest, ldpctest, ulsim, dlsim all compile
functionality and performance to be tested by CI
2018-08-30 07:08:26 -07:00
Hongzhi Wang
5141341cb6 ue bug fix polar decoder init 2018-08-30 09:43:50 +02:00
WEI-TAI CHEN
9aacf08473 merge develop and nr-rrc-additions into develop-nr 2018-08-29 07:18:15 -07:00
WEI-TAI CHEN
1a74c352c6 solve the conflict type between crc_byte.c and coding_defs.h 2018-08-29 06:27:31 -07:00
Louis Adrien Dufrene
ec702c88f3 Commentaries modifications 2018-08-29 14:27:09 +02:00
WEI-TAI CHEN
7462e43c02 merge develop-nr 2018-08-29 04:38:46 -07:00
WEI-TAI CHEN
c9eb16cc60 Merge branch 'nr-rrc-additions' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr-rrc-additions 2018-08-29 04:31:20 -07:00
WEI-TAI CHEN
dee115da18 Change the dl/ul_channel_bandwidth to dl/ul_carrier_bandwidth 2018-08-29 04:31:10 -07:00
WEI-TAI CHEN
7475a22e1e EN-DC in gNB 2018-08-29 04:29:58 -07:00
Agustin
4f37933034 Merge remote-tracking branch 'refs/remotes/origin/develop-nr' into develop-nr 2018-08-29 10:21:35 +02:00
Raphael Defosseux
a9cf09ec1c CI: fixing merge issues. First on the build side.
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-08-29 10:16:54 +02:00
Agustin
d14a10d954 NR PUCCH development: add ue parameter to pucch generation functions 2018-08-29 10:10:44 +02:00
Bing-Kai Hong
a817b54c74 T: generate for PROTO_AGENT and F1U 2018-08-28 17:01:17 +02:00
Hongzhi Wang
b9c823bcaa ue convert pdcch llr to double 2018-08-28 15:49:33 +02:00
Bing-Kai Hong
b797dafdc6 1.Update the F1 messages with F1AP spec R15.2.1 and build scripts for proper generation of F1 messages
2.Add SCTP procedure (without ITTI) with F1AP
3.Add F1AP test code
2018-08-28 15:05:05 +02:00
Guy De Souza
47afbdd91d Merge branch 'nr_pdcch' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr_pdcch 2018-08-28 14:47:08 +02:00
Guy De Souza
06dd8845ea Polar parms struct fix 2018-08-28 14:46:50 +02:00
Jacques
f6c327e09b Merge remote-tracking branch 'refs/remotes/origin/develop-nr' into develop-nr 2018-08-28 14:41:12 +02:00
Louis Adrien Dufrene
c12e3234b0 modification of tracer/gui/x.c for T tracer to work on screen 2018-08-28 14:03:37 +02:00
WEI-TAI CHEN
f94fe3125e remove AssertFatal in ul_7_5_kHZ.c file 2018-08-28 05:00:14 -07:00
hongzhi wang
c33f7c4a04 Merge branch 'nr_pdcch' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr_pdcch 2018-08-28 13:25:06 +02:00
WEI-TAI CHEN
a14450d2ac fix segmentation fault 2018-08-28 04:23:27 -07:00
Florian Kaltenberger
57c3e69eb4 disabling debug messages in polartest + fixing incorrect free() 2018-08-28 04:20:20 -07:00
Calvin HSU
b58ef54608 Merge remote-tracking branch 'origin/develop' into feature-127-protocol-split 2018-08-28 12:22:59 +02:00
Agustin
34a56dcaf5 NR UE PDCCH development: dci pdu implemented with 4 element table uint32_t (128 bits) 2018-08-28 11:53:34 +02:00
hongzhi wang
7b9b8348e1 ue pbch debug MIB 2018-08-28 11:47:57 +02:00
Agustin
9a1e1ab781 Merge remote-tracking branch 'refs/remotes/origin/develop-nr' into develop-nr 2018-08-28 11:23:39 +02:00
Jacques
5d30379b79 nr ue : add tdd slot config 2018-08-28 11:17:02 +02:00
Hongzhi Wang
059733574e ue frame_params update 2018-08-28 11:09:21 +02:00
Raymond Knopp
21be856f58 lte-softmodem-nos1 / lte-uesoftmodem-nos1 functional 2018-08-28 00:16:38 +02:00
Raymond Knopp
a9e4003372 lte-uesoftmodem compiles 2018-08-27 15:53:34 +02:00
Louis Adrien Dufrene
ec367c4b36 Merge branch 'develop' into DRX_develop 2018-08-27 14:43:09 +02:00
Louis Adrien Dufrene
a8f6accc9a rm .gitignore for repo consistancy 2018-08-27 14:41:29 +02:00
Florian Kaltenberger
e4b4b44968 adding polartest and ldpctest to build script 2018-08-27 05:10:56 -07:00
Florian Kaltenberger
42b9acc50e Merge branch 'nr_polar_uci' into develop-nr 2018-08-27 05:01:48 -07:00
Florian Kaltenberger
ebd07cb543 Merge branch 'develop-nr' into nr-pdsch 2018-08-27 05:00:03 -07:00
Guy De Souza
260a4c1324 Array size bug fix 2018-08-27 13:57:11 +02:00
Raymond Knopp
3367cc9319 lte-softmodem compiles 2018-08-27 13:37:00 +02:00
Guy De Souza
3e8b0dce73 reverse debug mode 2018-08-27 13:19:09 +02:00
Guy De Souza
796eab07e1 debug commit 2018-08-27 10:54:16 +02:00
Florian Kaltenberger
412186c234 adding help to polartest 2018-08-27 01:44:05 -07:00
Florian Kaltenberger
0962fbbecc Merge branch 'develop-nr' into nr_polar_uci 2018-08-27 01:37:57 -07:00
Agustin
ed80535521 Merge remote-tracking branch 'refs/remotes/origin/develop-nr' into develop-nr 2018-08-27 09:25:03 +02:00
Agustin
9e7608e726 NR UE PDCCH development: dci pdu implemented with 4 element table uint32_t (128 bits) 2018-08-27 09:14:41 +02:00
Raymond Knopp
bf407e6c34 rrc_eNB_S1AP.c compiles
L2_interface.c doesn't
2018-08-26 00:32:53 +02:00
Raymond Knopp
51c0c42207 rrc_eNB.c compiles
rrc_eNB_S1AP.c doesn't
2018-08-26 00:06:40 +02:00
Raymond Knopp
efeb48e09e rrc_UE.c merged
rrc_eNB.c doesn't compile
2018-08-25 23:27:16 +02:00
Raymond Knopp
019149e565 intermediate step (rrc_UE.c doesn't compile) 2018-08-25 22:23:51 +02:00
Raymond Knopp
2932d172a5 dlsim and ulsim are functional 2018-08-25 21:09:58 +02:00
Raymond Knopp
2245d82245 ASN1 generation for NR 2018-08-25 20:04:17 +02:00
Raymond Knopp
b93b7073ca Merge remote-tracking branch 'origin/develop' into develop-nr
Conflicts:
	ci-scripts/Jenkinsfile-gitlab
	ci-scripts/buildOnVM.sh
	ci-scripts/checkCodingFormattingRules.sh
	ci-scripts/createVM.sh
	ci-scripts/destroyAllRunningVM.sh
	ci-scripts/reportBuildLocally.sh
	cmake_targets/CMakeLists.txt
	cmake_targets/build_oai
	cmake_targets/tools/build_helper
	common/utils/LOG/log.h
	openair1/PHY/LTE_ESTIMATION/lte_sync_timefreq.c
	openair1/PHY/TOOLS/file_output.c
	openair1/PHY/TOOLS/lte_dfts.c
	openair1/PHY/TOOLS/tools_defs.h
	openair1/PHY/defs_eNB.h
	openair1/PHY/impl_defs_lte.h
	openair1/SCHED_UE/phy_procedures_lte_ue.c
	openair2/COMMON/platform_constants.h
	openair2/COMMON/platform_types.h
	openair2/LAYER2/MAC/eNB_scheduler.c
	openair2/LAYER2/MAC/main.c
	openair2/RRC/LTE/L2_interface.c
	openair2/RRC/LTE/MESSAGES/asn1_msg.c
	openair2/RRC/LTE/MESSAGES/asn1_msg_NB_IoT.c
	openair2/RRC/LTE/rrc_UE.c
	openair2/RRC/LTE/rrc_eNB.c
	openair2/RRC/LTE/rrc_eNB_S1AP.c
	openair2/UTIL/LOG/log.c
	openair3/S1AP/s1ap_common.h
	openair3/S1AP/s1ap_eNB.c
	openair3/S1AP/s1ap_eNB_context_management_procedures.c
	openair3/S1AP/s1ap_eNB_decoder.c
	openair3/S1AP/s1ap_eNB_decoder.h
	openair3/S1AP/s1ap_eNB_handlers.c
	openair3/S1AP/s1ap_eNB_nas_procedures.c
	openair3/S1AP/s1ap_eNB_overload.c
	openair3/S1AP/s1ap_eNB_trace.c
	openair3/TEST/EPC_TEST/play_scenario_decode.c
	openair3/TEST/EPC_TEST/play_scenario_s1ap.c
	openair3/TEST/EPC_TEST/play_scenario_s1ap_compare_ie.c
	targets/COMMON/openairinterface5g_limits.h
	targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210.conf
	targets/RT/USER/lte-ran.c
	targets/RT/USER/lte-ru.c
	targets/RT/USER/lte-ue.c
	targets/SIMU/USER/oaisim_functions.c
2018-08-25 18:20:44 +02:00
Florian Kaltenberger
714cdc091f adding llr clipping + other bugfixes 2018-08-24 12:50:12 -07:00
Calvin HSU
4280122cc6 UE: Add FAPI structure clean by every slot, update UL_CONFIG_REQ for PRACH, DL_CONFIG_REQ for DL-SCH and filling PHY parameter "dlsch", "dlsch_harq".: 2018-08-24 18:06:15 +02:00
Guy De Souza
5c3c79e7c3 Merge branch 'nr_pdcch' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr_pdcch 2018-08-24 15:40:52 +02:00
Guy De Souza
5449738861 remove encoder DCI debug 2018-08-24 15:40:32 +02:00
yilmazt
7d3cf4804c Working new polar coder with temporary fix 2018-08-24 15:36:31 +02:00
Raymond Knopp
b9a06a75ff Merge branch 'ru_rau_enhancement-external-timing' of http://gitlab.eurecom.fr/oai/openairinterface5g into ru_rau_enhancement-external-timing 2018-08-24 14:49:29 +02:00
Raymond Knopp
bcabf5fe11 tracing for if4p5 fronthaul 2018-08-24 14:49:00 +02:00
Raymond Knopp
671aa4e11a Merge remote-tracking branch 'origin/develop' into ru_rau_enhancement-external-timing 2018-08-24 14:48:04 +02:00
Florian Kaltenberger
90a468facb changing the prototypes of the ldpc encoder functions to harmonize more with standard
adding ldpctest encoder, decoder and ldpctest to CMakeLists.txt
activating the TCL LDPC decoder in the LDPC testbench but only works for largest blocksize 8448 for now.
2018-08-24 02:38:25 -07:00
Florian Kaltenberger
84f771ceb5 changing the prototypes of the ldpc encoder functions to harmonize more with standard
adding ldpctest encoder, decoder and ldpctest to CMakeLists.txt
activating the TCL LDPC decoder in the LDPC testbench but only works for largest blocksize 8448 for now.
2018-08-24 02:17:02 -07:00
Raymond Knopp
b7b48fd6c7 beamforming debugging after fronthaul testing 2018-08-24 10:32:03 +02:00
Louis Adrien Dufrene
7ea7af3ab8 initial commit 2018-08-24 08:56:06 +02:00
hongzhi wang
38501eb221 ue minor changes for init 2018-08-23 16:48:39 +02:00
Turker YILMAZ
4bcc4951b5 Update CMakeLists.txt 2018-08-23 11:25:18 +02:00
Guy De Souza
606ca59616 Merge branch 'nr_pdcch' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr_pdcch 2018-08-23 11:19:14 +02:00
Guy De Souza
03464d9131 mod8 fix 2018-08-23 11:18:33 +02:00
hongzhi wang
d89602c8af UE adding polar decoder 2018-08-23 11:16:20 +02:00
Guy De Souza
ed211ca2dd Merge branch 'nr_pdcch' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr_pdcch 2018-08-23 11:07:21 +02:00
Guy De Souza
d2f2dfc0a3 MIB config assert 2018-08-23 11:07:02 +02:00
Hongzhi
742700fabd Merge branch 'nr_smallBlockCoding' into nr_pdcch 2018-08-23 10:12:54 +02:00
Hongzhi
11c1256f5e Merge branch 'develop-nr' into nr_pdcch
Conflicts:
	cmake_targets/CMakeLists.txt
2018-08-23 10:03:12 +02:00
yilmazt
d056ae85c5 minor encoder fixes 2018-08-22 21:04:23 +02:00
yilmazt
42d70a9078 minor fixes 2018-08-22 17:52:18 +02:00
yilmazt
2e44c4c186 Polar coding update 2of2 2018-08-22 17:24:29 +02:00
hongzhi wang
0c22058d5e ue bug fix and workaround for pdcch test 2018-08-22 17:18:14 +02:00
yilmazt
fdbf8e7f40 minor update 2018-08-22 12:37:24 +02:00
yilmazt
09b44d3623 CMakeLists update 2018-08-22 12:21:10 +02:00
yilmazt
a4f8f49eef Polar coding update 1of2 2018-08-22 10:42:29 +02:00
Guy De Souza
69ec0ddd8c DMRS index update 2018-08-21 15:56:14 +02:00
Jacques
d77732b359 Merge branch 'develop-nr' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-nr 2018-08-21 14:10:52 +02:00
Jacques
e21db57ad5 nr ue : frame configuration and pucch changes 2018-08-21 14:10:19 +02:00
Guy De Souza
bdbec1ba64 Tiny symbol jump 2018-08-21 10:45:07 +02:00
Guy De Souza
adafb8f9f1 switch to aggregation level 8 2018-08-21 10:29:39 +02:00
Guy De Souza
8adb5d481c cset start RE type fix 2018-08-21 10:01:26 +02:00
Calvin HSU
4deb66636a UE: Add DCI interpretation in L2, finish part of the DL_CONFIG_REQ for L1 DL-SCH procedures. 2018-08-20 17:32:14 +02:00
tct-labo4
9e86d7cbc8 Adding bytes to bits conversion for polar encoder 2018-08-20 11:14:30 +02:00
yilmazt
7350475d36 DCI debug 2018-08-20 10:57:07 +02:00
Guy De Souza
9f85de3d94 Merge with nr_smallBlockCoding 2018-08-20 10:29:06 +02:00
Guy De Souza
cf7c7937da merge with develop-nr 2018-08-20 10:07:35 +02:00
yilmazt
5b42e83df2 Putting byte2bit operations within polar coders 2018-08-19 19:24:14 +02:00
root
a8458d3156 nr PUCCH development: call to pucch generation functions 2018-08-17 16:51:28 +02:00
Raymond Knopp
c3b9328540 Merge remote-tracking branch 'origin/t_tracer_w32' into ru_rau_enhancement-external-timing
Conflicts:
	common/utils/T/T_messages.txt
2018-08-17 16:33:07 +02:00
yilmazt
e6e99716ad Minor fix3 2018-08-17 15:35:01 +02:00
yilmazt
866c2fedc8 Minor fix2 2018-08-17 15:26:22 +02:00
yilmazt
48bd667b67 Minor fix 2018-08-17 15:08:09 +02:00
yilmazt
77b155c3b9 Debug changes1 2018-08-17 13:59:59 +02:00
yilmazt
76b1ee89fa Working polartest.c 2018-08-17 11:22:13 +02:00
cdxu0312
0fd3ca7584 added 2 RRU debugging for vcd 2018-08-17 15:12:26 +08:00
yilmazt
ca207808df Debug changes5 2018-08-16 21:57:33 +02:00
yilmazt
b31a0b42ec Debug changes4 2018-08-16 16:55:08 +02:00
yilmazt
df8929e575 Debug changes3 2018-08-16 16:01:17 +02:00
yilmazt
948eb6f1ca Debug changes2 2018-08-16 15:43:23 +02:00
yilmazt
c624654f6f Debug changes 2018-08-16 15:20:36 +02:00
Hongzhi Wang
25a136afca ue adding pdsch procedure 2018-08-16 15:01:16 +02:00
Raymond Knopp
ff0ca09040 changed precoder initialization for cell-specific antenna ports 2018-08-15 05:24:47 +02:00
Raymond Knopp
6bfbb77ebe Merge remote-tracking branch 'origin/340-fix-beamforming-for-multiple-antenna' into ru_rau_enhancement-external-timing
Conflicts:
	openair1/SCHED/ru_procedures.c
2018-08-15 04:23:59 +02:00
Raymond Knopp
1609b21f4b Merge remote-tracking branch 'origin/develop' into ru_rau_enhancement-external-timing 2018-08-15 04:17:25 +02:00
yilmazt
67eec34a5c Minor fixes 2018-08-14 16:25:51 +02:00
yilmazt
3c9a89576d Debug changes 2018-08-14 11:36:59 +02:00
yilmazt
d409ed1adb trial 2018-08-13 21:40:54 +02:00
yilmazt
5b99089997 Minor warning fixes 2018-08-13 20:00:23 +02:00
Cedric Roux
21481fef71 compilation warning "jobserver unavailable" removal
This commit emoves the warning:
make[4]: warning: jobserver unavailable: using -j1.  Add '+' to parent make rule.

Basically, inside a Makefile we should use $(MAKE) instead of make.
2018-08-13 12:37:17 +02:00
Cedric Roux
fd8eb46c6a minor: remove TABs 2018-08-13 11:29:07 +02:00
Cedric Roux
d5da350b06 T: check consistency of T_messages.txt with VCD functions and variables traces
Since VCD has now to go through the T tracer, we enforce the consistency
of data found in common/utils/LOG/vcd_signal_dumper.[ch] with data
found in common/utils/T/T_messages.txt.

We might get completely rid of common/utils/LOG/vcd_signal_dumper.[ch] at some
point. For the moment, let's keep it.

This commit adds the program common/utils/T/check_vcd.c and necessary
modifications to enforce its use at compilation time.

If you modify common/utils/LOG/vcd_signal_dumper.[ch] but do not update
cmake_targets/CMakeLists.txt an error will pop up when you compile the
software. You have to keep both modules synchronized.
2018-08-13 11:29:07 +02:00
Hongzhi Wang
e6623c7d45 ue update pdcch dmrs 2018-08-10 17:18:42 +02:00
root
84adc788ec fix compilation erro 2018-08-10 16:37:21 +02:00
root
a722645609 nr PDCCH development: modify loop slop_fep, calling nr_pdcch_procedures only once 2018-08-10 15:45:50 +02:00
Guy De Souza
a17b08f70a Symbol DMRS mapping fix 2018-08-10 15:33:00 +02:00
Cedric Roux
bd3fc60ae4 T: update 'to_vcd' tracer to trace all VCD variables and functions
Pass the command line arguemnt -vcd to trace all VCD variables
and functions.
2018-08-10 15:20:36 +02:00
Wang Tsu-Han
2d723c542e adding VCD log for multiple RUs
Conflicts:
	common/utils/T/T_messages.txt
	openair1/SCHED/ru_procedures.c
	targets/RT/USER/lte-enb.c
2018-08-10 15:19:00 +02:00
root
82f187853c Merge branch 'develop-nr' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-nr 2018-08-10 15:17:20 +02:00
root
6147b8d858 nr PDCCH development: add nr_dci_info_extracted in file phy_procedures_nr_ue.c 2018-08-10 15:14:36 +02:00
Calvin HSU
a964b894c0 UE: rx_frame, rx_slot in nr-ue.c to be fill. 2018-08-10 13:08:06 +02:00
Calvin HSU
4a60d91afc UE MAC: Add MAC PDU demultiplexing for DL-SCH PDU. 2018-08-10 11:43:37 +02:00
root
3d9fe860ef nr PDCCH development: getting rb_offset parameter from higher layers 2018-08-10 11:38:10 +02:00
root
394c7da914 nr PDCCH development: getting searchSpace and Coreset parameters from higher layers 2018-08-10 11:28:20 +02:00
Guy De Souza
3b17e145f5 Minor payload optim 2018-08-09 17:37:32 +02:00
Wang Tsu-Han
b8feeef407 VCD log for two ru_thread 2018-08-09 17:06:24 +02:00
Guy De Souza
da8604b4ce Interleaving index fix 2018-08-09 16:37:37 +02:00
Wang Tsu-Han
3fd125257a VCD removal 2018-08-09 16:34:59 +02:00
Calvin HSU
bdbd2bff57 UE: error fixed, add DL_CONFIG_REQ for DL-SCH. 2018-08-09 16:33:06 +02:00
Guy De Souza
8ed4e0718d Bundle fix 2018-08-09 16:30:02 +02:00
ISIP CS/NCTU
90c9bfd926 Update ru_procedures.c 2018-08-09 16:05:05 +02:00
Guy De Souza
acfc5e6ca0 CR interleaved 2018-08-09 15:58:21 +02:00
Calvin HSU
c8fbd90532 UE: Add frequency domain resource in type0-pdcch and new field rb_offset 2018-08-09 15:56:53 +02:00
ISIP CS/NCTU
f458287a4d Replace ru_procedures.c 2018-08-09 15:47:56 +02:00
ISIP CS/NCTU
5618856ea9 Replace modulation_eNB.h 2018-08-09 15:47:31 +02:00
ISIP CS/NCTU
9d8aecdb3e Replace beamforming.c 2018-08-09 15:47:12 +02:00
WEI-TAI CHEN
616a66b7dd Replace "#ifdef Rel14" by "#if (RRC_VERSION >= MAKE_VERSION(14, 0, 0))"
We can build Rel15 for LTE now
2018-08-09 06:08:33 -07:00
hongzhi wang
31caae0363 ue cmakefile error fix 2018-08-09 14:45:55 +02:00
WEI-TAI CHEN
ef77d53de2 Done for do_RLC_BEARER, do_MAC_CELLGROUP, do_PHYSICALCELLGROUP function like do_MIB_NR and do_SERVINGCELLCONFIGCOMMON 2018-08-09 04:42:49 -07:00
Calvin HSU
d4f10c7da6 Merge branch 'develop-nr' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-nr 2018-08-09 12:52:53 +02:00
Calvin HSU
c3c9790cd1 UE: error fixed. 2018-08-09 12:51:09 +02:00
hongzhi wang
cb6c7824ee ue improve sync stability 2018-08-09 12:22:06 +02:00
Calvin HSU
284c441367 UE: Add DCI_IND in phy_procedures_nr_ue. Fill type0-pdcch in scheduled_response 2018-08-09 11:53:30 +02:00
ISIP CS/NCTU
c87e00c35c Update beamforming.c 2018-08-09 11:53:00 +02:00
ISIP CS/NCTU
778361685c Update ru_procedures.c 2018-08-09 11:52:27 +02:00
ISIP CS/NCTU
0fbde1bad0 Update lte-enb.c 2018-08-09 11:51:54 +02:00
ISIP CS/NCTU
2e7962be0c Update modulation_eNB.h 2018-08-09 11:48:13 +02:00
ISIP CS/NCTU
cf2f6f58f6 Update beamforming.c 2018-08-09 11:40:53 +02:00
ISIP CS/NCTU
95d6792c12 Update ru_procedures.c 2018-08-09 11:38:51 +02:00
ISIP CS/NCTU
03e91a3d9c Replace modulation_eNB.h 2018-08-09 11:31:09 +02:00
ISIP CS/NCTU
61df625703 Replace beamforming.c 2018-08-09 11:30:44 +02:00
ISIP CS/NCTU
191d36705a Replace lte-enb.c 2018-08-09 11:29:47 +02:00
ISIP CS/NCTU
c4ee45acb3 Replace ru_procedures.c 2018-08-09 11:28:30 +02:00
Raymond Knopp
91d23cb31d Merge remote-tracking branch 'origin/ru_rau_enhancement' into ru_rau_enhancement-external-timing
Conflicts:
	targets/RT/USER/lte-ru.c
	targets/RT/USER/lte-softmodem.h
2018-08-09 09:45:57 +02:00
WEI-TAI CHEN
272fa05fea new function in order to fill CellGroupConfig 2018-08-08 16:19:43 -07:00
WEI-TAI CHEN
4491492a11 Update nr_nFAPI structure in order to more choice for adding Rel16 in NR 2018-08-08 16:17:59 -07:00
WEI-TAI CHEN
4dd74fbd9c Upata the loss config 2018-08-08 16:15:40 -07:00
Guy De Souza
fa509297f4 Non interleaved REG mapping 2018-08-08 17:48:55 +02:00
Guy De Souza
1095760c4e CCE list 2018-08-08 16:25:35 +02:00
Raymond Knopp
70461a3344 initialization of dumpframe variable to 0. 2018-08-08 05:37:16 +02:00
Raymond Knopp
47764ebb58 Merge remote-tracking branch 'origin/issue-centos-fixes' into ru_rau_enhancement 2018-08-08 05:06:35 +02:00
Raymond Knopp
53a31093fa minor modifications to lte-ru.c and ru_control.c. Addition of lte_noS1_buildCMakelists.template which somehow got removed. 2018-08-08 05:01:21 +02:00
Raymond Knopp
f7dfb6c6b2 Merge remote-tracking branch 'origin/develop' into ru_rau_enhancement
Conflicts:
	cmake_targets/build_oai
	openair1/PHY/LTE_TRANSPORT/prach.c
	openair1/PHY/LTE_TRANSPORT/pucch.c
	openair1/PHY/LTE_UE_TRANSPORT/initial_sync.c
	openair1/SCHED/fapi_l1.c
	openair1/SCHED/phy_procedures_lte_eNb.c
	openair2/LAYER2/MAC/eNB_scheduler.c
	openair2/LAYER2/MAC/eNB_scheduler_RA.c
	openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
	openair2/LAYER2/MAC/eNB_scheduler_primitives.c
	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
	targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
	targets/RT/USER/lte-enb.c
	targets/RT/USER/lte-ru.c
	targets/RT/USER/lte-softmodem.h
2018-08-07 19:44:53 +02:00
Guy De Souza
74ec8b3133 temp debug commit 2018-08-07 17:01:29 +02:00
Calvin HSU
bb47c46c31 UE: samll error fixed. 2018-08-07 16:55:35 +02:00
Calvin HSU
511562bba1 UE: update L2 intra primitives, FAPI message 2018-08-07 16:39:28 +02:00
WEI-TAI CHEN
b9037d1566 Complete merge develop into nr-rrc-additions
First build command : ./build_oai --gNB -w USRP -I
2018-08-07 05:31:52 -07:00
Guy De Souza
8060ffedf3 Payload generation fix 2018-08-07 14:13:14 +02:00
hongzhi wang
248aa02777 ue add waiting time for initial sync 2018-08-07 12:51:30 +02:00
Guy De Souza
d3c11bd5ba Merge branch 'nr_pdcch' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr_pdcch 2018-08-07 11:14:28 +02:00
Guy De Souza
fa1fb8e58b Phytest scheduler fix 2018-08-07 11:14:24 +02:00
yilmazt
3c4d3ef93e Merge branch 'nr_pdcch' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr_pdcch 2018-08-06 17:42:53 +02:00
yilmazt
56448ab70d Addition of polar encoding to scheduler_phytest. 2018-08-06 17:34:05 +02:00
Guy De Souza
a24e5b1a2f Minor changes 2018-08-06 11:04:30 +02:00
WEI-TAI CHEN
3e354e2ece merge develop but not complete [unstable] 2018-08-06 01:46:19 -07:00
WEI-TAI CHEN
9b7143ca86 merge develop 2018-08-05 06:19:32 -07:00
WEI-TAI CHEN
a6c95ca2da Define new structure for fill cellgroupconfig 2018-08-04 07:00:31 -07:00
Calvin HSU
23437bcc5c UE: Add DCI_IND, DL_CONFIG_REQ for DL-SCH 2018-08-03 14:41:59 +02:00
WEI-TAI CHEN
09c00b291b merge develop-nr 2018-08-03 03:33:28 -07:00
WEI-TAI CHEN
037e37eab4 do_SERVINGCELLCONFIGCOMMON will be reuse for fill common config 2018-08-03 03:29:17 -07:00
Guy De Souza
859aa1d28c Initial BWP config 2018-08-03 11:27:08 +02:00
Guy De Souza
271303c57a fill_dci for 1_0 RA_RNTI 2018-08-03 09:59:12 +02:00
WEI-TAI CHEN
02a602fad3 Update the 38331-f21 version 2018-08-02 09:17:00 -07:00
Calvin HSU
459257dae9 UE: Finish Type0-PDCCH scheduling and corresponding FAPI-like message DL_CONFIG_REQ
Procedures based on 38.213 ch.13 and ch.10, 38.211 ch.7.
 - Type0-PDCCH search space
 - Type0-PDCCH coreset
2018-08-02 17:45:55 +02:00
WEI-TAI CHEN
307b763b8d -Uppdate RRC ASN1 Version to 38331-f21
But NR-RRC-Definitions.asn file only include the NR-RRC-Definitions DEFINITIONS section
If we include the NR-UE-Variables into asn file, it will can't be compile in asn tool
and also some of implict problem for new version asn file
2018-08-02 06:39:55 -07:00
Raymond Knopp
44ce13d7de added ru_control.c (extraction of RU state-machine and support functions for fronthaul) 2018-08-02 05:55:50 -07:00
Guy De Souza
32af23b0c1 Debug prints DCI modulation 2018-08-02 10:04:54 +02:00
Guy De Souza
28e71b47cb Merge branch 'nr_pdcch' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr_pdcch 2018-08-02 09:40:22 +02:00
Guy De Souza
96bb073014 Minor fixes scheduler 2018-08-02 09:40:03 +02:00
yilmazt
9489bd9849 Merge branch 'nr_pdcch' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr_pdcch 2018-08-02 03:34:17 +02:00
yilmazt
3ecc2bdf3e Working polartest.c 2018-08-02 03:33:43 +02:00
WEI-TAI CHEN
964970924b fix undefined reference problem in nr-softmodem 2018-08-01 03:50:39 -07:00
Calvin HSU
df7acb2af7 silence asn1c warnings. UE: update rx_ind and fix type0-pdcch 2018-08-01 11:31:46 +02:00
Guy De Souza
6fad29454d dmrs gold sequence bug fix 2018-07-31 17:03:21 +02:00
Guy De Souza
9d8130568c DMRS malloc fix 2018-07-30 16:57:21 +02:00
Guy De Souza
eb7fe10865 Corrections to fill_dci/Compiling 2018-07-30 11:37:58 +02:00
WEI-TAI CHEN
2ed120d266 Since there are some error can't compile for 38311-f21.asn Version, NR RRC ASN go back to 38331-f10 version 2018-07-28 15:08:47 -07:00
Calvin HSU
94d14b4325 CMake: modify nr-uesoftmodem compiling target libraries
NR_LTE_UE_REUSE_LIB: set of files need to be update from LTE to NR version.
2018-07-27 18:26:34 +02:00
Guy De Souza
5d366c9605 Merge branch 'nr_pdcch' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr_pdcch 2018-07-27 16:47:31 +02:00
Guy De Souza
b387b2034e Nfapi struct corrections/ DCI interface/ Phytest scheduler type 1 2018-07-27 15:25:51 +02:00
Calvin HSU
c75c626b38 UE: Add Type0-PDCCH common search space & coreset calculation. 2018-07-26 16:54:41 +02:00
yilmazt
c7bb34aace changes for dci/does not compile 2018-07-26 13:56:04 +02:00
hongzhi wang
d2039b4c73 nr ue update rx sample offset 2018-07-26 11:54:12 +02:00
root
429b22613a fix warning pucch_nr.c 2018-07-25 17:08:33 +02:00
root
dae99fc3ca Merge branch 'develop-nr' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-nr 2018-07-25 16:04:01 +02:00
root
5688983e1f nr PUCCH development: format PUCHH generation, DM-RS generation and mapping to RE 2018-07-25 15:59:38 +02:00
Calvin HSU
8d90ece27a Merge branch 'develop-nr' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-nr 2018-07-25 15:23:57 +02:00
Calvin HSU
a4ee72dbaf UE: Add UL_IND message in IF module, for trigger L2 scheduler per TTI(slot).
Add Type0-PDCCH search space & coreset right after decode MIB and storage corresponding parameters in L2.
2018-07-25 15:22:22 +02:00
Hongzhi Wang
c3420b0198 ue update symbol num synchro 2018-07-25 14:50:56 +02:00
Guy De Souza
45db11de94 Interface adaptations/ gNB Tx procedure update 2018-07-25 14:19:33 +02:00
Hongzhi Wang
734646bccd Merge branch 'nr_pdcch_ue' into develop-nr 2018-07-25 10:48:14 +02:00
Jacques
b2e49fd0a3 nr ue : integration pucch_uci and unit tests 2018-07-25 10:11:19 +02:00
Guy De Souza
fa03cacef7 Compiling version 2018-07-24 17:26:59 +02:00
Guy De Souza
3ac9bd32b3 structures changes/ does not compile 2018-07-24 15:19:31 +02:00
Calvin HSU
bf6744686e UE: Add DL_CONFIG_REQ for PDCCH(DCI) and DLSCH config
clean code
2018-07-24 10:31:45 +02:00
Agustin
28fd97c08c Merge branch 'develop-nr' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-nr 2018-07-23 17:28:50 +02:00
root
adf53b5da9 NR PDCCH development: fix in dci_nr.c 2018-07-23 17:18:47 +02:00
Guy De Souza
88b1b593bf DMRS mapping update for precoder granularity same as reg bundle 2018-07-23 11:40:22 +02:00
Guy De Souza
b464e1adba PDCCH resource mapping DCI payload 2018-07-20 17:22:45 +02:00
hongzhi wang
e1554c6f89 UE: Add P5 phy_config_request with MIB information.
MIB PDU decode complete.
2018-07-20 16:46:42 +02:00
WEI-TAI CHEN
66e4dc7169 LTE eNB RRC update to Rel15 2018-07-20 01:55:57 -07:00
Calvin HSU
33bd476c85 UE: Fixed mac/ue_procedures 2018-07-19 18:27:50 +02:00
hongzhi wang
3a5f22d99d UE: add MAC and RRC instance initialization 2018-07-19 17:37:36 +02:00
Guy De Souza
591522ecfd nfapi changes/payload scrambling 2018-07-19 17:31:36 +02:00
WEI-TAI CHEN
9b1c03d10e -Update LTE RRC ASN to Rel15, but there is a parameter that does not meet the specifications since I modify asn file.
-I modify the name of the parameter "maxRS-IndexCellQual-r15" to "maxRS-IndexCellQualNR-r15" in structure,
 otherwise it will be conflict with the Macro define "#define maxRS_IndexCellQual_r15 (16)" in asn1_constant.h
2018-07-19 07:17:01 -07:00
Agustin
f6197c06d5 nr PDCCH development: time resource assignment according to TS38.214 subclauses 5.1.2.1 and 6.1.2.1 2018-07-19 15:31:24 +02:00
hongzhi wang
0138886bed Merge branch 'nr_pbch_ue' into develop-nr 2018-07-19 15:21:39 +02:00
hongzhi wang
a49a0d627f ue bug fix 2nd unscrambling 2018-07-19 15:11:48 +02:00
WEI-TAI CHEN
6bcbf53743 PDCCH common will put on P5 structure 2018-07-19 01:38:50 -07:00
Guy De Souza
47710949a0 Type 0 pdcch coreset and ss params update 2018-07-18 17:12:29 +02:00
WEI-TAI CHEN
a487b71bd7 Update RRC .asn to f21 2018-07-18 01:22:35 -07:00
Calvin HSU
04a0fa5831 UE: linked IF module, ready for testing 2018-07-17 14:33:55 +02:00
Calvin HSU
283e11e24b Merge branch 'develop-nr' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-nr 2018-07-16 17:19:05 +02:00
Calvin HSU
c7b297cf68 UE: modify pdcch config common, config_ue.c to compatiable RRC setup/release mechanism
deleted files not use
2018-07-16 17:16:29 +02:00
tct-labo4
46d08aedd8 Merge branch 'develop-nr' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-nr 2018-07-16 16:42:42 +02:00
tct-labo4
d978b6d256 fix build nr-softmodem-nos1 2018-07-16 16:41:11 +02:00
Calvin HSU
3e32b94f02 UE: add IF module initialization in nr-ue.c
update author contact information
2018-07-16 15:35:23 +02:00
Guy De Souza
6772e7c6b1 SFN bits interleaving workaround 2018-07-13 15:45:35 +02:00
Guy De Souza
b47547973f DCI size updates 2018-07-13 15:37:04 +02:00
Hongzhi Wang
bdf0d29c20 adding pbch logs 2018-07-13 15:29:32 +02:00
Hongzhi Wang
c4bef81edf ue adding 2nd decrambling and deinterleaving 2018-07-13 15:20:51 +02:00
WEI-TAI CHEN
754c92d4e2 signature 2018-07-13 02:02:08 -07:00
Guy De Souza
7a27b520ff Merge branch 'develop-nr' into nr_pdcch 2018-07-12 16:14:40 +02:00
Guy De Souza
f90bb55383 Debug print fix 2018-07-12 16:14:11 +02:00
Guy De Souza
1fd43c289a Interleaving optimization 2018-07-12 15:48:18 +02:00
Guy De Souza
0234d37743 Merge branch 'nr-rrc-additions' into develop-nr 2018-07-12 13:44:19 +02:00
Guy De Souza
22cd5d61d4 Scrambling 2 nushift update 2018-07-12 13:43:04 +02:00
Guy De Souza
35226d3eb3 Minor fix interleaver 2018-07-12 12:04:01 +02:00
WEI-TAI CHEN
36dedfa413 Merge remote-tracking branch 'origin/develop-nr' into nr-rrc-additions 2018-07-12 02:24:24 -07:00
WEI-TAI CHEN
48f721bf6e Merge remote-tracking branch 'origin/develop-nr' into nr-rrc-additions 2018-07-12 02:23:38 -07:00
Guy De Souza
9a9a83d270 Interleaving fix 2018-07-12 11:15:28 +02:00
WEI-TAI CHEN
c360601735 fix error and warning 2018-07-12 02:10:56 -07:00
WEI-TAI CHEN
e8e8c877b1 Fix warning in upper layer 2018-07-12 01:12:20 -07:00
WEI-TAI CHEN
fb38d1ae95 fix warning for MIB 2018-07-12 00:54:47 -07:00
WEI-TAI CHEN
8c0b196f21 Fix the BIT STRING ERROR problem in MIB 2018-07-12 00:49:40 -07:00
WEI-TAI CHEN
2b3818ce60 Solve undeclared 2018-07-11 08:16:58 -07:00
WEI-TAI CHEN
2077defc24 slove conflict 2018-07-11 07:25:36 -07:00
WEI-TAI CHEN
bb293b7742 In NR,systemFrameNumber : 10 bits, MIB carry 6 bit MSB 2018-07-11 07:22:18 -07:00
Guy De Souza
aeb298d012 Interleaving update 2018-07-11 15:39:49 +02:00
Guy De Souza
b5e227befd Merge branch 'develop-nr' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-nr 2018-07-11 14:42:14 +02:00
Raymond Knopp
0d4b7069d8 Testing MIB ASN1 encoder fail 2018-07-11 13:17:49 +02:00
Calvin
18b62e535e Update FAPI DCI structure from Rel15.1 to Rel15.2
structure name: fapi_nr_dci_pdu_rel15_t
DCI format 0_0
 - define CS-RNTI
 - C-RNTI, CS-RNTI add padding bits
DCI format 0_1
 - define CS-RNTI, SP-CSI-RNTI
 - C-RNTI, CS-RNTI, SP-CSI-RNTI:
   - remove VRB-to-PRB-mapping
   - add UL-SCH indicator
DCI format 1_0
 - define CS-RNTI
 - C-RNTI & freq_domain_resource all ones:
   - add random access preamble index
   - add ul/sch indication
   - add ss/pbch index
   - add prach mask index
 - P-RNTI:
   - add short messages
   - add freq_domain_resource
   - add time_domain_resource
   - add VRB-to-PRB-mapping
   - add NDI
   - add TB scaling
 - SI-RNTI:
   - add freq_domain_resource
   - add time_domain_resource
   - add VRB-to-PRB-mapping
   - add MCS
   - add RV
 - RA-RNTI (for RAR):
   - add TB scaling
   - remove NDI
   - remove RV
   - remove HARQ process number
   - remove Downlink assignment index
   - remove TPC
   - remove PUCCH resource indicator
   - remove PDSCH to HARQ feedback
DCI format 1_1
 - define CS-RNTI
DCI format 2_2
 - change TPC commands to block numbers
 - add closed loop indicator
 - add TPC command
DCI format 2_3
 - add TPC command numbers
2018-07-11 11:31:06 +02:00
Guy De Souza
8a6260d40a Merge branch 'nr-rrc-additions' into develop-nr 2018-07-11 10:37:45 +02:00
WEI-TAI CHEN
7cbc0dc18e fix some warning 2018-07-10 15:48:30 -07:00
Calvin HSU
cf3682e3f1 Fixed error during build procedure 2018-07-10 19:38:47 +02:00
WEI-TAI CHEN
b0bc5e65e2 merge develop-nr 2018-07-10 08:57:08 -07:00
Hongzhi Wang
ecc7f66e4e ue remove warnings dmrs 2018-07-10 16:41:43 +02:00
Hongzhi Wang
31d5682d6b ue adding nr pdsch channel est 2018-07-10 16:34:36 +02:00
WEI-TAI CHEN
dbdcf5b238 Add oai_nfapi_nr_dl_config_req in nfapi_vnf.c 2018-07-10 07:27:23 -07:00
WEI-TAI CHEN
f95989e7e2 Adding function NR_UL_indication 2018-07-10 07:02:07 -07:00
Guy De Souza
940eae3edd Minor temp memset 2018-07-10 15:58:16 +02:00
Guy De Souza
817ea15e9c Merge fixes ctd. 2018-07-10 15:51:43 +02:00
Guy De Souza
05e090db7f Merge conflicts with develop-nr 2018-07-10 15:18:27 +02:00
Guy De Souza
243684844f Nfapi NR extension merge 2018-07-10 15:08:29 +02:00
Guy De Souza
bedee9e37c RRC branch merge fix 2018-07-10 14:50:16 +02:00
yilmazt
d65ff1f023 Merge branch 'develop-nr' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-nr 2018-07-10 13:59:54 +02:00
yilmazt
b27164347c DCI structures 2018-07-10 13:58:07 +02:00
WEI-TAI CHEN
3e54d86e60 Merge remote-tracking branch 'origin/develop-nr' into nr-rrc-additions 2018-07-10 03:26:23 -07:00
WEI-TAI CHEN
b5a55ba93b In NR_UL_indication function call gNB_dlsch_ulsch_scheduler 2018-07-10 03:25:36 -07:00
Raphael Defosseux
131495dc91 CI: removing LPDC decoder file from cppcheck run
-- temporary, will need to compile it in order to generate
     code

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-07-10 11:46:10 +02:00
WEI-TAI CHEN
b7de9abb04 merge nr-develop 2018-07-10 01:45:04 -07:00
WEI-TAI CHEN
26d61373ba gNB_scheduler in testing not complete yet 2018-07-10 01:35:39 -07:00
Guy De Souza
bc4f4ad9c0 tab update 2018-07-10 10:15:30 +02:00
Guy De Souza
1842a727ea Printout formatting 2018-07-10 10:11:45 +02:00
Guy De Souza
5706605561 Merge branch 'develop-nr' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-nr 2018-07-10 09:29:16 +02:00
Guy De Souza
b0b11a9244 Encoding debug data 2018-07-10 09:29:00 +02:00
Hongzhi Wang
8ee10be253 ue nr pdcch channel est update 2018-07-09 17:08:08 +02:00
Calvin HSU
1f439ef2b6 Merge branch 'develop-nr' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-nr 2018-07-09 16:55:44 +02:00
Calvin HSU
d5234dd1fd add P5 config request message for MIB config, system_frame_number, ssb_subcarrier_offset and half_frame_bit
add gitignore for ignoring log, bin, ran_build folders
2018-07-09 16:50:33 +02:00
Guy De Souza
3716e921f6 Scrambling updates 2018-07-09 16:49:54 +02:00
Guy De Souza
f16d6127bf Merge branch 'develop-nr' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-nr 2018-07-09 14:59:51 +02:00
Guy De Souza
89d0971d31 PBCH payload interleaving 2018-07-09 14:59:45 +02:00
WEI-TAI CHEN
2070c982e7 Adding the NR MIB scheduler in eNB_ulsch_dlsch_scheduler, re-use LTE MAC 2018-07-09 04:27:26 -07:00
Agustin
241f57d8f9 NR PDCCH development: V15.2.0 modifications 2018-07-09 08:29:03 +02:00
Calvin HSU
4a05841325 ue add IF module, calculation of system frame and ssb_index 2018-07-06 10:49:58 +02:00
Guy De Souza
15a775f918 PDCCH DMRS modulation 2018-07-04 17:24:19 +02:00
hongzhi wang
f68d124dcc ue changing pbch dmrs modulation 2018-07-04 17:01:41 +02:00
Guy De Souza
966b3a0581 Merge branch 'develop-nr' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-nr 2018-07-04 16:05:24 +02:00
Guy De Souza
aed7cdf158 PBCH scrambling fix 2018-07-04 16:04:59 +02:00
Raphael Defosseux
08b2d4f983 CI: improve stability
-- Added apt-get update before any apt-get command in shell script on VM
     Necessary if the cloud image is a bit out of sync
  -- Added VM memory parameter when creating VM
     Necessary for cppcheck build
  -- Aligned some scripts with develop branch

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-07-04 15:02:33 +02:00
Guy De Souza
eba95e3f03 Merge branch 'develop-nr' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-nr 2018-07-04 10:31:50 +02:00
Guy De Souza
e06e8b2453 PBCH DMRS mmodulation fix/ scrambling update 2018-07-04 10:31:37 +02:00
WEI-TAI CHEN
b3f68c7203 Solve the conflicting types 2018-07-03 03:33:18 -07:00
WEI-TAI CHEN
4c6a31b44e Merge develop-nr 2018-07-03 02:25:04 -07:00
WEI-TAI CHEN
73339bc7f3 Amend to nfapi_nr_config_request_t 2018-07-02 08:08:59 -07:00
Hongzhi Wang
a79992bc75 ue adding nr pdcch channel est 2018-07-02 16:35:39 +02:00
WEI-TAI CHEN
a999051291 Amend L1 instant 2018-07-02 06:45:18 -07:00
WEI-TAI CHEN
4323aa482a Amend L1 instant 2018-07-02 06:22:12 -07:00
WEI-TAI CHEN
bd88e8b4b1 Amend L1 instant to nr 2018-07-02 05:03:00 -07:00
WEI-TAI CHEN
84f238fdea Solve the Segmentation Fault in fill_rf_config function in nr-ru.c 2018-07-02 04:08:27 -07:00
Florian Kaltenberger
d631a32fb3 WIP 2018-07-02 02:30:38 -07:00
Calvin HSU
a8709f0381 ue add MIB RX primitives and RRC 2018-06-29 10:14:02 +02:00
Florian Kaltenberger
58b676e4be Merge branch 'develop-nr' into nr_polar_uci 2018-06-28 04:47:38 -07:00
WEI-TAI CHEN
f767dea2a0 close GTP-U 2018-06-28 01:21:19 -07:00
Guy De Souza
c9e28a2be4 pdcch_dmrs malloc fix 2018-06-27 15:11:46 +02:00
WEI-TAI CHEN
b4fcb04711 Merge branch 'nr-rrc-additions' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr-rrc-additions 2018-06-27 06:00:46 -07:00
WEI-TAI CHEN
9b6c2ca4d7 init NR MAC instance 2018-06-27 05:59:56 -07:00
Calvin
91968d84fc P5 message UL/DL BWP Common/Dedicated finish, primitibes of MIB RX/RRC decode done 2018-06-27 14:39:54 +02:00
WEI-TAI CHEN
7c77013552 Complete solve the Segmentation Fault on do_SERVINGCELLCONFIGCOMMON 2018-06-27 04:05:21 -07:00
Guy De Souza
c34e33bf1e PDCCH DMRS generation/modulation 2018-06-27 12:07:58 +02:00
yilmazt
8d5a66e537 edci.c minor increment update 2018-06-27 11:46:06 +02:00
WEI-TAI CHEN
f701c02fdd Add Log for NR 2018-06-27 01:53:37 -07:00
yilmazt
5d7b79c220 Skeletons for 2 nr_transport files 2018-06-27 10:45:00 +02:00
Raphael Defosseux
9020ffd21b CI: importing the stabilized scripts from develop
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-06-26 17:54:47 +02:00
WEI-TAI CHEN
b57054b665 fix error in do_SERVINGCELLCONFIGCOMMON Function 2018-06-26 08:27:41 -07:00
WEI-TAI CHEN
89e39c8851 -Solve segmentation fault in do_MIB_NR
-Amend do_ServingCellConfigCommon function
2018-06-26 08:11:39 -07:00
hongzhi wang
ff26c55044 Merge branch 'nr_pbch' into develop-nr 2018-06-26 16:45:02 +02:00
hongzhi wang
624fa4dccc ue setting ssb index 2018-06-26 16:35:52 +02:00
hongzhi wang
14cac37d7b ue removing some warnings 2018-06-26 16:00:29 +02:00
hongzhi wang
59e6d72e3d ue pbch update 2018-06-26 15:52:53 +02:00
Bing-Kai Hong
a21258ece7 Update the F1 messages and build scripts for proper generation of F1 messages 2018-06-26 10:58:46 +02:00
Hongzhi Wang
51ffa4f62b ue removing logs 2018-06-26 09:10:15 +02:00
Calvin
607525f84b Merge branch 'nr-rrc-additions' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr-rrc-additions 2018-06-25 15:30:20 +02:00
Calvin
005f49f97d complete P5 dl_bwp_dedicated definition 2018-06-25 15:30:02 +02:00
Raphael Defosseux
8760ad83bc CI: fix on the cppcheck variant tests
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-06-25 14:09:27 +02:00
Raphael Defosseux
a754196899 CI: proper fix on -k option
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-06-25 13:53:18 +02:00
Raphael Defosseux
8e98d2c40b CI: fix in -k option syntax
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-06-25 13:49:57 +02:00
WEI-TAI CHEN
f35f127765 Add the function RCconfig_nr_gtpu 2018-06-25 04:47:10 -07:00
Raphael Defosseux
0b0f70bc48 CI: fix in merge from develop-ci
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-06-25 13:46:32 +02:00
Raphael Defosseux
bee199735f CI: Latest version of CI for gNB project
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-06-25 13:42:14 +02:00
WEI-TAI CHEN
302aea2f15 Amend gNB L1 inst to NR 2018-06-25 03:58:15 -07:00
hongzhi wang
d091e84694 ue nr pbch bug fix 2018-06-25 11:54:18 +02:00
WEI-TAI CHEN
b1d1f4fefd adding f10 asn1 file 2018-06-22 05:59:35 -07:00
WEI-TAI CHEN
a98bf76d19 -Solving some of warning
"implicit declaration of function"
"incompatible pointer type'
2018-06-22 05:42:50 -07:00
Raphael Defosseux
adca460e47 CI: import of scripts into develop-nr
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-06-22 14:14:52 +02:00
Agustin
4580ac1785 NR PDCCH development 2018-06-22 13:06:42 +02:00
hongzhi wang
8ae993aef5 ue add nr pbch unscrambling 2018-06-22 11:19:41 +02:00
WEI-TAI CHEN
5eb919e201 Modify nr_phy_config_request for testing config. module 2018-06-22 01:37:55 -07:00
Guy De Souza
022211cdaf Coreset and search space params 2018-06-22 10:00:03 +02:00
hongzhi wang
227216f023 ue add pbch demodulation 2018-06-21 15:39:58 +02:00
Guy De Souza
b4e3a0412c warning fixes 2018-06-21 14:28:26 +02:00
WEI-TAI CHEN
d78218b2f5 Merge branch 'nr-rrc-additions' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr-rrc-additions 2018-06-21 04:38:24 -07:00
WEI-TAI CHEN
041a7517b2 - Amend P5 interface structure to more like FAPI style in LTE
- Create PDCCH structre in FAPI, it will be one of P7 structure
- Maintain Configuration Module
2018-06-21 04:34:44 -07:00
Calvin
d56c19ccc4 complete P5 ul_bwp_common definition 2018-06-21 13:21:10 +02:00
Calvin
6f91109dbe complete P5 dl_bwp_common definition 2018-06-21 11:59:26 +02:00
Guy De Souza
80dae9d522 minor pdcch changes 2018-06-21 11:09:21 +02:00
Calvin HSU
18314f9796 fixed redundant element from structure 2018-06-19 23:20:38 +02:00
Calvin HSU
e01d0bcc9d fix nfapi struct and nameing rule 2018-06-19 23:16:49 +02:00
Hongzhi Wang
269e2182e4 ue nr pbch update 2018-06-19 15:59:35 +02:00
Hongzhi Wang
1ecb006291 ue adding nr polar decoder 2018-06-19 15:38:30 +02:00
Raymond Knopp
011818e91e extraction of RU control functions from lte-ru.c. Removal of mobipass fronthaul. 2018-06-19 03:51:52 -07:00
hongzhi wang
fbbb2e03cb ue nr pbch channel est fix 2018-06-19 10:15:00 +02:00
Martino
d4fbc3a14d Final version of kernal function, now we save 320 us with the intrinsics 2018-06-18 09:40:29 +02:00
Martino
4626a85dbf Improved intrinsic version: now it's (20us) slower than the normal one 2018-06-17 12:15:21 +02:00
Martino
a3d5d0f889 Kernal operation with avx and avx2 (commented) 2018-06-17 11:39:46 +02:00
WEI-TAI CHEN
5ed0599cec merge develop-nr 2018-06-15 06:39:27 -07:00
Bing-Kai Hong
05c0ab1a76 Merge remote-tracking branch 'origin/develop' into feature-127-protocol-split 2018-06-15 14:33:25 +02:00
WEI-TAI CHEN
ec3786ef0d - Fix the warning in RRC gNB side
- It coulde be build, but there are "implicit declaration of function" warnings in MAC layer.
  Since we re-use the MAC layer function.
- Maybe it is already could be test for configuration module.
2018-06-15 02:53:05 -07:00
Guy De Souza
813df31b5f Merge branch 'develop-nr' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-nr 2018-06-15 11:19:53 +02:00
Guy De Souza
7cbcddc4ff DCI DL PDU creation for nr_nfapi 2018-06-15 11:19:49 +02:00
WEI-TAI CHEN
18e020187e - Fix the warning for declare warning type in GNB_APP 2018-06-15 01:04:28 -07:00
martino
a611e0b955 Fixing of some errors 2018-06-14 19:26:56 +02:00
hongzhi wang
9a5371b172 Merge branch 'develop-nr' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-nr 2018-06-14 16:41:17 +02:00
hongzhi wang
d92bc77a34 ue nr pbch fix 2018-06-14 16:40:15 +02:00
Guy De Souza
a99a7db70c Nfapi extension from nr-rrc-additions 2018-06-14 16:29:31 +02:00
Calvin
d83251d431 implement rrc list module, declair in rrc_inst and initialization, finish part of l12 FAPI messages, DCI0, DCI1, DCI2 and UCI, part of DCI_IND messages 2018-06-14 15:28:58 +02:00
WEI-TAI CHEN
73cfa6bbb6 - Maintain The Configuration Module
- Create task for GAB_APP and GAN_RRC
- Create the NR FAPI for P5 interface
- *It could be build, but still have a lot of warning need to maintain
2018-06-14 06:02:26 -07:00
hongzhi wang
7b5b739e31 ue nr sync update 2018-06-13 18:34:22 +02:00
tct-labo4
e3203bce99 Merge branch 'develop-nr' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-nr 2018-06-13 10:54:01 +02:00
tct-labo4
91423446fd fix gccxml + adding nr_softmodem_nos1 2018-06-13 10:51:55 +02:00
Raymond Knopp
bafd6fbe75 removed logging, fixed drs_modulation after recent change 2018-06-12 14:23:35 -07:00
Hongzhi Wang
2991bbe927 ue bug fix 2018-06-12 19:11:13 +02:00
Hongzhi Wang
98aa9e1c56 ue nr pbch bug fix 2018-06-12 17:43:17 +02:00
Hongzhi Wang
1a039eecbd ue missing files 2018-06-12 17:36:45 +02:00
Hongzhi Wang
44ded7bfc3 ue enable nr channel est 2018-06-12 17:26:27 +02:00
Raymond Knopp
502d6658a0 modification of receive timeout in ethernet library (for fronthaul simulation to setup on slow machines)
removal of some logging in lte-ru
2018-06-12 01:51:06 -07:00
martino
92cdd224d4 Right path to compile new crc functions 2018-06-11 16:07:18 +02:00
Raymond Knopp
5e991ecc3d fixed compilatiaon issues after merge with develop and enhancement-rfsim. Intitial testing with emulator. 2018-06-10 17:10:16 -07:00
Raymond Knopp
45dc7ed608 Merge branch 'enhancement-rfsim' into ru_rau_enhancement
Conflicts:
	cmake_targets/build_oai
	openair1/PHY/LTE_ESTIMATION/lte_sync_time.c
	openair1/PHY/LTE_TRANSPORT/dci_tools.c
	openair1/PHY/LTE_TRANSPORT/if4_tools.c
	openair1/PHY/LTE_TRANSPORT/prach.c
	openair1/PHY/defs_eNB.h
	openair1/PHY/impl_defs_lte.h
	openair2/ENB_APP/enb_config.c
	openair2/LAYER2/MAC/eNB_scheduler.c
	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
	targets/RT/USER/lte-enb.c
	targets/RT/USER/lte-ru.c
	targets/SIMU/USER/channel_sim.c
	targets/SIMU/USER/oaisim.c
	targets/SIMU/USER/oaisim_config.c
	targets/SIMU/USER/oaisim_functions.c
2018-06-10 15:14:09 -07:00
Raymond Knopp
6ecf336ae7 missing declaration 2018-06-10 14:29:45 -07:00
Guy De Souza
50a4a1fded Merge branch 'nr_initialsync' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr_initialsync 2018-06-07 10:14:35 +02:00
Guy De Souza
5da38359ad nfapi_nr_extension update 2018-06-07 10:14:31 +02:00
martino
69767e7d20 New encoding implementation (with AVX 512 commented below) 2018-06-06 19:47:44 +02:00
martino
a77e31b525 New CRC implementation + PUCCH parameters for init 2018-06-06 19:43:57 +02:00
hongzhi wang
0fb133830c nr parms bug fix 2018-06-06 18:16:01 +02:00
Raymond Knopp
cffb083914 Merge branch 'ru_rau_enhancement' of http://gitlab.eurecom.fr/oai/openairinterface5g into ru_rau_enhancement
Conflicts:
	targets/RT/USER/lte-ru.c
2018-06-06 08:12:41 +02:00
Massive
59a07e2117 testing with 2 RUS (changes in default precoder) 2018-06-06 07:46:16 +02:00
hongzhi wang
f0c5dfd603 UE nr parms init bug fix 2018-06-05 16:02:00 +02:00
Hongzhi Wang
a75834cab9 Merge branch 'nr_initialsync' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr_initialsync 2018-06-04 19:07:51 +02:00
Hongzhi Wang
d33269a870 UE adding nr initial_sync 2018-06-04 19:06:36 +02:00
hongzhi wang
a7081fedf7 UE add rf config file 2018-06-04 17:28:05 +02:00
hongzhi wang
e807f7cd97 UE nr thread bug fix 2018-06-04 17:25:40 +02:00
Hongzhi Wang
37e0943783 UE nr enable rf 2018-06-04 15:52:45 +02:00
Hongzhi Wang
e164b980b4 UE nr parms init 2018-06-04 15:23:15 +02:00
sharma
3c1c5a1508 merge in changes from local copy which were made just prior to Orange Research Day demonstration 2018-06-04 08:15:16 +02:00
Hongzhi Wang
de15cf9778 UE adding default params + fft bug fix 2018-06-01 16:56:32 +02:00
Hongzhi Wang
bb78f964cf UE missing file nr_init 2018-06-01 15:10:42 +02:00
Guy De Souza
4e80ce902e Merge branch 'nr_initialsync' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr_initialsync 2018-06-01 13:28:53 +02:00
Guy De Souza
a985544627 fft scaling fix 2018-06-01 13:28:38 +02:00
Hongzhi Wang
de4f43134a Merge branch 'nr_initialsync' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr_initialsync 2018-06-01 13:16:06 +02:00
Hongzhi Wang
55544c5f60 UE adding nr_init 2018-06-01 11:25:52 +02:00
Guy De Souza
4922eea5f0 idft/dft 3072 fix 2018-06-01 10:51:44 +02:00
Guy De Souza
921b728373 Config module init 2018-05-31 10:28:41 +02:00
Hongzhi Wang
77dd1d76ac UE adding config process 2018-05-31 09:58:22 +02:00
Hongzhi
707f3da005 UE small compile bug fix 2018-05-30 17:02:21 +02:00
Raymond Knopp
6bbe833735 fixing for testing 2018-05-30 16:40:27 +02:00
Hongzhi Wang
0ca8286172 Merge branch 'nr_initialsync' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr_initialsync 2018-05-30 16:19:21 +02:00
Hongzhi Wang
7ccf478a56 UE missing files for nr synchro 2018-05-30 16:17:10 +02:00
Guy De Souza
2cb411c5d7 Merge branch 'nr_initialsync' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr_initialsync 2018-05-30 15:33:46 +02:00
Guy De Souza
4f66234773 Merge with nr-rrc-additions 2018-05-30 15:33:25 +02:00
Hongzhi Wang
8aa8b6ca2d Merge branch 'nr_initialsync' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr_initialsync 2018-05-30 12:05:43 +02:00
Hongzhi Wang
fa5e522c1a UE create nr_uesoftmodem + nr synchro 2018-05-30 12:02:34 +02:00
WEI-TAI CHEN
5b94aeac77 Merge nr_initialsync 2018-05-29 03:13:08 -07:00
Guy De Souza
047e8e2cf3 Merge branch 'nr_initialsync' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr_initialsync 2018-05-29 10:30:24 +02:00
Guy De Souza
a9ccf1cac4 3072 dtf/idft implementation 2018-05-29 10:29:51 +02:00
WEI-TAI CHEN
45519c9249 Merge feature-s1ap-r14-based-on-new-asn1c 2018-05-28 08:17:07 -07:00
Raymond Knopp
d9568d2c06 bugfix after merge 2018-05-28 15:31:14 +02:00
WEI-TAI CHEN
33d67f2453 merge S1AP 2018-05-28 05:07:25 -07:00
WEI-TAI CHEN
e9ce528ed7 Modified and fixed common config 2018-05-28 04:52:39 -07:00
Raymond Knopp
8a11946f73 Merge remote-tracking branch 'origin/develop' into ru_rau_enhancement 2018-05-28 11:53:34 +02:00
Raymond Knopp
a0e193c5e8 fixing conflicts 2018-05-27 05:27:58 +02:00
Raymond Knopp
3864136700 fixing conflicts 2018-05-26 06:30:36 +02:00
Raymond Knopp
285e01943d fixing conflicts 2018-05-26 06:26:33 +02:00
Raymond Knopp
8364b4f97d adding thread_tx from develop 2018-05-26 05:49:49 +02:00
Calvin
3b7960d851 1. nr_rrc_mac_config_req_ue 2. copy IF module from eNB to new folder 2018-05-25 16:16:22 +02:00
yilmazt
054ac83d2b Merge branch 'nr_initialsync' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr_initialsync 2018-05-24 18:53:08 +02:00
yilmazt
8b38bfc7c5 General modifications for polar coding, and deleting duplicate functions. 2018-05-24 18:44:01 +02:00
Guy De Souza
065614f0a0 RE jump fix 2018-05-24 16:45:05 +02:00
Guy De Souza
5e980ccd37 PBCH RE mapping fix 2018-05-24 15:05:03 +02:00
Guy De Souza
21fdaecfa0 Merge branch 'nr_initialsync' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr_initialsync 2018-05-24 11:25:57 +02:00
Guy De Souza
12f4c55ff0 PBCH RE mapping 2018-05-24 11:25:15 +02:00
yilmazt
cded3bd65b polartest sync update 2018-05-19 18:24:18 +02:00
WEI-TAI CHEN
6c1c711e08 1. NR gNB Application use ITTI transmit config. to RRC
2.NR RRC do_SERVINGCELLCONFIGCOMMON for all of common config. will be transmit to lower layer by rrc_mac_config_req_gNB"
2018-05-18 08:00:30 -07:00
Guy De Souza
2ef63f24a9 PBCH generation/coding/Modulation 2018-05-18 16:38:41 +02:00
Calvin
5e1c6029e0 Add nr_rrc_mac_config_req_ue function 2018-05-18 13:34:40 +02:00
Guy De Souza
860c99071d Polar encoding init 2018-05-18 09:23:15 +02:00
Guy De Souza
5cf8d93a09 NR Polar imports 2018-05-17 11:50:47 +02:00
Guy De Souza
313cab3d56 nr_transport.h creation 2018-05-17 11:30:38 +02:00
Guy De Souza
d6bbce2194 Minor changes: loop declarations 2018-05-17 10:46:51 +02:00
Guy De Souza
382348adf4 PBCH generation layout 2018-05-17 09:42:16 +02:00
Guy De Souza
5b970ac4a0 lte-softmodem NB_timing fix 2018-05-16 17:21:15 +02:00
Calvin
42afd54598 push EN-DC RRC configuration initizalization 2018-05-16 16:58:43 +02:00
Calvin
afeb57549c push EN-DC RRC configuration initizalization 2018-05-16 16:56:44 +02:00
Guy De Souza
7e5ee477d8 RU malloc fix 2018-05-16 12:11:55 +02:00
Guy De Souza
3ac00170b2 Compiling version- Merge with UE directory split 2018-05-16 11:37:57 +02:00
Raymond Knopp
0ad9ab947c dmrs-based OTA synchronization for RU 2018-05-13 15:53:59 -07:00
Raymond Knopp
fe861bf49e compilation passes and 1 UE simulation ok. 2018-05-13 05:16:57 -07:00
Raymond Knopp
0b89046a81 Merge branch 'ru_rau_enhancement' of https://gitlab.eurecom.fr/oai/openairinterface5g into ru_rau_enhancement 2018-05-13 00:47:48 -07:00
Raymond Knopp
66fe9c5d3b added external-timing option to allow to wait for PPS in usrp_lib.cpp 2018-05-04 17:26:07 +08:00
Raymond Knopp
bb15ec4e4e Merge remote-tracking branch 'origin/develop' into ru_rau_enhancement 2018-05-04 10:30:08 +02:00
Raymond Knopp
0eb2f0175e Support for RAW, not tested yet 2018-05-04 10:29:45 +02:00
Raymond Knopp
9d82d5aebd added command line parameter to set external timing for PPS on USRP. 2018-05-04 15:55:32 +08:00
WEI-TAI CHEN
fa42fa81eb maintain NR configuration 2018-05-03 10:48:52 -07:00
Guy De Souza
8d5e7e4335 Addition of phich_common.c
Merge branch 'develop-uedirectorysplit' into nr_initialsync
2018-05-02 16:22:35 +02:00
Guy De Souza
303d677197 Merge branch 'develop-uedirectorysplit' into nr_initialsync 2018-05-02 16:21:33 +02:00
Guy De Souza
996a3013f6 Shift warning fixes 2018-05-02 11:28:52 +02:00
Guy De Souza
f5ce3af797 BPSK mod fix 2018-05-02 11:04:14 +02:00
Guy De Souza
98a41e8356 PBCH DMRS updated mapping 2018-05-02 08:59:03 +02:00
Guy De Souza
56785bde0c PBCH DMRS TX 2018-04-30 18:17:38 +02:00
Nikos Makris
3aabed57d2 Applied patch for aper asn1c - Compile with flag --pdcp-split 2018-04-27 15:24:17 +03:00
Guy De Souza
f0c7c5ed23 Merge branch 'nr_initialsync' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr_initialsync 2018-04-26 15:08:11 +02:00
Guy De Souza
153b206dd0 DC subcarrier fix/minor changes 2018-04-26 15:07:24 +02:00
WEI-TAI CHEN
fa21ee4548 Merge branch 'nr-rrc-additions' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr-rrc-additions 2018-04-26 03:22:35 -07:00
WEI-TAI CHEN
0a98198763 1. Modify the wrong name file ans1c to asn1c 2.Update the do_MIB function 3.Update the gNB initial parameter for non-standalone 2018-04-26 03:19:29 -07:00
root
1d8f716c71 hardcoding config file for ADRV9371_ZC706 target 2018-04-25 12:35:31 +02:00
root
ab3c963bc4 more missing files 2018-04-25 12:21:41 +02:00
root
97494d747b adding missing config files 2018-04-25 12:18:50 +02:00
root
9248e9ed41 adding CMakelists template for nos1 2018-04-25 12:18:24 +02:00
Guy De Souza
db326bbf44 SSB repositioning 2018-04-25 10:14:54 +02:00
Guy De Souza
fb23ffd61c malloc clear fix 2018-04-24 14:41:09 +02:00
Guy De Souza
8d844fef68 SS debug disabling 2018-04-24 10:35:44 +02:00
Guy De Souza
a72c960e80 txdata fix 2018-04-23 18:25:01 +02:00
Guy De Souza
da3ef78204 SS debug mode 2018-04-20 11:34:10 +02:00
Guy De Souza
8344996895 half frame index fix 2018-04-20 11:02:03 +02:00
Guy De Souza
75471ff721 malloc fix 2 2018-04-18 12:07:52 +02:00
Guy De Souza
ad358decce txdata malloc fix 2018-04-18 11:57:24 +02:00
Guy De Souza
e00192e803 nr_feptx0 restructuring 2018-04-18 11:20:36 +02:00
Guy De Souza
653506c252 NR feptx thread 2018-04-18 10:41:52 +02:00
Guy De Souza
d1f264cd90 feptx ofdm update 2018-04-18 09:47:37 +02:00
Guy De Souza
34aa7fb750 Carrier Freq update 2018-04-17 15:19:57 +02:00
Guy De Souza
ff7c5f5e9d DL freq fix 2018-04-17 12:17:44 +02:00
Guy De Souza
36717c6831 Ofdm mod update 2018-04-17 10:18:00 +02:00
Guy De Souza
1440e3c5ad NR RU procedures 2018-04-16 17:42:17 +02:00
Guy De Souza
4aba771cce CP length/ warnings fix 2018-04-13 15:56:33 +02:00
Calvin
b61b925544 create NR UE directory 2018-04-13 10:59:37 +02:00
WEI-TAI CHEN
c4e0f47570 upload RRC file 2018-04-13 01:52:05 -07:00
WEI-TAI CHEN
0339b49bdf RRC .ans1 file and test asn1c 2018-04-13 01:37:04 -07:00
Guy De Souza
64db7233b9 NR parms fix 2018-04-12 17:04:47 +02:00
Guy De Souza
5cdda33859 Minor config correction 2018-04-12 10:23:32 +02:00
Nikos Makris
da7c24b539 Added definitions for F1AP ASN messages
Added asn1c compiler compatible with the F1AP definitions
Compilation fails for the S1AP messages with "error: unknown type name ‘asn_comp_rval_t’"
2018-04-11 20:45:54 +03:00
Guy De Souza
8dec69ea4f Frame Parms update 2018-04-11 16:38:39 +02:00
Guy De Souza
7e7c15c3b9 NR RU init 2018-04-11 14:31:08 +02:00
Guy De Souza
312cf0bf56 NR config file 2018-04-11 12:06:39 +02:00
Guy De Souza
1447d0fa40 Synchronization signals scheduling update 2018-04-10 14:38:59 +02:00
Florian Kaltenberger
b61e800764 adding LDPC encoder and decoder (from mwc18 branch) 2018-04-09 13:10:17 -07:00
Florian Kaltenberger
4b0a1c06c7 Merge branch 'nr_initialsync' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr_initialsync 2018-04-09 12:45:26 -07:00
Guy De Souza
20fa442b23 gNB Tx procedure 2018-04-09 17:29:55 +02:00
Florian Kaltenberger
a413f12d9c adding support for bandwidths 40 and 80 MHz to usrp_lib and rru 2018-04-09 08:07:52 -07:00
Florian Kaltenberger
dc30b30bf7 Merge branch 'nr_initialsync' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr_initialsync 2018-04-09 05:48:04 -07:00
Guy De Souza
1b68a4f270 NR exe update(compiling) 2018-04-09 14:42:32 +02:00
Florian Kaltenberger
c2aabeaabf Merge branch 'nr_initialsync' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr_initialsync 2018-04-06 01:28:32 -07:00
root
6f290e7125 UE add RF board ZC706+AD9371
Conflicts:
	cmake_targets/build_oai
	openair1/PHY/LTE_TRANSPORT/prach.c
	openair1/SCHED/phy_procedures_lte_ue.c
	targets/ARCH/COMMON/common_lib.h
	targets/RT/USER/lte-softmodem.c
2018-04-06 01:28:22 -07:00
Raymond Knopp
497c818b02 removed some logging 2018-04-05 12:26:02 -07:00
Guy De Souza
7b524674c6 Intermediate commit/ Not working(defs issue) 2018-04-05 16:48:26 +02:00
Nikos Makris
4195681fc9 Merge remote-tracking branch 'origin/develop' into feature-127-protocol-split
Tested with one UE
Possibly broken FLEXRAN (different methods for configuring the link manager)
2018-04-05 13:22:12 +03:00
Guy De Souza
a18969824b nfapi nr extension update 2018-04-02 14:48:17 +02:00
Guy De Souza
d7ab43cee5 NR_PSS/NR_SSS 2018-04-02 14:08:52 +02:00
Bi-Ruei, Chiu
7321aab67e Add S1AP R14 based on new asn1c
This feature requires an un-official version of asn1c :

https://github.com/velichkov/asn1c/tree/s1ap
2018-03-28 00:19:01 +08:00
Guy De Souza
c4fd4dcab3 nfapi extension/ test nr-softmodem 2018-03-27 13:52:16 +02:00
Raymond Knopp
03dfe63a1b reseting in_synch after receiving RU_CONFIG 2018-03-26 16:34:53 +02:00
Raymond Knopp
df9827b5fb changes for TDD 2018-03-25 23:57:33 -07:00
Guy De Souza
e88abf27c2 3/4 sampling for 80MHz / Max ofdm size 4096 2018-03-22 16:27:30 +01:00
Guy De Souza
8d953b0952 Frame parms init 30kHz-106/217 PRB 2018-03-22 15:20:05 +01:00
Guy De Souza
2fe84d937c Build folder change/ NR exec 2018-03-22 11:03:32 +01:00
Guy De Souza
e8282dc406 Build_oai changes for NR 2018-03-21 17:09:28 +01:00
Raymond Knopp
d312f9c805 debugging for TDD 2018-03-19 01:10:10 -07:00
Raymond Knopp
c4a81c2215 changes for TDD signaling. 2018-03-13 16:18:26 +01:00
Raymond Knopp
f8f6f003ef Bugfix 2018-03-12 13:54:09 +01:00
Raymond Knopp
1f130faf17 Resolving Merge conflicts 2018-03-12 13:48:12 +01:00
Raymond Knopp
ffe2967d81 Split init and config USRP device. It seems to have solved the stop/restart RAU without stopping the RRU 2018-03-12 11:31:08 +01:00
Raymond Knopp
9a373b2897 oaisim updates after merge with develop 2018-03-11 19:43:44 +01:00
Raymond Knopp
c42a4f4baa testing monolithic eNodeB after merge with develop. Changes : don't create ru_thread_control and add initalization procedures during configuration instead. 2018-03-11 10:11:19 +01:00
Raymond Knopp
bf846280d1 removal of warnings 2018-03-11 09:20:45 +01:00
Raymond Knopp
4d71261cb9 Merge remote-tracking branch 'origin/develop' into ru_rau_enhancement
Conflicts:
	cmake_targets/CMakeLists.txt
	openair1/PHY/INIT/lte_init_ru.c
	openair1/PHY/defs.h
	openair2/ENB_APP/enb_paramdef.h
	targets/RT/USER/lte-ru.c
2018-03-11 08:45:09 +01:00
Raymond Knopp
79c8d0e0cb updates for IF4p5 to handle >1 nb_rx/nb_tx. Tested with 2x2 2018-03-10 16:19:40 +01:00
Raymond Knopp
49bb8b4cd7 bug fixes in channel simulation routines for multi-UE 2018-03-10 00:02:50 +01:00
Raymond Knopp
6a4abf1464 modifications to default configuration files for oaisim and some minor chanes to lte-ru.c for simulator target 2018-03-09 10:48:32 -08:00
Younes
bc0ae0fce9 Merge branch 'ru_rau_enhancement' of https://gitlab.eurecom.fr/oai/openairinterface5g into ru_rau_enhancement 2018-03-05 08:17:10 +01:00
Younes
a4660d322d minor changes in RRU portion for frame resynch 2018-03-05 08:16:55 +01:00
Raymond Knopp
271b761a64 frame resynch completed. to be tested with more than 2 RRU. 2018-03-05 08:15:46 +01:00
Raymond Knopp
4afeaaf2ff Merge branch 'ru_rau_enhancement' of https://gitlab.eurecom.fr/oai/openairinterface5g into ru_rau_enhancement 2018-03-04 18:39:24 +01:00
Raymond Knopp
570ac353f1 frame resynchronization in RAU and RRU 2018-03-04 18:38:43 +01:00
Younes
e57ecfb7f8 modifications for RU synch 2018-03-03 21:33:15 +01:00
Raymond Knopp
b68e7d76eb fixes for if4p5 RRU 2018-03-03 09:36:31 +01:00
Raymond Knopp
103471e9cc added "is_slave" flag parsing to RAU 2018-03-02 20:08:27 +01:00
Raymond Knopp
58fb23757f Merge branch 'ru_rau_enhancement' of https://gitlab.eurecom.fr/oai/openairinterface5g into ru_rau_enhancement 2018-03-02 17:06:02 +01:00
Younes
cbecc5860c modifications for Synch procedure in RU 2018-03-02 17:02:54 +01:00
Younes
34be055fb3 changes in RAU handling of multiple RRUs 2018-03-02 17:01:20 +01:00
Younes
96c12c86d9 some conditions for TDD which were asserting after latest NFAPI merge. 2018-03-02 12:19:27 +01:00
Raymond Knopp
4695d16cf9 handling of RU_IDLE->RU_RUN->RU_IDLE 2018-02-25 21:58:26 +01:00
Raymond Knopp
1bf4541190 Merge branch 'ru_rau_enhancement' of https://gitlab.eurecom.fr/oai/openairinterface5g into ru_rau_enhancement
Conflicts:
	targets/SIMU/USER/oaisim.c
2018-02-25 18:24:58 +01:00
Raymond Knopp
5abbdaa39c debugging for RU state control 2018-02-25 18:24:14 +01:00
Raymond Knopp
75325ec79e debbuging for RU state control 2018-02-25 18:23:40 +01:00
Raymond Knopp
d4eb54660a indentation of lte-ru.c 2018-02-23 16:10:02 -08:00
Raymond Knopp
1547de9ad8 debugging for simulator target 2018-02-24 01:04:01 +01:00
Raymond Knopp
72cd1b1d7c update lte-softmodem for init_RU 2018-02-23 18:11:58 +01:00
Raymond Knopp
5cb9fcfce7 fixed compilation error in lte-ru.c Added modifications for oaisim from other branch. 2018-02-23 17:18:52 +01:00
Younes
3ab54c8a4b gpio fix 2018-02-23 16:50:32 +01:00
khadraou
de5e5beee1 Merge remote-tracking branch 'origin/develop' into ru_rau_enhancement 2018-02-22 17:11:44 +01:00
Younes
e2ddd50fde Dealing with connection lost case. Now the RRU keeps working but we can't restart it again, a problem with the USRP load 2018-02-22 15:54:27 +01:00
Younes
ecd1f9f3e1 Dealing with the case of keeping RRU working if RAU is down 2018-02-21 15:10:42 +01:00
Nikos Makris
73691de7f6 Fixes that were affecting the communication between PDCP and RLC, cleanup 2018-02-08 19:13:34 +02:00
Nikos Makris
fc43139e6a Merge remote-tracking branch 'origin/develop' into feature-127-protocol-split
Compile with  ./build_oai --eNB -w USRP --pdcp-split
2018-02-07 19:31:51 +02:00
Raymond Knopp
f9aba7ac0f OTA synchronization for TDD. Added PSS position computation for testing on EURECOM CRAN. 2018-02-04 02:18:24 -08:00
Nikos Makris
bc0f49cea0 Merge remote-tracking branch 'origin/develop' into feature-127-protocol-split
OAISIM NoS1 broken, needs fixing (no linking of libraries for the UE code)
2018-02-02 20:21:34 +02:00
Younes
9e69e729c5 bugfix 2018-02-02 16:51:59 +01:00
Younes
57f02ec182 bugfix 2018-02-02 16:35:30 +01:00
Younes
7c4e75d018 Send RRU_sync_ok once RRU is in sync 2018-02-02 16:32:22 +01:00
Younes
6e3f57cbe1 added msg type RRU_sync 2018-02-02 16:23:32 +01:00
Younes
58948310b3 Slave RU can now synchronize, the problem was in nb_antennas_rx which is init in UE but not in RU. I added it in ru_thread_control, but it should be done somewhere else. Added msg RRU_sync_ok from RRU to RAU to inform the RAU that the RRU is in sync 2018-02-02 16:22:08 +01:00
Younes
1783066561 removed log 2018-02-02 11:10:08 +01:00
Younes
9d8c205073 Removed some logs 2018-02-02 11:06:49 +01:00
Younes
e0a0f7ed8b Merge branch 'ru_rau_enhancement' of https://gitlab.eurecom.fr/oai/openairinterface5g into ru_rau_enhancement 2018-02-02 10:55:28 +01:00
Younes
785a435fe0 bugfix in configuring ru from file, at_rx was set to att_tx 2018-02-02 10:53:22 +01:00
Younes
becbaf2006 bugfix in do_ru_synch 2018-01-29 16:04:45 +01:00
Younes
a32775149a commented freq adjustment in do_ru_sync 2018-01-29 16:00:28 +01:00
Younes
4f23f5427c mask adjustment to take into account RRUs not in SYNC 2018-01-29 15:58:12 +01:00
Younes
9255b3b97b Commented MTU tuning 2018-01-29 14:45:55 +01:00
Raymond Knopp
1b87fe8f51 split of external clock and external time sources 2018-01-26 23:53:02 +01:00
Younes
ba5e3e7463 clock source / timing source split.
MTU tuning removed for now.
2018-01-26 16:06:15 +01:00
Younes
22638ba012 Merge branch 'develop-nos1-fixes' into ru_rau_enhancement 2018-01-15 14:32:57 +01:00
Younes
767621ce28 fixing diffs to merge with develop-nos1-fixes 2018-01-15 14:32:02 +01:00
Eurecom
f3be3c4d7b signal output when sync 2017-12-20 16:20:35 +01:00
Eurecom
384e113660 signal output when sync 2017-12-20 16:02:00 +01:00
Eurecom
d7718fb298 signal output when sync 2017-12-20 15:41:26 +01:00
Eurecom
a564363221 bugfix 2017-12-20 15:04:27 +01:00
Eurecom
92d0610c60 bugfix 2017-12-20 15:01:11 +01:00
Eurecom
0f0204556d added config slave 2017-12-20 14:50:27 +01:00
Eurecom
30857e8d74 bugfix 2017-12-20 14:43:32 +01:00
Eurecom
04230dcaa2 Merge branch 'ru_rau_enhancement' of https://gitlab.eurecom.fr/oai/openairinterface5g into ru_rau_enhancement 2017-12-20 14:32:04 +01:00
khadraou
7fcb24e6d8 dealing with sync 2017-12-20 14:30:20 +01:00
Eurecom
7be8f7bddc some logs 2017-12-20 14:28:37 +01:00
khadraou
ebb53665d9 dealing with sync 2017-12-20 14:26:10 +01:00
Eurecom
efabb8b687 signal output when sync 2017-12-20 11:40:37 +01:00
Eurecom
80ec6e5e6f signal output when sync 2017-12-20 11:26:45 +01:00
Eurecom
0a953c91d4 signal output when sync 2017-12-20 11:26:08 +01:00
Eurecom
4b69b75b5e signal output when sync 2017-12-20 11:17:58 +01:00
Eurecom
7c5c6e62ba lte_sync_time_eNB logs 2017-12-20 11:06:35 +01:00
Eurecom
eeb399177a lte_sync_time assertFatal added 2017-12-20 11:02:05 +01:00
Eurecom
4c59670399 slave in configfile 2017-12-19 16:45:40 +01:00
Eurecom
70388157af added is_slave to config file 2017-12-19 16:41:07 +01:00
Eurecom
58d9901683 Set RU 0 to master and others to slave. Testing the synch 2017-12-19 15:32:18 +01:00
Eurecom
9d687c8d84 Set RU 0 to master and others to slave. Testing the synch 2017-12-19 15:23:28 +01:00
Eurecom
9b4938293b Set RU 0 to master and others to slave. Testing the synch 2017-12-19 15:13:12 +01:00
Eurecom
f161b406dc Set RU 0 to master and others to slave. Testing the synch 2017-12-19 14:34:36 +01:00
Eurecom
630746e49f Set RU 0 to master and others to slave. Testing the synch 2017-12-19 14:28:27 +01:00
Eurecom
a65a29f91a Bugfix for multiple RRUs. Tested with 2 2017-12-19 10:43:54 +01:00
Eurecom
8414e01f19 VCD logs for frame_number_eNB 2017-12-18 14:51:56 +01:00
khadraou
59b77ffcf8 bugfix 2017-12-14 14:00:56 +01:00
khadraou
24c84695e5 bugfix 2017-12-14 10:09:53 +01:00
khadraou
e015b521d7 bugfix 2017-12-14 09:31:37 +01:00
khadraou
b5a28996c7 bugfix 2017-12-14 09:09:31 +01:00
khadraou
34b16b004f bugfix 2017-12-13 17:12:11 +01:00
khadraou
e4a3a539a5 bugfix 2017-12-13 17:09:36 +01:00
khadraou
0dcc9e8284 bugfix 2017-12-13 17:00:09 +01:00
khadraou
a83218a0dd bugfix 2017-12-13 16:39:49 +01:00
khadraou
362e7c1403 bugfix 2017-12-13 16:38:28 +01:00
khadraou
3a84acfe42 bugfix 2017-12-13 16:25:20 +01:00
khadraou
16f9d4974b bugfix 2017-12-13 16:24:27 +01:00
khadraou
e289be953e bugfix 2017-12-13 15:34:45 +01:00
khadraou
0ef072c722 bugfix 2017-12-13 15:29:58 +01:00
khadraou
eda72f0e8a bugfix 2017-12-13 15:28:48 +01:00
khadraou
c41601908e bugfix 2017-12-13 14:28:13 +01:00
khadraou
6d84da68ef bugfix 2017-12-13 14:26:51 +01:00
khadraou
04e37e9ae2 bugfix 2017-12-13 14:19:09 +01:00
khadraou
c935816d6a bugfix 2017-12-13 12:02:34 +01:00
khadraou
5c5c8c4eb2 ru_thread_control: still missing stop ru_thread; not tested 2017-12-13 11:40:37 +01:00
khadraou
c3a7a7286d added some members to RU_proc, RU_struct, other type of msg and states for RU 2017-12-13 11:40:31 +01:00
khadraou
ca0a6820b9 added some members to RU_proc, RU_struct, other type of msg and states for RU 2017-12-13 11:32:09 +01:00
khadraou
3f2df9bb1e added some members to RU_proc, RU_struct, other type of msg and states for RU 2017-12-13 11:23:53 +01:00
khadraou
242beed0e3 ru_thread_control: still missing stop ru_thread; not tested 2017-12-13 11:21:49 +01:00
khadraou
c9908f536c ru_thread_control: still missing stop ru_thread; not tested 2017-12-13 11:05:54 +01:00
khadraou
c5ea577e3d some code in ru_thread_control, still need to remove redundant code in ru_thread, add the state to ru struct, all ru_thread changes still need to be done 2017-12-07 12:03:44 +01:00
Younes
93551181f3 thread control lte-ru 2017-12-04 10:37:15 +01:00
sharma
f32355c7dd added handling of narrowbands for ULSCH scheduling 2017-12-03 03:49:29 +01:00
sharma
18d996ebd6 addition of UL scheduler for eMTC 2017-12-03 00:08:04 +01:00
sharma
3a2f4c797a debugging of Msg4 2017-11-29 07:54:41 +01:00
Raymond Knopp
500e826c14 aligned nDMRS1 parameter in LTE and LTE-M sections of SIB2 until L1 uses LTE-M parameters for PUSCH 2017-11-26 08:37:23 -08:00
Raymond Knopp
dd695beb5e functions up to Msg3 reception. Still a bug in decoding, signal is perfect, but decoding fails. probably an issue in the descrambling 2017-11-26 03:22:29 -08:00
Raymond Knopp
7db69e3ad5 MPDCCH resource element fix 2017-11-21 17:24:51 +01:00
Raymond Knopp
7451f4c9f5 fixed MPDDCH resource element mappings and DMRS scrambling initialization 2017-11-21 08:00:48 +01:00
Raymond Knopp
2d97eb4b34 more debugging of RA procedure for eMTC 2017-11-19 12:09:52 +01:00
Cedric Roux
ae0494b0bc Merge remote-tracking branch 'origin/bugfix-tdd-usrp' 2017-11-17 15:59:21 +01:00
Raymond Knopp
97097a8c49 more debugging for RA procedures for eMTC 2017-11-16 09:35:39 +01:00
Raymond Knopp
71dbefe981 activated debugging traces for Msg2 MPDCCH/PDSCH 2017-11-16 06:15:45 +01:00
Raymond Knopp
d135627884 integration of mpdcch format 2,3,5, wired for format 5 only. integration of mpdcch dmrs signals. 2017-11-05 12:27:46 -08:00
Raymond Knopp
e4f82c5e95 Merge branch 'RU-RAU-split' of https://gitlab.eurecom.fr/raymond.knopp/openairinterface5g into RU-RAU-split
Conflicts:
	openair1/PHY/LTE_TRANSPORT/edci.c
	openair2/LAYER2/MAC/eNB_scheduler_RA.c
2017-11-05 05:26:01 -08:00
Raymond Knopp
decdded21b debugging for MPDCCH 2017-11-05 05:19:40 -08:00
Raymond Knopp
3a4343708b modifications for MPDCCH 2017-11-05 14:18:19 +01:00
Raymond Knopp
c8070607a9 small fix on MPDCCH repetition handling and logging 2017-10-28 21:17:30 -07:00
Raymond Knopp
51a9107c14 Merge branch 'RU-RAU-split' of https://gitlab.eurecom.fr/oai/openairinterface5g into RU-RAU-split
Conflicts:
	openair1/SCHED/phy_procedures_lte_eNb.c
	openair2/ENB_APP/enb_config.c
	openair2/LAYER2/MAC/eNB_scheduler_primitives.c
	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
	openair2/RRC/LITE/MESSAGES/asn1_msg.c
	targets/RT/USER/lte-ru.c
2017-10-25 00:40:20 +02:00
Raymond Knopp
1c33d18df1 logging 2017-10-24 19:26:25 +02:00
Raymond Knopp
90f0886261 Merge branch 'RU-RAU-split' of https://gitlab.eurecom.fr/oai/openairinterface5g into RU-RAU-split 2017-10-24 00:55:40 +02:00
Raymond Knopp
b18f9d6a76 minor chanels for IF4p5 in RRU 2017-10-24 00:55:24 +02:00
Eurecom
ab058059ac minor changes for IF4p5 in RAU. 2017-10-24 00:54:45 +02:00
Raymond Knopp
5d5efb7b74 IF4p5 optimizations for RRU and more inline performance statistics for RRU 2017-10-23 19:48:13 +02:00
Raymond Knopp
0a90e36087 Merge branch 'RU-RAU-split' of https://gitlab.eurecom.fr/oai/openairinterface5g into RU-RAU-split 2017-10-23 19:25:25 +02:00
Raymond Knopp
56e74b7886 noise measurements used for PUCCH/PUSCH 2017-10-23 19:24:53 +02:00
Florian Kaltenberger
67df8e0e7b fix to previous commit 2017-10-23 16:42:54 +02:00
Cedric Roux
c0a64ed506 Merge remote-tracking branch 'origin/develop'
New version 0.6.1.

Mostly bugfixes.

Conflicts:
	cmake_targets/tools/build_helper
2017-10-23 15:22:42 +02:00
Florian Kaltenberger
4989c0f030 fix for TDD: TX is powered on a few samples earlier to allow it to settle before start of DL 2017-10-19 18:03:01 +02:00
Florian Kaltenberger
55f0fc30bf new config files 2017-10-19 18:02:44 +02:00
Ahmed Elias
e42505648c Solving minor issue in configuration 2017-10-17 13:05:04 +02:00
mohamed.said
7cecfa10e3 Stable version of configuration 2017-10-16 19:44:29 +02:00
mohamed.said
78408cc697 added missing definitions in enb_paramdef.h ,, assigned some br values in enb_config.c 2017-10-15 22:51:24 +02:00
mohamed.said
06e9aacc64 fixed some br parameters in the macro definition 2017-10-15 15:19:04 +02:00
Ahmed Elias
40cbafa757 Reading BR parameters from configuration 2017-10-15 13:23:41 +02:00
Ahmed Elias
56eedf67fa semi stablr version still need to add br configuration parameters 2017-10-15 08:47:46 +02:00
kogo
1ee9b1b684 modified enb_paramdef.h file ,, parameters fixing 2017-10-11 20:03:37 +02:00
Ahmed Elias
d34226c8b2 resolving compilation errors (temp commit) 2017-10-11 19:06:06 +02:00
Raymond Knopp
cd318b327a filled in parameter definitions 2017-10-11 05:29:19 -07:00
Raymond Knopp
cb33ca456a partial adaption of configuration parameters 2017-10-11 02:45:26 -07:00
Raymond Knopp
4fc7846f13 Merge branch 'RU-RAU-split' of https://gitlab.eurecom.fr/oai/openairinterface5g into RU-RAU-split
Conflicts:
	openair1/PHY/INIT/lte_init.c
	openair1/PHY/LTE_TRANSPORT/dlsch_coding.c
	openair1/PHY/LTE_TRANSPORT/prach.c
	openair1/SCHED/phy_procedures_lte_eNb.c
	openair2/ENB_APP/enb_config.c
	openair2/LAYER2/MAC/defs.h
	openair2/LAYER2/MAC/eNB_scheduler.c
	openair2/LAYER2/MAC/eNB_scheduler_RA.c
	openair2/LAYER2/MAC/eNB_scheduler_bch.c
	openair2/LAYER2/MAC/eNB_scheduler_primitives.c
	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
	openair2/LAYER2/MAC/rar_tools.c
	openair2/RRC/LITE/MESSAGES/asn1_msg.c
	openair2/RRC/LITE/rrc_eNB.c
2017-10-10 22:09:13 -07:00
Ahmed Elias
3289891e9d Update do_RRCConnectionReconfiguration_BR method 2017-09-07 04:00:55 -07:00
kogo
707f2745ae Merge branch 'RU-RAU-split' of https://gitlab.eurecom.fr/raymond.knopp/openairinterface5g into RU-RAU-split 2017-08-30 17:00:39 +02:00
kogo
1b429a63da refactored config file, SIB1 & SIB2 are sent/received successfully 2017-08-30 16:59:58 +02:00
khalidhamdy
c8f960c977 edit scheduler for emtc UE 2017-08-23 13:25:43 +02:00
khalidhamdy
18d57dbbba Merge branch 'RU-RAU-split' of https://gitlab.eurecom.fr/raymond.knopp/openairinterface5g into RU-RAU-split 2017-08-23 12:59:47 +02:00
Ahmed Elias
a8e8f14fbb Merge branch 'RU-RAU-split' of https://gitlab.eurecom.fr/raymond.knopp/openairinterface5g into RU-RAU-split 2017-08-22 08:59:47 -07:00
Ahmed Elias
e0be431a2c minor update in asn file 2017-08-22 08:58:15 -07:00
kogo
b6bc4bc8ba Merge branch 'RU-RAU-split' of https://gitlab.eurecom.fr/raymond.knopp/openairinterface5g into RU-RAU-split 2017-08-21 17:56:18 +02:00
kogo
aec3cad8cf rearranged enb_config.c 2017-08-21 17:55:37 +02:00
islam.galal
9d7abfe0b4 Merge branch 'RU-RAU-split' of http://gitlab.eurecom.fr/raymond.knopp/openairinterface5g into RU-RAU-split 2017-08-21 14:13:19 +02:00
islam.galal
a86f8cdb79 Update RRCConectionSetup_BR 2017-08-21 14:11:09 +02:00
kogo
d45b6c1f20 rearranged conf file - added pdsch_configcommon_v1310 & pusch_configcommon_v1310 2017-08-21 13:34:20 +02:00
Raymond Knopp
94c433d6a0 integration of RAR and Msg3 programming for eMTC 2017-08-17 18:36:40 +02:00
Raymond Knopp
322f8cbb66 Merge branch 'RU-RAU-split' of http://gitlab.eurecom.fr/raymond.knopp/openairinterface5g into RU-RAU-split 2017-08-17 16:25:27 +02:00
Raymond Knopp
8f0ba722f6 first half of RA procedure. PRACH reception functional for CElevel0. Up to RAR generation. 2017-08-17 16:22:04 +02:00
khalidhamdy
3c2ee62797 Merge branch 'RU-RAU-split' of https://gitlab.eurecom.fr/raymond.knopp/openairinterface5g into RU-RAU-split 2017-08-17 15:50:45 +02:00
mohamed.said
0a4fd47334 updated fill_rar_brY 2017-08-17 14:06:00 +02:00
mohamed.said
874e0cf9e5 Reviewing do_RRCConnectionSetup_BR 2017-08-17 12:52:20 +02:00
Raymond Knopp
fde6645f5f Merge branch 'RU-RAU-split' of https://gitlab.eurecom.fr/oai/openairinterface5g into RU-RAU-split
Conflicts:
	openair1/PHY/LTE_TRANSPORT/edci.c
2017-08-17 01:18:27 -07:00
Raymond Knopp
52afb72d29 Merge branch 'RU-RAU-split' of https://gitlab.eurecom.fr/oai/openairinterface5g into RU-RAU-split
Conflicts:
	openair1/PHY/LTE_TRANSPORT/defs.h
	openair1/PHY/LTE_TRANSPORT/dlsch_scrambling.c
	openair1/SCHED/phy_procedures_lte_eNb.c
2017-08-17 01:04:55 -07:00
khalidhamdy
2278a0ef2b Merge branch 'RU-RAU-split' of https://gitlab.eurecom.fr/raymond.knopp/openairinterface5g into RU-RAU-split 2017-08-17 09:48:45 +02:00
islam.galal
1ca5c8c405 fixing prach configurations 2017-08-16 18:58:15 +02:00
khalidhamdy
7d7adbac35 adding the vrb map in sceduler of BR 2017-08-16 17:25:09 +02:00
islam.galal
a0f2d4815e eMTC modem receives SIB1 & SIB23 successfully 2017-08-16 16:17:40 +02:00
islam.galal
4d6af68714 added edci.c and minor configuration changes 2017-08-16 15:00:01 +02:00
islam.galal
82cd728edb small changes 2017-08-16 13:40:04 +02:00
islam.galal
91beb110f0 hard-coded PUSCH/PDSCH-Config-Common-v1310, harmonization of configuration file with eMTC config from samples of Verizon network 2017-08-16 13:18:51 +02:00
islam.galal
c0b0ed5a57 SIB2-BR configuration parameters 2017-08-16 12:54:13 +02:00
mohamed.said
8ec2f370b0 added frequncy hopping config in do_SIB23 - ready to test 2017-08-16 12:39:16 +02:00
mohamed.said
defe1ece09 Fixed memory allocation bugs in asn1_msg.c (SIB1 & SIB23) ASN1C issue 2017-08-16 10:43:12 +02:00
Cedric Roux
c453bb9145 fix RSRP_Range allocation in prach_ConfigCommon_v1310 2017-08-16 10:11:54 +02:00
islam.galal
291616328e integration and testing of SIB2 integrity 2017-08-15 19:01:47 +02:00
islam.galal
d4483259bd Merge branch 'RU-RAU-split' of http://gitlab.eurecom.fr/raymond.knopp/openairinterface5g into RU-RAU-split 2017-08-15 15:51:02 +02:00
islam.galal
44fc7753b6 modifications in SI scheduler during interop testing with Sequans module. Some changes in eMTC config file. 2017-08-15 15:50:18 +02:00
mohamed.said
aeda8e5cec added pcch_config_v1310 to config file and handled in enb_config.c , asn1_msg.c 2017-08-15 15:49:11 +02:00
mohamed.said
3d1adb066e Merge branch 'RU-RAU-split' of https://gitlab.eurecom.fr/raymond.knopp/openairinterface5g into RU-RAU-split
MAC bug fixe
2017-08-15 14:54:16 +02:00
mohamed.said
5d157436c2 SIB1 system info value tag made optional 2017-08-15 14:53:45 +02:00
khalidhamdy
280d57018e fix mpdcch uespec search space parameters 2017-08-15 14:16:29 +02:00
islam.galal
13cbd3022f Merge branch 'RU-RAU-split' of http://gitlab.eurecom.fr/raymond.knopp/openairinterface5g into RU-RAU-split 2017-08-15 13:56:16 +02:00
mohamed.said
feaa8e2888 fixed fdd_uplinkBitmap 2017-08-15 13:55:36 +02:00
islam.galal
f2adfceeb7 Merge branch 'RU-RAU-split' of http://gitlab.eurecom.fr/raymond.knopp/openairinterface5g into RU-RAU-split 2017-08-15 13:34:29 +02:00
islam.galal
32201bf30b commit before merge from repository 2017-08-15 13:34:09 +02:00
mohamed.said
f0376c7e19 updated fdd_DownlinkSubframe in enb_config.c , do_SIB1 and rrc_message_types.h 2017-08-15 13:31:14 +02:00
mohamed.said
3a6a00ac44 Merge branch 'RU-RAU-split' of https://gitlab.eurecom.fr/raymond.knopp/openairinterface5g into RU-RAU-split
Fixing SIB1_BR and do_RRCConnectionSetup_BR
2017-08-15 12:07:32 +02:00
mohamed.said
d160ae244a fixing issues in do_RRCConnectionSetup_BR 2017-08-15 12:00:30 +02:00
khalidhamdy
db9f855b3b add UEspec mpdcch search space subframe rule 2017-08-15 11:48:29 +02:00
islam.galal
4a067bd119 band 13 50 PRB configuration file including eMTC resources 2017-08-15 10:07:04 +02:00
khalidhamdy
8182906564 Adding Schedule UE Spec BR Method 2017-08-15 10:05:54 +02:00
Raymond Knopp
7876b46ff7 Merge branch 'RU-RAU-split' of https://gitlab.eurecom.fr/oai/openairinterface5g into RU-RAU-split
Conflicts:
	openair2/LAYER2/MAC/eNB_scheduler_bch.c
2017-08-15 00:58:30 -07:00
islam.galal
5801bf7cb6 Merge branch 'RU-RAU-split' of http://gitlab.eurecom.fr/raymond.knopp/openairinterface5g into RU-RAU-split 2017-08-14 18:44:38 +02:00
islam.galal
79d77a4af8 debugging for SIB1-BR 2017-08-14 18:43:49 +02:00
khalidhamdy
8e73bca80f fix some errors while merging BR edit 2017-08-14 15:39:51 +02:00
Ahmed.Elias
3e77b141eb adding br parameters 2017-08-14 15:15:15 +02:00
khalidhamdy
ae598b9488 fix some errors 2017-08-14 13:13:45 +02:00
khalidhamdy
85ef6b894d solving minor issues 2017-08-14 11:40:56 +02:00
khalidhamdy
d847f3cad5 solving some errors 2017-08-14 11:04:50 +02:00
Ahmed.Elias
319372b68a passin BR paraemeter to rrc 2017-08-14 10:39:17 +02:00
Raymond Knopp
6753a7af6b Merge branch 'RU-RAU-split' of https://gitlab.eurecom.fr/oai/openairinterface5g into RU-RAU-split
Conflicts:
	openair2/LAYER2/MAC/eNB_scheduler_bch.c
	openair2/RRC/LITE/L2_interface.c
	targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
2017-08-13 23:11:23 -07:00
Raymond Knopp
50ebffea97 minor modifications before merge with upstream 2017-08-13 23:06:52 -07:00
Raymond Knopp
5774b5b452 correction for TBS in NFAPI interface conversion (SIB1-BR and SI-BR) 2017-08-13 11:42:51 -07:00
islam.galal
9b174dd831 integration step 1, breaks in SIB2 generation in L1 (lte-segmentation.c) 2017-08-13 19:33:33 +02:00
Raymond Knopp
db808dddaf Merge branch 'RU-RAU-split' of https://gitlab.eurecom.fr/oai/openairinterface5g into RU-RAU-split
Conflicts:
	openair2/ENB_APP/enb_config.c
2017-08-13 05:18:04 -07:00
Raymond Knopp
c1fff42782 Merge branch 'RU-RAU-split' of https://gitlab.eurecom.fr/raymond.knopp/openairinterface5g into RU-RAU-split
Conflicts:
	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
2017-08-10 17:27:07 -07:00
Raymond Knopp
01868adee2 repairs after merge from upstream 2017-08-10 17:24:55 -07:00
Raymond Knopp
08f7b212fc Merge branch 'RU-RAU-split' of https://gitlab.eurecom.fr/oai/openairinterface5g into RU-RAU-split
Conflicts:
	openair2/ENB_APP/enb_config.c
2017-08-10 16:49:32 -07:00
khalid
eaf4c79f8c Delete ray_enb_dev.includes 2017-08-09 16:49:43 +02:00
khalid
ec6874e1ef Delete ray_enb_dev.files 2017-08-09 16:49:33 +02:00
khalid
e9ba8c20ed Delete ray_enb_dev.creator 2017-08-09 16:49:18 +02:00
khalid
0cc55ce97a Delete ray_enb_dev.config 2017-08-09 16:48:55 +02:00
khalidhamdy
46c3d2b5bb copying RA_Template BR parameters to UE_template 2017-08-09 16:13:00 +02:00
Cedric Roux
45212d3b2f hotfix: protobuf-c compilation failure
protobuf-c does not compile anymore.

Let's handle this a bit better.

We now install protobuf and protobuf-c only for the
flexran agent. That is, if you want to use the flexran
agent, you need to install protobuf/protobuf-c and
you do it this way:

  ./build_oai -I -a

(you add -a)

Other targets don't need protobuf nor protobuf-c, so
it's not installed by the -I command of build_oai,
unless you pass -a with -I.

Also, we now use protobuf 3.3.0, not 2.6.1. The code
has been adapted, a quick test seems to indicate that
the system works, but it has not been intensively tested.
2017-08-08 10:06:38 +02:00
Raymond Knopp
e2254984ca Merge branch 'RU-RAU-split' of https://gitlab.eurecom.fr/oai/openairinterface5g into RU-RAU-split
Conflicts:
	openair2/ENB_APP/enb_config.c
2017-08-07 23:47:27 -07:00
Raymond Knopp
6aa0ff090b Merge branch 'RU-RAU-split' of https://gitlab.eurecom.fr/raymond.knopp/openairinterface5g into RU-RAU-split 2017-08-07 23:31:13 -07:00
Raymond Knopp
f613ecfa13 minor change for BL/CE in asn1_msg.c 2017-08-07 23:30:47 -07:00
kogo
74b7b9627b activated SIB1 & SIB23 reading from config files and added BR parameters 2017-08-07 15:21:24 +02:00
kogo
99dcb4ceb4 added config file + bug fixing 2017-07-27 19:53:39 +02:00
Raymond Knopp
9a8d277b68 small change in init_SI routine in rrc_eNB.c after merge 2017-07-26 17:39:15 -07:00
Raymond Knopp
05573ced20 Merge branch 'RU-RAU-split' of https://gitlab.eurecom.fr/raymond.knopp/openairinterface5g into RU-RAU-split
Conflicts:
	openair2/ENB_APP/enb_config.c
	openair2/RRC/LITE/MESSAGES/asn1_msg.c
	openair2/RRC/LITE/MESSAGES/asn1_msg.h
2017-07-26 17:13:30 -07:00
Raymond Knopp
64ee15062f added selection of LTE or BL/CE SIB1/2 configuration 2017-07-26 16:49:17 -07:00
kogo
1d8833c743 updated SIB1 ,, added BR option 2017-07-26 19:52:00 +02:00
kogo
930e5364e9 SIB23 reads successfullt from config file -- done testing 2017-07-26 18:13:31 +02:00
kogo
8717669c92 tested do_SIB1 parameters & config file reading 2017-07-26 17:36:11 +02:00
ahmed elias
33e6766d41 adding all changes from ornage private branch 2017-07-25 20:56:22 +02:00
Nikos Makris
9db40696f7 Added functionality for UDP/TCP/SCTP transferring of data over the ASYNC channel interface.
Added selection of interfaces through the configuration file with a new block of statements as follows:

    FLEXSPLIT_INTERFACES :
    {
        DU_INTERFACE_NAME_FOR_F1U           = "lo";
        DU_IPV4_ADDRESS_FOR_F1U             = "127.0.0.1/24";
        DU_PORT_FOR_F1U			    = 2210;

        CU_INTERFACE_NAME_FOR_F1U           = "lo";
        CU_IPV4_ADDRESS_FOR_F1U             = "127.0.0.1";	//Address to search the DU
        CU_PORT_FOR_F1U			    = 2210;

        // One of TCP/UDP/SCTP
        F1_U_TRANSPORT_TYPE 		    = "UDP";
    };
2017-07-21 14:02:09 +03:00
Cedric Roux
076b2ed2be Merge remote-tracking branch 'origin/develop'
Version 0.6.
2017-05-22 11:50:13 +02:00
Cedric Roux
d0e2938baa remove asn1 compilation fixes that went to asn1c (IMPORTANT: reinstall asn1c!)
The files NativeInteger.c.diff and constr_SET_OF.c.diff
from asn1c were generating compilation warnings. We had
local patches applied on generated files by asn1c.

A new version of asn1c has been pushed to
https://gitlab.eurecom.fr/oai/asn1c
(commit 224dc1f991b7e7ad705ce92e171b942f87b7b7e7)
making obsolete the fixes we do here.

So we now remove those fixes.

*************************
* IMPORTANT BEGIN       *
*************************

Everyone should update their asn1c installation.

The simplest is to do:

    source oaienv
    cd cmake_targets
    ./build_oai -I

*************************
* IMPORTANT END         *
*************************
2017-03-25 15:48:36 +01:00
Nikos Makris
af6af8a90d Cleanup of the messages; sometimes an error is logged 2016-10-10 20:12:46 +03:00
Nikos Makris
e0c3356dbb Fixed memory management issues 2016-10-10 19:43:26 +03:00
Nikos Makris
71cc8fa337 Changed the mem alloc of queue 12 for data; can now work for TCP split with traffic more than 2Mbps 2016-10-04 20:18:15 +03:00
Nikos Makris
2a4fa1da41 Fixed broken UL for data plane split 2016-10-04 18:59:01 +03:00
Nikos Makris
9f3b8cb9f8 Added support for the UL split:
TODO:
1) connection to UEs is broken (tested for oaisim)
2) Memory management problems, oaisim is exiting for large rates of traffic
2016-09-15 18:38:31 +03:00
Nikos Makris
2eb2b5e7ba First working version of the DL split.
TODO list:
1) check the message handler as if the function is not present it does not return msg not handled
2) use and check return arguments from the functions calling the data req
3) parse the config file for the configuration arguments
4) clean up the messy code
5) define and use other protocols than TCP for the communication between RLC and PDCP
2016-09-13 21:02:20 +03:00
Nikos Makris
96e46e77e2 RLC_DATA_REQ Message is created and sent over the async channel, initial functionality preserved 2016-09-08 20:44:33 +03:00
Nikos Makris
70ad5d587e Functionality for a simple protocol agent exchanging echo_request/reply messages 2016-09-05 14:28:58 +03:00
Nikos Makris
bc5e30318f Added proto_agent files for a simple message exchange in oaisim 2016-09-05 14:09:22 +03:00
Navid Nikaein
e508be85d4 add async interface and flexsplit messages 2016-08-29 16:04:07 +02:00
Navid Nikaein
560170a0ee update cmakefile to support split messages and scripts to manage the protobuf 2016-08-29 13:09:05 +02:00
1716 changed files with 1267271 additions and 696432 deletions

14
.gitignore vendored Normal file
View File

@@ -0,0 +1,14 @@
# vim swp
*.swp
# log and exec file
cmake_targets/log/
cmake_targets/*/build/
cmake_targets/ran_build/
cmake_targets/nas_sim_tools/build/
log/
lte_build_oai/
targets/bin/
# vscode
.vscode

View File

@@ -1,17 +0,0 @@
job1:
script:
- date
- pwd
- echo $OAI_TEST_CASE_GROUP
- echo $MACHINELIST
- echo $MACHINELISTGENERIC
- echo $RESULT_DIR
- echo $NRUNS_LTE_SOFTMODEM
- source oaienv
- rm -rf cmake_targets/autotests/log
- mkdir cmake_targets/autotests/log
- cd cmake_targets/autotests/v2
- python main.py
- date
only:
- triggers

28
.vscode/launch.json vendored Normal file
View File

@@ -0,0 +1,28 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"name": "(gdb) Launch",
"type": "cppdbg",
"request": "launch",
"program": "enter program name, for example ${workspaceFolder}/a.exe",
"args": [],
"stopAtEntry": false,
"cwd": "${workspaceFolder}",
"environment": [],
"externalConsole": false,
"MIMode": "gdb",
"miDebuggerPath": "/path/to/gdb",
"setupCommands": [
{
"description": "Enable pretty-printing for gdb",
"text": "-enable-pretty-printing",
"ignoreFailures": true
}
]
}
]
}

View File

@@ -2,45 +2,109 @@ OpenAirInterface is under OpenAirInterface Software Alliance license.
├── http://www.openairinterface.org/?page_id=101
├── http://www.openairinterface.org/?page_id=698
It is distributed under OAI Public License V1.0.
It is distributed under OAI Public License V1.1.
The license information is distributed under LICENSE file in the same directory.
Please see NOTICE.txt for third party software that is included in the sources.
The OpenAirInterface (OAI) software is composed of the following parts:
openairinterface5g
├── cmake_targets: build utilities to compile (simulation, emulation and real-time platforms), and generated build files
├── common : some common OAI utilities, other tools can be found at openair2/UTILS
├── ci-scripts: Meta-scripts used by the OSA CI process. Contains also configuration files used day-to-day by CI.
├── cmake_targets: Build utilities to compile (simulation, emulation and real-time platforms), and generated build files
├── common : Some common OAI utilities, other tools can be found at openair2/UTILS
├── doc : Contains an up-to-date feature set list
├── LICENSE
├── maketags : script to generate emacs tags
├── openair1 : 3GPP LTE Rel-10 PHY layer + PHY RF simulation and a subset of Rel 12 Features.
├── openair2 :3GPP LTE Rel-10 RLC/MAC/PDCP/RRC/X2AP implementation.
├── maketags : Script to generate emacs tags
├── nfapi : Contains the NFAPI code. A local Readme file provides more details.
├── openair1 : 3GPP LTE Rel-10/12 PHY layer + PHY RF simulation. A local Readme file provides more details.
├── openair2 : 3GPP LTE Rel-10 RLC/MAC/PDCP/RRC/X2AP + LTE Rel-14 M2AP implementation.
├── COMMON
├── DOCS
├── ENB_APP
├── LAYER2/RLC/ with the following subdirectories: UM_v9.3.0, TM_v9.3.0, and AM_v9.3.0.
├── LAYER2/PDCP/PDCP_v10.1.0.
├── RRC/LITE
├── LAYER2/PDCP/PDCP_v10.1.0.
├── NETWORK_DRIVER
├── PHY_INTERFACE
├── RRC/LITE
├── UTIL
├── X2AP
├── ENB_APP
├── M2AP
├── MCE_APP
├── openair3: 3GPP LTE Rel10 for S1AP, NAS GTPV1-U for both ENB and UE.
├── COMMON
├── DOCS
├── GTPV1-U
├── NAS
├── NAS
├── S1AP
├── M3AP
├── SCTP
├── SECU
├── UDP
└── targets: top level wrapper for unitary simulation for PHY channels, system-level emulation (eNB-UE with and without S1), and realtime eNB and UE and RRH GW.
├── UTILS
└── targets: Top-level wrappers for unitary simulation for PHY channels, system-level emulation (eNB-UE with and without S1), and realtime eNB and UE and RRH GW.
RELEASE NOTES:
v0.1 -> Last stable commit on develop branch before enhancement-10-harmony
v0.2 -> Merge of enhancement-10-harmony to include NGFI RRH + New Interface for RF/BBU
v0.3 -> Last stable commit on develop branch before the merge of feature-131-new-license. This is the last commit with GPL License
v0.4 -> Merge of feature-131-new-license. It closes issue#131 and changes the license to OAI Public License V1.0
v0.5 -> Merge of enhancement-10-harmony-lts. It includes fixes for Ubuntu 16.04 support
v0.5.1 -> Merge of bugfix-137-uplink-fixes. It includes stablity fixes for eNB
v0.5.2 -> Last version with old code for oaisim (abstraction mode works)
v1.2.0 -> January 2020. This version adds the following implemented features:
* LTE-M : eNB support for Mode A repetitions
- PUSCH CE - 8 Repetitions
* Improved CDRX implementation for monolithic eNB
* Experimental eMBMS support (now also on eNB side)
* Experimental MCE - Multicast Coordination Entity
* Bug fixes
This version also has an improved code quality:
* Better Test Coverage in Continuous Integration:
- Initial framework to do long-run testing at R2LAB
v1.1.1 -> November 2019. Bug fix in the TDD Fair Round-Robin scheduler
v1.1.0 -> July 2019. This version adds the following implemented features:
* Experimental support of LTE-M
- Single LTE-M UE attachment, legacy-LTE UE attachment is disabled
* X2 interface and handover (also X2-U interface)
- In FDD and TDD
* CU/DU split (F1 interface)
- Tested only in FDD
* CDRX
- Tested only in FDD
* Experimental eMBMS support (only on UE side)
* Experimental multi-RRU support
- Tested only in TDD
This version has an improved code quality:
* Simplification of the Build System
- A single build includes all full-stack simulators, S1/noS1 modes and one HW platform (such as USRP, BladeRF, ...)
* TUN interface is now used as default for the data plane
- for UE, eNB-noS1 and UE-noS1
* Code Cleanup
* Better Static Code Analysis:
- Limited number of errors in cppcheck
- Important Decrease on high Impact errors in CoverityScan
* Better Test Coverage in Continuous Integration:
- TM2, CDRX, IF4.5, F1
- OAI UE is tested in S1 and noS1 modes with USRP board
- Multi-RRU TDD mode
- X2 Handover in FDD mode
v1.0.3 -> June 2019: Bug fix for LimeSuite v19.04.0 API
v1.0.2 -> February 2019: Full OAI support for 3.13.1 UHD
v1.0.1 -> February 2019: Bug fix for the UE L1 simulator.
v1.0.0 -> January 2019. This version first implements the architectural split described in doc/oai_lte_enb_func_split_arch.png picture.
Only FAPI, nFAPI and IF4.5 interfaces are implemented.
Repository tree structure prepares future integrations of features such as LTE-M, nbIOT or 5G-NR.
Preliminary X2 support has been implemented.
S1-flex has been introduced.
New tools: config library, telnet server, ...
A lot of bugfixes and a proper automated Continuous Integration process validates contributions.
v0.6.1 -> Mostly bugfixes. This is the last version without NFAPI.
v0.6 -> RRH functionality, UE greatly improved, better TDD support,
a lot of bugs fixed. WARNING: oaisim in PHY abstraction mode does not
work, you need to use v0.5.2 for that.
v0.6.1 -> Mostly bugfixes. This is the last version without NFAPI.
v0.5.2 -> Last version with old code for oaisim (abstraction mode works)
v0.5.1 -> Merge of bugfix-137-uplink-fixes. It includes stablity fixes for eNB
v0.5 -> Merge of enhancement-10-harmony-lts. It includes fixes for Ubuntu 16.04 support
v0.4 -> Merge of feature-131-new-license. It closes issue#131 and changes the license to OAI Public License V1.0
v0.3 -> Last stable commit on develop branch before the merge of feature-131-new-license. This is the last commit with GPL License
v0.2 -> Merge of enhancement-10-harmony to include NGFI RRH + New Interface for RF/BBU
v0.1 -> Last stable commit on develop branch before enhancement-10-harmony

7
ci-scripts/.gitignore vendored Normal file
View File

@@ -0,0 +1,7 @@
enb_*.log
ue_*.log
ping_*.*
iperf_*.*
phones_list.txt
modules_list.txt
test_results*.html

View File

@@ -31,16 +31,43 @@ def sendSocialMediaMessage(pipeChannel, pipeColor, pipeMessage) {
}
def doRedHatBuild = false
def doFlexranCtrlTest = false
// Location of the executor node
def nodeExecutor = params.nodeExecutor
pipeline {
agent {
label 'bellatrix'
label nodeExecutor
}
options {
disableConcurrentBuilds()
timestamps()
gitLabConnection('OAI GitLab')
gitlabBuilds(builds: ["Build eNb-USRP", "Build basic-sim", "Build phy-sim", "Build eNb-ethernet", "Build UE-ethernet", "Analysis with cppcheck", "Test phy-sim", "Test basic-sim", "Test-FDD-Band7", "Test-TDD-Band40", "Test-IF4p5-FDD-Band7", "Test-IF4p5-TDD-Band40"])
gitlabBuilds(builds: [
"Build gNB-USRP",
"Build nr-UE-USRP",
"Build eNB-USRP",
"Build basic-sim",
"Build phy-sim",
"Build eNB-ethernet",
"Build UE-ethernet",
"Analysis with cppcheck",
"Test phy-sim",
"Test basic-sim",
"Test L1-sim",
"Test RF-sim",
"Test L2-sim",
"Test-Mono-FDD-Band7",
"Test-Mono-TDD-Band40",
"Test-IF4p5-FDD-Band7",
"Test-IF4p5-TDD-Band40",
"Test-Mono-FDD-Band13-LTE-M",
"Test-IF4p5-TDD-Band38-Multi-RRU",
"Test-eNB-OAI-UE-FDD-Band7",
"Test-Mono-FDD-Band13-X2-HO",
"Test-TDD-Band78-gNB-NR-UE"
])
ansiColor('xterm')
}
@@ -53,6 +80,9 @@ pipeline {
echo '\u2705 \u001B[32mVerify Parameters\u001B[0m'
def allParametersPresent = true
if (env.TESTPLATFORM_OWNER) {
echo "Platform is ${env.TESTPLATFORM_OWNER}"
}
if (params.RedHatRemoteServer == null) {
allParametersPresent = false
@@ -69,6 +99,12 @@ pipeline {
} else {
doRedHatBuild = false
}
if (params.FlexRanRtcGitLabRepository_Credentials != null) {
doFlexranCtrlTest = true
}
if (fileExists("flexran")) {
sh "rm -Rf flexran > /dev/null 2>&1"
}
}
}
}
@@ -78,6 +114,9 @@ pipeline {
echo "GitLab Act is ${env.gitlabActionType}"
script {
if ("MERGE".equals(env.gitlabActionType)) {
// since a bit, in push events, gitlabUserEmail is not populated
gitCommitAuthorEmailAddr = env.gitlabUserEmail
echo "GitLab Usermail is ${gitCommitAuthorEmailAddr}"
// GitLab-Jenkins plugin integration is lacking to perform the merge by itself
// Doing it manually --> it may have merge conflicts
sh "./ci-scripts/doGitLabMerge.sh --src-branch ${env.gitlabSourceBranch} --src-commit ${env.gitlabMergeRequestLastCommit} --target-branch ${env.gitlabTargetBranch} --target-commit ${GIT_COMMIT}"
@@ -97,12 +136,29 @@ pipeline {
} else {
echo "Git Branch is ${GIT_BRANCH}"
echo "Git Commit is ${GIT_COMMIT}"
// since a bit, in push events, gitlabUserEmail is not populated
gitCommitAuthorEmailAddr = sh returnStdout: true, script: 'git log -n1 --pretty=format:%ae ${GIT_COMMIT}'
gitCommitAuthorEmailAddr = gitCommitAuthorEmailAddr.trim()
echo "GitLab Usermail is ${gitCommitAuthorEmailAddr}"
sh "git log -n1 --pretty=format:\"%s\" > .git/CI_COMMIT_MSG"
sh "zip -r -qq localZip.zip ."
// Running astyle options on all C/H files in the repository
// For the moment, there is no fail criteria. Just a notification of number of files that do not follow
sh "./ci-scripts/checkCodingFormattingRules.sh"
}
if (doFlexranCtrlTest) {
sh "mkdir flexran"
dir ('flexran') {
withCredentials([
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.FlexRanRtcGitLabRepository_Credentials}", usernameVariable: 'git_username', passwordVariable: 'git_password']
]) {
sh "git clone https://${git_username}:${git_password}@gitlab.eurecom.fr/flexran/flexran-rtc.git . > ../git_clone.log 2>&1"
sh "git checkout develop >> ../git_clone.log 2>&1"
}
sh "zip -r -qq flexran.zip ."
}
}
}
}
post {
@@ -110,31 +166,40 @@ pipeline {
script {
def message = "OAI " + JOB_NAME + " build (" + BUILD_ID + "): Merge Conflicts -- Cannot perform CI"
addGitLabMRComment comment: message
currentBuild.result = 'FAILURE'
}
}
}
}
stage ("Start VM -- cppcheck") {
steps {
timeout (time: 5, unit: 'MINUTES') {
sh "./ci-scripts/createVM.sh --variant cppcheck --job-name ${JOB_NAME} --build-id ${BUILD_ID}"
}
}
}
stage ("Start VM -- enb-usrp") {
steps {
timeout (time: 5, unit: 'MINUTES') {
sh "./ci-scripts/createVM.sh --variant enb-usrp --job-name ${JOB_NAME} --build-id ${BUILD_ID}"
}
}
}
stage ("Start VM -- basic-sim") {
steps {
timeout (time: 5, unit: 'MINUTES') {
sh "./ci-scripts/createVM.sh --variant basic-sim --job-name ${JOB_NAME} --build-id ${BUILD_ID}"
sh "./ci-scripts/oai-ci-vm-tool build --workspace $WORKSPACE --variant basic-sim --job-name ${JOB_NAME} --build-id ${BUILD_ID} --daemon"
}
}
}
stage ("Start VM -- gnb-usrp") {
steps {
timeout (time: 5, unit: 'MINUTES') {
sh "./ci-scripts/oai-ci-vm-tool build --workspace $WORKSPACE --variant gnb-usrp --job-name ${JOB_NAME} --build-id ${BUILD_ID} --daemon"
}
}
}
stage ("Start VM -- nr-ue-usrp") {
steps {
timeout (time: 5, unit: 'MINUTES') {
sh "./ci-scripts/oai-ci-vm-tool build --workspace $WORKSPACE --variant nr-ue-usrp --job-name ${JOB_NAME} --build-id ${BUILD_ID} --daemon"
}
}
}
stage ("Start VM -- enb-usrp") {
steps {
timeout (time: 5, unit: 'MINUTES') {
sh "./ci-scripts/oai-ci-vm-tool build --workspace $WORKSPACE --variant enb-usrp --job-name ${JOB_NAME} --build-id ${BUILD_ID} --daemon"
}
}
}
@@ -142,15 +207,15 @@ pipeline {
stage ("Start VM -- phy-sim") {
steps {
timeout (time: 5, unit: 'MINUTES') {
sh "./ci-scripts/createVM.sh --variant phy-sim --job-name ${JOB_NAME} --build-id ${BUILD_ID}"
sh "./ci-scripts/oai-ci-vm-tool build --workspace $WORKSPACE --variant phy-sim --job-name ${JOB_NAME} --build-id ${BUILD_ID} --daemon"
}
}
}
stage ("Start VM -- enb-ethernet") {
steps {
timeout (time: 5, unit: 'MINUTES') {
sh "./ci-scripts/createVM.sh --variant enb-ethernet --job-name ${JOB_NAME} --build-id ${BUILD_ID}"
sh "./ci-scripts/oai-ci-vm-tool build --workspace $WORKSPACE --variant enb-ethernet --job-name ${JOB_NAME} --build-id ${BUILD_ID} --daemon"
}
}
}
@@ -158,7 +223,15 @@ pipeline {
stage ("Start VM -- ue-ethernet") {
steps {
timeout (time: 5, unit: 'MINUTES') {
sh "./ci-scripts/createVM.sh --variant ue-ethernet --job-name ${JOB_NAME} --build-id ${BUILD_ID}"
sh "./ci-scripts/oai-ci-vm-tool build --workspace $WORKSPACE --variant ue-ethernet --job-name ${JOB_NAME} --build-id ${BUILD_ID} --daemon"
}
}
}
stage ("Start VM -- cppcheck") {
steps {
timeout (time: 5, unit: 'MINUTES') {
sh "./ci-scripts/oai-ci-vm-tool build --workspace $WORKSPACE --variant cppcheck --job-name ${JOB_NAME} --build-id ${BUILD_ID} --daemon"
}
}
}
@@ -169,16 +242,7 @@ pipeline {
steps {
gitlabCommitStatus(name: "Analysis with cppcheck") {
timeout (time: 20, unit: 'MINUTES') {
sh "./ci-scripts/buildOnVM.sh --workspace $WORKSPACE --variant cppcheck --job-name ${JOB_NAME} --build-id ${BUILD_ID}"
}
}
}
}
stage ("Build eNb-USRP") {
steps {
gitlabCommitStatus(name: "Build eNb-USRP") {
timeout (time: 20, unit: 'MINUTES') {
sh "./ci-scripts/buildOnVM.sh --workspace $WORKSPACE --variant enb-usrp --job-name ${JOB_NAME} --build-id ${BUILD_ID}"
sh "./ci-scripts/oai-ci-vm-tool wait --workspace $WORKSPACE --variant cppcheck --job-name ${JOB_NAME} --build-id ${BUILD_ID}"
}
}
}
@@ -187,7 +251,34 @@ pipeline {
steps {
gitlabCommitStatus(name: "Build basic-sim") {
timeout (time: 20, unit: 'MINUTES') {
sh "./ci-scripts/buildOnVM.sh --workspace $WORKSPACE --variant basic-sim --job-name ${JOB_NAME} --build-id ${BUILD_ID} --keep-vm-alive"
sh "./ci-scripts/oai-ci-vm-tool wait --workspace $WORKSPACE --variant basic-sim --job-name ${JOB_NAME} --build-id ${BUILD_ID} --keep-vm-alive"
}
}
}
}
stage ("Build 5G gNB-USRP") {
steps {
gitlabCommitStatus(name: "Build gNB-USRP") {
timeout (time: 20, unit: 'MINUTES') {
sh "./ci-scripts/oai-ci-vm-tool wait --workspace $WORKSPACE --variant gnb-usrp --job-name ${JOB_NAME} --build-id ${BUILD_ID} --keep-vm-alive"
}
}
}
}
stage ("Build 5G NR-UE-USRP") {
steps {
gitlabCommitStatus(name: "Build nr-UE-USRP") {
timeout (time: 20, unit: 'MINUTES') {
sh "./ci-scripts/oai-ci-vm-tool wait --workspace $WORKSPACE --variant nr-ue-usrp --job-name ${JOB_NAME} --build-id ${BUILD_ID} --keep-vm-alive"
}
}
}
}
stage ("Build eNB-USRP") {
steps {
gitlabCommitStatus(name: "Build eNB-USRP") {
timeout (time: 20, unit: 'MINUTES') {
sh "./ci-scripts/oai-ci-vm-tool wait --workspace $WORKSPACE --variant enb-usrp --job-name ${JOB_NAME} --build-id ${BUILD_ID} --keep-vm-alive"
}
}
}
@@ -196,16 +287,16 @@ pipeline {
steps {
gitlabCommitStatus(name: "Build phy-sim") {
timeout (time: 20, unit: 'MINUTES') {
sh "./ci-scripts/buildOnVM.sh --workspace $WORKSPACE --variant phy-sim --job-name ${JOB_NAME} --build-id ${BUILD_ID} --keep-vm-alive"
sh "./ci-scripts/oai-ci-vm-tool wait --workspace $WORKSPACE --variant phy-sim --job-name ${JOB_NAME} --build-id ${BUILD_ID} --keep-vm-alive"
}
}
}
}
stage ("Build eNb-ethernet") {
stage ("Build eNB-ethernet") {
steps {
gitlabCommitStatus(name: "Build eNb-ethernet") {
gitlabCommitStatus(name: "Build eNB-ethernet") {
timeout (time: 20, unit: 'MINUTES') {
sh "./ci-scripts/buildOnVM.sh --workspace $WORKSPACE --variant enb-ethernet --job-name ${JOB_NAME} --build-id ${BUILD_ID} --keep-vm-alive"
sh "./ci-scripts/oai-ci-vm-tool wait --workspace $WORKSPACE --variant enb-ethernet --job-name ${JOB_NAME} --build-id ${BUILD_ID} --keep-vm-alive"
}
}
}
@@ -214,17 +305,17 @@ pipeline {
steps {
gitlabCommitStatus(name: "Build UE-ethernet") {
timeout (time: 20, unit: 'MINUTES') {
sh "./ci-scripts/buildOnVM.sh --workspace $WORKSPACE --variant ue-ethernet --job-name ${JOB_NAME} --build-id ${BUILD_ID} --keep-vm-alive"
sh "./ci-scripts/oai-ci-vm-tool wait --workspace $WORKSPACE --variant ue-ethernet --job-name ${JOB_NAME} --build-id ${BUILD_ID} --keep-vm-alive"
}
}
}
}
stage ("Build eNb-USRP on Red Hat") {
stage ("Build eNB-USRP on Red Hat") {
when {
expression {doRedHatBuild}
}
steps {
gitlabCommitStatus(name: "Build eNb-USRP-CentOS") {
gitlabCommitStatus(name: "Build eNB-USRP-RHE") {
script {
try {
withCredentials([
@@ -235,7 +326,7 @@ pipeline {
}
}
} catch (Exception e) {
echo "Red Hat build failed not an error now"
echo "Red Hat build failed but we could keep running pipeline if all ubuntu-based build passed"
}
}
}
@@ -243,16 +334,36 @@ pipeline {
}
}
post {
failure {
script {
currentBuild.result = 'FAILURE'
}
}
always {
script {
dir ('archives') {
sh "zip -r -qq vm_build_logs.zip basic_sim enb_usrp phy_sim cppcheck enb_eth ue_eth red_hat"
if (fileExists('red_hat')) {
sh "zip -r -qq vm_build_logs.zip basic_sim enb_usrp phy_sim cppcheck enb_eth ue_eth gnb_usrp nr_ue_usrp red_hat"
} else {
sh "zip -r -qq vm_build_logs.zip basic_sim enb_usrp phy_sim cppcheck enb_eth ue_eth gnb_usrp nr_ue_usrp"
}
}
if(fileExists('archives/vm_build_logs.zip')) {
archiveArtifacts artifacts: 'archives/vm_build_logs.zip'
}
if ("MERGE".equals(env.gitlabActionType)) {
sh "./ci-scripts/reportBuildLocally.sh --git-url ${GIT_URL} --job-name ${JOB_NAME} --build-id ${BUILD_ID} --trigger merge-request --src-branch ${env.gitlabSourceBranch} --src-commit ${env.gitlabMergeRequestLastCommit} --target-branch ${env.gitlabTargetBranch} --target-commit ${GIT_COMMIT}"
sh "./ci-scripts/oai-ci-vm-tool report-build --workspace $WORKSPACE --git-url ${GIT_URL} --job-name ${JOB_NAME} --build-id ${BUILD_ID} --trigger merge-request --src-branch ${env.gitlabSourceBranch} --src-commit ${env.gitlabMergeRequestLastCommit} --target-branch ${env.gitlabTargetBranch} --target-commit ${GIT_COMMIT}"
// If the merge request has introduced more CPPCHECK errors or warnings, notifications in GitLab
if (fileExists('oai_cppcheck_added_errors.txt')) {
def ret=readFile('./oai_cppcheck_added_errors.txt').trim();
if ("0".equals(ret)) {
echo "No added cppcheck warnings/errors in this merge request"
} else {
def message = "OAI " + JOB_NAME + " build (" + BUILD_ID + "): Some modified files in Merge Request MAY have INTRODUCED up to " + ret + " CPPCHECK errors/warnings"
addGitLabMRComment comment: message
}
}
// If the merge request has introduced compilation warnings, notifications in GitLab
sh "./ci-scripts/checkAddedWarnings.sh --src-branch ${env.gitlabSourceBranch} --target-branch ${env.gitlabTargetBranch}"
def res=readFile('./oai_warning_files.txt').trim();
if ("0".equals(res)) {
@@ -263,7 +374,7 @@ pipeline {
addGitLabMRComment comment: message
}
} else {
sh "./ci-scripts/reportBuildLocally.sh --git-url ${GIT_URL} --job-name ${JOB_NAME} --build-id ${BUILD_ID} --trigger push --branch ${GIT_BRANCH} --commit ${GIT_COMMIT}"
sh "./ci-scripts/oai-ci-vm-tool report-build --workspace $WORKSPACE --git-url ${GIT_URL} --job-name ${JOB_NAME} --build-id ${BUILD_ID} --trigger push --branch ${GIT_BRANCH} --commit ${GIT_COMMIT}"
}
if(fileExists('build_results.html')) {
sh "sed -i -e 's#Build-ID: ${BUILD_ID}#Build-ID: <a href=\"${BUILD_URL}\">${BUILD_ID}</a>#' -e 's#TEMPLATE_BUILD_TIME#${JOB_TIMESTAMP}#' build_results.html"
@@ -276,222 +387,300 @@ pipeline {
stage ("Variant Tests") {
parallel {
stage ("Test physical simulators") {
steps {
gitlabCommitStatus(name: "Test phy-sim") {
timeout (time: 20, unit: 'MINUTES') {
sh "./ci-scripts/runTestOnVM.sh --workspace $WORKSPACE --variant phy-sim --job-name ${JOB_NAME} --build-id ${BUILD_ID}"
}
}
}
}
stage ("Test basic simulator") {
steps {
gitlabCommitStatus(name: "Test basic-sim") {
timeout (time: 20, unit: 'MINUTES') {
sh "./ci-scripts/runTestOnVM.sh --workspace $WORKSPACE --variant basic-sim --job-name ${JOB_NAME} --build-id ${BUILD_ID} --keep-vm-alive"
}
}
}
}
stage ("Test on CI bench #1") {
stage ("VM-based tests") {
stages {
stage ("Test FDD - Band 7 - B210") {
stage ("Test physical simulators") {
steps {
script {
try {
if ("MERGE".equals(env.gitlabActionType)) {
gitlabCommitStatus(name: "Test-FDD-Band7") {
build job: 'eNB-CI-FDD-Band7-B210',
parameters: [
string(name: 'eNB_Repository', value: String.valueOf(GIT_URL)),
string(name: 'eNB_Branch', value: String.valueOf(env.gitlabSourceBranch)),
string(name: 'eNB_CommitID', value: String.valueOf(env.gitlabMergeRequestLastCommit)),
booleanParam(name: 'eNB_mergeRequest', value: true)
]
}
} else {
gitlabCommitStatus(name: "Test-FDD-Band7") {
build job: 'eNB-CI-FDD-Band7-B210',
parameters: [
string(name: 'eNB_Repository', value: String.valueOf(GIT_URL)),
string(name: 'eNB_Branch', value: String.valueOf(GIT_BRANCH)),
string(name: 'eNB_CommitID', value: String.valueOf(GIT_COMMIT)),
booleanParam(name: 'eNB_mergeRequest', value: false)
]
}
}
} catch (Exception e) {
currentBuild.result = 'FAILURE'
}
}
}
post {
// In case of any non-success, we are retrieving the HTML report of the last completed
// slave job.
// The only drop-back is that we may retrieve the HTML report of a previous build
always {
script {
if (!fileExists('test_results-eNB-CI-FDD-Band7-B210.html')) {
copyArtifacts(projectName: 'eNB-CI-FDD-Band7-B210',
filter: 'test_results*.html',
selector: lastCompleted())
if (fileExists('test_results-eNB-CI-FDD-Band7-B210.html')) {
sh "sed -i -e 's#TEMPLATE_BUILD_TIME#${JOB_TIMESTAMP}#' test_results-eNB-CI-FDD-Band7-B210.html"
archiveArtifacts artifacts: 'test_results-eNB-CI-FDD-Band7-B210.html'
timeout (time: 90, unit: 'MINUTES') {
try {
gitlabCommitStatus(name: "Test phy-sim") {
sh "./ci-scripts/oai-ci-vm-tool test --workspace $WORKSPACE --variant phy-sim --job-name ${JOB_NAME} --build-id ${BUILD_ID}"
}
} catch (Exception e) {
currentBuild.result = 'FAILURE'
}
}
}
}
}
stage ("Test TDD - Band 40 - B210") {
stage ("Build Flexran Controller") {
when {
expression {doFlexranCtrlTest}
}
steps {
script {
try {
if ("MERGE".equals(env.gitlabActionType)) {
gitlabCommitStatus(name: "Test-TDD-Band40") {
build job: 'eNB-CI-TDD-Band40-B210',
parameters: [
string(name: 'eNB_Repository', value: String.valueOf(GIT_URL)),
string(name: 'eNB_Branch', value: String.valueOf(env.gitlabSourceBranch)),
string(name: 'eNB_CommitID', value: String.valueOf(env.gitlabMergeRequestLastCommit)),
booleanParam(name: 'eNB_mergeRequest', value: true)
]
}
} else {
gitlabCommitStatus(name: "Test-TDD-Band40") {
build job: 'eNB-CI-TDD-Band40-B210',
parameters: [
string(name: 'eNB_Repository', value: String.valueOf(GIT_URL)),
string(name: 'eNB_Branch', value: String.valueOf(GIT_BRANCH)),
string(name: 'eNB_CommitID', value: String.valueOf(GIT_COMMIT)),
booleanParam(name: 'eNB_mergeRequest', value: false)
]
}
}
} catch (Exception e) {
currentBuild.result = 'FAILURE'
}
}
}
post {
// In case of any non-success, we are retrieving the HTML report of the last completed
// slave job.
// The only drop-back is that we may retrieve the HTML report of a previous build
always {
script {
if (!fileExists('test_results-eNB-CI-TDD-Band40-B210.html')) {
copyArtifacts(projectName: 'eNB-CI-TDD-Band40-B210',
filter: 'test_results*.html',
selector: lastCompleted())
if (fileExists('test_results-eNB-CI-TDD-Band40-B210.html')) {
sh "sed -i -e 's#TEMPLATE_BUILD_TIME#${JOB_TIMESTAMP}#' test_results-eNB-CI-TDD-Band40-B210.html"
archiveArtifacts artifacts: 'test_results-eNB-CI-TDD-Band40-B210.html'
}
timeout (time: 20, unit: 'MINUTES') {
try {
sh "./ci-scripts/oai-ci-vm-tool build --workspace $WORKSPACE --variant flexran-rtc --job-name ${JOB_NAME} --build-id ${BUILD_ID} --keep-vm-alive"
} catch (Exception e) {
currentBuild.result = 'FAILURE'
}
}
}
}
}
stage ("Test IF4p5 - FDD - Band 7 - B210") {
stage ("Test basic simulator") {
steps {
script {
try {
if ("MERGE".equals(env.gitlabActionType)) {
gitlabCommitStatus(name: "Test-IF4p5-FDD-Band7") {
build job: 'eNB-CI-IF4p5-FDD-Band7-B210',
parameters: [
string(name: 'eNB_Repository', value: String.valueOf(GIT_URL)),
string(name: 'eNB_Branch', value: String.valueOf(env.gitlabSourceBranch)),
string(name: 'eNB_CommitID', value: String.valueOf(env.gitlabMergeRequestLastCommit)),
booleanParam(name: 'eNB_mergeRequest', value: true)
]
}
} else {
gitlabCommitStatus(name: "Test-IF4p5-FDD-Band7") {
build job: 'eNB-CI-IF4p5-FDD-Band7-B210',
parameters: [
string(name: 'eNB_Repository', value: String.valueOf(GIT_URL)),
string(name: 'eNB_Branch', value: String.valueOf(GIT_BRANCH)),
string(name: 'eNB_CommitID', value: String.valueOf(GIT_COMMIT)),
booleanParam(name: 'eNB_mergeRequest', value: false)
]
}
}
} catch (Exception e) {
currentBuild.result = 'FAILURE'
}
}
}
post {
// In case of any non-success, we are retrieving the HTML report of the last completed
// slave job.
// The only drop-back is that we may retrieve the HTML report of a previous build
always {
script {
if (!fileExists('test_results-eNB-CI-IF4p5-FDD-Band7-B210.html')) {
copyArtifacts(projectName: 'eNB-CI-IF4p5-FDD-Band7-B210',
filter: 'test_results*.html',
selector: lastCompleted())
if (fileExists('test_results-eNB-CI-IF4p5-FDD-Band7-B210.html')) {
sh "sed -i -e 's#TEMPLATE_BUILD_TIME#${JOB_TIMESTAMP}#' test_results-eNB-CI-IF4p5-FDD-Band7-B210.html"
archiveArtifacts artifacts: 'test_results-eNB-CI-IF4p5-FDD-Band7-B210.html'
timeout (time: 30, unit: 'MINUTES') {
try {
gitlabCommitStatus(name: "Test basic-sim") {
sh "./ci-scripts/oai-ci-vm-tool test --workspace $WORKSPACE --variant basic-sim --job-name ${JOB_NAME} --build-id ${BUILD_ID}"
}
} catch (Exception e) {
currentBuild.result = 'FAILURE'
}
}
}
}
}
stage ("Test IF4p5 - TDD - Band 40 - B210") {
stage ("Test L1 simulator") {
steps {
script {
try {
if ("MERGE".equals(env.gitlabActionType)) {
gitlabCommitStatus(name: "Test-IF4p5-TDD-Band40") {
build job: 'eNB-CI-IF4p5-TDD-Band40-B210',
parameters: [
string(name: 'eNB_Repository', value: String.valueOf(GIT_URL)),
string(name: 'eNB_Branch', value: String.valueOf(env.gitlabSourceBranch)),
string(name: 'eNB_CommitID', value: String.valueOf(env.gitlabMergeRequestLastCommit)),
booleanParam(name: 'eNB_mergeRequest', value: true)
]
}
} else {
gitlabCommitStatus(name: "Test-IF4p5-TDD-Band40") {
build job: 'eNB-CI-IF4p5-TDD-Band40-B210',
parameters: [
string(name: 'eNB_Repository', value: String.valueOf(GIT_URL)),
string(name: 'eNB_Branch', value: String.valueOf(GIT_BRANCH)),
string(name: 'eNB_CommitID', value: String.valueOf(GIT_COMMIT)),
booleanParam(name: 'eNB_mergeRequest', value: false)
]
timeout (time: 30, unit: 'MINUTES') {
try {
gitlabCommitStatus(name: "Test L1-sim") {
sh "./ci-scripts/oai-ci-vm-tool test --workspace $WORKSPACE --variant l1-sim --job-name ${JOB_NAME} --build-id ${BUILD_ID} --keep-vm-alive"
}
} catch (Exception e) {
currentBuild.result = 'FAILURE'
}
} catch (Exception e) {
currentBuild.result = 'FAILURE'
}
}
}
post {
// In case of any non-success, we are retrieving the HTML report of the last completed
// slave job.
// The only drop-back is that we may retrieve the HTML report of a previous build
always {
script {
if (!fileExists('test_results-eNB-CI-IF4p5-TDD-Band40-B210.html')) {
copyArtifacts(projectName: 'eNB-CI-IF4p5-TDD-Band40-B210',
filter: 'test_results*.html',
selector: lastCompleted())
if (fileExists('test_results-eNB-CI-IF4p5-TDD-Band40-B210.html')) {
sh "sed -i -e 's#TEMPLATE_BUILD_TIME#${JOB_TIMESTAMP}#' test_results-eNB-CI-IF4p5-TDD-Band40-B210.html"
archiveArtifacts artifacts: 'test_results-eNB-CI-IF4p5-TDD-Band40-B210.html'
}
stage ("Test RF simulator") {
steps {
script {
timeout (time: 30, unit: 'MINUTES') {
try {
gitlabCommitStatus(name: "Test RF-sim") {
sh "./ci-scripts/oai-ci-vm-tool test --workspace $WORKSPACE --variant rf-sim --job-name ${JOB_NAME} --build-id ${BUILD_ID} --keep-vm-alive"
}
} catch (Exception e) {
currentBuild.result = 'FAILURE'
}
}
}
}
}
stage ("Test L2 simulator") {
steps {
script {
timeout (time: 30, unit: 'MINUTES') {
try {
gitlabCommitStatus(name: "Test L2-sim") {
sh "./ci-scripts/oai-ci-vm-tool test --workspace $WORKSPACE --variant l2-sim --job-name ${JOB_NAME} --build-id ${BUILD_ID}"
}
} catch (Exception e) {
currentBuild.result = 'FAILURE'
}
}
}
}
}
stage ("Destroy all Virtual Machines") {
steps {
sh "./ci-scripts/oai-ci-vm-tool destroy --job-name ${JOB_NAME} --build-id ${BUILD_ID}"
}
}
}
}
stage ("Test MONOLITHIC - FDD - Band 7 - B210") {
steps {
script {
triggerSlaveJob ('eNB-CI-FDD-Band7-B210', 'Test-Mono-FDD-Band7')
}
}
post {
always {
script {
finalizeSlaveJob('eNB-CI-FDD-Band7-B210')
}
}
failure {
script {
currentBuild.result = 'FAILURE'
}
}
}
}
stage ("Test MONOLITHIC - TDD - Band 40 - B210") {
steps {
script {
triggerSlaveJob ('eNB-CI-TDD-Band40-B210', 'Test-Mono-TDD-Band40')
}
}
post {
always {
script {
finalizeSlaveJob('eNB-CI-TDD-Band40-B210')
}
}
failure {
script {
currentBuild.result = 'FAILURE'
}
}
}
}
stage ("Test IF4p5 - FDD - Band 7 - B210") {
steps {
script {
sh "sleep 60"
triggerSlaveJob ('eNB-CI-IF4p5-FDD-Band7-B210', 'Test-IF4p5-FDD-Band7')
}
}
post {
always {
script {
finalizeSlaveJob('eNB-CI-IF4p5-FDD-Band7-B210')
}
}
failure {
script {
currentBuild.result = 'FAILURE'
}
}
}
}
stage ("Test IF4p5 - TDD - Band 40 - B210") {
steps {
script {
sh "sleep 60"
triggerSlaveJob ('eNB-CI-IF4p5-TDD-Band40-B210', 'Test-IF4p5-TDD-Band40')
}
}
post {
always {
script {
finalizeSlaveJob('eNB-CI-IF4p5-TDD-Band40-B210')
}
}
failure {
script {
currentBuild.result = 'FAILURE'
}
}
}
}
stage ("Test MONOLITHIC - FDD - Band 13 - B210") {
steps {
script {
sh "sleep 60"
triggerSlaveJob ('eNB-CI-MONO-FDD-Band13-B210', 'Test-Mono-FDD-Band13-LTE-M')
}
}
post {
always {
script {
finalizeSlaveJob('eNB-CI-MONO-FDD-Band13-B210')
}
}
failure {
script {
currentBuild.result = 'FAILURE'
}
}
}
}
stage ("Test X2 Handover - FDD - Band 13 - B210") {
steps {
script {
sh "sleep 60"
triggerSlaveJob ('eNB-CI-MONO-FDD-Band13-X2HO-B210', 'Test-Mono-FDD-Band13-X2-HO')
}
}
post {
always {
script {
finalizeSlaveJob('eNB-CI-MONO-FDD-Band13-X2HO-B210')
}
}
failure {
script {
currentBuild.result = 'FAILURE'
}
}
}
}
stage ("Test IF4p5 - TDD - Band 38 - B210 - MultiRRU") {
steps {
script {
triggerSlaveJob ('eNB-CI-IF4p5-TDD-Band38-MultiRRU-B210', 'Test-IF4p5-TDD-Band38-Multi-RRU')
}
}
post {
always {
script {
finalizeSlaveJob('eNB-CI-IF4p5-TDD-Band38-MultiRRU-B210')
}
}
failure {
script {
currentBuild.result = 'FAILURE'
}
}
}
}
stage ("Test OAI UE - FDD - Band 20 - B200") {
steps {
script {
triggerSlaveJobNoGitLab ('UE-CI-FDD-Band20-B200')
}
}
post {
always {
script {
finalizeSlaveJob('UE-CI-FDD-Band20-B200')
}
}
failure {
script {
currentBuild.result = 'FAILURE'
}
}
}
}
stage ("Test OAI UE - OAI eNB - FDD - Band 7 - B200") {
steps {
script {
// Delayed trigger on slave job, so it is always the last one to run
sh "sleep 240"
triggerSlaveJob ('eNB-UE-CI-MONO-FDD-Band7-B200', 'Test-eNB-OAI-UE-FDD-Band7')
}
}
post {
always {
script {
finalizeSlaveJob('eNB-UE-CI-MONO-FDD-Band7-B200')
}
}
failure {
script {
currentBuild.result = 'FAILURE'
}
}
}
}
stage ("Test OAI NR UE - OAI gNB - TDD - Band 78 - N300") {
steps {
script {
triggerSlaveJob ('gNB-nrUE-MONO-TDD-Band78-N300', 'Test-TDD-Band78-gNB-NR-UE')
}
}
post {
always {
script {
finalizeSlaveJob('gNB-nrUE-MONO-TDD-Band78-N300')
}
}
failure {
script {
currentBuild.result = 'FAILURE'
}
}
}
}
}
@@ -499,14 +688,14 @@ pipeline {
always {
script {
dir ('archives') {
sh "if [ -d basic_sim/test ] || [ -d phy_sim/test ]; then zip -r -qq vm_tests_logs.zip */test ; fi"
sh "if [ -d basic_sim/test ] || [ -d phy_sim/test ] || [ -d l2_sim/test ]; then zip -r -qq vm_tests_logs.zip */test ; fi"
}
if(fileExists('archives/vm_tests_logs.zip')) {
archiveArtifacts artifacts: 'archives/vm_tests_logs.zip'
if ("MERGE".equals(env.gitlabActionType)) {
sh "./ci-scripts/reportTestLocally.sh --git-url ${GIT_URL} --job-name ${JOB_NAME} --build-id ${BUILD_ID} --trigger merge-request --src-branch ${env.gitlabSourceBranch} --src-commit ${env.gitlabMergeRequestLastCommit} --target-branch ${env.gitlabTargetBranch} --target-commit ${GIT_COMMIT}"
sh "./ci-scripts/oai-ci-vm-tool report-test --workspace $WORKSPACE --git-url ${GIT_URL} --job-name ${JOB_NAME} --build-id ${BUILD_ID} --trigger merge-request --src-branch ${env.gitlabSourceBranch} --src-commit ${env.gitlabMergeRequestLastCommit} --target-branch ${env.gitlabTargetBranch} --target-commit ${GIT_COMMIT}"
} else {
sh "./ci-scripts/reportTestLocally.sh --git-url ${GIT_URL} --job-name ${JOB_NAME} --build-id ${BUILD_ID} --trigger push --branch ${GIT_BRANCH} --commit ${GIT_COMMIT}"
sh "./ci-scripts/oai-ci-vm-tool report-test --workspace $WORKSPACE --git-url ${GIT_URL} --job-name ${JOB_NAME} --build-id ${BUILD_ID} --trigger push --branch ${GIT_BRANCH} --commit ${GIT_COMMIT}"
}
if(fileExists('test_simulator_results.html')) {
sh "sed -i -e 's#Build-ID: ${BUILD_ID}#Build-ID: <a href=\"${BUILD_URL}\">${BUILD_ID}</a>#' -e 's#TEMPLATE_BUILD_TIME#${JOB_TIMESTAMP}#' test_simulator_results.html"
@@ -517,26 +706,26 @@ pipeline {
}
}
}
stage ("Destroy all Virtual Machines") {
steps {
sh "./ci-scripts/destroyAllRunningVM.sh --job-name ${JOB_NAME} --build-id ${BUILD_ID}"
}
}
}
post {
always {
script {
// Stage destroy may not be run if error in previous stage
sh "./ci-scripts/destroyAllRunningVM.sh --job-name ${JOB_NAME} --build-id ${BUILD_ID}"
sh "./ci-scripts/oai-ci-vm-tool destroy --job-name ${JOB_NAME} --build-id ${BUILD_ID}"
emailext attachmentsPattern: '*results*.html',
body: '''Hi,
Here are attached HTML report files for $PROJECT_NAME - Build # $BUILD_NUMBER - $BUILD_STATUS!
Regards,
OAI CI Team''',
replyTo: 'no-reply@openairinterface.org',
subject: '$PROJECT_NAME - Build # $BUILD_NUMBER - $BUILD_STATUS!',
to: env.gitlabUserEmail
to: gitCommitAuthorEmailAddr
if (fileExists('.git/CI_COMMIT_MSG')) {
sh "rm -f .git/CI_COMMIT_MSG"
}
}
}
success {
@@ -567,3 +756,68 @@ OAI CI Team''',
}
}
}
// ---- Slave Job functions
def triggerSlaveJob (jobName, gitlabStatusName) {
// Workaround for the "cancelled" GitLab pipeline notification
// The slave job is triggered with the propagate false so the following commands are executed
// Its status is now PASS/SUCCESS from a stage pipeline point of view
// localStatus variable MUST be analyzed to properly assess the status
localStatus = build job: jobName,
parameters: [
string(name: 'eNB_Repository', value: String.valueOf(GIT_URL)),
string(name: 'eNB_Branch', value: String.valueOf(env.gitlabSourceBranch)),
string(name: 'eNB_CommitID', value: String.valueOf(env.gitlabMergeRequestLastCommit)),
booleanParam(name: 'eNB_mergeRequest', value: "MERGE".equals(env.gitlabActionType)),
string(name: 'eNB_TargetBranch', value: String.valueOf(env.gitlabTargetBranch))
], propagate: false
localResult = localStatus.getResult()
echo "${jobName} Slave Job status is ${localResult}"
gitlabCommitStatus(name: gitlabStatusName) {
if (localStatus.resultIsBetterOrEqualTo('SUCCESS')) {
echo "${jobName} Slave Job is OK"
} else {
echo "${jobName} Slave Job is KO"
sh "ci-scripts/fail.sh"
}
}
}
def triggerSlaveJobNoGitLab (jobName) {
// Workaround for the "cancelled" GitLab pipeline notification
// The slave job is triggered with the propagate false so the following commands are executed
// Its status is now PASS/SUCCESS from a stage pipeline point of view
// localStatus variable MUST be analyzed to properly assess the status
localStatus = build job: jobName,
parameters: [
string(name: 'eNB_Repository', value: String.valueOf(GIT_URL)),
string(name: 'eNB_Branch', value: String.valueOf(env.gitlabSourceBranch)),
string(name: 'eNB_CommitID', value: String.valueOf(env.gitlabMergeRequestLastCommit)),
booleanParam(name: 'eNB_mergeRequest', value: "MERGE".equals(env.gitlabActionType)),
string(name: 'eNB_TargetBranch', value: String.valueOf(env.gitlabTargetBranch))
], propagate: false
localResult = localStatus.getResult()
echo "${jobName} Slave Job status is ${localResult}"
if (localStatus.resultIsBetterOrEqualTo('SUCCESS')) {
echo "${jobName} Slave Job is OK"
} else {
echo "${jobName} Slave Job is KO"
sh "ci-scripts/fail.sh"
}
}
def finalizeSlaveJob(jobName) {
// In case of any non-success, we are retrieving the HTML report of the last completed
// slave job. The only drop-back is that we may retrieve the HTML report of a previous build
fileName = "test_results-${jobName}.html"
if (!fileExists(fileName)) {
copyArtifacts(projectName: jobName,
filter: 'test_results*.html',
selector: lastCompleted())
if (fileExists(fileName)) {
sh "sed -i -e 's#TEMPLATE_BUILD_TIME#${JOB_TIMESTAMP}#' ${fileName}"
archiveArtifacts artifacts: fileName
}
}
}

View File

@@ -0,0 +1,421 @@
#!/bin/groovy
/*
* Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The OpenAirInterface Software Alliance licenses this file to You under
* the OAI Public License, Version 1.1 (the "License"); you may not use this file
* except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.openairinterface.org/?page_id=698
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*-------------------------------------------------------------------------------
* For more information about the OpenAirInterface (OAI) Software Alliance:
* contact@openairinterface.org
*/
// Abstraction function to send social media messages:
// like on Slack or Mattermost
def sendSocialMediaMessage(pipeChannel, pipeColor, pipeMessage) {
if (params.pipelineUsesSlack != null) {
if (params.pipelineUsesSlack) {
slackSend channel: pipeChannel, color: pipeColor, message: pipeMessage
}
}
}
// Location of the test XML file to be run
def testXMLFile = params.pythonTestXmlFile
def mainPythonAllXmlFiles = ""
def buildStageStatus = true
// Name of the test stage
def testStageName = params.pipelineTestStageName
// Name of the branch to work on
def ranRepoBranch = params.pythonWorkingBranch
// Lease booking parameters
def r2labStartTime = params.R2LAB_LeaseBookStartTime
def r2labDuration = params.R2LAB_LeaseBookDuration
// Fixed deployment
def r2labBaseIpAddr = '192.168.3.'
def r2labPythonExeIdx = '14'
def r2labPythonExe = 'fit' + r2labPythonExeIdx
def r2labENB0Idx = '23'
def r2labENB0 = 'fit' + r2labENB0Idx
def r2labENB0IpAddr = r2labBaseIpAddr + r2labENB0Idx
def r2labEPC0Idx = '17'
def r2labEPC0 = 'fit' + r2labEPC0Idx
def r2labEPC0IpAddr = r2labBaseIpAddr + r2labEPC0Idx
def r2labUE0Idx = '6'
def r2labUE0 = 'fit0' + r2labUE0Idx
def r2labUE0IpAddr = r2labBaseIpAddr + r2labUE0Idx
pipeline {
agent {
label 'master'
}
options {
disableConcurrentBuilds()
timestamps()
ansiColor('xterm')
}
stages {
stage ("Book session") {
steps {
script {
echo '\u2705 \u001B[32mVerify Parameters\u001B[0m'
def allParametersPresent = true
if (params.R2LAB_Credentials == null) {
allParametersPresent = false
}
if (params.R2LAB_FitNode_Credentials == null) {
allParametersPresent = false
}
if (params.R2LAB_LeaseBookStartTime == null) {
allParametersPresent = false
}
if (params.R2LAB_LeaseBookDuration == null) {
allParametersPresent = false
}
// If not present picking a default Stage Name
if (params.pipelineTestStageName == null) {
// picking default
testStageName = 'Tests at Inria R2LAB'
}
// If not present picking a default branch name
if (params.pythonWorkingBranch == null) {
ranRepoBranch = 'develop'
}
if (params.pythonTestXmlFile == null) {
// picking default
testXMLFile = 'xml_files/inria/enb_usrp210_band7_build.xml'
echo "Test XML file(default): ${testXMLFile}"
mainPythonAllXmlFiles += "--XMLTestFile=" + testXMLFile + " "
} else {
String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
for (xmlFile in myXmlTestSuite) {
mainPythonAllXmlFiles += "--XMLTestFile=" + xmlFile + " "
echo "Test XML file : ${xmlFile}"
}
}
if (!allParametersPresent) {
currentBuild.result = 'ABORTED'
error('Stopping early because no R2LAB credentials')
}
JOB_TIMESTAMP = sh returnStdout: true, script: 'date --rfc-3339=seconds | sed -e "s#+00:00##"'
JOB_TIMESTAMP = JOB_TIMESTAMP.trim()
echo '\u2705 \u001B[32mBook a Session\u001B[0m'
BOOK_TIMESTAMP = sh returnStdout: true, script: 'date --rfc-3339=date'
BOOK_TIMESTAMP = BOOK_TIMESTAMP.trim()
withCredentials([
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.R2LAB_Credentials}", usernameVariable: 'r2labuser', passwordVariable: 'r2labpassword']
]) {
sh "python3 /home/eurecom/inria-scripts/booking-lease.py --book-lease --from ${BOOK_TIMESTAMP}T${r2labStartTime} --duration ${r2labDuration} --slice inria_oaici ${r2labuser} ${r2labpassword}"
sh "python3 /home/eurecom/inria-scripts/booking-lease.py --get-leases ${r2labuser} ${r2labpassword}"
}
}
}
}
stage ("Load Images") {
steps {
script {
echo '\u2705 \u001B[32mLoad Image for Python Executor\u001B[0m'
sh "ssh -t inria_oaici@faraday.inria.fr 'rload -i oai-ci-cd-u18-lowlatency-enb-ue ${r2labPythonExeIdx} > /dev/null 2>&1'"
sh "ssh -t inria_oaici@faraday.inria.fr 'rwait --silent ${r2labPythonExeIdx}'"
echo '\u2705 \u001B[32mLoad Image for one eNB\u001B[0m'
sh "ssh -t inria_oaici@faraday.inria.fr 'rload -i oai-ci-cd-u18-lowlatency-enb-ue ${r2labENB0Idx} > /dev/null 2>&1'"
sh "ssh -t inria_oaici@faraday.inria.fr 'rwait --silent ${r2labENB0Idx}'"
sh "ssh -t inria_oaici@faraday.inria.fr 'uon ${r2labENB0Idx}'"
echo '\u2705 \u001B[32mLoad Image for one OAI UE\u001B[0m'
sh "ssh -t inria_oaici@faraday.inria.fr 'rload -i oai-ci-cd-u18-lowlatency-enb-ue ${r2labUE0Idx} > /dev/null 2>&1'"
sh "ssh -t inria_oaici@faraday.inria.fr 'rwait --silent ${r2labUE0Idx}'"
sh "ssh -t inria_oaici@faraday.inria.fr 'uon ${r2labUE0Idx}'"
echo '\u2705 \u001B[32mLoad Image for one EPC\u001B[0m'
sh "ssh -t inria_oaici@faraday.inria.fr 'rload -i oai-ci-cd-u18-lowlatency-epc ${r2labEPC0Idx} > /dev/null 2>&1'"
sh "ssh -t inria_oaici@faraday.inria.fr 'rwait --silent ${r2labEPC0Idx}'"
sh "ssh -t inria_oaici@faraday.inria.fr 'nodes ${r2labUE0Idx},${r2labPythonExeIdx},${r2labEPC0Idx},${r2labENB0Idx} && st'"
}
}
}
stage ("Prepare Python Executor") {
steps {
script {
withCredentials([
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.R2LAB_FitNode_Credentials}", usernameVariable: 'fituser', passwordVariable: 'fitpasswd']
]) {
sh "ssh -t inria_oaici@faraday.inria.fr 'ssh -t -b 192.168.3.100 ${fituser}@${r2labPythonExe} \"cd openairinterface5g && git fetch --all --prune --quiet\"'"
sh "ssh -t inria_oaici@faraday.inria.fr 'ssh -t -b 192.168.3.100 ${fituser}@${r2labPythonExe} \"cd openairinterface5g && git checkout --quiet ${ranRepoBranch}\"'"
sh "ssh -t inria_oaici@faraday.inria.fr 'ssh -t -b 192.168.3.100 ${fituser}@${r2labPythonExe} \"cd openairinterface5g && git pull --quiet origin ${ranRepoBranch}\"'"
GIT_COMMIT_TO_RUN = sh returnStdout: true, script: "ssh -t inria_oaici@faraday.inria.fr 'ssh -t -b 192.168.3.100 ${fituser}@${r2labPythonExe} \"cd openairinterface5g && git log -n1 --pretty=format:%H\"' | grep -v fit"
GIT_COMMIT_TO_RUN = GIT_COMMIT_TO_RUN.trim()
echo "Latest commit to use is ${GIT_COMMIT_TO_RUN}"
// Putting the adaptation parameters for the OAI UE
sh "ssh -t inria_oaici@faraday.inria.fr 'scp /home/inria_oaici/for-ci/adapt_usim_parameters_${r2labUE0}.sed ${fituser}@${r2labUE0}:/tmp/adapt_usim_parameters.sed'"
sh "ssh -t inria_oaici@faraday.inria.fr 'scp /home/inria_oaici/for-ci/phones_list.txt ${fituser}@${r2labEPC0}:/tmp'"
sh "ssh -t inria_oaici@faraday.inria.fr 'ssh -t -b 192.168.3.100 ${fituser}@${r2labEPC0} \"echo ${fitpasswd} | sudo -S cp /tmp/phones_list.txt /etc/ci\"'"
// Out of rload, the sub-network-interfaces are not up
sh "ssh -t inria_oaici@faraday.inria.fr 'ssh -t -b 192.168.3.100 ${fituser}@${r2labEPC0} \"echo ${fitpasswd} | sudo -S ifconfig control:m11 172.16.1.102 up\"'"
sh "ssh -t inria_oaici@faraday.inria.fr 'ssh -t -b 192.168.3.100 ${fituser}@${r2labEPC0} \"echo ${fitpasswd} | sudo -S ifconfig control:m10 192.168.10.110 up\"'"
sh "ssh -t inria_oaici@faraday.inria.fr 'ssh -t -b 192.168.3.100 ${fituser}@${r2labEPC0} \"echo ${fitpasswd} | sudo -S ifconfig control:sxu 172.55.55.102 up\"'"
sh "ssh -t inria_oaici@faraday.inria.fr 'ssh -t -b 192.168.3.100 ${fituser}@${r2labEPC0} \"echo ${fitpasswd} | sudo -S ifconfig control:s1u 192.168.248.159 up\"'"
sh "ssh -t inria_oaici@faraday.inria.fr 'ssh -t -b 192.168.3.100 ${fituser}@${r2labEPC0} \"echo ${fitpasswd} | sudo -S ifconfig control:sxc 172.55.55.101 up\"'"
sh "ssh -t inria_oaici@faraday.inria.fr 'ssh -t -b 192.168.3.100 ${fituser}@${r2labEPC0} \"echo ${fitpasswd} | sudo -S ifconfig control:s5c 172.58.58.102 up\"'"
sh "ssh -t inria_oaici@faraday.inria.fr 'ssh -t -b 192.168.3.100 ${fituser}@${r2labEPC0} \"echo ${fitpasswd} | sudo -S ifconfig control:p5c 172.58.58.101 up\"'"
sh "ssh -t inria_oaici@faraday.inria.fr 'ssh -t -b 192.168.3.100 ${fituser}@${r2labEPC0} \"echo ${fitpasswd} | sudo -S ifconfig control:s11 172.16.1.104 up\"'"
sh "ssh -t inria_oaici@faraday.inria.fr 'ssh -t -b 192.168.3.100 ${fituser}@${r2labEPC0} \"ifconfig\"'"
// Adding routes on the EPC
sh "ssh -t inria_oaici@faraday.inria.fr 'ssh -t -b 192.168.3.100 ${fituser}@${r2labEPC0} \"echo ${fitpasswd} | sudo -S ip route add default via 192.168.3.100 dev control table lte\"'"
sh "ssh -t inria_oaici@faraday.inria.fr 'ssh -t -b 192.168.3.100 ${fituser}@${r2labEPC0} \"echo ${fitpasswd} | sudo -S ip rule add from 12.0.0.0/8 table lte\"'"
sh "ssh -t inria_oaici@faraday.inria.fr 'ssh -t -b 192.168.3.100 ${fituser}@${r2labEPC0} \"echo ${fitpasswd} | sudo -S ip rule add from 12.1.1.0/8 table lte\"'"
// Adding a route on the eNB for the S1U interface
sh "ssh -t inria_oaici@faraday.inria.fr 'ssh -t -b 192.168.3.100 ${fituser}@${r2labENB0} \"echo ${fitpasswd} | sudo -S ip route add 192.168.248.0/24 via ${r2labEPC0IpAddr} dev control\"'"
// For the moment, simple way to route traffic from python executor to any UEs
sh "ssh -t inria_oaici@faraday.inria.fr 'ssh -t -b 192.168.3.100 ${fituser}@${r2labPythonExe} \"echo ${fitpasswd} | sudo -S ip route add 12.1.1.0/24 via ${r2labEPC0IpAddr} dev control\"'"
}
}
}
}
stage ("Build and Test") {
steps {
script {
withCredentials([
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.R2LAB_FitNode_Credentials}", usernameVariable: 'fituser', passwordVariable: 'fitpasswd']
]) {
sh "ssh -t -t inria_oaici@faraday.inria.fr 'ssh -t -t -b 192.168.3.100 ${fituser}@${r2labPythonExe} \"cd openairinterface5g/ci-scripts && python3 main.py --mode=InitiateHtml --ranRepository=https://gitlab.eurecom.fr/oai/openairinterface5g --ranBranch=${ranRepoBranch} --ranCommitID=${GIT_COMMIT_TO_RUN} --ranAllowMerge=false --ADBIPAddress=${r2labEPC0IpAddr} --ADBUserName=${fituser} --ADBPassword=${fitpasswd} --ADBType=distributed ${mainPythonAllXmlFiles}\"'"
String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
for (xmlFile in myXmlTestSuite) {
try {
sh "ssh -t -t inria_oaici@faraday.inria.fr 'ssh -t -t -b 192.168.3.100 ${fituser}@${r2labPythonExe} \"cd openairinterface5g/ci-scripts && python3 main.py --mode=TesteNB --ranRepository=https://gitlab.eurecom.fr/oai/openairinterface5g --ranBranch=${ranRepoBranch} --ranCommitID=${GIT_COMMIT_TO_RUN} --ranAllowMerge=false --eNBIPAddress=${r2labENB0IpAddr} --eNBUserName=${fituser} --eNBPassword=${fitpasswd} --eNBSourceCodePath=/home/${fituser}/openairinterface5g --UEIPAddress=${r2labUE0IpAddr} --UEUserName=${fituser} --UEPassword=${fitpasswd} --UESourceCodePath=/home/${fituser}/openairinterface5g --EPCIPAddress=${r2labEPC0IpAddr} --EPCType=OAI-Rel14-CUPS --EPCUserName=${fituser} --EPCPassword=${fitpasswd} --EPCSourceCodePath=/home/${fituser}/openair-cn --ADBIPAddress=${r2labEPC0IpAddr} --ADBUserName=${fituser} --ADBPassword=${fitpasswd} --ADBType=distributed --XMLTestFile=${xmlFile}\"'"
} catch (Exception e) {
currentBuild.result = 'FAILURE'
buildStageStatus = false
}
}
sh "ssh -t -t inria_oaici@faraday.inria.fr 'ssh -t -t -b 192.168.3.100 ${fituser}@${r2labPythonExe} \"cd openairinterface5g/ci-scripts && python3 main.py --mode=FinalizeHtml --finalStatus=${buildStageStatus} --eNBIPAddress=${r2labENB0IpAddr} --eNBUserName=${fituser} --eNBPassword=${fitpasswd}\"'"
}
}
}
}
stage ("Prepare Log Collection") {
steps {
sh "ssh -t inria_oaici@faraday.inria.fr 'mkdir -p /home/inria_oaici/archives'"
sh "ssh -t inria_oaici@faraday.inria.fr 'touch /home/inria_oaici/archives/no_error.txt'"
sh "ssh -t inria_oaici@faraday.inria.fr 'rm -f /home/inria_oaici/archives/*.*'"
withCredentials([
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.R2LAB_FitNode_Credentials}", usernameVariable: 'fituser', passwordVariable: 'fitpasswd']
]) {
sh "ssh -t inria_oaici@faraday.inria.fr 'scp ${fituser}@${r2labPythonExe}:/home/${fituser}/openairinterface5g/ci-scripts/test_results.html /home/inria_oaici/archives'"
}
sh "scp inria_oaici@faraday.inria.fr:/home/inria_oaici/archives/test_results.html ."
script {
if(fileExists("./test_results.html")) {
sh "mv ./test_results.html test_results-${JOB_NAME}.html"
sh "sed -i -e 's#TEMPLATE_JOB_NAME#${JOB_NAME}#' -e 's@build #TEMPLATE_BUILD_ID@build #${BUILD_ID}@' -e 's#Build-ID: TEMPLATE_BUILD_ID#Build-ID: <a href=\"${BUILD_URL}\">${BUILD_ID}</a>#' -e 's#TEMPLATE_STAGE_NAME#${testStageName}#' -e 's#TEMPLATE_BUILD_TIME#${JOB_TIMESTAMP}#' test_results-${JOB_NAME}.html"
archiveArtifacts "test_results-${JOB_NAME}.html"
}
}
}
}
stage ("Log Collection") {
parallel {
stage('Log Collection (OAI eNB - Build)') {
steps {
withCredentials([
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.R2LAB_FitNode_Credentials}", usernameVariable: 'fituser', passwordVariable: 'fitpasswd']
]) {
echo '\u2705 \u001B[32mLog Collection (OAI eNB - Build)\u001B[0m'
sh "ssh -t -t inria_oaici@faraday.inria.fr 'ssh -t -t -b 192.168.3.100 ${fituser}@${r2labPythonExe} \"cd openairinterface5g/ci-scripts && python3 main.py --mode=LogCollectBuild --eNBIPAddress=${r2labENB0IpAddr} --eNBUserName=${fituser} --eNBPassword=${fitpasswd} --eNBSourceCodePath=/home/${fituser}/openairinterface5g\"'"
sh "ssh -t inria_oaici@faraday.inria.fr 'scp ${fituser}@${r2labENB0}:/home/${fituser}/openairinterface5g/cmake_targets/build.log.zip /home/inria_oaici/archives/enb.build.log.zip'"
}
sh "scp inria_oaici@faraday.inria.fr:/home/inria_oaici/archives/enb.build.log.zip enb.build.log.${env.BUILD_ID}.zip"
script {
if(fileExists("enb.build.log.${env.BUILD_ID}.zip")) {
archiveArtifacts "enb.build.log.${env.BUILD_ID}.zip"
}
}
}
}
stage('Log Collection (OAI UE - Build)') {
steps {
withCredentials([
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.R2LAB_FitNode_Credentials}", usernameVariable: 'fituser', passwordVariable: 'fitpasswd']
]) {
echo '\u2705 \u001B[32mLog Collection (OAI UE - Build)\u001B[0m'
sh "ssh -t -t inria_oaici@faraday.inria.fr 'ssh -t -t -b 192.168.3.100 ${fituser}@${r2labPythonExe} \"cd openairinterface5g/ci-scripts && python3 main.py --mode=LogCollectBuild --UEIPAddress=${r2labUE0IpAddr} --UEUserName=${fituser} --UEPassword=${fitpasswd} --UESourceCodePath=/home/${fituser}/openairinterface5g\"'"
sh "ssh -t inria_oaici@faraday.inria.fr 'scp ${fituser}@${r2labUE0}:/home/${fituser}/openairinterface5g/cmake_targets/build.log.zip /home/inria_oaici/archives/ue.build.log.zip'"
}
sh "scp inria_oaici@faraday.inria.fr:/home/inria_oaici/archives/ue.build.log.zip ue.build.log.${env.BUILD_ID}.zip"
script {
if(fileExists("ue.build.log.${env.BUILD_ID}.zip")) {
archiveArtifacts "ue.build.log.${env.BUILD_ID}.zip"
}
}
}
}
stage('Log Collection (OAI eNB - Runs)') {
steps {
withCredentials([
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.R2LAB_FitNode_Credentials}", usernameVariable: 'fituser', passwordVariable: 'fitpasswd']
]) {
echo '\u2705 \u001B[32mLog Collection (OAI eNB - Runs)\u001B[0m'
sh "ssh -t -t inria_oaici@faraday.inria.fr 'ssh -t -t -b 192.168.3.100 ${fituser}@${r2labPythonExe} \"cd openairinterface5g/ci-scripts && python3 main.py --mode=LogCollecteNB --eNBIPAddress=${r2labENB0IpAddr} --eNBUserName=${fituser} --eNBPassword=${fitpasswd} --eNBSourceCodePath=/home/${fituser}/openairinterface5g\"'"
sh "ssh -t inria_oaici@faraday.inria.fr 'scp ${fituser}@${r2labENB0}:/home/${fituser}/openairinterface5g/cmake_targets/enb.log.zip /home/inria_oaici/archives/enb.run.log.zip'"
}
sh "scp inria_oaici@faraday.inria.fr:/home/inria_oaici/archives/enb.run.log.zip enb.run.log.${env.BUILD_ID}.zip"
script {
if(fileExists("enb.run.log.${env.BUILD_ID}.zip")) {
archiveArtifacts "enb.run.log.${env.BUILD_ID}.zip"
}
}
}
}
stage('Log Collection (OAI UE - Runs)') {
steps {
withCredentials([
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.R2LAB_FitNode_Credentials}", usernameVariable: 'fituser', passwordVariable: 'fitpasswd']
]) {
echo '\u2705 \u001B[32mLog Collection (OAI UE - Runs)\u001B[0m'
sh "ssh -t -t inria_oaici@faraday.inria.fr 'ssh -t -t -b 192.168.3.100 ${fituser}@${r2labPythonExe} \"cd openairinterface5g/ci-scripts && python3 main.py --mode=LogCollectOAIUE --UEIPAddress=${r2labUE0IpAddr} --UEUserName=${fituser} --UEPassword=${fitpasswd} --UESourceCodePath=/home/${fituser}/openairinterface5g\"'"
sh "ssh -t inria_oaici@faraday.inria.fr 'scp ${fituser}@${r2labUE0}:/home/${fituser}/openairinterface5g/cmake_targets/ue.log.zip /home/inria_oaici/archives/ue.run.log.zip'"
}
sh "scp inria_oaici@faraday.inria.fr:/home/inria_oaici/archives/ue.run.log.zip ue.run.log.${env.BUILD_ID}.zip"
script {
if(fileExists("ue.run.log.${env.BUILD_ID}.zip")) {
archiveArtifacts "ue.run.log.${env.BUILD_ID}.zip"
}
}
}
}
stage('Log Collection (MME)') {
steps {
withCredentials([
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.R2LAB_FitNode_Credentials}", usernameVariable: 'fituser', passwordVariable: 'fitpasswd']
]) {
echo '\u2705 \u001B[32mLog Collection (MME)\u001B[0m'
sh "ssh -t -t inria_oaici@faraday.inria.fr 'ssh -t -t -b 192.168.3.100 ${fituser}@${r2labPythonExe} \"cd openairinterface5g/ci-scripts && python3 main.py --mode=LogCollectMME --EPCIPAddress=${r2labEPC0IpAddr} --EPCUserName=${fituser} --EPCPassword=${fitpasswd} --EPCSourceCodePath=/home/${fituser}/openair-cn --EPCType=OAI-Rel14-CUPS\"'"
sh "ssh -t inria_oaici@faraday.inria.fr 'scp ${fituser}@${r2labEPC0}:/home/${fituser}/openair-cn/scripts/mme.log.zip /home/inria_oaici/archives/mme.log.zip'"
}
sh "scp inria_oaici@faraday.inria.fr:/home/inria_oaici/archives/mme.log.zip mme.log.${env.BUILD_ID}.zip"
script {
if(fileExists("mme.log.${env.BUILD_ID}.zip")) {
archiveArtifacts "mme.log.${env.BUILD_ID}.zip"
}
}
}
}
stage('Log Collection (HSS)') {
steps {
withCredentials([
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.R2LAB_FitNode_Credentials}", usernameVariable: 'fituser', passwordVariable: 'fitpasswd']
]) {
echo '\u2705 \u001B[32mLog Collection (HSS)\u001B[0m'
sh "ssh -t -t inria_oaici@faraday.inria.fr 'ssh -t -t -b 192.168.3.100 ${fituser}@${r2labPythonExe} \"cd openairinterface5g/ci-scripts && python3 main.py --mode=LogCollectHSS --EPCIPAddress=${r2labEPC0IpAddr} --EPCUserName=${fituser} --EPCPassword=${fitpasswd} --EPCSourceCodePath=/home/${fituser}/openair-cn --EPCType=OAI-Rel14-CUPS\"'"
sh "ssh -t inria_oaici@faraday.inria.fr 'scp ${fituser}@${r2labEPC0}:/home/${fituser}/openair-cn/scripts/hss.log.zip /home/inria_oaici/archives/hss.log.zip'"
}
sh "scp inria_oaici@faraday.inria.fr:/home/inria_oaici/archives/hss.log.zip hss.log.${env.BUILD_ID}.zip"
script {
if(fileExists("hss.log.${env.BUILD_ID}.zip")) {
archiveArtifacts "hss.log.${env.BUILD_ID}.zip"
}
}
}
}
stage('Log Collection (SPGW)') {
steps {
withCredentials([
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.R2LAB_FitNode_Credentials}", usernameVariable: 'fituser', passwordVariable: 'fitpasswd']
]) {
echo '\u2705 \u001B[32mLog Collection (SPGW)\u001B[0m'
sh "ssh -t -t inria_oaici@faraday.inria.fr 'ssh -t -t -b 192.168.3.100 ${fituser}@${r2labPythonExe} \"cd openairinterface5g/ci-scripts && python3 main.py --mode=LogCollectSPGW --EPCIPAddress=${r2labEPC0IpAddr} --EPCUserName=${fituser} --EPCPassword=${fitpasswd} --EPCSourceCodePath=/home/${fituser}/openair-cn --EPCType=OAI-Rel14-CUPS\"'"
sh "ssh -t inria_oaici@faraday.inria.fr 'scp ${fituser}@${r2labEPC0}:/home/${fituser}/openair-cn/scripts/spgw.log.zip /home/inria_oaici/archives/spgw.log.zip'"
}
sh "scp inria_oaici@faraday.inria.fr:/home/inria_oaici/archives/spgw.log.zip spgw.log.${env.BUILD_ID}.zip"
script {
if(fileExists("spgw.log.${env.BUILD_ID}.zip")) {
archiveArtifacts "spgw.log.${env.BUILD_ID}.zip"
}
}
}
}
stage('Log Collection (Ping)') {
steps {
withCredentials([
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.R2LAB_FitNode_Credentials}", usernameVariable: 'fituser', passwordVariable: 'fitpasswd']
]) {
echo '\u2705 \u001B[32mLog Collection (Ping)\u001B[0m'
sh "ssh -t -t inria_oaici@faraday.inria.fr 'ssh -t -t -b 192.168.3.100 ${fituser}@${r2labPythonExe} \"cd openairinterface5g/ci-scripts && python3 main.py --mode=LogCollectPing --EPCIPAddress=${r2labEPC0IpAddr} --EPCUserName=${fituser} --EPCPassword=${fitpasswd} --EPCSourceCodePath=/home/${fituser}/openair-cn --EPCType=OAI-Rel14-CUPS\"'"
sh "ssh -t inria_oaici@faraday.inria.fr 'scp ${fituser}@${r2labEPC0}:/home/${fituser}/openair-cn/scripts/ping.log.zip /home/inria_oaici/archives/ping.log.zip'"
}
sh "scp inria_oaici@faraday.inria.fr:/home/inria_oaici/archives/ping.log.zip ping.log.${env.BUILD_ID}.zip"
script {
if(fileExists("ping.log.${env.BUILD_ID}.zip")) {
archiveArtifacts "ping.log.${env.BUILD_ID}.zip"
}
}
}
}
stage('Log Collection (Iperf)') {
steps {
withCredentials([
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.R2LAB_FitNode_Credentials}", usernameVariable: 'fituser', passwordVariable: 'fitpasswd']
]) {
echo '\u2705 \u001B[32mLog Collection (Iperf)\u001B[0m'
sh "ssh -t -t inria_oaici@faraday.inria.fr 'ssh -t -t -b 192.168.3.100 ${fituser}@${r2labPythonExe} \"cd openairinterface5g/ci-scripts && python3 main.py --mode=LogCollectIperf --EPCIPAddress=${r2labEPC0IpAddr} --EPCUserName=${fituser} --EPCPassword=${fitpasswd} --EPCSourceCodePath=/home/${fituser}/openair-cn --EPCType=OAI-Rel14-CUPS\"'"
sh "ssh -t inria_oaici@faraday.inria.fr 'scp ${fituser}@${r2labEPC0}:/home/${fituser}/openair-cn/scripts/iperf.log.zip /home/inria_oaici/archives/iperf.log.zip'"
}
sh "scp inria_oaici@faraday.inria.fr:/home/inria_oaici/archives/iperf.log.zip iperf.log.${env.BUILD_ID}.zip"
script {
if(fileExists("iperf.log.${env.BUILD_ID}.zip")) {
archiveArtifacts "iperf.log.${env.BUILD_ID}.zip"
}
}
}
}
}
}
stage ("Clean-up Log Collection") {
steps {
sh "ssh -t inria_oaici@faraday.inria.fr 'rm -Rf /home/inria_oaici/archives'"
}
}
}
post {
always {
script {
echo '\u2705 \u001B[32mShutdown every node\u001B[0m'
sh 'ssh -t inria_oaici@faraday.inria.fr "all-off"'
sh 'ssh -t inria_oaici@faraday.inria.fr "all-off"'
}
}
}
}

View File

@@ -0,0 +1,376 @@
#!/bin/groovy
/*
* Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The OpenAirInterface Software Alliance licenses this file to You under
* the OAI Public License, Version 1.1 (the "License"); you may not use this file
* except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.openairinterface.org/?page_id=698
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*-------------------------------------------------------------------------------
* For more information about the OpenAirInterface (OAI) Software Alliance:
* contact@openairinterface.org
*/
// Abstraction function to send social media messages:
// like on Slack or Mattermost
def sendSocialMediaMessage(pipeChannel, pipeColor, pipeMessage) {
if (params.pipelineUsesSlack != null) {
if (params.pipelineUsesSlack) {
slackSend channel: pipeChannel, color: pipeColor, message: pipeMessage
}
}
}
// Location of the test XML file to be run
def testXMLFile = params.pythonTestXmlFile
def mainPythonAllXmlFiles = ""
def buildStageStatus = true
// Name of the phone resource
def ciUSRPsResource = params.USRPsResource
// Terminate Status
def termUE = 0
def termENB = 1
def termStatusArray = new Boolean[2]
termStatusArray[termUE] = false
termStatusArray[termENB] = false
// Global Parameters.
def eNB_Repository
def eNB_Branch
def eNB_CommitID
def eNB_AllowMergeRequestProcess = false
def eNB_TargetBranch = "develop-nr"
def GIT_COMMIT_AUTHOR
def GIT_COMMIT_EMAIL
def testStageName
// Global Parameters not to break the main.py command line and code.
def ADB_IPAddress = "none"
def ADB_Username = "none"
def ADB_Password = "none"
def EPC_IPAddress = "none"
def EPC_Username = "none"
def EPC_Password = "none"
pipeline {
agent {
label pythonExecutor
}
options {
disableConcurrentBuilds()
gitLabConnection('OAI GitLab')
ansiColor('xterm')
lock (ciUSRPsResource)
}
stages {
stage ('Retrieve latest from branch') {
steps {
script {
checkout([$class: 'GitSCM', branches: [[name: "${params.Branch}"]], doGenerateSubmoduleConfigurations: false, extensions: [], submoduleCfg: [], userRemoteConfigs: [[url: 'https://gitlab.eurecom.fr/oai/openairinterface5g.git']]])
sh "git clean -x -d -ff"
sh "git log -n1"
}
}
}
stage ("print latest commit info") {
steps {
script {
echo "Building on: "
echo " Repository -- ${GIT_URL}"
echo " Branch -- ${GIT_BRANCH}"
echo " Commit -- ${GIT_COMMIT}"
}
}
}
stage ("Verify Parameters") {
steps {
script {
JOB_TIMESTAMP = sh returnStdout: true, script: 'date --utc --rfc-3339=seconds | sed -e "s#+00:00##"'
JOB_TIMESTAMP = JOB_TIMESTAMP.trim()
echo '\u2705 \u001B[32mVerify Parameters\u001B[0m'
def allParametersPresent = true
// It is already too late to check it
if (params.pythonExecutor != null) {
echo "eNB CI executor node : ${pythonExecutor}"
}
if (params.eNB_Repository == null) {
eNB_Repository = GIT_URL
} else {
eNB_Repository = params.eNB_Repository
}
echo "eNB_Repository = ${eNB_Repository}"
if (params.eNB_Branch== null) {
eNB_Branch = GIT_BRANCH
} else {
eNB_Branch = params.eNB_Branch
}
echo "eNB_Branch = ${eNB_Branch}"
if (params.eNB_CommitID == null) {
eNB_CommitID = GIT_COMMIT
} else {
eNB_CommitID = params.eNB_CommitID
}
echo "eNB_CommitID = ${eNB_CommitID}"
// If not present picking a default Stage Name
if (params.pipelineTestStageName == null) {
// picking default
testStageName = 'Template Test Stage'
} else {
testStageName = params.pipelineTestStageName
}
if (params.USRPsResource == null) {
allParametersPresent = false
}
if (params.eNB_IPAddress == null) {
allParametersPresent = false
}
if (params.UE_IPAddress == null) {
allParametersPresent = false
}
if (params.eNB_SourceCodePath == null) {
allParametersPresent = false
}
if (params.eNB_Credentials == null) {
allParametersPresent = false
}
if (params.UE_Credentials == null) {
allParametersPresent = false
}
GIT_COMMIT_AUTHOR = sh (
script: 'git show -s --pretty=%an',
returnStdout: true
).trim()
echo "The author of the commit is: ${GIT_COMMIT_AUTHOR}"
GIT_COMMIT_EMAIL = sh (
script: 'git show -s --pretty=%ae',
returnStdout: true
).trim()
echo "The email of the author is: ${GIT_COMMIT_EMAIL}"
if (allParametersPresent) {
echo "All parameters are present"
} else {
echo "Some parameters are missing"
sh "./ci-scripts/fail.sh"
}
}
}
}
stage ("Build and Test") {
steps {
script {
dir ('ci-scripts') {
// If not present picking a default XML file
if (params.pythonTestXmlFile == null) {
// picking default
testXMLFile = 'xml_files/gnb_usrp_build.xml'
echo "Test XML file(default): ${testXMLFile}"
mainPythonAllXmlFiles += "--XMLTestFile=" + testXMLFile + " "
} else {
String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
for (xmlFile in myXmlTestSuite) {
if (fileExists(xmlFile)) {
mainPythonAllXmlFiles += "--XMLTestFile=" + xmlFile + " "
echo "Test XML file : ${xmlFile}"
}
}
}
withCredentials([
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password'],
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.UE_Credentials}", usernameVariable: 'UE_Username', passwordVariable: 'UE_Password']
]) {
sh "python3 main.py --mode=InitiateHtml --eNBRepository=${eNB_Repository} --eNBBranch=${eNB_Branch} --eNBCommitID=${eNB_CommitID} --eNB_AllowMerge=${eNB_AllowMergeRequestProcess} --eNBTargetBranch=${eNB_TargetBranch} --ADBIPAddress=${ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} ${mainPythonAllXmlFiles}"
String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
for (xmlFile in myXmlTestSuite) {
if (fileExists(xmlFile)) {
try {
sh "python3 main.py --mode=TesteNB --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --UEIPAddress=${params.eNB_IPAddress} --UEUserName=${eNB_Username} --UEPassword=${eNB_Password} --UESourceCodePath=${params.eNB_SourceCodePath} --eNBRepository=${eNB_Repository} --eNBBranch=${eNB_Branch} --eNBCommitID=${eNB_CommitID} --eNB_AllowMerge=${eNB_AllowMergeRequestProcess} --eNBTargetBranch=${eNB_TargetBranch} --ADBIPAddress=${ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} --EPCIPAddress=${EPC_IPAddress} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=/tmp/${EPC_Username} --EPCType=ltebox --XMLTestFile=${xmlFile}"
} catch (Exception e) {
currentBuild.result = 'FAILURE'
buildStageStatus = false
}
}
}
sh "python3 main.py --mode=FinalizeHtml --finalStatus=${buildStageStatus} --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password}"
}
}
}
}
}
stage ("Terminate") {
parallel {
stage('Terminate NR UE') {
steps {
echo '\u2705 \u001B[32mTerminate NR UE\u001B[0m'
withCredentials([
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'UE_Username', passwordVariable: 'UE_Password']
]) {
sh "python3 ci-scripts/main.py --mode=TerminateOAIUE --UEIPAddress=${params.eNB_IPAddress} --UEUserName=${UE_Username} --UEPassword=${UE_Password}"
}
}
post {
success {
script {
termStatusArray[termUE] = true
}
}
}
}
stage('Terminate NR eNB') {
steps {
echo '\u2705 \u001B[32mTerminate NR eNB\u001B[0m'
withCredentials([
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password']
]) {
sh "python3 ci-scripts/main.py --mode=TerminateeNB --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password}"
}
}
post {
success {
script {
termStatusArray[termENB] = true
}
}
}
}
}
}
stage('Log Collection') {
parallel {
stage('Log Collection (gNB and NR UE - Build)') {
steps {
withCredentials([
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password']
]) {
echo '\u2705 \u001B[32mLog Collection (gNB and NR UE - Build)\u001B[0m'
sh "python3 ci-scripts/main.py --mode=LogCollectBuild --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath}"
echo '\u2705 \u001B[32mLog Transfer (gNB and NR UE - Build)\u001B[0m'
sh "sshpass -p \'${eNB_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${eNB_Username}@${params.eNB_IPAddress}:${eNB_SourceCodePath}/cmake_targets/build.log.zip ./build.log.${env.BUILD_ID}.zip || true"
}
script {
if(fileExists("build.log.${env.BUILD_ID}.zip")) {
archiveArtifacts "build.log.${env.BUILD_ID}.zip"
}
}
}
}
stage('Log Collection (gNB - Run)') {
steps {
withCredentials([
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password']
]) {
echo '\u2705 \u001B[32mLog Collection (gNB - Run)\u001B[0m'
sh "python3 ci-scripts/main.py --mode=LogCollecteNB --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath}"
echo '\u2705 \u001B[32mLog Transfer (gNB - Run)\u001B[0m'
sh "sshpass -p \'${eNB_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${eNB_Username}@${params.eNB_IPAddress}:${eNB_SourceCodePath}/cmake_targets/enb.log.zip ./enb.log.${env.BUILD_ID}.zip || true"
}
script {
if(fileExists("enb.log.${env.BUILD_ID}.zip")) {
archiveArtifacts "enb.log.${env.BUILD_ID}.zip"
}
if(fileExists("ci-scripts/test_results.html")) {
sh "mv ci-scripts/test_results.html test_results-${JOB_NAME}.html"
sh "sed -i -e 's#TEMPLATE_BUILD_TIME#${JOB_TIMESTAMP}#' -e 's#TEMPLATE_JOB_NAME#${JOB_NAME}#' -e 's@build #TEMPLATE_BUILD_ID@build #${BUILD_ID}@' -e 's#Build-ID: TEMPLATE_BUILD_ID#Build-ID: <a href=\"${BUILD_URL}\">${BUILD_ID}</a>#' -e 's#TEMPLATE_STAGE_NAME#${testStageName}#' test_results-${JOB_NAME}.html"
archiveArtifacts "test_results-${JOB_NAME}.html"
}
}
}
}
stage('Log Collection (NR UE - Run)') {
steps {
withCredentials([
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password']
]) {
echo '\u2705 \u001B[32mLog Collection (gNB - Run)\u001B[0m'
sh "python3 ci-scripts/main.py --mode=LogCollectOAIUE --UEIPAddress=${params.eNB_IPAddress} --UEUserName=${eNB_Username} --UEPassword=${eNB_Password} --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --UESourceCodePath=${params.eNB_SourceCodePath}"
echo '\u2705 \u001B[32mLog Transfer (gNB - Run)\u001B[0m'
sh "sshpass -p \'${eNB_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${eNB_Username}@${params.eNB_IPAddress}:${eNB_SourceCodePath}/cmake_targets/ue.log.zip ./ue.log.${env.BUILD_ID}.zip || true"
}
script {
if(fileExists("ue.log.${env.BUILD_ID}.zip")) {
archiveArtifacts "ue.log.${env.BUILD_ID}.zip"
}
}
}
}
}
}
}
post {
always {
script {
if ("MERGE".equals(env.gitlabActionType)) {
echo "This is a MERGE event"
} else {
gitlabCommitStatus(name: "Test-gNB-nrUE") {
if ((currentBuild.result == null) || (currentBuild.result == 'SUCCESS')) {
echo "Setting the gitlab commit status to pass"
} else {
sh "./ci-scripts/fail.sh"
}
}
}
emailext attachmentsPattern: '*results*.html',
body: '''Hi,
Here are attached HTML report files for $PROJECT_NAME - Build # $BUILD_NUMBER - $BUILD_STATUS!
Regards,
OAI CI Team''',
replyTo: 'no-reply@openairinterface.org',
subject: '$PROJECT_NAME - Build # $BUILD_NUMBER - $BUILD_STATUS!',
to: GIT_COMMIT_EMAIL
}
}
success {
script {
def message = "OAI " + JOB_NAME + " build (" + BUILD_ID + "): passed (" + BUILD_URL + ")"
if ("MERGE".equals(env.gitlabActionType)) {
echo "This is a MERGE event"
//addGitLabMRComment comment: message
def message2 = "OAI " + JOB_NAME + " build (" + BUILD_ID + "): passed (" + BUILD_URL + ") -- MergeRequest #" + env.gitlabMergeRequestIid + " (" + env.gitlabMergeRequestTitle + ")"
sendSocialMediaMessage('ci-test', 'good', message2)
} else {
sendSocialMediaMessage('ci-test', 'good', message)
}
}
}
failure {
script {
def message = "OAI " + JOB_NAME + " build (" + BUILD_ID + "): failed (" + BUILD_URL + ")"
if ("MERGE".equals(env.gitlabActionType)) {
echo "This is a MERGE event"
//addGitLabMRComment comment: message
def message2 = "OAI " + JOB_NAME + " build (" + BUILD_ID + "): failed (" + BUILD_URL + ") -- MergeRequest #" + env.gitlabMergeRequestIid + " (" + env.gitlabMergeRequestTitle + ")"
sendSocialMediaMessage('ci-test', 'danger', message2)
} else {
sendSocialMediaMessage('ci-test', 'danger', message)
}
}
}
}
}

View File

@@ -0,0 +1,454 @@
#!/bin/groovy
/*
* Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The OpenAirInterface Software Alliance licenses this file to You under
* the OAI Public License, Version 1.1 (the "License"); you may not use this file
* except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.openairinterface.org/?page_id=698
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*-------------------------------------------------------------------------------
* For more information about the OpenAirInterface (OAI) Software Alliance:
* contact@openairinterface.org
*/
// Template Jenkins Declarative Pipeline script to run Test w/ RF HW
// Location of the python executor node shall be in the same subnet as the others servers
def pythonExecutor = params.pythonExecutor
// Location of the test XML file to be run
def testXMLFile = params.pythonTestXmlFile
def mainPythonAllXmlFiles = ""
def buildStageStatus = true
// Name of the test stage
def testStageName = params.pipelineTestStageName
// Name of the phone resource
def ciSmartPhoneResource = params.smartphonesResource
// Name of the phone resource
def oaiUEResource = params.oaiUEResource
// Terminate Status
def termENB = 0
def termOAIUE = 1
def termStatusArray = new Boolean[termOAIUE + 1]
termStatusArray[termENB] = false
termStatusArray[termOAIUE] = false
// Global Parameters. Normally they should be populated when the master job
// triggers the slave job with parameters
def eNB_Repository
def eNB_Branch
def eNB_CommitID
def eNB_AllowMergeRequestProcess = false
def eNB_TargetBranch
def doEpcLogCollection = true
pipeline {
agent {
label pythonExecutor
}
options {
disableConcurrentBuilds()
ansiColor('xterm')
lock(extra: [[resource: oaiUEResource]], resource: ciSmartPhoneResource)
}
stages {
stage ("Verify Parameters") {
steps {
script {
echo '\u2705 \u001B[32mVerify Parameters\u001B[0m'
def allParametersPresent = true
// It is already to late to check it
if (params.pythonExecutor != null) {
echo "eNB CI executor node : ${pythonExecutor}"
}
// If not present picking a default Stage Name
if (params.pipelineTestStageName == null) {
// picking default
testStageName = 'Template Test Stage'
}
if (params.smartphonesResource == null) {
allParametersPresent = false
}
if (params.oaiUEResource == null) {
allParametersPresent = false
}
if (params.eNB_IPAddress == null) {
allParametersPresent = false
}
if (params.eNB_SourceCodePath == null) {
allParametersPresent = false
}
if (params.eNB_Credentials == null) {
allParametersPresent = false
}
if (params.UE_IPAddress == null) {
allParametersPresent = false
}
if (params.UE_SourceCodePath == null) {
allParametersPresent = false
}
if (params.UE_Credentials == null) {
allParametersPresent = false
}
// the following 4 parameters should be pushed by the master trigger
// if not present, take the job GIT variables (used for developing)
if (params.eNB_Repository == null) {
eNB_Repository = env.GIT_URL
} else {
eNB_Repository = params.eNB_Repository
}
echo "eNB_Repository : ${eNB_Repository}"
if (params.eNB_Branch == null) {
eNB_Branch = env.GIT_BRANCH
} else {
eNB_Branch = params.eNB_Branch
}
echo "eNB_Branch : ${eNB_Branch}"
if (params.eNB_CommitID == null) {
eNB_CommitID = env.GIT_COMMIT
} else {
eNB_CommitID = params.eNB_CommitID
}
echo "eNB_CommitID : ${eNB_CommitID}"
if (params.eNB_mergeRequest != null) {
eNB_AllowMergeRequestProcess = params.eNB_mergeRequest
if (eNB_AllowMergeRequestProcess) {
if (params.eNB_TargetBranch != null) {
eNB_TargetBranch = params.eNB_TargetBranch
} else {
eNB_TargetBranch = 'develop'
}
echo "eNB_TargetBranch : ${eNB_TargetBranch}"
}
}
if (params.EPC_IPAddress == null) {
allParametersPresent = false
} else {
if (params.EPC_IPAddress == "none") {
doEpcLogCollection = false
echo "No EPC collections (ping/iperf/hss/mme/spgw)"
}
}
if (params.EPC_Type == null) {
allParametersPresent = false
}
if (params.EPC_SourceCodePath == null) {
allParametersPresent = false
}
if (params.EPC_Credentials == null) {
allParametersPresent = false
}
if (params.ADB_IPAddress == null) {
allParametersPresent = false
}
if (params.ADB_Credentials == null) {
allParametersPresent = false
}
if (allParametersPresent) {
echo "All parameters are present"
if (eNB_AllowMergeRequestProcess) {
sh "git fetch"
sh "./ci-scripts/doGitLabMerge.sh --src-branch ${eNB_Branch} --src-commit ${eNB_CommitID} --target-branch ${eNB_TargetBranch} --target-commit latest"
} else {
sh "git fetch"
sh "git checkout -f ${eNB_CommitID}"
}
} else {
currentBuild.result = 'ABORTED'
error('Stopping early because some parameters are missing')
}
}
}
}
stage ("Build and Test") {
steps {
script {
dir ('ci-scripts') {
echo "\u2705 \u001B[32m${testStageName}\u001B[0m"
// If not present picking a default XML file
if (params.pythonTestXmlFile == null) {
// picking default
testXMLFile = 'xml_files/enb_usrpB210_band7_50PRB.xml'
echo "Test XML file(default): ${testXMLFile}"
mainPythonAllXmlFiles += "--XMLTestFile=" + testXMLFile + " "
} else {
String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
for (xmlFile in myXmlTestSuite) {
if (fileExists(xmlFile)) {
mainPythonAllXmlFiles += "--XMLTestFile=" + xmlFile + " "
echo "Test XML file : ${xmlFile}"
}
}
}
withCredentials([
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password'],
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.UE_Credentials}", usernameVariable: 'UE_Username', passwordVariable: 'UE_Password'],
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password'],
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.ADB_Credentials}", usernameVariable: 'ADB_Username', passwordVariable: 'ADB_Password']
]) {
sh "python3 main.py --mode=InitiateHtml --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} ${mainPythonAllXmlFiles}"
String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
for (xmlFile in myXmlTestSuite) {
if (fileExists(xmlFile)) {
try {
sh "python3 main.py --mode=TesteNB --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --UEIPAddress=${params.UE_IPAddress} --UEUserName=${UE_Username} --UEPassword=${UE_Password} --UESourceCodePath=${params.UE_SourceCodePath} --EPCIPAddress=${params.EPC_IPAddress} --EPCType=${params.EPC_Type} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} --XMLTestFile=${xmlFile}"
} catch (Exception e) {
currentBuild.result = 'FAILURE'
buildStageStatus = false
}
}
}
sh "python3 main.py --mode=FinalizeHtml --finalStatus=${buildStageStatus} --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --UEIPAddress=${params.UE_IPAddress} --UEUserName=${UE_Username} --UEPassword=${UE_Password}"
}
}
}
}
}
stage ("Terminate") {
parallel {
stage('Terminate eNB') {
steps {
echo '\u2705 \u001B[32mTerminate eNB\u001B[0m'
withCredentials([
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password']
]) {
sh "python3 ci-scripts/main.py --mode=TerminateeNB --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password}"
}
}
post {
success {
script {
termStatusArray[termENB] = true
}
}
}
}
stage('Terminate OAI-UE') {
steps {
echo '\u2705 \u001B[32mTerminate OAI-UE\u001B[0m'
withCredentials([
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.UE_Credentials}", usernameVariable: 'UE_Username', passwordVariable: 'UE_Password']
]) {
sh "python3 ci-scripts/main.py --mode=TerminateOAIUE --UEIPAddress=${params.UE_IPAddress} --UEUserName=${UE_Username} --UEPassword=${UE_Password}"
}
}
post {
success {
script {
termStatusArray[termOAIUE] = true
}
}
}
}
}
}
stage('Log Collection') {
parallel {
stage('Log Collection (eNB - Run)') {
steps {
withCredentials([
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password']
]) {
echo '\u2705 \u001B[32mLog Collection (eNB - Run)\u001B[0m'
sh "python3 ci-scripts/main.py --mode=LogCollecteNB --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath}"
echo '\u2705 \u001B[32mLog Transfer (eNB - Run)\u001B[0m'
sh "sshpass -p \'${eNB_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${eNB_Username}@${params.eNB_IPAddress}:${eNB_SourceCodePath}/cmake_targets/enb.log.zip ./enb.log.${env.BUILD_ID}.zip || true"
}
script {
if(fileExists("enb.log.${env.BUILD_ID}.zip")) {
archiveArtifacts "enb.log.${env.BUILD_ID}.zip"
}
if(fileExists("ci-scripts/test_results.html")) {
sh "mv ci-scripts/test_results.html test_results-${JOB_NAME}.html"
sh "sed -i -e 's#TEMPLATE_JOB_NAME#${JOB_NAME}#' -e 's@build #TEMPLATE_BUILD_ID@build #${BUILD_ID}@' -e 's#Build-ID: TEMPLATE_BUILD_ID#Build-ID: <a href=\"${BUILD_URL}\">${BUILD_ID}</a>#' -e 's#TEMPLATE_STAGE_NAME#${testStageName}#' test_results-${JOB_NAME}.html"
archiveArtifacts "test_results-${JOB_NAME}.html"
}
}
}
}
stage('Log Collection (OAI UE - Run)') {
steps {
withCredentials([
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.UE_Credentials}", usernameVariable: 'UE_Username', passwordVariable: 'UE_Password']
]) {
echo '\u2705 \u001B[32mLog Collection (OAI UE - Run)\u001B[0m'
sh "python3 ci-scripts/main.py --mode=LogCollectOAIUE --UEIPAddress=${params.UE_IPAddress} --UEUserName=${UE_Username} --UEPassword=${UE_Password} --UESourceCodePath=${params.UE_SourceCodePath}"
echo '\u2705 \u001B[32mLog Transfer (OAI UE - Run)\u001B[0m'
sh "sshpass -p \'${UE_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${UE_Username}@${params.UE_IPAddress}:${UE_SourceCodePath}/cmake_targets/ue.log.zip ./ue.log.${env.BUILD_ID}.zip || true"
}
script {
if(fileExists("ue.log.${env.BUILD_ID}.zip")) {
archiveArtifacts "ue.log.${env.BUILD_ID}.zip"
}
}
}
}
stage('Log Collection (Ping)') {
when {
expression {doEpcLogCollection}
}
steps {
withCredentials([
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password']
]) {
echo '\u2705 \u001B[32mLog Collection (Ping)\u001B[0m'
sh "python3 ci-scripts/main.py --mode=LogCollectPing --EPCIPAddress=${params.EPC_IPAddress} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --EPCType=${params.EPC_Type}"
echo '\u2705 \u001B[32mLog Transfer (Ping)\u001B[0m'
sh "sshpass -p \'${EPC_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${EPC_Username}@${params.EPC_IPAddress}:${EPC_SourceCodePath}/scripts/ping.log.zip ./ping.log.${env.BUILD_ID}.zip || true"
}
script {
if(fileExists("ping.log.${env.BUILD_ID}.zip")) {
archiveArtifacts "ping.log.${env.BUILD_ID}.zip"
}
}
}
}
stage('Log Collection (Iperf)') {
when {
expression {doEpcLogCollection}
}
steps {
withCredentials([
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password']
]) {
echo '\u2705 \u001B[32mLog Collection (Iperf)\u001B[0m'
sh "python3 ci-scripts/main.py --mode=LogCollectIperf --EPCIPAddress=${params.EPC_IPAddress} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --EPCType=${params.EPC_Type}"
echo '\u2705 \u001B[32mLog Transfer (Iperf)\u001B[0m'
sh "sshpass -p \'${EPC_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${EPC_Username}@${params.EPC_IPAddress}:${EPC_SourceCodePath}/scripts/iperf.log.zip ./iperf.log.${env.BUILD_ID}.zip || true"
}
script {
if(fileExists("iperf.log.${env.BUILD_ID}.zip")) {
archiveArtifacts "iperf.log.${env.BUILD_ID}.zip"
}
}
}
}
stage('Log Collection (SPGW)') {
when {
expression {doEpcLogCollection}
}
steps {
withCredentials([
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password']
]) {
echo '\u2705 \u001B[32mLog Collection (SPGW)\u001B[0m'
sh "python3 ci-scripts/main.py --mode=LogCollectSPGW --EPCIPAddress=${params.EPC_IPAddress} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --EPCType=${params.EPC_Type}"
echo '\u2705 \u001B[32mLog Transfer (SPGW)\u001B[0m'
sh "sshpass -p \'${EPC_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${EPC_Username}@${params.EPC_IPAddress}:${EPC_SourceCodePath}/scripts/spgw.log.zip ./spgw.log.${env.BUILD_ID}.zip || true"
}
script {
if(fileExists("spgw.log.${env.BUILD_ID}.zip")) {
archiveArtifacts "spgw.log.${env.BUILD_ID}.zip"
}
}
}
}
stage('Log Collection (MME)') {
when {
expression {doEpcLogCollection}
}
steps {
withCredentials([
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password']
]) {
echo '\u2705 \u001B[32mLog Collection (MME)\u001B[0m'
sh "python3 ci-scripts/main.py --mode=LogCollectMME --EPCIPAddress=${params.EPC_IPAddress} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --EPCType=${params.EPC_Type}"
echo '\u2705 \u001B[32mLog Transfer (MME)\u001B[0m'
sh "sshpass -p \'${EPC_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${EPC_Username}@${params.EPC_IPAddress}:${EPC_SourceCodePath}/scripts/mme.log.zip ./mme.log.${env.BUILD_ID}.zip || true"
}
script {
if(fileExists("mme.log.${env.BUILD_ID}.zip")) {
archiveArtifacts "mme.log.${env.BUILD_ID}.zip"
}
}
}
}
stage('Log Collection (HSS)') {
when {
expression {doEpcLogCollection}
}
steps {
withCredentials([
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password']
]) {
echo '\u2705 \u001B[32mLog Collection (HSS)\u001B[0m'
sh "python3 ci-scripts/main.py --mode=LogCollectHSS --EPCIPAddress=${params.EPC_IPAddress} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --EPCType=${params.EPC_Type}"
echo '\u2705 \u001B[32mLog Transfer (HSS)\u001B[0m'
sh "sshpass -p \'${EPC_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${EPC_Username}@${params.EPC_IPAddress}:${EPC_SourceCodePath}/scripts/hss.log.zip ./hss.log.${env.BUILD_ID}.zip || true"
}
script {
if(fileExists("hss.log.${env.BUILD_ID}.zip")) {
archiveArtifacts "hss.log.${env.BUILD_ID}.zip"
}
}
}
}
}
}
}
post {
always {
script {
if (params.pipelineZipsConsoleLog != null) {
if (params.pipelineZipsConsoleLog) {
echo "Archiving Jenkins console log"
sh "wget --no-check-certificate --no-proxy ${env.JENKINS_URL}/job/${env.JOB_NAME}/${env.BUILD_ID}/consoleText -O consoleText.log || true"
sh "zip -m consoleText.log.${env.BUILD_ID}.zip consoleText.log || true"
if(fileExists("consoleText.log.${env.BUILD_ID}.zip")) {
archiveArtifacts "consoleText.log.${env.BUILD_ID}.zip"
}
}
}
}
}
// Making sure that we really shutdown every thing before leaving
failure {
script {
if (!termStatusArray[termENB]) {
withCredentials([
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password']
]) {
sh "python3 ci-scripts/main.py --mode=TerminateeNB --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password}"
}
}
if (!termStatusArray[termOAIUE]) {
withCredentials([
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.UE_Credentials}", usernameVariable: 'UE_Username', passwordVariable: 'UE_Password']
]) {
sh "python3 ci-scripts/main.py --mode=TerminateOAIUE --UEIPAddress=${params.UE_IPAddress} --UEUserName=${UE_Username} --UEPassword=${UE_Password}"
}
}
}
}
}
}

View File

@@ -0,0 +1,282 @@
#!/bin/groovy
/*
* Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The OpenAirInterface Software Alliance licenses this file to You under
* the OAI Public License, Version 1.1 (the "License"); you may not use this file
* except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.openairinterface.org/?page_id=698
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*-------------------------------------------------------------------------------
* For more information about the OpenAirInterface (OAI) Software Alliance:
* contact@openairinterface.org
*/
// Template Jenkins Declarative Pipeline script to run Test w/ RF HW
// Location of the python executor node shall be in the same subnet as the others servers
def pythonExecutor = params.pythonExecutor
// Location of the test XML file to be run
def testXMLFile = params.pythonTestXmlFile
def mainPythonAllXmlFiles = ""
def buildStageStatus = true
// Name of the test stage
def testStageName = params.pipelineTestStageName
// Name of the phone resource
def ciSmartPhoneResource = params.smartphonesResource
// Global Parameters. Normally they should be populated when the master job
// triggers the slave job with parameters
def eNB_Repository
def eNB_Branch
def eNB_CommitID
def eNB_AllowMergeRequestProcess = false
def eNB_TargetBranch
pipeline {
agent {
label pythonExecutor
}
options {
disableConcurrentBuilds()
ansiColor('xterm')
lock (ciSmartPhoneResource)
}
stages {
stage ("Verify Parameters") {
steps {
script {
echo '\u2705 \u001B[32mVerify Parameters\u001B[0m'
def allParametersPresent = true
// It is already to late to check it
if (params.pythonExecutor != null) {
echo "eNB CI executor node : ${pythonExecutor}"
}
// If not present picking a default Stage Name
if (params.pipelineTestStageName == null) {
// picking default
testStageName = 'Template Test Stage'
}
if (params.smartphonesResource == null) {
allParametersPresent = false
}
// 1st eNB parameters
if (params.eNB_IPAddress == null) {
allParametersPresent = false
}
if (params.eNB_SourceCodePath == null) {
allParametersPresent = false
}
if (params.eNB_Credentials == null) {
allParametersPresent = false
}
// 2nd eNB parameters
if (params.eNB1_IPAddress == null) {
allParametersPresent = false
}
if (params.eNB1_SourceCodePath == null) {
allParametersPresent = false
}
if (params.eNB1_Credentials == null) {
allParametersPresent = false
}
// 3rd eNB parameters
if (params.eNB2_IPAddress == null) {
allParametersPresent = false
}
if (params.eNB2_SourceCodePath == null) {
allParametersPresent = false
}
if (params.eNB2_Credentials == null) {
allParametersPresent = false
}
// the following 4 parameters should be pushed by the master trigger
// if not present, take the job GIT variables (used for developing)
if (params.eNB_Repository == null) {
eNB_Repository = env.GIT_URL
} else {
eNB_Repository = params.eNB_Repository
}
echo "eNB_Repository : ${eNB_Repository}"
if (params.eNB_Branch == null) {
eNB_Branch = env.GIT_BRANCH
} else {
eNB_Branch = params.eNB_Branch
}
echo "eNB_Branch : ${eNB_Branch}"
if (params.eNB_CommitID == null) {
eNB_CommitID = env.GIT_COMMIT
} else {
eNB_CommitID = params.eNB_CommitID
}
echo "eNB_CommitID : ${eNB_CommitID}"
if (params.eNB_mergeRequest != null) {
eNB_AllowMergeRequestProcess = params.eNB_mergeRequest
if (eNB_AllowMergeRequestProcess) {
if (params.eNB_TargetBranch != null) {
eNB_TargetBranch = params.eNB_TargetBranch
} else {
eNB_TargetBranch = 'develop'
}
echo "eNB_TargetBranch : ${eNB_TargetBranch}"
}
}
if (params.EPC_IPAddress == null) {
allParametersPresent = false
}
if (params.EPC_Type == null) {
allParametersPresent = false
}
if (params.EPC_SourceCodePath == null) {
allParametersPresent = false
}
if (params.EPC_Credentials == null) {
allParametersPresent = false
}
if (params.ADB_IPAddress == null) {
allParametersPresent = false
}
if (params.ADB_Credentials == null) {
allParametersPresent = false
}
if (allParametersPresent) {
echo "All parameters are present"
if (eNB_AllowMergeRequestProcess) {
sh "git fetch"
sh "./ci-scripts/doGitLabMerge.sh --src-branch ${eNB_Branch} --src-commit ${eNB_CommitID} --target-branch ${eNB_TargetBranch} --target-commit latest"
} else {
sh "git fetch"
sh "git checkout -f ${eNB_CommitID}"
}
} else {
echo "Some parameters are missing"
sh "./ci-scripts/fail.sh"
}
}
}
}
stage ("Build and Test") {
steps {
script {
dir ('ci-scripts') {
echo "\u2705 \u001B[32m${testStageName}\u001B[0m"
// If not present picking a default XML file
if (params.pythonTestXmlFile == null) {
// picking default
testXMLFile = 'xml_files/enb_usrpB210_band7_50PRB.xml'
echo "Test XML file(default): ${testXMLFile}"
mainPythonAllXmlFiles += "--XMLTestFile=" + testXMLFile + " "
} else {
String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
for (xmlFile in myXmlTestSuite) {
if (fileExists(xmlFile)) {
mainPythonAllXmlFiles += "--XMLTestFile=" + xmlFile + " "
echo "Test XML file : ${xmlFile}"
}
}
}
withCredentials([
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password'],
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB1_Credentials}", usernameVariable: 'eNB1_Username', passwordVariable: 'eNB1_Password'],
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB2_Credentials}", usernameVariable: 'eNB2_Username', passwordVariable: 'eNB2_Password'],
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password'],
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.ADB_Credentials}", usernameVariable: 'ADB_Username', passwordVariable: 'ADB_Password']
]) {
sh "python3 main.py --mode=InitiateHtml --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} ${mainPythonAllXmlFiles}"
String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
for (xmlFile in myXmlTestSuite) {
if (fileExists(xmlFile)) {
try {
sh "python3 main.py --mode=TesteNB --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --eNB1IPAddress=${params.eNB1_IPAddress} --eNB1UserName=${eNB1_Username} --eNB1Password=${eNB1_Password} --eNB1SourceCodePath=${params.eNB1_SourceCodePath} --eNB2IPAddress=${params.eNB2_IPAddress} --eNB2UserName=${eNB2_Username} --eNB2Password=${eNB2_Password} --eNB2SourceCodePath=${params.eNB2_SourceCodePath} --EPCIPAddress=${params.EPC_IPAddress} --EPCType=${params.EPC_Type} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} --XMLTestFile=${xmlFile}"
} catch (Exception e) {
currentBuild.result = 'FAILURE'
buildStageStatus = false
}
}
}
sh "python3 main.py --mode=FinalizeHtml --finalStatus=${buildStageStatus} --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password}"
}
}
}
}
}
stage('Log Collection') {
parallel {
stage('Log Collection (eNB - Build)') {
steps {
withCredentials([
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password']
]) {
echo '\u2705 \u001B[32mLog Collection (eNB - Build)\u001B[0m'
sh "python3 ci-scripts/main.py --mode=LogCollectBuild --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath}"
echo '\u2705 \u001B[32mLog Transfer (eNB - Build)\u001B[0m'
sh "sshpass -p \'${eNB_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${eNB_Username}@${params.eNB_IPAddress}:${eNB_SourceCodePath}/cmake_targets/build.log.zip ./build.log.${env.BUILD_ID}.zip || true"
}
script {
if(fileExists("build.log.${env.BUILD_ID}.zip")) {
archiveArtifacts "build.log.${env.BUILD_ID}.zip"
}
}
}
}
stage('Log Collection (eNB - Run)') {
steps {
withCredentials([
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password']
]) {
echo '\u2705 \u001B[32mLog Collection (eNB - Run)\u001B[0m'
sh "python3 ci-scripts/main.py --mode=LogCollecteNB --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath}"
echo '\u2705 \u001B[32mLog Transfer (eNB - Run)\u001B[0m'
sh "sshpass -p \'${eNB_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${eNB_Username}@${params.eNB_IPAddress}:${eNB_SourceCodePath}/cmake_targets/enb.log.zip ./enb.log.${env.BUILD_ID}.zip || true"
}
script {
if(fileExists("enb.log.${env.BUILD_ID}.zip")) {
archiveArtifacts "enb.log.${env.BUILD_ID}.zip"
}
if(fileExists("ci-scripts/test_results.html")) {
sh "mv ci-scripts/test_results.html test_results-${JOB_NAME}.html"
sh "sed -i -e 's#TEMPLATE_JOB_NAME#${JOB_NAME}#' -e 's@build #TEMPLATE_BUILD_ID@build #${BUILD_ID}@' -e 's#Build-ID: TEMPLATE_BUILD_ID#Build-ID: <a href=\"${BUILD_URL}\">${BUILD_ID}</a>#' -e 's#TEMPLATE_STAGE_NAME#${testStageName}#' test_results-${JOB_NAME}.html"
archiveArtifacts "test_results-${JOB_NAME}.html"
}
}
}
}
}
}
}
post {
always {
script {
if (params.pipelineZipsConsoleLog != null) {
if (params.pipelineZipsConsoleLog) {
echo "Archiving Jenkins console log"
sh "wget --no-check-certificate --no-proxy ${env.JENKINS_URL}/job/${env.JOB_NAME}/${env.BUILD_ID}/consoleText -O consoleText.log || true"
sh "zip -m consoleText.log.${env.BUILD_ID}.zip consoleText.log || true"
if(fileExists("consoleText.log.${env.BUILD_ID}.zip")) {
archiveArtifacts "consoleText.log.${env.BUILD_ID}.zip"
}
}
}
}
}
}
}

View File

@@ -27,6 +27,8 @@ def pythonExecutor = params.pythonExecutor
// Location of the test XML file to be run
def testXMLFile = params.pythonTestXmlFile
def mainPythonAllXmlFiles = ""
def buildStageStatus = true
// Name of the test stage
def testStageName = params.pipelineTestStageName
@@ -53,6 +55,7 @@ def eNB_Repository
def eNB_Branch
def eNB_CommitID
def eNB_AllowMergeRequestProcess = false
def eNB_TargetBranch
pipeline {
agent {
@@ -61,6 +64,7 @@ pipeline {
options {
disableConcurrentBuilds()
ansiColor('xterm')
lock (ciSmartPhoneResource)
}
// the following parameter options are commented out so it shows the ones
// that you SHALL have to run the job.
@@ -102,13 +106,6 @@ pipeline {
if (params.pythonExecutor != null) {
echo "eNB CI executor node : ${pythonExecutor}"
}
// If not present picking a default XML file
if (params.pythonTestXmlFile == null) {
// picking default
testXMLFile = 'xml_files/enb_usrpB210_band7_50PRB.xml'
} else {
echo "Test XML file : ${testXMLFile}"
}
// If not present picking a default Stage Name
if (params.pipelineTestStageName == null) {
// picking default
@@ -149,6 +146,14 @@ pipeline {
echo "eNB_CommitID : ${eNB_CommitID}"
if (params.eNB_mergeRequest != null) {
eNB_AllowMergeRequestProcess = params.eNB_mergeRequest
if (eNB_AllowMergeRequestProcess) {
if (params.eNB_TargetBranch != null) {
eNB_TargetBranch = params.eNB_TargetBranch
} else {
eNB_TargetBranch = 'develop'
}
echo "eNB_TargetBranch : ${eNB_TargetBranch}"
}
}
if (params.EPC_IPAddress == null) {
@@ -173,6 +178,13 @@ pipeline {
if (allParametersPresent) {
echo "All parameters are present"
if (eNB_AllowMergeRequestProcess) {
sh "git fetch"
sh "./ci-scripts/doGitLabMerge.sh --src-branch ${eNB_Branch} --src-commit ${eNB_CommitID} --target-branch ${eNB_TargetBranch} --target-commit latest"
} else {
sh "git fetch"
sh "git checkout -f ${eNB_CommitID}"
}
} else {
echo "Some parameters are missing"
sh "./ci-scripts/fail.sh"
@@ -184,20 +196,41 @@ pipeline {
steps {
script {
dir ('ci-scripts') {
lock (ciSmartPhoneResource) {
try {
echo "\u2705 \u001B[32m${testStageName}\u001B[0m"
withCredentials([
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password'],
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password'],
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.ADB_Credentials}", usernameVariable: 'ADB_Username', passwordVariable: 'ADB_Password']
]) {
sh "python3 main.py --mode=TesteNB --eNBIPAddress=${params.eNB_IPAddress} --eNBRepository=${eNB_Repository} --eNBBranch=${eNB_Branch} --eNBCommitID=${eNB_CommitID} --eNB_AllowMerge=${eNB_AllowMergeRequestProcess} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --EPCIPAddress=${params.EPC_IPAddress} --EPCType=${params.EPC_Type} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} --XMLTestFile=${testXMLFile}"
echo "\u2705 \u001B[32m${testStageName}\u001B[0m"
// If not present picking a default XML file
if (params.pythonTestXmlFile == null) {
// picking default
testXMLFile = 'xml_files/enb_usrpB210_band7_50PRB.xml'
echo "Test XML file(default): ${testXMLFile}"
mainPythonAllXmlFiles += "--XMLTestFile=" + testXMLFile + " "
} else {
String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
for (xmlFile in myXmlTestSuite) {
if (fileExists(xmlFile)) {
mainPythonAllXmlFiles += "--XMLTestFile=" + xmlFile + " "
echo "Test XML file : ${xmlFile}"
}
}
} catch (Exception e) {
currentBuild.result = 'FAILURE'
}
}
withCredentials([
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password'],
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password'],
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.ADB_Credentials}", usernameVariable: 'ADB_Username', passwordVariable: 'ADB_Password']
]) {
sh "python3 main.py --mode=InitiateHtml --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} ${mainPythonAllXmlFiles}"
String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
for (xmlFile in myXmlTestSuite) {
if (fileExists(xmlFile)) {
try {
sh "python3 main.py --mode=TesteNB --eNBIPAddress=${params.eNB_IPAddress} --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --EPCIPAddress=${params.EPC_IPAddress} --EPCType=${params.EPC_Type} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} --XMLTestFile=${xmlFile}"
} catch (Exception e) {
currentBuild.result = 'FAILURE'
buildStageStatus = false
}
}
}
sh "python3 main.py --mode=FinalizeHtml --finalStatus=${buildStageStatus} --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password}"
}
}
}
}
@@ -328,7 +361,7 @@ pipeline {
}
if(fileExists("ci-scripts/test_results.html")) {
sh "mv ci-scripts/test_results.html test_results-${JOB_NAME}.html"
sh "sed -i -e 's#TEMPLATE_JOB_NAME#${JOB_NAME}#' -e 's@build #TEMPLATE_BUILD_ID@build #${BUILD_ID}@' -e 's#Build-ID: TEMPLATE_BUILD_ID#Build-ID: <a href=\"${BUILD_URL}\">${BUILD_ID}</a>#' test_results-${JOB_NAME}.html"
sh "sed -i -e 's#TEMPLATE_JOB_NAME#${JOB_NAME}#' -e 's@build #TEMPLATE_BUILD_ID@build #${BUILD_ID}@' -e 's#Build-ID: TEMPLATE_BUILD_ID#Build-ID: <a href=\"${BUILD_URL}\">${BUILD_ID}</a>#' -e 's#TEMPLATE_STAGE_NAME#${testStageName}#' test_results-${JOB_NAME}.html"
archiveArtifacts "test_results-${JOB_NAME}.html"
}
}

View File

@@ -0,0 +1,271 @@
#!/bin/groovy
/*
* Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The OpenAirInterface Software Alliance licenses this file to You under
* the OAI Public License, Version 1.1 (the "License"); you may not use this file
* except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.openairinterface.org/?page_id=698
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*-------------------------------------------------------------------------------
* For more information about the OpenAirInterface (OAI) Software Alliance:
* contact@openairinterface.org
*/
// Template Jenkins Declarative Pipeline script to run Test w/ RF HW
// Location of the python executor node shall be in the same subnet as the others servers
def pythonExecutor = params.pythonExecutor
// Location of the test XML file to be run
def testXMLFile = params.pythonTestXmlFile
def mainPythonAllXmlFiles = ""
def buildStageStatus = true
// Name of the test stage
def testStageName = params.pipelineTestStageName
// Name of the phone resource
def ciSmartPhoneResource = params.smartphonesResource
// Terminate Status
def termUE = 0
def termENB = 1
def termSPGW = 2
def termMME = 3
def termHSS = 4
def termStatusArray = new Boolean[termHSS + 1]
termStatusArray[termUE] = false
termStatusArray[termENB] = false
termStatusArray[termSPGW] = false
termStatusArray[termMME] = false
termStatusArray[termHSS] = false
// Global Parameters. Normally they should be populated when the master job
// triggers the slave job with parameters
def eNB_Repository
def eNB_Branch
def eNB_CommitID
def eNB_AllowMergeRequestProcess = false
def eNB_TargetBranch
pipeline {
agent {
label pythonExecutor
}
options {
disableConcurrentBuilds()
ansiColor('xterm')
lock (ciSmartPhoneResource)
}
stages {
stage ("Verify Parameters") {
steps {
script {
echo '\u2705 \u001B[32mVerify Parameters\u001B[0m'
def allParametersPresent = true
// It is already to late to check it
if (params.pythonExecutor != null) {
echo "eNB CI executor node : ${pythonExecutor}"
}
// If not present picking a default Stage Name
if (params.pipelineTestStageName == null) {
// picking default
testStageName = 'Template Test Stage'
}
if (params.smartphonesResource == null) {
allParametersPresent = false
}
if (params.UE_IPAddress == null) {
allParametersPresent = false
}
if (params.UE_SourceCodePath == null) {
allParametersPresent = false
}
if (params.UE_Credentials == null) {
allParametersPresent = false
}
// the following 4 parameters should be pushed by the master trigger
// if not present, take the job GIT variables (used for developing)
if (params.eNB_Repository == null) {
eNB_Repository = env.GIT_URL
} else {
eNB_Repository = params.eNB_Repository
}
echo "eNB_Repository : ${eNB_Repository}"
if (params.eNB_Branch == null) {
eNB_Branch = env.GIT_BRANCH
} else {
eNB_Branch = params.eNB_Branch
}
echo "eNB_Branch : ${eNB_Branch}"
if (params.eNB_CommitID == null) {
eNB_CommitID = env.GIT_COMMIT
} else {
eNB_CommitID = params.eNB_CommitID
}
echo "eNB_CommitID : ${eNB_CommitID}"
if (params.eNB_mergeRequest != null) {
eNB_AllowMergeRequestProcess = params.eNB_mergeRequest
if (eNB_AllowMergeRequestProcess) {
if (params.eNB_TargetBranch != null) {
eNB_TargetBranch = params.eNB_TargetBranch
} else {
eNB_TargetBranch = 'develop'
}
echo "eNB_TargetBranch : ${eNB_TargetBranch}"
}
}
/*
if (params.EPC_IPAddress == null) {
allParametersPresent = false
}
if (params.EPC_Type == null) {
allParametersPresent = false
}
if (params.EPC_SourceCodePath == null) {
allParametersPresent = false
}
if (params.EPC_Credentials == null) {
allParametersPresent = false
}
*/
if (params.ADB_IPAddress == null) {
allParametersPresent = false
}
if (params.ADB_Credentials == null) {
allParametersPresent = false
}
if (allParametersPresent) {
echo "All parameters are present"
if (eNB_AllowMergeRequestProcess) {
sh "git fetch"
sh "./ci-scripts/doGitLabMerge.sh --src-branch ${eNB_Branch} --src-commit ${eNB_CommitID} --target-branch ${eNB_TargetBranch} --target-commit latest"
} else {
sh "git fetch"
sh "git checkout -f ${eNB_CommitID}"
}
} else {
echo "Some parameters are missing"
sh "./ci-scripts/fail.sh"
}
}
}
}
stage ("Build and Test") {
steps {
script {
dir ('ci-scripts') {
echo "\u2705 \u001B[32m${testStageName}\u001B[0m"
// If not present picking a default XML file
if (params.pythonTestXmlFile == null) {
// picking default
testXMLFile = 'xml_files/ue_band20_build.xml'
echo "Test XML file(default): ${testXMLFile}"
mainPythonAllXmlFiles += "--XMLTestFile=" + testXMLFile + " "
} else {
String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
for (xmlFile in myXmlTestSuite) {
if (fileExists(xmlFile)) {
mainPythonAllXmlFiles += "--XMLTestFile=" + xmlFile + " "
echo "Test XML file : ${xmlFile}"
}
}
}
withCredentials([
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.UE_Credentials}", usernameVariable: 'UE_Username', passwordVariable: 'UE_Password'],
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.ADB_Credentials}", usernameVariable: 'ADB_Username', passwordVariable: 'ADB_Password']
]) {
sh "python3 main.py --mode=InitiateHtml --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} ${mainPythonAllXmlFiles}"
String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
for (xmlFile in myXmlTestSuite) {
if (fileExists(xmlFile)) {
try {
sh "python3 main.py --mode=TestUE --UEIPAddress=${params.UE_IPAddress} --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --UEUserName=${UE_Username} --UEPassword=${UE_Password} --UESourceCodePath=${params.UE_SourceCodePath} --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} --XMLTestFile=${xmlFile}"
} catch (Exception e) {
currentBuild.result = 'FAILURE'
buildStageStatus = false
}
}
}
sh "python3 main.py --mode=FinalizeHtml --finalStatus=${buildStageStatus} --UEIPAddress=${params.UE_IPAddress} --UEUserName=${UE_Username} --UEPassword=${UE_Password}"
}
}
}
}
}
stage('Log Collection') {
parallel {
stage('Log Collection (OAI UE - Build)') {
steps {
echo '\u2705 \u001B[32mLog Collection (OAI UE - Build)\u001B[0m'
withCredentials([
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.UE_Credentials}", usernameVariable: 'UE_Username', passwordVariable: 'UE_Password']
]) {
sh "python3 ci-scripts/main.py --mode=LogCollectBuild --UEIPAddress=${params.UE_IPAddress} --UEUserName=${UE_Username} --UEPassword=${UE_Password} --UESourceCodePath=${params.UE_SourceCodePath}"
echo '\u2705 \u001B[32mLog Transfer (UE - Build)\u001B[0m'
sh "sshpass -p \'${UE_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${UE_Username}@${params.UE_IPAddress}:${UE_SourceCodePath}/cmake_targets/build.log.zip ./build.log.${env.BUILD_ID}.zip || true"
}
script {
if(fileExists("build.log.${env.BUILD_ID}.zip")) {
archiveArtifacts "build.log.${env.BUILD_ID}.zip"
}
}
}
}
stage('Log Collection (OAI UE - Run)') {
steps {
echo '\u2705 \u001B[32mLog Collection (OAI UE - Run)\u001B[0m'
withCredentials([
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.UE_Credentials}", usernameVariable: 'UE_Username', passwordVariable: 'UE_Password']
]) {
sh "python3 ci-scripts/main.py --mode=LogCollectOAIUE --UEIPAddress=${params.UE_IPAddress} --UEUserName=${UE_Username} --UEPassword=${UE_Password} --UESourceCodePath=${params.UE_SourceCodePath}"
echo '\u2705 \u001B[32mLog Transfer (UE - Run)\u001B[0m'
sh "sshpass -p \'${UE_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${UE_Username}@${params.UE_IPAddress}:${UE_SourceCodePath}/cmake_targets/ue.log.zip ./ue.log.${env.BUILD_ID}.zip || true"
}
script {
if(fileExists("ue.log.${env.BUILD_ID}.zip")) {
archiveArtifacts "ue.log.${env.BUILD_ID}.zip"
}
if(fileExists("ci-scripts/test_results.html")) {
sh "mv ci-scripts/test_results.html test_results-${JOB_NAME}.html"
sh "sed -i -e 's#TEMPLATE_JOB_NAME#${JOB_NAME}#' -e 's@build #TEMPLATE_BUILD_ID@build #${BUILD_ID}@' -e 's#Build-ID: TEMPLATE_BUILD_ID#Build-ID: <a href=\"${BUILD_URL}\">${BUILD_ID}</a>#' -e 's#TEMPLATE_STAGE_NAME#${testStageName}#' test_results-${JOB_NAME}.html"
archiveArtifacts "test_results-${JOB_NAME}.html"
}
}
}
}
}
}
}
post {
always {
script {
if (params.pipelineZipsConsoleLog != null) {
if (params.pipelineZipsConsoleLog) {
echo "Archiving Jenkins console log"
sh "wget --no-check-certificate --no-proxy ${env.JENKINS_URL}/job/${env.JOB_NAME}/${env.BUILD_ID}/consoleText -O consoleText.log || true"
sh "zip -m consoleText.log.${env.BUILD_ID}.zip consoleText.log || true"
if(fileExists("consoleText.log.${env.BUILD_ID}.zip")) {
archiveArtifacts "consoleText.log.${env.BUILD_ID}.zip"
}
}
}
}
}
}
}

View File

@@ -0,0 +1,21 @@
#/*
# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
# * contributor license agreements. See the NOTICE file distributed with
# * this work for additional information regarding copyright ownership.
# * The OpenAirInterface Software Alliance licenses this file to You under
# * the OAI Public License, Version 1.1 (the "License"); you may not use this file
# * except in compliance with the License.
# * You may obtain a copy of the License at
# *
# * http://www.openairinterface.org/?page_id=698
# *
# * Unless required by applicable law or agreed to in writing, software
# * distributed under the License is distributed on an "AS IS" BASIS,
# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# * See the License for the specific language governing permissions and
# * limitations under the License.
# *-------------------------------------------------------------------------------
# * For more information about the OpenAirInterface (OAI) Software Alliance:
# * contact@openairinterface.org
# */
/inet.*brd/{print "interfaceToUse="$NF"done"}

View File

@@ -0,0 +1,33 @@
BEGIN{lineIdx=0;captureUEDesc=0}
{
if ($0 ~/UE0/) {
captureUEDesc = 1
}
if (captureUEDesc == 1) {
captureLine[lineIdx] = $0
lineIdx = lineIdx + 1
}
print $0
}
END {
for (ueIdx = 1; ueIdx < num_ues; ueIdx++) {
print ""
for (k = 0; k < lineIdx; k++) {
if (captureLine[k] ~/UE0/) {
mLine = captureLine[k]
gsub("UE0", "UE"ueIdx, mLine)
print mLine
} else {
if (captureLine[k] ~/MSIN=/) {
mLine = captureLine[k]
MSIN=sprintf("%08d", 1111+int(ueIdx))
gsub("00001111", MSIN, mLine)
print mLine
} else {
print captureLine[k]
}
}
}
}
}

View File

@@ -0,0 +1,27 @@
BEGIN{lineIdx=0}
{
captureLine[lineIdx] = $0
lineIdx = lineIdx + 1
print $0
}
END{
for (ueIdx = 1; ueIdx < num_ues; ueIdx++) {
for (k = 0; k < lineIdx; k++) {
if (captureLine[k] ~/UserName=/) {
mLine = captureLine[k]
MSIN=sprintf("%08d", 1111+int(ueIdx))
gsub("00001111", MSIN, mLine)
print mLine
} else {
if (captureLine[k] ~/SubscriptionIndex/) {
mLine = captureLine[k]
MSIN=sprintf("%d", 111+int(ueIdx))
gsub("111", MSIN, mLine)
print mLine
} else {
print captureLine[k]
}
}
}
}
}

View File

@@ -179,8 +179,8 @@ echo "############################################################"
echo "Checking build status"
echo "############################################################"
LOG_PATTERN=.Rel14.txt
NB_PATTERN_FILES=4
LOG_PATTERN=.Rel15.txt
NB_PATTERN_FILES=7
LOG_FILES=`ls $ARCHIVES_LOC/*.txt`
STATUS=0
@@ -198,12 +198,19 @@ do
fi
done
if [ $NB_PATTERN_FILES -ne $NB_FOUND_FILES ]; then STATUS=-1; fi
if [ $NB_PATTERN_FILES -ne $NB_FOUND_FILES ]
then
echo "Expecting $NB_PATTERN_FILES log files and found $NB_FOUND_FILES"
STATUS=-1
fi
echo "COMMAND: build_oai -I -w USRP --eNB" > $ARCHIVES_LOC/build_final_status.log
if [ $STATUS -eq 0 ]
then
echo "BUILD_OK" >> $ARCHIVES_LOC/build_final_status.log
echo "STATUS seems OK"
else
echo "BUILD_KO" >> $ARCHIVES_LOC/build_final_status.log
echo "STATUS failed?"
fi
exit $STATUS

View File

@@ -20,380 +20,198 @@
# * contact@openairinterface.org
# */
function usage {
echo "OAI VM Build Check script"
function build_usage {
echo "OAI CI VM script"
echo " Original Author: Raphael Defosseux"
echo " Requirements:"
echo " -- uvtool uvtool-libvirt apt-cacher"
echo " -- xenial image already synced"
echo " -- $VM_OSREL image already synced"
echo " Default:"
echo " -- eNB with USRP"
echo ""
echo "Usage:"
echo "------"
echo " buildOnVM.sh [OPTIONS]"
echo ""
echo "Options:"
echo "--------"
echo " --job-name #### OR -jn ####"
echo " Specify the name of the Jenkins job."
echo ""
echo " --build-id #### OR -id ####"
echo " Specify the build ID of the Jenkins job."
echo ""
echo " --workspace #### OR -ws ####"
echo " Specify the workspace."
echo ""
echo " --variant enb-usrp OR -v1"
echo " --variant basic-sim OR -v2"
echo " --variant phy-sim OR -v3"
echo " --variant cppcheck OR -v4"
echo " --variant enb-ethernet OR -v7"
echo " --variant ue-ethernet OR -v8"
echo " Specify the variant to build."
echo ""
echo " --keep-vm-alive OR -k"
echo " Keep the VM alive after the build."
echo ""
echo " --help OR -h"
echo " Print this help message."
echo " oai-ci-vm-tool build [OPTIONS]"
echo ""
command_options_usage
}
function variant_usage {
echo "OAI VM Build Check script"
echo " Original Author: Raphael Defosseux"
echo ""
echo " --variant enb-usrp OR -v1"
echo " --variant basic-sim OR -v2"
echo " --variant phy-sim OR -v3"
echo " --variant cppcheck OR -v4"
echo " --variant enb-ethernet OR -v7"
echo " --variant ue-ethernet OR -v8"
echo ""
}
if [ $# -lt 1 ] || [ $# -gt 9 ]
then
echo "Syntax Error: not the correct number of arguments"
echo ""
usage
exit 1
fi
VM_TEMPLATE=ci-
JOB_NAME=XX
BUILD_ID=XX
VM_NAME=ci-enb-usrp
VM_MEMORY=2048
VM_CPU=4
ARCHIVES_LOC=enb_usrp
LOG_PATTERN=.Rel14.txt
NB_PATTERN_FILES=4
BUILD_OPTIONS="--eNB -w USRP"
KEEP_VM_ALIVE=0
while [[ $# -gt 0 ]]
do
key="$1"
case $key in
-h|--help)
shift
usage
exit 0
;;
-jn|--job-name)
JOB_NAME="$2"
shift
shift
;;
-id|--build-id)
BUILD_ID="$2"
shift
shift
;;
-ws|--workspace)
JENKINS_WKSP="$2"
shift
shift
;;
-k|--keep-vm-alive)
KEEP_VM_ALIVE=1
shift
;;
-v1)
VM_NAME=ci-enb-usrp
ARCHIVES_LOC=enb_usrp
LOG_PATTERN=.Rel14.txt
NB_PATTERN_FILES=4
BUILD_OPTIONS="--eNB -w USRP --mu"
shift
;;
-v2)
VM_NAME=ci-basic-sim
ARCHIVES_LOC=basic_sim
LOG_PATTERN=basic_simulator
NB_PATTERN_FILES=2
BUILD_OPTIONS="--basic-simulator"
VM_MEMORY=8192
VM_CPU=4
shift
;;
-v3)
VM_NAME=ci-phy-sim
ARCHIVES_LOC=phy_sim
LOG_PATTERN=.Rel14.txt
NB_PATTERN_FILES=3
BUILD_OPTIONS="--phy_simulators"
shift
;;
-v4)
VM_NAME=ci-cppcheck
VM_MEMORY=4096
ARCHIVES_LOC=cppcheck
LOG_PATTERN=cppcheck.xml
NB_PATTERN_FILES=1
BUILD_OPTIONS="--enable=warning --force --xml --xml-version=2"
shift
;;
-v7)
VM_NAME=ci-enb-ethernet
ARCHIVES_LOC=enb_eth
LOG_PATTERN=.Rel14.txt
NB_PATTERN_FILES=6
BUILD_OPTIONS="--eNB -t ETHERNET --noS1"
shift
;;
-v8)
VM_NAME=ci-ue-ethernet
ARCHIVES_LOC=ue_eth
LOG_PATTERN=.Rel14.txt
NB_PATTERN_FILES=6
BUILD_OPTIONS="--UE -t ETHERNET --noS1"
shift
;;
--variant)
variant="$2"
case $variant in
enb-usrp)
VM_NAME=ci-enb-usrp
ARCHIVES_LOC=enb_usrp
LOG_PATTERN=.Rel14.txt
NB_PATTERN_FILES=4
BUILD_OPTIONS="--eNB -w USRP --mu"
;;
basic-sim)
VM_NAME=ci-basic-sim
ARCHIVES_LOC=basic_sim
LOG_PATTERN=basic_simulator
NB_PATTERN_FILES=2
BUILD_OPTIONS="--basic-simulator"
VM_MEMORY=8192
VM_CPU=4
;;
phy-sim)
VM_NAME=ci-phy-sim
ARCHIVES_LOC=phy_sim
LOG_PATTERN=.Rel14.txt
NB_PATTERN_FILES=3
BUILD_OPTIONS="--phy_simulators"
;;
cppcheck)
VM_NAME=ci-cppcheck
VM_MEMORY=4096
ARCHIVES_LOC=cppcheck
LOG_PATTERN=cppcheck.xml
NB_PATTERN_FILES=1
BUILD_OPTIONS="--enable=warning --force --xml --xml-version=2"
;;
enb-ethernet)
VM_NAME=ci-enb-ethernet
ARCHIVES_LOC=enb_eth
LOG_PATTERN=.Rel14.txt
NB_PATTERN_FILES=6
BUILD_OPTIONS="--eNB -t ETHERNET --noS1"
;;
ue-ethernet)
VM_NAME=ci-ue-ethernet
ARCHIVES_LOC=ue_eth
LOG_PATTERN=.Rel14.txt
NB_PATTERN_FILES=6
BUILD_OPTIONS="--UE -t ETHERNET --noS1"
;;
*)
echo ""
echo "Syntax Error: Invalid Variant option -> $variant"
echo ""
variant_usage
exit 1
esac
shift
shift
;;
*)
echo "Syntax Error: unknown option: $key"
echo ""
usage
exit 1
esac
done
if [ ! -f $JENKINS_WKSP/localZip.zip ]
then
echo "Missing localZip.zip file!"
exit 1
fi
if [ ! -f /etc/apt/apt.conf.d/01proxy ]
then
echo "Missing /etc/apt/apt.conf.d/01proxy file!"
echo "Is apt-cacher installed and configured?"
exit 1
fi
if [ "$JOB_NAME" == "XX" ] || [ "$BUILD_ID" == "XX" ]
then
VM_TEMPLATE=ci-
else
VM_TEMPLATE=${JOB_NAME}-b${BUILD_ID}-
fi
VM_NAME=`echo $VM_NAME | sed -e "s#ci-#$VM_TEMPLATE#"`
VM_CMDS=${VM_NAME}_cmds.txt
ARCHIVES_LOC=${JENKINS_WKSP}/archives/${ARCHIVES_LOC}
echo "VM_NAME = $VM_NAME"
echo "VM_CMD_FILE = $VM_CMDS"
echo "JENKINS_WKSP = $JENKINS_WKSP"
echo "ARCHIVES_LOC = $ARCHIVES_LOC"
echo "BUILD_OPTIONS = $BUILD_OPTIONS"
IS_VM_ALIVE=`uvt-kvm list | grep -c $VM_NAME`
if [ $IS_VM_ALIVE -eq 0 ]
then
echo "############################################################"
echo "Creating VM ($VM_NAME) on Ubuntu Cloud Image base"
echo "############################################################"
uvt-kvm create $VM_NAME release=xenial --memory $VM_MEMORY --cpu $VM_CPU --unsafe-caching --template ci-scripts/template-host.xml
fi
echo "Waiting for VM to be started"
uvt-kvm wait $VM_NAME --insecure
VM_IP_ADDR=`uvt-kvm ip $VM_NAME`
echo "$VM_NAME has for IP addr = $VM_IP_ADDR"
echo "############################################################"
echo "Copying GIT repo into VM ($VM_NAME)"
echo "############################################################"
scp -o StrictHostKeyChecking=no localZip.zip ubuntu@$VM_IP_ADDR:/home/ubuntu
scp -o StrictHostKeyChecking=no /etc/apt/apt.conf.d/01proxy ubuntu@$VM_IP_ADDR:/home/ubuntu
echo "############################################################"
echo "Running install and build script on VM ($VM_NAME)"
echo "############################################################"
echo "sudo cp 01proxy /etc/apt/apt.conf.d/" > $VM_CMDS
echo "touch /home/ubuntu/.hushlogin" >> $VM_CMDS
if [[ "$VM_NAME" == *"-cppcheck"* ]]
then
echo "echo \"sudo apt-get --yes --quiet install zip cppcheck \"" >> $VM_CMDS
echo "sudo apt-get update > zip-install.txt 2>&1" >> $VM_CMDS
echo "sudo apt-get --yes install zip cppcheck >> zip-install.txt 2>&1" >> $VM_CMDS
else
echo "echo \"sudo apt-get --yes --quiet install zip subversion libboost-dev \"" >> $VM_CMDS
echo "sudo apt-get update > zip-install.txt 2>&1" >> $VM_CMDS
echo "sudo apt-get --yes install zip subversion libboost-dev >> zip-install.txt 2>&1" >> $VM_CMDS
fi
echo "mkdir tmp" >> $VM_CMDS
echo "cd tmp" >> $VM_CMDS
echo "echo \"unzip -qq -DD ../localZip.zip\"" >> $VM_CMDS
echo "unzip -qq -DD ../localZip.zip" >> $VM_CMDS
if [[ "$VM_NAME" == *"-cppcheck"* ]]
then
echo "mkdir cmake_targets/log" >> $VM_CMDS
echo "cp /home/ubuntu/zip-install.txt cmake_targets/log" >> $VM_CMDS
echo "echo \"cppcheck $BUILD_OPTIONS . \"" >> $VM_CMDS
echo "cppcheck $BUILD_OPTIONS . 2> cmake_targets/log/cppcheck.xml 1> cmake_targets/log/cppcheck_build.txt" >> $VM_CMDS
else
echo "echo \"source oaienv\"" >> $VM_CMDS
echo "source oaienv" >> $VM_CMDS
echo "cd cmake_targets/" >> $VM_CMDS
echo "mkdir log" >> $VM_CMDS
echo "cp /home/ubuntu/zip-install.txt log" >> $VM_CMDS
echo "echo \"./build_oai -I $BUILD_OPTIONS \"" >> $VM_CMDS
echo "./build_oai -I $BUILD_OPTIONS > log/install-build.txt 2>&1" >> $VM_CMDS
fi
ssh -o StrictHostKeyChecking=no ubuntu@$VM_IP_ADDR < $VM_CMDS
echo "############################################################"
echo "Creating a tmp folder to store results and artifacts"
echo "############################################################"
if [ ! -d $JENKINS_WKSP/archives ]
then
mkdir $JENKINS_WKSP/archives
fi
if [ ! -d $ARCHIVES_LOC ]
then
mkdir $ARCHIVES_LOC
fi
scp -o StrictHostKeyChecking=no ubuntu@$VM_IP_ADDR:/home/ubuntu/tmp/cmake_targets/log/*.txt $ARCHIVES_LOC
if [[ "$VM_NAME" == *"-cppcheck"* ]]
then
scp -o StrictHostKeyChecking=no ubuntu@$VM_IP_ADDR:/home/ubuntu/tmp/cmake_targets/log/*.xml $ARCHIVES_LOC
fi
if [ $KEEP_VM_ALIVE -eq 0 ]
then
echo "############################################################"
echo "Destroying VM"
echo "############################################################"
uvt-kvm destroy $VM_NAME
ssh-keygen -R $VM_IP_ADDR
fi
rm -f $VM_CMDS
echo "############################################################"
echo "Checking build status"
echo "############################################################"
LOG_FILES=`ls $ARCHIVES_LOC/*.txt $ARCHIVES_LOC/*.xml`
STATUS=0
NB_FOUND_FILES=0
for FULLFILE in $LOG_FILES
do
if [[ $FULLFILE == *"$LOG_PATTERN"* ]]
function build_on_vm {
if [ ! -f $JENKINS_WKSP/localZip.zip ]
then
filename=$(basename -- "$FULLFILE")
if [ "$LOG_PATTERN" == ".Rel14.txt" ]
then
PASS_PATTERN=`echo $filename | sed -e "s#$LOG_PATTERN##"`
fi
if [ "$LOG_PATTERN" == "basic_simulator" ]
then
PASS_PATTERN="lte-"
fi
if [ "$LOG_PATTERN" == "cppcheck.xml" ]
then
PASS_PATTERN="results version"
LOCAL_STAT=`egrep -c "$PASS_PATTERN" $FULLFILE`
else
LOCAL_STAT=`egrep -c "Built target $PASS_PATTERN" $FULLFILE`
fi
if [ $LOCAL_STAT -eq 0 ]; then STATUS=-1; fi
NB_FOUND_FILES=$((NB_FOUND_FILES + 1))
echo "Missing localZip.zip file!"
STATUS=1
return
fi
if [[ ! -f /etc/apt/apt.conf.d/01proxy ]] && [[ "$OPTIONAL_APTCACHER" != "true" ]]
then
echo "Missing /etc/apt/apt.conf.d/01proxy file!"
echo "Is apt-cacher installed and configured?"
STATUS=1
return
fi
done
if [ $NB_PATTERN_FILES -ne $NB_FOUND_FILES ]; then STATUS=-1; fi
echo "############################################################"
echo "OAI CI VM script"
echo "############################################################"
if [ $STATUS -eq 0 ]
then
echo "STATUS seems OK"
else
echo "STATUS failed?"
fi
exit $STATUS
echo "VM_NAME = $VM_NAME"
echo "VM_CMD_FILE = $VM_CMDS"
echo "JENKINS_WKSP = $JENKINS_WKSP"
echo "ARCHIVES_LOC = $ARCHIVES_LOC"
echo "BUILD_OPTIONS = $BUILD_OPTIONS"
IS_VM_ALIVE=`uvt-kvm list | grep -c $VM_NAME`
if [ $IS_VM_ALIVE -eq 0 ]
then
echo "VM_MEMORY = $VM_MEMORY MBytes"
echo "VM_CPU = $VM_CPU"
echo "VM_DISK = $VM_DISK GBytes"
echo "############################################################"
echo "Creating VM ($VM_NAME) on Ubuntu Cloud Image base"
echo "############################################################"
acquire_vm_create_lock
uvt-kvm create $VM_NAME release=$VM_OSREL --memory $VM_MEMORY --cpu $VM_CPU --disk $VM_DISK --unsafe-caching --template ci-scripts/template-host.xml
echo "Waiting for VM to be started"
uvt-kvm wait $VM_NAME --insecure
VM_IP_ADDR=`uvt-kvm ip $VM_NAME`
echo "$VM_NAME has for IP addr = $VM_IP_ADDR"
release_vm_create_lock
else
echo "Waiting for VM to be started"
uvt-kvm wait $VM_NAME --insecure
VM_IP_ADDR=`uvt-kvm ip $VM_NAME`
echo "$VM_NAME has for IP addr = $VM_IP_ADDR"
fi
echo "############################################################"
echo "Copying GIT repo into VM ($VM_NAME)"
echo "############################################################"
if [[ "$VM_NAME" == *"-flexran-rtc"* ]]
then
scp -o StrictHostKeyChecking=no $JENKINS_WKSP/flexran/flexran.zip ubuntu@$VM_IP_ADDR:/home/ubuntu/localZip.zip
else
scp -o StrictHostKeyChecking=no $JENKINS_WKSP/localZip.zip ubuntu@$VM_IP_ADDR:/home/ubuntu
fi
[ -f /etc/apt/apt.conf.d/01proxy ] && scp -o StrictHostKeyChecking=no /etc/apt/apt.conf.d/01proxy ubuntu@$VM_IP_ADDR:/home/ubuntu
echo "############################################################"
echo "Running install and build script on VM ($VM_NAME)"
echo "############################################################"
echo "[ -f 01proxy ] && sudo cp 01proxy /etc/apt/apt.conf.d/" > $VM_CMDS
echo "touch /home/ubuntu/.hushlogin" >> $VM_CMDS
echo "git config --global https.postBuffer 123289600" >> $VM_CMDS
if [[ "$VM_NAME" == *"-cppcheck"* ]]
then
if [ $DAEMON -eq 0 ]
then
echo "echo \"sudo apt-get --yes --quiet install zip cppcheck \"" >> $VM_CMDS
echo "sudo apt-get update > zip-install.txt 2>&1" >> $VM_CMDS
echo "sudo apt-get --yes install zip cppcheck >> zip-install.txt 2>&1" >> $VM_CMDS
else
echo "echo \"sudo apt-get --yes --quiet install zip daemon cppcheck \"" >> $VM_CMDS
echo "sudo apt-get update > zip-install.txt 2>&1" >> $VM_CMDS
echo "sudo apt-get --yes install zip daemon cppcheck >> zip-install.txt 2>&1" >> $VM_CMDS
fi
fi
if [[ "$VM_NAME" == *"-flexran-rtc"* ]]
then
if [ $DAEMON -eq 0 ]
then
echo "echo \"sudo apt-get --yes --quiet install zip curl jq \"" >> $VM_CMDS
echo "sudo apt-get update > zip-install.txt 2>&1" >> $VM_CMDS
echo "sudo apt-get --yes install zip curl jq >> zip-install.txt 2>&1" >> $VM_CMDS
else
echo "echo \"sudo apt-get --yes --quiet install zip daemon curl jq \"" >> $VM_CMDS
echo "sudo apt-get update > zip-install.txt 2>&1" >> $VM_CMDS
echo "sudo apt-get --yes install zip daemon curl jq >> zip-install.txt 2>&1" >> $VM_CMDS
fi
fi
if [[ "$VM_NAME" != *"-cppcheck"* ]] && [[ "$VM_NAME" != *"-flexran-rtc"* ]]
then
if [ $DAEMON -eq 0 ]
then
echo "echo \"sudo apt-get --yes --quiet install zip subversion libboost-dev \"" >> $VM_CMDS
echo "sudo apt-get update > zip-install.txt 2>&1" >> $VM_CMDS
if [[ "$VM_NAME" == *"-phy-sim"* ]]
then
echo "sudo apt-get --yes install zip subversion libboost-dev make gcc >> zip-install.txt 2>&1" >> $VM_CMDS
else
echo "sudo apt-get --yes install zip subversion libboost-dev >> zip-install.txt 2>&1" >> $VM_CMDS
fi
else
echo "echo \"sudo apt-get --yes --quiet install zip daemon subversion libboost-dev \"" >> $VM_CMDS
echo "sudo apt-get update > zip-install.txt 2>&1" >> $VM_CMDS
if [[ "$VM_NAME" == *"-phy-sim"* ]]
then
echo "sudo apt-get --yes install zip daemon subversion libboost-dev make gcc >> zip-install.txt 2>&1" >> $VM_CMDS
else
echo "sudo apt-get --yes install zip daemon subversion libboost-dev >> zip-install.txt 2>&1" >> $VM_CMDS
fi
fi
fi
echo "mkdir tmp" >> $VM_CMDS
echo "cd tmp" >> $VM_CMDS
echo "echo \"unzip -qq -DD ../localZip.zip\"" >> $VM_CMDS
echo "unzip -qq -DD ../localZip.zip" >> $VM_CMDS
if [[ "$VM_NAME" == *"-cppcheck"* ]]
then
echo "mkdir cmake_targets/log" >> $VM_CMDS
echo "chmod 777 cmake_targets/log" >> $VM_CMDS
echo "cp /home/ubuntu/zip-install.txt cmake_targets/log" >> $VM_CMDS
echo "echo \"cppcheck $BUILD_OPTIONS . \"" >> $VM_CMDS
if [ $DAEMON -eq 0 ]
then
echo "cppcheck $BUILD_OPTIONS . 2> cmake_targets/log/cppcheck.xml 1> cmake_targets/log/cppcheck_build.txt" >> $VM_CMDS
else
echo "echo \"cppcheck $BUILD_OPTIONS .\" > ./my-vm-build.sh" >> $VM_CMDS
echo "chmod 775 ./my-vm-build.sh " >> $VM_CMDS
echo "sudo -E daemon --inherit --unsafe --name=build_daemon --chdir=/home/ubuntu/tmp -O /home/ubuntu/tmp/cmake_targets/log/cppcheck_build.txt -E /home/ubuntu/tmp/cmake_targets/log/cppcheck.xml ./my-vm-build.sh" >> $VM_CMDS
fi
fi
if [[ "$VM_NAME" == *"-flexran-rtc"* ]]
then
echo "mkdir -p cmake_targets/log" >> $VM_CMDS
echo "chmod 777 cmake_targets/log" >> $VM_CMDS
echo "cp /home/ubuntu/zip-install.txt cmake_targets/log" >> $VM_CMDS
echo "echo \"./tools/install_dependencies \"" >> $VM_CMDS
echo "./tools/install_dependencies > cmake_targets/log/install-build.txt 2>&1" >> $VM_CMDS
echo "echo \"mkdir build\"" >> $VM_CMDS
echo "mkdir build" >> $VM_CMDS
echo "echo \"cd build\"" >> $VM_CMDS
echo "cd build" >> $VM_CMDS
echo "echo \"$BUILD_OPTIONS \"" >> $VM_CMDS
echo "$BUILD_OPTIONS > ../cmake_targets/log/rt_controller.Rel15.txt 2>&1" >> $VM_CMDS
fi
if [[ "$VM_NAME" != *"-cppcheck"* ]] && [[ "$VM_NAME" != *"-flexran-rtc"* ]]
then
echo "echo \"source oaienv\"" >> $VM_CMDS
echo "source oaienv" >> $VM_CMDS
if [[ "$VM_NAME" == *"-phy-sim"* ]]
then
echo "cd common/utils/T" >> $VM_CMDS
echo "make" >> $VM_CMDS
echo "cd ../../.." >> $VM_CMDS
fi
echo "cd cmake_targets/" >> $VM_CMDS
echo "mkdir log" >> $VM_CMDS
echo "chmod 777 log" >> $VM_CMDS
echo "cp /home/ubuntu/zip-install.txt log" >> $VM_CMDS
if [ $DAEMON -eq 0 ]
then
echo "echo \"./build_oai -I $BUILD_OPTIONS \"" >> $VM_CMDS
echo "./build_oai -I $BUILD_OPTIONS > log/install-build.txt 2>&1" >> $VM_CMDS
else
echo "echo \"./build_oai -I $BUILD_OPTIONS\" > ./my-vm-build.sh" >> $VM_CMDS
echo "chmod 775 ./my-vm-build.sh " >> $VM_CMDS
echo "echo \"sudo -E daemon --inherit --unsafe --name=build_daemon --chdir=/home/ubuntu/tmp/cmake_targets -o /home/ubuntu/tmp/cmake_targets/log/install-build.txt ./my-vm-build.sh\"" >> $VM_CMDS
echo "sudo -E daemon --inherit --unsafe --name=build_daemon --chdir=/home/ubuntu/tmp/cmake_targets -o /home/ubuntu/tmp/cmake_targets/log/install-build.txt ./my-vm-build.sh" >> $VM_CMDS
fi
fi
ssh -T -o StrictHostKeyChecking=no ubuntu@$VM_IP_ADDR < $VM_CMDS
rm -f $VM_CMDS
}

View File

@@ -95,7 +95,7 @@ fi
# Merge request scenario
MERGE_COMMMIT=`git log -n1 | grep commit | sed -e "s@commit @@"`
MERGE_COMMMIT=`git log -n1 --pretty=format:%H`
TARGET_INIT_COMMIT=`cat .git/refs/remotes/origin/$TARGET_BRANCH`
echo " ---- Checking the modified files by the merge request ----"
@@ -110,7 +110,7 @@ MODIFIED_FILES=`git log $TARGET_INIT_COMMIT..$MERGE_COMMMIT --oneline --name-sta
NB_WARNINGS_FILES=0
# Retrieve list of warnings
LIST_WARNING_FILES=`egrep "error:|warning:" archives/*/*.Rel14.txt archives/*/basic_simulator_*txt | egrep -v "jobserver unavailable|Clock skew detected.|flexran.proto" | sed -e "s#^.*/home/ubuntu/tmp/##" -e "s#^.*/tmp/CI-eNB/##" -e "s#common/utils/.*/itti#common/utils/itti#" | awk -F ":" '{print $1}' | sort | uniq`
LIST_WARNING_FILES=`egrep "error:|warning:" archives/*/*.Rel15.txt archives/*/basic_simulator_*txt | egrep -v "jobserver unavailable|Clock skew detected.|flexran.proto" | sed -e "s#^.*/home/ubuntu/tmp/##" -e "s#^.*/tmp/CI-eNB/##" -e "s#common/utils/.*/itti#common/utils/itti#" | awk -F ":" '{print $1}' | sort | uniq`
echo ""
echo "List of files that have been modified by the Merge Request AND"

View File

@@ -111,7 +111,7 @@ fi
# Merge request scenario
MERGE_COMMMIT=`git log -n1 | grep commit | sed -e "s@commit @@"`
MERGE_COMMMIT=`git log -n1 --pretty=format:%H`
TARGET_INIT_COMMIT=`cat .git/refs/remotes/origin/$TARGET_BRANCH`
echo " ---- Checking the modified files by the merge request ----"

View File

@@ -0,0 +1,221 @@
Active_eNBs = ( "eNB-CU-Eurecom-LTEBox");
# Asn1_verbosity, choice in: none, info, annoying
Asn1_verbosity = "none";
eNBs = (
{
////////// Identification parameters:
eNB_ID = 0xe00;
cell_type = "CELL_MACRO_ENB";
eNB_name = "eNB-CU-Eurecom-LTEBox";
// Tracking area code, 0x0000 and 0xfffe are reserved values
tracking_area_code = 1;
plmn_list = ( { mcc = 208; mnc = 92; mnc_length = 2; } )
nr_cellid = 12345678L
tr_s_preference = "f1"
local_s_if_name = "lo";
remote_s_address = "127.0.0.3";
local_s_address = "127.0.0.4";
local_s_portc = 501;
remote_s_portc = 500;
local_s_portd = 601;
remote_s_portd = 600;
////////// Physical parameters:
component_carriers = (
{
node_function = "3GPP_eNodeB";
node_timing = "synch_to_ext_device";
node_synch_ref = 0;
frame_type = "FDD";
tdd_config = 3;
tdd_config_s = 0;
prefix_type = "NORMAL";
eutra_band = 7;
downlink_frequency = 2680000000L;
uplink_frequency_offset = -120000000;
Nid_cell = 0;
N_RB_DL = 100;
pbch_repetition = "FALSE";
prach_root = 0;
prach_config_index = 0;
prach_high_speed = "DISABLE";
prach_zero_correlation = 1;
prach_freq_offset = 2;
pucch_delta_shift = 1;
pucch_nRB_CQI = 0;
pucch_nCS_AN = 0;
pucch_n1_AN = 0;
pdsch_referenceSignalPower = -29;
pdsch_p_b = 0;
pusch_n_SB = 1;
pusch_enable64QAM = "DISABLE";
pusch_hoppingMode = "interSubFrame";
pusch_hoppingOffset = 0;
pusch_groupHoppingEnable = "ENABLE";
pusch_groupAssignment = 0;
pusch_sequenceHoppingEnabled = "DISABLE";
pusch_nDMRS1 = 1;
phich_duration = "NORMAL";
phich_resource = "ONESIXTH";
srs_enable = "DISABLE";
/*
srs_BandwidthConfig =;
srs_SubframeConfig =;
srs_ackNackST =;
srs_MaxUpPts =;
*/
pusch_p0_Nominal = -96;
pusch_alpha = "AL1";
pucch_p0_Nominal = -104;
msg3_delta_Preamble = 6;
pucch_deltaF_Format1 = "deltaF2";
pucch_deltaF_Format1b = "deltaF3";
pucch_deltaF_Format2 = "deltaF0";
pucch_deltaF_Format2a = "deltaF0";
pucch_deltaF_Format2b = "deltaF0";
rach_numberOfRA_Preambles = 64;
rach_preamblesGroupAConfig = "DISABLE";
/*
rach_sizeOfRA_PreamblesGroupA = ;
rach_messageSizeGroupA = ;
rach_messagePowerOffsetGroupB = ;
*/
rach_powerRampingStep = 4;
rach_preambleInitialReceivedTargetPower = -108;
rach_preambleTransMax = 10;
rach_raResponseWindowSize = 10;
rach_macContentionResolutionTimer = 48;
rach_maxHARQ_Msg3Tx = 4;
pcch_default_PagingCycle = 128;
pcch_nB = "oneT";
bcch_modificationPeriodCoeff= 2;
ue_TimersAndConstants_t300 = 1000;
ue_TimersAndConstants_t301 = 1000;
ue_TimersAndConstants_t310 = 1000;
ue_TimersAndConstants_t311 = 10000;
ue_TimersAndConstants_n310 = 20;
ue_TimersAndConstants_n311 = 1;
ue_TransmissionMode = 1;
//Parameters for SIB18
rxPool_sc_CP_Len = "normal";
rxPool_sc_Period = "sf40";
rxPool_data_CP_Len = "normal";
rxPool_ResourceConfig_prb_Num = 20;
rxPool_ResourceConfig_prb_Start = 5;
rxPool_ResourceConfig_prb_End = 44;
rxPool_ResourceConfig_offsetIndicator_present = "prSmall";
rxPool_ResourceConfig_offsetIndicator_choice = 0;
rxPool_ResourceConfig_subframeBitmap_present = "prBs40";
rxPool_ResourceConfig_subframeBitmap_choice_bs_buf = "00000000000000000000";
rxPool_ResourceConfig_subframeBitmap_choice_bs_size = 5;
rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0;
/*
rxPool_dataHoppingConfig_hoppingParameter = 0;
rxPool_dataHoppingConfig_numSubbands = "ns1";
rxPool_dataHoppingConfig_rbOffset = 0;
rxPool_commTxResourceUC-ReqAllowed = "TRUE";
*/
// Parameters for SIB19
discRxPool_cp_Len = "normal"
discRxPool_discPeriod = "rf32"
discRxPool_numRetx = 1;
discRxPool_numRepetition = 2;
discRxPool_ResourceConfig_prb_Num = 5;
discRxPool_ResourceConfig_prb_Start = 3;
discRxPool_ResourceConfig_prb_End = 21;
discRxPool_ResourceConfig_offsetIndicator_present = "prSmall";
discRxPool_ResourceConfig_offsetIndicator_choice = 0;
discRxPool_ResourceConfig_subframeBitmap_present = "prBs40";
discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf = "f0ffffffff";
discRxPool_ResourceConfig_subframeBitmap_choice_bs_size = 5;
discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0;
}
);
srb1_parameters :
{
# timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
timer_poll_retransmit = 80;
# timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
timer_reordering = 35;
# timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
timer_status_prohibit = 0;
# poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
poll_pdu = 4;
# poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
poll_byte = 99999;
# max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
max_retx_threshold = 4;
}
# ------- SCTP definitions
SCTP :
{
# Number of streams to use in input/output
SCTP_INSTREAMS = 2;
SCTP_OUTSTREAMS = 2;
};
////////// MME parameters:
mme_ip_address = (
{
ipv4 = "CI_MME_IP_ADDR";
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
NETWORK_INTERFACES : {
ENB_INTERFACE_NAME_FOR_S1_MME = "eth0";
ENB_IPV4_ADDRESS_FOR_S1_MME = "CI_ENB_IP_ADDR";
ENB_INTERFACE_NAME_FOR_S1U = "eth0";
ENB_IPV4_ADDRESS_FOR_S1U = "CI_ENB_IP_ADDR";
ENB_PORT_FOR_S1U = 2152; # Spec 2152
ENB_IPV4_ADDRESS_FOR_X2C = "CI_ENB_IP_ADDR";
ENB_PORT_FOR_X2C = 36422; # Spec 36422
};
}
);
log_config = {
global_log_level = "info";
global_log_verbosity = "medium";
pdcp_log_level = "info";
pdcp_log_verbosity = "high";
rrc_log_level = "info";
rrc_log_verbosity = "medium";
flexran_agent_log_level = "info";
flexran_agent_log_verbosity = "medium";
gtp_log_level = "info";
gtp_log_verbosity = "medium";
};
NETWORK_CONTROLLER : {
FLEXRAN_ENABLED = "no";
FLEXRAN_INTERFACE_NAME = "lo";
FLEXRAN_IPV4_ADDRESS = "127.0.0.1";
FLEXRAN_PORT = 2210;
FLEXRAN_CACHE = "/mnt/oai_agent_cache";
FLEXRAN_AWAIT_RECONF = "no";
};

View File

@@ -0,0 +1,221 @@
Active_eNBs = ( "eNB-CU-Eurecom-LTEBox");
# Asn1_verbosity, choice in: none, info, annoying
Asn1_verbosity = "none";
eNBs = (
{
////////// Identification parameters:
eNB_ID = 0xe00;
cell_type = "CELL_MACRO_ENB";
eNB_name = "eNB-CU-Eurecom-LTEBox";
// Tracking area code, 0x0000 and 0xfffe are reserved values
tracking_area_code = 1;
plmn_list = ( { mcc = 208; mnc = 92; mnc_length = 2; } )
nr_cellid = 12345678L
tr_s_preference = "f1"
local_s_if_name = "lo";
remote_s_address = "127.0.0.3";
local_s_address = "127.0.0.4";
local_s_portc = 501;
remote_s_portc = 500;
local_s_portd = 601;
remote_s_portd = 600;
////////// Physical parameters:
component_carriers = (
{
node_function = "3GPP_eNodeB";
node_timing = "synch_to_ext_device";
node_synch_ref = 0;
frame_type = "FDD";
tdd_config = 3;
tdd_config_s = 0;
prefix_type = "NORMAL";
eutra_band = 7;
downlink_frequency = 2680000000L;
uplink_frequency_offset = -120000000;
Nid_cell = 0;
N_RB_DL = 25;
pbch_repetition = "FALSE";
prach_root = 0;
prach_config_index = 0;
prach_high_speed = "DISABLE";
prach_zero_correlation = 1;
prach_freq_offset = 2;
pucch_delta_shift = 1;
pucch_nRB_CQI = 0;
pucch_nCS_AN = 0;
pucch_n1_AN = 0;
pdsch_referenceSignalPower = -25;
pdsch_p_b = 0;
pusch_n_SB = 1;
pusch_enable64QAM = "DISABLE";
pusch_hoppingMode = "interSubFrame";
pusch_hoppingOffset = 0;
pusch_groupHoppingEnable = "ENABLE";
pusch_groupAssignment = 0;
pusch_sequenceHoppingEnabled = "DISABLE";
pusch_nDMRS1 = 1;
phich_duration = "NORMAL";
phich_resource = "ONESIXTH";
srs_enable = "DISABLE";
/*
srs_BandwidthConfig =;
srs_SubframeConfig =;
srs_ackNackST =;
srs_MaxUpPts =;
*/
pusch_p0_Nominal = -96;
pusch_alpha = "AL1";
pucch_p0_Nominal = -104;
msg3_delta_Preamble = 6;
pucch_deltaF_Format1 = "deltaF2";
pucch_deltaF_Format1b = "deltaF3";
pucch_deltaF_Format2 = "deltaF0";
pucch_deltaF_Format2a = "deltaF0";
pucch_deltaF_Format2b = "deltaF0";
rach_numberOfRA_Preambles = 64;
rach_preamblesGroupAConfig = "DISABLE";
/*
rach_sizeOfRA_PreamblesGroupA = ;
rach_messageSizeGroupA = ;
rach_messagePowerOffsetGroupB = ;
*/
rach_powerRampingStep = 4;
rach_preambleInitialReceivedTargetPower = -108;
rach_preambleTransMax = 10;
rach_raResponseWindowSize = 10;
rach_macContentionResolutionTimer = 48;
rach_maxHARQ_Msg3Tx = 4;
pcch_default_PagingCycle = 128;
pcch_nB = "oneT";
bcch_modificationPeriodCoeff= 2;
ue_TimersAndConstants_t300 = 1000;
ue_TimersAndConstants_t301 = 1000;
ue_TimersAndConstants_t310 = 1000;
ue_TimersAndConstants_t311 = 10000;
ue_TimersAndConstants_n310 = 20;
ue_TimersAndConstants_n311 = 1;
ue_TransmissionMode = 1;
//Parameters for SIB18
rxPool_sc_CP_Len = "normal";
rxPool_sc_Period = "sf40";
rxPool_data_CP_Len = "normal";
rxPool_ResourceConfig_prb_Num = 20;
rxPool_ResourceConfig_prb_Start = 5;
rxPool_ResourceConfig_prb_End = 44;
rxPool_ResourceConfig_offsetIndicator_present = "prSmall";
rxPool_ResourceConfig_offsetIndicator_choice = 0;
rxPool_ResourceConfig_subframeBitmap_present = "prBs40";
rxPool_ResourceConfig_subframeBitmap_choice_bs_buf = "00000000000000000000";
rxPool_ResourceConfig_subframeBitmap_choice_bs_size = 5;
rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0;
/*
rxPool_dataHoppingConfig_hoppingParameter = 0;
rxPool_dataHoppingConfig_numSubbands = "ns1";
rxPool_dataHoppingConfig_rbOffset = 0;
rxPool_commTxResourceUC-ReqAllowed = "TRUE";
*/
// Parameters for SIB19
discRxPool_cp_Len = "normal"
discRxPool_discPeriod = "rf32"
discRxPool_numRetx = 1;
discRxPool_numRepetition = 2;
discRxPool_ResourceConfig_prb_Num = 5;
discRxPool_ResourceConfig_prb_Start = 3;
discRxPool_ResourceConfig_prb_End = 21;
discRxPool_ResourceConfig_offsetIndicator_present = "prSmall";
discRxPool_ResourceConfig_offsetIndicator_choice = 0;
discRxPool_ResourceConfig_subframeBitmap_present = "prBs40";
discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf = "f0ffffffff";
discRxPool_ResourceConfig_subframeBitmap_choice_bs_size = 5;
discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0;
}
);
srb1_parameters :
{
# timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
timer_poll_retransmit = 80;
# timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
timer_reordering = 35;
# timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
timer_status_prohibit = 0;
# poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
poll_pdu = 4;
# poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
poll_byte = 99999;
# max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
max_retx_threshold = 4;
}
# ------- SCTP definitions
SCTP :
{
# Number of streams to use in input/output
SCTP_INSTREAMS = 2;
SCTP_OUTSTREAMS = 2;
};
////////// MME parameters:
mme_ip_address = (
{
ipv4 = "CI_MME_IP_ADDR";
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
NETWORK_INTERFACES : {
ENB_INTERFACE_NAME_FOR_S1_MME = "eth0";
ENB_IPV4_ADDRESS_FOR_S1_MME = "CI_ENB_IP_ADDR";
ENB_INTERFACE_NAME_FOR_S1U = "eth0";
ENB_IPV4_ADDRESS_FOR_S1U = "CI_ENB_IP_ADDR";
ENB_PORT_FOR_S1U = 2152; # Spec 2152
ENB_IPV4_ADDRESS_FOR_X2C = "CI_ENB_IP_ADDR";
ENB_PORT_FOR_X2C = 36422; # Spec 36422
};
}
);
log_config = {
global_log_level = "info";
global_log_verbosity = "medium";
pdcp_log_level = "info";
pdcp_log_verbosity = "high";
rrc_log_level = "info";
rrc_log_verbosity = "medium";
flexran_agent_log_level = "info";
flexran_agent_log_verbosity = "medium";
gtp_log_level = "info";
gtp_log_verbosity = "medium";
};
NETWORK_CONTROLLER : {
FLEXRAN_ENABLED = "no";
FLEXRAN_INTERFACE_NAME = "lo";
FLEXRAN_IPV4_ADDRESS = "127.0.0.1";
FLEXRAN_PORT = 2210;
FLEXRAN_CACHE = "/mnt/oai_agent_cache";
FLEXRAN_AWAIT_RECONF = "no";
};

View File

@@ -0,0 +1,221 @@
Active_eNBs = ( "eNB-CU-Eurecom-LTEBox");
# Asn1_verbosity, choice in: none, info, annoying
Asn1_verbosity = "none";
eNBs = (
{
////////// Identification parameters:
eNB_ID = 0xe00;
cell_type = "CELL_MACRO_ENB";
eNB_name = "eNB-CU-Eurecom-LTEBox";
// Tracking area code, 0x0000 and 0xfffe are reserved values
tracking_area_code = 1;
plmn_list = ( { mcc = 208; mnc = 92; mnc_length = 2; } )
nr_cellid = 12345678L
tr_s_preference = "f1"
local_s_if_name = "lo";
remote_s_address = "127.0.0.3";
local_s_address = "127.0.0.4";
local_s_portc = 501;
remote_s_portc = 500;
local_s_portd = 601;
remote_s_portd = 600;
////////// Physical parameters:
component_carriers = (
{
node_function = "3GPP_eNodeB";
node_timing = "synch_to_ext_device";
node_synch_ref = 0;
frame_type = "FDD";
tdd_config = 3;
tdd_config_s = 0;
prefix_type = "NORMAL";
eutra_band = 7;
downlink_frequency = 2680000000L;
uplink_frequency_offset = -120000000;
Nid_cell = 0;
N_RB_DL = 50;
pbch_repetition = "FALSE";
prach_root = 0;
prach_config_index = 0;
prach_high_speed = "DISABLE";
prach_zero_correlation = 1;
prach_freq_offset = 2;
pucch_delta_shift = 1;
pucch_nRB_CQI = 0;
pucch_nCS_AN = 0;
pucch_n1_AN = 0;
pdsch_referenceSignalPower = -27;
pdsch_p_b = 0;
pusch_n_SB = 1;
pusch_enable64QAM = "DISABLE";
pusch_hoppingMode = "interSubFrame";
pusch_hoppingOffset = 0;
pusch_groupHoppingEnable = "ENABLE";
pusch_groupAssignment = 0;
pusch_sequenceHoppingEnabled = "DISABLE";
pusch_nDMRS1 = 1;
phich_duration = "NORMAL";
phich_resource = "ONESIXTH";
srs_enable = "DISABLE";
/*
srs_BandwidthConfig =;
srs_SubframeConfig =;
srs_ackNackST =;
srs_MaxUpPts =;
*/
pusch_p0_Nominal = -96;
pusch_alpha = "AL1";
pucch_p0_Nominal = -104;
msg3_delta_Preamble = 6;
pucch_deltaF_Format1 = "deltaF2";
pucch_deltaF_Format1b = "deltaF3";
pucch_deltaF_Format2 = "deltaF0";
pucch_deltaF_Format2a = "deltaF0";
pucch_deltaF_Format2b = "deltaF0";
rach_numberOfRA_Preambles = 64;
rach_preamblesGroupAConfig = "DISABLE";
/*
rach_sizeOfRA_PreamblesGroupA = ;
rach_messageSizeGroupA = ;
rach_messagePowerOffsetGroupB = ;
*/
rach_powerRampingStep = 4;
rach_preambleInitialReceivedTargetPower = -108;
rach_preambleTransMax = 10;
rach_raResponseWindowSize = 10;
rach_macContentionResolutionTimer = 48;
rach_maxHARQ_Msg3Tx = 4;
pcch_default_PagingCycle = 128;
pcch_nB = "oneT";
bcch_modificationPeriodCoeff= 2;
ue_TimersAndConstants_t300 = 1000;
ue_TimersAndConstants_t301 = 1000;
ue_TimersAndConstants_t310 = 1000;
ue_TimersAndConstants_t311 = 10000;
ue_TimersAndConstants_n310 = 20;
ue_TimersAndConstants_n311 = 1;
ue_TransmissionMode = 1;
//Parameters for SIB18
rxPool_sc_CP_Len = "normal";
rxPool_sc_Period = "sf40";
rxPool_data_CP_Len = "normal";
rxPool_ResourceConfig_prb_Num = 20;
rxPool_ResourceConfig_prb_Start = 5;
rxPool_ResourceConfig_prb_End = 44;
rxPool_ResourceConfig_offsetIndicator_present = "prSmall";
rxPool_ResourceConfig_offsetIndicator_choice = 0;
rxPool_ResourceConfig_subframeBitmap_present = "prBs40";
rxPool_ResourceConfig_subframeBitmap_choice_bs_buf = "00000000000000000000";
rxPool_ResourceConfig_subframeBitmap_choice_bs_size = 5;
rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0;
/*
rxPool_dataHoppingConfig_hoppingParameter = 0;
rxPool_dataHoppingConfig_numSubbands = "ns1";
rxPool_dataHoppingConfig_rbOffset = 0;
rxPool_commTxResourceUC-ReqAllowed = "TRUE";
*/
// Parameters for SIB19
discRxPool_cp_Len = "normal"
discRxPool_discPeriod = "rf32"
discRxPool_numRetx = 1;
discRxPool_numRepetition = 2;
discRxPool_ResourceConfig_prb_Num = 5;
discRxPool_ResourceConfig_prb_Start = 3;
discRxPool_ResourceConfig_prb_End = 21;
discRxPool_ResourceConfig_offsetIndicator_present = "prSmall";
discRxPool_ResourceConfig_offsetIndicator_choice = 0;
discRxPool_ResourceConfig_subframeBitmap_present = "prBs40";
discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf = "f0ffffffff";
discRxPool_ResourceConfig_subframeBitmap_choice_bs_size = 5;
discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0;
}
);
srb1_parameters :
{
# timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
timer_poll_retransmit = 80;
# timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
timer_reordering = 35;
# timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
timer_status_prohibit = 0;
# poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
poll_pdu = 4;
# poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
poll_byte = 99999;
# max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
max_retx_threshold = 4;
}
# ------- SCTP definitions
SCTP :
{
# Number of streams to use in input/output
SCTP_INSTREAMS = 2;
SCTP_OUTSTREAMS = 2;
};
////////// MME parameters:
mme_ip_address = (
{
ipv4 = "CI_MME_IP_ADDR";
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
NETWORK_INTERFACES : {
ENB_INTERFACE_NAME_FOR_S1_MME = "eth0";
ENB_IPV4_ADDRESS_FOR_S1_MME = "CI_ENB_IP_ADDR";
ENB_INTERFACE_NAME_FOR_S1U = "eth0";
ENB_IPV4_ADDRESS_FOR_S1U = "CI_ENB_IP_ADDR";
ENB_PORT_FOR_S1U = 2152; # Spec 2152
ENB_IPV4_ADDRESS_FOR_X2C = "CI_ENB_IP_ADDR";
ENB_PORT_FOR_X2C = 36422; # Spec 36422
};
}
);
log_config = {
global_log_level = "info";
global_log_verbosity = "medium";
pdcp_log_level = "info";
pdcp_log_verbosity = "high";
rrc_log_level = "info";
rrc_log_verbosity = "medium";
flexran_agent_log_level = "info";
flexran_agent_log_verbosity = "medium";
gtp_log_level = "info";
gtp_log_verbosity = "medium";
};
NETWORK_CONTROLLER : {
FLEXRAN_ENABLED = "no";
FLEXRAN_INTERFACE_NAME = "lo";
FLEXRAN_IPV4_ADDRESS = "127.0.0.1";
FLEXRAN_PORT = 2210;
FLEXRAN_CACHE = "/mnt/oai_agent_cache";
FLEXRAN_AWAIT_RECONF = "no";
};

View File

@@ -0,0 +1,128 @@
Active_eNBs = ( "eNB-Eurecom-DU");
# Asn1_verbosity, choice in: none, info, annoying
Asn1_verbosity = "none";
eNBs =
(
{
////////// Identification parameters:
eNB_CU_ID = 0xe00;
eNB_name = "eNB-Eurecom-DU";
// Tracking area code, 0x0000 and 0xfffe are reserved values
tracking_area_code = 1;
plmn_list = ( { mcc = 208; mnc = 92; mnc_length = 2; } )
nr_cellid = 12345678L
////////// Physical parameters:
component_carriers = (
{
node_function = "3GPP_eNODEB";
node_timing = "synch_to_ext_device";
node_synch_ref = 0;
frame_type = "FDD";
tdd_config = 3;
tdd_config_s = 0;
prefix_type = "NORMAL";
eutra_band = 7;
downlink_frequency = 2680000000L;
uplink_frequency_offset = -120000000;
Nid_cell = 0;
N_RB_DL = 100;
Nid_cell_mbsfn = 0;
nb_antenna_ports = 1;
nb_antennas_tx = 1;
nb_antennas_rx = 1;
tx_gain = 90;
rx_gain = 115;
pucch_deltaF_Format1 = "deltaF2";
pucch_deltaF_Format1b = "deltaF3";
pucch_deltaF_Format2 = "deltaF0";
pucch_deltaF_Format2a = "deltaF0";
pucch_deltaF_Format2b = "deltaF0";
}
);
# ------- SCTP definitions
SCTP :
{
# Number of streams to use in input/output
SCTP_INSTREAMS = 2;
SCTP_OUTSTREAMS = 2;
};
}
);
MACRLCs = (
{
num_cc = 1;
tr_s_preference = "local_L1";
tr_n_preference = "f1";
local_n_if_name = "lo";
remote_n_address = "127.0.0.4";
local_n_address = "127.0.0.3";
local_n_portc = 500;
remote_n_portc = 501;
local_n_portd = 600;
remote_n_portd = 601;
}
);
L1s = (
{
num_cc = 1;
tr_n_preference = "local_mac";
}
);
RUs = (
{
local_rf = "yes";
nb_tx = 1;
nb_rx = 1;
att_tx = 10;
att_rx = 10;
bands = [7];
max_pdschReferenceSignalPower = -29;
max_rxgain = 115;
eNB_instances = [0];
}
);
log_config = {
global_log_level = "info";
global_log_verbosity = "medium";
hw_log_level = "info";
hw_log_verbosity = "medium";
phy_log_level = "info";
phy_log_verbosity = "medium";
mac_log_level = "info";
mac_log_verbosity = "high";
rlc_log_level = "info";
rlc_log_verbosity = "medium";
flexran_agent_log_level = "info";
flexran_agent_log_verbosity = "medium";
};
NETWORK_CONTROLLER : {
FLEXRAN_ENABLED = "no";
FLEXRAN_INTERFACE_NAME = "lo";
FLEXRAN_IPV4_ADDRESS = "127.0.0.1";
FLEXRAN_PORT = 2210;
FLEXRAN_CACHE = "/mnt/oai_agent_cache";
FLEXRAN_AWAIT_RECONF = "no";
};
THREAD_STRUCT = (
{
#three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
parallel_config = "PARALLEL_SINGLE_THREAD";
# #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
worker_config = "WORKER_ENABLE";
}
);

View File

@@ -0,0 +1,128 @@
Active_eNBs = ( "eNB-Eurecom-DU");
# Asn1_verbosity, choice in: none, info, annoying
Asn1_verbosity = "none";
eNBs =
(
{
////////// Identification parameters:
eNB_CU_ID = 0xe00;
eNB_name = "eNB-Eurecom-DU";
// Tracking area code, 0x0000 and 0xfffe are reserved values
tracking_area_code = 1;
plmn_list = ( { mcc = 208; mnc = 92; mnc_length = 2; } )
nr_cellid = 12345678L
////////// Physical parameters:
component_carriers = (
{
node_function = "3GPP_eNODEB";
node_timing = "synch_to_ext_device";
node_synch_ref = 0;
frame_type = "FDD";
tdd_config = 3;
tdd_config_s = 0;
prefix_type = "NORMAL";
eutra_band = 7;
downlink_frequency = 2680000000L;
uplink_frequency_offset = -120000000;
Nid_cell = 0;
N_RB_DL = 25;
Nid_cell_mbsfn = 0;
nb_antenna_ports = 1;
nb_antennas_tx = 1;
nb_antennas_rx = 1;
tx_gain = 90;
rx_gain = 125;
pucch_deltaF_Format1 = "deltaF2";
pucch_deltaF_Format1b = "deltaF3";
pucch_deltaF_Format2 = "deltaF0";
pucch_deltaF_Format2a = "deltaF0";
pucch_deltaF_Format2b = "deltaF0";
}
);
# ------- SCTP definitions
SCTP :
{
# Number of streams to use in input/output
SCTP_INSTREAMS = 2;
SCTP_OUTSTREAMS = 2;
};
}
);
MACRLCs = (
{
num_cc = 1;
tr_s_preference = "local_L1";
tr_n_preference = "f1";
local_n_if_name = "lo";
remote_n_address = "127.0.0.4";
local_n_address = "127.0.0.3";
local_n_portc = 500;
remote_n_portc = 501;
local_n_portd = 600;
remote_n_portd = 601;
}
);
L1s = (
{
num_cc = 1;
tr_n_preference = "local_mac";
}
);
RUs = (
{
local_rf = "yes";
nb_tx = 1;
nb_rx = 1;
att_tx = 10;
att_rx = 10;
bands = [7];
max_pdschReferenceSignalPower = -25;
max_rxgain = 125;
eNB_instances = [0];
}
);
log_config = {
global_log_level = "info";
global_log_verbosity = "medium";
hw_log_level = "info";
hw_log_verbosity = "medium";
phy_log_level = "info";
phy_log_verbosity = "medium";
mac_log_level = "info";
mac_log_verbosity = "high";
rlc_log_level = "info";
rlc_log_verbosity = "medium";
flexran_agent_log_level = "info";
flexran_agent_log_verbosity = "medium";
};
NETWORK_CONTROLLER : {
FLEXRAN_ENABLED = "no";
FLEXRAN_INTERFACE_NAME = "lo";
FLEXRAN_IPV4_ADDRESS = "127.0.0.1";
FLEXRAN_PORT = 2210;
FLEXRAN_CACHE = "/mnt/oai_agent_cache";
FLEXRAN_AWAIT_RECONF = "no";
};
THREAD_STRUCT = (
{
#three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
parallel_config = "PARALLEL_SINGLE_THREAD";
# #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
worker_config = "WORKER_ENABLE";
}
);

View File

@@ -0,0 +1,128 @@
Active_eNBs = ( "eNB-Eurecom-DU");
# Asn1_verbosity, choice in: none, info, annoying
Asn1_verbosity = "none";
eNBs =
(
{
////////// Identification parameters:
eNB_CU_ID = 0xe00;
eNB_name = "eNB-Eurecom-DU";
// Tracking area code, 0x0000 and 0xfffe are reserved values
tracking_area_code = 1;
plmn_list = ( { mcc = 208; mnc = 92; mnc_length = 2; } )
nr_cellid = 12345678L
////////// Physical parameters:
component_carriers = (
{
node_function = "3GPP_eNODEB";
node_timing = "synch_to_ext_device";
node_synch_ref = 0;
frame_type = "FDD";
tdd_config = 3;
tdd_config_s = 0;
prefix_type = "NORMAL";
eutra_band = 7;
downlink_frequency = 2680000000L;
uplink_frequency_offset = -120000000;
Nid_cell = 0;
N_RB_DL = 50;
Nid_cell_mbsfn = 0;
nb_antenna_ports = 1;
nb_antennas_tx = 1;
nb_antennas_rx = 1;
tx_gain = 90;
rx_gain = 120;
pucch_deltaF_Format1 = "deltaF2";
pucch_deltaF_Format1b = "deltaF3";
pucch_deltaF_Format2 = "deltaF0";
pucch_deltaF_Format2a = "deltaF0";
pucch_deltaF_Format2b = "deltaF0";
}
);
# ------- SCTP definitions
SCTP :
{
# Number of streams to use in input/output
SCTP_INSTREAMS = 2;
SCTP_OUTSTREAMS = 2;
};
}
);
MACRLCs = (
{
num_cc = 1;
tr_s_preference = "local_L1";
tr_n_preference = "f1";
local_n_if_name = "lo";
remote_n_address = "127.0.0.4";
local_n_address = "127.0.0.3";
local_n_portc = 500;
remote_n_portc = 501;
local_n_portd = 600;
remote_n_portd = 601;
}
);
L1s = (
{
num_cc = 1;
tr_n_preference = "local_mac";
}
);
RUs = (
{
local_rf = "yes";
nb_tx = 1;
nb_rx = 1;
att_tx = 10;
att_rx = 10;
bands = [7];
max_pdschReferenceSignalPower = -27;
max_rxgain = 120;
eNB_instances = [0];
}
);
log_config = {
global_log_level = "info";
global_log_verbosity = "medium";
hw_log_level = "info";
hw_log_verbosity = "medium";
phy_log_level = "info";
phy_log_verbosity = "medium";
mac_log_level = "info";
mac_log_verbosity = "high";
rlc_log_level = "info";
rlc_log_verbosity = "medium";
flexran_agent_log_level = "info";
flexran_agent_log_verbosity = "medium";
};
NETWORK_CONTROLLER : {
FLEXRAN_ENABLED = "no";
FLEXRAN_INTERFACE_NAME = "lo";
FLEXRAN_IPV4_ADDRESS = "127.0.0.1";
FLEXRAN_PORT = 2210;
FLEXRAN_CACHE = "/mnt/oai_agent_cache";
FLEXRAN_AWAIT_RECONF = "no";
};
THREAD_STRUCT = (
{
#three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
parallel_config = "PARALLEL_SINGLE_THREAD";
# #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
worker_config = "WORKER_ENABLE";
}
);

View File

@@ -6,19 +6,18 @@ eNBs =
(
{
////////// Identification parameters:
eNB_ID = 0xe00;
eNB_ID = 0xe01;
cell_type = "CELL_MACRO_ENB";
eNB_name = "eNB-Eurecom-LTEBox";
// Tracking area code, 0x0000 and 0xfffe are reserved values
tracking_area_code = "1";
tracking_area_code = 1;
mobile_country_code = "208";
mobile_network_code = "93";
plmn_list = ( { mcc = 208; mnc = 93; mnc_length = 2; } );
nr_cellid = 98765L;
tr_s_preference = "local_mac"
////////// Physical parameters:
@@ -32,17 +31,17 @@ eNBs =
tdd_config = 3;
tdd_config_s = 0;
prefix_type = "NORMAL";
eutra_band = 7;
downlink_frequency = 2685000000L;
uplink_frequency_offset = -120000000;
Nid_cell = 0;
N_RB_DL = 50;
eutra_band = 13;
downlink_frequency = 751000000L;
uplink_frequency_offset = 31000000;
Nid_cell = 1;
N_RB_DL = 25;
Nid_cell_mbsfn = 0;
nb_antenna_ports = 1;
nb_antennas_tx = 1;
nb_antennas_rx = 1;
tx_gain = 90;
rx_gain = 125;
rx_gain = 110;
pbch_repetition = "FALSE";
prach_root = 0;
prach_config_index = 0;
@@ -174,22 +173,27 @@ eNBs =
////////// MME parameters:
mme_ip_address = ( { ipv4 = "192.168.12.26";
mme_ip_address = ( { ipv4 = "CI_MME_IP_ADDR";
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
///X2
enable_x2 = "yes";
t_reloc_prep = 1000; /* unit: millisecond */
tx2_reloc_overall = 2000; /* unit: millisecond */
NETWORK_INTERFACES :
{
ENB_INTERFACE_NAME_FOR_S1_MME = "eth0";
ENB_IPV4_ADDRESS_FOR_S1_MME = "192.168.12.111/24";
ENB_IPV4_ADDRESS_FOR_S1_MME = "CI_ENB_IP_ADDR";
ENB_INTERFACE_NAME_FOR_S1U = "eth0";
ENB_IPV4_ADDRESS_FOR_S1U = "192.168.12.111/24";
ENB_IPV4_ADDRESS_FOR_S1U = "CI_ENB_IP_ADDR";
ENB_PORT_FOR_S1U = 2152; # Spec 2152
ENB_IPV4_ADDRESS_FOR_X2C = "192.168.12.111/24";
ENB_IPV4_ADDRESS_FOR_X2C = "CI_ENB_IP_ADDR";
ENB_PORT_FOR_X2C = 36422; # Spec 36422
};
}
@@ -210,10 +214,6 @@ L1s = (
{
num_cc = 1;
tr_n_preference = "local_mac";
},
{
num_cc = 1;
tr_n_preference = "local_mac";
}
);
@@ -229,30 +229,28 @@ RUs = (
max_rxgain = 125;
eNB_instances = [0];
},
{
local_rf = "yes"
nb_tx = 1
nb_rx = 1
att_tx = 0
att_rx = 0;
bands = [7];
max_pdschReferenceSignalPower = -27;
max_rxgain = 125;
eNB_instances = [1];
}
);
NETWORK_CONTROLLER :
{
FLEXRAN_ENABLED = "no";
FLEXRAN_INTERFACE_NAME = "lo";
FLEXRAN_IPV4_ADDRESS = "127.0.0.1";
FLEXRAN_INTERFACE_NAME = "eth0";
FLEXRAN_IPV4_ADDRESS = "CI_MME_IP_ADDR";
FLEXRAN_PORT = 2210;
FLEXRAN_CACHE = "/mnt/oai_agent_cache";
FLEXRAN_AWAIT_RECONF = "no";
};
THREAD_STRUCT = (
{
#three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
parallel_config = "PARALLEL_SINGLE_THREAD";//PARALLEL_RU_L1_TRX_SPLIT";
#two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
worker_config = "WORKER_ENABLE";
}
);
log_config :
{
global_log_level ="info";

View File

@@ -0,0 +1,470 @@
Active_eNBs = ( "eNB_Eurecom_LTEBox");
# Asn1_verbosity, choice in: none, info, annoying
Asn1_verbosity = "none";
eNBs =
(
{
////////// Identification parameters:
eNB_ID = 0xe00;
cell_type = "CELL_MACRO_ENB";
eNB_name = "eNB_Eurecom_LTEBox";
// Tracking area code, 0x0000 and 0xfffe are reserved values
tracking_area_code = 1;
plmn_list = ( { mcc = 208; mnc = 92; mnc_length = 2;} );
tr_s_preference = "local_mac"
////////// Physical parameters:
component_carriers = (
{
node_function = "3GPP_eNodeB";
node_timing = "synch_to_ext_device";
node_synch_ref = 0;
frame_type = "FDD";
tdd_config = 3;
tdd_config_s = 0;
prefix_type = "NORMAL";
eutra_band = 13;
downlink_frequency = 751000000L;
uplink_frequency_offset = 31000000;
Nid_cell = 0;
N_RB_DL = 50;
Nid_cell_mbsfn = 0;
nb_antenna_ports = 1;
nb_antennas_tx = 1;
nb_antennas_rx = 1;
tx_gain = 90;
rx_gain = 110;
pbch_repetition = "FALSE";
prach_root = 0;
prach_config_index = 0;
prach_high_speed = "DISABLE";
prach_zero_correlation = 1;
prach_freq_offset = 1;
pucch_delta_shift = 1;
pucch_nRB_CQI = 0;
pucch_nCS_AN = 0;
pucch_n1_AN = 0;
pdsch_referenceSignalPower = -24;
pdsch_p_b = 0;
pusch_n_SB = 1;
pusch_enable64QAM = "DISABLE";
pusch_hoppingMode = "interSubFrame";
pusch_hoppingOffset = 0;
pusch_groupHoppingEnabled = "ENABLE";
pusch_groupAssignment = 0;
pusch_sequenceHoppingEnabled = "DISABLE";
pusch_nDMRS1 = 1;
phich_duration = "NORMAL";
phich_resource = "ONESIXTH";
srs_enable = "DISABLE";
/* srs_BandwidthConfig =;
srs_SubframeConfig =;
srs_ackNackST =;
srs_MaxUpPts =;*/
pusch_p0_Nominal = -96;
pusch_alpha = "AL1";
pucch_p0_Nominal = -104;
msg3_delta_Preamble = 6;
pucch_deltaF_Format1 = "deltaF2";
pucch_deltaF_Format1b = "deltaF3";
pucch_deltaF_Format2 = "deltaF0";
pucch_deltaF_Format2a = "deltaF0";
pucch_deltaF_Format2b = "deltaF0";
rach_numberOfRA_Preambles = "n64"; #64
rach_preamblesGroupAConfig = "DISABLE";
/*
rach_sizeOfRA_PreamblesGroupA = ;
rach_messageSizeGroupA = ;
rach_messagePowerOffsetGroupB = ;
*/
rach_powerRampingStep = 4;
rach_preambleInitialReceivedTargetPower = -108;
rach_preambleTransMax = 10;
rach_raResponseWindowSize = 10;
rach_macContentionResolutionTimer = 48;
rach_maxHARQ_Msg3Tx = 4;
pcch_default_PagingCycle = "rf128"; #128
pcch_nB = "oneT";
bcch_modificationPeriodCoeff = 2;
ue_TimersAndConstants_t300 = "ms1000";
ue_TimersAndConstants_t301 = "ms1000";
ue_TimersAndConstants_t310 = "ms1000";
ue_TimersAndConstants_t311 = "ms10000";
ue_TimersAndConstants_n310 = "n20";
ue_TimersAndConstants_n311 = "n1";
ue_TransmissionMode = "tm1";
# eMTC Parameters
emtc_parameters :
{
eMTC_configured = 1;
#hyperSFN_r13 = 0;
#eDRX_Allowed_r13 = 0;
#q_QualMinRSRQ_CE_r13 = ;
#SIB1
schedulingInfoSIB1_BR_r13 = 4;
#system_info_value_tag_SI =
#(
# {
# systemInfoValueTagSi_r13 = 0;
# }
#);
cellSelectionInfoCE_r13 = "ENABLE";
q_RxLevMinCE_r13 = -70;
bandwidthReducedAccessRelatedInfo_r13 = "ENABLE"
si_WindowLength_BR_r13 = "ms20"; #0
si_RepetitionPattern_r13 = "everyRF"; #0
scheduling_info_br =
(
{
si_Narrowband_r13 = 8;
si_TBS_r13 = 5;
}
);
fdd_DownlinkOrTddSubframeBitmapBR_r13 = "subframePattern40-r13";
fdd_DownlinkOrTddSubframeBitmapBR_val_r13 = 0xFFFFFFFFFF;
startSymbolBR_r13 = 2;
si_HoppingConfigCommon_r13 = "off"; #1; # Note: 1==OFF !
si_ValidityTime_r13 = "true"; #0
freqHoppingParametersDL_r13 = "DISABLE"
mpdcch_pdsch_HoppingNB_r13 = "nb2"; #0
interval_DLHoppingConfigCommonModeA_r13 = "interval-FDD-r13"
interval_DLHoppingConfigCommonModeA_r13_val = 0;
interval_DLHoppingConfigCommonModeB_r13 = "interval-FDD-r13"
interval_DLHoppingConfigCommonModeB_r13_val = 0;
mpdcch_pdsch_HoppingOffset_r13 = 1;
# SIB23
frame_type = "FDD";
preambleTransMax_CE_r13 = 10; #6
rach_numberOfRA_Preambles = 60; #14
rach_powerRampingStep = 4;
rach_preambleInitialReceivedTargetPower = -110;
rach_preambleTransMax = 10;
rach_raResponseWindowSize = 10;
rach_macContentionResolutionTimer = 64;
rach_maxHARQ_Msg3Tx = 4;
# max size for this array is 4
rach_CE_LevelInfoList_r13 =
(
{
firstPreamble_r13 = 60;
lastPreamble_r13 = 63;
ra_ResponseWindowSize_r13 = 20; #0
mac_ContentionResolutionTimer_r13 = 80; #0
rar_HoppingConfig_r13 = 1; // Note 1 means off
}
);
# BCCH CONFIG
bcch_modificationPeriodCoeff = 2;
#PCCH Config
pcch_default_PagingCycle = "rf128"; #128
pcch_nB = "oneT";
#PRACH Config
prach_root = 89;
prach_config_index = 0;
prach_high_speed = "DISABLE";
prach_zero_correlation = 1;
prach_freq_offset = 1;
#PDSCH Config Common
pdsch_referenceSignalPower = -24
pdsch_p_b = 0;
# PUSCH Config Common
pusch_n_SB = 1;
pusch_hoppingMode = "interSubFrame";
pusch_hoppingOffset = 0;
pusch_enable64QAM = "DISABLE";
pusch_groupHoppingEnabled = "ENABLE";
pusch_groupAssignment = 0;
pusch_sequenceHoppingEnabled = "DISABLE";
pusch_nDMRS1 = 1;
# PUCCH Config Common
pucch_delta_shift = 1;
pucch_nRB_CQI = 0;
pucch_nCS_AN = 0;
pucch_n1_AN = 0;
pusch_p0_Nominal = -96;
pusch_alpha = "AL1";
pucch_p0_Nominal = -104;
pucch_deltaF_Format1 = "deltaF0";
pucch_deltaF_Format1b = "deltaF3";
pucch_deltaF_Format2 = "deltaF0";
pucch_deltaF_Format2a = "deltaF0";
pucch_deltaF_Format2b = "deltaF0";
msg3_delta_Preamble = 6;
prach_ConfigCommon_v1310 = "ENABLE";
mpdcch_startSF_CSS_RA_r13 = "fdd-r13";
mpdcch_startSF_CSS_RA_r13_val = "v1"; #0
prach_HoppingOffset_r13 = 0;
pdsch_maxNumRepetitionCEmodeA_r13 = "r16"; #0
#pdsch_maxNumRepetitionCEmodeB_r13 = "r384"; # NULL - 2
pusch_maxNumRepetitionCEmodeA_r13 = "r8"; #0
pusch_repetitionLevelCEmodeA_r13 = "l1";
#pusch_maxNumRepetitionCEmodeB_r13 = "r768"; #4 #NULL
#pusch_HoppingOffset_v1310 = 5; #NULL
# max size for this array is 3
rsrp_range_list =
(
{
rsrp_range_br = 0;
}
);
# max size for this array is 4
prach_parameters_ce_r13 =
(
{
prach_config_index_br = 3;
prach_freq_offset_br = 2;
prach_StartingSubframe_r13 = 2;
maxNumPreambleAttemptCE_r13 = 10; #6
numRepetitionPerPreambleAttempt_r13 = 1; #0
mpdcch_NumRepetition_RA_r13 = 1; #0
prach_HoppingConfig_r13 = 0; #1
max_available_narrow_band = [3];
}
);
n1PUCCH_AN_InfoList_r13 =
(
{
pucch_info_value = 33;
}
);
ue_TimersAndConstants_t300 = "ms1000";
ue_TimersAndConstants_t301 = "ms400";
ue_TimersAndConstants_t310 = "ms50";
ue_TimersAndConstants_t311 = "ms30000";
ue_TimersAndConstants_n310 = "n1";
ue_TimersAndConstants_n311 = "n10";
ue_TransmissionMode = "tm1";
pcch_config_v1310 :
{
paging_narrowbands_r13 = 1;
mpdcch_numrepetition_paging_r13 = "r1"; #0
#nb_v1310 = "one256thT"; #2
}
pucch_NumRepetitionCE_Msg4_Level0_r13 = "n1"; #0
#pucch_NumRepetitionCE_Msg4_Level1_r13 = "n2"; #1
#pucch_NumRepetitionCE_Msg4_Level2_r13 = "n16"; #2
#pucch_NumRepetitionCE_Msg4_Level3_r13 = "n32"; #3
sib2_freq_hoppingParameters_r13 :
{
#sib2_mpdcch_pdsch_hoppingNB_r13 = "nb2"; #0
#sib2_interval_DLHoppingConfigCommonModeA_r13 = "FDD"; # choice -> (0, FDD) (1, TDD)
#sib2_interval_DLHoppingConfigCommonModeA_r13_val = "int1";
#sib2_interval_DLHoppingConfigCommonModeB_r13 = "FDD"; # choice -> (0, FDD) (1, TDD)
#sib2_interval_DLHoppingConfigCommonModeB_r13_val = "int2";
sib2_interval_ULHoppingConfigCommonModeA_r13 = "FDD"; # choice -> (0, FDD) (1, TDD)
sib2_interval_ULHoppingConfigCommonModeA_r13_val = "int4"; #2
# sib2_interval_ULHoppingConfigCommonModeB_r13 = "FDD"; # choice -> (0, FDD) (1, TDD)
# sib2_interval_ULHoppingConfigCommonModeB_r13_val = "int2"; #0
# sib2_mpdcch_pdsch_hoppingOffset_r13 = 1;
}
rach_preamblesGroupAConfig = "DISABLE";
phich_duration = "NORMAL";
phich_resource = "ONESIXTH";
srs_enable = "DISABLE";
}
}
);
srb1_parameters :
{
# timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
timer_poll_retransmit = 80;
# timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
timer_reordering = 35;
# timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
timer_status_prohibit = 0;
# poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
poll_pdu = 4;
# poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
poll_byte = 99999;
# max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
max_retx_threshold = 4;
}
# ------- SCTP definitions
SCTP :
{
# Number of streams to use in input/output
SCTP_INSTREAMS = 2;
SCTP_OUTSTREAMS = 2;
};
////////// MME parameters:
mme_ip_address = ( { ipv4 = "CI_MME_IP_ADDR";
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
enable_measurement_reports = "no";
///X2
enable_x2 = "no";
t_reloc_prep = 1000; /* unit: millisecond */
tx2_reloc_overall = 2000; /* unit: millisecond */
NETWORK_INTERFACES :
{
ENB_INTERFACE_NAME_FOR_S1_MME = "eth0";
ENB_IPV4_ADDRESS_FOR_S1_MME = "CI_ENB_IP_ADDR";
ENB_INTERFACE_NAME_FOR_S1U = "eth0";
ENB_IPV4_ADDRESS_FOR_S1U = "CI_ENB_IP_ADDR";
ENB_PORT_FOR_S1U = 2152; # Spec 2152
ENB_IPV4_ADDRESS_FOR_X2C = "CI_ENB_IP_ADDR";
ENB_PORT_FOR_X2C = 36422; # Spec 36422
};
log_config :
{
global_log_level ="info";
global_log_verbosity ="medium";
hw_log_level ="info";
hw_log_verbosity ="medium";
phy_log_level ="info";
phy_log_verbosity ="medium";
mac_log_level ="info";
mac_log_verbosity ="high";
rlc_log_level ="info";
rlc_log_verbosity ="medium";
pdcp_log_level ="info";
pdcp_log_verbosity ="medium";
rrc_log_level ="info";
rrc_log_verbosity ="medium";
};
}
);
MACRLCs = (
{
num_cc = 1;
tr_s_preference = "local_L1";
tr_n_preference = "local_RRC";
phy_test_mode = 0;
puSch10xSnr = 200;
puCch10xSnr = 200;
}
);
L1s = (
{
num_cc = 1;
tr_n_preference = "local_mac";
prach_dtx_threshold = 200;
}
);
RUs = (
{
local_rf = "yes"
nb_tx = 1
nb_rx = 1
att_tx = 0
att_rx = 0;
bands = [13];
max_pdschReferenceSignalPower = -24;
max_rxgain = 110;
eNB_instances = [0];
}
);
THREAD_STRUCT = (
{
#three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
parallel_config = "PARALLEL_SINGLE_THREAD";
#two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
worker_config = "WORKER_ENABLE";
}
);
NETWORK_CONTROLLER :
{
FLEXRAN_ENABLED = "no";
FLEXRAN_INTERFACE_NAME = "lo";
FLEXRAN_IPV4_ADDRESS = "127.0.0.1";
FLEXRAN_PORT = 2210;
FLEXRAN_CACHE = "/mnt/oai_agent_cache";
FLEXRAN_AWAIT_RECONF = "no";
};
log_config :
{
global_log_level ="info";
global_log_verbosity ="medium";
hw_log_level ="info";
hw_log_verbosity ="medium";
phy_log_level ="info";
phy_log_verbosity ="medium";
mac_log_level ="info";
mac_log_verbosity ="high";
rlc_log_level ="info";
rlc_log_verbosity ="medium";
pdcp_log_level ="info";
pdcp_log_verbosity ="medium";
rrc_log_level ="info";
rrc_log_verbosity ="medium";
};

View File

@@ -0,0 +1,273 @@
Active_eNBs = ( "eNB-Eurecom-LTEBox");
# Asn1_verbosity, choice in: none, info, annoying
Asn1_verbosity = "none";
eNBs =
(
{
////////// Identification parameters:
eNB_ID = 0xe00;
cell_type = "CELL_MACRO_ENB";
eNB_name = "eNB-Eurecom-LTEBox";
// Tracking area code, 0x0000 and 0xfffe are reserved values
tracking_area_code = 1;
plmn_list = ( { mcc = 208; mnc = 92; mnc_length = 2; } );
tr_s_preference = "local_mac"
// In seconds
rrc_inactivity_threshold = 30;
////////// Physical parameters:
component_carriers = (
{
node_function = "3GPP_eNODEB";
node_timing = "synch_to_ext_device";
node_synch_ref = 0;
frame_type = "FDD";
tdd_config = 3;
tdd_config_s = 0;
prefix_type = "NORMAL";
eutra_band = 17;
downlink_frequency = 736000000L;
uplink_frequency_offset = -30000000;
Nid_cell = 0;
N_RB_DL = 25;
Nid_cell_mbsfn = 0;
nb_antenna_ports = 1;
nb_antennas_tx = 1;
nb_antennas_rx = 1;
tx_gain = 90;
rx_gain = 125;
pbch_repetition = "FALSE";
prach_root = 0;
prach_config_index = 0;
prach_high_speed = "DISABLE";
prach_zero_correlation = 1;
prach_freq_offset = 2;
pucch_delta_shift = 1;
pucch_nRB_CQI = 0;
pucch_nCS_AN = 0;
pucch_n1_AN = 0;
pdsch_referenceSignalPower = -25;
pdsch_p_b = 0;
pusch_n_SB = 1;
pusch_enable64QAM = "DISABLE";
pusch_hoppingMode = "interSubFrame";
pusch_hoppingOffset = 0;
pusch_groupHoppingEnabled = "ENABLE";
pusch_groupAssignment = 0;
pusch_sequenceHoppingEnabled = "DISABLE";
pusch_nDMRS1 = 1;
phich_duration = "NORMAL";
phich_resource = "ONESIXTH";
srs_enable = "DISABLE";
/* srs_BandwidthConfig =;
srs_SubframeConfig =;
srs_ackNackST =;
srs_MaxUpPts =;*/
pusch_p0_Nominal = -96;
pusch_alpha = "AL1";
pucch_p0_Nominal = -104;
msg3_delta_Preamble = 6;
pucch_deltaF_Format1 = "deltaF2";
pucch_deltaF_Format1b = "deltaF3";
pucch_deltaF_Format2 = "deltaF0";
pucch_deltaF_Format2a = "deltaF0";
pucch_deltaF_Format2b = "deltaF0";
rach_numberOfRA_Preambles = 64;
rach_preamblesGroupAConfig = "DISABLE";
/*
rach_sizeOfRA_PreamblesGroupA = ;
rach_messageSizeGroupA = ;
rach_messagePowerOffsetGroupB = ;
*/
rach_powerRampingStep = 4;
rach_preambleInitialReceivedTargetPower = -108;
rach_preambleTransMax = 10;
rach_raResponseWindowSize = 10;
rach_macContentionResolutionTimer = 48;
rach_maxHARQ_Msg3Tx = 4;
pcch_default_PagingCycle = 128;
pcch_nB = "oneT";
bcch_modificationPeriodCoeff = 2;
ue_TimersAndConstants_t300 = 1000;
ue_TimersAndConstants_t301 = 1000;
ue_TimersAndConstants_t310 = 1000;
ue_TimersAndConstants_t311 = 10000;
ue_TimersAndConstants_n310 = 20;
ue_TimersAndConstants_n311 = 1;
ue_TransmissionMode = 1;
//Parameters for SIB18
rxPool_sc_CP_Len = "normal";
rxPool_sc_Period = "sf40";
rxPool_data_CP_Len = "normal";
rxPool_ResourceConfig_prb_Num = 20;
rxPool_ResourceConfig_prb_Start = 5;
rxPool_ResourceConfig_prb_End = 44;
rxPool_ResourceConfig_offsetIndicator_present = "prSmall";
rxPool_ResourceConfig_offsetIndicator_choice = 0;
rxPool_ResourceConfig_subframeBitmap_present = "prBs40";
rxPool_ResourceConfig_subframeBitmap_choice_bs_buf = "00000000000000000000";
rxPool_ResourceConfig_subframeBitmap_choice_bs_size = 5;
rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0;
/* rxPool_dataHoppingConfig_hoppingParameter = 0;
rxPool_dataHoppingConfig_numSubbands = "ns1";
rxPool_dataHoppingConfig_rbOffset = 0;
rxPool_commTxResourceUC-ReqAllowed = "TRUE";
*/
// Parameters for SIB19
discRxPool_cp_Len = "normal"
discRxPool_discPeriod = "rf32"
discRxPool_numRetx = 1;
discRxPool_numRepetition = 2;
discRxPool_ResourceConfig_prb_Num = 5;
discRxPool_ResourceConfig_prb_Start = 3;
discRxPool_ResourceConfig_prb_End = 21;
discRxPool_ResourceConfig_offsetIndicator_present = "prSmall";
discRxPool_ResourceConfig_offsetIndicator_choice = 0;
discRxPool_ResourceConfig_subframeBitmap_present = "prBs40";
discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf = "f0ffffffff";
discRxPool_ResourceConfig_subframeBitmap_choice_bs_size = 5;
discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0;
}
);
srb1_parameters :
{
# timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
timer_poll_retransmit = 80;
# timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
timer_reordering = 35;
# timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
timer_status_prohibit = 0;
# poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
poll_pdu = 4;
# poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
poll_byte = 99999;
# max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
max_retx_threshold = 4;
}
# ------- SCTP definitions
SCTP :
{
# Number of streams to use in input/output
SCTP_INSTREAMS = 2;
SCTP_OUTSTREAMS = 2;
};
////////// MME parameters:
mme_ip_address = ( { ipv4 = "CI_MME_IP_ADDR";
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
enable_measurement_reports = "no";
///X2
enable_x2 = "no";
t_reloc_prep = 1000; /* unit: millisecond */
tx2_reloc_overall = 2000; /* unit: millisecond */
NETWORK_INTERFACES :
{
ENB_INTERFACE_NAME_FOR_S1_MME = "eth0";
ENB_IPV4_ADDRESS_FOR_S1_MME = "CI_ENB_IP_ADDR";
ENB_INTERFACE_NAME_FOR_S1U = "eth0";
ENB_IPV4_ADDRESS_FOR_S1U = "CI_ENB_IP_ADDR";
ENB_PORT_FOR_S1U = 2152; # Spec 2152
ENB_IPV4_ADDRESS_FOR_X2C = "CI_ENB_IP_ADDR";
ENB_PORT_FOR_X2C = 36422; # Spec 36422
};
}
);
MACRLCs = (
{
num_cc = 1;
tr_s_preference = "local_L1";
tr_n_preference = "local_RRC";
phy_test_mode = 0;
puSch10xSnr = 160;
puCch10xSnr = 160;
}
);
L1s = (
{
num_cc = 1;
tr_n_preference = "local_mac";
}
);
RUs = (
{
local_rf = "yes"
nb_tx = 1
nb_rx = 1
att_tx = 0
att_rx = 0;
bands = [7];
max_pdschReferenceSignalPower = -27;
max_rxgain = 125;
eNB_instances = [0];
}
);
THREAD_STRUCT = (
{
#three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
parallel_config = "PARALLEL_SINGLE_THREAD";
#two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
worker_config = "WORKER_ENABLE";
}
);
NETWORK_CONTROLLER :
{
FLEXRAN_ENABLED = "no";
FLEXRAN_INTERFACE_NAME = "eth0";
FLEXRAN_IPV4_ADDRESS = "CI_MME_IP_ADDR";
FLEXRAN_PORT = 2210;
FLEXRAN_CACHE = "/mnt/oai_agent_cache";
FLEXRAN_AWAIT_RECONF = "no";
};
log_config :
{
global_log_level ="info";
global_log_verbosity ="medium";
hw_log_level ="info";
hw_log_verbosity ="medium";
phy_log_level ="info";
phy_log_verbosity ="medium";
mac_log_level ="info";
mac_log_verbosity ="high";
rlc_log_level ="info";
rlc_log_verbosity ="medium";
pdcp_log_level ="info";
pdcp_log_verbosity ="medium";
rrc_log_level ="info";
rrc_log_verbosity ="medium";
};

View File

@@ -0,0 +1,417 @@
Active_eNBs = ( "eNB-Eurecom-LTEBox");
# Asn1_verbosity, choice in: none, info, annoying
Asn1_verbosity = "none";
eNBs =
(
{
////////// Identification parameters:
eNB_ID = 0xe00;
cell_type = "CELL_MACRO_ENB";
eNB_name = "eNB-Eurecom-LTEBox";
// Tracking area code, 0x0000 and 0xfffe are reserved values
tracking_area_code = 1;
plmn_list = ( { mcc = 208; mnc = 92; mnc_length = 2; } );
tr_s_preference = "local_mac"
// In seconds
rrc_inactivity_threshold = 30;
////////// Physical parameters:
component_carriers = (
{
node_function = "3GPP_eNODEB";
node_timing = "synch_to_ext_device";
node_synch_ref = 0;
frame_type = "FDD";
tdd_config = 3;
tdd_config_s = 0;
prefix_type = "NORMAL";
eutra_band = 17;
downlink_frequency = 736000000L;
uplink_frequency_offset = -30000000;
Nid_cell = 0;
N_RB_DL = 25;
Nid_cell_mbsfn = 0;
nb_antenna_ports = 1;
nb_antennas_tx = 1;
nb_antennas_rx = 1;
tx_gain = 90;
rx_gain = 125;
pbch_repetition = "FALSE";
prach_root = 0;
prach_config_index = 0;
prach_high_speed = "DISABLE";
prach_zero_correlation = 1;
prach_freq_offset = 2;
pucch_delta_shift = 1;
pucch_nRB_CQI = 0;
pucch_nCS_AN = 0;
pucch_n1_AN = 0;
pdsch_referenceSignalPower = -25;
pdsch_p_b = 0;
pusch_n_SB = 1;
pusch_enable64QAM = "DISABLE";
pusch_hoppingMode = "interSubFrame";
pusch_hoppingOffset = 0;
pusch_groupHoppingEnabled = "ENABLE";
pusch_groupAssignment = 0;
pusch_sequenceHoppingEnabled = "DISABLE";
pusch_nDMRS1 = 1;
phich_duration = "NORMAL";
phich_resource = "ONESIXTH";
srs_enable = "DISABLE";
/* srs_BandwidthConfig =;
srs_SubframeConfig =;
srs_ackNackST =;
srs_MaxUpPts =;*/
pusch_p0_Nominal = -96;
pusch_alpha = "AL1";
pucch_p0_Nominal = -104;
msg3_delta_Preamble = 6;
pucch_deltaF_Format1 = "deltaF2";
pucch_deltaF_Format1b = "deltaF3";
pucch_deltaF_Format2 = "deltaF0";
pucch_deltaF_Format2a = "deltaF0";
pucch_deltaF_Format2b = "deltaF0";
rach_numberOfRA_Preambles = 64;
rach_preamblesGroupAConfig = "DISABLE";
/*
rach_sizeOfRA_PreamblesGroupA = ;
rach_messageSizeGroupA = ;
rach_messagePowerOffsetGroupB = ;
*/
rach_powerRampingStep = 4;
rach_preambleInitialReceivedTargetPower = -108;
rach_preambleTransMax = 10;
rach_raResponseWindowSize = 10;
rach_macContentionResolutionTimer = 48;
rach_maxHARQ_Msg3Tx = 4;
pcch_default_PagingCycle = 128;
pcch_nB = "oneT";
bcch_modificationPeriodCoeff = 2;
ue_TimersAndConstants_t300 = 1000;
ue_TimersAndConstants_t301 = 1000;
ue_TimersAndConstants_t310 = 1000;
ue_TimersAndConstants_t311 = 10000;
ue_TimersAndConstants_n310 = 20;
ue_TimersAndConstants_n311 = 1;
ue_TransmissionMode = 1;
//Parameters for SIB18
rxPool_sc_CP_Len = "normal";
rxPool_sc_Period = "sf40";
rxPool_data_CP_Len = "normal";
rxPool_ResourceConfig_prb_Num = 20;
rxPool_ResourceConfig_prb_Start = 5;
rxPool_ResourceConfig_prb_End = 44;
rxPool_ResourceConfig_offsetIndicator_present = "prSmall";
rxPool_ResourceConfig_offsetIndicator_choice = 0;
rxPool_ResourceConfig_subframeBitmap_present = "prBs40";
rxPool_ResourceConfig_subframeBitmap_choice_bs_buf = "00000000000000000000";
rxPool_ResourceConfig_subframeBitmap_choice_bs_size = 5;
rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0;
/* rxPool_dataHoppingConfig_hoppingParameter = 0;
rxPool_dataHoppingConfig_numSubbands = "ns1";
rxPool_dataHoppingConfig_rbOffset = 0;
rxPool_commTxResourceUC-ReqAllowed = "TRUE";
*/
// Parameters for SIB19
discRxPool_cp_Len = "normal"
discRxPool_discPeriod = "rf32"
discRxPool_numRetx = 1;
discRxPool_numRepetition = 2;
discRxPool_ResourceConfig_prb_Num = 5;
discRxPool_ResourceConfig_prb_Start = 3;
discRxPool_ResourceConfig_prb_End = 21;
discRxPool_ResourceConfig_offsetIndicator_present = "prSmall";
discRxPool_ResourceConfig_offsetIndicator_choice = 0;
discRxPool_ResourceConfig_subframeBitmap_present = "prBs40";
discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf = "f0ffffffff";
discRxPool_ResourceConfig_subframeBitmap_choice_bs_size = 5;
discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0;
}
);
srb1_parameters :
{
# timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
timer_poll_retransmit = 80;
# timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
timer_reordering = 35;
# timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
timer_status_prohibit = 0;
# poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
poll_pdu = 4;
# poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
poll_byte = 99999;
# max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
max_retx_threshold = 4;
}
# ------- SCTP definitions
SCTP :
{
# Number of streams to use in input/output
SCTP_INSTREAMS = 2;
SCTP_OUTSTREAMS = 2;
};
////////// MME parameters:
mme_ip_address = ( { ipv4 = "CI_MME_IP_ADDR";
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
enable_measurement_reports = "no";
///X2
enable_x2 = "no";
t_reloc_prep = 1000; /* unit: millisecond */
tx2_reloc_overall = 2000; /* unit: millisecond */
///M2
target_mce_m2_ip_address = ( { ipv4 = "127.0.0.7";
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
enable_enb_m2 = "yes";
mbms_configuration_data_list = (
{
mbsfn_sync_area = 0x0001;
mbms_service_area_list=(
{
mbms_service_area=0x0001;
}
);
}
);
NETWORK_INTERFACES :
{
ENB_INTERFACE_NAME_FOR_S1_MME = "eth0";
ENB_IPV4_ADDRESS_FOR_S1_MME = "CI_ENB_IP_ADDR";
ENB_INTERFACE_NAME_FOR_S1U = "eth0";
ENB_IPV4_ADDRESS_FOR_S1U = "CI_ENB_IP_ADDR";
ENB_PORT_FOR_S1U = 2152; # Spec 2152
ENB_IPV4_ADDRESS_FOR_X2C = "CI_ENB_IP_ADDR";
ENB_PORT_FOR_X2C = 36422; # Spec 36422
ENB_IPV4_ADDRESS_FOR_M2C = "127.0.0.2/24";
ENB_PORT_FOR_M2C = 36443; # Spec 36443
};
}
);
MCEs = (
{
MCE_ID = 0xe00;
MCE_name = "MCE-Vicomtech-LTEBox";
//M2
enable_mce_m2 = "yes";
//M3
enable_mce_m3 = "yes";
target_mme_m3_ip_address = ( { ipv4 = "127.0.0.18";
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
NETWORK_INTERFACES :
{
MCE_INTERFACE_NAME_FOR_M2_ENB = "lo";
MCE_IPV4_ADDRESS_FOR_M2C = "127.0.0.7/24";
MCE_PORT_FOR_M2C = 36443; # Spec 36443
MCE_INTERFACE_NAME_FOR_M3_MME = "lo";
MCE_IPV4_ADDRESS_FOR_M3C = "127.0.0.3/24";
MCE_PORT_FOR_M3C = 36444; # Spec 36444
};
plnm:
{
mcc = 208;
mnc = 93;
mnc_length = 2;
};
mbms_sched_info :
{
mcch_update_time = 10;
mbms_area_config_list = (
{
common_sf_allocation_period = 2; #rf4(0) rf8(1) rf16(2) rf32(3) rf64(4) rf128(5) rf256(6)
mbms_area_id = 0;
pmch_config_list = (
{
allocated_sf_end=64;
data_mcs=10;
mch_scheduling_period = 0; #rf8(0)
mbms_session_list = (
{
#plnm + service_id ->tmgi
plnm:
{
mcc = 208;
mnc = 93;
mnc_length = 2;
}
service_id=0;
lcid=8; #this must be properly defined lcid:8+service:0 -> rab_id:8
}
);
}
);
mbms_sf_config_list = (
{
radioframe_allocation_period=1; #n1(0) n2(1) n4(2) n8(3) n16(4) n32(5)
radioframe_alloocation_offset=0;
num_frame="oneFrame";
subframe_allocation=57; #xx100000
//num_frame="fourFrame";
//subframe_allocation=14548987; #
}
);
}
);
};
mcch_config_per_mbsfn_area = (
{
mbsfn_area = 0;
pdcch_length = 1; #s1(0), s2(1)
repetition_period = 0; #rf32(0), rf64(1), rf128(2), rf256(3)
offset = 0;
modification_period = 0; #rf512(0; rf1024(1)
subframe_allocation_info = 32; #BITSTRING (6bits -> one frame) xx100101
mcs = 0; #n2(0), n7(1), n13(2), n19(3)
}
);
#); #end mbms_scheduling_info
}
);
MMEs = (
{
MME_ID = 0xe00;
MME_name = "MME-MBMS-Vicomtech-LTEBox";
//M3
enable_mme_m3 = "yes";
NETWORK_INTERFACES :
{
MME_INTERFACE_NAME_FOR_M3_MCE = "lo";
MME_IPV4_ADDRESS_FOR_M3C = "127.0.0.18/24";
MME_PORT_FOR_M3C = 36444; # Spec 36444
};
}
);
MACRLCs = (
{
num_cc = 1;
tr_s_preference = "local_L1";
tr_n_preference = "local_RRC";
phy_test_mode = 0;
puSch10xSnr = 160;
puCch10xSnr = 160;
}
);
L1s = (
{
num_cc = 1;
tr_n_preference = "local_mac";
}
);
RUs = (
{
local_rf = "yes"
nb_tx = 1
nb_rx = 1
att_tx = 0
att_rx = 0;
bands = [7];
max_pdschReferenceSignalPower = -27;
max_rxgain = 125;
eNB_instances = [0];
}
);
THREAD_STRUCT = (
{
#three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
parallel_config = "PARALLEL_SINGLE_THREAD";
#two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
worker_config = "WORKER_ENABLE";
}
);
NETWORK_CONTROLLER :
{
FLEXRAN_ENABLED = "no";
FLEXRAN_INTERFACE_NAME = "eth0";
FLEXRAN_IPV4_ADDRESS = "CI_MME_IP_ADDR";
FLEXRAN_PORT = 2210;
FLEXRAN_CACHE = "/mnt/oai_agent_cache";
FLEXRAN_AWAIT_RECONF = "no";
};
log_config :
{
global_log_level ="info";
global_log_verbosity ="medium";
hw_log_level ="info";
hw_log_verbosity ="medium";
phy_log_level ="info";
phy_log_verbosity ="medium";
mac_log_level ="info";
mac_log_verbosity ="high";
rlc_log_level ="info";
rlc_log_verbosity ="medium";
pdcp_log_level ="info";
pdcp_log_verbosity ="medium";
rrc_log_level ="info";
rrc_log_verbosity ="medium";
};

View File

@@ -37,7 +37,7 @@ eNBs =
nb_antennas_tx = 1;
nb_antennas_rx = 1;
tx_gain = 90;
rx_gain = 125;
rx_gain = 115;
prach_root = 0;
prach_config_index = 0;
prach_high_speed = "DISABLE";
@@ -134,23 +134,28 @@ eNBs =
};
////////// MME parameters:
mme_ip_address = ( { ipv4 = "10.0.0.2";
mme_ip_address = ( { ipv4 = "CI_MME_IP_ADDR";
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
enable_measurement_reports = "no";
///X2
enable_x2 = "no";
t_reloc_prep = 1000; /* unit: millisecond */
tx2_reloc_overall = 2000; /* unit: millisecond */
NETWORK_INTERFACES :
{
ENB_INTERFACE_NAME_FOR_S1_MME = "eth0";
ENB_IPV4_ADDRESS_FOR_S1_MME = "10.0.0.1/24";
ENB_IPV4_ADDRESS_FOR_S1_MME = "CI_ENB_IP_ADDR";
ENB_INTERFACE_NAME_FOR_S1U = "eth0";
ENB_IPV4_ADDRESS_FOR_S1U = "10.0.0.1/24";
ENB_IPV4_ADDRESS_FOR_S1U = "CI_ENB_IP_ADDR";
ENB_PORT_FOR_S1U = 2152; # Spec 2152
ENB_IPV4_ADDRESS_FOR_X2C = "192.168.12.111/24";
ENB_IPV4_ADDRESS_FOR_X2C = "CI_ENB_IP_ADDR";
ENB_PORT_FOR_X2C = 36422; # Spec 36422
};
@@ -180,8 +185,8 @@ MACRLCs = (
tr_s_preference = "local_L1";
tr_n_preference = "local_RRC";
scheduler_mode = "fairRR";
puSch10xSnr = 200;
puCch10xSnr = 200;
puSch10xSnr = 150;
puCch10xSnr = 150;
}
);
@@ -210,7 +215,7 @@ RUs = (
THREAD_STRUCT = (
{
#three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
parallel_config = "PARALLEL_RU_L1_TRX_SPLIT";
parallel_config = "PARALLEL_SINGLE_THREAD";
#two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
worker_config = "WORKER_ENABLE";
}

View File

@@ -134,23 +134,28 @@ eNBs =
};
////////// MME parameters:
mme_ip_address = ( { ipv4 = "10.0.0.2";
mme_ip_address = ( { ipv4 = "CI_MME_IP_ADDR";
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
enable_measurement_reports = "no";
///X2
enable_x2 = "no";
t_reloc_prep = 1000; /* unit: millisecond */
tx2_reloc_overall = 2000; /* unit: millisecond */
NETWORK_INTERFACES :
{
ENB_INTERFACE_NAME_FOR_S1_MME = "eth0";
ENB_IPV4_ADDRESS_FOR_S1_MME = "10.0.0.1/24";
ENB_IPV4_ADDRESS_FOR_S1_MME = "CI_ENB_IP_ADDR";
ENB_INTERFACE_NAME_FOR_S1U = "eth0";
ENB_IPV4_ADDRESS_FOR_S1U = "10.0.0.1/24";
ENB_IPV4_ADDRESS_FOR_S1U = "CI_ENB_IP_ADDR";
ENB_PORT_FOR_S1U = 2152; # Spec 2152
ENB_IPV4_ADDRESS_FOR_X2C = "192.168.12.111/24";
ENB_IPV4_ADDRESS_FOR_X2C = "CI_ENB_IP_ADDR";
ENB_PORT_FOR_X2C = 36422; # Spec 36422
};
@@ -180,8 +185,8 @@ MACRLCs = (
tr_s_preference = "local_L1";
tr_n_preference = "local_RRC";
scheduler_mode = "fairRR";
puSch10xSnr = 200;
puCch10xSnr = 200;
puSch10xSnr = 150;
puCch10xSnr = 150;
}
);
@@ -201,7 +206,7 @@ RUs = (
att_rx = 0;
bands = [38];
max_pdschReferenceSignalPower = -27;
max_rxgain = 115;
max_rxgain = 125;
eNB_instances = [0];
}
@@ -210,7 +215,7 @@ RUs = (
THREAD_STRUCT = (
{
#three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
parallel_config = "PARALLEL_RU_L1_TRX_SPLIT";
parallel_config = "PARALLEL_SINGLE_THREAD";
#two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
worker_config = "WORKER_ENABLE";
}

View File

@@ -37,7 +37,7 @@ eNBs =
nb_antennas_tx = 1;
nb_antennas_rx = 1;
tx_gain = 90;
rx_gain = 125;
rx_gain = 120;
prach_root = 0;
prach_config_index = 0;
prach_high_speed = "DISABLE";
@@ -134,23 +134,28 @@ eNBs =
};
////////// MME parameters:
mme_ip_address = ( { ipv4 = "10.0.0.2";
mme_ip_address = ( { ipv4 = "CI_MME_IP_ADDR";
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
enable_measurement_reports = "no";
///X2
enable_x2 = "no";
t_reloc_prep = 1000; /* unit: millisecond */
tx2_reloc_overall = 2000; /* unit: millisecond */
NETWORK_INTERFACES :
{
ENB_INTERFACE_NAME_FOR_S1_MME = "eth0";
ENB_IPV4_ADDRESS_FOR_S1_MME = "10.0.0.1/24";
ENB_IPV4_ADDRESS_FOR_S1_MME = "CI_ENB_IP_ADDR";
ENB_INTERFACE_NAME_FOR_S1U = "eth0";
ENB_IPV4_ADDRESS_FOR_S1U = "10.0.0.1/24";
ENB_IPV4_ADDRESS_FOR_S1U = "CI_ENB_IP_ADDR";
ENB_PORT_FOR_S1U = 2152; # Spec 2152
ENB_IPV4_ADDRESS_FOR_X2C = "192.168.12.111/24";
ENB_IPV4_ADDRESS_FOR_X2C = "CI_ENB_IP_ADDR";
ENB_PORT_FOR_X2C = 36422; # Spec 36422
};
@@ -180,8 +185,8 @@ MACRLCs = (
tr_s_preference = "local_L1";
tr_n_preference = "local_RRC";
scheduler_mode = "fairRR";
puSch10xSnr = 200;
puCch10xSnr = 200;
puSch10xSnr = 150;
puCch10xSnr = 150;
}
);
@@ -201,7 +206,7 @@ RUs = (
att_rx = 0;
bands = [38];
max_pdschReferenceSignalPower = -27;
max_rxgain = 115;
max_rxgain = 120;
eNB_instances = [0];
}
@@ -210,7 +215,7 @@ RUs = (
THREAD_STRUCT = (
{
#three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
parallel_config = "PARALLEL_RU_L1_TRX_SPLIT";
parallel_config = "PARALLEL_SINGLE_THREAD";
#two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
worker_config = "WORKER_ENABLE";
}

View File

@@ -0,0 +1,230 @@
Active_eNBs = ( "eNB_Eurecom_LTEBox");
# Asn1_verbosity, choice in: none, info, annoying
Asn1_verbosity = "none";
eNBs =
(
{
////////// Identification parameters:
eNB_ID = 0xe00;
cell_type = "CELL_MACRO_ENB";
eNB_name = "eNB_Eurecom_LTEBox";
// Tracking area code, 0x0000 and 0xfffe are reserved values
tracking_area_code = 1;
plmn_list = ( { mcc = 208; mnc = 92; mnc_length = 2; } );
////////// Physical parameters:
component_carriers = (
{
node_function = "eNodeB_3GPP";
node_timing = "synch_to_ext_device";
node_synch_ref = 0;
frame_type = "TDD";
tdd_config = 1;
tdd_config_s = 0;
prefix_type = "NORMAL";
eutra_band = 40;
downlink_frequency = 2350000000L;
uplink_frequency_offset = 0;
Nid_cell = 0;
N_RB_DL = 25;
Nid_cell_mbsfn = 0;
nb_antenna_ports = 2;
nb_antennas_tx = 2;
nb_antennas_rx = 2;
tx_gain = 90;
rx_gain = 125;
prach_root = 0;
prach_config_index = 0;
prach_high_speed = "DISABLE";
prach_zero_correlation = 1;
prach_freq_offset = 2;
pucch_delta_shift = 1;
pucch_nRB_CQI = 1;
pucch_nCS_AN = 0;
pucch_n1_AN = 0;
pdsch_referenceSignalPower =-27;
pdsch_p_b = 0;
pusch_n_SB = 1;
pusch_enable64QAM = "DISABLE";
pusch_hoppingMode = "interSubFrame";
pusch_hoppingOffset = 0;
pusch_groupHoppingEnabled = "ENABLE";
pusch_groupAssignment = 0;
pusch_sequenceHoppingEnabled = "DISABLE";
pusch_nDMRS1 = 1;
phich_duration = "NORMAL";
phich_resource = "ONESIXTH";
srs_enable = "DISABLE";
/* srs_BandwidthConfig =;
srs_SubframeConfig =;
srs_ackNackST =;
srs_MaxUpPts =;*/
pusch_p0_Nominal = -96;
pusch_alpha = "AL1";
pucch_p0_Nominal = -106;
msg3_delta_Preamble = 6;
pucch_deltaF_Format1 = "deltaF2";
pucch_deltaF_Format1b = "deltaF3";
pucch_deltaF_Format2 = "deltaF0";
pucch_deltaF_Format2a = "deltaF0";
pucch_deltaF_Format2b = "deltaF0";
rach_numberOfRA_Preambles = 64;
rach_preamblesGroupAConfig = "DISABLE";
/*
rach_sizeOfRA_PreamblesGroupA = ;
rach_messageSizeGroupA = ;
rach_messagePowerOffsetGroupB = ;
*/
rach_powerRampingStep = 4;
rach_preambleInitialReceivedTargetPower = -108;
rach_preambleTransMax = 10;
rach_raResponseWindowSize = 10;
rach_macContentionResolutionTimer = 48;
rach_maxHARQ_Msg3Tx = 4;
pcch_default_PagingCycle = 128;
pcch_nB = "oneT";
bcch_modificationPeriodCoeff = 2;
ue_TimersAndConstants_t300 = 1000;
ue_TimersAndConstants_t301 = 1000;
ue_TimersAndConstants_t310 = 1000;
ue_TimersAndConstants_t311 = 10000;
ue_TimersAndConstants_n310 = 20;
ue_TimersAndConstants_n311 = 1;
ue_TransmissionMode = 1;
}
);
srb1_parameters :
{
# timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
timer_poll_retransmit = 80;
# timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
timer_reordering = 35;
# timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
timer_status_prohibit = 0;
# poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
poll_pdu = 4;
# poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
poll_byte = 99999;
# max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
max_retx_threshold = 4;
}
# ------- SCTP definitions
SCTP :
{
# Number of streams to use in input/output
SCTP_INSTREAMS = 2;
SCTP_OUTSTREAMS = 2;
};
////////// MME parameters:
mme_ip_address = ( { ipv4 = "CI_MME_IP_ADDR";
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
///X2
enable_x2 = "no";
t_reloc_prep = 1000; /* unit: millisecond */
tx2_reloc_overall = 2000; /* unit: millisecond */
NETWORK_INTERFACES :
{
ENB_INTERFACE_NAME_FOR_S1_MME = "eth0";
ENB_IPV4_ADDRESS_FOR_S1_MME = "CI_ENB_IP_ADDR";
ENB_INTERFACE_NAME_FOR_S1U = "eth0";
ENB_IPV4_ADDRESS_FOR_S1U = "CI_ENB_IP_ADDR";
ENB_PORT_FOR_S1U = 2152; # Spec 2152
ENB_IPV4_ADDRESS_FOR_X2C = "CI_ENB_IP_ADDR";
ENB_PORT_FOR_X2C = 36422; # Spec 36422
};
log_config :
{
global_log_level ="debug";
global_log_verbosity ="medium";
hw_log_level ="info";
hw_log_verbosity ="medium";
phy_log_level ="info";
phy_log_verbosity ="medium";
mac_log_level ="info";
mac_log_verbosity ="high";
rlc_log_level ="info";
rlc_log_verbosity ="medium";
pdcp_log_level ="info";
pdcp_log_verbosity ="medium";
rrc_log_level ="info";
rrc_log_verbosity ="medium";
};
}
);
MACRLCs = (
{
num_cc = 1;
tr_s_preference = "local_L1";
tr_n_preference = "local_RRC";
scheduler_mode = "fairRR";
puSch10xSnr = 150;
puCch10xSnr = 150;
}
);
L1s = (
{
num_cc = 1;
tr_n_preference = "local_mac";
}
);
RUs = (
{
local_rf = "yes"
nb_tx = 2
nb_rx = 2
att_tx = 0
att_rx = 0;
bands = [38];
max_pdschReferenceSignalPower = -27;
max_rxgain = 110;
eNB_instances = [0];
}
);
THREAD_STRUCT = (
{
#three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
parallel_config = "PARALLEL_SINGLE_THREAD";
#two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
worker_config = "WORKER_ENABLE";
}
);
NETWORK_CONTROLLER :
{
FLEXRAN_ENABLED = "no";
FLEXRAN_INTERFACE_NAME = "lo";
FLEXRAN_IPV4_ADDRESS = "127.0.0.1";
FLEXRAN_PORT = 2210;
FLEXRAN_CACHE = "/mnt/oai_agent_cache";
FLEXRAN_AWAIT_RECONF = "no";
};

View File

@@ -171,22 +171,28 @@ eNBs =
////////// MME parameters:
mme_ip_address = ( { ipv4 = "192.168.12.26";
mme_ip_address = ( { ipv4 = "CI_MME_IP_ADDR";
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
enable_measurement_reports = "no";
///X2
enable_x2 = "no";
t_reloc_prep = 1000; /* unit: millisecond */
tx2_reloc_overall = 2000; /* unit: millisecond */
NETWORK_INTERFACES :
{
ENB_INTERFACE_NAME_FOR_S1_MME = "eth0";
ENB_IPV4_ADDRESS_FOR_S1_MME = "192.168.12.111/24";
ENB_IPV4_ADDRESS_FOR_S1_MME = "CI_ENB_IP_ADDR";
ENB_INTERFACE_NAME_FOR_S1U = "eth0";
ENB_IPV4_ADDRESS_FOR_S1U = "192.168.12.111/24";
ENB_IPV4_ADDRESS_FOR_S1U = "CI_ENB_IP_ADDR";
ENB_PORT_FOR_S1U = 2152; # Spec 2152
ENB_IPV4_ADDRESS_FOR_X2C = "192.168.12.111/24";
ENB_IPV4_ADDRESS_FOR_X2C = "CI_ENB_IP_ADDR";
ENB_PORT_FOR_X2C = 36422; # Spec 36422
};
}
@@ -198,8 +204,8 @@ MACRLCs = (
tr_s_preference = "local_L1";
tr_n_preference = "local_RRC";
phy_test_mode = 0;
puSch10xSnr = 200;
puCch10xSnr = 200;
puSch10xSnr = 160;
puCch10xSnr = 160;
}
);
@@ -228,7 +234,7 @@ RUs = (
THREAD_STRUCT = (
{
#three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
parallel_config = "PARALLEL_RU_L1_TRX_SPLIT";
parallel_config = "PARALLEL_SINGLE_THREAD";
#two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
worker_config = "WORKER_ENABLE";
}

View File

@@ -18,6 +18,9 @@ eNBs =
tr_s_preference = "local_mac"
// In seconds
rrc_inactivity_threshold = 30;
////////// Physical parameters:
component_carriers = (
@@ -171,22 +174,28 @@ eNBs =
////////// MME parameters:
mme_ip_address = ( { ipv4 = "192.168.12.26";
mme_ip_address = ( { ipv4 = "CI_MME_IP_ADDR";
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
enable_measurement_reports = "no";
///X2
enable_x2 = "no";
t_reloc_prep = 1000; /* unit: millisecond */
tx2_reloc_overall = 2000; /* unit: millisecond */
NETWORK_INTERFACES :
{
ENB_INTERFACE_NAME_FOR_S1_MME = "eth0";
ENB_IPV4_ADDRESS_FOR_S1_MME = "192.168.12.111/24";
ENB_IPV4_ADDRESS_FOR_S1_MME = "CI_ENB_IP_ADDR";
ENB_INTERFACE_NAME_FOR_S1U = "eth0";
ENB_IPV4_ADDRESS_FOR_S1U = "192.168.12.111/24";
ENB_IPV4_ADDRESS_FOR_S1U = "CI_ENB_IP_ADDR";
ENB_PORT_FOR_S1U = 2152; # Spec 2152
ENB_IPV4_ADDRESS_FOR_X2C = "192.168.12.111/24";
ENB_IPV4_ADDRESS_FOR_X2C = "CI_ENB_IP_ADDR";
ENB_PORT_FOR_X2C = 36422; # Spec 36422
};
}
@@ -198,8 +207,8 @@ MACRLCs = (
tr_s_preference = "local_L1";
tr_n_preference = "local_RRC";
phy_test_mode = 0;
puSch10xSnr = 200;
puCch10xSnr = 200;
puSch10xSnr = 160;
puCch10xSnr = 160;
}
);
@@ -219,7 +228,7 @@ RUs = (
att_rx = 0;
bands = [7];
max_pdschReferenceSignalPower = -27;
max_rxgain = 115;
max_rxgain = 125;
eNB_instances = [0];
}
@@ -228,7 +237,7 @@ RUs = (
THREAD_STRUCT = (
{
#three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
parallel_config = "PARALLEL_RU_L1_TRX_SPLIT";
parallel_config = "PARALLEL_SINGLE_THREAD";
#two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
worker_config = "WORKER_ENABLE";
}
@@ -237,8 +246,8 @@ THREAD_STRUCT = (
NETWORK_CONTROLLER :
{
FLEXRAN_ENABLED = "no";
FLEXRAN_INTERFACE_NAME = "lo";
FLEXRAN_IPV4_ADDRESS = "127.0.0.1";
FLEXRAN_INTERFACE_NAME = "eth0";
FLEXRAN_IPV4_ADDRESS = "CI_MME_IP_ADDR";
FLEXRAN_PORT = 2210;
FLEXRAN_CACHE = "/mnt/oai_agent_cache";
FLEXRAN_AWAIT_RECONF = "no";

View File

@@ -94,6 +94,14 @@ eNBs =
pcch_default_PagingCycle = 128;
pcch_nB = "oneT";
drx_Config_present = "prSetup"; //"prSetup" "prRelease"
drx_onDurationTimer = "psf1"; // "psfX": X=1,2,3,4,5,6,8,10,20,30,40,50,60,80,100
drx_InactivityTimer = "psf1"; // "psfX": X=1,2,3,4,5,6,8,10,20,30,40,50,60,80,100,200,300,500,750,1280,1920,2560
drx_RetransmissionTimer = "psf1"; // "psfX": X=1,2,4,6,8,16,24,33
drx_longDrx_CycleStartOffset_present = "prSf128"; // "psfX": X=10,20,32,40,64,80,128,160,256,320,512,640,1024,1280,2048,2560
drx_longDrx_CycleStartOffset = 0; // X >= 0 && X < drx_longDrx_CycleStartOffset_present
drx_shortDrx_Cycle = "sf16"; // "sfX": X=2,5,8,10,16,20,32,40,64,80,128,160,256,320,512,640
drx_shortDrx_ShortCycleTimer = 3; // 1..16 integer. Total duration in short cycle = drx_shortDrx_Cycle*drx_shortDrx_ShortCycleTimer [subframe]
bcch_modificationPeriodCoeff = 2;
ue_TimersAndConstants_t300 = 1000;
ue_TimersAndConstants_t301 = 1000;
@@ -171,22 +179,28 @@ eNBs =
////////// MME parameters:
mme_ip_address = ( { ipv4 = "192.168.12.26";
mme_ip_address = ( { ipv4 = "CI_MME_IP_ADDR";
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
enable_measurement_reports = "no";
///X2
enable_x2 = "no";
t_reloc_prep = 1000; /* unit: millisecond */
tx2_reloc_overall = 2000; /* unit: millisecond */
NETWORK_INTERFACES :
{
ENB_INTERFACE_NAME_FOR_S1_MME = "eth0";
ENB_IPV4_ADDRESS_FOR_S1_MME = "192.168.12.111/24";
ENB_IPV4_ADDRESS_FOR_S1_MME = "CI_ENB_IP_ADDR";
ENB_INTERFACE_NAME_FOR_S1U = "eth0";
ENB_IPV4_ADDRESS_FOR_S1U = "192.168.12.111/24";
ENB_IPV4_ADDRESS_FOR_S1U = "CI_ENB_IP_ADDR";
ENB_PORT_FOR_S1U = 2152; # Spec 2152
ENB_IPV4_ADDRESS_FOR_X2C = "192.168.12.111/24";
ENB_IPV4_ADDRESS_FOR_X2C = "CI_ENB_IP_ADDR";
ENB_PORT_FOR_X2C = 36422; # Spec 36422
};
}
@@ -198,8 +212,8 @@ MACRLCs = (
tr_s_preference = "local_L1";
tr_n_preference = "local_RRC";
phy_test_mode = 0;
puSch10xSnr = 200;
puCch10xSnr = 200;
puSch10xSnr = 160;
puCch10xSnr = 160;
}
);
@@ -219,7 +233,7 @@ RUs = (
att_rx = 0;
bands = [7];
max_pdschReferenceSignalPower = -27;
max_rxgain = 115;
max_rxgain = 120;
eNB_instances = [0];
}
@@ -228,7 +242,7 @@ RUs = (
THREAD_STRUCT = (
{
#three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
parallel_config = "PARALLEL_RU_L1_TRX_SPLIT";
parallel_config = "PARALLEL_SINGLE_THREAD";
#two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
worker_config = "WORKER_ENABLE";
}

View File

@@ -0,0 +1,271 @@
Active_eNBs = ( "eNB-Eurecom-LTEBox");
# Asn1_verbosity, choice in: none, info, annoying
Asn1_verbosity = "none";
eNBs =
(
{
////////// Identification parameters:
eNB_ID = 0xe00;
cell_type = "CELL_MACRO_ENB";
eNB_name = "eNB-Eurecom-LTEBox";
// Tracking area code, 0x0000 and 0xfffe are reserved values
tracking_area_code = 1;
plmn_list = ( { mcc = 208; mnc = 92; mnc_length = 2; } );
tr_s_preference = "local_mac"
////////// Physical parameters:
component_carriers = (
{
node_function = "3GPP_eNODEB";
node_timing = "synch_to_ext_device";
node_synch_ref = 0;
frame_type = "FDD";
tdd_config = 3;
tdd_config_s = 0;
prefix_type = "NORMAL";
eutra_band = 7;
downlink_frequency = 2680000000L;
uplink_frequency_offset = -120000000;
Nid_cell = 0;
N_RB_DL = 25;
Nid_cell_mbsfn = 0;
nb_antenna_ports = 2;
nb_antennas_tx = 2;
nb_antennas_rx = 2;
tx_gain = 90;
rx_gain = 125;
pbch_repetition = "FALSE";
prach_root = 0;
prach_config_index = 0;
prach_high_speed = "DISABLE";
prach_zero_correlation = 1;
prach_freq_offset = 2;
pucch_delta_shift = 1;
pucch_nRB_CQI = 0;
pucch_nCS_AN = 0;
pucch_n1_AN = 0;
pdsch_referenceSignalPower = -25;
pdsch_p_b = 0;
pusch_n_SB = 1;
pusch_enable64QAM = "DISABLE";
pusch_hoppingMode = "interSubFrame";
pusch_hoppingOffset = 0;
pusch_groupHoppingEnabled = "ENABLE";
pusch_groupAssignment = 0;
pusch_sequenceHoppingEnabled = "DISABLE";
pusch_nDMRS1 = 1;
phich_duration = "NORMAL";
phich_resource = "ONESIXTH";
srs_enable = "DISABLE";
/*
srs_BandwidthConfig =;
srs_SubframeConfig =;
srs_ackNackST =;
srs_MaxUpPts =;
*/
pusch_p0_Nominal = -96;
pusch_alpha = "AL1";
pucch_p0_Nominal = -104;
msg3_delta_Preamble = 6;
pucch_deltaF_Format1 = "deltaF2";
pucch_deltaF_Format1b = "deltaF3";
pucch_deltaF_Format2 = "deltaF0";
pucch_deltaF_Format2a = "deltaF0";
pucch_deltaF_Format2b = "deltaF0";
rach_numberOfRA_Preambles = 64;
rach_preamblesGroupAConfig = "DISABLE";
/*
rach_sizeOfRA_PreamblesGroupA = ;
rach_messageSizeGroupA = ;
rach_messagePowerOffsetGroupB = ;
*/
rach_powerRampingStep = 4;
rach_preambleInitialReceivedTargetPower = -108;
rach_preambleTransMax = 10;
rach_raResponseWindowSize = 10;
rach_macContentionResolutionTimer = 48;
rach_maxHARQ_Msg3Tx = 4;
pcch_default_PagingCycle = 128;
pcch_nB = "oneT";
bcch_modificationPeriodCoeff = 2;
ue_TimersAndConstants_t300 = 1000;
ue_TimersAndConstants_t301 = 1000;
ue_TimersAndConstants_t310 = 1000;
ue_TimersAndConstants_t311 = 10000;
ue_TimersAndConstants_n310 = 20;
ue_TimersAndConstants_n311 = 1;
ue_TransmissionMode = 2;
//Parameters for SIB18
rxPool_sc_CP_Len = "normal";
rxPool_sc_Period = "sf40";
rxPool_data_CP_Len = "normal";
rxPool_ResourceConfig_prb_Num = 20;
rxPool_ResourceConfig_prb_Start = 5;
rxPool_ResourceConfig_prb_End = 44;
rxPool_ResourceConfig_offsetIndicator_present = "prSmall";
rxPool_ResourceConfig_offsetIndicator_choice = 0;
rxPool_ResourceConfig_subframeBitmap_present = "prBs40";
rxPool_ResourceConfig_subframeBitmap_choice_bs_buf = "00000000000000000000";
rxPool_ResourceConfig_subframeBitmap_choice_bs_size = 5;
rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0;
/*
rxPool_dataHoppingConfig_hoppingParameter = 0;
rxPool_dataHoppingConfig_numSubbands = "ns1";
rxPool_dataHoppingConfig_rbOffset = 0;
rxPool_commTxResourceUC-ReqAllowed = "TRUE";
*/
// Parameters for SIB19
discRxPool_cp_Len = "normal"
discRxPool_discPeriod = "rf32"
discRxPool_numRetx = 1;
discRxPool_numRepetition = 2;
discRxPool_ResourceConfig_prb_Num = 5;
discRxPool_ResourceConfig_prb_Start = 3;
discRxPool_ResourceConfig_prb_End = 21;
discRxPool_ResourceConfig_offsetIndicator_present = "prSmall";
discRxPool_ResourceConfig_offsetIndicator_choice = 0;
discRxPool_ResourceConfig_subframeBitmap_present = "prBs40";
discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf = "f0ffffffff";
discRxPool_ResourceConfig_subframeBitmap_choice_bs_size = 5;
discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0;
}
);
srb1_parameters :
{
# timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
timer_poll_retransmit = 80;
# timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
timer_reordering = 35;
# timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
timer_status_prohibit = 0;
# poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
poll_pdu = 4;
# poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
poll_byte = 99999;
# max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
max_retx_threshold = 4;
}
# ------- SCTP definitions
SCTP :
{
# Number of streams to use in input/output
SCTP_INSTREAMS = 2;
SCTP_OUTSTREAMS = 2;
};
////////// MME parameters:
mme_ip_address = ( { ipv4 = "CI_MME_IP_ADDR";
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
enable_measurement_reports = "no";
///X2
enable_x2 = "no";
t_reloc_prep = 1000; /* unit: millisecond */
tx2_reloc_overall = 2000; /* unit: millisecond */
NETWORK_INTERFACES :
{
ENB_INTERFACE_NAME_FOR_S1_MME = "eth0";
ENB_IPV4_ADDRESS_FOR_S1_MME = "CI_ENB_IP_ADDR";
ENB_INTERFACE_NAME_FOR_S1U = "eth0";
ENB_IPV4_ADDRESS_FOR_S1U = "CI_ENB_IP_ADDR";
ENB_PORT_FOR_S1U = 2152; # Spec 2152
ENB_IPV4_ADDRESS_FOR_X2C = "CI_ENB_IP_ADDR";
ENB_PORT_FOR_X2C = 36422; # Spec 36422
};
}
);
MACRLCs = (
{
num_cc = 1;
tr_s_preference = "local_L1";
tr_n_preference = "local_RRC";
phy_test_mode = 0;
puSch10xSnr = 200;
puCch10xSnr = 200;
}
);
L1s = (
{
num_cc = 1;
tr_n_preference = "local_mac";
}
);
RUs = (
{
local_rf = "yes"
nb_tx = 2
nb_rx = 2
att_tx = 0
att_rx = 0;
bands = [7];
max_pdschReferenceSignalPower = -27;
max_rxgain = 115;
eNB_instances = [0];
}
);
THREAD_STRUCT = (
{
#three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
parallel_config = "PARALLEL_SINGLE_THREAD";
#two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
worker_config = "WORKER_ENABLE";
}
);
NETWORK_CONTROLLER :
{
FLEXRAN_ENABLED = "no";
FLEXRAN_INTERFACE_NAME = "lo";
FLEXRAN_IPV4_ADDRESS = "127.0.0.1";
FLEXRAN_PORT = 2210;
FLEXRAN_CACHE = "/mnt/oai_agent_cache";
FLEXRAN_AWAIT_RECONF = "no";
};
log_config :
{
global_log_level ="info";
global_log_verbosity ="medium";
hw_log_level ="info";
hw_log_verbosity ="medium";
phy_log_level ="info";
phy_log_verbosity ="medium";
mac_log_level ="info";
mac_log_verbosity ="high";
rlc_log_level ="info";
rlc_log_verbosity ="medium";
pdcp_log_level ="info";
pdcp_log_verbosity ="medium";
rrc_log_level ="info";
rrc_log_verbosity ="medium";
};

View File

@@ -0,0 +1,276 @@
Active_eNBs = ( "eNB-Eurecom-LTEBox");
# Asn1_verbosity, choice in: none, info, annoying
Asn1_verbosity = "none";
eNBs =
(
{
////////// Identification parameters:
eNB_ID = 0xe00;
cell_type = "CELL_MACRO_ENB";
eNB_name = "eNB-Eurecom-LTEBox";
// Tracking area code, 0x0000 and 0xfffe are reserved values
tracking_area_code = 1;
plmn_list = ( { mcc = 208; mnc = 93; mnc_length = 2; } );
nr_cellid = 123456L;
tr_s_preference = "local_mac"
////////// Physical parameters:
component_carriers = (
{
node_function = "3GPP_eNODEB";
node_timing = "synch_to_ext_device";
node_synch_ref = 0;
frame_type = "FDD";
tdd_config = 3;
tdd_config_s = 0;
prefix_type = "NORMAL";
eutra_band = 13;
downlink_frequency = 751000000L;
uplink_frequency_offset = 31000000;
Nid_cell = 0;
N_RB_DL = 25;
Nid_cell_mbsfn = 0;
nb_antenna_ports = 1;
nb_antennas_tx = 1;
nb_antennas_rx = 1;
tx_gain = 90;
rx_gain = 110;
pbch_repetition = "FALSE";
prach_root = 0;
prach_config_index = 0;
prach_high_speed = "DISABLE";
prach_zero_correlation = 1;
prach_freq_offset = 2;
pucch_delta_shift = 1;
pucch_nRB_CQI = 0;
pucch_nCS_AN = 0;
pucch_n1_AN = 0;
pdsch_referenceSignalPower = -27;
pdsch_p_b = 0;
pusch_n_SB = 1;
pusch_enable64QAM = "DISABLE";
pusch_hoppingMode = "interSubFrame";
pusch_hoppingOffset = 0;
pusch_groupHoppingEnabled = "ENABLE";
pusch_groupAssignment = 0;
pusch_sequenceHoppingEnabled = "DISABLE";
pusch_nDMRS1 = 1;
phich_duration = "NORMAL";
phich_resource = "ONESIXTH";
srs_enable = "DISABLE";
/* srs_BandwidthConfig =;
srs_SubframeConfig =;
srs_ackNackST =;
srs_MaxUpPts =;*/
pusch_p0_Nominal = -96;
pusch_alpha = "AL1";
pucch_p0_Nominal = -104;
msg3_delta_Preamble = 6;
pucch_deltaF_Format1 = "deltaF2";
pucch_deltaF_Format1b = "deltaF3";
pucch_deltaF_Format2 = "deltaF0";
pucch_deltaF_Format2a = "deltaF0";
pucch_deltaF_Format2b = "deltaF0";
rach_numberOfRA_Preambles = 64;
rach_preamblesGroupAConfig = "DISABLE";
/*
rach_sizeOfRA_PreamblesGroupA = ;
rach_messageSizeGroupA = ;
rach_messagePowerOffsetGroupB = ;
*/
rach_powerRampingStep = 4;
rach_preambleInitialReceivedTargetPower = -108;
rach_preambleTransMax = 10;
rach_raResponseWindowSize = 10;
rach_macContentionResolutionTimer = 48;
rach_maxHARQ_Msg3Tx = 4;
pcch_default_PagingCycle = 128;
pcch_nB = "oneT";
bcch_modificationPeriodCoeff = 2;
ue_TimersAndConstants_t300 = 1000;
ue_TimersAndConstants_t301 = 1000;
ue_TimersAndConstants_t310 = 1000;
ue_TimersAndConstants_t311 = 10000;
ue_TimersAndConstants_n310 = 20;
ue_TimersAndConstants_n311 = 1;
ue_TransmissionMode = 1;
//Parameters for SIB18
rxPool_sc_CP_Len = "normal";
rxPool_sc_Period = "sf40";
rxPool_data_CP_Len = "normal";
rxPool_ResourceConfig_prb_Num = 20;
rxPool_ResourceConfig_prb_Start = 5;
rxPool_ResourceConfig_prb_End = 44;
rxPool_ResourceConfig_offsetIndicator_present = "prSmall";
rxPool_ResourceConfig_offsetIndicator_choice = 0;
rxPool_ResourceConfig_subframeBitmap_present = "prBs40";
rxPool_ResourceConfig_subframeBitmap_choice_bs_buf = "00000000000000000000";
rxPool_ResourceConfig_subframeBitmap_choice_bs_size = 5;
rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0;
/* rxPool_dataHoppingConfig_hoppingParameter = 0;
rxPool_dataHoppingConfig_numSubbands = "ns1";
rxPool_dataHoppingConfig_rbOffset = 0;
rxPool_commTxResourceUC-ReqAllowed = "TRUE";
*/
// Parameters for SIB19
discRxPool_cp_Len = "normal"
discRxPool_discPeriod = "rf32"
discRxPool_numRetx = 1;
discRxPool_numRepetition = 2;
discRxPool_ResourceConfig_prb_Num = 5;
discRxPool_ResourceConfig_prb_Start = 3;
discRxPool_ResourceConfig_prb_End = 21;
discRxPool_ResourceConfig_offsetIndicator_present = "prSmall";
discRxPool_ResourceConfig_offsetIndicator_choice = 0;
discRxPool_ResourceConfig_subframeBitmap_present = "prBs40";
discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf = "f0ffffffff";
discRxPool_ResourceConfig_subframeBitmap_choice_bs_size = 5;
discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0;
}
);
srb1_parameters :
{
# timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
timer_poll_retransmit = 80;
# timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
timer_reordering = 35;
# timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
timer_status_prohibit = 0;
# poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
poll_pdu = 4;
# poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
poll_byte = 99999;
# max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
max_retx_threshold = 4;
}
# ------- SCTP definitions
SCTP :
{
# Number of streams to use in input/output
SCTP_INSTREAMS = 2;
SCTP_OUTSTREAMS = 2;
};
////////// MME parameters:
mme_ip_address = ( { ipv4 = "CI_MME_IP_ADDR";
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
///X2
enable_x2 = "yes";
t_reloc_prep = 1000; /* unit: millisecond */
tx2_reloc_overall = 2000; /* unit: millisecond */
target_enb_x2_ip_address = (
{ ipv4 = "CI_RCC_IP_ADDR";
ipv6 = "192:168:30::17";
preference = "ipv4";
}
);
NETWORK_INTERFACES :
{
ENB_INTERFACE_NAME_FOR_S1_MME = "eth0";
ENB_IPV4_ADDRESS_FOR_S1_MME = "CI_ENB_IP_ADDR";
ENB_INTERFACE_NAME_FOR_S1U = "eth0";
ENB_IPV4_ADDRESS_FOR_S1U = "CI_ENB_IP_ADDR";
ENB_PORT_FOR_S1U = 2152; # Spec 2152
ENB_IPV4_ADDRESS_FOR_X2C = "CI_ENB_IP_ADDR";
ENB_PORT_FOR_X2C = 36422; # Spec 36422
};
}
);
MACRLCs = (
{
num_cc = 1;
tr_s_preference = "local_L1";
tr_n_preference = "local_RRC";
phy_test_mode = 0;
puSch10xSnr = 200;
puCch10xSnr = 200;
}
);
L1s = (
{
num_cc = 1;
tr_n_preference = "local_mac";
}
);
RUs = (
{
local_rf = "yes"
nb_tx = 1
nb_rx = 1
att_tx = 0
att_rx = 0;
bands = [7];
max_pdschReferenceSignalPower = -27;
max_rxgain = 125;
eNB_instances = [0];
}
);
NETWORK_CONTROLLER :
{
FLEXRAN_ENABLED = "no";
FLEXRAN_INTERFACE_NAME = "eth0";
FLEXRAN_IPV4_ADDRESS = "CI_MME_IP_ADDR";
FLEXRAN_PORT = 2210;
FLEXRAN_CACHE = "/mnt/oai_agent_cache";
FLEXRAN_AWAIT_RECONF = "no";
};
THREAD_STRUCT = (
{
#three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
parallel_config = "PARALLEL_SINGLE_THREAD";//PARALLEL_RU_L1_TRX_SPLIT";
#two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
worker_config = "WORKER_ENABLE";
}
);
log_config :
{
global_log_level ="info";
global_log_verbosity ="medium";
hw_log_level ="info";
hw_log_verbosity ="medium";
phy_log_level ="info";
phy_log_verbosity ="medium";
mac_log_level ="info";
mac_log_verbosity ="high";
rlc_log_level ="info";
rlc_log_verbosity ="medium";
pdcp_log_level ="info";
pdcp_log_verbosity ="medium";
rrc_log_level ="info";
rrc_log_verbosity ="medium";
};

View File

@@ -0,0 +1,298 @@
Active_gNBs = ( "gNB-Eurecom-5GNRBox");
# Asn1_verbosity, choice in: none, info, annoying
Asn1_verbosity = "none";
gNBs =
(
{
////////// Identification parameters:
gNB_ID = 0xe00;
cell_type = "CELL_MACRO_GNB";
gNB_name = "gNB-Eurecom-5GNRBox";
// Tracking area code, 0x0000 and 0xfffe are reserved values
tracking_area_code = 1;
plmn_list = ({mcc = 208; mnc = 93; mnc_length = 2;});
tr_s_preference = "local_mac"
////////// Physical parameters:
component_carriers = (
{
node_function = "3GPP_gNODEB";
node_timing = "synch_to_ext_device";
node_synch_ref = 0;
frame_type = "TDD";
DL_prefix_type = "NORMAL";
UL_prefix_type = "NORMAL";
eutra_band = 78;
downlink_frequency = 3510000000L;
uplink_frequency_offset = -120000000;
Nid_cell = 0;
N_RB_DL = 106;
nb_antenna_ports = 1;
nb_antennas_tx = 1;
nb_antennas_rx = 1;
tx_gain = 90;
rx_gain = 125;
MIB_subCarrierSpacingCommon = 30;
MIB_ssb_SubcarrierOffset = 0;
MIB_dmrs_TypeA_Position = 2;
pdcch_ConfigSIB1 = 0;
SIB1_frequencyOffsetSSB = "khz5";
SIB1_ssb_PeriodicityServingCell = 5;
SIB1_ss_PBCH_BlockPower = -60;
absoluteFrequencySSB = 0;
DL_FreqBandIndicatorNR = 15;
DL_absoluteFrequencyPointA = 15;
DL_offsetToCarrier = 15;
DL_SCS_SubcarrierSpacing = "kHz30";
DL_SCS_SpecificCarrier_k0 = 0;
DL_carrierBandwidth = 15;
DL_locationAndBandwidth = 15;
DL_BWP_SubcarrierSpacing = "kHz30";
DL_BWP_prefix_type = "NORMAL";
UL_FreqBandIndicatorNR = 15;
UL_absoluteFrequencyPointA = 13;
UL_additionalSpectrumEmission = 3;
UL_p_Max = -1;
UL_frequencyShift7p5khz = "TRUE";
UL_offsetToCarrier = 10;
UL_SCS_SubcarrierSpacing = "kHz30";
UL_SCS_SpecificCarrier_k0 = 0;
UL_carrierBandwidth = 15;
UL_locationAndBandwidth = 15;
UL_BWP_SubcarrierSpacing = "kHz30";
UL_BWP_prefix_type = "NORMAL";
UL_timeAlignmentTimerCommon = "infinity";
ServingCellConfigCommon_n_TimingAdvanceOffset = "n0"
ServingCellConfigCommon_ssb_PositionsInBurst_PR = 0x01;
ServingCellConfigCommon_ssb_periodicityServingCell = 10;
ServingCellConfigCommon_dmrs_TypeA_Position = 2;
NIA_SubcarrierSpacing = "kHz15";
ServingCellConfigCommon_ss_PBCH_BlockPower = -60;
referenceSubcarrierSpacing = "kHz15";
dl_UL_TransmissionPeriodicity = "ms0p5";
nrofDownlinkSlots = 10;
nrofDownlinkSymbols = 10;
nrofUplinkSlots = 10;
nrofUplinkSymbols = 10;
rach_totalNumberOfRA_Preambles = 63;
rach_ssb_perRACH_OccasionAndCB_PreamblesPerSSB_choice = "oneEighth";
rach_ssb_perRACH_OccasionAndCB_PreamblesPerSSB_oneEighth = 4;
rach_ssb_perRACH_OccasionAndCB_PreamblesPerSSB_oneFourth = 8;
rach_ssb_perRACH_OccasionAndCB_PreamblesPerSSB_oneHalf = 16;
rach_ssb_perRACH_OccasionAndCB_PreamblesPerSSB_one = 24;
rach_ssb_perRACH_OccasionAndCB_PreamblesPerSSB_two = 32;
rach_ssb_perRACH_OccasionAndCB_PreamblesPerSSB_four = 8;
rach_ssb_perRACH_OccasionAndCB_PreamblesPerSSB_eight = 4;
rach_ssb_perRACH_OccasionAndCB_PreamblesPerSSB_sixteen = 2;
rach_groupBconfigured = "ENABLE";
rach_ra_Msg3SizeGroupA = 56;
rach_messagePowerOffsetGroupB = "dB0";
rach_numberOfRA_PreamblesGroupA = 32;
rach_ra_ContentionResolutionTimer = 8;
rsrp_ThresholdSSB = 64;
rsrp_ThresholdSSB_SUL = 64;
prach_RootSequenceIndex_choice = "l839";
prach_RootSequenceIndex_l839 = 0;
prach_RootSequenceIndex_l139 = 0;
prach_msg1_SubcarrierSpacing = "kHz30";
restrictedSetConfig = "unrestrictedSet";
msg3_transformPrecoding = "ENABLE";
prach_ConfigurationIndex = 10;
prach_msg1_FDM = "one";
prach_msg1_FrequencyStart = 10;
zeroCorrelationZoneConfig = 10;
preambleReceivedTargetPower = -150;
preambleTransMax = 6;
powerRampingStep = "dB0";
ra_ResponseWindow = 8;
groupHoppingEnabledTransformPrecoding = "ENABLE";
msg3_DeltaPreamble = 0;
p0_NominalWithGrant = 0;
PUSCH_TimeDomainResourceAllocation_k2 = 0;
PUSCH_TimeDomainResourceAllocation_mappingType = "typeA";
PUSCH_TimeDomainResourceAllocation_startSymbolAndLength = 0;
pucch_ResourceCommon = 0;
pucch_GroupHopping = "neither";
hoppingId = 0;
p0_nominal = -30;
PDSCH_TimeDomainResourceAllocation_k0 = 2;
PDSCH_TimeDomainResourceAllocation_mappingType = "typeA";
PDSCH_TimeDomainResourceAllocation_startSymbolAndLength = 0;
rateMatchPatternId = 0;
RateMatchPattern_patternType = "bitmaps";
symbolsInResourceBlock = "oneSlot";
periodicityAndPattern = 2;
RateMatchPattern_controlResourceSet = 5;
RateMatchPattern_subcarrierSpacing = "kHz30";
RateMatchPattern_mode = "dynamic";
controlResourceSetZero = 0;
searchSpaceZero = 0;
searchSpaceSIB1 = 10;
searchSpaceOtherSystemInformation = 10;
pagingSearchSpace = 10;
ra_SearchSpace = 10;
PDCCH_common_controlResourceSetId = 5;
PDCCH_common_ControlResourceSet_duration = 2;
PDCCH_cce_REG_MappingType = "nonInterleaved";
PDCCH_reg_BundleSize = 3;
PDCCH_interleaverSize = 3;
PDCCH_shiftIndex = 10;
PDCCH_precoderGranularity = "sameAsREG-bundle";
PDCCH_TCI_StateId = 32;
tci_PresentInDCI = "ENABLE";
PDCCH_DMRS_ScramblingID = 0;
SearchSpaceId = 10;
commonSearchSpaces_controlResourceSetId = 5;
SearchSpace_monitoringSlotPeriodicityAndOffset_choice = "sl1";
SearchSpace_monitoringSlotPeriodicityAndOffset_value = 0;
SearchSpace_duration = 2;
SearchSpace_nrofCandidates_aggregationLevel1 = 0;
SearchSpace_nrofCandidates_aggregationLevel2 = 0;
SearchSpace_nrofCandidates_aggregationLevel4 = 0;
SearchSpace_nrofCandidates_aggregationLevel8 = 0;
SearchSpace_nrofCandidates_aggregationLevel16 = 0;
SearchSpace_searchSpaceType = "common";
Common_dci_Format2_0_nrofCandidates_SFI_aggregationLevel1 = 1;
Common_dci_Format2_0_nrofCandidates_SFI_aggregationLevel2 = 1;
Common_dci_Format2_0_nrofCandidates_SFI_aggregationLevel4 = 1;
Common_dci_Format2_0_nrofCandidates_SFI_aggregationLevel8 = 1;
Common_dci_Format2_0_nrofCandidates_SFI_aggregationLevel16 = 1;
Common_dci_Format2_3_monitoringPeriodicity = 1;
Common_dci_Format2_3_nrofPDCCH_Candidates = 1;
ue_Specific__dci_Formats = "formats0-0-And-1-0";
RateMatchPatternLTE_CRS_carrierFreqDL = 6;
RateMatchPatternLTE_CRS_carrierBandwidthDL = 6;
RateMatchPatternLTE_CRS_nrofCRS_Ports = 1;
RateMatchPatternLTE_CRS_v_Shift = 0;
RateMatchPatternLTE_CRS_radioframeAllocationPeriod = 1;
RateMatchPatternLTE_CRS_radioframeAllocationOffset = 0;
RateMatchPatternLTE_CRS_subframeAllocation_choice = "oneFrame";
}
);
srb1_parameters :
{
# timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
timer_poll_retransmit = 80;
# timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
timer_reordering = 35;
# timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
timer_status_prohibit = 0;
# poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
poll_pdu = 4;
# poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
poll_byte = 99999;
# max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
max_retx_threshold = 4;
}
# ------- SCTP definitions
SCTP :
{
# Number of streams to use in input/output
SCTP_INSTREAMS = 2;
SCTP_OUTSTREAMS = 2;
};
////////// MME parameters:
mme_ip_address = ( { ipv4 = "192.168.12.26";
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
NETWORK_INTERFACES :
{
GNB_INTERFACE_NAME_FOR_S1_MME = "eth0";
GNB_IPV4_ADDRESS_FOR_S1_MME = "192.168.12.111/24";
GNB_INTERFACE_NAME_FOR_S1U = "eth0";
GNB_IPV4_ADDRESS_FOR_S1U = "192.168.12.111/24";
GNB_PORT_FOR_S1U = 2152; # Spec 2152
};
}
);
MACRLCs = (
{
num_cc = 1;
tr_s_preference = "local_L1";
tr_n_preference = "local_RRC";
}
);
L1s = (
{
num_cc = 1;
tr_n_preference = "local_mac";
}
);
RUs = (
{
local_rf = "yes"
nb_tx = 1
nb_rx = 1
att_tx = 0
att_rx = 0;
bands = [7];
max_pdschReferenceSignalPower = -27;
max_rxgain = 114;
eNB_instances = [0];
sdr_addrs = "addr=192.168.20.2,second_addr=192.168.10.2,mgmt_addr=192.168.20.2,clock_source=external,time_source=external";
}
);
THREAD_STRUCT = (
{
#three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
parallel_config = "PARALLEL_RU_L1_TRX_SPLIT";
#two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
worker_config = "WORKER_ENABLE";
}
);
NETWORK_CONTROLLER :
{
FLEXRAN_ENABLED = "no";
FLEXRAN_INTERFACE_NAME = "lo";
FLEXRAN_IPV4_ADDRESS = "127.0.0.1";
FLEXRAN_PORT = 2210;
FLEXRAN_CACHE = "/mnt/oai_agent_cache";
FLEXRAN_AWAIT_RECONF = "no";
};
log_config :
{
global_log_level ="info";
global_log_verbosity ="medium";
hw_log_level ="info";
hw_log_verbosity ="medium";
phy_log_level ="info";
phy_log_verbosity ="medium";
mac_log_level ="info";
mac_log_verbosity ="high";
rlc_log_level ="info";
rlc_log_verbosity ="medium";
pdcp_log_level ="info";
pdcp_log_verbosity ="medium";
rrc_log_level ="info";
rrc_log_verbosity ="medium";
};

View File

@@ -178,6 +178,13 @@ eNBs =
}
);
enable_measurement_reports = "no";
///X2
enable_x2 = "no";
t_reloc_prep = 1000; /* unit: millisecond */
tx2_reloc_overall = 2000; /* unit: millisecond */
NETWORK_INTERFACES :
{
@@ -186,7 +193,6 @@ eNBs =
ENB_INTERFACE_NAME_FOR_S1U = "eth0";
ENB_IPV4_ADDRESS_FOR_S1U = "CI_ENB_IP_ADDR";
ENB_PORT_FOR_S1U = 2152; # Spec 2152
ENB_IPV4_ADDRESS_FOR_X2C = "CI_ENB_IP_ADDR";
ENB_PORT_FOR_X2C = 36422; # Spec 36422
};
@@ -201,18 +207,18 @@ MACRLCs = (
phy_test_mode = 0;
puSch10xSnr = 200;
puCch10xSnr = 200;
}
}
);
L1s = (
{
{
num_cc = 1;
tr_n_preference = "local_mac";
}
}
);
RUs = (
{
{
local_rf = "yes"
nb_tx = 1
nb_rx = 1
@@ -224,7 +230,7 @@ RUs = (
eNB_instances = [0];
}
);
);
THREAD_STRUCT = (
{
@@ -238,8 +244,8 @@ THREAD_STRUCT = (
NETWORK_CONTROLLER :
{
FLEXRAN_ENABLED = "no";
FLEXRAN_INTERFACE_NAME = "lo";
FLEXRAN_IPV4_ADDRESS = "127.0.0.1";
FLEXRAN_INTERFACE_NAME = "ens3";
FLEXRAN_IPV4_ADDRESS = "CI_FLEXRAN_CTL_IP_ADDR";
FLEXRAN_PORT = 2210;
FLEXRAN_CACHE = "/mnt/oai_agent_cache";
FLEXRAN_AWAIT_RECONF = "no";
@@ -262,4 +268,3 @@ NETWORK_CONTROLLER :
rrc_log_level ="info";
rrc_log_verbosity ="medium";
};

View File

@@ -0,0 +1,418 @@
Active_eNBs = ( "eNB-Eurecom-LTEBox");
# Asn1_verbosity, choice in: none, info, annoying
Asn1_verbosity = "none";
eNBs =
(
{
////////// Identification parameters:
eNB_ID = 0xe00;
cell_type = "CELL_MACRO_ENB";
eNB_name = "eNB-Eurecom-LTEBox";
// Tracking area code, 0x0000 and 0xfffe are reserved values
tracking_area_code = 1;
plmn_list = ( { mcc = 208; mnc = 93; mnc_length = 2; } );
tr_s_preference = "local_mac"
////////// Physical parameters:
component_carriers = (
{
node_function = "3GPP_eNODEB";
node_timing = "synch_to_ext_device";
node_synch_ref = 0;
frame_type = "FDD";
tdd_config = 3;
tdd_config_s = 0;
prefix_type = "NORMAL";
eutra_band = 7;
downlink_frequency = 2680000000L;
uplink_frequency_offset = -120000000;
Nid_cell = 0;
N_RB_DL = 25;
Nid_cell_mbsfn = 0;
nb_antenna_ports = 1;
nb_antennas_tx = 1;
nb_antennas_rx = 1;
tx_gain = 90;
rx_gain = 125;
pbch_repetition = "FALSE";
prach_root = 0;
prach_config_index = 0;
prach_high_speed = "DISABLE";
prach_zero_correlation = 1;
prach_freq_offset = 2;
pucch_delta_shift = 1;
pucch_nRB_CQI = 0;
pucch_nCS_AN = 0;
pucch_n1_AN = 0;
pdsch_referenceSignalPower = -27;
pdsch_p_b = 0;
pusch_n_SB = 1;
pusch_enable64QAM = "DISABLE";
pusch_hoppingMode = "interSubFrame";
pusch_hoppingOffset = 0;
pusch_groupHoppingEnabled = "ENABLE";
pusch_groupAssignment = 0;
pusch_sequenceHoppingEnabled = "DISABLE";
pusch_nDMRS1 = 1;
phich_duration = "NORMAL";
phich_resource = "ONESIXTH";
srs_enable = "DISABLE";
/* srs_BandwidthConfig =;
srs_SubframeConfig =;
srs_ackNackST =;
srs_MaxUpPts =;*/
pusch_p0_Nominal = -96;
pusch_alpha = "AL1";
pucch_p0_Nominal = -104;
msg3_delta_Preamble = 6;
pucch_deltaF_Format1 = "deltaF2";
pucch_deltaF_Format1b = "deltaF3";
pucch_deltaF_Format2 = "deltaF0";
pucch_deltaF_Format2a = "deltaF0";
pucch_deltaF_Format2b = "deltaF0";
rach_numberOfRA_Preambles = 64;
rach_preamblesGroupAConfig = "DISABLE";
/*
rach_sizeOfRA_PreamblesGroupA = ;
rach_messageSizeGroupA = ;
rach_messagePowerOffsetGroupB = ;
*/
rach_powerRampingStep = 4;
rach_preambleInitialReceivedTargetPower = -108;
rach_preambleTransMax = 10;
rach_raResponseWindowSize = 10;
rach_macContentionResolutionTimer = 48;
rach_maxHARQ_Msg3Tx = 4;
pcch_default_PagingCycle = 128;
pcch_nB = "oneT";
bcch_modificationPeriodCoeff = 2;
ue_TimersAndConstants_t300 = 1000;
ue_TimersAndConstants_t301 = 1000;
ue_TimersAndConstants_t310 = 1000;
ue_TimersAndConstants_t311 = 10000;
ue_TimersAndConstants_n310 = 20;
ue_TimersAndConstants_n311 = 1;
ue_TransmissionMode = 1;
//Parameters for SIB18
rxPool_sc_CP_Len = "normal";
rxPool_sc_Period = "sf40";
rxPool_data_CP_Len = "normal";
rxPool_ResourceConfig_prb_Num = 20;
rxPool_ResourceConfig_prb_Start = 5;
rxPool_ResourceConfig_prb_End = 44;
rxPool_ResourceConfig_offsetIndicator_present = "prSmall";
rxPool_ResourceConfig_offsetIndicator_choice = 0;
rxPool_ResourceConfig_subframeBitmap_present = "prBs40";
rxPool_ResourceConfig_subframeBitmap_choice_bs_buf = "00000000000000000000";
rxPool_ResourceConfig_subframeBitmap_choice_bs_size = 5;
rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0;
/* rxPool_dataHoppingConfig_hoppingParameter = 0;
rxPool_dataHoppingConfig_numSubbands = "ns1";
rxPool_dataHoppingConfig_rbOffset = 0;
rxPool_commTxResourceUC-ReqAllowed = "TRUE";
*/
// Parameters for SIB19
discRxPool_cp_Len = "normal"
discRxPool_discPeriod = "rf32"
discRxPool_numRetx = 1;
discRxPool_numRepetition = 2;
discRxPool_ResourceConfig_prb_Num = 5;
discRxPool_ResourceConfig_prb_Start = 3;
discRxPool_ResourceConfig_prb_End = 21;
discRxPool_ResourceConfig_offsetIndicator_present = "prSmall";
discRxPool_ResourceConfig_offsetIndicator_choice = 0;
discRxPool_ResourceConfig_subframeBitmap_present = "prBs40";
discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf = "f0ffffffff";
discRxPool_ResourceConfig_subframeBitmap_choice_bs_size = 5;
discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0;
}
);
srb1_parameters :
{
# timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
timer_poll_retransmit = 80;
# timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
timer_reordering = 35;
# timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
timer_status_prohibit = 0;
# poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
poll_pdu = 4;
# poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
poll_byte = 99999;
# max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
max_retx_threshold = 4;
}
# ------- SCTP definitions
SCTP :
{
# Number of streams to use in input/output
SCTP_INSTREAMS = 2;
SCTP_OUTSTREAMS = 2;
};
////////// MME parameters:
mme_ip_address = ( { ipv4 = "CI_MME_IP_ADDR";
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
enable_measurement_reports = "no";
///X2
enable_x2 = "no";
t_reloc_prep = 1000; /* unit: millisecond */
tx2_reloc_overall = 2000; /* unit: millisecond */
////////// MCE parameters:
target_mce_m2_ip_address = ( { ipv4 = "127.0.0.7";
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
///M2
enable_enb_m2 = "yes";
mbms_configuration_data_list = (
{
mbsfn_sync_area = 0x0001;
mbms_service_area_list=(
{
mbms_service_area=0x0001;
}
);
}
);
NETWORK_INTERFACES :
{
ENB_INTERFACE_NAME_FOR_S1_MME = "eth0";
ENB_IPV4_ADDRESS_FOR_S1_MME = "CI_ENB_IP_ADDR";
ENB_INTERFACE_NAME_FOR_S1U = "eth0";
ENB_IPV4_ADDRESS_FOR_S1U = "CI_ENB_IP_ADDR";
ENB_PORT_FOR_S1U = 2152; # Spec 2152
ENB_IPV4_ADDRESS_FOR_X2C = "CI_ENB_IP_ADDR";
ENB_PORT_FOR_X2C = 36422; # Spec 36422
ENB_IPV4_ADDRESS_FOR_M2C = "127.0.0.2/24";
ENB_PORT_FOR_M2C = 36443; # Spec 36443
};
}
);
MACRLCs = (
{
num_cc = 1;
tr_s_preference = "local_L1";
tr_n_preference = "local_RRC";
phy_test_mode = 0;
puSch10xSnr = 200;
puCch10xSnr = 200;
}
);
L1s = (
{
num_cc = 1;
tr_n_preference = "local_mac";
}
);
MCEs = (
{
MCE_ID = 0xe00;
MCE_name = "MCE-Vicomtech-LTEBox";
//M2
enable_mce_m2 = "yes";
//M3
enable_mce_m3 = "yes";
target_mme_m3_ip_address = ( { ipv4 = "127.0.0.18";
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
NETWORK_INTERFACES :
{
MCE_INTERFACE_NAME_FOR_M2_ENB = "lo";
MCE_IPV4_ADDRESS_FOR_M2C = "127.0.0.7/24";
MCE_PORT_FOR_M2C = 36443; # Spec 36443
MCE_INTERFACE_NAME_FOR_M3_MME = "lo";
MCE_IPV4_ADDRESS_FOR_M3C = "127.0.0.3/24";
MCE_PORT_FOR_M3C = 36444; # Spec 36444
};
plnm:
{
mcc = 208;
mnc = 93;
mnc_length = 2;
};
mbms_sched_info :
{
mcch_update_time = 10;
mbms_area_config_list = (
{
common_sf_allocation_period = 1; #rf4(0) rf8(1) rf16(2) rf32(3) rf64(4) rf128(5) rf256(6)
mbms_area_id = 0;
pmch_config_list = (
{
allocated_sf_end=32;
data_mcs=14;
mch_scheduling_period = 0; #rf8(0)
mbms_session_list = (
{
#plnm + service_id ->tmgi
plnm:
{
mcc = 208;
mnc = 93;
mnc_length = 2;
}
service_id=0; #keep this allways as 0 (workaround for TUN if)
lcid=5; #this must be properly defined lcid:6+service:0 -> rab_id:5 //with new RLC set lcid either 4 or 5
}
);
}
);
mbms_sf_config_list = (
{
radioframe_allocation_period=0; #n1(0) n2(1) n4(2) n8(3) n16(4) n32(5)
radioframe_alloocation_offset=0;
num_frame="oneFrame";
subframe_allocation=57; #xx111001
//num_frame="fourFrame";
//subframe_allocation=14548987; #
}
);
}
);
};
mcch_config_per_mbsfn_area = (
{
mbsfn_area = 0;
pdcch_length = 1; #s1(0), s2(1)
repetition_period = 0; #rf32(0), rf64(1), rf128(2), rf256(3)
offset = 0;
modification_period = 0; #rf512(0; rf1024(1)
subframe_allocation_info = 32; #BITSTRING (6bits -> one frame) xx100000
mcs = 1; #n2(0), n7(1), n13(2), n19(3)
}
);
#); #end mbms_scheduling_info
}
);
MMEs = (
{
MME_ID = 0xe00;
MME_name = "MME-MBMS-Vicomtech-LTEBox";
//M3
enable_mme_m3 = "yes";
NETWORK_INTERFACES :
{
MME_INTERFACE_NAME_FOR_M3_MCE = "lo";
MME_IPV4_ADDRESS_FOR_M3C = "127.0.0.18/24";
MME_PORT_FOR_M3C = 36444; # Spec 36444
};
}
);
RUs = (
{
local_rf = "yes"
nb_tx = 1
nb_rx = 1
att_tx = 0
att_rx = 0;
bands = [7];
max_pdschReferenceSignalPower = -27;
max_rxgain = 125;
eNB_instances = [0];
}
);
THREAD_STRUCT = (
{
#three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
parallel_config = "PARALLEL_SINGLE_THREAD";
#two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
worker_config = "WORKER_ENABLE";
}
);
NETWORK_CONTROLLER :
{
FLEXRAN_ENABLED = "no";
FLEXRAN_INTERFACE_NAME = "ens3";
FLEXRAN_IPV4_ADDRESS = "CI_FLEXRAN_CTL_IP_ADDR";
FLEXRAN_PORT = 2210;
FLEXRAN_CACHE = "/mnt/oai_agent_cache";
FLEXRAN_AWAIT_RECONF = "no";
};
log_config :
{
global_log_level ="info";
global_log_verbosity ="medium";
hw_log_level ="info";
hw_log_verbosity ="medium";
phy_log_level ="info";
phy_log_verbosity ="medium";
mac_log_level ="info";
mac_log_verbosity ="high";
rlc_log_level ="info";
rlc_log_verbosity ="medium";
pdcp_log_level ="info";
pdcp_log_verbosity ="medium";
rrc_log_level ="info";
rrc_log_verbosity ="medium";
};

View File

@@ -141,15 +141,20 @@ eNBs =
}
);
enable_measurement_reports = "no";
///X2
enable_x2 = "no";
t_reloc_prep = 1000; /* unit: millisecond */
tx2_reloc_overall = 2000; /* unit: millisecond */
NETWORK_INTERFACES :
{
ENB_INTERFACE_NAME_FOR_S1_MME = "eth0";
ENB_IPV4_ADDRESS_FOR_S1_MME = "CI_ENB_IP_ADDR";
ENB_INTERFACE_NAME_FOR_S1U = "eth0";
ENB_IPV4_ADDRESS_FOR_S1U = "CI_ENB_IP_ADDR";
ENB_PORT_FOR_S1U = 2152; # Spec 2152
ENB_IPV4_ADDRESS_FOR_X2C = "CI_ENB_IP_ADDR";
ENB_PORT_FOR_X2C = 36422; # Spec 36422
};
@@ -219,8 +224,8 @@ THREAD_STRUCT = (
NETWORK_CONTROLLER :
{
FLEXRAN_ENABLED = "no";
FLEXRAN_INTERFACE_NAME = "lo";
FLEXRAN_IPV4_ADDRESS = "127.0.0.1";
FLEXRAN_INTERFACE_NAME = "ens3";
FLEXRAN_IPV4_ADDRESS = "CI_FLEXRAN_CTL_IP_ADDR";
FLEXRAN_PORT = 2210;
FLEXRAN_CACHE = "/mnt/oai_agent_cache";
FLEXRAN_AWAIT_RECONF = "no";

View File

@@ -0,0 +1,242 @@
Active_eNBs = ( "eNB_Eurecom_LTEBox");
# Asn1_verbosity, choice in: none, info, annoying
Asn1_verbosity = "none";
eNBs =
(
{
# real_time choice in {hard, rt-preempt, no}
real_time = "no";
////////// Identification parameters:
eNB_ID = 0xe00;
cell_type = "CELL_MACRO_ENB";
eNB_name = "eNB_Eurecom_LTEBox";
// Tracking area code, 0x0000 and 0xfffe are reserved values
tracking_area_code = 1;
plmn_list = ( { mcc = 208; mnc = 92; mnc_length = 2; } );
tr_s_preference = "local_mac"
////////// Physical parameters:
component_carriers = (
{
node_function = "NGFI_RCC_IF4p5";
node_timing = "synch_to_ext_device";
node_synch_ref = 0;
frame_type = "TDD";
tdd_config = 1;
tdd_config_s = 0;
prefix_type = "NORMAL";
eutra_band = 38;
downlink_frequency = 2580000000L;
uplink_frequency_offset = 0;
Nid_cell = 0;
N_RB_DL = 50; #25;
Nid_cell_mbsfn = 0;
nb_antenna_ports = 1;
nb_antennas_tx = 1;
nb_antennas_rx = 1;
tx_gain = 90;
rx_gain = 125;
pbch_repetition = "FALSE";
prach_root = 0;
prach_config_index = 0;
prach_high_speed = "DISABLE";
prach_zero_correlation = 1;
prach_freq_offset = 2;
pucch_delta_shift = 1;
pucch_nRB_CQI = 0;
pucch_nCS_AN = 0;
pucch_n1_AN = 32;
pdsch_referenceSignalPower = -27;
pdsch_p_b = 0;
pusch_n_SB = 1;
pusch_enable64QAM = "DISABLE";
pusch_hoppingMode = "interSubFrame";
pusch_hoppingOffset = 0;
pusch_groupHoppingEnabled = "ENABLE";
pusch_groupAssignment = 0;
pusch_sequenceHoppingEnabled = "DISABLE";
pusch_nDMRS1 = 1;
phich_duration = "NORMAL";
phich_resource = "ONESIXTH";
srs_enable = "DISABLE";
/* srs_BandwidthConfig =;
srs_SubframeConfig =;
srs_ackNackST =;
srs_MaxUpPts =;*/
pusch_p0_Nominal = -104; #-96;
pusch_alpha = "AL1";
pucch_p0_Nominal = -96; #-104;
msg3_delta_Preamble = 6;
pucch_deltaF_Format1 = "deltaF2";
pucch_deltaF_Format1b = "deltaF3";
pucch_deltaF_Format2 = "deltaF0";
pucch_deltaF_Format2a = "deltaF0";
pucch_deltaF_Format2b = "deltaF0";
rach_numberOfRA_Preambles = 64;
rach_preamblesGroupAConfig = "DISABLE";
/*
rach_sizeOfRA_PreamblesGroupA = ;
rach_messageSizeGroupA = ;
rach_messagePowerOffsetGroupB = ;
*/
rach_powerRampingStep = 4;
rach_preambleInitialReceivedTargetPower = -108;
rach_preambleTransMax = 10;
rach_raResponseWindowSize = 10;
rach_macContentionResolutionTimer = 48;
rach_maxHARQ_Msg3Tx = 4;
pcch_default_PagingCycle = 128;
pcch_nB = "oneT";
bcch_modificationPeriodCoeff = 2;
ue_TimersAndConstants_t300 = 1000;
ue_TimersAndConstants_t301 = 1000;
ue_TimersAndConstants_t310 = 1000;
ue_TimersAndConstants_t311 = 10000;
ue_TimersAndConstants_n310 = 20;
ue_TimersAndConstants_n311 = 1;
ue_TransmissionMode = 1;
}
);
srb1_parameters :
{
# timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
timer_poll_retransmit = 80;
# timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
timer_reordering = 35;
# timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
timer_status_prohibit = 0;
# poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
poll_pdu = 4;
# poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
poll_byte = 99999;
# max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
max_retx_threshold = 4;
}
# ------- SCTP definitions
SCTP :
{
# Number of streams to use in input/output
SCTP_INSTREAMS = 2;
SCTP_OUTSTREAMS = 2;
};
////////// MME parameters:
mme_ip_address = ( { ipv4 = "CI_MME_IP_ADDR";
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
NETWORK_INTERFACES :
{
ENB_INTERFACE_NAME_FOR_S1_MME = "enp129s0f0";
ENB_IPV4_ADDRESS_FOR_S1_MME = "CI_ENB_IP_ADDR";
ENB_INTERFACE_NAME_FOR_S1U = "enp129s0f0";
ENB_IPV4_ADDRESS_FOR_S1U = "CI_ENB_IP_ADDR"; #"127.0.0.4/24";
ENB_PORT_FOR_S1U = 2152; # Spec 2152\
ENB_IPV4_ADDRESS_FOR_X2C = "CI_ENB_IP_ADDR";
ENB_PORT_FOR_X2C = 36422; # Spec 36422
};
}
);
MACRLCs = (
{
num_cc = 1;
tr_s_preference = "local_L1";
tr_n_preference = "local_RRC";
}
);
L1s = (
{
num_cc = 1;
tr_n_preference = "local_mac";
}
);
RUs = (
{
local_if_name = "enp129s0f0";
local_address = "CI_ENB_IP_ADDR";
remote_address = "CI_RRU1_IP_ADDR";
local_portc = 50002;
remote_portc = 50002;
local_portd = 50003;
remote_portd = 50003;
local_rf = "no"
tr_preference = "udp_if4p5"
nb_tx = 1
nb_rx = 1
att_tx = 20
att_rx = 20;
eNB_instances = [0];
is_slave = "no";
ota_sync_enabled = "yes";
},
{
local_if_name = "enp129s0f0";
local_address = "CI_ENB_IP_ADDR";
remote_address = "CI_RRU2_IP_ADDR";
local_portc = 50010;
remote_portc = 50010;
local_portd = 50011;
remote_portd = 50011;
local_rf = "no"
tr_preference = "udp_if4p5"
nb_tx = 1
nb_rx = 1
att_tx = 20
att_rx = 20;
eNB_instances = [0];
is_slave = "yes";
ota_sync_enabled = "yes";
}
);
THREAD_STRUCT = (
{
#three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
parallel_config = "PARALLEL_RU_L1_TRX_SPLIT";
#two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
worker_config = "WORKER_ENABLE";
}
);
log_config = {
global_log_level ="info";
global_log_verbosity ="medium";
hw_log_level ="info";
hw_log_verbosity ="medium";
phy_log_level ="info";
phy_log_verbosity ="medium";
mac_log_level ="info";
mac_log_verbosity ="high";
rlc_log_level ="info";
rlc_log_verbosity ="medium";
pdcp_log_level ="info";
pdcp_log_verbosity ="medium";
rrc_log_level ="info";
rrc_log_verbosity ="medium";
};

View File

@@ -137,23 +137,28 @@ eNBs =
};
////////// MME parameters:
mme_ip_address = ( { ipv4 = "10.0.0.2";
mme_ip_address = ( { ipv4 = "CI_MME_IP_ADDR";
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
enable_measurement_reports = "no";
///X2
enable_x2 = "no";
t_reloc_prep = 1000; /* unit: millisecond */
tx2_reloc_overall = 2000; /* unit: millisecond */
NETWORK_INTERFACES :
{
ENB_INTERFACE_NAME_FOR_S1_MME = "eth0";
ENB_IPV4_ADDRESS_FOR_S1_MME = "10.0.0.1/24";
ENB_IPV4_ADDRESS_FOR_S1_MME = "CI_ENB_IP_ADDR";
ENB_INTERFACE_NAME_FOR_S1U = "eth0";
ENB_IPV4_ADDRESS_FOR_S1U = "10.0.0.1/24";
ENB_IPV4_ADDRESS_FOR_S1U = "CI_ENB_IP_ADDR";
ENB_PORT_FOR_S1U = 2152; # Spec 2152
ENB_IPV4_ADDRESS_FOR_X2C = "192.168.12.111/24";
ENB_IPV4_ADDRESS_FOR_X2C = "CI_ENB_IP_ADDR";
ENB_PORT_FOR_X2C = 36422; # Spec 36422
};
@@ -217,7 +222,7 @@ RUs = (
THREAD_STRUCT = (
{
#three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
parallel_config = "PARALLEL_RU_L1_TRX_SPLIT";
parallel_config = "PARALLEL_SINGLE_THREAD";
#two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
worker_config = "WORKER_ENABLE";
}

View File

@@ -137,23 +137,28 @@ eNBs =
};
////////// MME parameters:
mme_ip_address = ( { ipv4 = "10.0.0.2";
mme_ip_address = ( { ipv4 = "CI_MME_IP_ADDR";
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
enable_measurement_reports = "no";
///X2
enable_x2 = "no";
t_reloc_prep = 1000; /* unit: millisecond */
tx2_reloc_overall = 2000; /* unit: millisecond */
NETWORK_INTERFACES :
{
ENB_INTERFACE_NAME_FOR_S1_MME = "eth0";
ENB_IPV4_ADDRESS_FOR_S1_MME = "10.0.0.1/24";
ENB_IPV4_ADDRESS_FOR_S1_MME = "CI_ENB_IP_ADDR";
ENB_INTERFACE_NAME_FOR_S1U = "eth0";
ENB_IPV4_ADDRESS_FOR_S1U = "10.0.0.1/24";
ENB_IPV4_ADDRESS_FOR_S1U = "CI_ENB_IP_ADDR";
ENB_PORT_FOR_S1U = 2152; # Spec 2152
ENB_IPV4_ADDRESS_FOR_X2C = "192.168.12.111/24";
ENB_IPV4_ADDRESS_FOR_X2C = "CI_ENB_IP_ADDR";
ENB_PORT_FOR_X2C = 36422; # Spec 36422
};
@@ -217,7 +222,7 @@ RUs = (
THREAD_STRUCT = (
{
#three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
parallel_config = "PARALLEL_RU_L1_TRX_SPLIT";
parallel_config = "PARALLEL_SINGLE_THREAD";
#two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
worker_config = "WORKER_ENABLE";
}

View File

@@ -137,23 +137,28 @@ eNBs =
};
////////// MME parameters:
mme_ip_address = ( { ipv4 = "10.0.0.2";
mme_ip_address = ( { ipv4 = "CI_MME_IP_ADDR";
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
enable_measurement_reports = "no";
///X2
enable_x2 = "no";
t_reloc_prep = 1000; /* unit: millisecond */
tx2_reloc_overall = 2000; /* unit: millisecond */
NETWORK_INTERFACES :
{
ENB_INTERFACE_NAME_FOR_S1_MME = "eth0";
ENB_IPV4_ADDRESS_FOR_S1_MME = "10.0.0.1/24";
ENB_IPV4_ADDRESS_FOR_S1_MME = "CI_ENB_IP_ADDR";
ENB_INTERFACE_NAME_FOR_S1U = "eth0";
ENB_IPV4_ADDRESS_FOR_S1U = "10.0.0.1/24";
ENB_IPV4_ADDRESS_FOR_S1U = "CI_ENB_IP_ADDR";
ENB_PORT_FOR_S1U = 2152; # Spec 2152
ENB_IPV4_ADDRESS_FOR_X2C = "192.168.12.111/24";
ENB_IPV4_ADDRESS_FOR_X2C = "CI_ENB_IP_ADDR";
ENB_PORT_FOR_X2C = 36422; # Spec 36422
};
@@ -217,7 +222,7 @@ RUs = (
THREAD_STRUCT = (
{
#three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
parallel_config = "PARALLEL_RU_L1_TRX_SPLIT";
parallel_config = "PARALLEL_SINGLE_THREAD";
#two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
worker_config = "WORKER_ENABLE";
}

View File

@@ -7,7 +7,7 @@ eNBs =
{
# real_time choice in {hard, rt-preempt, no}
real_time = "no";
////////// Identification parameters:
eNB_ID = 0xe00;
@@ -174,22 +174,28 @@ eNBs =
////////// MME parameters:
mme_ip_address = ( { ipv4 = "192.168.12.26";
mme_ip_address = ( { ipv4 = "CI_MME_IP_ADDR";
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
enable_measurement_reports = "no";
///X2
enable_x2 = "no";
t_reloc_prep = 1000; /* unit: millisecond */
tx2_reloc_overall = 2000; /* unit: millisecond */
NETWORK_INTERFACES :
{
ENB_INTERFACE_NAME_FOR_S1_MME = "eth0";
ENB_IPV4_ADDRESS_FOR_S1_MME = "192.168.12.111/24";
ENB_IPV4_ADDRESS_FOR_S1_MME = "CI_ENB_IP_ADDR";
ENB_INTERFACE_NAME_FOR_S1U = "eth0";
ENB_IPV4_ADDRESS_FOR_S1U = "192.168.12.111/24";
ENB_IPV4_ADDRESS_FOR_S1U = "CI_ENB_IP_ADDR";
ENB_PORT_FOR_S1U = 2152; # Spec 2152
ENB_IPV4_ADDRESS_FOR_X2C = "192.168.12.111/24";
ENB_IPV4_ADDRESS_FOR_X2C = "CI_ENB_IP_ADDR";
ENB_PORT_FOR_X2C = 36422; # Spec 36422
};
}
@@ -201,20 +207,20 @@ MACRLCs = (
tr_s_preference = "local_L1";
tr_n_preference = "local_RRC";
phy_test_mode = 0;
puSch10xSnr = 200;
puCch10xSnr = 200;
}
puSch10xSnr = 160;
puCch10xSnr = 160;
}
);
L1s = (
{
{
num_cc = 1;
tr_n_preference = "local_mac";
}
}
);
RUs = (
{
{
local_if_name = "lo";
remote_address = "127.0.0.2";
local_address = "127.0.0.1";
@@ -230,12 +236,12 @@ RUs = (
att_rx = 0;
eNB_instances = [0];
}
);
);
THREAD_STRUCT = (
{
#three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
parallel_config = "PARALLEL_RU_L1_TRX_SPLIT";
parallel_config = "PARALLEL_SINGLE_THREAD";
#two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
worker_config = "WORKER_ENABLE";
}
@@ -268,4 +274,3 @@ NETWORK_CONTROLLER :
rrc_log_level ="info";
rrc_log_verbosity ="medium";
};

View File

@@ -7,7 +7,7 @@ eNBs =
{
# real_time choice in {hard, rt-preempt, no}
real_time = "no";
////////// Identification parameters:
eNB_ID = 0xe00;
@@ -174,22 +174,28 @@ eNBs =
////////// MME parameters:
mme_ip_address = ( { ipv4 = "192.168.12.26";
mme_ip_address = ( { ipv4 = "CI_MME_IP_ADDR";
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
enable_measurement_reports = "no";
///X2
enable_x2 = "no";
t_reloc_prep = 1000; /* unit: millisecond */
tx2_reloc_overall = 2000; /* unit: millisecond */
NETWORK_INTERFACES :
{
ENB_INTERFACE_NAME_FOR_S1_MME = "eth0";
ENB_IPV4_ADDRESS_FOR_S1_MME = "192.168.12.111/24";
ENB_IPV4_ADDRESS_FOR_S1_MME = "CI_ENB_IP_ADDR";
ENB_INTERFACE_NAME_FOR_S1U = "eth0";
ENB_IPV4_ADDRESS_FOR_S1U = "192.168.12.111/24";
ENB_IPV4_ADDRESS_FOR_S1U = "CI_ENB_IP_ADDR";
ENB_PORT_FOR_S1U = 2152; # Spec 2152
ENB_IPV4_ADDRESS_FOR_X2C = "192.168.12.111/24";
ENB_IPV4_ADDRESS_FOR_X2C = "CI_ENB_IP_ADDR";
ENB_PORT_FOR_X2C = 36422; # Spec 36422
};
}
@@ -201,20 +207,20 @@ MACRLCs = (
tr_s_preference = "local_L1";
tr_n_preference = "local_RRC";
phy_test_mode = 0;
puSch10xSnr = 200;
puCch10xSnr = 200;
}
puSch10xSnr = 160;
puCch10xSnr = 160;
}
);
L1s = (
{
{
num_cc = 1;
tr_n_preference = "local_mac";
}
}
);
RUs = (
{
{
local_if_name = "lo";
remote_address = "127.0.0.2";
local_address = "127.0.0.1";
@@ -230,12 +236,12 @@ RUs = (
att_rx = 0;
eNB_instances = [0];
}
);
);
THREAD_STRUCT = (
{
#three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
parallel_config = "PARALLEL_RU_L1_TRX_SPLIT";
parallel_config = "PARALLEL_SINGLE_THREAD";
#two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
worker_config = "WORKER_ENABLE";
}
@@ -268,4 +274,3 @@ NETWORK_CONTROLLER :
rrc_log_level ="info";
rrc_log_verbosity ="medium";
};

View File

@@ -7,7 +7,7 @@ eNBs =
{
# real_time choice in {hard, rt-preempt, no}
real_time = "no";
////////// Identification parameters:
eNB_ID = 0xe00;
@@ -174,22 +174,28 @@ eNBs =
////////// MME parameters:
mme_ip_address = ( { ipv4 = "192.168.12.26";
mme_ip_address = ( { ipv4 = "CI_MME_IP_ADDR";
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
enable_measurement_reports = "no";
///X2
enable_x2 = "no";
t_reloc_prep = 1000; /* unit: millisecond */
tx2_reloc_overall = 2000; /* unit: millisecond */
NETWORK_INTERFACES :
{
ENB_INTERFACE_NAME_FOR_S1_MME = "eth0";
ENB_IPV4_ADDRESS_FOR_S1_MME = "192.168.12.111/24";
ENB_IPV4_ADDRESS_FOR_S1_MME = "CI_ENB_IP_ADDR";
ENB_INTERFACE_NAME_FOR_S1U = "eth0";
ENB_IPV4_ADDRESS_FOR_S1U = "192.168.12.111/24";
ENB_IPV4_ADDRESS_FOR_S1U = "CI_ENB_IP_ADDR";
ENB_PORT_FOR_S1U = 2152; # Spec 2152
ENB_IPV4_ADDRESS_FOR_X2C = "192.168.12.111/24";
ENB_IPV4_ADDRESS_FOR_X2C = "CI_ENB_IP_ADDR";
ENB_PORT_FOR_X2C = 36422; # Spec 36422
};
}
@@ -201,20 +207,20 @@ MACRLCs = (
tr_s_preference = "local_L1";
tr_n_preference = "local_RRC";
phy_test_mode = 0;
puSch10xSnr = 200;
puCch10xSnr = 200;
}
puSch10xSnr = 160;
puCch10xSnr = 160;
}
);
L1s = (
{
{
num_cc = 1;
tr_n_preference = "local_mac";
}
}
);
RUs = (
{
{
local_if_name = "lo";
remote_address = "127.0.0.2";
local_address = "127.0.0.1";
@@ -230,12 +236,12 @@ RUs = (
att_rx = 0;
eNB_instances = [0];
}
);
);
THREAD_STRUCT = (
{
#three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
parallel_config = "PARALLEL_RU_L1_TRX_SPLIT";
parallel_config = "PARALLEL_SINGLE_THREAD";
#two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
worker_config = "WORKER_ENABLE";
}
@@ -268,4 +274,3 @@ NETWORK_CONTROLLER :
rrc_log_level ="info";
rrc_log_verbosity ="medium";
};

View File

@@ -0,0 +1,378 @@
Active_eNBs = ( "eNB-Eurecom-LTEBox");
# Asn1_verbosity, choice in: none, info, annoying
Asn1_verbosity = "none";
eNBs =
(
{
# real_time choice in {hard, rt-preempt, no}
real_time = "no";
////////// Identification parameters:
eNB_ID = 0xe00;
cell_type = "CELL_MACRO_ENB";
eNB_name = "eNB-Eurecom-LTEBox";
// Tracking area code, 0x0000 and 0xfffe are reserved values
tracking_area_code = 600;
plmn_list = ( { mcc = 208; mnc = 93; mnc_length = 2; } );
tr_s_preference = "local_mac"
////////// Physical parameters:
component_carriers = (
{
node_function = "NGFI_RCC_IF4p5";
node_timing = "synch_to_ext_device";
node_synch_ref = 0;
frame_type = "FDD";
tdd_config = 3;
tdd_config_s = 0;
prefix_type = "NORMAL";
eutra_band = 7;
downlink_frequency = 2685000000L;
uplink_frequency_offset = -120000000;
Nid_cell = 0;
N_RB_DL = 50;
Nid_cell_mbsfn = 0;
nb_antenna_ports = 2;
nb_antennas_tx = 1;
nb_antennas_rx = 1;
tx_gain = 90;
rx_gain = 125;
pbch_repetition = "FALSE";
prach_root = 0;
prach_config_index = 0;
prach_high_speed = "DISABLE";
prach_zero_correlation = 1;
prach_freq_offset = 2;
pucch_delta_shift = 1;
pucch_nRB_CQI = 0;
pucch_nCS_AN = 0;
pucch_n1_AN = 0;
pdsch_referenceSignalPower = -27;
pdsch_p_b = 0;
pusch_n_SB = 1;
pusch_enable64QAM = "DISABLE";
pusch_hoppingMode = "interSubFrame";
pusch_hoppingOffset = 0;
pusch_groupHoppingEnabled = "ENABLE";
pusch_groupAssignment = 0;
pusch_sequenceHoppingEnabled = "DISABLE";
pusch_nDMRS1 = 1;
phich_duration = "NORMAL";
phich_resource = "ONESIXTH";
srs_enable = "DISABLE";
/* srs_BandwidthConfig =;
srs_SubframeConfig =;
srs_ackNackST =;
srs_MaxUpPts =;*/
pusch_p0_Nominal = -104;
pusch_alpha = "AL1";
pucch_p0_Nominal = -108;
msg3_delta_Preamble = 6;
pucch_deltaF_Format1 = "deltaF2";
pucch_deltaF_Format1b = "deltaF3";
pucch_deltaF_Format2 = "deltaF0";
pucch_deltaF_Format2a = "deltaF0";
pucch_deltaF_Format2b = "deltaF0";
rach_numberOfRA_Preambles = 64;
rach_preamblesGroupAConfig = "DISABLE";
/*
rach_sizeOfRA_PreamblesGroupA = ;
rach_messageSizeGroupA = ;
rach_messagePowerOffsetGroupB = ;
*/
rach_powerRampingStep = 4;
rach_preambleInitialReceivedTargetPower = -108;
rach_preambleTransMax = 10;
rach_raResponseWindowSize = 10;
rach_macContentionResolutionTimer = 48;
rach_maxHARQ_Msg3Tx = 4;
pcch_default_PagingCycle = 128;
pcch_nB = "oneT";
bcch_modificationPeriodCoeff = 2;
ue_TimersAndConstants_t300 = 1000;
ue_TimersAndConstants_t301 = 1000;
ue_TimersAndConstants_t310 = 1000;
ue_TimersAndConstants_t311 = 10000;
ue_TimersAndConstants_n310 = 20;
ue_TimersAndConstants_n311 = 1;
ue_TransmissionMode = 1;
mbms_dedicated_serving_cell = "DISABLE"
}
);
srb1_parameters :
{
# timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
timer_poll_retransmit = 80;
# timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
timer_reordering = 35;
# timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
timer_status_prohibit = 0;
# poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
poll_pdu = 4;
# poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
poll_byte = 99999;
# max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
max_retx_threshold = 4;
}
# ------- SCTP definitions
SCTP :
{
# Number of streams to use in input/output
SCTP_INSTREAMS = 2;
SCTP_OUTSTREAMS = 2;
};
////////// MME parameters:
mme_ip_address = ( { ipv4 = "192.168.15.130";
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
enable_measurement_reports = "no";
///X2
enable_x2 = "no";
t_reloc_prep = 1000; /* unit: millisecond */
tx2_reloc_overall = 2000; /* unit: millisecond */
////////// MCE parameters:
target_mce_m2_ip_address = ( { ipv4 = "127.0.0.7";
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
///M2
enable_enb_m2 = "yes";
mbms_configuration_data_list = (
{
mbsfn_sync_area = 0x0001;
mbms_service_area_list=(
{
mbms_service_area=0x0001;
}
);
}
);
NETWORK_INTERFACES :
{
ENB_INTERFACE_NAME_FOR_S1_MME = "enp2s0";
ENB_IPV4_ADDRESS_FOR_S1_MME = "192.168.10.15/24";
ENB_INTERFACE_NAME_FOR_S1U = "enp2s0";
ENB_IPV4_ADDRESS_FOR_S1U = "192.168.10.15/24";
ENB_PORT_FOR_S1U = 2152; # Spec 2152
ENB_IPV4_ADDRESS_FOR_X2C = "127.0.0.2/24";
ENB_PORT_FOR_X2C = 36422; # Spec 36422
ENB_IPV4_ADDRESS_FOR_M2C = "127.0.0.2/24";
ENB_PORT_FOR_M2C = 36443; # Spec 36443
};
}
);
MCEs = (
{
MCE_ID = 0xe00;
MCE_name = "MCE-Vicomtech-LTEBox";
//M2
enable_mce_m2 = "yes";
//M3
enable_mce_m3 = "yes";
target_mme_m3_ip_address = ( { ipv4 = "127.0.0.18";
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
NETWORK_INTERFACES :
{
MCE_INTERFACE_NAME_FOR_M2_ENB = "lo";
MCE_IPV4_ADDRESS_FOR_M2C = "127.0.0.7/24";
MCE_PORT_FOR_M2C = 36443; # Spec 36443
MCE_INTERFACE_NAME_FOR_M3_MME = "lo";
MCE_IPV4_ADDRESS_FOR_M3C = "127.0.0.3/24";
MCE_PORT_FOR_M3C = 36444; # Spec 36444
};
plnm:
{
mcc = 208;
mnc = 93;
mnc_length = 2;
};
mbms_sched_info :
{
mcch_update_time = 10;
mbms_area_config_list = (
{
common_sf_allocation_period = 2; #rf4(0) rf8(1) rf16(2) rf32(3) rf64(4) rf128(5) rf256(6)
mbms_area_id = 0;
pmch_config_list = (
{
allocated_sf_end=32;
data_mcs=14;
mch_scheduling_period = 0; #rf8(0)
mbms_session_list = (
{
#plnm + service_id ->tmgi
plnm:
{
mcc = 208;
mnc = 93;
mnc_length = 2;
}
service_id=0; #keep this allways as 0 (workaround for TUN if)
lcid=6; #this must be properly defined lcid:6+service:0 -> rab_id:6
}
);
}
);
mbms_sf_config_list = (
{
radioframe_allocation_period=1; #n1(0) n2(1) n4(2) n8(3) n16(4) n32(5)
radioframe_alloocation_offset=0;
num_frame="oneFrame";
subframe_allocation=57; #xx111001
//num_frame="fourFrame";
//subframe_allocation=14548987; #
}
);
}
);
};
mcch_config_per_mbsfn_area = (
{
mbsfn_area = 0;
pdcch_length = 1; #s1(0), s2(1)
repetition_period = 0; #rf32(0), rf64(1), rf128(2), rf256(3)
offset = 0;
modification_period = 0; #rf512(0; rf1024(1)
subframe_allocation_info = 32; #BITSTRING (6bits -> one frame) xx100000
mcs = 1; #n2(0), n7(1), n13(2), n19(3)
}
);
#); #end mbms_scheduling_info
}
);
MMEs = (
{
MME_ID = 0xe00;
MME_name = "MME-MBMS-Vicomtech-LTEBox";
//M3
enable_mme_m3 = "yes";
NETWORK_INTERFACES :
{
MME_INTERFACE_NAME_FOR_M3_MCE = "lo";
MME_IPV4_ADDRESS_FOR_M3C = "127.0.0.18/24";
MME_PORT_FOR_M3C = 36444; # Spec 36444
};
}
);
MACRLCs = (
{
num_cc = 1;
tr_s_preference = "local_L1";
tr_n_preference = "local_RRC";
}
);
L1s = (
{
num_cc = 1;
tr_n_preference = "local_mac";
}
);
RUs = (
{
local_if_name = "lo";
remote_address = "127.0.0.2";
local_address = "127.0.0.1";
local_portc = 50000;
remote_portc = 50000;
local_portd = 50001;
remote_portd = 50001;
local_rf = "no"
tr_preference = "udp_if4p5"
nb_tx = 2
nb_rx = 2
att_tx = 0
att_rx = 0;
eNB_instances = [0];
is_slave = "no";
}
);
THREAD_STRUCT = (
{
#three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
parallel_config = "PARALLEL_SINGLE_THREAD";
#two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
worker_config = "WORKER_ENABLE";
}
);
log_config = {
global_log_level ="info";
global_log_verbosity ="medium";
hw_log_level ="info";
hw_log_verbosity ="medium";
phy_log_level ="info";
phy_log_verbosity ="medium";
mac_log_level ="info";
mac_log_verbosity ="high";
rlc_log_level ="info";
rlc_log_verbosity ="medium";
pdcp_log_level ="info";
pdcp_log_verbosity ="medium";
rrc_log_level ="info";
rrc_log_verbosity ="medium";
};

View File

@@ -0,0 +1,378 @@
Active_eNBs = ( "eNB-Eurecom-LTEBox");
# Asn1_verbosity, choice in: none, info, annoying
Asn1_verbosity = "none";
eNBs =
(
{
# real_time choice in {hard, rt-preempt, no}
real_time = "no";
////////// Identification parameters:
eNB_ID = 0xe00;
cell_type = "CELL_MACRO_ENB";
eNB_name = "eNB-Eurecom-LTEBox";
// Tracking area code, 0x0000 and 0xfffe are reserved values
tracking_area_code = 1;
plmn_list = ( { mcc = 208; mnc = 93; mnc_length = 2; } );
tr_s_preference = "local_mac"
////////// Physical parameters:
component_carriers = (
{
node_function = "NGFI_RCC_IF4p5";
node_timing = "synch_to_ext_device";
node_synch_ref = 0;
frame_type = "FDD";
tdd_config = 3;
tdd_config_s = 0;
prefix_type = "NORMAL";
eutra_band = 7;
downlink_frequency = 2685000000L;
uplink_frequency_offset = -120000000;
Nid_cell = 0;
N_RB_DL = 50;
Nid_cell_mbsfn = 0;
nb_antenna_ports = 2;
nb_antennas_tx = 1;
nb_antennas_rx = 1;
tx_gain = 90;
rx_gain = 125;
pbch_repetition = "FALSE";
prach_root = 0;
prach_config_index = 0;
prach_high_speed = "DISABLE";
prach_zero_correlation = 1;
prach_freq_offset = 2;
pucch_delta_shift = 1;
pucch_nRB_CQI = 0;
pucch_nCS_AN = 0;
pucch_n1_AN = 0;
pdsch_referenceSignalPower = -27;
pdsch_p_b = 0;
pusch_n_SB = 1;
pusch_enable64QAM = "DISABLE";
pusch_hoppingMode = "interSubFrame";
pusch_hoppingOffset = 0;
pusch_groupHoppingEnabled = "ENABLE";
pusch_groupAssignment = 0;
pusch_sequenceHoppingEnabled = "DISABLE";
pusch_nDMRS1 = 1;
phich_duration = "NORMAL";
phich_resource = "ONESIXTH";
srs_enable = "DISABLE";
/* srs_BandwidthConfig =;
srs_SubframeConfig =;
srs_ackNackST =;
srs_MaxUpPts =;*/
pusch_p0_Nominal = -104;
pusch_alpha = "AL1";
pucch_p0_Nominal = -108;
msg3_delta_Preamble = 6;
pucch_deltaF_Format1 = "deltaF2";
pucch_deltaF_Format1b = "deltaF3";
pucch_deltaF_Format2 = "deltaF0";
pucch_deltaF_Format2a = "deltaF0";
pucch_deltaF_Format2b = "deltaF0";
rach_numberOfRA_Preambles = 64;
rach_preamblesGroupAConfig = "DISABLE";
/*
rach_sizeOfRA_PreamblesGroupA = ;
rach_messageSizeGroupA = ;
rach_messagePowerOffsetGroupB = ;
*/
rach_powerRampingStep = 4;
rach_preambleInitialReceivedTargetPower = -108;
rach_preambleTransMax = 10;
rach_raResponseWindowSize = 10;
rach_macContentionResolutionTimer = 48;
rach_maxHARQ_Msg3Tx = 4;
pcch_default_PagingCycle = 128;
pcch_nB = "oneT";
bcch_modificationPeriodCoeff = 2;
ue_TimersAndConstants_t300 = 1000;
ue_TimersAndConstants_t301 = 1000;
ue_TimersAndConstants_t310 = 1000;
ue_TimersAndConstants_t311 = 10000;
ue_TimersAndConstants_n310 = 20;
ue_TimersAndConstants_n311 = 1;
ue_TransmissionMode = 1;
mbms_dedicated_serving_cell = "DISABLE"
}
);
srb1_parameters :
{
# timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
timer_poll_retransmit = 80;
# timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
timer_reordering = 35;
# timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
timer_status_prohibit = 0;
# poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
poll_pdu = 4;
# poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
poll_byte = 99999;
# max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
max_retx_threshold = 4;
}
# ------- SCTP definitions
SCTP :
{
# Number of streams to use in input/output
SCTP_INSTREAMS = 2;
SCTP_OUTSTREAMS = 2;
};
////////// MME parameters:
mme_ip_address = ( { ipv4 = "127.0.0.3";
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
enable_measurement_reports = "no";
///X2
enable_x2 = "no";
t_reloc_prep = 1000; /* unit: millisecond */
tx2_reloc_overall = 2000; /* unit: millisecond */
////////// MCE parameters:
target_mce_m2_ip_address = ( { ipv4 = "127.0.0.7";
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
///M2
enable_enb_m2 = "yes";
mbms_configuration_data_list = (
{
mbsfn_sync_area = 0x0001;
mbms_service_area_list=(
{
mbms_service_area=0x0001;
}
);
}
);
NETWORK_INTERFACES :
{
ENB_INTERFACE_NAME_FOR_S1_MME = "lo";
ENB_IPV4_ADDRESS_FOR_S1_MME = "127.0.0.2/24";
ENB_INTERFACE_NAME_FOR_S1U = "lo";
ENB_IPV4_ADDRESS_FOR_S1U = "127.0.0.5/24";
ENB_PORT_FOR_S1U = 2152; # Spec 2152
ENB_IPV4_ADDRESS_FOR_X2C = "127.0.0.2/24";
ENB_PORT_FOR_X2C = 36422; # Spec 36422
ENB_IPV4_ADDRESS_FOR_M2C = "127.0.0.2/24";
ENB_PORT_FOR_M2C = 36443; # Spec 36443
};
}
);
MCEs = (
{
MCE_ID = 0xe00;
MCE_name = "MCE-Vicomtech-LTEBox";
//M2
enable_mce_m2 = "yes";
//M3
enable_mce_m3 = "yes";
target_mme_m3_ip_address = ( { ipv4 = "127.0.0.18";
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
NETWORK_INTERFACES :
{
MCE_INTERFACE_NAME_FOR_M2_ENB = "lo";
MCE_IPV4_ADDRESS_FOR_M2C = "127.0.0.7/24";
MCE_PORT_FOR_M2C = 36443; # Spec 36443
MCE_INTERFACE_NAME_FOR_M3_MME = "lo";
MCE_IPV4_ADDRESS_FOR_M3C = "127.0.0.3/24";
MCE_PORT_FOR_M3C = 36444; # Spec 36444
};
plnm:
{
mcc = 208;
mnc = 93;
mnc_length = 2;
};
mbms_sched_info :
{
mcch_update_time = 10;
mbms_area_config_list = (
{
common_sf_allocation_period = 2; #rf4(0) rf8(1) rf16(2) rf32(3) rf64(4) rf128(5) rf256(6)
mbms_area_id = 0;
pmch_config_list = (
{
allocated_sf_end=32;
data_mcs=14;
mch_scheduling_period = 0; #rf8(0)
mbms_session_list = (
{
#plnm + service_id ->tmgi
plnm:
{
mcc = 208;
mnc = 93;
mnc_length = 2;
}
service_id=0; #keep this allways as 0 (workaround for TUN if)
lcid=6; #this must be properly defined lcid:6+service:0 -> rab_id:6
}
);
}
);
mbms_sf_config_list = (
{
radioframe_allocation_period=1; #n1(0) n2(1) n4(2) n8(3) n16(4) n32(5)
radioframe_alloocation_offset=0;
num_frame="oneFrame";
subframe_allocation=57; #xx111001
//num_frame="fourFrame";
//subframe_allocation=14548987; #
}
);
}
);
};
mcch_config_per_mbsfn_area = (
{
mbsfn_area = 0;
pdcch_length = 1; #s1(0), s2(1)
repetition_period = 0; #rf32(0), rf64(1), rf128(2), rf256(3)
offset = 0;
modification_period = 0; #rf512(0; rf1024(1)
subframe_allocation_info = 32; #BITSTRING (6bits -> one frame) xx100000
mcs = 1; #n2(0), n7(1), n13(2), n19(3)
}
);
#); #end mbms_scheduling_info
}
);
MMEs = (
{
MME_ID = 0xe00;
MME_name = "MME-MBMS-Vicomtech-LTEBox";
//M3
enable_mme_m3 = "yes";
NETWORK_INTERFACES :
{
MME_INTERFACE_NAME_FOR_M3_MCE = "lo";
MME_IPV4_ADDRESS_FOR_M3C = "127.0.0.18/24";
MME_PORT_FOR_M3C = 36444; # Spec 36444
};
}
);
MACRLCs = (
{
num_cc = 1;
tr_s_preference = "local_L1";
tr_n_preference = "local_RRC";
}
);
L1s = (
{
num_cc = 1;
tr_n_preference = "local_mac";
}
);
RUs = (
{
local_if_name = "lo";
remote_address = "127.0.0.2";
local_address = "127.0.0.1";
local_portc = 50000;
remote_portc = 50000;
local_portd = 50001;
remote_portd = 50001;
local_rf = "no"
tr_preference = "udp_if4p5"
nb_tx = 2
nb_rx = 2
att_tx = 0
att_rx = 0;
eNB_instances = [0];
is_slave = "no";
}
);
THREAD_STRUCT = (
{
#three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
parallel_config = "PARALLEL_SINGLE_THREAD";
#two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
worker_config = "WORKER_ENABLE";
}
);
log_config = {
global_log_level ="info";
global_log_verbosity ="medium";
hw_log_level ="info";
hw_log_verbosity ="medium";
phy_log_level ="info";
phy_log_verbosity ="medium";
mac_log_level ="info";
mac_log_verbosity ="high";
rlc_log_level ="info";
rlc_log_verbosity ="medium";
pdcp_log_level ="info";
pdcp_log_verbosity ="medium";
rrc_log_level ="info";
rrc_log_verbosity ="medium";
};

View File

@@ -0,0 +1,243 @@
Active_eNBs = ( "eNB-Eurecom-LTEBox");
# Asn1_verbosity, choice in: none, info, annoying
Asn1_verbosity = "none";
eNBs =
(
{
////////// Identification parameters:
eNB_ID = 0xe00;
cell_type = "CELL_MACRO_ENB";
eNB_name = "eNB-Eurecom-LTEBox";
// Tracking area code, 0x0000 and 0xfffe are reserved values
tracking_area_code = 1;
plmn_list = ( { mcc = 208; mnc = 93; mnc_length = 2; } );
tr_s_preference = "local_mac"
////////// Physical parameters:
component_carriers = (
{
node_function = "3GPP_eNODEB";
node_timing = "synch_to_ext_device";
node_synch_ref = 0;
frame_type = "FDD";
tdd_config = 3;
tdd_config_s = 0;
prefix_type = "NORMAL";
eutra_band = 7;
downlink_frequency = 2685000000L;
uplink_frequency_offset = -120000000;
Nid_cell = 0;
N_RB_DL = 50;
Nid_cell_mbsfn = 0;
nb_antenna_ports = 1;
nb_antennas_tx = 1;
nb_antennas_rx = 1;
tx_gain = 90;
rx_gain = 125;
pbch_repetition = "FALSE";
prach_root = 0;
prach_config_index = 0;
prach_high_speed = "DISABLE";
prach_zero_correlation = 1;
prach_freq_offset = 2;
pucch_delta_shift = 1;
pucch_nRB_CQI = 0;
pucch_nCS_AN = 0;
pucch_n1_AN = 0;
pdsch_referenceSignalPower = -27;
pdsch_p_b = 0;
pusch_n_SB = 1;
pusch_enable64QAM = "DISABLE";
pusch_hoppingMode = "interSubFrame";
pusch_hoppingOffset = 0;
pusch_groupHoppingEnabled = "ENABLE";
pusch_groupAssignment = 0;
pusch_sequenceHoppingEnabled = "DISABLE";
pusch_nDMRS1 = 1;
phich_duration = "NORMAL";
phich_resource = "ONESIXTH";
srs_enable = "DISABLE";
/* srs_BandwidthConfig =;
srs_SubframeConfig =;
srs_ackNackST =;
srs_MaxUpPts =;*/
pusch_p0_Nominal = -96;
pusch_alpha = "AL1";
pucch_p0_Nominal = -104;
msg3_delta_Preamble = 6;
pucch_deltaF_Format1 = "deltaF2";
pucch_deltaF_Format1b = "deltaF3";
pucch_deltaF_Format2 = "deltaF0";
pucch_deltaF_Format2a = "deltaF0";
pucch_deltaF_Format2b = "deltaF0";
rach_numberOfRA_Preambles = 64;
rach_preamblesGroupAConfig = "DISABLE";
/*
rach_sizeOfRA_PreamblesGroupA = ;
rach_messageSizeGroupA = ;
rach_messagePowerOffsetGroupB = ;
*/
rach_powerRampingStep = 4;
rach_preambleInitialReceivedTargetPower = -108;
rach_preambleTransMax = 10;
rach_raResponseWindowSize = 10;
rach_macContentionResolutionTimer = 48;
rach_maxHARQ_Msg3Tx = 4;
pcch_default_PagingCycle = 128;
pcch_nB = "oneT";
bcch_modificationPeriodCoeff = 2;
ue_TimersAndConstants_t300 = 1000;
ue_TimersAndConstants_t301 = 1000;
ue_TimersAndConstants_t310 = 1000;
ue_TimersAndConstants_t311 = 10000;
ue_TimersAndConstants_n310 = 20;
ue_TimersAndConstants_n311 = 1;
ue_TransmissionMode = 1;
//Parameters for SIB18
rxPool_sc_CP_Len = "normal";
rxPool_sc_Period = "sf40";
rxPool_data_CP_Len = "normal";
rxPool_ResourceConfig_prb_Num = 20;
rxPool_ResourceConfig_prb_Start = 5;
rxPool_ResourceConfig_prb_End = 44;
rxPool_ResourceConfig_offsetIndicator_present = "prSmall";
rxPool_ResourceConfig_offsetIndicator_choice = 0;
rxPool_ResourceConfig_subframeBitmap_present = "prBs40";
rxPool_ResourceConfig_subframeBitmap_choice_bs_buf = "00000000000000000000";
rxPool_ResourceConfig_subframeBitmap_choice_bs_size = 5;
rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0;
/* rxPool_dataHoppingConfig_hoppingParameter = 0;
rxPool_dataHoppingConfig_numSubbands = "ns1";
rxPool_dataHoppingConfig_rbOffset = 0;
rxPool_commTxResourceUC-ReqAllowed = "TRUE";
*/
// Parameters for SIB19
discRxPool_cp_Len = "normal"
discRxPool_discPeriod = "rf32"
discRxPool_numRetx = 1;
discRxPool_numRepetition = 2;
discRxPool_ResourceConfig_prb_Num = 5;
discRxPool_ResourceConfig_prb_Start = 3;
discRxPool_ResourceConfig_prb_End = 21;
discRxPool_ResourceConfig_offsetIndicator_present = "prSmall";
discRxPool_ResourceConfig_offsetIndicator_choice = 0;
discRxPool_ResourceConfig_subframeBitmap_present = "prBs40";
discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf = "f0ffffffff";
discRxPool_ResourceConfig_subframeBitmap_choice_bs_size = 5;
discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0;
}
);
srb1_parameters :
{
# timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
timer_poll_retransmit = 80;
# timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
timer_reordering = 35;
# timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
timer_status_prohibit = 0;
# poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
poll_pdu = 4;
# poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
poll_byte = 99999;
# max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
max_retx_threshold = 4;
}
# ------- SCTP definitions
SCTP :
{
# Number of streams to use in input/output
SCTP_INSTREAMS = 2;
SCTP_OUTSTREAMS = 2;
};
////////// MME parameters:
mme_ip_address = ( { ipv4 = "CI_MME_IP_ADDR";
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
enable_measurement_reports = "no";
///X2
enable_x2 = "no";
t_reloc_prep = 1000; /* unit: millisecond */
tx2_reloc_overall = 2000; /* unit: millisecond */
NETWORK_INTERFACES :
{
ENB_INTERFACE_NAME_FOR_S1_MME = "ens3";
ENB_IPV4_ADDRESS_FOR_S1_MME = "CI_ENB_IP_ADDR";
ENB_INTERFACE_NAME_FOR_S1U = "ens3";
ENB_IPV4_ADDRESS_FOR_S1U = "CI_ENB_IP_ADDR";
ENB_PORT_FOR_S1U = 2152; # Spec 2152
ENB_IPV4_ADDRESS_FOR_X2C = "CI_ENB_IP_ADDR";
ENB_PORT_FOR_X2C = 36422; # Spec 36422
};
}
);
MACRLCs = (
{
num_cc = 1;
local_s_if_name = "ens3";
remote_s_address = "CI_UE_IP_ADDR";
local_s_address = "CI_ENB_IP_ADDR";
local_s_portc = 50001;
remote_s_portc = 50000;
local_s_portd = 50011;
remote_s_portd = 50010;
tr_s_preference = "nfapi";
tr_n_preference = "local_RRC";
}
);
THREAD_STRUCT = (
{
#three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
parallel_config = "PARALLEL_RU_L1_SPLIT";
#two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
worker_config = "WORKER_ENABLE";
}
);
log_config =
{
global_log_level ="info";
global_log_verbosity ="medium";
hw_log_level ="info";
hw_log_verbosity ="medium";
phy_log_level ="info";
phy_log_verbosity ="medium";
mac_log_level ="info";
mac_log_verbosity ="high";
rlc_log_level ="info";
rlc_log_verbosity ="medium";
pdcp_log_level ="info";
pdcp_log_verbosity ="medium";
rrc_log_level ="info";
rrc_log_verbosity ="medium";
};

View File

@@ -0,0 +1,47 @@
RUs = (
{
local_if_name = "enp1s0";
remote_address = "CI_RCC_IP_ADDR";
local_address = "CI_ENB_IP_ADDR";
local_portc = 50002;
remote_portc = 50002;
local_portd = 50003;
remote_portd = 50003;
local_rf = "yes"
tr_preference = "udp_if4p5";
nb_tx = 1;
nb_rx = 1;
max_pdschReferenceSignalPower = -12;
max_rxgain = 100;
bands = [38];
is_slave = "no";
ota_sync_enabled = "yes";
}
);
THREAD_STRUCT = (
{
#three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
parallel_config = "PARALLEL_SINGLE_THREAD";
#two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
worker_config = "WORKER_ENABLE";
}
);
log_config = {
global_log_level ="info";
global_log_verbosity ="medium";
hw_log_level ="info";
hw_log_verbosity ="medium";
phy_log_level ="info";
phy_log_verbosity ="medium";
mac_log_level ="info";
mac_log_verbosity ="high";
rlc_log_level ="info";
rlc_log_verbosity ="medium";
pdcp_log_level ="info";
pdcp_log_verbosity ="medium";
rrc_log_level ="info";
rrc_log_verbosity ="medium";
};

View File

@@ -0,0 +1,47 @@
RUs = (
{
local_if_name = "enp1s0";
remote_address = "CI_RCC_IP_ADDR";
local_address = "CI_ENB_IP_ADDR";
local_portc = 50010;
remote_portc = 50010;
local_portd = 50011;
remote_portd = 50011;
local_rf = "yes"
tr_preference = "udp_if4p5";
nb_tx = 1;
nb_rx = 1;
max_pdschReferenceSignalPower = -12;
max_rxgain = 100;
bands = [38];
is_slave = "yes";
ota_sync_enabled = "yes";
}
);
THREAD_STRUCT = (
{
#three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
parallel_config = "PARALLEL_SINGLE_THREAD";
#two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
worker_config = "WORKER_ENABLE";
}
);
log_config = {
global_log_level ="info";
global_log_verbosity ="medium";
hw_log_level ="info";
hw_log_verbosity ="medium";
phy_log_level ="info";
phy_log_verbosity ="medium";
mac_log_level ="info";
mac_log_verbosity ="high";
rlc_log_level ="info";
rlc_log_verbosity ="medium";
pdcp_log_level ="info";
pdcp_log_verbosity ="medium";
rrc_log_level ="info";
rrc_log_verbosity ="medium";
};

View File

@@ -20,7 +20,7 @@ RUs = (
THREAD_STRUCT = (
{
#three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
parallel_config = "PARALLEL_RU_L1_TRX_SPLIT";
parallel_config = "PARALLEL_SINGLE_THREAD";
#two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
worker_config = "WORKER_ENABLE";
}
@@ -42,4 +42,3 @@ log_config = {
rrc_log_level ="error";
rrc_log_verbosity ="medium";
};

View File

@@ -20,7 +20,7 @@ RUs = (
THREAD_STRUCT = (
{
#three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
parallel_config = "PARALLEL_RU_L1_TRX_SPLIT";
parallel_config = "PARALLEL_SINGLE_THREAD";
#two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
worker_config = "WORKER_ENABLE";
}
@@ -42,4 +42,3 @@ log_config = {
rrc_log_level ="error";
rrc_log_verbosity ="medium";
};

View File

@@ -0,0 +1,44 @@
log_config = {
global_log_level ="info";
global_log_verbosity ="medium";
hw_log_level ="info";
hw_log_verbosity ="medium";
phy_log_level ="info";
phy_log_verbosity ="medium";
mac_log_level ="info";
mac_log_verbosity ="medium";
rlc_log_level ="info";
rlc_log_verbosity ="medium";
pdcp_log_level ="info";
pdcp_log_verbosity ="medium";
rrc_log_level ="info";
rrc_log_verbosity ="full";
};
L1s = (
{
num_cc = 1;
tr_n_preference = "nfapi";
local_n_if_name = "ens3";
remote_n_address = "CI_ENB_IP_ADDR";
local_n_address = "CI_UE_IP_ADDR";
local_n_portc = 50000;
remote_n_portc = 50001;
local_n_portd = 50010;
remote_n_portd = 50011;
}
);
RUs = (
{
local_rf = "yes"
nb_tx = 1
nb_rx = 1
att_tx = 90
att_rx = 0;
bands = [7,38,42,43];
max_pdschReferenceSignalPower = -27;
max_rxgain = 125;
}
);

View File

@@ -0,0 +1,101 @@
// *INDENT-OFF* cppcheck doesn't like "astyling" this file!!!!
// /*
// * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
// * contributor license agreements. See the NOTICE file distributed with
// * this work for additional information regarding copyright ownership.
// * The OpenAirInterface Software Alliance licenses this file to You under
// * the OAI Public License, Version 1.1 (the "License"); you may not use this file
// * except in compliance with the License.
// * You may obtain a copy of the License at
// *
// * http://www.openairinterface.org/?page_id=698
// *
// * Unless required by applicable law or agreed to in writing, software
// * distributed under the License is distributed on an "AS IS" BASIS,
// * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// * See the License for the specific language governing permissions and
// * limitations under the License.
// *-------------------------------------------------------------------------------
// * For more information about the OpenAirInterface (OAI) Software Alliance:
// * contact@openairinterface.org
// */
//*****************************************************************************
//*****************************************************************************
// section for "valid" memory leaks: the related functions are allocators and
// the caller is responsible of freeing the memory. cppcheck has a mechanism
// to check more accuretaly this, by defining callers responsible of freeing
// but tools like valgring might be more suitable
//
//-----------------------------------------------------------------------------
// suppress error about keysP memory leak, free must be done by calling func
memleak:common/utils/hashtable/obj_hashtable.c
//-----------------------------------------------------------------------------
// suppress error about keys memory leak, free must be done by calling func
memleak:openair2/UTIL/OMG/omg_hashtable.c
//-----------------------------------------------------------------------------
// suppress error about data memory leak. This is the buffer where
// _emm_as_encode function creates the encoded buffer
//
memleak:openair3/NAS/UE/EMM/SAP/emm_as.c
//-----------------------------------------------------------------------------
//*****************************************************************************
// section for files not used in oai exec's included in CI.
// Possibly candidates for removal otherwise should be documented and updated
// for project rules enforcement
// ----------------------------------------------------------------------------
// likely sources for test programs, maintained?
invalidPrintfArgType_sint:openair1/PHY/CODING/TESTBENCH/ltetest.c
memleak:openair1/PHY/CODING/TESTBENCH/ltetest.c
invalidPrintfArgType_sint:openair1/PHY/CODING/TESTBENCH/pdcch_test.c
//
//-----------------------------------------------------------------------------
// oaisim deprecated, remove?
doubleFree:openair3/TEST/oaisim_mme_list_benchmark.c
//
//-----------------------------------------------------------------------------
// is itti analyzer deprecated
nullPointer:common/utils/itti_analyzer/itti_analyzer.c
nullPointerRedundantCheck:common/utils/itti_analyzer/libbuffers/buffers.c
doubleFree:common/utils/itti_analyzer/libbuffers/socket.c
memleak:common/utils/itti_analyzer/libbuffers/socket.c
memleak:common/utils/itti_analyzer/libparser/array_type.c
memleak:common/utils/itti_analyzer/libui/ui_callbacks.c
//-----------------------------------------------------------------------------
// obviously never even compiled!!!
syntaxError:openair1/SIMULATION/LTE_PHY/dlsim_tm4.c
//-----------------------------------------------------------------------------
// omg, otg commented out in cmakelist to be cleaned up definitely?
arrayIndexOutOfBounds:openair2/UTIL/OMG/omg.c
uninitvar:openair2/UTIL/OTG/otg_rx_socket.c
//-----------------------------------------------------------------------------
// cppcheck is not able to understand that buf is initialized at the first
// iteration of the loop.
nullPointer:common/utils/T/local_tracer.c:243
//-----------------------------------------------------------------------------
// once again cppcheck does not understand that fds is initialized in the
// first iteration of the loop
nullPointer:common/utils/T/tracer/multi.c:264
nullPointer:common/utils/T/tracer/multi.c:265
//
//*****************************************************************************
//
// True problems we don't know how to fix, Suppression is commented out,
// as these kind of problem need either to be fixed or can be suppressed
// when fully uderstood
//-----------------------------------------------------------------------------
// the function [nv]fapi_pnf_p7_config_create should return
// _this. _this points to a structure and a dynamically allocated field is
// returned. cppcheck suspects _this will never be released, so do i
// memleak:nfapi/open-nFAPI/pnf/src/pnf_p7_interface.c
// memleak:nfapi/open-nFAPI/vnf/src/vnf_p7_interface.c
//-----------------------------------------------------------------------------
// may be security_data->kenb.value is released from calling functions. But even
// when, for test, freeing it before returning from emm_proc_security_mode_command
// which does the allocation, cppcheck complains. So something might be wrong...
// memleak:openair3/NAS/UE/EMM/SecurityModeControl.c
//-----------------------------------------------------------------------------
// when used, nobody but the original developer can guess if sn_data_cnf is set or not
// cppcheck found that in some cases it is not, code needs cleanup before fixing that...
// uninitvar:openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_status_report.c
//*****************************************************************************
// *INDENT-ON*

View File

@@ -20,20 +20,20 @@
# * contact@openairinterface.org
# */
function usage {
echo "OAI VM Creation script"
function create_usage {
echo "OAI CI VM script"
echo " Original Author: Raphael Defosseux"
echo " Requirements:"
echo " -- uvtool uvtool-libvirt apt-cacher"
echo " -- xenial image already synced"
echo " -- $VM_OSREL image already synced"
echo " Default:"
echo " -- eNB with USRP"
echo ""
echo "Usage:"
echo "------"
echo " createVM.sh [OPTIONS]"
echo " oai-ci-vm-tool create [OPTIONS]"
echo ""
echo "Options:"
echo "Mandatory Options:"
echo "--------"
echo " --job-name #### OR -jn ####"
echo " Specify the name of the Jenkins job."
@@ -41,12 +41,7 @@ function usage {
echo " --build-id #### OR -id ####"
echo " Specify the build ID of the Jenkins job."
echo ""
echo " --variant enb-usrp OR -v1"
echo " --variant basic-sim OR -v2"
echo " --variant phy-sim OR -v3"
echo " --variant cppcheck OR -v4"
echo " --variant enb-ethernet OR -v7"
echo " --variant ue-ethernet OR -v8"
variant_usage
echo " Specify the variant to build."
echo ""
echo " --help OR -h"
@@ -54,144 +49,53 @@ function usage {
echo ""
}
function variant_usage {
echo "OAI VM Build Check script"
echo " Original Author: Raphael Defosseux"
echo ""
echo " --variant enb-usrp OR -v1"
echo " --variant basic-sim OR -v2"
echo " --variant phy-sim OR -v3"
echo " --variant cppcheck OR -v4"
echo " --variant enb-ethernet OR -v7"
echo " --variant ue-ethernet OR -v8"
echo ""
function acquire_vm_create_lock {
local FlockFile="/tmp/vmclone.lck"
local unlocked="0"
touch ${FlockFile} 2>/dev/null
if [[ $? -ne 0 ]]
then
echo "Cannot access lock file ${FlockFile}"
exit 2
fi
while [ $unlocked -eq 0 ]
do
exec 5>${FlockFile}
flock -nx 5
if [[ $? -ne 0 ]]
then
echo "Another instance of VM creation is running"
sleep 10
else
unlocked="1"
fi
done
chmod 666 ${FlockFile} 2>/dev/null
}
if [ $# -lt 1 ] || [ $# -gt 6 ]
then
echo "Syntax Error: not the correct number of arguments"
echo ""
usage
exit 1
fi
function release_vm_create_lock {
local FlockFile="/tmp/vmclone.lck"
rm -Rf ${FlockFile}
}
VM_TEMPLATE=ci-
JOB_NAME=XX
BUILD_ID=XX
VM_NAME=ci-enb-usrp
VM_MEMORY=2048
VM_CPU=4
function create_vm {
echo "############################################################"
echo "OAI CI VM script"
echo "############################################################"
echo "VM_NAME = $VM_NAME"
echo "VM_MEMORY = $VM_MEMORY MBytes"
echo "VM_CPU = $VM_CPU"
echo "VM_DISK = $VM_DISK GBytes"
while [[ $# -gt 0 ]]
do
key="$1"
echo "############################################################"
echo "Creating VM ($VM_NAME) on Ubuntu Cloud Image base"
echo "############################################################"
acquire_vm_create_lock
uvt-kvm create $VM_NAME release=$VM_OSREL --memory $VM_MEMORY --cpu $VM_CPU --disk $VM_DISK --unsafe-caching --template ci-scripts/template-host.xml
echo "Waiting for VM to be started"
uvt-kvm wait $VM_NAME --insecure
case $key in
-h|--help)
shift
usage
exit 0
;;
-jn|--job-name)
JOB_NAME="$2"
shift
shift
;;
-id|--build-id)
BUILD_ID="$2"
shift
shift
;;
-v1)
VM_NAME=ci-enb-usrp
shift
;;
-v2)
VM_NAME=ci-basic-sim
VM_MEMORY=8192
shift
;;
-v3)
VM_NAME=ci-phy-sim
shift
;;
-v4)
VM_NAME=ci-cppcheck
VM_MEMORY=4096
VM_CPU=4
shift
;;
-v7)
VM_NAME=ci-enb-ethernet
shift
;;
-v8)
VM_NAME=ci-ue-ethernet
shift
;;
--variant)
variant="$2"
case $variant in
enb-usrp)
VM_NAME=ci-enb-usrp
;;
basic-sim)
VM_NAME=ci-basic-sim
VM_MEMORY=8192
;;
phy-sim)
VM_NAME=ci-phy-sim
;;
cppcheck)
VM_NAME=ci-cppcheck
VM_MEMORY=4096
VM_CPU=4
;;
enb-ethernet)
VM_NAME=ci-enb-ethernet
;;
ue-ethernet)
VM_NAME=ci-ue-ethernet
;;
*)
echo ""
echo "Syntax Error: Invalid Variant option -> $variant"
echo ""
variant_usage
exit 1
esac
shift
shift
;;
*)
echo "Syntax Error: unknown option: $key"
echo ""
usage
exit 1
esac
done
if [ "$JOB_NAME" == "XX" ] || [ "$BUILD_ID" == "XX" ]
then
VM_TEMPLATE=ci-
else
VM_TEMPLATE=${JOB_NAME}-b${BUILD_ID}-
fi
VM_NAME=`echo $VM_NAME | sed -e "s#ci-#$VM_TEMPLATE#"`
VM_CMDS=${VM_NAME}_cmds.txt
echo "VM_NAME = $VM_NAME"
echo "VM_MEMORY = $VM_MEMORY MBytes"
echo "VM_CPU = $VM_CPU"
echo "############################################################"
echo "Creating VM ($VM_NAME) on Ubuntu Cloud Image base"
echo "############################################################"
uvt-kvm create $VM_NAME release=xenial --memory $VM_MEMORY --cpu $VM_CPU --unsafe-caching --template ci-scripts/template-host.xml
echo "Waiting for VM to be started"
uvt-kvm wait $VM_NAME --insecure
VM_IP_ADDR=`uvt-kvm ip $VM_NAME`
echo "$VM_NAME has for IP addr = $VM_IP_ADDR"
exit 0
VM_IP_ADDR=`uvt-kvm ip $VM_NAME`
echo "$VM_NAME has for IP addr = $VM_IP_ADDR"
release_vm_create_lock
}

View File

@@ -20,82 +20,32 @@
# * contact@openairinterface.org
# */
function usage {
echo "OAI VM Destroy script"
function destroy_usage {
echo "OAI CI VM script"
echo " Original Author: Raphael Defosseux"
echo " Requirements:"
echo " -- uvtool uvtool-libvirt apt-cacher"
echo ""
echo "Usage:"
echo "------"
echo " destroyAllRunningVM.sh [OPTIONS]"
echo ""
echo "Options:"
echo "--------"
echo " --job-name #### OR -jn ####"
echo " Specify the name of the Jenkins job."
echo ""
echo " --build-id #### OR -id ####"
echo " Specify the build ID of the Jenkins job."
echo ""
echo " --help OR -h"
echo " Print this help message."
echo " oai-ci-vm-tool destroy [OPTIONS]"
echo ""
command_options_usage
}
if [ $# -gt 4 ]
then
echo "Syntax Error: not the correct number of arguments"
echo ""
usage
exit 1
fi
function destroy_vm {
echo "############################################################"
echo "OAI CI VM script"
echo "############################################################"
echo "VM_TEMPLATE = $VM_TEMPLATE"
VM_TEMPLATE=ci-
JOB_NAME=XX
BUILD_ID=XX
while [[ $# -gt 0 ]]
do
key="$1"
case $key in
-h|--help)
shift
usage
exit 0
;;
-jn|--job-name)
JOB_NAME="$2"
shift
shift
;;
-id|--build-id)
BUILD_ID="$2"
shift
shift
;;
*)
echo "Syntax Error: unknown option: $key"
echo ""
usage
exit 1
esac
done
if [ "$JOB_NAME" == "XX" ] || [ "$BUILD_ID" == "XX" ]
then
VM_TEMPLATE=ci-
else
VM_TEMPLATE=${JOB_NAME}-b${BUILD_ID}-
fi
LIST_CI_VM=`uvt-kvm list | grep $VM_TEMPLATE`
for CI_VM in $LIST_CI_VM
do
VM_IP_ADDR=`uvt-kvm ip $CI_VM`
echo "VM to destroy: $CI_VM -- IP $VM_IP_ADDR"
uvt-kvm destroy $CI_VM
ssh-keygen -R $VM_IP_ADDR
done
exit 0
LIST_CI_VM=`uvt-kvm list | grep $VM_TEMPLATE`
for CI_VM in $LIST_CI_VM
do
VM_IP_ADDR=`uvt-kvm ip $CI_VM`
echo "VM to destroy: $CI_VM -- IP $VM_IP_ADDR"
uvt-kvm destroy $CI_VM
ssh-keygen -R $VM_IP_ADDR
done
}

View File

@@ -1,4 +1,24 @@
#!/bin/bash
#/*
# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
# * contributor license agreements. See the NOTICE file distributed with
# * this work for additional information regarding copyright ownership.
# * The OpenAirInterface Software Alliance licenses this file to You under
# * the OAI Public License, Version 1.1 (the "License"); you may not use this file
# * except in compliance with the License.
# * You may obtain a copy of the License at
# *
# * http://www.openairinterface.org/?page_id=698
# *
# * Unless required by applicable law or agreed to in writing, software
# * distributed under the License is distributed on an "AS IS" BASIS,
# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# * See the License for the specific language governing permissions and
# * limitations under the License.
# *-------------------------------------------------------------------------------
# * For more information about the OpenAirInterface (OAI) Software Alliance:
# * contact@openairinterface.org
# */
function usage {
echo "OAI GitLab merge request applying script"
@@ -83,6 +103,11 @@ esac
done
if [[ $TARGET_COMMIT_ID == "latest" ]]
then
TARGET_COMMIT_ID=`git log -n1 --pretty=format:%H origin/$TARGET_BRANCH`
fi
echo "Source Branch is : $SOURCE_BRANCH"
echo "Source Commit ID is : $SOURCE_COMMIT_ID"
echo "Target Branch is : $TARGET_BRANCH"
@@ -100,7 +125,17 @@ fi
git config user.email "jenkins@openairinterface.org"
git config user.name "OAI Jenkins"
git checkout -f $SOURCE_COMMIT_ID
git checkout -f $SOURCE_COMMIT_ID > checkout.txt 2>&1
STATUS=`egrep -c "fatal: reference is not a tree" checkout.txt`
rm -f checkout.txt
if [ $STATUS -ne 0 ]
then
echo "fatal: reference is not a tree --> $SOURCE_COMMIT_ID"
STATUS=-1
exit $STATUS
fi
git log -n1 --pretty=format:\"%s\" > .git/CI_COMMIT_MSG
git merge --ff $TARGET_COMMIT_ID -m "Temporary merge for CI"

View File

@@ -0,0 +1,31 @@
<table style="border-collapse: collapse; border: none;">
<tr style="border-collapse: collapse; border: none;">
<td style="border-collapse: collapse; border: none;">
<a href="http://www.openairinterface.org/">
<img src="../../doc/images/oai_final_logo.png" alt="" border=3 height=50 width=150>
</img>
</a>
</td>
<td style="border-collapse: collapse; border: none; vertical-align: center;">
<b><font size = "5">OAI CI Dev documentation</font></b>
</td>
</tr>
</table>
VM-based RF-Less Environment:
* [How to setup your test env](./vm_based_simulator_env.md)
* [How to deal with OAI source files](./vm_based_simulator_sources.md)
* [The main script](./vm_based_simulator_main_scripts.md)
* [How to create one or several VM instances](./vm_based_simulator_create.md)
* [How to build an OAI variant](./vm_based_simulator_build.md)
* [How the build is checked](./vm_based_simulator_check_build.md)
* [How to test an OAI variant](./vm_based_simulator_test.md)
* [How to destroy all VM instances](./vm_based_simulator_destroy.md)
Currently missing documentation:
* How to generate a build report
* How to generate a test report
---

View File

@@ -0,0 +1,264 @@
<table style="border-collapse: collapse; border: none;">
<tr style="border-collapse: collapse; border: none;">
<td style="border-collapse: collapse; border: none;">
<a href="http://www.openairinterface.org/">
<img src="../../doc/images/oai_final_logo.png" alt="" border=3 height=50 width=150>
</img>
</a>
</td>
<td style="border-collapse: collapse; border: none; vertical-align: center;">
<b><font size = "5">OAI CI Virtual-Machine-based Test Environment: build an OAI variant</font></b>
</td>
</tr>
</table>
## Table of Contents ##
1. [Introduction](#1-introduction)
2. [Detailed Description](#2-detailed-description)
3. [Typical Usage](#3-typical-usage)
# 1. Introduction #
```bash
$ cd /tmp/CI-raphael
$ ls *.zip
localZip.zip
$ ./ci-scripts/oai-ci-vm-tool build --help
OAI CI VM script
Original Author: Raphael Defosseux
Requirements:
-- uvtool uvtool-libvirt apt-cacher
-- xenial image already synced
Default:
-- eNB with USRP
Usage:
------
oai-ci-vm-tool build [OPTIONS]
Mandatory Options:
--------
--job-name #### OR -jn ####
Specify the name of the Jenkins job.
--build-id #### OR -id ####
Specify the build ID of the Jenkins job.
--workspace #### OR -ws ####
Specify the workspace.
Options:
--------
# OpenAirInterface Build Variants
--variant enb-usrp OR -v1 ( build and test )
--variant basic-sim OR -v2 ( build and test )
--variant phy-sim OR -v3 ( build and test )
--variant cppcheck OR -v4 ( build and test )
--variant gnb-usrp OR -v5 ( build and test )
--variant nr-ue-usrp OR -v6 ( build and test )
--variant enb-ethernet OR -v7 ( build and test )
--variant ue-ethernet OR -v8 ( build and test )
# non-OSA Build Variants
--variant flexran-rtc OR -v10 ( build and test non-OSA )
# OpenAirInterface Test Variants
--variant l1-sim OR -v20 ( test )
--variant rf-sim OR -v21 ( test )
--variant l2-sim OR -v22 ( test )
Specify the variant to build.
--keep-vm-alive OR -k
Keep the VM alive after the build.
--daemon OR -D
Run as daemon
--help OR -h
Print this help message.
```
# 2. Detailed Description #
Source file concerned: `ci-scripts/buildOnVM.sh`
## 2.1. build_on_vm function ##
* First check if the ZIP file is available and if the apt-cacher proxy configuration file is present. If not, it will stop.
* Check if the VM instance is alive. If not, create it.
* Once the VM is alive, retrieve the IP address with VM_IP_ADDR=`uvt-kvm ip $VM_NAME`
* We copy the ZIP file to the VM : `scp localZip.zip ubuntu@$VM_IP_ADDR:/home/ubuntu`
* apt-cacher proxy file: `scp etc/apt/apt.conf.d/01proxy ubuntu@$VM_IP_ADDR:/home/ubuntu`
Then we open a SSH session on the VM : `ssh ubuntu@$VM_IP_ADDR`
* We copy the apt-cacher proxy file to its destination space: `sudo cp 01proxy /etc/apt/apt.conf.d/`
* We create an hush login file to eliminate the ssh opening session messages.
* We unzip the ZIP file into `/home/ubuntu/tmp/` folder
* and we work from there.
# 3. Typical Usage #
## 3.1. Build in the foreground, check the results and destroy the VM at the end ##
```bash
$ cd /tmp/CI-raphael
$ ls *.zip
localZip.zip
$ ./ci-scripts/oai-ci-vm-tool build --workspace /tmp/CI-raphael --job-name RAN-CI-develop --build-id 47 --variant enb-usrp
############################################################
OAI CI VM script
############################################################
VM_NAME = RAN-CI-develop-b47-enb-usrp
VM_CMD_FILE = RAN-CI-develop-b47-enb-usrp_cmds.txt
JENKINS_WKSP = /var/jenkins/workspace/RAN-CI-develop
ARCHIVES_LOC = /var/jenkins/workspace/RAN-CI-develop/archives/enb_usrp
BUILD_OPTIONS = --eNB -w USRP --mu
VM_MEMORY = 2048 MBytes
VM_CPU = 4
############################################################
Creating VM (RAN-CI-develop-b47-enb-usrp) on Ubuntu Cloud Image base
############################################################
Waiting for VM to be started
Warning: Permanently added '192.168.122.2' (ECDSA) to the list of known hosts.
RAN-CI-develop-b47-enb-usrp has for IP addr = 192.168.122.2
############################################################
Copying GIT repo into VM (RAN-CI-develop-b47-enb-usrp)
############################################################
Warning: Permanently added '192.168.122.2' (ECDSA) to the list of known hosts.
############################################################
Running install and build script on VM (RAN-CI-develop-b47-enb-usrp)
############################################################
Welcome to Ubuntu 16.04.6 LTS (GNU/Linux 4.4.0-145-generic x86_64)
* Documentation: https://help.ubuntu.com
* Management: https://landscape.canonical.com
* Support: https://ubuntu.com/advantage
Get cloud support with Ubuntu Advantage Cloud Guest:
http://www.ubuntu.com/business/services/cloud
0 packages can be updated.
0 updates are security updates.
New release '18.04.2 LTS' available.
Run 'do-release-upgrade' to upgrade to it.
sudo apt-get --yes --quiet install zip subversion libboost-dev
unzip -qq -DD ../localZip.zip
cd /home/ubuntu/tmp
source oaienv
cd cmake_targets
./build_oai -I --eNB -w USRP --mu
# Here wait for a few minutes 8 to 12 minutes #
############################################################
Creating a tmp folder to store results and artifacts
############################################################
############################################################
Destroying VM
############################################################
# Host 192.168.122.2 found: line 19
/home/eurecom/.ssh/known_hosts updated.
Original contents retained as /home/eurecom/.ssh/known_hosts.old
############################################################
Checking build status
############################################################
STATUS seems OK
```
If you are adding the `-k` or `--keep-vm-alive` option, the VM instance will not be destroyed and you explore what happenned.
## 3.2. Build in the background ##
This is how it is done in the CI master job pipeline.
```bash
$ cd /tmp/CI-raphael
$ ls *.zip
localZip.zip
$ ./ci-scripts/oai-ci-vm-tool build --workspace /tmp/CI-raphael --job-name RAN-CI-develop --build-id 47 --variant phy-sim --daemon
12:44:24 ############################################################
12:44:24 OAI CI VM script
12:44:24 ############################################################
12:44:24 VM_NAME = RAN-CI-develop-b47-phy-sim
12:44:24 VM_CMD_FILE = RAN-CI-develop-b47-phy-sim_cmds.txt
12:44:24 JENKINS_WKSP = /var/jenkins/workspace/RAN-CI-develop
12:44:24 ARCHIVES_LOC = /var/jenkins/workspace/RAN-CI-develop/archives/phy_sim
12:44:24 BUILD_OPTIONS = --phy_simulators
12:44:24 VM_MEMORY = 2048 MBytes
12:44:24 VM_CPU = 4
12:44:24 ############################################################
12:44:24 Creating VM (RAN-CI-develop-b47-phy-sim) on Ubuntu Cloud Image base
12:44:24 ############################################################
12:44:27 Waiting for VM to be started
12:46:34 Warning: Permanently added '192.168.122.220' (ECDSA) to the list of known hosts.
12:46:34 RAN-CI-develop-b47-phy-sim has for IP addr = 192.168.122.220
12:46:34 ############################################################
12:46:34 Copying GIT repo into VM (RAN-CI-develop-b47-phy-sim)
12:46:34 ############################################################
12:46:34 Warning: Permanently added '192.168.122.220' (ECDSA) to the list of known hosts.
12:46:34 ############################################################
12:46:34 Running install and build script on VM (RAN-CI-develop-b47-phy-sim)
12:46:34 ############################################################
12:46:34 Welcome to Ubuntu 16.04.6 LTS (GNU/Linux 4.4.0-145-generic x86_64)
12:46:34
12:46:34 * Documentation: https://help.ubuntu.com
12:46:34 * Management: https://landscape.canonical.com
12:46:34 * Support: https://ubuntu.com/advantage
12:46:34
12:46:34 Get cloud support with Ubuntu Advantage Cloud Guest:
12:46:34 http://www.ubuntu.com/business/services/cloud
12:46:34
12:46:34 0 packages can be updated.
12:46:34 0 updates are security updates.
12:46:34
12:46:34 New release '18.04.2 LTS' available.
12:46:34 Run 'do-release-upgrade' to upgrade to it.
12:46:34
12:46:34
12:46:34 sudo apt-get --yes --quiet install zip daemon subversion libboost-dev
12:46:46 unzip -qq -DD ../localZip.zip
12:46:48 source oaienv
12:46:48 sudo -E daemon --inherit --unsafe --name=build_daemon --chdir=/home/ubuntu/tmp/cmake_targets -o /home/ubuntu/tmp/cmake_targets/log/install-build.txt ./my-vm-build.sh
12:46:48 STATUS seems OK
```
So here is 2.5 minutes, a VM was created, source files copied and the build process is started in the background.
```bash
$ cd /tmp/raphael
$ ./ci-scripts/oai-ci-vm-tool wait --workspace /var/jenkins/workspace/RAN-CI-develop --variant phy-sim --job-name RAN-CI-develop --build-id 47 --keep-vm-alive
12:49:14 ############################################################
12:49:14 OAI CI VM script
12:49:14 ############################################################
12:49:14 VM_NAME = RAN-CI-develop-b47-phy-sim
12:49:14 VM_CMD_FILE = RAN-CI-develop-b47-phy-sim_cmds.txt
12:49:14 JENKINS_WKSP = /var/jenkins/workspace/RAN-CI-develop
12:49:14 ARCHIVES_LOC = /var/jenkins/workspace/RAN-CI-develop/archives/phy_sim
12:49:14 BUILD_OPTIONS = --phy_simulators
12:49:15 Waiting for VM to be started
12:49:15 Warning: Permanently added '192.168.122.220' (ECDSA) to the list of known hosts.
12:49:16 RAN-CI-develop-b47-phy-sim has for IP addr = 192.168.122.220
12:49:16 ############################################################
12:49:16 Waiting build process to end on VM (RAN-CI-develop-b47-phy-sim)
12:49:16 ############################################################
12:49:16 ps -aux | grep build
12:54:23 ############################################################
12:54:23 Creating a tmp folder to store results and artifacts
12:54:23 ############################################################
12:54:23 ############################################################
12:54:23 Checking build status
12:54:23 ############################################################
12:54:23 STATUS seems OK
```
Here the `--keep-vm-alive` option is used to keep the VM alive and performs some testing.
---
Next step: [how the build is checked](./vm_based_simulator_check_build.md)
You can also go back to the [CI dev main page](./ci_dev_home.md)

View File

@@ -0,0 +1,45 @@
<table style="border-collapse: collapse; border: none;">
<tr style="border-collapse: collapse; border: none;">
<td style="border-collapse: collapse; border: none;">
<a href="http://www.openairinterface.org/">
<img src="../../doc/images/oai_final_logo.png" alt="" border=3 height=50 width=150>
</img>
</a>
</td>
<td style="border-collapse: collapse; border: none; vertical-align: center;">
<b><font size = "5">OAI CI Virtual-Machine-based Test Environment: checking the build result</font></b>
</td>
</tr>
</table>
## Table of Contents ##
1. [Introduction](#1-introduction)
2. [Detailed Description](#2-detailed-description)
# 1. Introduction #
Function is called:
- when building in foreground
- when waiting for the background build process is finished
# 2. Detailed Description #
Source file concerned: `ci-scripts/waitBuildOnVM.sh`
## 2.1. check_on_vm_build function ##
* Retrieve the build log files from the VM instance `ubuntu@$VM_IP_ADDR:/home/ubuntu/tmp/cmake_targets/log/*.txt`
* and copy them locally in the workspace at $ARCHIVES_LOC
* List all log files that match the pattern. Each should have
* the `Built target` pattern (the library/executable SHALL link)
* Evaluate the remaining space on VM disk
* The number of patterned log files SHALL match $NB_PATTERN_FILES defined in `ci-scripts/oai-ci-vm-tool` script for the variant
---
Next step: [how to test a function](./vm_based_simulator_test.md)
You can also go back to the [CI dev main page](./ci_dev_home.md)

View File

@@ -0,0 +1,113 @@
<table style="border-collapse: collapse; border: none;">
<tr style="border-collapse: collapse; border: none;">
<td style="border-collapse: collapse; border: none;">
<a href="http://www.openairinterface.org/">
<img src="../../doc/images/oai_final_logo.png" alt="" border=3 height=50 width=150>
</img>
</a>
</td>
<td style="border-collapse: collapse; border: none; vertical-align: center;">
<b><font size = "5">OAI CI Virtual-Machine-based Test Environment: create a VM instance</font></b>
</td>
</tr>
</table>
## Table of Contents ##
1. [Introduction](#1-introduction)
2. [Detailed Description](#2-detailed-description)
3. [Typical Usage](#3-typical-usage)
# 1. Introduction #
```bash
$ cd /tmp/CI-raphael
$ ./ci-scripts/oai-ci-vm-tool create --help
OAI CI VM script
Original Author: Raphael Defosseux
Requirements:
-- uvtool uvtool-libvirt apt-cacher
-- xenial image already synced
Default:
-- eNB with USRP
Usage:
------
oai-ci-vm-tool create [OPTIONS]
Mandatory Options:
--------
--job-name #### OR -jn ####
Specify the name of the Jenkins job.
--build-id #### OR -id ####
Specify the build ID of the Jenkins job.
# OpenAirInterface Build Variants
--variant enb-usrp OR -v1 ( build and test )
--variant basic-sim OR -v2 ( build and test )
--variant phy-sim OR -v3 ( build and test )
--variant cppcheck OR -v4 ( build and test )
--variant gnb-usrp OR -v5 ( build and test )
--variant nr-ue-usrp OR -v6 ( build and test )
--variant enb-ethernet OR -v7 ( build and test )
--variant ue-ethernet OR -v8 ( build and test )
# non-OSA Build Variants
--variant flexran-rtc OR -v10 ( build and test non-OSA )
# OpenAirInterface Test Variants
--variant l1-sim OR -v20 ( test )
--variant rf-sim OR -v21 ( test )
--variant l2-sim OR -v22 ( test )
Specify the variant to build.
--help OR -h
Print this help message.
```
# 2. Detailed Description #
Source file concerned: `ci-scripts/createVM.sh`
## 2.1. create_vm function ##
This is the function that is being called from the main oai-vm-tool script.
The main purpose is to start a VM instance:
```bash
uvt-kvm create $VM_NAME release=xenial --memory $VM_MEMORY --cpu $VM_CPU --disk $VM_DISK --unsafe-caching --template ci-scripts/template-host.xml
```
Variables are set in the main script based on the options.
`--unsafe-caching` option is used because our VM instances are throw-away's.
`--template ci-scripts/template-host.xml` is used to duplicate the CPU properties to the VM instance. **VERY IMPORTANT to build OAI**
## 2.2. Lock / Unlock functions ##
There are `acquire_vm_create_lock` and `release_vm_create_lock` functions.
Creating Virtual Machines instances in parallel **creates a lot of stress** on the host server HW. If you launch creations in parallel (Jenkins pipeline could do it) or you are several people working on the same host server, this mechanism atomizes the creation process and wait until the previous VM creation is finished.
# 3. Typical Usage #
```bash
$ cd /tmp/CI-raphael
$ ./ci-scripts/oai-ci-vm-tool create --job-name raphael --build-id 1 --variant phy-sim
# or a more **unique approach**
$ ./ci-scripts/oai-ci-vm-tool create -jn toto -id 1 -v2
```
The Jenkins pipeline uses the master job name as `job-name` option and the job-build ID.
Try to be unique if you are several developers working on the same host server.
Finally, typically I never use the `create` command. I use directly the build command that checks if VM is created and if not, will create it. See next step.
---
Next step: [how to build an OAI variant](./vm_based_simulator_build.md)
You can also go back to the [CI dev main page](./ci_dev_home.md)

View File

@@ -0,0 +1,71 @@
<table style="border-collapse: collapse; border: none;">
<tr style="border-collapse: collapse; border: none;">
<td style="border-collapse: collapse; border: none;">
<a href="http://www.openairinterface.org/">
<img src="../../doc/images/oai_final_logo.png" alt="" border=3 height=50 width=150>
</img>
</a>
</td>
<td style="border-collapse: collapse; border: none; vertical-align: center;">
<b><font size = "5">OAI CI Virtual-Machine-based Test Environment: Properly Destroy all VM instances</font></b>
</td>
</tr>
</table>
## Table of Contents ##
1. [Introduction](#1-introduction)
2. [Detailed Description](#2-detailed-description)
3. [Typical Usage](#3-typical-usage)
# 1. Introduction #
```bash
$ cd /tmp/CI-raphael
$ ./ci-scripts/oai-ci-vm-tool destroy --help
OAI CI VM script
Original Author: Raphael Defosseux
Requirements:
-- uvtool uvtool-libvirt apt-cacher
Usage:
------
oai-ci-vm-tool destroy [OPTIONS]
Mandatory Options:
--------
--job-name #### OR -jn ####
Specify the name of the Jenkins job.
--build-id #### OR -id ####
Specify the build ID of the Jenkins job.
Options:
--------
--help OR -h
Print this help message.
```
# 2. Detailed Description #
Source file concerned: `ci-scripts/destroyAllRunningVM.sh`
## 2.1. destroy_vm function ##
This is the function that is being called from the main oai-vm-tool script.
The main purpose is to destroy all VM instances whose name matches a pattern.
It also cleans up the `.ssh/known_hosts` file.
# 3. Typical Usage #
```bash
$ cd /tmp/CI-raphael
$ ./ci-scripts/oai-ci-vm-tool destroy --job-name raphael --build-id 1
```
---
You can go back to the [CI dev main page](./ci_dev_home.md)

View File

@@ -0,0 +1,123 @@
<table style="border-collapse: collapse; border: none;">
<tr style="border-collapse: collapse; border: none;">
<td style="border-collapse: collapse; border: none;">
<a href="http://www.openairinterface.org/">
<img src="../../doc/images/oai_final_logo.png" alt="" border=3 height=50 width=150>
</img>
</a>
</td>
<td style="border-collapse: collapse; border: none; vertical-align: center;">
<b><font size = "5">OAI CI Virtual-Machine-based Simulator Test Environment</font></b>
</td>
</tr>
</table>
## Table of Contents ##
1. [Introduction](#1-introduction)
2. [Prerequisites](#2-prerequisites)
1. [uvtool installation](#21-uvtool-installation)
2. [apt-cacher-server installation](#22-apt-cacher-server-installation)
# 1. Introduction #
This document explains how the master pipeline works and how any developer could contribute to add testing.
It is an extension to the wiki [page](https://gitlab.eurecom.fr/oai/openairinterface5g/wikis/ci/enb-master-job).
The purpose of this master pipeline is to:
* Validate that a Merge Request is mergeable
* Validate that a Merge Request is following coding guidelines
* Validate that a Merge Request is not breaking any typical build variant
* Validate that a Merge Request is not breaking any legacy simulator-based test
We will mainly focused on the 2 last items.
Last point, this documentation is valid for all CI-supported branches:
* `master`
* `develop`
* `develop-nr`
But the feature set may not be aligned. **The principles still apply.**
# 2. Prerequisites #
Some details are available on this wiki [section](https://gitlab.eurecom.fr/oai/openairinterface5g/wikis/ci/enb-ci-architecture#22-pipeline-executor).
Currently we have a host server (`bellatrix`) with the current parameters:
* 40 x Intel(R) Xeon(R) CPU E5-2640 v4 @ 2.40GHz
* 64 Gbytes RAM
* Ubuntu 16.04.3 LTS (xenial)
For you to replicate this environment, you need a strong server:
* At least 16 cores
* Ubuntu 16 (xenial) or higher (such as bionic, not tested)
Also we are using a Virtual Machine (VM for the rest of document) based strategy for the moment.
So you need to install 2 tools:
* uvt-kvm
* apt-cacher
We are planning to also add:
* A Red Hat Linux Entreprise 7.6 host environment
* A Container-based strategy (such as Docket and Kubernetes)
## 2.1. uvtool installation ##
```bash
$ sudo apt-get install uvtool
# if you don't have already, create an ssh key
$ ssh-keygen -b 2048
# retrieve an image
$ sudo uvt-simplestreams-libvirt sync arch=amd64 release=xenial
# we might soon switch to an Ubuntu 18.04 version
$ sudo uvt-simplestreams-libvirt sync arch=amd64 release=bionic
$ uvt-simplestreams-libvirt query
release=bionic arch=amd64 label=release (20190402)
release=xenial arch=amd64 label=release (20190406)
```
On our server, I don't update (sync) that often (every 2-4 months).
For more details:
* uvtool syntax is [here](http://manpages.ubuntu.com/manpages/trusty/man1/uvt-kvm.1.html)
* more readable tutorial is [here](https://help.ubuntu.com/lts/serverguide/cloud-images-and-uvtool.html)
## 2.2. apt-cacher-server installation ##
I recommend to follow to the letter this [tutorial](https://help.ubuntu.com/community/Apt-Cacher-Server).
The reason: we are creating/using/destroying a lot of VM instances and we are always installing the same packages.
This service allows to cache on the host and, doing so, **decreases the pressure on your internet bandwith usage**.
It also optimizes time at build stage.
```bash
$ sudo apt-get install apt-cacher apache2
$ sudo vi /etc/default/apt-cache
$ sudo service apache2 restart
# Server configuration
$ sudo vi /etc/apt-cacher/apt-cacher.conf
--> allowed_hosts = *
--> fix the installer_files_regexp
$ sudo vi /etc/apt/apt.conf.d/01proxy
--> add `Acquire::http::Proxy "http://<IP address or hostname of the apt-cacher server>:3142";`
$ sudo service apt-cacher restart
```
This last file (/etc/apt/apt.conf.d/01proxy) is very important since it is tested in any CI script.
---
We can now switch to the next step: [how to deal with oai sources](./vm_based_simulator_sources.md)
You can also go back to the [CI dev main page](./ci_dev_home.md)

View File

@@ -0,0 +1,196 @@
<table style="border-collapse: collapse; border: none;">
<tr style="border-collapse: collapse; border: none;">
<td style="border-collapse: collapse; border: none;">
<a href="http://www.openairinterface.org/">
<img src="../../doc/images/oai_final_logo.png" alt="" border=3 height=50 width=150>
</img>
</a>
</td>
<td style="border-collapse: collapse; border: none; vertical-align: center;">
<b><font size = "5">OAI CI Virtual-Machine-based Test Environment: the Main Script</font></b>
</td>
</tr>
</table>
## Table of Contents ##
1. [Introduction](#1-introduction)
2. [Sub BASH scripts](#2-sub-bash-scripts)
3. [Main script features](#3-main-script-features)
# 1. Introduction #
The file name is `./ci-scripts/oai-ci-vm-tool` from the workspace root.
```bash
$ cd /tmp/CI-raphael
$ ./ci-scripts/oai-ci-vm-tool --help
OAI CI VM script
Original Author: Raphael Defosseux
Requirements:
-- uvtool uvtool-libvirt apt-cacher
-- xenial image already synced
Usage:
------
oai-ci-vm-tool (-h|--help) {create,destroy,build,wait,test,report-build,report-test} ...
```
This is a **BASH** script.
# 2. Sub BASH scripts #
The main script is including a bunch of sub BASH scripts.
* ci-scripts/createVM.sh
* ci-scripts/buildOnVM.sh
* ci-scripts/waitBuildOnVM.sh
* ci-scripts/destroyAllRunningVM.sh
* ci-scripts/runTestOnVM.sh
* ci-scripts/reportBuildLocally.sh
* ci-scripts/reportTestLocally.sh
**NOTE: ci-scripts/runTestOnVM.sh is getting big and will certainly be split to facilitate maintenance. Start functions will be also factorized.**
# 3. Main script features #
The main purpose of the main script is decipher the options and launch the requested function.
It is also **testing if uvtool and apt-cacher are installed.**
It finally provides parameters to the requested functions. Parameter definition is centralized there.
For example:
for VM instance creation:
* the instance name: VM_NAME
* the RAM and number of CPUs: VM_MEMORY, VM_CPU
for OAI variant build:
* build options: BUILD_OPTIONS
* build log file to parse: LOG_PATTERN
* the number of log files to parse: NB_PATTERN_FILES
You can get the list of variant specific variables specifying the variant argument when asking for help:
``` bash
./ci-scripts/oai-ci-vm-tool help variant
--variant flexran-rtc OR -v10 ( build and test non-OSA )
VM_NAME=ci-flexran-rtc ARCHIVES_LOC=flexran
VM_MEMORY=2048 VM_CPU=4
NB_PATTERN_FILES=1 BUILD_OPTIONS="cmake . && make -j2"
LOG_PATTERN=.Rel15.txt
--variant enb-usrp OR -v1 ( build and test )
VM_NAME=ci-enb-usrp ARCHIVES_LOC=enb_usrp
VM_MEMORY=2048 VM_CPU=4
NB_PATTERN_FILES=9 BUILD_OPTIONS="--eNB -w USRP --mu"
LOG_PATTERN=.Rel15.txt
--variant l1-sim OR -v20 ( test )
VM_NAME=ci-l1-sim ARCHIVES_LOC=l1_sim
VM_MEMORY=2048 VM_CPU=4
NB_PATTERN_FILES=9 BUILD_OPTIONS=""
LOG_PATTERN=.Rel15.txt
--variant rf-sim OR -v21 ( test )
VM_NAME=ci-rf-sim ARCHIVES_LOC=rf_sim
VM_MEMORY=2048 VM_CPU=4
NB_PATTERN_FILES=9 BUILD_OPTIONS=""
LOG_PATTERN=.Rel15.txt
--variant l2-sim OR -v22 ( test )
VM_NAME=ci-l2-sim ARCHIVES_LOC=l2_sim
VM_MEMORY=2048 VM_CPU=4
NB_PATTERN_FILES=9 BUILD_OPTIONS=""
LOG_PATTERN=.Rel15.txt
--variant basic-sim OR -v2 ( build and test )
VM_NAME=ci-basic-sim ARCHIVES_LOC=basic_sim
VM_MEMORY=8192 VM_CPU=4
NB_PATTERN_FILES=13 BUILD_OPTIONS="--eNB --UE"
LOG_PATTERN=.Rel15.txt
--variant phy-sim OR -v3 ( build and test )
VM_NAME=ci-phy-sim ARCHIVES_LOC=phy_sim
VM_MEMORY=2048 VM_CPU=4
NB_PATTERN_FILES=3 BUILD_OPTIONS="--phy_simulators"
LOG_PATTERN=.Rel15.txt
--variant cppcheck OR -v4 ( build and test )
VM_NAME=ci-cppcheck ARCHIVES_LOC=cppcheck
VM_MEMORY=4096 VM_CPU=4
NB_PATTERN_FILES=1 BUILD_OPTIONS="--enable=warning --force --xml --xml-version=2 --suppressions-list=ci-scripts/cppcheck_suppressions.list -I common/utils -j4"
LOG_PATTERN=cppcheck.xml
--variant enb-ethernet OR -v7 ( build and test )
VM_NAME=ci-enb-ethernet ARCHIVES_LOC=enb_eth
VM_MEMORY=4096 VM_CPU=4
NB_PATTERN_FILES=8 BUILD_OPTIONS="--eNB"
LOG_PATTERN=.Rel15.txt
--variant ue-ethernet OR -v8 ( build and test )
VM_NAME=ci-ue-ethernet ARCHIVES_LOC=ue_eth
VM_MEMORY=4096 VM_CPU=4
NB_PATTERN_FILES=12 BUILD_OPTIONS="--UE"
LOG_PATTERN=.Rel15.txt
```
To define a new variant you just need to define a function which name conforms to `function variant__v<n>__<variant_name>` where n and variant_name will respectively define the short and long options for your variant. The function only needs to define the variant dependent variables. For many variables, default values are set in the `check_set_variant` function. When a variant doesn't define the BUILD_OPTIONS variable it cannot be used for the `build` `wait` and `create` commands.
The main scripts also allows the definition of non variant-dependant variable via the `--setvar_<variable name> <variable value>` options.
You can get the list of these variables by using `help setvar`:
```BASH
./ci-scripts/oai-ci-vm-tool help setvar
--setvar_<varname> <value> where varname is one of:
VM_OSREL : OS release to use in virtual machines
RUN_EXPERIMENTAL : Enforce execution of variants with EXPERIMENTAL variable set to "true"
```
To add a new non-variant dependant variable you need:
* Add an item to the `AUTHORIZED_VAR` array
* In the `setvar_usage`function, add your help string in the HELP_VAR["<your variable name>"] variable.
* Write the bash code for your variable.
Example of non variant dependent usage:
``` bash
./ci-scripts/oai-ci-vm-tool test -v21 -ws /usr/local/oai/enhance_CI_extEPC/openairinterface5g -id 1 -jn testci
Currently testci-b1-rf-sim Testing is not implemented / enabled
Comment out these lines in ./ci-scripts/oai-ci-vm-tool if you want to run it
or use option --setvar_RUN_EXPERIMENTAL=true to test it
./ci-scripts/oai-ci-vm-tool test -v21 -ws /usr/local/oai/enhance_CI_extEPC/openairinterface5g -id 1 -jn testci --setvar_RUN_EXPERIMENTAL true
Setting RUN_EXPERIMENTAL to true...
############################################################
OAI CI VM script
############################################################
ENB_VM_NAME = testci-b1-enb-ethernet
ENB_VM_CMD_FILE = testci-b1-enb-ethernet_cmds.txt
UE_VM_NAME = testci-b1-ue-ethernet
UE_VM_CMD_FILE = testci-b1-ue-ethernet_cmds.txt
JENKINS_WKSP = /usr/local/oai/enhance_CI_extEPC/openairinterface5g
ARCHIVES_LOC = /usr/local/oai/enhance_CI_extEPC/openairinterface5g/archives/rf_sim/test
############################################################
Waiting for ENB VM to be started
...........................
```
In the same way, you can set the variable `VM_OSREL` to run the test in virtual machines of the specified OS release:
``` bash
./ci-scripts/oai-ci-vm-tool test -v21 -ws /usr/local/oai/enhance_CI_extEPC/openairinterface5g -id 1 -jn testci --setvar_VM_OSREL bionic
```
---
Next step: [how to create one or several VM instances](./vm_based_simulator_create.md)
You can also go back to the [CI dev main page](./ci_dev_home.md)

View File

@@ -0,0 +1,85 @@
<table style="border-collapse: collapse; border: none;">
<tr style="border-collapse: collapse; border: none;">
<td style="border-collapse: collapse; border: none;">
<a href="http://www.openairinterface.org/">
<img src="../../doc/images/oai_final_logo.png" alt="" border=3 height=50 width=150>
</img>
</a>
</td>
<td style="border-collapse: collapse; border: none; vertical-align: center;">
<b><font size = "5">OAI CI Virtual-Machine-based Simulator OAI source management</font></b>
</td>
</tr>
</table>
## Table of Contents ##
1. [Introduction](#1-introduction)
2. [Centralized Workspace](#2-centralized-workspace)
3. [Create the ZIP file](#3-create-the-zip-file)
# 1. Introduction #
The idea of this section is to optimize/uniform source management for several VM instances.
If we were cloning the same repository in each VM we are creating, we would put so much pressure on the central GitLab repository.
The solution:
* clone/fetch on a given clean workspace and tar/zip only the source files without any artifacts.
* we then copy the tar/zip file to each VM instance
* and within each VM instance, unzip
# 2. Centralized Workspace #
You can create a brand new workspace by cloning:
```bash
$ mkdir /tmp/CI-raphael
$ cd /tmp/CI-raphael
$ git clone https://gitlab.eurecom.fr/oai/openairinterface5g.git .
$ git checkout develop
```
You can also use your current cloned workspace and any `develop`-based branch.
```bash
$ cd /home/raphael/openairinterface5g
$ git fetch
$ git checkout develop-improved-documentation
# CAUTION: the following command will remove any file that has not already been added to GIT
$ sudo git clean -x -d -ff
$ git status
On branch develop-improved-documentation
Your branch is up-to-date with 'origin/develop-improved-documentation'.
nothing to commit, working directory clean
```
You can also have modified files.
**The main point is to have NO ARTIFACTS from a previous build in your workspace.**
Last point, the workspace folder name is not necesseraly `openairinterface5g`. But all the following commands will be run for the root of the workspace.
For clarity, I will always use `/tmp/CI-raphael` as $WORKSPACE.
# 3. Create the ZIP file #
```bash
# go to root of workspace
$ cd /tmp/CI-raphael
$ zip -r -qq localZip.zip .
```
The **Jenkins Pipeline** performs automatically these operations.
In addition, in case of a merge request, it tries to merge with the target branch and might create a dummy local commit.
See [section](https://gitlab.eurecom.fr/oai/openairinterface5g/wikis/ci/enb-master-job#32-verify-guidelines-stage)
---
Next step: [the main scripts](./vm_based_simulator_main_scripts.md)
You can also go back to the [CI dev main page](./ci_dev_home.md)

View File

@@ -0,0 +1,262 @@
<table style="border-collapse: collapse; border: none;">
<tr style="border-collapse: collapse; border: none;">
<td style="border-collapse: collapse; border: none;">
<a href="http://www.openairinterface.org/">
<img src="../../doc/images/oai_final_logo.png" alt="" border=3 height=50 width=150>
</img>
</a>
</td>
<td style="border-collapse: collapse; border: none; vertical-align: center;">
<b><font size = "5">OAI CI Virtual-Machine-based Test Environment: Testing an OAI variant</font></b>
</td>
</tr>
</table>
## Table of Contents ##
1. [Introduction](#1-introduction)
2. [Detailed Description](#2-detailed-description)
3. [Typical Usage](#3-typical-usage)
1. [Testing the physical simulators](#31-testing-the-physicals-simulators)
2. [Testing the basic simulator](#32-testing-the-basic-simulator)
3. [Testing the RF simulator](#33-testing-the-rf-simulator)
4. [Testing the L2-nFAPI simulator](#33-testing-the-l2-nfapi-simulator)
# 1. Introduction #
Currently 2 build variants can be directly tested:
* Physical Simulators
* Basic Simulator
In addition, 2 build variants are used:
* OAI eNB with ETHERNET transport
* OAI UE with ETHERNET transport
for the following scenarios:
* L1 simulator w/ a channel simulator (NOT IMPLEMENTED)
* RF simulator : (IMPLEMENTED but not working as of 2019.w15)
* L2 nFAPI simulator
Tests are run sequentially in the Jenkins pipeline because:
* We want to mutualize the VM creation for an EPC
* We have seen performance issues when running in parallel.
```bash
./ci-scripts/oai-ci-vm-tool test --help
OAI CI VM script
Original Author: Raphael Defosseux
Requirements:
-- uvtool uvtool-libvirt apt-cacher
-- xenial image already synced
Default:
-- eNB with USRP
Usage:
------
oai-ci-vm-tool test [OPTIONS]
Options:
--------
--job-name #### OR -jn ####
Specify the name of the Jenkins job.
--build-id #### OR -id ####
Specify the build ID of the Jenkins job.
--workspace #### OR -ws ####
Specify the workspace.
# OpenAirInterface Build Variants
--variant enb-usrp OR -v1 ( build and test )
--variant basic-sim OR -v2 ( build and test )
--variant phy-sim OR -v3 ( build and test )
--variant cppcheck OR -v4 ( build and test )
--variant gnb-usrp OR -v5 ( build and test )
--variant nr-ue-usrp OR -v6 ( build and test )
--variant enb-ethernet OR -v7 ( build and test )
--variant ue-ethernet OR -v8 ( build and test )
# non-OSA Build Variants
--variant flexran-rtc OR -v10 ( build and test non-OSA )
# OpenAirInterface Test Variants
--variant l1-sim OR -v20 ( test )
--variant rf-sim OR -v21 ( test )
--variant l2-sim OR -v22 ( test )
Specify the variant to build.
--keep-vm-alive OR -k
Keep the VM alive after the build.
--help OR -h
Print this help message.
```
# 2. Detailed Description #
Source file concerned: `ci-scripts/run_test_on_vm.sh`
**TBD when file is re-structured.**
# 3. Typical Usage #
## 3.1. Testing the physical simulators ##
```bash
$ ./ci-scripts/oai-ci-vm-tool test --workspace /var/jenkins/workspace/RAN-CI-develop --variant phy-sim --job-name RAN-CI-develop --build-id 47
12:54:29 ############################################################
12:54:29 OAI CI VM script
12:54:29 ############################################################
12:54:29 VM_NAME = RAN-CI-develop-b47-phy-sim
12:54:29 VM_CMD_FILE = RAN-CI-develop-b47-phy-sim_cmds.txt
12:54:29 JENKINS_WKSP = /var/jenkins/workspace/RAN-CI-develop
12:54:29 ARCHIVES_LOC = /var/jenkins/workspace/RAN-CI-develop/archives/phy_sim/test
12:54:29 ############################################################
12:54:29 Waiting for VM to be started
12:54:29 ############################################################
12:54:29 Warning: Permanently added '192.168.122.220' (ECDSA) to the list of known hosts.
12:54:30 RAN-CI-develop-b47-phy-sim has for IP addr = 192.168.122.220
...
13:04:48 Test Results are written to /home/ubuntu/tmp/cmake_targets/autotests/log/results_autotests.xml
13:05:00 ############################################################
13:05:00 Creating a tmp folder to store results and artifacts
13:05:00 ############################################################
13:05:00 /var/jenkins/workspace/RAN-CI-develop/archives/phy_sim/test /var/jenkins/workspace/RAN-CI-develop
13:05:04 /var/jenkins/workspace/RAN-CI-develop
13:05:04 ############################################################
13:05:04 Destroying VM
13:05:04 ############################################################
13:05:06 # Host 192.168.122.220 found: line 21
13:05:06 /home/eurecom/.ssh/known_hosts updated.
13:05:06 Original contents retained as /home/eurecom/.ssh/known_hosts.old
13:05:06 ############################################################
13:05:06 Checking run status
13:05:06 ############################################################
13:05:06 NB_FOUND_FILES = 1
13:05:06 NB_RUNS = 20
13:05:06 NB_FAILURES = 0
13:05:06 STATUS seems OK
```
Note that the VM instance is destroyed. You do that when you are sure your test is passing.
## 3.2. Testing the basic simulator ##
```bash
$ ./ci-scripts/oai-ci-vm-tool test --workspace /var/jenkins/workspace/RAN-CI-develop --variant basic-sim --job-name RAN-CI-develop --build-id 48
15:11:13 ############################################################
15:11:13 OAI CI VM script
15:11:13 ############################################################
15:11:13 VM_NAME = RAN-CI-develop-b48-basic-sim
15:11:13 VM_CMD_FILE = RAN-CI-develop-b48-basic-sim_cmds.txt
15:11:13 JENKINS_WKSP = /var/jenkins/workspace/RAN-CI-develop
15:11:13 ARCHIVES_LOC = /var/jenkins/workspace/RAN-CI-develop/archives/basic_sim/test
15:11:13 ############################################################
15:11:13 Waiting for VM to be started
15:11:13 ############################################################
15:11:14 Warning: Permanently added '192.168.122.29' (ECDSA) to the list of known hosts.
15:11:15 RAN-CI-develop-b48-basic-sim has for IP addr = 192.168.122.29
15:11:15 ############################################################
15:11:15 Test EPC on VM (RAN-CI-develop-b48-epc) will be using ltebox
15:11:15 ############################################################
15:11:15 EPC_VM_CMD_FILE = RAN-CI-develop-b48-epc_cmds.txt
15:11:15 ############################################################
15:11:15 Creating test EPC VM (RAN-CI-develop-b48-epc) on Ubuntu Cloud Image base
15:11:15 ############################################################
15:11:18 Waiting for VM to be started
15:13:25 Warning: Permanently added '192.168.122.156' (ECDSA) to the list of known hosts.
15:13:25 RAN-CI-develop-b48-epc has for IP addr = 192.168.122.156
15:13:25 Warning: Permanently added '192.168.122.156' (ECDSA) to the list of known hosts.
15:13:25 ls: cannot access '/opt/ltebox/tools/start_ltebox': No such file or directory
15:13:25 ############################################################
15:13:25 Copying ltebox archives into EPC VM (RAN-CI-develop-b48-epc)
15:13:25 ############################################################
15:13:25 ############################################################
15:13:25 Install EPC on EPC VM (RAN-CI-develop-b48-epc)
15:13:25 ############################################################
....
15:24:39 ############################################################
15:24:39 Terminate EPC
15:24:39 ############################################################
15:24:39 cd /opt/ltebox/tools
15:24:39 sudo ./stop_ltebox
15:24:40 sudo daemon --name=simulated_hss --stop
15:24:40 sudo killall --signal SIGKILL hss_sim
15:24:40 ############################################################
15:24:40 Destroying VMs
15:24:40 ############################################################
15:24:41 # Host 192.168.122.29 found: line 18
15:24:41 /home/eurecom/.ssh/known_hosts updated.
15:24:41 Original contents retained as /home/eurecom/.ssh/known_hosts.old
15:24:43 # Host 192.168.122.60 found: line 20
15:24:43 /home/eurecom/.ssh/known_hosts updated.
15:24:43 Original contents retained as /home/eurecom/.ssh/known_hosts.old
15:24:43 ############################################################
15:24:43 Checking run status
15:24:43 ############################################################
15:24:43 STATUS seems OK
```
## 3.3. Test the RF simulator ##
```bash
./ci-scripts/oai-ci-vm-tool test --workspace /var/jenkins/workspace/RAN-CI-develop --variant rf-sim --job-name RAN-CI-develop --build-id 48 --keep-vm-alive
15:24:45 Currently RF-Simulator Testing is not implemented / enabled
15:24:45 Comment out these lines in ./ci-scripts/oai-ci-vm-tool if you want to run it
15:24:45 STATUS seems OK
```
## 3.4. Testing the L2-nFAPI simulator
```bash
./ci-scripts/oai-ci-vm-tool test --workspace /var/jenkins/workspace/RAN-CI-develop --variant l2-sim --job-name RAN-CI-develop --build-id 48
15:24:47 ############################################################
15:24:47 OAI CI VM script
15:24:47 ############################################################
15:24:47 ENB_VM_NAME = RAN-CI-develop-b48-enb-ethernet
15:24:47 ENB_VM_CMD_FILE = RAN-CI-develop-b48-enb-ethernet_cmds.txt
15:24:47 UE_VM_NAME = RAN-CI-develop-b48-ue-ethernet
15:24:47 UE_VM_CMD_FILE = RAN-CI-develop-b48-ue-ethernet_cmds.txt
15:24:47 JENKINS_WKSP = /var/jenkins/workspace/RAN-CI-develop
15:24:47 ARCHIVES_LOC = /var/jenkins/workspace/RAN-CI-develop/archives/l2_sim/test
15:24:47 ############################################################
15:24:47 Waiting for ENB VM to be started
15:24:47 ############################################################
15:24:47 Warning: Permanently added '192.168.122.110' (ECDSA) to the list of known hosts.
15:24:48 RAN-CI-develop-b48-enb-ethernet has for IP addr = 192.168.122.110
15:24:48 ############################################################
15:24:48 Waiting for UE VM to be started
15:24:48 ############################################################
15:24:49 Warning: Permanently added '192.168.122.90' (ECDSA) to the list of known hosts.
15:24:50 RAN-CI-develop-b48-ue-ethernet has for IP addr = 192.168.122.90
15:24:50 ############################################################
15:24:50 Test EPC on VM (RAN-CI-develop-b48-epc) will be using ltebox
15:24:50 ############################################################
15:24:50 EPC_VM_CMD_FILE = RAN-CI-develop-b48-epc_cmds.txt
15:24:50 Waiting for VM to be started
15:24:50 Warning: Permanently added '192.168.122.156' (ECDSA) to the list of known hosts.
15:24:51 RAN-CI-develop-b48-epc has for IP addr = 192.168.122.156
...
15:42:44 ############################################################
15:42:44 Destroying VMs
15:42:44 ############################################################
15:42:46 # Host 192.168.122.110 found: line 18
15:42:46 /home/eurecom/.ssh/known_hosts updated.
15:42:46 Original contents retained as /home/eurecom/.ssh/known_hosts.old
15:42:47 # Host 192.168.122.90 found: line 18
15:42:47 /home/eurecom/.ssh/known_hosts updated.
15:42:47 Original contents retained as /home/eurecom/.ssh/known_hosts.old
15:42:47 ############################################################
15:42:47 Checking run status
15:42:47 ############################################################
15:42:47 STATUS failed?
```
---
Final step: [how to properly destroy all VM instances](./vm_based_simulator_destroy.md)
You can also go back to the [CI dev main page](./ci_dev_home.md)

File diff suppressed because it is too large Load Diff

883
ci-scripts/oai-ci-vm-tool Executable file
View File

@@ -0,0 +1,883 @@
#!/bin/bash
#/*
# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
# * contributor license agreements. See the NOTICE file distributed with
# * this work for additional information regarding copyright ownership.
# * The OpenAirInterface Software Alliance licenses this file to You under
# * the OAI Public License, Version 1.1 (the "License"); you may not use this file
# * except in compliance with the License.
# * You may obtain a copy of the License at
# *
# * http://www.openairinterface.org/?page_id=698
# *
# * Unless required by applicable law or agreed to in writing, software
# * distributed under the License is distributed on an "AS IS" BASIS,
# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# * See the License for the specific language governing permissions and
# * limitations under the License.
# *-------------------------------------------------------------------------------
# * For more information about the OpenAirInterface (OAI) Software Alliance:
# * contact@openairinterface.org
# */
function top_usage {
echo "OAI CI VM script"
echo " Original Author: Raphael Defosseux"
echo " Requirements:"
echo " -- uvtool uvtool-libvirt apt-cacher"
echo " -- $VM_OSREL image already synced"
echo ""
echo "Usage:"
echo "------"
echo " oai-ci-vm-tool (-h|--help) { `for i in "${COMMANDS_NAME[@]}"; do echo -n $i,;done` ..." }
echo ""
}
function variant_usage {
for (( i=0 ; i<${#VARIANTS_LONG[@]} ; i++ ))
do
unset BUILD_OPTIONS
unset VARIANT_INFO
check_set_variant "${VARIANTS_SHORT[$i]}"
printf " --variant %-15s OR -%-3s" "${VARIANTS_LONG[$i]}" "${VARIANTS_SHORT[$i]}"
if [ "$BUILD_OPTIONS" = "" ]
then
echo -n " ( test "
else
echo -n " ( build and test "
fi
echo "$VARIANT_INFO )"
if [ "$1" = "full" ]
then
printf " VM_NAME=%-15s ARCHIVES_LOC=%-15s\n" "$VM_NAME" "$ARCHIVES_LOC"
printf " VM_MEMORY=%-15s VM_CPU=%-15s VM_DISK=%-15s\n" "$VM_MEMORY" "$VM_CPU" "$VM_DISK"
printf " NB_PATTERN_FILES=%-15s BUILD_OPTIONS=%-15s\n" "$NB_PATTERN_FILES" "\"$BUILD_OPTIONS\""
printf " LOG_PATTERN=%-15s EXPERIMENTAL=%-15s\n\n\n" "$LOG_PATTERN" "$EXPERIMENTAL"
fi
done
}
function command_options_usage {
local -A HELP_MSG
HELP_MSG["jn"]=" Specify the name of the Jenkins job."
HELP_MSG["id"]=" Specify the build ID of the Jenkins job."
HELP_MSG["ws"]=" Specify the workspace"
HELP_MSG["var"]=" Specify the variant to build."
HELP_MSG["k"]=" Keep the VM alive after the build."
HELP_MSG["D"]=" Run as daemon"
HELP_MSG["gu"]=" Specify the URL of the GIT Repository."
HELP_MSG["pu"]=" trigger a push action from the Jenkins job to the specified url, \"--trigger pu\" can also be used"
HELP_MSG["mr"]=" trigger a merge request action from the Jenkins job, \"--trigger mr\" can also be used"
HELP_MSG["sb"]=" Specify the source branch of the merge request."
HELP_MSG["sc"]=" Specify the source commit ID (SHA-1) of the merge request."
HELP_MSG["tb"]=" Specify the target branch of the merge request (usually develop)."
HELP_MSG["tc"]=" Specify the target commit ID (SHA-1) of the merge request."
HELP_MSG["br"]=" Specify the branch of the push event."
HELP_MSG["co"]=" Specify the commit ID (SHA-1) of the push event."
HELP_MSG["epc"]=" (two arguments) Specify the ip addresses of an external EPC, on respectively the core network and the UEs network"
HELP_MSG["sim"]=" Specify the path to the sim file, used to emulate the oai UE sim card "
for (( m=0 ; m<2 ; m++ ))
do
if [[ $m -eq 0 || ( $m > 0 && ${MANDATORY_OPTMASK[$m]} > 0 ) ]]
then
echo "Mandatory Options ($((m+1))):"
echo "---------------------"
for (( i=0 ; i<${#SHORT_OPTIONS[@]} ; i++ ))
do
if [ $(( MANDATORY_OPTMASK[$m] & $(( 2**$i )) )) -ne 0 ]
then
if [ "${LONG_OPTIONS[$i]}" != "" ]
then
local ARGPATTERN
if [[ !("${HELP_MSG[${SHORT_OPTIONS[$i]}]}" =~ "Specify") ]]
then
ARGPATTERN=""
elif [[ "${HELP_MSG[${SHORT_OPTIONS[$i]}]}" =~ "(two arguments)" ]]
then
ARGPATTERN="#### ####"
else
ARGPATTERN="####"
fi
printf " %s %s OR " "--${LONG_OPTIONS[$i]}" "$ARGPATTERN"
fi
printf "%s %s \n" "-${SHORT_OPTIONS[$i]}" "$ARGPATTERN"
printf " %s\n\n" "${HELP_MSG[${SHORT_OPTIONS[$i]}]}"
fi
done
fi
done
echo "Options:"
echo "--------"
for (( i=0 ; i<${#SHORT_OPTIONS[@]} ; i++ ))
do
if [ $(( ALLOWED_OPTMASK & $(( 2**$i )) )) -ne 0 ]
then
if [ "${LONG_OPTIONS[$i]}" != "" ]
then
printf " %s #### OR " "--${LONG_OPTIONS[$i]}"
fi
printf "%s #### \n" "-${SHORT_OPTIONS[$i]}"
printf " %s\n\n" "${HELP_MSG[${SHORT_OPTIONS[$i]}]}"
fi
done
for (( i=0 ; i<${#SHORT_OPTIONS[@]} ; i++ ))
do
if [ $(( ALLOWED_OPTMASK & $(( 2**$i )) )) -ne 0 ]
then
if [ "$(type -t ${LONG_OPTIONS[$i]}_usage)" = 'function' ]
then
${LONG_OPTIONS[$i]}_usage
fi
fi
done
echo " --help OR -h"
echo " Print this help message."
echo ""
}
# function to set specific behavior depending on the TESTPLATFORM_OWNER variable
# which may be set by a jenkins server for exemple
function platform_set {
if [ "$TESTPLATFORM_OWNER" != "" ]
then
echo "Running on $TESTPLATFORM_OWNER platform"
if [ -x "/usr/local/bin/oai_${TESTPLATFORM_OWNER}_setenv.sh" ]
then
. /usr/local/bin/oai_${TESTPLATFORM_OWNER}_setenv.sh
fi
fi
}
function setvar_usage {
declare -A HELP_VAR
HELP_VAR["VM_OSREL"]="OS release to use in virtual machines"
HELP_VAR["RUN_EXPERIMENTAL"]="Enforce execution of variants with EXPERIMENTAL variable set to \"true\""
HELP_VAR["OPTIONAL_APTCACHER"]="build and Run tests will fail if apt-cacher not installed and this variable not set to \"true\""
HELP_VAR["TESTPLATFORM_OWNER"]="Allow pipeline customization via execution of an externel scripts residing on the jenkins server"
echo "--setvar_<varname> <value> where varname is one of:"
for i in ${AUTHORIZED_VAR[@]}; do printf "%20s : %s\n" "$i" "${HELP_VAR[$i]}" ;done
}
# functions variant__v<n>__<variant name> are used to define build or test variants
# The only thing to do to define a new variant is to add a function which name
# match this template. Note that "_" character in function <varriant name> part
# will be replaced by "-" character in build_variant_arrays function, this is
# for compatibility reasons
function variant__v1__enb_usrp {
NB_PATTERN_FILES=9
BUILD_OPTIONS="--eNB -w USRP --mu"
}
function variant__v2__basic_sim {
NB_PATTERN_FILES=13
BUILD_OPTIONS="--eNB --UE"
VM_MEMORY=8192
RUN_OPTIONS="complex"
}
function variant__v3__phy_sim {
NB_PATTERN_FILES=12
BUILD_OPTIONS="--phy_simulators"
VM_MEMORY=8192
VM_DISK=20
RUN_OPTIONS="./run_exec_autotests.bash -g \"01510* 015111\" -q -np -b"
}
function variant__v4__cppcheck {
VM_MEMORY=4096
LOG_PATTERN=cppcheck.xml
NB_PATTERN_FILES=1
BUILD_OPTIONS="--enable=warning --force --xml --xml-version=2 -i openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder.c --suppressions-list=ci-scripts/cppcheck_suppressions.list -I common/utils -I openair3/NAS/COMMON/UTIL -j4"
}
function variant__v5__gnb_usrp {
VM_MEMORY=8192
VM_CPU=8
NB_PATTERN_FILES=9
BUILD_OPTIONS="--gNB -w USRP"
}
function variant__v6__nr_ue_usrp {
VM_MEMORY=4096
VM_CPU=4
NB_PATTERN_FILES=9
BUILD_OPTIONS="--nrUE -w USRP"
}
function variant__v7__enb_ethernet {
VM_MEMORY=4096
ARCHIVES_LOC=enb_eth
NB_PATTERN_FILES=8
BUILD_OPTIONS="--eNB"
}
function variant__v8__ue_ethernet {
VM_MEMORY=4096
ARCHIVES_LOC=ue_eth
NB_PATTERN_FILES=12
BUILD_OPTIONS="--UE"
}
function variant__v10__flexran_rtc {
ARCHIVES_LOC=flexran
NB_PATTERN_FILES=1
BUILD_OPTIONS="cmake .. && make -j2"
VARIANT_INFO="non-OSA"
}
function variant__v20__l1_sim {
ARCHIVES_LOC=l1_sim
RUN_OPTIONS="complex"
EXPERIMENTAL="true"
}
function variant__v21__rf_sim {
ARCHIVES_LOC=rf_sim
RUN_OPTIONS="complex"
}
function variant__v22__l2_sim {
RUN_OPTIONS="complex"
}
# Following function lists all variant__v<n>__<variant name> functions
# and set the VARIANTS_SHORT and VARIANTS_LONG arrays from
# the function names
function build_variant_arrays {
VARIANTS=`declare -F`
VARIANTS=${VARIANTS//"declare -f "}
for i in $VARIANTS
do
if [ `expr match "$i" 'variant__v'` -eq 10 ]
then
IDX1=`expr match "$i" 'variant__v[0-9]\+__'`
VARIANTS_SHORT+=(${i:9:$((IDX1-11))})
LONGNAME=${i:$IDX1}
VARIANTS_LONG+=(${LONGNAME//"_"/"-"})
fi
done
}
# check that the passed argument is a valid variant, set
# default values for variant related variables and then execute
# the corresponding variant__v<n>__<variant name> function
function check_set_variant {
for (( i=0 ; i<${#VARIANTS_SHORT[@]} ; i++ ))
do
if [ "$1" = "${VARIANTS_SHORT[$i]}" ] || [ "$1" = "${VARIANTS_LONG[$i]}" ]
then
VM_NAME=ci-${VARIANTS_LONG[$i]}
LOG_PATTERN=.$ASN1VER.txt
ARCHIVES_LOC=${VARIANTS_LONG[$i]//"-"/"_"}
VM_MEMORY=2048
VM_CPU=4
VM_DISK=10
EXPERIMENTAL=""
NBARGS=$[$NBARGS+$VARIANT_OPTID]
variant__${VARIANTS_SHORT[$i]}__${VARIANTS_LONG[$i]//"-"/"_"}
return 0
fi
done
echo "$1" is not a valid variant
variant_usage
exit 1
}
function check_command_options {
GIVEN_OPTIONS=$1
declare -a MANDATORY_OPTIONS=("${!2}")
if [ ${MANDATORY_OPTIONS[1]} -eq 0 ]
then
MANDATORY_OPTIONS[1]=${MANDATORY_OPTIONS[0]}
fi
OPTIONAL_OPTIONS=$3
if [ $(($GIVEN_OPTIONS & ${MANDATORY_OPTIONS[0]} )) -ne ${MANDATORY_OPTIONS[0]} ] && [ $(($GIVEN_OPTIONS & ${MANDATORY_OPTIONS[1]} )) -ne ${MANDATORY_OPTIONS[1]} ]
then
echo "Syntax Error: missing option(s) for $4 command"
${4//-/_}_usage
exit 1
fi
if [ $(( $(($GIVEN_OPTIONS ^ ${MANDATORY_OPTIONS[0]})) | $OPTIONAL_OPTIONS )) -ne $(( $OPTIONAL_OPTIONS )) ] && [ $(( $(($GIVEN_OPTIONS ^ ${MANDATORY_OPTIONS[1]})) | $OPTIONAL_OPTIONS )) -ne $(( $OPTIONAL_OPTIONS )) ]
then
echo "Syntax Error: unknown option(s) for $4 command"
${4//-/_}_usage
exit 1
fi
}
function check_ipv4addr {
local ipaddr=$1
local stat=1
if [[ $ipaddr =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3} ]]
then
OIFS=$IFS
IFS='.'
ipaddr=($ipaddr)
IFS=$OIFS
[[ ${ipaddr[0]} -le 255 && ${ipaddr[1]} -le 255 \
&& ${ipaddr[2]} -le 255 && ${ipaddr[3]} -le 255 ]]
stat=$?
fi
if [ $stat -ne 0 ]
then
echo $ipaddr " is not a valid ip V4 address"
exit 1
fi
}
function check_setvar {
for i in ${AUTHORIZED_VAR[@]}
do
if [ "$1" = "$i" ]
then
echo "Setting $1 to $2..."
export "$1"="$2"
return 0
fi
done
echo " $1 is not a variable you can set"
setvar_usage
exit 1
}
platform_set
MY_DIR=$(dirname $(readlink -f $0))
. $MY_DIR/createVM.sh
. $MY_DIR/buildOnVM.sh
. $MY_DIR/waitBuildOnVM.sh
. $MY_DIR/destroyAllRunningVM.sh
. $MY_DIR/runTestOnVM.sh
. $MY_DIR/reportBuildLocally.sh
. $MY_DIR/reportTestLocally.sh
if [ $# -lt 1 ]
then
echo "Syntax Error: too few arguments"
echo ""
top_usage
exit 1
fi
VM_TEMPLATE=ci-
# look for ASN1 release in cmake directives
# It will be the release used when building
ASN1VEROPT=( `grep "set (RRC_ASN1_VERSION" cmake_targets/CMakeLists.txt` )
ASN1VER=${ASN1VEROPT[2]//\"}
ASN1VER=${ASN1VER//)}
unset ASN1VEROPT
# variable to identify and store the command (build, create ...)
# command index in the COMMAND and COMMANDS_NAME arrays
HELP_CMD=0
CREATE_CMD=1
BUILD_CMD=2
WAIT_CMD=3
DESTROY_CMD=4
TEST_CMD=5
REPORT_BUILD_CMD=6
REPORT_TEST_CMD=7
COMMANDS_NAME=(help create build wait destroy test report-build report-test)
#COMMAND will be used to save the command entered as argument
declare -A COMMAND
for i in "${COMMANDS_NAME[@]}"
do
COMMAND[$i]=0
done
# build the variant arrays
declare -a VARIANTS_SHORT
declare -a VARIANTS_LONG
build_variant_arrays
#variables to process options, for each option we define a variable to store
# its value and a bit mask, used to check allowed options depending on
# the command
# The two following arrays must be consistent: a given index must point to the long and short options
# of a given command
SHORT_OPTIONS=( "jn" "id" "ws" "k" "D" "gu" "pu" "mr" "var" "notused" "sb" "sc" "tb" "tc" "br" "co" "epc" "sim")
LONG_OPTIONS=( "job-name" "build-id" "workspace" "keep-vm-alive" "daemon" "git-url" "push" "merge-request"
"variant" "notused" "src-branch" "src-commit" "target-branch" "target-commit" "branch" "commit"
"external-epc" "sim-file")
JOB_NAME=XX
JOB_NAME_OPTINDEX=0
JOB_NAME_OPTID=1
BUILD_ID=XX
BUILD_ID_OPTINDEX=1
BUILD_ID_OPTID=2
JENKINS_WKSP_OPTINDEX=2
JENKINS_WKSP_OPTID=4
KEEP_VM_ALIVE_OPTINDEX=3
KEEP_VM_ALIVE_OPTID=8
KEEP_VM_ALIVE=0
DAEMON_OPTINDEX=4
DAEMON_OPTID=$((2**4))
DAEMON=0
GITURL_OPTINDEX=5
GITURL_OPTID=$((2**5))
PU_OPTINDEX=6
PU_OPTID=$((2**6))
PU_TRIG=0
MR_OPTINDEX=7
MR_OPTID=$((2**7))
MR_TRIG=0
VARIANT_OPTINDEX=8
VARIANT_OPTID=$((2**8))
SB_OPTINDEX=10
SB_OPTID=$((2**10))
SC_OPTINDEX=11
SC_OPTID=$((2**11))
TB_OPTINDEX=12
TB_OPTID=$((2**12))
TC_OPTINDEX=13
TC_OPTID=$((2**13))
BR_OPTINDEX=14
BR_OPTID=$((2**14))
CO_OPTINDEX=15
CO_OPTID=$((2**15))
EPC_IPADDR_OPTINDEX=16
EPC_IPADDR_OPTID=$((2**16))
EPC_IPADDR=""
SIM_OPTINDEX=17
SIM_OPTID=$((2**17))
SIMFILE=""
RUN_OPTIONS="none"
# list of variables that can be set via the --setvar option
AUTHORIZED_VAR=("VM_OSREL RUN_EXPERIMENTAL OPTIONAL_APTCACHER TESTPLATFORM_OWNER")
#variables to set which OS VM should use
#if [ -f "/etc/os-release" ]
#then
# source /etc/os-release
# VM_OS="$NAME"
# VM_OSREL="$VERSION_CODENAME"
# VM_ARCHI=`uname -m`
#else
VM_OS="ubuntu"
VM_OSREL="xenial"
VM_ARCHI="x86_64"
#fi
# variant option, ie the test variant which will be run triggers the
# variables listed below, used to configure the VM and to define what this
# VM will do. The variant can be specified by the --variant option or by a
# -V<xx> option.
VM_NAME=""
VM_MEMORY=0
VM_DISK=0
VM_CPU=0
ARCHIVES_LOC=""
LOG_PATTERN=""
NB_PATTERN_FILES=0
BUILD_OPTIONS=""
RUN_OPTIONS=""
# NARGS is used to check that only valid options are used for the given command
# It is a bit mask, each bit set to 1 specifies the corresponding option
# has been entered on the command line. MANDATORY_OPTMASK and ALLOWED_OPTMASK define
# respectively the mandatory and optional parameters of the entered command
NBARGS=0
MANDATORY_OPTMASK=(0 0) # some command have two sets of mandatory options
ALLOWED_OPTMASK=0
while [[ $# -gt 0 ]]
do
key="$1"
if [ "$(type -t $funcname)" != 'function' ]; then
funcname=do_it_normal
fi
case $key in
--debug)
set -v
set -x
shift
;;
-h|--help|help)
COMMAND["help"]=1
# following word might specify the topic for the help request
# but help can also be used without argument, so don't shift
if [ "$2" != "" ] && [ "$(type -t ${2//-/_}_usage)" = 'function' ]
then
HELPCMD="${2//-/_}_usage full"
fi
shift
;;
create)
COMMAND[$key]=1
# For create, mandatory options: jn, id. Optional: variant
MANDATORY_OPTMASK[0]=$(($JOB_NAME_OPTID + $BUILD_ID_OPTID ))
ALLOWED_OPTMASK=$(($VARIANT_OPTID))
# It is implied to keep the VM when creating it
KEEP_VM_ALIVE=1
shift
;;
build)
COMMAND[$key]=1
# For build, mandatory options: jn, id, ws. Optional: variant, k, D
MANDATORY_OPTMASK[0]=$(($JOB_NAME_OPTID + $BUILD_ID_OPTID + $JENKINS_WKSP_OPTID))
ALLOWED_OPTMASK=$(($KEEP_VM_ALIVE_OPTID + $DAEMON_OPTID + $VARIANT_OPTID))
shift
;;
wait)
# For test, mandatory options: jn, id, ws. Optional: variant, k
COMMAND[$key]=1
MANDATORY_OPTMASK[0]=$(($JOB_NAME_OPTID + $BUILD_ID_OPTID + $JENKINS_WKSP_OPTID))
ALLOWED_OPTMASK=$(($KEEP_VM_ALIVE_OPTID + $VARIANT_OPTID))
shift
;;
test)
COMMAND[$key]=1
# For test, mandatory options: jn, id, ws. Optional: variant, k, epc
MANDATORY_OPTMASK[0]=$(($JOB_NAME_OPTID + $BUILD_ID_OPTID + $JENKINS_WKSP_OPTID))
ALLOWED_OPTMASK=$(($KEEP_VM_ALIVE_OPTID + $VARIANT_OPTID + $EPC_IPADDR_OPTID + $SIM_OPTID))
shift
;;
destroy)
COMMAND[$key]=1
# For destroy, mandatory options: jn, id.
MANDATORY_OPTMASK[0]=$(($JOB_NAME_OPTID + $BUILD_ID_OPTID))
shift
;;
report-build)
COMMAND[$key]=1
# For report-build, mandatory options: jn, id, ws, gu, pu, br,co.
# or: jn, id, ws, gu, mr, sb, sc, tb, tc.
MANDATORY_OPTMASK[0]=$(($JOB_NAME_OPTID + $BUILD_ID_OPTID + $JENKINS_WKSP_OPTID + $GITURL_OPTID + $PU_OPTID + $BR_OPTID + $CO_OPTID))
MANDATORY_OPTMASK[1]=$(($JOB_NAME_OPTID + $BUILD_ID_OPTID + $JENKINS_WKSP_OPTID + $GITURL_OPTID + $MR_OPTID + $SB_OPTID + $SC_OPTID))
MANDATORY_OPTMASK[1]=$(( ${MANDATORY_OPTMASK[1]} + $TB_OPTID + $TC_OPTID))
shift
;;
report-test)
COMMAND[$key]=1
# For report-test, mandatory options: jn, id, ws, gu, pu, br,co.
# or: jn, id, ws, gu, mr, sb, sc, tb, tc.
MANDATORY_OPTMASK[0]=$(($JOB_NAME_OPTID + $BUILD_ID_OPTID + $JENKINS_WKSP_OPTID))
MANDATORY_OPTMASK[0]=$((${MANDATORY_OPTMASK[0]} + $GITURL_OPTID + $PU_OPTID + $BR_OPTID + $CO_OPTID))
MANDATORY_OPTMASK[1]=$(($JOB_NAME_OPTID + $BUILD_ID_OPTID + $JENKINS_WKSP_OPTID))
MANDATORY_OPTMASK[1]=$((${MANDATORY_OPTMASK[1]} + GITURL_OPTID + $MR_OPTID + $SB_OPTID + $SC_OPTID))
MANDATORY_OPTMASK[1]=$((${MANDATORY_OPTMASK[1]} + $TB_OPTID + $TC_OPTID))
shift
;;
-jn|--job-name)
JOB_NAME="$2"
NBARGS=$[$NBARGS+$JOB_NAME_OPTID]
shift
shift
;;
-id|--build-id)
BUILD_ID="$2"
NBARGS=$[$NBARGS+$BUILD_ID_OPTID]
shift
shift
;;
-ws|--workspace)
JENKINS_WKSP="$2"
NBARGS=$[$NBARGS+$JENKINS_WKSP_OPTID]
shift
shift
;;
-k|--keep-vm-alive)
KEEP_VM_ALIVE=1
NBARGS=$[$NBARGS+$KEEP_VM_ALIVE_OPTID]
shift
;;
-D|--daemon)
DAEMON=1
NBARGS=$[$NBARGS+$DAEMON_OPTID]
shift
;;
-gu|--git-url)
GIT_URL="$2"
NBARGS=$[$NBARGS+$GITURL_OPTID]
shift
shift
;;
--trigger)
TRIG="$2"
case $TRIG in
merge-request)
MR_TRIG=1
NBARGS=$[$NBARGS+$MR_OPTID]
;;
push)
PU_TRIG=1
NBARGS=$[$NBARGS+$PU_OPTID]
;;
*)
echo ""
echo "Syntax Error: Invalid Trigger option -> $TRIG"
echo ""
trigger_usage
exit
;;
esac
shift
shift
;;
-mr|--merge-request)
MR_TRIG=1
NBARGS=$[$NBARGS+$MR_OPTID]
shift
;;
-pu|--push)
PU_TRIG=1
NBARGS=$[$NBARGS+$PU_OPTID]
shift
;;
-sb|--src-branch)
SOURCE_BRANCH="$2"
NBARGS=$[$NBARGS+$SB_OPTID]
shift
shift
;;
-sc|--src-commit)
SOURCE_COMMIT_ID="$2"
NBARGS=$[$NBARGS+$SC_OPTID]
shift
shift
;;
-tb|--target-branch)
TARGET_BRANCH="$2"
NBARGS=$[$NBARGS+$TB_OPTID]
shift
shift
;;
-tc|--target-commit)
TARGET_COMMIT_ID="$2"
NBARGS=$[$NBARGS+$TC_OPTID]
shift
shift
;;
-br|--branch)
SOURCE_BRANCH="$2"
NBARGS=$[$NBARGS+$BR_OPTID]
shift
shift
;;
-co|--commit)
SOURCE_COMMIT_ID="$2"
NBARGS=$[$NBARGS+$CO_OPTID]
shift
shift
;;
-epc|--external-epc)
check_ipv4addr "$2"
check_ipv4addr "$3"
EPC_IPADDR="$2"
EPC_TUN_IPADDR="$3"
NBARGS=$[$NBARGS+$EPC_IPADDR_OPTID]
shift
shift
shift
;;
-sim|--sim-file)
SIMFILE="$2"
NBARGS=$[$NBARGS+$SIM_OPTID]
shift
shift
;;
--setvar_*)
check_setvar "${key:9}" "$2"
shift
shift
;;
-v[0-9] | -v[0-9][0-9])
check_set_variant ${key//"-"}
shift
;;
-var|--variant)
variant="$2"
check_set_variant ${2}
shift
shift
;;
*)
echo "Syntax Error: unknown option: $key"
echo ""
top_usage
exit 1
esac
done
i=0
for (( COUNT=1 ; COUNT<${#COMMAND[@]} ; COUNT++ ))
do
if [ ${COMMAND[${COMMANDS_NAME[$COUNT]}]} -eq 1 ]
then
COMMAND_KEY[$i]=${COMMANDS_NAME[$COUNT]}
(( i++ ))
fi
done
if [ ${COMMAND["help"]} -eq 1 ]
then
if [ ${#COMMAND_KEY[@]} -ne 1 ] && [ "$HELPCMD" == "" ]
then
top_usage
elif [ "$HELPCMD" != "" ]
then
$HELPCMD
else
${COMMAND_KEY[0]//-/_}_usage
fi
exit 0
else
if [ ${#COMMAND_KEY[@]} -gt 1 ]
then
echo "Syntax Error, too many commands: ${COMMAND_KEY[@]}"
top_usage
exit 1
fi
if [ -z "${COMMAND_KEY[0]}" ]
then
echo "Syntax Error: no command, specify one of: ${COMMANDS_NAME[@]}"
top_usage
exit 1
fi
check_command_options $NBARGS MANDATORY_OPTMASK[@] $ALLOWED_OPTMASK ${COMMAND_KEY[0]}
fi
if [ ${COMMAND[${COMMANDS_NAME[$REPORT_BUILD_CMD]}]} -ne 1 ] && [ ${COMMAND[${COMMANDS_NAME[$REPORT_TEST_CMD]}]} -ne 1 ]
then
# Checking uvt-kvm is installed
UVT_KVM_PATH=`which uvt-kvm | grep -c uvt-kvm`
if [ $UVT_KVM_PATH -eq 0 ]
then
echo "Error: uvt-kvm is not installed"
top_usage
exit 1
fi
fi
if [ "$JOB_NAME" == "XX" ] || [ "$BUILD_ID" == "XX" ]
then
VM_TEMPLATE=ci-
else
VM_TEMPLATE=${JOB_NAME}-b${BUILD_ID}-
fi
# set default variant
if [ "$VM_NAME" = "" ]
then
check_set_variant "v1"
fi
VM_NAME=`echo $VM_NAME | sed -e "s#ci-#$VM_TEMPLATE#"`
VM_CMDS=${VM_NAME}_cmds.txt
ARCHIVES_LOC=${JENKINS_WKSP}/archives/${ARCHIVES_LOC}
STATUS=0
if [ ${COMMAND[${COMMANDS_NAME[$CREATE_CMD]}]} -eq 1 ]
then
if [[ "$BUILD_OPTIONS" = "" ]]
then
echo "$VM_NAME is not a build variant"
exit 0
else
create_vm
fi
fi
if [ ${COMMAND[${COMMANDS_NAME[$BUILD_CMD]}]} -eq 1 ]
then
if [[ "$BUILD_OPTIONS" = "" ]]
then
echo " $VM_NAME is not a build variant"
exit 0
else
build_on_vm
fi
if [ $DAEMON -eq 0 ] && [ $STATUS -eq 0 ]
then
check_on_vm_build
fi
fi
if [ ${COMMAND[${COMMANDS_NAME[$WAIT_CMD]}]} -eq 1 ]
then
if [[ "$BUILD_OPTIONS" = "" ]]
then
echo "$VM_NAME is not a build variant"
exit 0
else
wait_on_vm_build
fi
if [ $STATUS -eq 0 ]
then
check_on_vm_build
fi
fi
if [ ${COMMAND[${COMMANDS_NAME[$TEST_CMD]}]} -eq 1 ]
then
# variant with EXPERIMENTAL variable set to true won't run and will be
# considered OK, except if --setvar_RUN_EXPERIMENTAL option has been set to true
if [ "$EXPERIMENTAL" = "true" ] && [ "$RUN_EXPERIMENTAL" != "true" ]
then
echo "Currently $VM_NAME Testing is not implemented / enabled"
echo "remove EXPERIMENTAL variable definition from this variant"
echo " or use option --setvar_RUN_EXPERIMENTAL=true to enforce testing it"
echo "STATUS seems OK"
exit $STATUS
fi
ARCHIVES_LOC=${ARCHIVES_LOC}/test
run_test_on_vm
fi
if [ ${COMMAND[${COMMANDS_NAME[$DESTROY_CMD]}]} -eq 1 ]
then
destroy_vm
fi
if [ ${COMMAND[${COMMANDS_NAME[$REPORT_BUILD_CMD]}]} -eq 1 ]
then
report_build
fi
if [ ${COMMAND[${COMMANDS_NAME[$REPORT_TEST_CMD]}]} -eq 1 ]
then
report_test
fi
# Did command pass or fail?
if [ $STATUS -eq 0 ]
then
echo "STATUS seems OK"
else
echo "STATUS failed?"
fi
exit $STATUS

View File

@@ -20,66 +20,20 @@
# * contact@openairinterface.org
# */
function usage {
echo "OAI Local Build Report script"
function report_build_usage {
echo "OAI CI VM script"
echo " Original Author: Raphael Defosseux"
echo ""
echo "Usage:"
echo "------"
echo " oai-ci-vm-tool report-build [OPTIONS]"
echo ""
echo " reportBuildLocally.sh [OPTIONS]"
echo ""
echo "Options:"
echo "--------"
echo ""
echo " --help OR -h"
echo " Print this help message."
echo ""
echo "Job Options:"
echo "------------"
echo ""
echo " --git-url #### OR -gu ####"
echo " Specify the URL of the GIT Repository."
echo ""
echo " --job-name #### OR -jn ####"
echo " Specify the name of the Jenkins job."
echo ""
echo " --build-id #### OR -id ####"
echo " Specify the build ID of the Jenkins job."
echo ""
echo " --trigger merge-request OR -mr"
echo " --trigger push OR -pu"
echo " Specify trigger action of the Jenkins job. Either a merge-request event or a push event."
echo ""
echo "Merge-Request Options:"
echo "----------------------"
echo ""
echo " --src-branch #### OR -sb ####"
echo " Specify the source branch of the merge request."
echo ""
echo " --src-commit #### OR -sc ####"
echo " Specify the source commit ID (SHA-1) of the merge request."
echo ""
echo " --target-branch #### OR -tb ####"
echo " Specify the target branch of the merge request (usually develop)."
echo ""
echo " --target-commit #### OR -tc ####"
echo " Specify the target commit ID (SHA-1) of the merge request."
echo ""
echo "Push Options:"
echo "----------------------"
echo ""
echo " --branch #### OR -br ####"
echo " Specify the branch of the push event."
echo ""
echo " --commit #### OR -co ####"
echo " Specify the commit ID (SHA-1) of the push event."
echo ""
echo ""
command_options_usage
}
function trigger_usage {
echo "OAI Local Build Report script"
echo "OAI CI VM script"
echo " Original Author: Raphael Defosseux"
echo ""
echo " --trigger merge-request OR -mr"
@@ -103,7 +57,7 @@ function details_table {
COMPLETE_MESSAGE="start"
for MESSAGE in $LIST_MESSAGES
do
if [[ $MESSAGE == *"/home/ubuntu/tmp"* ]]
if [[ $MESSAGE == *"/home/ubuntu/tmp"* ]] || [[ $MESSAGE == *"/tmp/CI-eNB"* ]]
then
FILENAME=`echo $MESSAGE | sed -e "s#^/home/ubuntu/tmp/##" -e "s#^.*/tmp/CI-eNB/##" | awk -F ":" '{print $1}'`
LINENB=`echo $MESSAGE | awk -F ":" '{print $2}'`
@@ -139,6 +93,31 @@ function details_table {
function summary_table_header {
echo " <h3>$1</h3>" >> ./build_results.html
if [ -f $2/build_final_status.log ]
then
if [ `grep -c COMMAND $2/build_final_status.log` -eq 1 ]
then
COMMAND=`grep COMMAND $2/build_final_status.log | sed -e "s#COMMAND: ##"`
else
COMMAND="Unknown"
fi
if [ `grep -c BUILD_OK $2/build_final_status.log` -eq 1 ]
then
echo " <div class=\"alert alert-success\">" >> ./build_results.html
echo " <span class=\"glyphicon glyphicon-expand\"></span> $COMMAND <span class=\"glyphicon glyphicon-arrow-right\"></span> " >> ./build_results.html
echo " <strong>BUILD was SUCCESSFUL <span class=\"glyphicon glyphicon-ok-circle\"></span></strong>" >> ./build_results.html
echo " </div>" >> ./build_results.html
else
echo " <div class=\"alert alert-danger\">" >> ./build_results.html
echo " <span class=\"glyphicon glyphicon-expand\"></span> $COMMAND <span class=\"glyphicon glyphicon-arrow-right\"></span> " >> ./build_results.html
echo " <strong>BUILD was a FAILURE! <span class=\"glyphicon glyphicon-ban-circle\"></span></strong>" >> ./build_results.html
echo " </div>" >> ./build_results.html
fi
else
echo " <div class=\"alert alert-danger\">" >> ./build_results.html
echo " <strong>COULD NOT DETERMINE BUILD FINAL STATUS! <span class=\"glyphicon glyphicon-ban-circle\"></span></strong>" >> ./build_results.html
echo " </div>" >> ./build_results.html
fi
echo " <table border = \"1\">" >> ./build_results.html
echo " <tr bgcolor = \"#33CCFF\" >" >> ./build_results.html
echo " <th>Element</th>" >> ./build_results.html
@@ -153,8 +132,8 @@ function summary_table_row {
echo " <td bgcolor = \"lightcyan\" >$1</th>" >> ./build_results.html
if [ -f $2 ]
then
STATUS=`egrep -c "$3" $2`
if [ $STATUS -eq 1 ]
BUILD_STATUS=`egrep -c "$3" $2`
if [ $BUILD_STATUS -eq 1 ]
then
echo " <td bgcolor = \"green\" >OK</th>" >> ./build_results.html
else
@@ -196,7 +175,92 @@ function summary_table_footer {
}
function sca_summary_table_header {
echo " <h3>$1</h3>" >> ./build_results.html
echo " <h3>$2</h3>" >> ./build_results.html
NB_ERRORS=`egrep -c "severity=\"error\"" $1`
NB_WARNINGS=`egrep -c "severity=\"warning\"" $1`
ADDED_ERRORS="0"
ADDED_WARNINGS="0"
FINAL_LOG=`echo $1 | sed -e "s#cppcheck\.xml#build_final_status.log#"`
if [ `grep -c COMMAND $FINAL_LOG` -eq 1 ]
then
COMMAND=`grep COMMAND $FINAL_LOG | sed -e "s#COMMAND: ##"`
else
COMMAND="Unknown"
fi
if [ $MR_TRIG -eq 1 ]
then
if [ -d ../../cppcheck_archives ]
then
if [ -d ../../cppcheck_archives/$JOB_NAME ]
then
ADDED_ERRORS=`diff $1 ../../cppcheck_archives/$JOB_NAME/cppcheck.xml | egrep --color=never "^<" | egrep -c "severity=\"error"`
ADDED_WARNINGS=`diff $1 ../../cppcheck_archives/$JOB_NAME/cppcheck.xml | egrep --color=never "^<" | egrep -c "severity=\"warning"`
fi
fi
local TOTAL_NUMBER=$[$ADDED_ERRORS+$ADDED_WARNINGS]
if [ -f $JENKINS_WKSP/oai_cppcheck_added_errors.txt ]; then rm -f $JENKINS_WKSP/oai_cppcheck_added_errors.txt; fi
echo "$TOTAL_NUMBER" > $JENKINS_WKSP/oai_cppcheck_added_errors.txt
fi
if [ $NB_ERRORS -eq 0 ] && [ $NB_WARNINGS -eq 0 ]
then
echo " <div class=\"alert alert-success\">" >> ./build_results.html
echo " <span class=\"glyphicon glyphicon-expand\"></span> $COMMAND <br><br>" >> ./build_results.html
echo " <strong>CPPCHECK found NO error and NO warning <span class=\"glyphicon glyphicon-ok-circle\"></span></strong>" >> ./build_results.html
echo " </div>" >> ./build_results.html
else
if [ $NB_ERRORS -eq 0 ]
then
echo " <div class=\"alert alert-warning\">" >> ./build_results.html
echo " <span class=\"glyphicon glyphicon-expand\"></span> $COMMAND <br><br>" >> ./build_results.html
if [ $PU_TRIG -eq 1 ]
then
echo " <strong>CPPCHECK found NO error and $NB_WARNINGS warnings <span class=\"glyphicon glyphicon-warning-sign\"></span></strong>" >> ./build_results.html
fi
if [ $MR_TRIG -eq 1 ]
then
if [ $ADDED_WARNINGS -eq 0 ]
then
echo " <strong>CPPCHECK found NO error and $NB_WARNINGS warnings <span class=\"glyphicon glyphicon-warning-sign\"></span></strong>" >> ./build_results.html
else
echo " <strong>CPPCHECK found NO error and $NB_WARNINGS warnings <span class=\"glyphicon glyphicon-warning-sign\"></span></strong>" >> ./build_results.html
fi
fi
echo " </div>" >> ./build_results.html
else
echo " <div class=\"alert alert-danger\">" >> ./build_results.html
echo " <span class=\"glyphicon glyphicon-expand\"></span> $COMMAND <br><br>" >> ./build_results.html
if [ $PU_TRIG -eq 1 ]
then
echo " <strong>CPPCHECK found $NB_ERRORS errors and $NB_WARNINGS warnings <span class=\"glyphicon glyphicon-ban-circle\"></span></strong>" >> ./build_results.html
fi
if [ $MR_TRIG -eq 1 ]
then
if [ $ADDED_ERRORS -eq 0 ] && [ $ADDED_WARNINGS -eq 0 ]
then
echo " <strong>CPPCHECK found $NB_ERRORS errors and $NB_WARNINGS warnings <span class=\"glyphicon glyphicon-ban-circle\"></span></strong>" >> ./build_results.html
else
echo " <strong>CPPCHECK found $NB_ERRORS errors and $NB_WARNINGS warnings <span class=\"glyphicon glyphicon-ban-circle\"></span>" >> ./build_results.html
echo " <br>" >> ./build_results.html
echo " <br>" >> ./build_results.html
echo " <span class=\"glyphicon glyphicon-alert\"></span> This Merge Request may have introduced up to $ADDED_ERRORS errors and $ADDED_WARNINGS warnings. <span class=\"glyphicon glyphicon-alert\"></span></strong>" >> ./build_results.html
fi
fi
echo " </div>" >> ./build_results.html
fi
fi
if [ $PU_TRIG -eq 1 ]
then
if [ -d ../../cppcheck_archives ]
then
if [ -d ../../cppcheck_archives/$JOB_NAME ]
then
cp $1 ../../cppcheck_archives/$JOB_NAME
fi
fi
fi
echo " <button data-toggle=\"collapse\" data-target=\"#oai-cppcheck-details\">More details on CPPCHECK results</button>" >> ./build_results.html
echo " <div id=\"oai-cppcheck-details\" class=\"collapse\">" >> ./build_results.html
echo " <br>" >> ./build_results.html
echo " <table border = \"1\">" >> ./build_results.html
echo " <tr bgcolor = \"#33CCFF\" >" >> ./build_results.html
echo " <th>Error / Warning Type</th>" >> ./build_results.html
@@ -261,344 +325,385 @@ function sca_summary_table_footer {
echo " </table>" >> ./build_results.html
echo " <p>Full details in zipped artifact (cppcheck/cppcheck.xml) </p>" >> ./build_results.html
echo " <p style=\"margin-left: 30px\">Graphical Interface tool : <strong><code>cppcheck-gui -l cppcheck/cppcheck.xml</code></strong></p>" >> ./build_results.html
if [ $MR_TRIG -eq 1 ]
then
if [ $ADDED_ERRORS -ne 0 ] || [ $ADDED_WARNINGS -ne 0 ]
then
echo " <table border = \"1\">" >> ./build_results.html
echo " <tr bgcolor = \"#33CCFF\" >" >> ./build_results.html
echo " <th>Potential File(s) impacted by added errors/warnings</th>" >> ./build_results.html
echo " <th>Line Number</th>" >> ./build_results.html
echo " <th>Severity</th>" >> ./build_results.html
echo " <th>Message</th>" >> ./build_results.html
echo " </tr>" >> ./build_results.html
SEVERITY="none"
POTENTIAL_FILES=`diff $1 ../../cppcheck_archives/$JOB_NAME/cppcheck.xml | egrep --color=never "^<" | egrep "location file|severity" | sed -e "s# #@#g"`
for POT_FILE in $POTENTIAL_FILES
do
if [ `echo $POT_FILE | grep -c location` -eq 1 ]
then
FILENAME=`echo $POT_FILE | sed -e "s#^.*file=\"##" -e "s#\"@line.*/>##"`
LINE=`echo $POT_FILE | sed -e "s#^.*line=\"##" -e "s#\"/>##"`
if [[ $SEVERITY != *"none" ]]
then
echo " <tr>" >> ./build_results.html
echo " <td>$FILENAME</td>" >> ./build_results.html
echo " <td>$LINE</td>" >> ./build_results.html
echo " <td>$SEVERITY</td>" >> ./build_results.html
echo " <td>$MESSAGE</td>" >> ./build_results.html
echo " </tr>" >> ./build_results.html
fi
else
SEVERITY=`echo $POT_FILE | sed -e "s#^.*severity=\"##" -e "s#\"@msg=.*##"`
MESSAGE=`echo $POT_FILE | sed -e "s#^.*msg=\"##" -e "s#\"@verbose=.*##" -e "s#@# #g"`
fi
done
echo " </table>" >> ./build_results.html
fi
fi
echo " </div>" >> ./build_results.html
}
jb_checker=0
mr_checker=0
pu_checker=0
MR_TRIG=0
PU_TRIG=0
while [[ $# -gt 0 ]]
do
key="$1"
function report_build {
echo "############################################################"
echo "OAI CI VM script"
echo "############################################################"
case $key in
-h|--help)
shift
usage
exit 0
;;
-gu|--git-url)
GIT_URL="$2"
let "jb_checker|=0x1"
shift
shift
;;
-jn|--job-name)
JOB_NAME="$2"
let "jb_checker|=0x2"
shift
shift
;;
-id|--build-id)
BUILD_ID="$2"
let "jb_checker|=0x4"
shift
shift
;;
--trigger)
TRIG="$2"
case $TRIG in
merge-request)
MR_TRIG=1
;;
push)
PU_TRIG=1
;;
*)
echo ""
echo "Syntax Error: Invalid Trigger option -> $TRIG"
echo ""
trigger_usage
exit
;;
esac
let "jb_checker|=0x8"
shift
shift
;;
-mr)
MR_TRIG=1
let "jb_checker|=0x8"
shift
;;
-pu)
PU_TRIG=1
let "jb_checker|=0x8"
shift
;;
-sb|--src-branch)
SOURCE_BRANCH="$2"
let "mr_checker|=0x1"
shift
shift
;;
-sc|--src-commit)
SOURCE_COMMIT_ID="$2"
let "mr_checker|=0x2"
shift
shift
;;
-tb|--target-branch)
TARGET_BRANCH="$2"
let "mr_checker|=0x4"
shift
shift
;;
-tc|--target-commit)
TARGET_COMMIT_ID="$2"
let "mr_checker|=0x8"
shift
shift
;;
-br|--branch)
SOURCE_BRANCH="$2"
let "pu_checker|=0x1"
shift
shift
;;
-co|--commit)
SOURCE_COMMIT_ID="$2"
let "pu_checker|=0x2"
shift
shift
;;
*)
echo "Syntax Error: unknown option: $key"
echo ""
usage
exit 1
;;
esac
echo "JENKINS_WKSP = $JENKINS_WKSP"
echo "GIT_URL = $GIT_URL"
done
if [ $jb_checker -ne 15 ]
then
echo ""
echo "Syntax Error: missing job information."
# TODO : list missing info
echo ""
exit 1
fi
if [ $PU_TRIG -eq 1 ] && [ $MR_TRIG -eq 1 ]
then
echo ""
echo "Syntax Error: trigger action incoherent."
echo ""
trigger_usage
exit 1
fi
if [ $PU_TRIG -eq 1 ]
then
if [ $pu_checker -ne 3 ]
cd ${JENKINS_WKSP}
echo "<!DOCTYPE html>" > ./build_results.html
echo "<html class=\"no-js\" lang=\"en-US\">" >> ./build_results.html
echo "<head>" >> ./build_results.html
echo " <meta name=\"viewport\" content=\"width=device-width, initial-scale=1\">" >> ./build_results.html
echo " <link rel=\"stylesheet\" href=\"https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css\">" >> ./build_results.html
echo " <script src=\"https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js\"></script>" >> ./build_results.html
echo " <script src=\"https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js\"></script>" >> ./build_results.html
echo " <title>Build Results for $JOB_NAME job build #$BUILD_ID</title>" >> ./build_results.html
echo " <base href = \"http://www.openairinterface.org/\" />" >> ./build_results.html
echo "</head>" >> ./build_results.html
echo "<body><div class=\"container\">" >> ./build_results.html
echo " <br>" >> ./build_results.html
echo " <table style=\"border-collapse: collapse; border: none;\">" >> ./build_results.html
echo " <tr style=\"border-collapse: collapse; border: none;\">" >> ./build_results.html
echo " <td style=\"border-collapse: collapse; border: none;\">" >> ./build_results.html
echo " <a href=\"http://www.openairinterface.org/\">" >> ./build_results.html
echo " <img src=\"/wp-content/uploads/2016/03/cropped-oai_final_logo2.png\" alt=\"\" border=\"none\" height=50 width=150>" >> ./build_results.html
echo " </img>" >> ./build_results.html
echo " </a>" >> ./build_results.html
echo " </td>" >> ./build_results.html
echo " <td style=\"border-collapse: collapse; border: none; vertical-align: center;\">" >> ./build_results.html
echo " <b><font size = \"6\">Job Summary -- Job: $JOB_NAME -- Build-ID: $BUILD_ID</font></b>" >> ./build_results.html
echo " </td>" >> ./build_results.html
echo " </tr>" >> ./build_results.html
echo " </table>" >> ./build_results.html
echo " <br>" >> ./build_results.html
echo " <table border = \"1\">" >> ./build_results.html
echo " <tr>" >> ./build_results.html
echo " <td bgcolor = \"lightcyan\" > <span class=\"glyphicon glyphicon-time\"></span> Build Start Time (UTC)</td>" >> ./build_results.html
echo " <td>TEMPLATE_BUILD_TIME</td>" >> ./build_results.html
echo " </tr>" >> ./build_results.html
echo " <tr>" >> ./build_results.html
echo " <td bgcolor = \"lightcyan\" > <span class=\"glyphicon glyphicon-cloud-upload\"></span> GIT Repository</td>" >> ./build_results.html
echo " <td><a href=\"$GIT_URL\">$GIT_URL</a></td>" >> ./build_results.html
echo " </tr>" >> ./build_results.html
echo " <tr>" >> ./build_results.html
echo " <td bgcolor = \"lightcyan\" > <span class=\"glyphicon glyphicon-wrench\"></span> Job Trigger</td>" >> ./build_results.html
if [ $PU_TRIG -eq 1 ]; then echo " <td>Push Event</td>" >> ./build_results.html; fi
if [ $MR_TRIG -eq 1 ]; then echo " <td>Merge-Request</td>" >> ./build_results.html; fi
echo " </tr>" >> ./build_results.html
if [ $PU_TRIG -eq 1 ]
then
echo ""
echo "Syntax Error: missing push information."
# TODO : list missing info
echo ""
exit 1
echo " <tr>" >> ./build_results.html
echo " <td bgcolor = \"lightcyan\" > <span class=\"glyphicon glyphicon-tree-deciduous\"></span> Branch</td>" >> ./build_results.html
echo " <td>$SOURCE_BRANCH</td>" >> ./build_results.html
echo " </tr>" >> ./build_results.html
echo " <tr>" >> ./build_results.html
echo " <td bgcolor = \"lightcyan\" > <span class=\"glyphicon glyphicon-tag\"></span> Commit ID</td>" >> ./build_results.html
echo " <td>$SOURCE_COMMIT_ID</td>" >> ./build_results.html
echo " </tr>" >> ./build_results.html
if [ -e .git/CI_COMMIT_MSG ]
then
echo " <tr>" >> ./build_results.html
echo " <td bgcolor = \"lightcyan\" > <span class=\"glyphicon glyphicon-comment\"></span> Commit Message</td>" >> ./build_results.html
MSG=`cat .git/CI_COMMIT_MSG`
echo " <td>$MSG</td>" >> ./build_results.html
echo " </tr>" >> ./build_results.html
fi
fi
fi
if [ $MR_TRIG -eq 1 ]
then
if [ $mr_checker -ne 15 ]
if [ $MR_TRIG -eq 1 ]
then
echo ""
echo "Syntax Error: missing merge-request information."
# TODO : list missing info
echo ""
exit 1
echo " <tr>" >> ./build_results.html
echo " <td bgcolor = \"lightcyan\" > <span class=\"glyphicon glyphicon-log-out\"></span> Source Branch</td>" >> ./build_results.html
echo " <td>$SOURCE_BRANCH</td>" >> ./build_results.html
echo " </tr>" >> ./build_results.html
echo " <tr>" >> ./build_results.html
echo " <td bgcolor = \"lightcyan\" > <span class=\"glyphicon glyphicon-tag\"></span> Source Commit ID</td>" >> ./build_results.html
echo " <td>$SOURCE_COMMIT_ID</td>" >> ./build_results.html
echo " </tr>" >> ./build_results.html
if [ -e .git/CI_COMMIT_MSG ]
then
echo " <tr>" >> ./build_results.html
echo " <td bgcolor = \"lightcyan\" > <span class=\"glyphicon glyphicon-comment\"></span> Source Commit Message</td>" >> ./build_results.html
MSG=`cat .git/CI_COMMIT_MSG`
echo " <td>$MSG</td>" >> ./build_results.html
echo " </tr>" >> ./build_results.html
fi
echo " <tr>" >> ./build_results.html
echo " <td bgcolor = \"lightcyan\" > <span class=\"glyphicon glyphicon-log-in\"></span> Target Branch</td>" >> ./build_results.html
echo " <td>$TARGET_BRANCH</td>" >> ./build_results.html
echo " </tr>" >> ./build_results.html
echo " <tr>" >> ./build_results.html
echo " <td bgcolor = \"lightcyan\" > <span class=\"glyphicon glyphicon-tag\"></span> Target Commit ID</td>" >> ./build_results.html
echo " <td>$TARGET_COMMIT_ID</td>" >> ./build_results.html
echo " </tr>" >> ./build_results.html
fi
fi
echo " </table>" >> ./build_results.html
echo " <h2>Build Summary</h2>" >> ./build_results.html
echo "<!DOCTYPE html>" > ./build_results.html
echo "<html class=\"no-js\" lang=\"en-US\">" >> ./build_results.html
echo "<head>" >> ./build_results.html
echo " <title>Build Results for $JOB_NAME job build #$BUILD_ID</title>" >> ./build_results.html
echo " <base href = \"http://www.openairinterface.org/\" />" >> ./build_results.html
echo "</head>" >> ./build_results.html
echo "<body>" >> ./build_results.html
echo " <table style=\"border-collapse: collapse; border: none;\">" >> ./build_results.html
echo " <tr style=\"border-collapse: collapse; border: none;\">" >> ./build_results.html
echo " <td style=\"border-collapse: collapse; border: none;\">" >> ./build_results.html
echo " <a href=\"http://www.openairinterface.org/\">" >> ./build_results.html
echo " <img src=\"/wp-content/uploads/2016/03/cropped-oai_final_logo2.png\" alt=\"\" border=\"none\" height=50 width=150>" >> ./build_results.html
echo " </img>" >> ./build_results.html
echo " </a>" >> ./build_results.html
echo " </td>" >> ./build_results.html
echo " <td style=\"border-collapse: collapse; border: none; vertical-align: center;\">" >> ./build_results.html
echo " <b><font size = \"6\">Job Summary -- Job: $JOB_NAME -- Build-ID: $BUILD_ID</font></b>" >> ./build_results.html
echo " </td>" >> ./build_results.html
echo " </tr>" >> ./build_results.html
echo " </table>" >> ./build_results.html
echo " <br>" >> ./build_results.html
echo " <table border = \"1\">" >> ./build_results.html
echo " <tr>" >> ./build_results.html
echo " <td bgcolor = \"lightcyan\" >Build Start Time (UTC)</td>" >> ./build_results.html
echo " <td>TEMPLATE_BUILD_TIME</td>" >> ./build_results.html
echo " </tr>" >> ./build_results.html
echo " <tr>" >> ./build_results.html
echo " <td bgcolor = \"lightcyan\" >GIT Repository</td>" >> ./build_results.html
echo " <td>$GIT_URL</td>" >> ./build_results.html
echo " </tr>" >> ./build_results.html
echo " <tr>" >> ./build_results.html
echo " <td bgcolor = \"lightcyan\" >Job Trigger</td>" >> ./build_results.html
if [ $PU_TRIG -eq 1 ]; then echo " <td>Push Event</td>" >> ./build_results.html; fi
if [ $MR_TRIG -eq 1 ]; then echo " <td>Merge-Request</td>" >> ./build_results.html; fi
echo " </tr>" >> ./build_results.html
if [ $PU_TRIG -eq 1 ]
then
echo " <tr>" >> ./build_results.html
echo " <td bgcolor = \"lightcyan\" >Branch</td>" >> ./build_results.html
echo " <td>$SOURCE_BRANCH</td>" >> ./build_results.html
echo " </tr>" >> ./build_results.html
echo " <tr>" >> ./build_results.html
echo " <td bgcolor = \"lightcyan\" >Commit ID</td>" >> ./build_results.html
echo " <td>$SOURCE_COMMIT_ID</td>" >> ./build_results.html
echo " </tr>" >> ./build_results.html
fi
if [ $MR_TRIG -eq 1 ]
then
echo " <tr>" >> ./build_results.html
echo " <td bgcolor = \"lightcyan\" >Source Branch</td>" >> ./build_results.html
echo " <td>$SOURCE_BRANCH</td>" >> ./build_results.html
echo " </tr>" >> ./build_results.html
echo " <tr>" >> ./build_results.html
echo " <td bgcolor = \"lightcyan\" >Source Commit ID</td>" >> ./build_results.html
echo " <td>$SOURCE_COMMIT_ID</td>" >> ./build_results.html
echo " </tr>" >> ./build_results.html
echo " <tr>" >> ./build_results.html
echo " <td bgcolor = \"lightcyan\" >Target Branch</td>" >> ./build_results.html
echo " <td>$TARGET_BRANCH</td>" >> ./build_results.html
echo " </tr>" >> ./build_results.html
echo " <tr>" >> ./build_results.html
echo " <td bgcolor = \"lightcyan\" >Target Commit ID</td>" >> ./build_results.html
echo " <td>$TARGET_COMMIT_ID</td>" >> ./build_results.html
echo " </tr>" >> ./build_results.html
fi
echo " </table>" >> ./build_results.html
echo " <h2>Build Summary</h2>" >> ./build_results.html
if [ -f ./oai_rules_result.txt ]
then
echo " <h3>OAI Coding / Formatting Guidelines Check</h3>" >> ./build_results.html
echo " <table border = "1">" >> ./build_results.html
echo " <tr>" >> ./build_results.html
echo " <td bgcolor = \"lightcyan\" >Result:</td>" >> ./build_results.html
NB_FILES=`cat ./oai_rules_result.txt`
if [ $NB_FILES = "0" ]
then
if [ $PU_TRIG -eq 1 ]; then echo " <td bgcolor = \"green\">All files in repository follow OAI rules. </td>" >> ./build_results.html; fi
if [ $MR_TRIG -eq 1 ]; then echo " <td bgcolor = \"green\">All modified files in Merge-Request follow OAI rules.</td>" >> ./build_results.html; fi
echo " </tr>" >> ./build_results.html
echo " </table>" >> ./build_results.html
else
if [ $PU_TRIG -eq 1 ]; then echo " <td bgcolor = \"orange\">$NB_FILES files in repository DO NOT follow OAI rules. </td>" >> ./build_results.html; fi
if [ $MR_TRIG -eq 1 ]; then echo " <td bgcolor = \"orange\">$NB_FILES modified files in Merge-Request DO NOT follow OAI rules.</td>" >> ./build_results.html; fi
echo " </tr>" >> ./build_results.html
if [ -f ./oai_rules_result.txt ]
then
echo " <h3>OAI Coding / Formatting Guidelines Check</h3>" >> ./build_results.html
NB_FILES=`cat ./oai_rules_result.txt`
if [ $NB_FILES = "0" ]
then
echo " <div class=\"alert alert-success\">" >> ./build_results.html
if [ $PU_TRIG -eq 1 ]; then echo " <strong>All files in repository follow OAI rules. <span class=\"glyphicon glyphicon-ok-circle\"></span></strong>" >> ./build_results.html; fi
if [ $MR_TRIG -eq 1 ]; then echo " <strong>All modified files in Merge-Request follow OAI rules. <span class=\"glyphicon glyphicon-ok-circle\"></span></strong>" >> ./build_results.html; fi
echo " </div>" >> ./build_results.html
else
echo " <div class=\"alert alert-warning\">" >> ./build_results.html
if [ $PU_TRIG -eq 1 ]; then echo " <strong>$NB_FILES files in repository DO NOT follow OAI rules. <span class=\"glyphicon glyphicon-warning-sign\"></span></strong>" >> ./build_results.html; fi
if [ $MR_TRIG -eq 1 ]; then echo " <strong>$NB_FILES modified files in Merge-Request DO NOT follow OAI rules. <span class=\"glyphicon glyphicon-warning-sign\"></span></strong>" >> ./build_results.html; fi
echo " </div>" >> ./build_results.html
fi
if [ -f ./oai_rules_result_list.txt ]
then
awk '{print " <tr><td></td><td>"$1"</td></tr>"}' ./oai_rules_result_list.txt >> ./build_results.html
echo " <button data-toggle=\"collapse\" data-target=\"#oai-formatting-details\">More details on formatting check</button>" >> ./build_results.html
echo " <div id=\"oai-formatting-details\" class=\"collapse\">" >> ./build_results.html
echo " <p>Please apply the following command to this(ese) file(s): </p>" >> ./build_results.html
echo " <p style=\"margin-left: 30px\"><strong><code>astyle --options=ci-scripts/astyle-options.txt filename(s)</code></strong></p>" >> ./build_results.html
echo " <table border = 1>" >> ./build_results.html
echo " <tr>" >> ./build_results.html
echo " <th bgcolor = \"lightcyan\" >Filename</th>" >> ./build_results.html
echo " </tr>" >> ./build_results.html
awk '{print " <tr><td>"$1"</td></tr>"}' ./oai_rules_result_list.txt >> ./build_results.html
echo " </table>" >> ./build_results.html
echo " </div>" >> ./build_results.html
fi
echo " </table>" >> ./build_results.html
echo " <p>Please apply the following command to this(ese) file(s): </p>" >> ./build_results.html
echo " <p style=\"margin-left: 30px\"><strong><code>astyle --options=ci-scripts/astyle-options.txt filename(s)</code></strong></p>" >> ./build_results.html
fi
fi
echo " <h2>Ubuntu 16.04 LTS -- Summary</h2>" >> ./build_results.html
echo " <h2>Ubuntu 16.04 LTS -- Summary</h2>" >> ./build_results.html
sca_summary_table_header "OAI Static Code Analysis with CPPCHECK"
sca_summary_table_row ./archives/cppcheck/cppcheck.xml "Uninitialized variable" uninitvar
sca_summary_table_row ./archives/cppcheck/cppcheck.xml "Uninitialized struct member" uninitStructMember
sca_summary_table_row ./archives/cppcheck/cppcheck.xml "Memory leak" memleak
sca_summary_table_row ./archives/cppcheck/cppcheck.xml "Memory is freed twice" doubleFree
sca_summary_table_row ./archives/cppcheck/cppcheck.xml "Resource leak" resourceLeak
sca_summary_table_row ./archives/cppcheck/cppcheck.xml "Possible null pointer dereference" nullPointer
sca_summary_table_row ./archives/cppcheck/cppcheck.xml "Array access out of bounds" arrayIndexOutOfBounds
sca_summary_table_row ./archives/cppcheck/cppcheck.xml "Buffer is accessed out of bounds" bufferAccessOutOfBounds
sca_summary_table_row ./archives/cppcheck/cppcheck.xml "Expression depends on order of evaluation of side effects" unknownEvaluationOrder
sca_summary_table_footer ./archives/cppcheck/cppcheck.xml
sca_summary_table_header ./archives/cppcheck/cppcheck.xml "OAI Static Code Analysis with CPPCHECK"
sca_summary_table_row ./archives/cppcheck/cppcheck.xml "Uninitialized variable" uninitvar
sca_summary_table_row ./archives/cppcheck/cppcheck.xml "Uninitialized struct member" uninitStructMember
sca_summary_table_row ./archives/cppcheck/cppcheck.xml "Memory leak" memleak
sca_summary_table_row ./archives/cppcheck/cppcheck.xml "Memory is freed twice" doubleFree
sca_summary_table_row ./archives/cppcheck/cppcheck.xml "Resource leak" resourceLeak
sca_summary_table_row ./archives/cppcheck/cppcheck.xml "Possible null pointer dereference" nullPointer
sca_summary_table_row ./archives/cppcheck/cppcheck.xml "Array access out of bounds" arrayIndexOutOfBounds
sca_summary_table_row ./archives/cppcheck/cppcheck.xml "Buffer is accessed out of bounds" bufferAccessOutOfBounds
sca_summary_table_row ./archives/cppcheck/cppcheck.xml "Expression depends on order of evaluation of side effects" unknownEvaluationOrder
sca_summary_table_footer ./archives/cppcheck/cppcheck.xml
summary_table_header "OAI Build eNB -- USRP option"
summary_table_row "LTE SoftModem - Release 14" ./archives/enb_usrp/lte-softmodem.Rel14.txt "Built target lte-softmodem" ./enb_usrp_row1.html
summary_table_row "Coding - Release 14" ./archives/enb_usrp/coding.Rel14.txt "Built target coding" ./enb_usrp_row2.html
summary_table_row "OAI USRP device if - Release 14" ./archives/enb_usrp/oai_usrpdevif.Rel14.txt "Built target oai_usrpdevif" ./enb_usrp_row3.html
summary_table_row "Parameters Lib Config - Release 14" ./archives/enb_usrp/params_libconfig.Rel14.txt "Built target params_libconfig" ./enb_usrp_row4.html
summary_table_footer
summary_table_header "OAI Build: 4G LTE eNB -- USRP option" ./archives/enb_usrp
summary_table_row "LTE SoftModem - Release 15" ./archives/enb_usrp/lte-softmodem.Rel15.txt "Built target lte-softmodem" ./enb_usrp_row1.html
summary_table_row "Coding - Release 15" ./archives/enb_usrp/coding.Rel15.txt "Built target coding" ./enb_usrp_row2.html
summary_table_row "OAI USRP device if - Release 15" ./archives/enb_usrp/oai_usrpdevif.Rel15.txt "Built target oai_usrpdevif" ./enb_usrp_row3.html
summary_table_row "OAI ETHERNET transport - Release 15" ./archives/enb_usrp/oai_eth_transpro.Rel15.txt "Built target oai_eth_transpro" ./enb_usrp_row4.html
summary_table_row "Parameters Lib Config - Release 15" ./archives/enb_usrp/params_libconfig.Rel15.txt "Built target params_libconfig" ./enb_usrp_row5.html
summary_table_row "NASMESH - Release 15" ./archives/enb_usrp/nasmesh.Rel15.txt "Built target nasmesh" ./enb_usrp_row6.html
summary_table_row "RB Tool - Release 15" ./archives/enb_usrp/rb_tool.Rel15.txt "Built target rb_tool" ./enb_usrp_row7.html
summary_table_row "RF Simulator - Release 15" ./archives/enb_usrp/rfsimulator.Rel15.txt "Built target rfsimulator" ./enb_usrp_row8.html
summary_table_row "TCP Bridge - Release 15" ./archives/enb_usrp/tcp_bridge_oai.Rel15.txt "Built target tcp_bridge_oai" ./enb_usrp_row9.html
summary_table_footer
summary_table_header "OAI Build basic simulator option"
summary_table_row "Basic Simulator eNb - Release 14" ./archives/basic_sim/basic_simulator_enb.txt "Built target lte-softmodem" ./basic_sim_row1.html
summary_table_row "Basic Simulator UE - Release 14" ./archives/basic_sim/basic_simulator_ue.txt "Built target lte-uesoftmodem" ./basic_sim_row2.html
summary_table_row "Conf 2 UE data - Release 14" ./archives/basic_sim/conf2uedata.Rel14.txt "Built target conf2uedata" ./basic_sim_row3.html
summary_table_footer
summary_table_header "OAI Build: 4G LTE basic simulator option" ./archives/basic_sim
summary_table_row "LTE SoftModem - Release 15" ./archives/basic_sim/lte-softmodem.Rel15.txt "Built target lte-softmodem" ./basic_sim_row1.html
summary_table_row "LTE UE SoftModem - Release 15" ./archives/basic_sim/lte-uesoftmodem.Rel15.txt "Built target lte-uesoftmodem" ./basic_sim_row2.htm
summary_table_row "Coding - Release 15" ./archives/basic_sim/coding.Rel15.txt "Built target coding" ./basic_sim_row3.html
summary_table_row "Conf 2 UE data - Release 15" ./archives/basic_sim/conf2uedata.Rel15.txt "Built target conf2uedata" ./basic_sim_row4.html
summary_table_row "OAI ETHERNET transport - Release 15" ./archives/basic_sim/oai_eth_transpro.Rel15.txt "Built target oai_eth_transpro" ./basic_sim_row5.html
summary_table_row "NASMESH - Release 15" ./archives/basic_sim/nasmesh.Rel15.txt "Built target nasmesh" ./basic_sim_row6.html
summary_table_row "Parameters Lib Config - Release 15" ./archives/basic_sim/params_libconfig.Rel15.txt "Built target params_libconfig" ./basic_sim_row7.html
summary_table_row "RB Tool - Release 15" ./archives/basic_sim/rb_tool.Rel15.txt "Built target rb_tool" ./basic_sim_row8.html
summary_table_row "RF Simulator - Release 15" ./archives/basic_sim/rfsimulator.Rel15.txt "Built target rfsimulator" ./basic_sim_row9.html
summary_table_row "TCP Bridge - Release 15" ./archives/basic_sim/tcp_bridge_oai.Rel15.txt "Built target tcp_bridge_oai" ./basic_sim_row10.html
summary_table_row "UE IP - Release 15" ./archives/basic_sim/ue_ip.Rel15.txt "Built target ue_ip" ./basic_sim_row11.html
summary_table_row "USIM - Release 15" ./archives/basic_sim/usim.Rel15.txt "Built target usim" ./basic_sim_row12.html
summary_table_row "NVRAM - Release 15" ./archives/basic_sim/nvram.Rel15.txt "Built target nvram" ./basic_sim_row13.html
summary_table_footer
summary_table_header "OAI Build Physical simulators option"
summary_table_row "DL Simulator - Release 14" ./archives/phy_sim/dlsim.Rel14.txt "Built target dlsim" ./phy_sim_row1.html
summary_table_row "UL Simulator - Release 14" ./archives/phy_sim/ulsim.Rel14.txt "Built target ulsim" ./phy_sim_row2.html
summary_table_row "Coding - Release 14" ./archives/phy_sim/coding.Rel14.txt "Built target coding" ./phy_sim_row3.html
summary_table_footer
summary_table_header "OAI Build: 4G LTE / 5G NR Physical simulators option" ./archives/phy_sim
summary_table_row "LTE DL Simulator - Release 15" ./archives/phy_sim/dlsim.Rel15.txt "Built target dlsim" ./phy_sim_row1.html
summary_table_row "LTE UL Simulator - Release 15" ./archives/phy_sim/ulsim.Rel15.txt "Built target ulsim" ./phy_sim_row2.html
summary_table_row "Coding - Release 15" ./archives/phy_sim/coding.Rel15.txt "Built target coding" ./phy_sim_row3.html
if [ -f ./archives/phy_sim/ldpctest.Rel15.txt ]
then
summary_table_row "NR LDPC Test - Release 15" ./archives/phy_sim/ldpctest.Rel15.txt "Built target ldpctest" ./phy_sim_row4.html
fi
if [ -f ./archives/phy_sim/polartest.Rel15.txt ]
then
summary_table_row "NR Polar Test - Release 15" ./archives/phy_sim/polartest.Rel15.txt "Built target polartest" ./phy_sim_row5.html
fi
if [ -f ./archives/phy_sim/nr_pbchsim.Rel15.txt ]
then
summary_table_row "NR PBCH Test - Release 15" ./archives/phy_sim/nr_pbchsim.Rel15.txt "Built target nr_pbchsim" ./phy_sim_row6.html
fi
if [ -f ./archives/phy_sim/nr_dlschsim.Rel15.txt ]
then
summary_table_row "NR DLSCH Test - Release 15" ./archives/phy_sim/nr_dlschsim.Rel15.txt "Built target nr_dlschsim" ./phy_sim_row7.html
fi
if [ -f ./archives/phy_sim/nr_pucchsim.Rel15.txt ]
then
summary_table_row "NR PUCCH Test - Release 15" ./archives/phy_sim/nr_pucchsim.Rel15.txt "Built target nr_pucchsim" ./phy_sim_row8.html
fi
if [ -f ./archives/phy_sim/smallblocktest.Rel15.txt ]
then
summary_table_row "NR Small Block Test - Release 15" ./archives/phy_sim/smallblocktest.Rel15.txt "Built target smallblocktest" ./phy_sim_row9.html
fi
if [ -f ./archives/phy_sim/nr_dlsim.Rel15.txt ]
then
summary_table_row "NR DL Sim Test - Release 15" ./archives/phy_sim/nr_dlsim.Rel15.txt "Built target nr_dlsim" ./phy_sim_row10.html
fi
if [ -f ./archives/phy_sim/nr_ulschsim.Rel15.txt ]
then
summary_table_row "NR ULSCH Test - Release 15" ./archives/phy_sim/nr_ulschsim.Rel15.txt "Built target nr_ulschsim" ./phy_sim_row11.html
fi
if [ -f ./archives/phy_sim/nr_ulsim.Rel15.txt ]
then
summary_table_row "NR UL Sim Test - Release 15" ./archives/phy_sim/nr_ulsim.Rel15.txt "Built target nr_ulsim" ./phy_sim_row12.html
fi
summary_table_footer
summary_table_header "OAI Build eNB -- ETHERNET transport option"
summary_table_row "LTE SoftModem w/o S1 - Release 14" ./archives/enb_eth/lte-softmodem-nos1.Rel14.txt "Built target lte-softmodem" ./enb_eth_row1.html
summary_table_row "Coding - Release 14" ./archives/enb_eth/coding.Rel14.txt "Built target coding" ./enb_eth_row2.html
summary_table_row "OAI ETHERNET transport - Release 14" ./archives/enb_eth/oai_eth_transpro.Rel14.txt "Built target oai_eth_transpro" ./enb_eth_row3.html
summary_table_row "Parameters Lib Config - Release 14" ./archives/enb_eth/params_libconfig.Rel14.txt "Built target params_libconfig" ./enb_eth_row4.html
summary_table_row "RB Tools - Release 14" ./archives/enb_eth/rb_tool.Rel14.txt "Built target rb_tool" ./enb_eth_row5.html
summary_table_row "NAS Mesh - Release 14" ./archives/enb_eth/nasmesh.Rel14.txt "Built target nasmesh" ./enb_eth_row6.html
summary_table_footer
if [ -f archives/gnb_usrp/nr-softmodem.Rel15.txt ]
then
summary_table_header "OAI Build: 5G NR gNB -- USRP option" ./archives/gnb_usrp
summary_table_row "5G NR SoftModem - Release 15" ./archives/gnb_usrp/nr-softmodem.Rel15.txt "Built target nr-softmodem" ./gnb_usrp_row1.html
summary_table_row "Coding - Release 15" ./archives/gnb_usrp/coding.Rel15.txt "Built target coding" ./gnb_usrp_row2.html
summary_table_row "OAI USRP device if - Release 15" ./archives/gnb_usrp/oai_usrpdevif.Rel15.txt "Built target oai_usrpdevif" ./gnb_usrp_row3.html
summary_table_row "OAI ETHERNET transport - Release 15" ./archives/gnb_usrp/oai_eth_transpro.Rel15.txt "Built target oai_eth_transpro" ./gnb_usrp_row4.html
summary_table_row "NASMESH - Release 15" ./archives/gnb_usrp/nasmesh.Rel15.txt "Built target nasmesh" ./gnb_usrp_row5.html
summary_table_row "Parameters Lib Config - Release 15" ./archives/gnb_usrp/params_libconfig.Rel15.txt "Built target params_libconfig" ./gnb_usrp_row6.html
summary_table_row "RB Tool - Release 15" ./archives/gnb_usrp/rb_tool.Rel15.txt "Built target rb_tool" ./gnb_usrp_row7.html
summary_table_footer
fi
summary_table_header "OAI Build UE -- ETHERNET transport option"
summary_table_row "LTE UE SoftModem w/o S1 - Release 14" ./archives/ue_eth/lte-uesoftmodem-nos1.Rel14.txt "Built target lte-uesoftmodem" ./ue_eth_row1.html
summary_table_row "Coding - Release 14" ./archives/ue_eth/coding.Rel14.txt "Built target coding" ./ue_eth_row2.html
summary_table_row "OAI ETHERNET transport - Release 14" ./archives/ue_eth/oai_eth_transpro.Rel14.txt "Built target oai_eth_transpro" ./ue_eth_row3.html
summary_table_row "Parameters Lib Config - Release 14" ./archives/ue_eth/params_libconfig.Rel14.txt "Built target params_libconfig" ./ue_eth_row4.html
summary_table_row "RB Tools - Release 14" ./archives/ue_eth/rb_tool.Rel14.txt "Built target rb_tool" ./ue_eth_row5.html
summary_table_row "NAS Mesh - Release 14" ./archives/ue_eth/nasmesh.Rel14.txt "Built target nasmesh" ./ue_eth_row6.html
summary_table_footer
if [ -f archives/nr_ue_usrp/nr-uesoftmodem.Rel15.txt ]
then
summary_table_header "OAI Build: 5G NR UE -- USRP option" ./archives/nr_ue_usrp
summary_table_row "5G NR UE SoftModem - Release 15" ./archives/nr_ue_usrp/nr-uesoftmodem.Rel15.txt "Built target nr-uesoftmodem" ./nr_ue_usrp_row1.html
summary_table_row "Coding - Release 15" ./archives/nr_ue_usrp/coding.Rel15.txt "Built target coding" ./nr_ue_usrp_row2.html
summary_table_row "OAI USRP device if - Release 15" ./archives/nr_ue_usrp/oai_usrpdevif.Rel15.txt "Built target oai_usrpdevif" ./nr_ue_usrp_row3.html
summary_table_row "OAI ETHERNET transport - Release 15" ./archives/nr_ue_usrp/oai_eth_transpro.Rel15.txt "Built target oai_eth_transpro" ./nr_ue_usrp_row4.html
summary_table_row "NASMESH - Release 15" ./archives/nr_ue_usrp/nasmesh.Rel15.txt "Built target nasmesh" ./nr_ue_usrp_row5.html
summary_table_row "Parameters Lib Config - Release 15" ./archives/nr_ue_usrp/params_libconfig.Rel15.txt "Built target params_libconfig" ./nr_ue_usrp_row6.html
summary_table_row "RB Tool - Release 15" ./archives/nr_ue_usrp/rb_tool.Rel15.txt "Built target rb_tool" ./nr_ue_usrp_row7.html
summary_table_footer
fi
echo " <h2>Red Hat (CentOS Linux release 7.4.1708) -- Summary</h2>" >> ./build_results.html
summary_table_header "OAI Build: 4G LTE eNB -- ETHERNET transport option" ./archives/enb_eth
summary_table_row "LTE SoftModem - Release 15" ./archives/enb_eth/lte-softmodem.Rel15.txt "Built target lte-softmodem" ./enb_eth_row1.html
summary_table_row "Coding - Release 15" ./archives/enb_eth/coding.Rel15.txt "Built target coding" ./enb_eth_row2.html
summary_table_row "OAI ETHERNET transport - Release 15" ./archives/enb_eth/oai_eth_transpro.Rel15.txt "Built target oai_eth_transpro" ./enb_eth_row3.html
summary_table_row "Parameters Lib Config - Release 15" ./archives/enb_eth/params_libconfig.Rel15.txt "Built target params_libconfig" ./enb_eth_row4.html
summary_table_row "RF Simulator - Release 15" ./archives/enb_eth/rfsimulator.Rel15.txt "Built target rfsimulator" ./enb_eth_row5.html
summary_table_row "TCP OAI Bridge - Release 15" ./archives/enb_eth/tcp_bridge_oai.Rel15.txt "Built target tcp_bridge_oai" ./enb_eth_row6.html
summary_table_footer
summary_table_header "Red Hat -- OAI Build eNB -- USRP option"
summary_table_row "LTE SoftModem - Release 14" ./archives/red_hat/lte-softmodem.Rel14.txt "Built target lte-softmodem" ./enb_usrp_rh_row1.html
summary_table_row "Coding - Release 14" ./archives/red_hat/coding.Rel14.txt "Built target coding" ./enb_usrp_rh_row2.html
summary_table_row "OAI USRP device if - Release 14" ./archives/red_hat/oai_usrpdevif.Rel14.txt "Built target oai_usrpdevif" ./enb_usrp_rh_row3.html
summary_table_row "Parameters Lib Config - Release 14" ./archives/red_hat/params_libconfig.Rel14.txt "Built target params_libconfig" ./enb_usrp_rh_row4.html
summary_table_footer
summary_table_header "OAI Build: 4G LTE UE -- ETHERNET transport option" ./archives/ue_eth
summary_table_row "LTE UE SoftModem - Release 15" ./archives/ue_eth/lte-uesoftmodem.Rel15.txt "Built target lte-uesoftmodem" ./ue_eth_row1.html
summary_table_row "Coding - Release 15" ./archives/ue_eth/coding.Rel15.txt "Built target coding" ./ue_eth_row2.html
summary_table_row "OAI ETHERNET transport - Release 15" ./archives/ue_eth/oai_eth_transpro.Rel15.txt "Built target oai_eth_transpro" ./ue_eth_row3.html
summary_table_row "Parameters Lib Config - Release 15" ./archives/ue_eth/params_libconfig.Rel15.txt "Built target params_libconfig" ./ue_eth_row4.html
summary_table_row "RF Simulator - Release 15" ./archives/ue_eth/rfsimulator.Rel15.txt "Built target rfsimulator" ./ue_eth_row5.html
summary_table_row "TCP OAI Bridge - Release 15" ./archives/ue_eth/tcp_bridge_oai.Rel15.txt "Built target tcp_bridge_oai" ./ue_eth_row6.html
summary_table_row "Conf 2 UE Data - Release 15" ./archives/ue_eth/conf2uedata.Rel15.txt "Built target conf2uedata" ./ue_eth_row7.html
summary_table_row "NVRAM - Release 15" ./archives/ue_eth/nvram.Rel15.txt "Built target nvram" ./ue_eth_row8.html
summary_table_row "UE IP - Release 15" ./archives/ue_eth/ue_ip.Rel15.txt "Built target ue_ip" ./ue_eth_row9.html
summary_table_row "USIM - Release 15" ./archives/ue_eth/usim.Rel15.txt "Built target usim" ./ue_eth_row9a.html
summary_table_footer
echo " <h3>Details</h3>" >> ./build_results.html
if [ -e ./archives/red_hat ]
then
echo " <h2>Red Hat Enterprise Linux Server release 7.6) -- Summary</h2>" >> ./build_results.html
for DETAILS_TABLE in `ls ./enb_usrp_row*.html`
do
cat $DETAILS_TABLE >> ./build_results.html
done
for DETAILS_TABLE in `ls ./basic_sim_row*.html`
do
cat $DETAILS_TABLE >> ./build_results.html
done
for DETAILS_TABLE in `ls ./phy_sim_row*.html`
do
cat $DETAILS_TABLE >> ./build_results.html
done
for DETAILS_TABLE in `ls ./enb_eth_row*.html`
do
cat $DETAILS_TABLE >> ./build_results.html
done
for DETAILS_TABLE in `ls ./ue_eth_row*.html`
do
cat $DETAILS_TABLE >> ./build_results.html
done
for DETAILS_TABLE in `ls ./enb_usrp_rh_row*.html`
do
cat $DETAILS_TABLE >> ./build_results.html
done
rm -f ./enb_usrp_row*.html ./basic_sim_row*.html ./phy_sim_row*.html ./enb_eth_row*.html ./ue_eth_row*.html ./enb_usrp_rh_row*.html
summary_table_header "OAI Build: 4G LTE eNB -- USRP option (RHEL)" ./archives/red_hat
summary_table_row "LTE SoftModem - Release 15" ./archives/red_hat/lte-softmodem.Rel15.txt "Built target lte-softmodem" ./enb_usrp_rh_row1.html
summary_table_row "Coding - Release 15" ./archives/red_hat/coding.Rel15.txt "Built target coding" ./enb_usrp_rh_row2.html
summary_table_row "OAI USRP device if - Release 15" ./archives/red_hat/oai_usrpdevif.Rel15.txt "Built target oai_usrpdevif" ./enb_usrp_rh_row3.html
summary_table_row "Parameters Lib Config - Release 15" ./archives/red_hat/params_libconfig.Rel15.txt "Built target params_libconfig" ./enb_usrp_rh_row4.html
summary_table_footer
fi
echo "</body>" >> ./build_results.html
echo "</html>" >> ./build_results.html
echo " <h3>Details</h3>" >> ./build_results.html
echo " <button data-toggle=\"collapse\" data-target=\"#oai-compilation-details\">Details for Compilation Errors and Warnings </button>" >> ./build_results.html
echo " <div id=\"oai-compilation-details\" class=\"collapse\">" >> ./build_results.html
exit 0
if [ -f ./enb_usrp_row1.html ] || [ -f ./enb_usrp_row2.html ] || [ -f ./enb_usrp_row3.html ] || [ -f ./enb_usrp_row4.html ]
then
for DETAILS_TABLE in `ls ./enb_usrp_row*.html`
do
cat $DETAILS_TABLE >> ./build_results.html
done
fi
if [ -f ./basic_sim_row1.html ] || [ -f ./basic_sim_row2.html ] || [ -f ./basic_sim_row3.html ] || [ -f ./basic_sim_row4.html ] || [ -f ./basic_sim_row5.html ]
then
for DETAILS_TABLE in `ls ./basic_sim_row*.html`
do
cat $DETAILS_TABLE >> ./build_results.html
done
fi
if [ -f ./phy_sim_row1.html ] || [ -f ./phy_sim_row2.html ] || [ -f ./phy_sim_row3.html ] || [ -f ./phy_sim_row4.html ] || [ -f ./phy_sim_row5.html ] || [ -f ./phy_sim_row6.html ] || [ -f ./phy_sim_row7.html ] || [ -f ./phy_sim_row8.html ]
then
for DETAILS_TABLE in `ls ./phy_sim_row*.html`
do
cat $DETAILS_TABLE >> ./build_results.html
done
fi
if [ -f ./gnb_usrp_row1.html ] || [ -f ./gnb_usrp_row2.html ] || [ -f ./gnb_usrp_row3.html ] || [ -f ./gnb_usrp_row4.html ]
then
for DETAILS_TABLE in `ls ./gnb_usrp_row*.html`
do
cat $DETAILS_TABLE >> ./build_results.html
done
fi
if [ -f ./nr_ue_usrp_row1.html ] || [ -f ./nr_ue_usrp_row2.html ] || [ -f ./nr_ue_usrp_row3.html ] || [ -f ./nr_ue_usrp_row4.html ]
then
for DETAILS_TABLE in `ls ./nr_ue_usrp_row*.html`
do
cat $DETAILS_TABLE >> ./build_results.html
done
fi
if [ -f ./enb_eth_row1.html ] || [ -f ./enb_eth_row2.html ] || [ -f ./enb_eth_row3.html ] || [ -f ./enb_eth_row4.html ] || [ -f ./enb_eth_row5.html ] || [ -f ./enb_eth_row6.html ]
then
for DETAILS_TABLE in `ls ./enb_eth_row*.html`
do
cat $DETAILS_TABLE >> ./build_results.html
done
fi
if [ -f ./ue_eth_row1.html ] || [ -f ./ue_eth_row2.html ] || [ -f ./ue_eth_row3.html ] || [ -f ./ue_eth_row4.html ] || [ -f ./ue_eth_row5.html ] || [ -f ./ue_eth_row6.html ]
then
for DETAILS_TABLE in `ls ./ue_eth_row*.html`
do
cat $DETAILS_TABLE >> ./build_results.html
done
fi
if [ -f ./enb_usrp_rh_row1.html ] || [ -f ./enb_usrp_rh_row2.html ] || [ -f ./enb_usrp_rh_row3.html ] || [ -f ./enb_usrp_rh_row4.html ]
then
for DETAILS_TABLE in `ls ./enb_usrp_rh_row*.html`
do
cat $DETAILS_TABLE >> ./build_results.html
done
fi
rm -f ./*_row*.html
echo " </div>" >> ./build_results.html
echo " <p></p>" >> ./build_results.html
echo " <div class=\"well well-lg\">End of Build Report -- Copyright <span class=\"glyphicon glyphicon-copyright-mark\"></span> 2018 <a href=\"http://www.openairinterface.org/\">OpenAirInterface</a>. All Rights Reserved.</div>" >> ./build_results.html
echo "</div></body>" >> ./build_results.html
echo "</html>" >> ./build_results.html
}

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -1,3 +1,23 @@
#/*
# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
# * contributor license agreements. See the NOTICE file distributed with
# * this work for additional information regarding copyright ownership.
# * The OpenAirInterface Software Alliance licenses this file to You under
# * the OAI Public License, Version 1.1 (the "License"); you may not use this file
# * except in compliance with the License.
# * You may obtain a copy of the License at
# *
# * http://www.openairinterface.org/?page_id=698
# *
# * Unless required by applicable law or agreed to in writing, software
# * distributed under the License is distributed on an "AS IS" BASIS,
# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# * See the License for the specific language governing permissions and
# * limitations under the License.
# *-------------------------------------------------------------------------------
# * For more information about the OpenAirInterface (OAI) Software Alliance:
# * contact@openairinterface.org
# */
BEGIN{max=0;min=10000}
{
if ($0 ~/Mbits/) {

185
ci-scripts/waitBuildOnVM.sh Executable file
View File

@@ -0,0 +1,185 @@
#!/bin/bash
#/*
# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
# * contributor license agreements. See the NOTICE file distributed with
# * this work for additional information regarding copyright ownership.
# * The OpenAirInterface Software Alliance licenses this file to You under
# * the OAI Public License, Version 1.1 (the "License"); you may not use this file
# * except in compliance with the License.
# * You may obtain a copy of the License at
# *
# * http://www.openairinterface.org/?page_id=698
# *
# * Unless required by applicable law or agreed to in writing, software
# * distributed under the License is distributed on an "AS IS" BASIS,
# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# * See the License for the specific language governing permissions and
# * limitations under the License.
# *-------------------------------------------------------------------------------
# * For more information about the OpenAirInterface (OAI) Software Alliance:
# * contact@openairinterface.org
# */
function wait_usage {
echo "OAI CI VM script"
echo " Original Author: Raphael Defosseux"
echo " Requirements:"
echo " -- uvtool uvtool-libvirt apt-cacher"
echo " -- $VM_OSREL image already synced"
echo " Default:"
echo " -- eNB with USRP"
echo ""
echo "Usage:"
echo "------"
echo " oai-ci-vm-tool wait [OPTIONS]"
echo ""
command_options_usage
}
function wait_on_vm_build {
echo "############################################################"
echo "OAI CI VM script"
echo "############################################################"
echo "VM_NAME = $VM_NAME"
echo "VM_CMD_FILE = $VM_CMDS"
echo "JENKINS_WKSP = $JENKINS_WKSP"
echo "ARCHIVES_LOC = $ARCHIVES_LOC"
echo "BUILD_OPTIONS = $BUILD_OPTIONS"
IS_VM_ALIVE=`uvt-kvm list | grep -c $VM_NAME`
if [ $IS_VM_ALIVE -eq 0 ]
then
echo "############################################################"
echo "You should have created the VM before doing anything"
echo "############################################################"
STATUS=1
return
fi
echo "Waiting for VM to be started"
uvt-kvm wait $VM_NAME --insecure
VM_IP_ADDR=`uvt-kvm ip $VM_NAME`
echo "$VM_NAME has for IP addr = $VM_IP_ADDR"
echo "############################################################"
echo "Waiting build process to end on VM ($VM_NAME)"
echo "############################################################"
if [[ "$VM_NAME" == *"-cppcheck"* ]]
then
echo "echo \"ps -aux | grep cppcheck \"" >> $VM_CMDS
echo "while [ \$(ps -aux | grep --color=never cppcheck | grep -v grep | wc -l) -gt 0 ]; do sleep 3; done" >> $VM_CMDS
else
echo "echo \"ps -aux | grep build \"" >> $VM_CMDS
echo "while [ \$(ps -aux | grep --color=never build_oai | grep -v grep | wc -l) -gt 0 ]; do sleep 3; done" >> $VM_CMDS
fi
echo "echo \"df -h\"" >> $VM_CMDS
echo "df -h" >> $VM_CMDS
ssh -T -o StrictHostKeyChecking=no ubuntu@$VM_IP_ADDR < $VM_CMDS
rm -f $VM_CMDS
}
function check_on_vm_build {
echo "############################################################"
echo "Creating a tmp folder to store results and artifacts"
echo "############################################################"
if [ ! -d $JENKINS_WKSP/archives ]
then
mkdir $JENKINS_WKSP/archives
fi
if [ ! -d $ARCHIVES_LOC ]
then
mkdir $ARCHIVES_LOC
fi
scp -o StrictHostKeyChecking=no ubuntu@$VM_IP_ADDR:/home/ubuntu/tmp/cmake_targets/log/*.txt $ARCHIVES_LOC
if [[ "$VM_NAME" == *"-cppcheck"* ]]
then
scp -o StrictHostKeyChecking=no ubuntu@$VM_IP_ADDR:/home/ubuntu/tmp/cmake_targets/log/*.xml $ARCHIVES_LOC
fi
if [ $KEEP_VM_ALIVE -eq 0 ]
then
if [[ "$VM_NAME" == *"-enb-ethernet"* ]] || [[ "$VM_NAME" == *"-ue-ethernet"* ]]
then
echo "Hack to not destroy in current pipeline"
else
echo "############################################################"
echo "Destroying VM"
echo "############################################################"
uvt-kvm destroy $VM_NAME
ssh-keygen -R $VM_IP_ADDR
fi
fi
rm -f $VM_CMDS
echo "############################################################"
echo "Checking build status"
echo "############################################################"
if [[ "$VM_NAME" == *"-cppcheck"* ]]
then
LOG_FILES=`ls $ARCHIVES_LOC/*.txt $ARCHIVES_LOC/*.xml`
else
LOG_FILES=`ls $ARCHIVES_LOC/*.txt`
fi
STATUS=0
NB_FOUND_FILES=0
for FULLFILE in $LOG_FILES
do
if [[ $FULLFILE == *"$LOG_PATTERN"* ]]
then
filename=$(basename -- "$FULLFILE")
if [ "$LOG_PATTERN" == ".Rel15.txt" ]
then
PASS_PATTERN=`echo $filename | sed -e "s#$LOG_PATTERN##"`
fi
if [ "$LOG_PATTERN" == "cppcheck.xml" ]
then
PASS_PATTERN="results version"
LOCAL_STAT=`egrep -c "$PASS_PATTERN" $FULLFILE`
else
LOCAL_STAT=`egrep -c "Built target $PASS_PATTERN" $FULLFILE`
fi
if [ $LOCAL_STAT -eq 0 ]; then STATUS=-1; fi
NB_FOUND_FILES=$((NB_FOUND_FILES + 1))
fi
done
if [ $NB_PATTERN_FILES -ne $NB_FOUND_FILES ]
then
echo "Expecting $NB_PATTERN_FILES log files and found $NB_FOUND_FILES"
STATUS=-1
fi
# If we were building the FlexRan Controller, flag-touch for basic-simulator to continue
if [[ "$VM_NAME" == *"-flexran-rtc"* ]]
then
if [[ $STATUS -eq 0 ]]
then
touch $JENKINS_WKSP/flexran/flexran_build_complete.txt
fi
fi
if [[ "$VM_NAME" == *"-cppcheck"* ]]
then
echo "COMMAND: cppcheck $BUILD_OPTIONS . 2> cppcheck.xml" > $ARCHIVES_LOC/build_final_status.log
elif [[ "$VM_NAME" == *"-flexran-rtc"* ]]
then
echo "COMMAND: $BUILD_OPTIONS" > $ARCHIVES_LOC/build_final_status.log
else
echo "COMMAND: build_oai -I $BUILD_OPTIONS" > $ARCHIVES_LOC/build_final_status.log
fi
if [[ $STATUS -eq 0 ]]
then
echo "BUILD_OK" >> $ARCHIVES_LOC/build_final_status.log
else
echo "BUILD_KO" >> $ARCHIVES_LOC/build_final_status.log
fi
}

View File

@@ -0,0 +1,38 @@
<!--
Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The OpenAirInterface Software Alliance licenses this file to You under
the OAI Public License, Version 1.1 (the "License"); you may not use this file
except in compliance with the License.
You may obtain a copy of the License at
http://www.openairinterface.org/?page_id=698
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
For more information about the OpenAirInterface (OAI) Software Alliance:
contact@openairinterface.org
-->
<testCaseList>
<htmlTabRef>build-tab</htmlTabRef>
<htmlTabName>Build</htmlTabName>
<htmlTabIcon>wrench</htmlTabIcon>
<TestCaseRequestedList>
010101
</TestCaseRequestedList>
<TestCaseExclusionList></TestCaseExclusionList>
<testCase id="010101">
<class>Build_eNB</class>
<desc>Build eNB (USRP)</desc>
<Build_eNB_args>-w USRP -c --eNB</Build_eNB_args>
</testCase>
</testCaseList>

View File

@@ -0,0 +1,48 @@
<!--
Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The OpenAirInterface Software Alliance licenses this file to You under
the OAI Public License, Version 1.1 (the "License"); you may not use this file
except in compliance with the License.
You may obtain a copy of the License at
http://www.openairinterface.org/?page_id=698
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
For more information about the OpenAirInterface (OAI) Software Alliance:
contact@openairinterface.org
-->
<testCaseList>
<htmlTabRef>epc-closure</htmlTabRef>
<htmlTabName>EPC-Closure</htmlTabName>
<htmlTabIcon>log-out</htmlTabIcon>
<TestCaseRequestedList>
050201 060201 070201
</TestCaseRequestedList>
<TestCaseExclusionList>
</TestCaseExclusionList>
<testCase id="050201">
<class>Terminate_HSS</class>
<desc>Terminate HSS</desc>
</testCase>
<testCase id="060201">
<class>Terminate_MME</class>
<desc>Terminate MME</desc>
</testCase>
<testCase id="070201">
<class>Terminate_SPGW</class>
<desc>Terminate SPGW</desc>
</testCase>
</testCaseList>

View File

@@ -0,0 +1,60 @@
<!--
Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The OpenAirInterface Software Alliance licenses this file to You under
the OAI Public License, Version 1.1 (the "License"); you may not use this file
except in compliance with the License.
You may obtain a copy of the License at
http://www.openairinterface.org/?page_id=698
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
For more information about the OpenAirInterface (OAI) Software Alliance:
contact@openairinterface.org
-->
<testCaseList>
<htmlTabRef>epc-start</htmlTabRef>
<htmlTabName>EPC-Start</htmlTabName>
<htmlTabIcon>log-in</htmlTabIcon>
<TestCaseRequestedList>
010101 090101
050101 060101 070101
</TestCaseRequestedList>
<TestCaseExclusionList></TestCaseExclusionList>
<testCase id="010101">
<class>Build_eNB</class>
<desc>Build eNB (USRP)</desc>
<Build_eNB_args>-w USRP -c --eNB</Build_eNB_args>
</testCase>
<testCase id="090101">
<class>Build_OAI_UE</class>
<desc>Build OAI UE</desc>
<Build_OAI_UE_args>-w USRP --UE</Build_OAI_UE_args>
</testCase>
<testCase id="050101">
<class>Initialize_HSS</class>
<desc>Initialize HSS</desc>
</testCase>
<testCase id="060101">
<class>Initialize_MME</class>
<desc>Initialize MME</desc>
</testCase>
<testCase id="070101">
<class>Initialize_SPGW</class>
<desc>Initialize SPGW</desc>
</testCase>
</testCaseList>

View File

@@ -0,0 +1,118 @@
<!--
Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The OpenAirInterface Software Alliance licenses this file to You under
the OAI Public License, Version 1.1 (the "License"); you may not use this file
except in compliance with the License.
You may obtain a copy of the License at
http://www.openairinterface.org/?page_id=698
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
For more information about the OpenAirInterface (OAI) Software Alliance:
contact@openairinterface.org
-->
<testCaseList>
<htmlTabRef>test-05-tm1-nos1-tunnel</htmlTabRef>
<htmlTabName>Test-05MHz-TM1-noS1-tunnel</htmlTabName>
<htmlTabIcon>tasks</htmlTabIcon>
<repeatCount>4</repeatCount>
<TestCaseRequestedList>
030201 090109
030101 000001 090101 000002 040501 040502 000001 040601 040602 040641 040642 000001 090109 030201
</TestCaseRequestedList>
<TestCaseExclusionList></TestCaseExclusionList>
<testCase id="000001">
<class>IdleSleep</class>
<desc>Sleep</desc>
<idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
</testCase>
<testCase id="000002">
<class>IdleSleep</class>
<desc>Sleep</desc>
<idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
</testCase>
<testCase id="000003">
<class>IdleSleep</class>
<desc>Sleep</desc>
<idle_sleep_time_in_sec>60</idle_sleep_time_in_sec>
</testCase>
<testCase id="030101">
<class>Initialize_eNB</class>
<desc>Initialize eNB (FDD/Band7/5MHz)</desc>
<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band7.tm1.25PRB.usrpb210.conf --noS1 --eNBs.[0].rrc_inactivity_threshold 0</Initialize_eNB_args>
</testCase>
<testCase id="030201">
<class>Terminate_eNB</class>
<desc>Terminate eNB</desc>
</testCase>
<testCase id="090101">
<class>Initialize_OAI_UE</class>
<desc>Initialize OAI UE (FDD/Band7/5MHz)</desc>
<Initialize_OAI_UE_args>-C 2680000000 -r 25 --ue-rxgain 120 --ue-txgain 0 --ue-max-power 0 --ue-scan-carrier --nokrnmod 1 --noS1</Initialize_OAI_UE_args>
</testCase>
<testCase id="090109">
<class>Terminate_OAI_UE</class>
<desc>Terminate OAI UE</desc>
</testCase>
<testCase id="040501">
<class>Ping</class>
<desc>ping (5MHz - 20 sec)(from eNB to OAI UE)</desc>
<ping_args>-I oaitun_enb1 -c 20 10.0.1.2</ping_args>
<ping_packetloss_threshold>5</ping_packetloss_threshold>
</testCase>
<testCase id="040502">
<class>Ping</class>
<desc>ping (5MHz - 20 sec)(from OAI UE to eNB)</desc>
<ping_args>-I oaitun_ue1 -c 20 10.0.1.1</ping_args>
<ping_packetloss_threshold>5</ping_packetloss_threshold>
</testCase>
<testCase id="040601">
<class>Iperf</class>
<desc>iperf (5MHz - DL/1Mbps/UDP)(30 sec)</desc>
<iperf_args>-c 10.0.1.2 -u -b 1M -t 30 -i 1 -fm -B 10.0.1.1</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
</testCase>
<testCase id="040602">
<class>Iperf</class>
<desc>iperf (5MHz - DL/14Mbps/UDP)(30 sec)</desc>
<iperf_args>-c 10.0.1.2 -u -b 14M -t 30 -i 1 -fm -B 10.0.1.1</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
</testCase>
<testCase id="040641">
<class>Iperf</class>
<desc>iperf (5MHz - UL/1Mbps/UDP)(30 sec)</desc>
<iperf_args>-c 10.0.1.1 -u -b 1M -t 30 -i 1 -fm -B 10.0.1.2 -R</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_profile>balanced</iperf_profile>
</testCase>
<testCase id="040642">
<class>Iperf</class>
<desc>iperf (5MHz - UL/4Mbps/UDP)(30 sec)</desc>
<iperf_args>-c 10.0.1.1 -u -b 4M -t 30 -i 1 -fm -B 10.0.1.2 -R</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_profile>balanced</iperf_profile>
</testCase>
</testCaseList>

View File

@@ -0,0 +1,82 @@
<!--
Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The OpenAirInterface Software Alliance licenses this file to You under
the OAI Public License, Version 1.1 (the "License"); you may not use this file
except in compliance with the License.
You may obtain a copy of the License at
http://www.openairinterface.org/?page_id=698
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
For more information about the OpenAirInterface (OAI) Software Alliance:
contact@openairinterface.org
-->
<testCaseList>
<htmlTabRef>test-05-tm1-mbms-nos1-tunnel</htmlTabRef>
<htmlTabName>Test-05MHz-MBMS-TM1-noS1-tunnel</htmlTabName>
<htmlTabIcon>tasks</htmlTabIcon>
<repeatCount>2</repeatCount>
<TestCaseRequestedList>
030201 090109
030103 000001 090103 000002 040605 000001 090109 030201
</TestCaseRequestedList>
<TestCaseExclusionList></TestCaseExclusionList>
<testCase id="000001">
<class>IdleSleep</class>
<desc>Sleep</desc>
<idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
</testCase>
<testCase id="000002">
<class>IdleSleep</class>
<desc>Sleep</desc>
<idle_sleep_time_in_sec>15</idle_sleep_time_in_sec>
</testCase>
<testCase id="000003">
<class>IdleSleep</class>
<desc>Sleep</desc>
<idle_sleep_time_in_sec>60</idle_sleep_time_in_sec>
</testCase>
<testCase id="030103">
<class>Initialize_eNB</class>
<desc>Initialize eNB (FDD/Band7/5MHz/MBMS)</desc>
<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band17.tm1.mbms.25PRB.usrpb210.conf --noS1 --eNBs.[0].rrc_inactivity_threshold 0 --nokrnmod 1 --eNBs.[0].component_carriers.[0].eutra_band 7 --eNBs.[0].component_carriers.[0].downlink_frequency 2680000000 --eNBs.[0].component_carriers.[0].uplink_frequency_offset -120000000</Initialize_eNB_args>
</testCase>
<testCase id="030201">
<class>Terminate_eNB</class>
<desc>Terminate eNB</desc>
</testCase>
<testCase id="090103">
<class>Initialize_OAI_UE</class>
<desc>Initialize OAI UE (FDD/Band7/5MHz/MBMS)</desc>
<Initialize_OAI_UE_args>-C 2680000000 -r 25 --ue-rxgain 120 --ue-txgain 0 --ue-max-power 0 --ue-scan-carrier --nokrnmod 1 --noS1</Initialize_OAI_UE_args>
</testCase>
<testCase id="090109">
<class>Terminate_OAI_UE</class>
<desc>Terminate OAI UE</desc>
</testCase>
<testCase id="040605">
<class>Iperf</class>
<desc>iperf (5MHz - DL/1.5Mbps/UDP/MBMS-sink)(20 sec)</desc>
<iperf_args>-c 10.0.2.2 -u -b 1.5M -t 20 -i 1 -fm -B 10.0.2.1</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_options>sink</iperf_options>
</testCase>
</testCaseList>

View File

@@ -0,0 +1,105 @@
<!--
Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The OpenAirInterface Software Alliance licenses this file to You under
the OAI Public License, Version 1.1 (the "License"); you may not use this file
except in compliance with the License.
You may obtain a copy of the License at
http://www.openairinterface.org/?page_id=698
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
For more information about the OpenAirInterface (OAI) Software Alliance:
contact@openairinterface.org
-->
<testCaseList>
<htmlTabRef>test-05-tm1-tunnel</htmlTabRef>
<htmlTabName>Test-05MHz-TM1-tunnel</htmlTabName>
<htmlTabIcon>tasks</htmlTabIcon>
<repeatCount>2</repeatCount>
<TestCaseRequestedList>
030201 090109
030102 000001 090102 000002 040503 000001 040603 040604 040643 040644 000001 090109 030201
</TestCaseRequestedList>
<TestCaseExclusionList></TestCaseExclusionList>
<testCase id="000001">
<class>IdleSleep</class>
<desc>Sleep</desc>
<idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
</testCase>
<testCase id="000002">
<class>IdleSleep</class>
<desc>Sleep</desc>
<idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
</testCase>
<testCase id="030102">
<class>Initialize_eNB</class>
<desc>Initialize eNB (FDD/Band7/5MHz)</desc>
<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band7.tm1.25PRB.usrpb210.conf --eNBs.[0].rrc_inactivity_threshold 0</Initialize_eNB_args>
</testCase>
<testCase id="030201">
<class>Terminate_eNB</class>
<desc>Terminate eNB</desc>
</testCase>
<testCase id="090102">
<class>Initialize_OAI_UE</class>
<desc>Initialize OAI UE (FDD/Band7/5MHz)</desc>
<Initialize_OAI_UE_args>-C 2680000000 -r 25 --ue-rxgain 120 --ue-txgain 0 --ue-max-power 0 --ue-scan-carrier --nokrnmod 1</Initialize_OAI_UE_args>
</testCase>
<testCase id="090109">
<class>Terminate_OAI_UE</class>
<desc>Terminate OAI UE</desc>
</testCase>
<testCase id="040503">
<class>Ping</class>
<desc>ping (5MHz - 20 sec)</desc>
<ping_args>-c 20</ping_args>
<ping_packetloss_threshold>5</ping_packetloss_threshold>
</testCase>
<testCase id="040603">
<class>Iperf</class>
<desc>iperf (5MHz - DL/1Mbps/UDP)(30 sec)</desc>
<iperf_args>-u -b 1M -t 30 -i 1 -fm</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
</testCase>
<testCase id="040604">
<class>Iperf</class>
<desc>iperf (5MHz - DL/14Mbps/UDP)(30 sec)</desc>
<iperf_args>-u -b 14M -t 30 -i 1 -fm</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
</testCase>
<testCase id="040643">
<class>Iperf</class>
<desc>iperf (5MHz - UL/1Mbps/UDP)(30 sec)</desc>
<iperf_args>-u -b 1M -t 30 -i 1 -fm -R</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_profile>balanced</iperf_profile>
</testCase>
<testCase id="040644">
<class>Iperf</class>
<desc>iperf (5MHz - UL/4Mbps/UDP)(30 sec)</desc>
<iperf_args>-u -b 4M -t 30 -i 1 -fm -R</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_profile>balanced</iperf_profile>
</testCase>
</testCaseList>

View File

@@ -0,0 +1,38 @@
<!--
Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The OpenAirInterface Software Alliance licenses this file to You under
the OAI Public License, Version 1.1 (the "License"); you may not use this file
except in compliance with the License.
You may obtain a copy of the License at
http://www.openairinterface.org/?page_id=698
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
For more information about the OpenAirInterface (OAI) Software Alliance:
contact@openairinterface.org
-->
<testCaseList>
<htmlTabRef>oai-ue-build-tab</htmlTabRef>
<htmlTabName>OAI-UE-Build</htmlTabName>
<htmlTabIcon>wrench</htmlTabIcon>
<TestCaseRequestedList>
090101
</TestCaseRequestedList>
<TestCaseExclusionList></TestCaseExclusionList>
<testCase id="090101">
<class>Build_OAI_UE</class>
<desc>Build OAI UE</desc>
<Build_OAI_UE_args>-w USRP --UE</Build_OAI_UE_args>
</testCase>
</testCaseList>

View File

@@ -0,0 +1,39 @@
<!--
Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The OpenAirInterface Software Alliance licenses this file to You under
the OAI Public License, Version 1.1 (the "License"); you may not use this file
except in compliance with the License.
You may obtain a copy of the License at
http://www.openairinterface.org/?page_id=698
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
For more information about the OpenAirInterface (OAI) Software Alliance:
contact@openairinterface.org
-->
<testCaseList>
<htmlTabRef>build-tab</htmlTabRef>
<htmlTabName>Build</htmlTabName>
<htmlTabIcon>wrench</htmlTabIcon>
<TestCaseRequestedList>
010101
</TestCaseRequestedList>
<TestCaseExclusionList>
</TestCaseExclusionList>
<testCase id="010101">
<class>Build_eNB</class>
<desc>Build eNB (USRP)</desc>
<Build_eNB_args>-w USRP -c --eNB</Build_eNB_args>
</testCase>
</testCaseList>

View File

@@ -0,0 +1,53 @@
<!--
Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The OpenAirInterface Software Alliance licenses this file to You under
the OAI Public License, Version 1.1 (the "License"); you may not use this file
except in compliance with the License.
You may obtain a copy of the License at
http://www.openairinterface.org/?page_id=698
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
For more information about the OpenAirInterface (OAI) Software Alliance:
contact@openairinterface.org
-->
<testCaseList>
<htmlTabRef>epc-closure</htmlTabRef>
<htmlTabName>EPC-Closure</htmlTabName>
<htmlTabIcon>log-out</htmlTabIcon>
<TestCaseRequestedList>
040202
050201 060201 070201
</TestCaseRequestedList>
<TestCaseExclusionList></TestCaseExclusionList>
<testCase id="040202">
<class>Terminate_CatM_module</class>
<desc>Terminate CAT-M Module</desc>
</testCase>
<testCase id="050201">
<class>Terminate_HSS</class>
<desc>Terminate HSS</desc>
</testCase>
<testCase id="060201">
<class>Terminate_MME</class>
<desc>Terminate MME</desc>
</testCase>
<testCase id="070201">
<class>Terminate_SPGW</class>
<desc>Terminate SPGW</desc>
</testCase>
</testCaseList>

View File

@@ -0,0 +1,48 @@
<!--
Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The OpenAirInterface Software Alliance licenses this file to You under
the OAI Public License, Version 1.1 (the "License"); you may not use this file
except in compliance with the License.
You may obtain a copy of the License at
http://www.openairinterface.org/?page_id=698
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
For more information about the OpenAirInterface (OAI) Software Alliance:
contact@openairinterface.org
-->
<testCaseList>
<htmlTabRef>epc-start-tab</htmlTabRef>
<htmlTabName>EPC-Start</htmlTabName>
<htmlTabIcon>log-in</htmlTabIcon>
<TestCaseRequestedList>
050101 060101 070101
</TestCaseRequestedList>
<TestCaseExclusionList>
</TestCaseExclusionList>
<testCase id="050101">
<class>Initialize_HSS</class>
<desc>Initialize HSS</desc>
</testCase>
<testCase id="060101">
<class>Initialize_MME</class>
<desc>Initialize MME</desc>
</testCase>
<testCase id="070101">
<class>Initialize_SPGW</class>
<desc>Initialize SPGW</desc>
</testCase>
</testCaseList>

View File

@@ -0,0 +1,80 @@
<!--
Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The OpenAirInterface Software Alliance licenses this file to You under
the OAI Public License, Version 1.1 (the "License"); you may not use this file
except in compliance with the License.
You may obtain a copy of the License at
http://www.openairinterface.org/?page_id=698
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
For more information about the OpenAirInterface (OAI) Software Alliance:
contact@openairinterface.org
-->
<testCaseList>
<htmlTabRef>test-lte-m-10-tm1</htmlTabRef>
<htmlTabName>Test-LTE-M-10MHz-TM1</htmlTabName>
<htmlTabIcon>tasks</htmlTabIcon>
<repeatCount>2</repeatCount>
<TestCaseRequestedList>
030201
040102
030121 000001 040302 000001 040502 000001 040402 040202 000001 030201
</TestCaseRequestedList>
<TestCaseExclusionList>
</TestCaseExclusionList>
<testCase id="000001">
<class>IdleSleep</class>
<desc>Waiting for a moment...</desc>
<idle_sleep_time_in_sec>15</idle_sleep_time_in_sec>
</testCase>
<testCase id="030121">
<class>Initialize_eNB</class>
<desc>Initialize eNB (FDD/Band13/10MHz)</desc>
<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band13.tm1.50PRB.emtc.conf</Initialize_eNB_args>
</testCase>
<testCase id="030201">
<class>Terminate_eNB</class>
<desc>Terminate eNB</desc>
</testCase>
<testCase id="040102">
<class>Initialize_CatM_module</class>
<desc>Initialize CAT-M Module</desc>
</testCase>
<testCase id="040202">
<class>Terminate_CatM_module</class>
<desc>Terminate CAT-M Module</desc>
</testCase>
<testCase id="040302">
<class>Attach_CatM_module</class>
<desc>Attach CAT-M Module</desc>
</testCase>
<testCase id="040402">
<class>Detach_CatM_module</class>
<desc>Detach CAT-M Module</desc>
</testCase>
<testCase id="040502">
<class>Ping_CatM_module</class>
<desc>ping (10MHz - 20 sec)</desc>
<ping_args>-c 20</ping_args>
<ping_packetloss_threshold>5</ping_packetloss_threshold>
</testCase>
</testCaseList>

View File

@@ -0,0 +1,38 @@
<!--
Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The OpenAirInterface Software Alliance licenses this file to You under
the OAI Public License, Version 1.1 (the "License"); you may not use this file
except in compliance with the License.
You may obtain a copy of the License at
http://www.openairinterface.org/?page_id=698
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
For more information about the OpenAirInterface (OAI) Software Alliance:
contact@openairinterface.org
-->
<testCaseList>
<htmlTabRef>build-tab</htmlTabRef>
<htmlTabName>Build</htmlTabName>
<htmlTabIcon>wrench</htmlTabIcon>
<TestCaseRequestedList>
010101
</TestCaseRequestedList>
<TestCaseExclusionList></TestCaseExclusionList>
<testCase id="010101">
<class>Build_eNB</class>
<desc>Build eNB (USRP)</desc>
<Build_eNB_args>-w USRP -c --eNB</Build_eNB_args>
</testCase>
</testCaseList>

View File

@@ -0,0 +1,47 @@
<!--
Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The OpenAirInterface Software Alliance licenses this file to You under
the OAI Public License, Version 1.1 (the "License"); you may not use this file
except in compliance with the License.
You may obtain a copy of the License at
http://www.openairinterface.org/?page_id=698
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
For more information about the OpenAirInterface (OAI) Software Alliance:
contact@openairinterface.org
-->
<testCaseList>
<htmlTabRef>epc-closure</htmlTabRef>
<htmlTabName>EPC-Closure</htmlTabName>
<htmlTabIcon>log-out</htmlTabIcon>
<TestCaseRequestedList>
050201 060201 070201
</TestCaseRequestedList>
<TestCaseExclusionList></TestCaseExclusionList>
<testCase id="050201">
<class>Terminate_HSS</class>
<desc>Terminate HSS</desc>
</testCase>
<testCase id="060201">
<class>Terminate_MME</class>
<desc>Terminate MME</desc>
</testCase>
<testCase id="070201">
<class>Terminate_SPGW</class>
<desc>Terminate SPGW</desc>
</testCase>
</testCaseList>

View File

@@ -0,0 +1,47 @@
<!--
Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The OpenAirInterface Software Alliance licenses this file to You under
the OAI Public License, Version 1.1 (the "License"); you may not use this file
except in compliance with the License.
You may obtain a copy of the License at
http://www.openairinterface.org/?page_id=698
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
For more information about the OpenAirInterface (OAI) Software Alliance:
contact@openairinterface.org
-->
<testCaseList>
<htmlTabRef>epc-start-tab</htmlTabRef>
<htmlTabName>EPC-Start</htmlTabName>
<htmlTabIcon>log-in</htmlTabIcon>
<TestCaseRequestedList>
050101 060101 070101
</TestCaseRequestedList>
<TestCaseExclusionList></TestCaseExclusionList>
<testCase id="050101">
<class>Initialize_HSS</class>
<desc>Initialize HSS</desc>
</testCase>
<testCase id="060101">
<class>Initialize_MME</class>
<desc>Initialize MME</desc>
</testCase>
<testCase id="070101">
<class>Initialize_SPGW</class>
<desc>Initialize SPGW</desc>
</testCase>
</testCaseList>

View File

@@ -0,0 +1,150 @@
<!--
Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The OpenAirInterface Software Alliance licenses this file to You under
the OAI Public License, Version 1.1 (the "License"); you may not use this file
except in compliance with the License.
You may obtain a copy of the License at
http://www.openairinterface.org/?page_id=698
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
For more information about the OpenAirInterface (OAI) Software Alliance:
contact@openairinterface.org
-->
<testCaseList>
<htmlTabRef>test-05-tm1</htmlTabRef>
<htmlTabName>Test-05MHz-TM1</htmlTabName>
<htmlTabIcon>tasks</htmlTabIcon>
<TestCaseRequestedList>
030201
040101
030104 040301 040501 040602 040601 040603 040604 040605 040642 040641 040643 040644 040645 040401 040201 030201
</TestCaseRequestedList>
<TestCaseExclusionList></TestCaseExclusionList>
<testCase id="030104">
<class>Initialize_eNB</class>
<desc>Initialize eNB (TDD/Band40/5MHz)</desc>
<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band40.tm1.25PRB.FairScheduler.usrpb210.conf</Initialize_eNB_args>
</testCase>
<testCase id="030201">
<class>Terminate_eNB</class>
<desc>Terminate eNB</desc>
</testCase>
<testCase id="040101">
<class>Initialize_UE</class>
<desc>Initialize UE</desc>
</testCase>
<testCase id="040201">
<class>Terminate_UE</class>
<desc>Terminate UE</desc>
</testCase>
<testCase id="040301">
<class>Attach_UE</class>
<desc>Attach UE</desc>
</testCase>
<testCase id="040401">
<class>Detach_UE</class>
<desc>Detach UE</desc>
</testCase>
<testCase id="040501">
<class>Ping</class>
<desc>ping (5MHz - 20 sec)</desc>
<ping_args>-c 20</ping_args>
<ping_packetloss_threshold>25</ping_packetloss_threshold>
</testCase>
<testCase id="040601">
<class>Iperf</class>
<desc>iperf (5MHz - DL/6.5Mbps/UDP)(30 sec)(balanced)</desc>
<iperf_args>-u -b 6.5M -t 30 -i 1</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_profile>balanced</iperf_profile>
</testCase>
<testCase id="040602">
<class>Iperf</class>
<desc>iperf (5MHz - DL/6.5Mbps/UDP)(30 sec)(single-ue)</desc>
<iperf_args>-u -b 6.5M -t 30 -i 1</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_profile>single-ue</iperf_profile>
</testCase>
<testCase id="040603">
<class>Iperf</class>
<desc>iperf (5MHz - DL/6.5Mbps/UDP)(30 sec)(unbalanced)</desc>
<iperf_args>-u -b 6.5M -t 30 -i 1</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_profile>unbalanced</iperf_profile>
</testCase>
<testCase id="040604">
<class>Iperf</class>
<desc>iperf (5MHz - DL/TCP)(30 sec)(single-ue profile)</desc>
<iperf_args>-t 30 -i 1 -fm</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_profile>single-ue</iperf_profile>
</testCase>
<testCase id="040605">
<class>Iperf</class>
<desc>iperf (5MHz - DL/TCP)(30 sec)</desc>
<iperf_args>-t 30 -i 1 -fm</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
</testCase>
<testCase id="040641">
<class>Iperf</class>
<desc>iperf (5MHz - UL/2Mbps/UDP)(30 sec)(balanced)</desc>
<iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_profile>balanced</iperf_profile>
</testCase>
<testCase id="040642">
<class>Iperf</class>
<desc>iperf (5MHz - UL/2Mbps/UDP)(30 sec)(single-ue)</desc>
<iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_profile>single-ue</iperf_profile>
</testCase>
<testCase id="040643">
<class>Iperf</class>
<desc>iperf (5MHz - UL/2Mbps/UDP)(30 sec)(unbalanced)</desc>
<iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_profile>unbalanced</iperf_profile>
</testCase>
<testCase id="040644">
<class>Iperf</class>
<desc>iperf (5MHz - UL/TCP)(30 sec)(single-ue)</desc>
<iperf_args>-t 30 -i 1 -fm -R</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_profile>single-ue</iperf_profile>
</testCase>
<testCase id="040645">
<class>Iperf</class>
<desc>iperf (5MHz - UL/TCP)(30 sec)</desc>
<iperf_args>-t 30 -i 1 -fm -R</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
</testCase>
</testCaseList>

View File

@@ -19,43 +19,24 @@
For more information about the OpenAirInterface (OAI) Software Alliance:
contact@openairinterface.org
030105 040301 040502 040606 040601 040603 040608 040605 040646 040641 040643 040648 040645 040401 040201 030201
-->
<testCaseList>
<htmlTabRef>test-05-tm2</htmlTabRef>
<htmlTabName>Test-05MHz-TM2</htmlTabName>
<htmlTabIcon>tasks</htmlTabIcon>
<repeatCount>3</repeatCount>
<TestCaseRequestedList>
010101
050101 060101 070101 040101
030104 040301 040501 040602 040601 040603 040642 040641 040643 040401 040201 030201
030114 040301 040511 040612 040611 040613 040652 040651 040653 040401 040201 030201
050201 060201 070201
030201
040101
030105 040301 040502 040606 040608 040646 040648 040401 040201 030201
</TestCaseRequestedList>
<!-- 20MHz is not stable enough to be run -->
<!--
030124 040301 040521 040622 040621 040623 040662 040661 040663 040401 040201 030201
-->
<TestCaseExclusionList></TestCaseExclusionList>
<testCase id="010101">
<class>Build_eNB</class>
<desc>Build eNB (USRP)</desc>
<Build_eNB_args>-w USRP -c --eNB</Build_eNB_args>
</testCase>
<testCase id="030104">
<testCase id="030105">
<class>Initialize_eNB</class>
<desc>Initialize eNB (TDD/Band40/5MHz)</desc>
<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band40.tm1.25PRB.FairScheduler.usrpb210.conf --codingw --fepw</Initialize_eNB_args>
</testCase>
<testCase id="030114">
<class>Initialize_eNB</class>
<desc>Initialize eNB (TDD/Band40/10MHz/info)</desc>
<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band40.tm1.50PRB.FairScheduler.usrpb210.conf --codingw --fepw</Initialize_eNB_args>
</testCase>
<testCase id="030106">
<class>Initialize_eNB</class>
<desc>Initialize eNB (TDD/Band40/20MHz/info)</desc>
<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band40.tm1.100PRB.FairScheduler.usrpb210.conf --codingw --fepw</Initialize_eNB_args>
<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band40.tm2.25PRB.FairScheduler.usrpb210.conf --MACRLCs.[0].scheduler_mode default</Initialize_eNB_args>
</testCase>
<testCase id="030201">
@@ -83,20 +64,13 @@
<desc>Detach UE</desc>
</testCase>
<testCase id="040501">
<testCase id="040502">
<class>Ping</class>
<desc>ping (5MHz - 20 sec)</desc>
<ping_args>-c 20</ping_args>
<ping_packetloss_threshold>25</ping_packetloss_threshold>
</testCase>
<testCase id="040511">
<class>Ping</class>
<desc>ping (10MHz - 20 sec)</desc>
<ping_args>-c 20</ping_args>
<ping_packetloss_threshold>25</ping_packetloss_threshold>
</testCase>
<testCase id="040601">
<class>Iperf</class>
<desc>iperf (5MHz - DL/6.5Mbps/UDP)(30 sec)(balanced)</desc>
@@ -105,7 +79,7 @@
<iperf_profile>balanced</iperf_profile>
</testCase>
<testCase id="040602">
<testCase id="040606">
<class>Iperf</class>
<desc>iperf (5MHz - DL/6.5Mbps/UDP)(30 sec)(single-ue)</desc>
<iperf_args>-u -b 6.5M -t 30 -i 1</iperf_args>
@@ -121,29 +95,20 @@
<iperf_profile>unbalanced</iperf_profile>
</testCase>
<testCase id="040611">
<class>Iperf</class>
<desc>iperf (10MHz - DL/13.5Mbps/UDP)(30 sec)(balanced)</desc>
<iperf_args>-u -b 13.5M -t 30 -i 1</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_profile>balanced</iperf_profile>
</testCase>
<testCase id="040612">
<class>Iperf</class>
<desc>iperf (10MHz - DL/13.5Mbps/UDP)(30 sec)(single-ue)</desc>
<iperf_args>-u -b 13.5M -t 30 -i 1</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_profile>single-ue</iperf_profile>
</testCase>
<testCase id="040613">
<testCase id="040608">
<class>Iperf</class>
<desc>iperf (10MHz - DL/13.5Mbps/UDP)(30 sec)(unbalanced)</desc>
<iperf_args>-u -b 13.5M -t 30 -i 1</iperf_args>
<desc>iperf (5MHz - DL/TCP)(30 sec)(single-ue profile)</desc>
<iperf_args>-t 30 -i 1 -fm</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_profile>unbalanced</iperf_profile>
</testCase>
<iperf_profile>single-ue</iperf_profile>
</testCase>
<testCase id="040605">
<class>Iperf</class>
<desc>iperf (5MHz - DL/TCP)(30 sec)</desc>
<iperf_args>-t 30 -i 1 -fm</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
</testCase>
<testCase id="040641">
<class>Iperf</class>
@@ -153,7 +118,7 @@
<iperf_profile>balanced</iperf_profile>
</testCase>
<testCase id="040642">
<testCase id="040646">
<class>Iperf</class>
<desc>iperf (5MHz - UL/2Mbps/UDP)(30 sec)(single-ue)</desc>
<iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
@@ -169,58 +134,19 @@
<iperf_profile>unbalanced</iperf_profile>
</testCase>
<testCase id="040651">
<testCase id="040648">
<class>Iperf</class>
<desc>iperf (10MHz - UL/2Mbps/UDP)(30 sec)(balanced)</desc>
<iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_profile>balanced</iperf_profile>
</testCase>
<testCase id="040652">
<class>Iperf</class>
<desc>iperf (10MHz - UL/2Mbps/UDP)(30 sec)(single-ue)</desc>
<iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
<desc>iperf (5MHz - UL/TCP)(30 sec)(single-ue)</desc>
<iperf_args>-t 30 -i 1 -fm -R</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_profile>single-ue</iperf_profile>
</testCase>
<testCase id="040653">
<testCase id="040645">
<class>Iperf</class>
<desc>iperf (10MHz - UL/2Mbps/UDP)(30 sec)(unbalanced)</desc>
<iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
<desc>iperf (5MHz - UL/TCP)(30 sec)</desc>
<iperf_args>-t 30 -i 1 -fm -R</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_profile>unbalanced</iperf_profile>
</testCase>
<testCase id="050101">
<class>Initialize_HSS</class>
<desc>Initialize HSS</desc>
</testCase>
<testCase id="060101">
<class>Initialize_MME</class>
<desc>Initialize MME</desc>
</testCase>
<testCase id="070101">
<class>Initialize_SPGW</class>
<desc>Initialize SPGW</desc>
</testCase>
<testCase id="050201">
<class>Terminate_HSS</class>
<desc>Terminate HSS</desc>
</testCase>
<testCase id="060201">
<class>Terminate_MME</class>
<desc>Terminate MME</desc>
</testCase>
<testCase id="070201">
<class>Terminate_SPGW</class>
<desc>Terminate SPGW</desc>
</testCase>
</testCaseList>

View File

@@ -0,0 +1,150 @@
<!--
Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The OpenAirInterface Software Alliance licenses this file to You under
the OAI Public License, Version 1.1 (the "License"); you may not use this file
except in compliance with the License.
You may obtain a copy of the License at
http://www.openairinterface.org/?page_id=698
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
For more information about the OpenAirInterface (OAI) Software Alliance:
contact@openairinterface.org
-->
<testCaseList>
<htmlTabRef>test-10-tm1</htmlTabRef>
<htmlTabName>Test-10MHz-TM1</htmlTabName>
<htmlTabIcon>tasks</htmlTabIcon>
<TestCaseRequestedList>
030201
040101
030114 040301 040511 040612 040611 040613 040614 040615 040652 040651 040653 040654 040655 040401 040201 030201
</TestCaseRequestedList>
<TestCaseExclusionList></TestCaseExclusionList>
<testCase id="030114">
<class>Initialize_eNB</class>
<desc>Initialize eNB (TDD/Band40/10MHz/info)</desc>
<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band40.tm1.50PRB.FairScheduler.usrpb210.conf</Initialize_eNB_args>
</testCase>
<testCase id="030201">
<class>Terminate_eNB</class>
<desc>Terminate eNB</desc>
</testCase>
<testCase id="040101">
<class>Initialize_UE</class>
<desc>Initialize UE</desc>
</testCase>
<testCase id="040201">
<class>Terminate_UE</class>
<desc>Terminate UE</desc>
</testCase>
<testCase id="040301">
<class>Attach_UE</class>
<desc>Attach UE</desc>
</testCase>
<testCase id="040401">
<class>Detach_UE</class>
<desc>Detach UE</desc>
</testCase>
<testCase id="040511">
<class>Ping</class>
<desc>ping (10MHz - 20 sec)</desc>
<ping_args>-c 20</ping_args>
<ping_packetloss_threshold>25</ping_packetloss_threshold>
</testCase>
<testCase id="040611">
<class>Iperf</class>
<desc>iperf (10MHz - DL/13.5Mbps/UDP)(30 sec)(balanced)</desc>
<iperf_args>-u -b 13.5M -t 30 -i 1</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_profile>balanced</iperf_profile>
</testCase>
<testCase id="040612">
<class>Iperf</class>
<desc>iperf (10MHz - DL/13.5Mbps/UDP)(30 sec)(single-ue)</desc>
<iperf_args>-u -b 13.5M -t 30 -i 1</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_profile>single-ue</iperf_profile>
</testCase>
<testCase id="040613">
<class>Iperf</class>
<desc>iperf (10MHz - DL/13.5Mbps/UDP)(30 sec)(unbalanced)</desc>
<iperf_args>-u -b 13.5M -t 30 -i 1</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_profile>unbalanced</iperf_profile>
</testCase>
<testCase id="040614">
<class>Iperf</class>
<desc>iperf (10MHz - DL/TCP)(30 sec)(single-ue)</desc>
<iperf_args>-t 30 -i 1 -fm</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_profile>single-ue</iperf_profile>
</testCase>
<testCase id="040615">
<class>Iperf</class>
<desc>iperf (10MHz - DL/TCP)(30 sec)</desc>
<iperf_args>-t 30 -i 1 -fm</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
</testCase>
<testCase id="040651">
<class>Iperf</class>
<desc>iperf (10MHz - UL/2Mbps/UDP)(30 sec)(balanced)</desc>
<iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_profile>balanced</iperf_profile>
</testCase>
<testCase id="040652">
<class>Iperf</class>
<desc>iperf (10MHz - UL/2Mbps/UDP)(30 sec)(single-ue)</desc>
<iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_profile>single-ue</iperf_profile>
</testCase>
<testCase id="040653">
<class>Iperf</class>
<desc>iperf (10MHz - UL/2Mbps/UDP)(30 sec)(unbalanced)</desc>
<iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_profile>unbalanced</iperf_profile>
</testCase>
<testCase id="040654">
<class>Iperf</class>
<desc>iperf (10MHz - UL/TCP)(30 sec)(single-ue)</desc>
<iperf_args>-t 30 -i 1 -fm -R</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_profile>single-ue</iperf_profile>
</testCase>
<testCase id="040655">
<class>Iperf</class>
<desc>iperf (10MHz - UL/TCP)(30 sec)</desc>
<iperf_args>-t 30 -i 1 -fm -R</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
</testCase>
</testCaseList>

View File

@@ -0,0 +1,151 @@
<!--
Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The OpenAirInterface Software Alliance licenses this file to You under
the OAI Public License, Version 1.1 (the "License"); you may not use this file
except in compliance with the License.
You may obtain a copy of the License at
http://www.openairinterface.org/?page_id=698
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
For more information about the OpenAirInterface (OAI) Software Alliance:
contact@openairinterface.org
-->
<testCaseList>
<htmlTabRef>test-20-tm1</htmlTabRef>
<htmlTabName>Test-20MHz-TM1</htmlTabName>
<htmlTabIcon>tasks</htmlTabIcon>
<repeatCount>4</repeatCount>
<TestCaseRequestedList>
030201
040101
030124 040301 040521 040622 040621 040623 040662 040401 040201 030201
</TestCaseRequestedList>
<TestCaseExclusionList></TestCaseExclusionList>
<testCase id="030124">
<class>Initialize_eNB</class>
<desc>Initialize eNB (TDD/Band40/20MHz/info)</desc>
<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band40.tm1.100PRB.FairScheduler.usrpb210.conf</Initialize_eNB_args>
</testCase>
<testCase id="030201">
<class>Terminate_eNB</class>
<desc>Terminate eNB</desc>
</testCase>
<testCase id="040101">
<class>Initialize_UE</class>
<desc>Initialize UE</desc>
</testCase>
<testCase id="040201">
<class>Terminate_UE</class>
<desc>Terminate UE</desc>
</testCase>
<testCase id="040301">
<class>Attach_UE</class>
<desc>Attach UE</desc>
</testCase>
<testCase id="040401">
<class>Detach_UE</class>
<desc>Detach UE</desc>
</testCase>
<testCase id="040521">
<class>Ping</class>
<desc>ping (20MHz - 20 sec)</desc>
<ping_args>-c 20</ping_args>
<ping_packetloss_threshold>25</ping_packetloss_threshold>
</testCase>
<testCase id="040621">
<class>Iperf</class>
<desc>iperf (20MHz - DL/13.5Mbps/UDP)(30 sec)(balanced)</desc>
<iperf_args>-u -b 13.5M -t 30 -i 1</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_profile>balanced</iperf_profile>
</testCase>
<testCase id="040622">
<class>Iperf</class>
<desc>iperf (20MHz - DL/13.5Mbps/UDP)(30 sec)(single-ue)</desc>
<iperf_args>-u -b 13.5M -t 30 -i 1</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_profile>single-ue</iperf_profile>
</testCase>
<testCase id="040623">
<class>Iperf</class>
<desc>iperf (20MHz - DL/13.5Mbps/UDP)(30 sec)(unbalanced)</desc>
<iperf_args>-u -b 13.5M -t 30 -i 1</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_profile>unbalanced</iperf_profile>
</testCase>
<testCase id="040624">
<class>Iperf</class>
<desc>iperf (20MHz - DL/TCP)(30 sec)(single-ue)</desc>
<iperf_args>-t 30 -i 1 -fm</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_profile>single-ue</iperf_profile>
</testCase>
<testCase id="040625">
<class>Iperf</class>
<desc>iperf (20MHz - DL/TCP)(30 sec)</desc>
<iperf_args>-t 30 -i 1 -fm</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
</testCase>
<testCase id="040661">
<class>Iperf</class>
<desc>iperf (20MHz - UL/2Mbps/UDP)(30 sec)(balanced)</desc>
<iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_profile>balanced</iperf_profile>
</testCase>
<testCase id="040662">
<class>Iperf</class>
<desc>iperf (20MHz - UL/2Mbps/UDP)(30 sec)(single-ue)</desc>
<iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_profile>single-ue</iperf_profile>
</testCase>
<testCase id="040663">
<class>Iperf</class>
<desc>iperf (20MHz - UL/2Mbps/UDP)(30 sec)(unbalanced)</desc>
<iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_profile>unbalanced</iperf_profile>
</testCase>
<testCase id="040664">
<class>Iperf</class>
<desc>iperf (20MHz - UL/TCP)(30 sec)(single-ue)</desc>
<iperf_args>-t 30 -i 1 -fm -R</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_profile>single-ue</iperf_profile>
</testCase>
<testCase id="040665">
<class>Iperf</class>
<desc>iperf (20MHz - UL/TCP)(30 sec)</desc>
<iperf_args>-t 30 -i 1 -fm -R</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
</testCase>
</testCaseList>

View File

@@ -0,0 +1,150 @@
<!--
Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The OpenAirInterface Software Alliance licenses this file to You under
the OAI Public License, Version 1.1 (the "License"); you may not use this file
except in compliance with the License.
You may obtain a copy of the License at
http://www.openairinterface.org/?page_id=698
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
For more information about the OpenAirInterface (OAI) Software Alliance:
contact@openairinterface.org
-->
<testCaseList>
<htmlTabRef>test-20-tm1-defSched</htmlTabRef>
<htmlTabName>Test-20MHz-TM1-default-scheduler</htmlTabName>
<htmlTabIcon>tasks</htmlTabIcon>
<TestCaseRequestedList>
030201
040101
030125 040301 040522 040627 040626 040628 040629 040630 040667 040666 040668 040669 040670 040401 040201 030201
</TestCaseRequestedList>
<TestCaseExclusionList></TestCaseExclusionList>
<testCase id="030125">
<class>Initialize_eNB</class>
<desc>Initialize eNB (TDD/Band40/20MHz/info)</desc>
<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band40.tm1.100PRB.FairScheduler.usrpb210.conf --MACRLCs.[0].scheduler_mode default</Initialize_eNB_args>
</testCase>
<testCase id="030201">
<class>Terminate_eNB</class>
<desc>Terminate eNB</desc>
</testCase>
<testCase id="040101">
<class>Initialize_UE</class>
<desc>Initialize UE</desc>
</testCase>
<testCase id="040201">
<class>Terminate_UE</class>
<desc>Terminate UE</desc>
</testCase>
<testCase id="040301">
<class>Attach_UE</class>
<desc>Attach UE</desc>
</testCase>
<testCase id="040401">
<class>Detach_UE</class>
<desc>Detach UE</desc>
</testCase>
<testCase id="040522">
<class>Ping</class>
<desc>ping (20MHz - 20 sec)</desc>
<ping_args>-c 20</ping_args>
<ping_packetloss_threshold>25</ping_packetloss_threshold>
</testCase>
<testCase id="040626">
<class>Iperf</class>
<desc>iperf (20MHz - DL/27.5Mbps/UDP)(30 sec)(balanced)</desc>
<iperf_args>-u -b 27.5M -t 30 -i 1</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_profile>balanced</iperf_profile>
</testCase>
<testCase id="040627">
<class>Iperf</class>
<desc>iperf (20MHz - DL/27.5Mbps/UDP)(30 sec)(single-ue)</desc>
<iperf_args>-u -b 27.5M -t 30 -i 1</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_profile>single-ue</iperf_profile>
</testCase>
<testCase id="040628">
<class>Iperf</class>
<desc>iperf (20MHz - DL/27.5Mbps/UDP)(30 sec)(unbalanced)</desc>
<iperf_args>-u -b 27.5M -t 30 -i 1</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_profile>unbalanced</iperf_profile>
</testCase>
<testCase id="040629">
<class>Iperf</class>
<desc>iperf (20MHz - DL/TCP)(30 sec)(single-ue)</desc>
<iperf_args>-t 30 -i 1 -fm</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_profile>single-ue</iperf_profile>
</testCase>
<testCase id="040630">
<class>Iperf</class>
<desc>iperf (20MHz - DL/TCP)(30 sec)</desc>
<iperf_args>-t 30 -i 1 -fm</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
</testCase>
<testCase id="040666">
<class>Iperf</class>
<desc>iperf (20MHz - UL/7Mbps/UDP)(30 sec)(balanced)</desc>
<iperf_args>-u -b 7M -t 30 -i 1 -R</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_profile>balanced</iperf_profile>
</testCase>
<testCase id="040667">
<class>Iperf</class>
<desc>iperf (20MHz - UL/7Mbps/UDP)(30 sec)(single-ue)</desc>
<iperf_args>-u -b 7M -t 30 -i 1 -R</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_profile>single-ue</iperf_profile>
</testCase>
<testCase id="040668">
<class>Iperf</class>
<desc>iperf (20MHz - UL/7Mbps/UDP)(30 sec)(unbalanced)</desc>
<iperf_args>-u -b 7M -t 30 -i 1 -R</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_profile>unbalanced</iperf_profile>
</testCase>
<testCase id="040669">
<class>Iperf</class>
<desc>iperf (20MHz - UL/TCP)(30 sec)(single-ue)</desc>
<iperf_args>-t 30 -i 1 -fm -R</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_profile>single-ue</iperf_profile>
</testCase>
<testCase id="040670">
<class>Iperf</class>
<desc>iperf (20MHz - UL/TCP)(30 sec)</desc>
<iperf_args>-t 30 -i 1 -fm -R</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
</testCase>
</testCaseList>

View File

@@ -21,13 +21,19 @@
-->
<testCaseList>
<TestCaseRequestedList>030101 040101 040301 040501 040401 040201 030201</TestCaseRequestedList>
<htmlTabRef>tracer-test</htmlTabRef>
<htmlTabName>T-Tracer</htmlTabName>
<htmlTabIcon>duplicate</htmlTabIcon>
<TestCaseRequestedList>
040101
030100 040300 040401 040201 030201
</TestCaseRequestedList>
<TestCaseExclusionList></TestCaseExclusionList>
<testCase id="030101">
<testCase id="030100">
<class>Initialize_eNB</class>
<desc>Initialize eNB (FDD/Band1/5MHz/info)</desc>
<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band7.tm1.50PRB.usrpb210.conf</Initialize_eNB_args>
<desc>Initialize eNB (TDD/Band40/5MHz) with T Tracer on</desc>
<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band40.tm1.25PRB.FairScheduler.usrpb210.conf --T_stdout 0</Initialize_eNB_args>
</testCase>
<testCase id="030201">
@@ -45,21 +51,15 @@
<desc>Terminate UE</desc>
</testCase>
<testCase id="040301">
<class>Attach_UE</class>
<desc>Attach UE</desc>
</testCase>
<testCase id="040300">
<class>Attach_UE</class>
<desc>Attach single UE</desc>
<nbMaxUEtoAttach>1</nbMaxUEtoAttach>
</testCase>
<testCase id="040401">
<class>Detach_UE</class>
<desc>Detach UE</desc>
</testCase>
<testCase id="040501">
<class>Ping</class>
<desc>ping (20 sec)</desc>
<ping_args>-c 20</ping_args>
<ping_packetloss_threshold>5</ping_packetloss_threshold>
</testCase>
<testCase id="040401">
<class>Detach_UE</class>
<desc>Detach UE</desc>
</testCase>
</testCaseList>

View File

@@ -1,350 +0,0 @@
<!--
Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The OpenAirInterface Software Alliance licenses this file to You under
the OAI Public License, Version 1.1 (the "License"); you may not use this file
except in compliance with the License.
You may obtain a copy of the License at
http://www.openairinterface.org/?page_id=698
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
For more information about the OpenAirInterface (OAI) Software Alliance:
contact@openairinterface.org
-->
<testCaseList>
<TestCaseRequestedList>
010101
050101 060101 070101 040101
030101 040301 040501 040603 040604 040605 040606 040607 040641 040642 040643 040644 040401 040201 030201
030111 040301 040511 040613 040614 040615 040616 040617 040651 040652 040653 040654 040401 040201 030201
030121 040301 040521 040623 040624 040625 040626 040627 040662 040661 040663 040664 040401 040201 030201
050201 060201 070201
</TestCaseRequestedList>
<TestCaseExclusionList></TestCaseExclusionList>
<testCase id="010101">
<class>Build_eNB</class>
<desc>Build eNB (USRP)</desc>
<Build_eNB_args>-w USRP -c --eNB</Build_eNB_args>
</testCase>
<testCase id="030101">
<class>Initialize_eNB</class>
<desc>Initialize eNB (FDD/Band7/5MHz)</desc>
<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band7.tm1.25PRB.usrpb210.conf --codingw --fepw</Initialize_eNB_args>
</testCase>
<testCase id="030111">
<class>Initialize_eNB</class>
<desc>Initialize eNB (FDD/Band7/10MHz)</desc>
<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band7.tm1.50PRB.usrpb210.conf --codingw --fepw</Initialize_eNB_args>
</testCase>
<testCase id="030121">
<class>Initialize_eNB</class>
<desc>Initialize eNB (FDD/Band7/20MHz)</desc>
<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band7.tm1.100PRB.usrpb210.conf --codingw --fepw</Initialize_eNB_args>
</testCase>
<testCase id="030201">
<class>Terminate_eNB</class>
<desc>Terminate eNB</desc>
</testCase>
<testCase id="040101">
<class>Initialize_UE</class>
<desc>Initialize UE</desc>
</testCase>
<testCase id="040201">
<class>Terminate_UE</class>
<desc>Terminate UE</desc>
</testCase>
<testCase id="040301">
<class>Attach_UE</class>
<desc>Attach UE</desc>
</testCase>
<testCase id="040401">
<class>Detach_UE</class>
<desc>Detach UE</desc>
</testCase>
<testCase id="040501">
<class>Ping</class>
<desc>ping (5MHz - 20 sec)</desc>
<ping_args>-c 20</ping_args>
<ping_packetloss_threshold>5</ping_packetloss_threshold>
</testCase>
<testCase id="040511">
<class>Ping</class>
<desc>ping (10MHz - 20 sec)</desc>
<ping_args>-c 20</ping_args>
<ping_packetloss_threshold>5</ping_packetloss_threshold>
</testCase>
<testCase id="040521">
<class>Ping</class>
<desc>ping (20MHz - 20 sec)</desc>
<ping_args>-c 20</ping_args>
<ping_packetloss_threshold>5</ping_packetloss_threshold>
</testCase>
<testCase id="040603">
<class>Iperf</class>
<desc>iperf (5MHz - DL/15Mbps/UDP)(30 sec)(balanced profile)</desc>
<iperf_args>-u -b 15M -t 30 -i 1</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_profile>balanced</iperf_profile>
</testCase>
<testCase id="040604">
<class>Iperf</class>
<desc>iperf (5MHz - DL/15Mbps/UDP)(30 sec)(single-ue profile)</desc>
<iperf_args>-u -b 15M -t 30 -i 1</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_profile>single-ue</iperf_profile>
</testCase>
<testCase id="040605">
<class>Iperf</class>
<desc>iperf (5MHz - DL/15Mbps/UDP)(30 sec)(unbalanced profile)</desc>
<iperf_args>-u -b 15M -t 30 -i 1</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_profile>unbalanced</iperf_profile>
</testCase>
<testCase id="040606">
<class>Iperf</class>
<desc>iperf (5MHz - DL/TCP)(30 sec)(single-ue profile)</desc>
<iperf_args>-t 30 -i 1 -fm</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_profile>single-ue</iperf_profile>
</testCase>
<testCase id="040607">
<class>Iperf</class>
<desc>iperf (5MHz - DL/TCP)(30 sec)(balanced profile)</desc>
<iperf_args>-t 30 -i 1 -fm</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_profile>balanced</iperf_profile>
</testCase>
<testCase id="040641">
<class>Iperf</class>
<desc>iperf (5MHz - UL/9Mbps/UDP)(30 sec)(balanced profile)</desc>
<iperf_args>-u -b 9M -t 30 -i 1 -R</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_profile>balanced</iperf_profile>
</testCase>
<testCase id="040642">
<class>Iperf</class>
<desc>iperf (5MHz - UL/9Mbps/UDP)(30 sec)(single-ue profile)</desc>
<iperf_args>-u -b 9M -t 30 -i 1 -R</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_profile>single-ue</iperf_profile>
</testCase>
<testCase id="040643">
<class>Iperf</class>
<desc>iperf (5MHz - UL/TCP)(30 sec)(single-ue profile)</desc>
<iperf_args>-t 30 -i 1 -fm -R</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_profile>single-ue</iperf_profile>
</testCase>
<testCase id="040644">
<class>Iperf</class>
<desc>iperf (5MHz - UL/TCP)(30 sec)(balanced profile)</desc>
<iperf_args>-t 30 -i 1 -fm -R</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_profile>balanced</iperf_profile>
</testCase>
<testCase id="040613">
<class>Iperf</class>
<desc>iperf (10MHz - DL/30Mbps/UDP)(30 sec)(balanced profile)</desc>
<iperf_args>-u -b 30M -t 30 -i 1</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_profile>balanced</iperf_profile>
</testCase>
<testCase id="040614">
<class>Iperf</class>
<desc>iperf (10MHz - DL/30Mbps/UDP)(30 sec)(single-ue profile)</desc>
<iperf_args>-u -b 30M -t 30 -i 1</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_profile>single-ue</iperf_profile>
</testCase>
<testCase id="040615">
<class>Iperf</class>
<desc>iperf (10MHz - DL/30Mbps/UDP)(30 sec)(unbalanced profile)</desc>
<iperf_args>-u -b 30M -t 30 -i 1</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_profile>unbalanced</iperf_profile>
</testCase>
<testCase id="040616">
<class>Iperf</class>
<desc>iperf (10MHz - DL/TCP)(30 sec)(single-ue profile)</desc>
<iperf_args>-t 30 -i 1 -fm</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_profile>single-ue</iperf_profile>
</testCase>
<testCase id="040617">
<class>Iperf</class>
<desc>iperf (10MHz - DL/TCP)(30 sec)(balanced profile)</desc>
<iperf_args>-t 30 -i 1 -fm</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_profile>balanced</iperf_profile>
</testCase>
<testCase id="040651">
<class>Iperf</class>
<desc>iperf (10MHz - UL/20Mbps/UDP)(30 sec)(balanced profile)</desc>
<iperf_args>-u -b 20M -t 30 -i 1 -R</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_profile>balanced</iperf_profile>
</testCase>
<testCase id="040652">
<class>Iperf</class>
<desc>iperf (10MHz - UL/20Mbps/UDP)(30 sec)(single-ue profile)</desc>
<iperf_args>-u -b 20M -t 30 -i 1 -R</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_profile>single-ue</iperf_profile>
</testCase>
<testCase id="040653">
<class>Iperf</class>
<desc>iperf (10MHz - UL/TCP)(30 sec)(single-ue profile)</desc>
<iperf_args>-t 30 -i 1 -fm -R</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_profile>single-ue</iperf_profile>
</testCase>
<testCase id="040654">
<class>Iperf</class>
<desc>iperf (10MHz - UL/TCP)(30 sec)(balanced profile)</desc>
<iperf_args>-t 30 -i 1 -fm -R</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_profile>balanced</iperf_profile>
</testCase>
<testCase id="040623">
<class>Iperf</class>
<desc>iperf (20MHz - DL/70Mbps/UDP)(30 sec)(balanced profile)</desc>
<iperf_args>-u -b 70M -t 30 -i 1</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_profile>balanced</iperf_profile>
</testCase>
<testCase id="040624">
<class>Iperf</class>
<desc>iperf (20MHz - DL/70Mbps/UDP)(30 sec)(single-ue profile)</desc>
<iperf_args>-u -b 70M -t 30 -i 1</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_profile>single-ue</iperf_profile>
</testCase>
<testCase id="040625">
<class>Iperf</class>
<desc>iperf (20MHz - DL/70Mbps/UDP)(30 sec)(unbalanced profile)</desc>
<iperf_args>-u -b 70M -t 30 -i 1</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_profile>unbalanced</iperf_profile>
</testCase>
<testCase id="040626">
<class>Iperf</class>
<desc>iperf (20MHz - DL/TCP)(30 sec)(single-ue profile)</desc>
<iperf_args>-t 30 -i 1 -fm</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_profile>single-ue</iperf_profile>
</testCase>
<testCase id="040627">
<class>Iperf</class>
<desc>iperf (20MHz - DL/TCP)(30 sec)(balanced profile)</desc>
<iperf_args>-t 30 -i 1 -fm</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_profile>balanced</iperf_profile>
</testCase>
<testCase id="040661">
<class>Iperf</class>
<desc>iperf (20MHz - UL/20Mbps/UDP)(30 sec)(balanced profile)</desc>
<iperf_args>-u -b 20M -t 30 -i 1 -R</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_profile>balanced</iperf_profile>
</testCase>
<testCase id="040662">
<class>Iperf</class>
<desc>iperf (20MHz - UL/20Mbps/UDP)(30 sec)(single-ue profile)</desc>
<iperf_args>-u -b 20M -t 30 -i 1 -R</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_profile>single-ue</iperf_profile>
</testCase>
<testCase id="040663">
<class>Iperf</class>
<desc>iperf (20MHz - UL/TCP)(30 sec)(single-ue profile)</desc>
<iperf_args>-t 30 -i 1 -fm -R</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_profile>single-ue</iperf_profile>
</testCase>
<testCase id="040664">
<class>Iperf</class>
<desc>iperf (20MHz - UL/TCP)(30 sec)(balanced profile)</desc>
<iperf_args>-t 30 -i 1 -fm -R</iperf_args>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_profile>balanced</iperf_profile>
</testCase>
<testCase id="050101">
<class>Initialize_HSS</class>
<desc>Initialize HSS</desc>
</testCase>
<testCase id="060101">
<class>Initialize_MME</class>
<desc>Initialize MME</desc>
</testCase>
<testCase id="070101">
<class>Initialize_SPGW</class>
<desc>Initialize SPGW</desc>
</testCase>
<testCase id="050201">
<class>Terminate_HSS</class>
<desc>Terminate HSS</desc>
</testCase>
<testCase id="060201">
<class>Terminate_MME</class>
<desc>Terminate MME</desc>
</testCase>
<testCase id="070201">
<class>Terminate_SPGW</class>
<desc>Terminate SPGW</desc>
</testCase>
</testCaseList>

View File

@@ -0,0 +1,38 @@
<!--
Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The OpenAirInterface Software Alliance licenses this file to You under
the OAI Public License, Version 1.1 (the "License"); you may not use this file
except in compliance with the License.
You may obtain a copy of the License at
http://www.openairinterface.org/?page_id=698
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
For more information about the OpenAirInterface (OAI) Software Alliance:
contact@openairinterface.org
-->
<testCaseList>
<htmlTabRef>build-tab</htmlTabRef>
<htmlTabName>Build</htmlTabName>
<htmlTabIcon>wrench</htmlTabIcon>
<TestCaseRequestedList>
010101
</TestCaseRequestedList>
<TestCaseExclusionList></TestCaseExclusionList>
<testCase id="010101">
<class>Build_eNB</class>
<desc>Build eNB (USRP)</desc>
<Build_eNB_args>-w USRP -c --eNB</Build_eNB_args>
</testCase>
</testCaseList>

View File

@@ -0,0 +1,47 @@
<!--
Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The OpenAirInterface Software Alliance licenses this file to You under
the OAI Public License, Version 1.1 (the "License"); you may not use this file
except in compliance with the License.
You may obtain a copy of the License at
http://www.openairinterface.org/?page_id=698
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
For more information about the OpenAirInterface (OAI) Software Alliance:
contact@openairinterface.org
-->
<testCaseList>
<htmlTabRef>epc-closure</htmlTabRef>
<htmlTabName>EPC-Closure</htmlTabName>
<htmlTabIcon>log-out</htmlTabIcon>
<TestCaseRequestedList>
050201 060201 070201
</TestCaseRequestedList>
<TestCaseExclusionList></TestCaseExclusionList>
<testCase id="050201">
<class>Terminate_HSS</class>
<desc>Terminate HSS</desc>
</testCase>
<testCase id="060201">
<class>Terminate_MME</class>
<desc>Terminate MME</desc>
</testCase>
<testCase id="070201">
<class>Terminate_SPGW</class>
<desc>Terminate SPGW</desc>
</testCase>
</testCaseList>

Some files were not shown because too many files have changed in this diff Show More