Merge remote-tracking branch 'origin/develop' into nr_vcd

.gitignore

@@ -5,6 +5,10 @@
 cmake_targets/log/
 cmake_targets/*/build/
 cmake_targets/ran_build/
+cmake_targets/nas_sim_tools/build/
 log/
 lte_build_oai/
 targets/bin/
+
+# vscode
+.vscode

CHANGELOG.md

+# RELEASE NOTES: #
+
+## [v1.2.1](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tags/v1.2.1) -> February 2020. ##
+
+* Bug fix for mutex lock for wake-up signal
+
+## [v1.2.0](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tags/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](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tags/v1.1.1) -> November 2019. ##
+
+- Bug fix in the TDD Fair Round-Robin scheduler
+
+## [v1.1.0](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tags/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](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tags/v1.0.3) -> June 2019. ##
+
+- Bug fix for LimeSuite v19.04.0 API
+
+## [v1.0.2](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tags/v1.0.2) -> February 2019. ##
+
+- Full OAI support for 3.13.1 UHD
+
+## [v1.0.1](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tags/v1.0.1) -> February 2019. ##
+
+- Bug fix for the UE L1 simulator.
+
+## [v1.0.0](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tags/v1.0.0) -> January 2019. ##
+
+This version first implements the architectural split described in the following picture.
+
+![Block Diagram](./doc/images/oai_lte_enb_func_split_arch.png)
+
+* 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.
+
+Old Releases:
+
+* 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.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
+

CONTRIBUTING.md

+# Contributing to OpenAirInterface #
+
+We want to make contributing to this project as easy and transparent as possible.
+
+Please refer to the steps described on our website: [How to contribute to OAI](https://www.openairinterface.org/?page_id=112)
+
+1. Sign and return a Contributor License Agreement to OAI team.
+2. Create an account on [Eurecom GitLab Server](https://gitlab.eurecom.fr).
+3. Provide the identifiant of this account to the OAI team (mailto:contact@openairinterface.org) so you have developer rights on this repository.
+4. The policies are described in these wiki pages: [OAI Policies](https://gitlab.eurecom.fr/oai/openairinterface5g/wikis/oai-policies-home)
+   -  PLEASE DO NOT FORK the OAI repository on your own Eurecom GitLab account. It just eats up space on our servers.
+   - You can fork onto another hosting system. But we will NOT accept a merge request from a forked repository.
+      * This decision was made for the license reasons.
+      * The Continuous Integration will reject your merge request.
+   - All merge requests SHALL have `develop` branch as target branch.
+
+## Coding Styles ##
+
+There are described [here](https://gitlab.eurecom.fr/oai/openairinterface5g/wikis/guidelines/guidelines-home)
+
+## License ##
+
+By contributing to OpenAirInterface, you agree that your contributions will be licensed under the LICENSE file in the root directory of this source tree.

NOTICE.txt → NOTICE.md

-The source code of openairinterface5g is distributed under OAI Public License V1.0. 
-For more details of the license, refer to LICENSE file in the same directory.
+The source code of openairinterface5g is distributed under **OAI Public License V1.1**.
+
+For more details of the license, refer to [LICENSE](LICENSE) file in the same directory.
 
 However, the source code also contains third party software that is acknowledged here for reference.
 
-Credits for LFDS user space source code located in folder openair2/UTILS/LFDS/liblfds6.1.1/
-http://liblfds.org/.
-Extract from http://liblfds.org/pages/downloads_and_license.html:
+## Credits for LFDS user space source code located in folder openair2/UTILS/LFDS/ ##
+
+See on [liblfds website](https://liblfds.org/) the license section.
+
+<pre>
 "There is no license. You are free to use this software in any way, for any purpose. Go forth and create wealth!
 If however for legal reasons a licence is required, the license of your choice will be granted."
+</pre>
 
+## Credits for source code common/utils/collection/queue.h: ##
 
-Credits for source code common/utils/collection/queue.h:
 The Regents of the University of California: BSD 3-Clause Licence.
 
+## Credits for source code common/utils/collection/tree.h: ##
 
-Credits for source code common/utils/collection/tree.h:
 Niels Provos <provos@citi.umich.edu>: BSD 2-Clause Licence.
 
-
-

README.md

+# OpenAirInterface License #
+
+OpenAirInterface is under OpenAirInterface Software Alliance license.
+
+ *  [OAI License Model](http://www.openairinterface.org/?page_id=101)
+ *  [OAI License v1.1 on our website](http://www.openairinterface.org/?page_id=698)
+
+It is distributed under **OAI Public License V1.1**.
+
+The license information is distributed under [LICENSE](LICENSE) file in the same directory.
+
+Please see [NOTICE](NOTICE.md) file for third party software that is included in the sources.
+
+# Where to Start #
+
+ *  [The implemented features](./doc/FEATURE_SET.md)
+ *  [How to build](./doc/BUILD.md)
+ *  [How to run the modems](./doc/RUNMODEM.md)
+
+# RAN repository structure #
+
+The OpenAirInterface (OAI) software is composed of the following parts: 
+
+<pre>
+openairinterface5g
+├── 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 and starting tutorials.
+├── executables       : Top-level executable source files.
+├── LICENSE           : License file.
+├── 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 / 3GPP NR Rel-15 layer. A local Readme file provides more details.
+│   ├── PHY
+│   ├── SCHED
+│   ├── SCHED_NBIOT
+│   ├── SCHED_NR
+│   ├── SCHED_NR_UE
+│   ├── SCHED_UE
+│   └── SIMULATION    : PHY RF simulation.
+├── openair2          : 3GPP LTE Rel-10 RLC/MAC/PDCP/RRC/X2AP + LTE Rel-14 M2AP implementation. Also 3GPP NR Rel-15 RLC/MAC/PDCP/RRC/X2AP.
+│   ├── COMMON
+│   ├── DOCS
+│   ├── ENB_APP
+│   ├── F1AP
+│   ├── GNB_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
+│   ├── M2AP
+│   ├── MCE_APP
+│   ├── NETWORK_DRIVER
+│   ├── NR_PHY_INTERFACE
+│   ├── NR_UE_PHY_INTERFACE
+│   ├── PHY_INTERFACE
+│   ├── RRC
+│   ├── UTIL
+│   └── X2AP
+├── openair3          : 3GPP LTE Rel10 for S1AP, NAS GTPV1-U for both ENB and UE.
+│   ├── COMMON
+│   ├── DOCS
+│   ├── GTPV1-U
+│   ├── M3AP
+│   ├── MME_APP
+│   ├── NAS
+│   ├── S1AP
+│   ├── SCTP
+│   ├── SECU
+│   ├── TEST
+│   ├── UDP
+│   └── 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.
+</pre>

README.txt

-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.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
-├── 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
-├── 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 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.
-    ├── NETWORK_DRIVER
-    ├── PHY_INTERFACE
-    ├── RRC/LITE
-    ├── UTIL
-    ├── X2AP
-├── openair3: 3GPP LTE Rel10 for S1AP, NAS GTPV1-U for both ENB and UE.
-    ├── COMMON
-    ├── DOCS
-    ├── GTPV1-U
-    ├── NAS
-    ├── S1AP
-    ├── SCTP
-    ├── SECU
-    ├── UDP
-    ├── 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:
-
-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.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

ci-scripts/.gitignore

+enb_*.log
+ue_*.log
+ping_*.*
+iperf_*.*
+phones_list.txt
+modules_list.txt
+test_results*.html
+pMain*
+__pycache__

ci-scripts/Jenkinsfile-tmp-full-ran

@@ -208,12 +208,12 @@ pipeline {
                             [$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 --eNBRepository=${eNB_Repository} --eNBBranch=${eNB_Branch} --eNBCommitID=${eNB_CommitID} --eNB_AllowMerge=${eNB_AllowMergeRequestProcess} --eNBTargetBranch=${eNB_TargetBranch} --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} ${mainPythonAllXmlFiles}"
+                            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 --eNBRepository=${eNB_Repository} --eNBBranch=${eNB_Branch} --eNBCommitID=${eNB_CommitID} --eNB_AllowMerge=${eNB_AllowMergeRequestProcess} --eNBTargetBranch=${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}"
+                                    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

ci-scripts/Jenkinsfile-tmp-ran

@@ -36,6 +36,9 @@ def testStageName = params.pipelineTestStageName
 // Name of the phone resource
 def ciSmartPhoneResource = params.smartphonesResource
 
+// Name of the phone resource
+def ciEpcResource = params.epcResource
+
 // Terminate Status
 def termUE = 0
 def termENB = 1
@@ -64,7 +67,7 @@ pipeline {
     options {
         disableConcurrentBuilds()
         ansiColor('xterm')
-        lock (ciSmartPhoneResource)
+        lock(extra: [[resource: ciEpcResource]], resource: ciSmartPhoneResource)
     }
     // the following parameter options are commented out so it shows the ones
     // that you SHALL have to run the job.
@@ -217,12 +220,12 @@ pipeline {
                             [$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 --eNBRepository=${eNB_Repository} --eNBBranch=${eNB_Branch} --eNBCommitID=${eNB_CommitID} --eNB_AllowMerge=${eNB_AllowMergeRequestProcess} --eNBTargetBranch=${eNB_TargetBranch} --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} ${mainPythonAllXmlFiles}"
+                            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} --eNBRepository=${eNB_Repository} --eNBBranch=${eNB_Branch} --eNBCommitID=${eNB_CommitID} --eNB_AllowMerge=${eNB_AllowMergeRequestProcess} --eNBTargetBranch=${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}"
+                                    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

ci-scripts/Jenkinsfile-tmp-ue

@@ -187,12 +187,12 @@ pipeline {
                             [$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 --eNBRepository=${eNB_Repository} --eNBBranch=${eNB_Branch} --eNBCommitID=${eNB_CommitID} --eNB_AllowMerge=${eNB_AllowMergeRequestProcess} --eNBTargetBranch=${eNB_TargetBranch} --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} ${mainPythonAllXmlFiles}"
+                            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} --eNBRepository=${eNB_Repository} --eNBBranch=${eNB_Branch} --eNBCommitID=${eNB_CommitID} --eNB_AllowMerge=${eNB_AllowMergeRequestProcess} --eNBTargetBranch=${eNB_TargetBranch} --UEUserName=${UE_Username} --UEPassword=${UE_Password} --UESourceCodePath=${params.UE_SourceCodePath} --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} --XMLTestFile=${xmlFile}"
+                                    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

ci-scripts/buildOnVM.sh

@@ -44,7 +44,7 @@ function build_on_vm {
         STATUS=1
         return
     fi
-    if [ ! -f /etc/apt/apt.conf.d/01proxy ]
+    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?"
@@ -68,11 +68,12 @@ function build_on_vm {
     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 --unsafe-caching --template ci-scripts/template-host.xml
+        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
 
@@ -96,12 +97,12 @@ function build_on_vm {
     else
         scp -o StrictHostKeyChecking=no $JENKINS_WKSP/localZip.zip ubuntu@$VM_IP_ADDR:/home/ubuntu
     fi
-    scp -o StrictHostKeyChecking=no /etc/apt/apt.conf.d/01proxy ubuntu@$VM_IP_ADDR:/home/ubuntu
+    [ -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 "sudo cp 01proxy /etc/apt/apt.conf.d/" > $VM_CMDS
+    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"* ]]
@@ -179,8 +180,12 @@ function build_on_vm {
         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
+        echo "$BUILD_OPTIONS > ../cmake_targets/log/rt_controller.Rel15.txt 2>&1" >> $VM_CMDS
     fi
     if [[ "$VM_NAME" != *"-cppcheck"* ]] && [[ "$VM_NAME" != *"-flexran-rtc"* ]]
     then

ci-scripts/checkAddedWarnings.sh

@@ -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/*/*.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`
+LIST_WARNING_FILES=`egrep "error:|warning:" archives/*/*.Rel15.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"

ci-scripts/checkCodingFormattingRules.sh

@@ -62,6 +62,30 @@ then
     NB_FILES_TO_FORMAT=`astyle --dry-run --options=ci-scripts/astyle-options.txt --recursive *.c *.h | grep -c Formatted `
     echo "Nb Files that do NOT follow OAI rules: $NB_FILES_TO_FORMAT"
     echo $NB_FILES_TO_FORMAT > ./oai_rules_result.txt
+
+    # Testing Circular Dependencies protection
+    awk '/#[ \t]*ifndef/ { gsub("^.*ifndef *",""); if (names[$1]!="") print "files with same {define ", FILENAME, names[$1]; names[$1]=FILENAME } /#[ \t]*define/ { gsub("^.*define *",""); if(names[$1]!=FILENAME) print "error in declaration", FILENAME, $1, names[$1]; nextfile }' `find openair* common targets executables -name *.h |grep -v LFDS` > header-files-w-incorrect-define.txt
+
+    # Testing if explicit GNU GPL license banner
+    egrep -irl --exclude-dir=.git --include=*.cpp --include=*.c --include=*.h "General Public License" . > files-w-gnu-gpl-license-banner.txt
+
+    # Looking at exotic/suspect banner
+    LIST_OF_FILES_W_BANNER=`egrep -irl --exclude-dir=.git --include=*.cpp --include=*.c --include=*.h "Copyright|copyleft" .`
+    if [ -f ./files-w-suspect-banner.txt ]; then rm -f ./files-w-suspect-banner.txt; fi
+    for FILE in $LIST_OF_FILES_W_BANNER
+    do
+       IS_NFAPI=`echo $FILE | egrep -c "nfapi/open-nFAPI|nfapi/oai_integration/vendor_ext"`
+       IS_OAI_LICENCE_PRESENT=`egrep -c "OAI Public License" $FILE`
+       IS_BSD_LICENCE_PRESENT=`egrep -c "the terms of the BSD Licence" $FILE`
+       IS_EXCEPTION=`echo $FILE | egrep -c "common/utils/collection/tree.h|common/utils/collection/queue.h|common/utils/itti_analyzer/common/queue.h|openair3/UTILS/tree.h|openair3/UTILS/queue.h"`
+       if [ $IS_OAI_LICENCE_PRESENT -eq 0 ] && [ $IS_BSD_LICENCE_PRESENT -eq 0 ]
+       then
+           if [ $IS_NFAPI -eq 0 ] && [ $IS_EXCEPTION -eq 0 ]
+           then
+               echo $FILE >> ./files-w-suspect-banner.txt
+           fi
+       fi
+    done
     exit 0
 fi
 
@@ -131,8 +155,25 @@ if [ -f oai_rules_result_list.txt ]
 then
     rm -f oai_rules_result_list.txt
 fi
+if [ -f header-files-w-incorrect-define.txt ]
+then
+    rm -f header-files-w-incorrect-define.txt
+fi
+if [ -f files-w-gnu-gpl-license-banner.txt ]
+then
+    rm -f files-w-gnu-gpl-license-banner.txt
+fi
+if [ -f files-w-suspect-banner.txt ]
+then
+    rm -f files-w-suspect-banner.txt
+fi
+awk '/#[ \t]*ifndef/ { gsub("^.*ifndef *",""); if (names[$1]!="") print "files with same {define ", FILENAME, names[$1]; names[$1]=FILENAME } /#[ \t]*define/ { gsub("^.*define *",""); if(names[$1]!=FILENAME) print "error in declaration", FILENAME, $1, names[$1]; nextfile }' `find openair* common targets executables -name *.h |grep -v LFDS` > header-files-w-incorrect-define-tmp.txt
+
 for FULLFILE in $MODIFIED_FILES
 do
+    # sometimes, we remove files
+    if [ ! -f $FULLFILE ]; then continue; fi
+
     filename=$(basename -- "$FULLFILE")
     EXT="${filename##*.}"
     if [ $EXT = "c" ] || [ $EXT = "h" ] || [ $EXT = "cpp" ] || [ $EXT = "hpp" ]
@@ -144,8 +185,32 @@ do
             echo $FULLFILE
             echo $FULLFILE >> ./oai_rules_result_list.txt
         fi
+        # Testing if explicit GNU GPL license banner
+        egrep -i "General Public License" $FULLFILE >> files-w-gnu-gpl-license-banner.txt
+        # Looking at exotic/suspect banner
+        IS_BANNER=`egrep -i -c "Copyright|copyleft" $FULLFILE`
+        if [ $IS_BANNER -ne 0 ]
+        then
+            IS_NFAPI=`echo $FULLFILE | egrep -c "nfapi/open-nFAPI|nfapi/oai_integration/vendor_ext"`
+            IS_OAI_LICENCE_PRESENT=`egrep -c "OAI Public License" $FULLFILE`
+            IS_BSD_LICENCE_PRESENT=`egrep -c "the terms of the BSD Licence" $FULLFILE`
+            IS_EXCEPTION=`echo $FILE | egrep -c "common/utils/collection/tree.h|common/utils/collection/queue.h|common/utils/itti_analyzer/common/queue.h|openair3/UTILS/tree.h|openair3/UTILS/queue.h"`
+            if [ $IS_OAI_LICENCE_PRESENT -eq 0 ] && [ $IS_BSD_LICENCE_PRESENT -eq 0 ]
+            then
+                if [ $IS_NFAPI -eq 0 ] && [ $IS_EXCEPTION -eq 0 ]
+                then
+                    echo $FILE >> ./files-w-suspect-banner.txt
+                fi
+            fi
+        fi
+    fi
+    # Testing Circular Dependencies protection
+    if [ $EXT = "h" ] || [ $EXT = "hpp" ]
+    then
+        grep $FULLFILE header-files-w-incorrect-define-tmp.txt >> header-files-w-incorrect-define.txt
     fi
 done
+rm -f header-files-w-incorrect-define-tmp.txt
 echo ""
 echo " ----------------------------------------------------------"
 echo "Nb Files that do NOT follow OAI rules: $NB_TO_FORMAT"

ci-scripts/cls_physim.py

+# * 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
+# */
+#---------------------------------------------------------------------
+# Python for CI of OAI-eNB + COTS-UE
+#
+#   Required Python Version
+#     Python 3.x
+#
+#   Required Python Package
+#     pexpect
+#---------------------------------------------------------------------
+
+#to use logging.info()
+import logging
+#to create a SSH object locally in the methods
+import sshconnection
+#to update the HTML object
+import html
+from multiprocessing import SimpleQueue
+#for log folder maintenance
+import os
+
+class PhySim:
+	def __init__(self):
+		self.buildargs = ""
+		self.runargs = ""
+		self.eNBIpAddr = ""
+		self.eNBUserName = ""
+		self.eNBPassWord = ""
+		self.eNBSourceCodePath = ""
+		self.ranRepository = ""
+		self.ranBranch = ""
+		self.ranCommitID= ""
+		self.ranAllowMerge= ""
+		self.ranTargetBranch= ""
+		self.exitStatus=0
+		self.forced_workspace_cleanup=False
+		#private attributes
+		self.__workSpacePath=''
+		self.__buildLogFile='compile_phy_sim.log'
+		self.__runLogFile=''
+		self.__runResults=[]
+		self.__runLogPath='phy_sim_logs'
+
+
+#-----------------
+#PRIVATE Methods
+#-----------------
+
+	def __CheckResults_PhySim(self,HTML,CONST,testcase_id):
+		mySSH = sshconnection.SSHConnection()
+		mySSH.open(self.eNBIpAddr, self.eNBUserName, self.eNBPassWord)
+		#retrieve run log file and store it locally$
+		mySSH.copyin(self.eNBIpAddr, self.eNBUserName, self.eNBPassWord, self.__workSpacePath+self.__runLogFile, '.')
+		mySSH.close()
+		#parse results looking for Encoding and Decoding mean values
+		self.__runResults=[]
+		with open(self.__runLogFile) as f:
+			for line in f:
+				if 'mean' in line:
+					self.__runResults.append(line)
+		#the values are appended for each mean value (2), so we take these 2 values from the list
+		info=self.__runResults[0]+self.__runResults[1]
+
+		#once parsed move the local logfile to its folder for tidiness
+		os.system('mv '+self.__runLogFile+' '+ self.__runLogPath+'/.')
+
+		#updating the HTML with results
+		html_cell = '<pre style="background-color:white">' + info  + '</pre>'
+		html_queue=SimpleQueue()
+		html_queue.put(html_cell)
+		HTML.CreateHtmlTestRowQueue(self.runargs, 'OK', 1, html_queue)
+		return HTML
+
+
+	def __CheckBuild_PhySim(self, HTML, CONST):
+		self.__workSpacePath=self.eNBSourceCodePath+'/cmake_targets/'
+		mySSH = sshconnection.SSHConnection()
+		mySSH.open(self.eNBIpAddr, self.eNBUserName, self.eNBPassWord)
+		#retrieve compile log file and store it locally
+		mySSH.copyin(self.eNBIpAddr, self.eNBUserName, self.eNBPassWord, self.__workSpacePath+self.__buildLogFile, '.')
+		#delete older run log file
+		mySSH.command('rm ' + self.__workSpacePath+self.__runLogFile, '\$', 5)
+		mySSH.close()
+		#check build result from local compile log file
+		buildStatus=False
+		with open(self.__buildLogFile) as f:
+		#nr_prachsim is the last compile step
+			if 'nr_prachsim compiled' in f.read():
+				buildStatus=True
+		#update HTML based on build status
+		if buildStatus:
+			HTML.CreateHtmlTestRow(self.buildargs, 'OK', CONST.ALL_PROCESSES_OK, 'LDPC')
+			self.exitStatus=0
+		else:
+			logging.error('\u001B[1m Building Physical Simulators Failed\u001B[0m')
+			HTML.CreateHtmlTestRow(self.buildargs, 'KO', CONST.ALL_PROCESSES_OK, 'LDPC')
+			HTML.CreateHtmlTabFooter(False)
+			#exitStatus=1 will do a sys.exit in main
+			self.exitStatus=1
+		return HTML
+
+
+#-----------------$
+#PUBLIC Methods$
+#-----------------$
+
+	def Build_PhySim(self,htmlObj,constObj):
+		mySSH = sshconnection.SSHConnection()    
+		mySSH.open(self.eNBIpAddr, self.eNBUserName, self.eNBPassWord)
+
+		#create working dir    
+		mySSH.command('mkdir -p ' + self.eNBSourceCodePath, '\$', 5)
+		mySSH.command('cd ' + self.eNBSourceCodePath, '\$', 5)
+
+		if not self.ranRepository.lower().endswith('.git'):
+			self.ranRepository+='.git'
+
+		#git clone
+		mySSH.command('if [ ! -e .git ]; then stdbuf -o0 git clone '  + self.ranRepository + ' .; else stdbuf -o0 git fetch --prune; fi', '\$', 600)
+		#git config 
+		mySSH.command('git config user.email "jenkins@openairinterface.org"', '\$', 5)
+		mySSH.command('git config user.name "OAI Jenkins"', '\$', 5) 
+
+		#git clean depending on self.forced_workspace_cleanup captured in xml
+		if self.forced_workspace_cleanup==True:
+			logging.info('Cleaning workspace ...')
+			mySSH.command('echo ' + self.eNBPassWord + ' | sudo -S git clean -x -d -ff', '\$', 30)
+		else:
+			logging.info('Workspace cleaning was disabled')
+
+		# if the commit ID is provided, use it to point to it
+		if self.ranCommitID != '':
+			mySSH.command('git checkout -f ' + self.ranCommitID, '\$', 5)
+		# if the branch is not develop, then it is a merge request and we need to do 
+		# the potential merge. Note that merge conflicts should have already been checked earlier
+		if (self.ranAllowMerge):
+			if self.ranTargetBranch == '':
+				if (self.ranBranch != 'develop') and (self.ranBranch != 'origin/develop'):
+					mySSH.command('git merge --ff origin/develop -m "Temporary merge for CI"', '\$', 5)
+			else:
+				logging.info('Merging with the target branch: ' + self.ranTargetBranch)
+				mySSH.command('git merge --ff origin/' + self.ranTargetBranch + ' -m "Temporary merge for CI"', '\$', 5)
+
+		#build
+		mySSH.command('source oaienv', '\$', 5)
+		mySSH.command('cd cmake_targets', '\$', 5)
+		mySSH.command('mkdir -p log', '\$', 5)
+		mySSH.command('chmod 777 log', '\$', 5)
+		mySSH.command('stdbuf -o0 ./build_oai ' + self.buildargs + ' 2>&1 | stdbuf -o0 tee ' + self.__buildLogFile, 'Bypassing the Tests|build have failed', 1500) 
+
+		mySSH.close()
+		#check build status and update HTML object
+		lHTML = html.HTMLManagement()
+		lHTML=self.__CheckBuild_PhySim(htmlObj,constObj)
+		return lHTML
+
+
+	def Run_PhySim(self,htmlObj,constObj,testcase_id):
+		#create run logs folder locally
+		os.system('mkdir -p ./'+self.__runLogPath)
+		#log file is tc_<testcase_id>.log remotely
+		self.__runLogFile='physim_'+str(testcase_id)+'.log'
+		#open a session for test run
+		mySSH = sshconnection.SSHConnection()
+		mySSH.open(self.eNBIpAddr, self.eNBUserName, self.eNBPassWord)
+		mySSH.command('cd '+self.__workSpacePath,'\$',5)
+		#run and redirect the results to a log file
+		mySSH.command(self.__workSpacePath+'phy_simulators/build/ldpctest ' + self.runargs + ' >> '+self.__runLogFile, '\$', 30)   
+		mySSH.close()
+		#return updated HTML to main
+		lHTML = html.HTMLManagement()
+		lHTML=self.__CheckResults_PhySim(htmlObj,constObj,testcase_id)
+		return lHTML

ci-scripts/conf_files/enb.band13.tm1.50PRB.emtc.conf

@@ -233,6 +233,7 @@ eNBs =
           #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
 

ci-scripts/constants.py

+#/*
+# * 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
+# */
+#---------------------------------------------------------------------
+# Python for CI of OAI-eNB + COTS-UE
+#
+#   Required Python Version
+#     Python 3.x
+#
+#   Required Python Package
+#     pexpect
+#---------------------------------------------------------------------
+
+#-----------------------------------------------------------
+# Version
+#-----------------------------------------------------------
+Version = '0.2'
+
+#-----------------------------------------------------------
+# Constants
+#-----------------------------------------------------------
+ALL_PROCESSES_OK = 0
+ENB_PROCESS_FAILED = -1
+ENB_PROCESS_OK = +1
+ENB_PROCESS_SEG_FAULT = -11
+ENB_PROCESS_ASSERTION = -12
+ENB_PROCESS_REALTIME_ISSUE = -13
+ENB_PROCESS_NOLOGFILE_TO_ANALYZE = -14
+ENB_PROCESS_SLAVE_RRU_NOT_SYNCED = -15
+HSS_PROCESS_FAILED = -2
+HSS_PROCESS_OK = +2
+MME_PROCESS_FAILED = -3
+MME_PROCESS_OK = +3
+SPGW_PROCESS_FAILED = -4
+SPGW_PROCESS_OK = +4
+UE_IP_ADDRESS_ISSUE = -5
+OAI_UE_PROCESS_NOLOGFILE_TO_ANALYZE = -20
+OAI_UE_PROCESS_COULD_NOT_SYNC = -21
+OAI_UE_PROCESS_ASSERTION = -22
+OAI_UE_PROCESS_FAILED = -23
+OAI_UE_PROCESS_NO_TUNNEL_INTERFACE = -24
+OAI_UE_PROCESS_SEG_FAULT = -25
+OAI_UE_PROCESS_NO_MBMS_MSGS = -26
+OAI_UE_PROCESS_OK = +6
+
+UE_STATUS_DETACHED = 0
+UE_STATUS_DETACHING = 1
+UE_STATUS_ATTACHING = 2
+UE_STATUS_ATTACHED = 3
+
+X2_HO_REQ_STATE__IDLE = 0
+X2_HO_REQ_STATE__TARGET_RECEIVES_REQ = 1
+X2_HO_REQ_STATE__TARGET_RRC_RECFG_COMPLETE = 2
+X2_HO_REQ_STATE__TARGET_SENDS_SWITCH_REQ = 3
+X2_HO_REQ_STATE__SOURCE_RECEIVES_REQ_ACK = 10

ci-scripts/cppcheck_suppressions.list

@@ -37,6 +37,7 @@ memleak:openair2/UTIL/OMG/omg_hashtable.c
 //    _emm_as_encode function creates the encoded buffer
 //
 memleak:openair3/NAS/UE/EMM/SAP/emm_as.c
+memleak:openair1/PHY/INIT/nr_init_ue.c
 //-----------------------------------------------------------------------------
 //*****************************************************************************
 // section for files not used in oai exec's included in CI.
@@ -76,6 +77,11 @@ nullPointer:common/utils/T/local_tracer.c:243
 // first iteration of the loop
 nullPointer:common/utils/T/tracer/multi.c:264
 nullPointer:common/utils/T/tracer/multi.c:265
+//-----------------------------------------------------------------------------
+// this file is used for testing the RLC V2 implementation, this error is
+// not a problem, the programmer has to know what she does when writing
+// the tests
+arrayIndexOutOfBounds:openair2/LAYER2/rlc_v2/tests/test.c:401
 //
 //*****************************************************************************
 //

ci-scripts/createVM.sh

@@ -85,12 +85,13 @@ function create_vm {
     echo "VM_NAME             = $VM_NAME"
     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 --unsafe-caching --template ci-scripts/template-host.xml
+    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
 

ci-scripts/doc/vm_based_simulator_build.md

@@ -51,18 +51,20 @@ Mandatory Options:
 Options:
 --------
  # OpenAirInterface Build Variants
-    --variant enb-usrp     OR -v1
-    --variant basic-sim    OR -v2
-    --variant phy-sim      OR -v3
-    --variant cppcheck     OR -v4
-    --variant enb-ethernet OR -v7
-    --variant ue-ethernet  OR -v8
+    --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
+    --variant flexran-rtc     OR -v10    ( build and test non-OSA )
  # OpenAirInterface Test Variants
-    --variant l1-sim       OR -v20
-    --variant rf-sim       OR -v21
-    --variant l2-sim       OR -v22
+    --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

ci-scripts/doc/vm_based_simulator_check_build.md

@@ -34,6 +34,7 @@ Source file concerned: `ci-scripts/waitBuildOnVM.sh`
 *  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
 
 ---

ci-scripts/doc/vm_based_simulator_create.md

@@ -44,18 +44,20 @@ Mandatory Options:
     Specify the build ID of the Jenkins job.
 
  # OpenAirInterface Build Variants
-    --variant enb-usrp     OR -v1
-    --variant basic-sim    OR -v2
-    --variant phy-sim      OR -v3
-    --variant cppcheck     OR -v4
-    --variant enb-ethernet OR -v7
-    --variant ue-ethernet  OR -v8
+    --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
+    --variant flexran-rtc     OR -v10    ( build and test non-OSA )
  # OpenAirInterface Test Variants
-    --variant l1-sim       OR -v20
-    --variant rf-sim       OR -v21
-    --variant l2-sim       OR -v22
+    --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
@@ -73,7 +75,7 @@ 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 --unsafe-caching --template ci-scripts/template-host.xml
+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.

ci-scripts/doc/vm_based_simulator_env.md

@@ -38,7 +38,6 @@ 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.**
 

ci-scripts/doc/vm_based_simulator_test.md

@@ -72,18 +72,20 @@ Options:
     Specify the workspace.
 
  # OpenAirInterface Build Variants
-    --variant enb-usrp     OR -v1
-    --variant basic-sim    OR -v2
-    --variant phy-sim      OR -v3
-    --variant cppcheck     OR -v4
-    --variant enb-ethernet OR -v7
-    --variant ue-ethernet  OR -v8
+    --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
+    --variant flexran-rtc     OR -v10    ( build and test non-OSA )
  # OpenAirInterface Test Variants
-    --variant l1-sim       OR -v20
-    --variant rf-sim       OR -v21
-    --variant l2-sim       OR -v22
+    --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

ci-scripts/helpreadme.py

+#/*
+# * 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
+# */
+#---------------------------------------------------------------------
+# Python for CI of OAI-eNB + COTS-UE
+#
+#   Required Python Version
+#     Python 3.x
+#
+#   Required Python Package
+#     pexpect
+#---------------------------------------------------------------------
+
+#-----------------------------------------------------------
+# Functions Declaration
+#-----------------------------------------------------------
+
+def GenericHelp(vers):
+	print('----------------------------------------------------------------------------------------------------------------------')
+	print('main.py Ver: ' + vers)
+	print('----------------------------------------------------------------------------------------------------------------------')
+	print('python main.py [options]')
+	print('  --help  Show this help.')
+	print('  --mode=[Mode]')
+	print('      TesteNB')
+	print('      InitiateHtml, FinalizeHtml')
+	print('      TerminateeNB, TerminateUE, TerminateHSS, TerminateMME, TerminateSPGW')
+	print('      LogCollectBuild, LogCollecteNB, LogCollectHSS, LogCollectMME, LogCollectSPGW, LogCollectPing, LogCollectIperf')
+
+def GitSrvHelp(repository,branch,commit,mergeallow,targetbranch):
+	print('  --ranRepository=[OAI RAN Repository URL]                                      -- ' + repository)
+	print('  --ranBranch=[OAI RAN Repository Branch]                                       -- ' + branch)
+	print('  --ranCommitID=[OAI RAN Repository Commit SHA-1]                               -- ' + commit)
+	print('  --ranAllowMerge=[Allow Merge Request (with target branch) (true or false)]    -- ' + mergeallow)
+	print('  --ranTargetBranch=[Target Branch in case of a Merge Request]                  -- ' + targetbranch)
+
+def eNBSrvHelp(ipaddr, username, password, sourcepath):
+	print('  --eNBIPAddress=[eNB\'s IP Address]                       -- ' + ipaddr)
+	print('  --eNBUserName=[eNB\'s Login User Name]                   -- ' + username)
+	print('  --eNBPassword=[eNB\'s Login Password]                    -- ' + password)
+	print('  --eNBSourceCodePath=[eNB\'s Source Code Path]            -- ' + sourcepath)
+
+def OAIUESrvHelp(ipaddr, username, password, sourcepath):
+	print('  --UEIPAddress=[UE\'s IP Address]                         -- ' + ipaddr)
+	print('  --UEUserName=[UE\'s Login User Name]                     -- ' + username)
+	print('  --UEPassword=[UE\'s Login Password]                      -- ' + password)
+	print('  --UESourceCodePath=[UE\'s Source Code Path]              -- ' + sourcepath)
+		
+def EPCSrvHelp(ipaddr, username, password, sourcepath, epctype):
+	print('  --EPCIPAddress=[EPC\'s IP Address]                       -- ' + ipaddr)
+	print('  --EPCUserName=[EPC\'s Login User Name]                   -- ' + username)
+	print('  --EPCPassword=[EPC\'s Login Password]                    -- ' + password)
+	print('  --EPCSourceCodePath=[EPC\'s Source Code Path]            -- ' + sourcepath)
+	print('  --EPCType=[EPC\'s Type: OAI or ltebox or OAI-Rel14-CUPS] -- ' + epctype)
+
+def ADBSrvHelp(ipaddr, username, password):
+	print('  --ADBIPAddress=[ADB\'s IP Address]                       -- ' + ipaddr)
+	print('  --ADBUserName=[ADB\'s Login User Name]                   -- ' + username)
+	print('  --ADBPassword=[ADB\'s Login Password]                    -- ' + password)
+
+def XmlHelp(filename):
+	print('  --XMLTestFile=[XML Test File to be run]                  -- ' + filename)
+	print('	Note: multiple xml files can be specified (--XMLFile=File1 ... --XMLTestFile=FileN) when HTML headers are created ("InitiateHtml" mode)')
+

ci-scripts/oai-ci-vm-tool

@@ -52,7 +52,7 @@ function variant_usage {
         if [ "$1" = "full" ]
         then        
             printf  "               VM_NAME=%-15s          ARCHIVES_LOC=%-15s\n" "$VM_NAME" "$ARCHIVES_LOC"
-            printf  "               VM_MEMORY=%-15s        VM_CPU=%-15s\n" "$VM_MEMORY" "$VM_CPU"       
+            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
@@ -140,10 +140,25 @@ function command_options_usage {
     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
 }
@@ -167,25 +182,30 @@ function variant__v2__basic_sim {
 }
 
 function variant__v3__phy_sim {
-    NB_PATTERN_FILES=12
+    NB_PATTERN_FILES=13
     BUILD_OPTIONS="--phy_simulators"
     VM_MEMORY=8192
-    RUN_OPTIONS="./run_exec_autotests.bash -g \"01510*\" -q -np -b"
+    VM_DISK=20
+    RUN_OPTIONS="./run_exec_autotests.bash -g \"01510* 015111 015112\" -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 --suppressions-list=ci-scripts/cppcheck_suppressions.list -I common/utils -I openair3/NAS/COMMON/UTIL -j4"
+    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=10240
+    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"
 }
@@ -207,7 +227,7 @@ function variant__v8__ue_ethernet {
 function variant__v10__flexran_rtc {
     ARCHIVES_LOC=flexran
     NB_PATTERN_FILES=1
-    BUILD_OPTIONS="cmake . && make -j2"
+    BUILD_OPTIONS="cmake .. && make -j2"
     VARIANT_INFO="non-OSA"
 }
 
@@ -218,8 +238,8 @@ function variant__v20__l1_sim {
 }
     
 function variant__v21__rf_sim {
+    ARCHIVES_LOC=rf_sim
     RUN_OPTIONS="complex"
-    EXPERIMENTAL="true"
 }
 
 function variant__v22__l2_sim {
@@ -257,6 +277,7 @@ function check_set_variant {
             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]//"-"/"_"}
@@ -328,6 +349,7 @@ function check_setvar {
     exit 1
 }	
 
+platform_set
 MY_DIR=$(dirname $(readlink -f $0))
 . $MY_DIR/createVM.sh
 . $MY_DIR/buildOnVM.sh
@@ -337,6 +359,7 @@ MY_DIR=$(dirname $(readlink -f $0))
 . $MY_DIR/reportBuildLocally.sh
 . $MY_DIR/reportTestLocally.sh
 
+
 if [ $# -lt 1 ]
 then
     echo "Syntax Error: too few arguments"
@@ -454,7 +477,7 @@ RUN_OPTIONS="none"
 
 
 # list of variables that can be set via the --setvar option
-AUTHORIZED_VAR=("VM_OSREL RUN_EXPERIMENTAL")
+AUTHORIZED_VAR=("VM_OSREL RUN_EXPERIMENTAL OPTIONAL_APTCACHER TESTPLATFORM_OWNER")
 
 
 #variables to set which OS VM should use
@@ -477,6 +500,7 @@ AUTHORIZED_VAR=("VM_OSREL RUN_EXPERIMENTAL")
 # -V<xx> option.
 VM_NAME=""
 VM_MEMORY=0
+VM_DISK=0
 VM_CPU=0
 ARCHIVES_LOC=""
 LOG_PATTERN=""

ci-scripts/waitBuildOnVM.sh

@@ -76,6 +76,8 @@ function wait_on_vm_build {
         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

ci-scripts/xml_files/enb_usrp210_band7_test_10mhz_tm1_cdrx.xml

@@ -56,7 +56,6 @@
 	<testCase id="040302">
 		<class>Attach_UE</class>
 		<desc>Attach UE</desc>
-		<nbMaxUEtoAttach>1</nbMaxUEtoAttach>
 	</testCase>
 
 	<testCase id="040401">