channel_simulator: synch eNBs in time and some bugs fixed

By default, eNB are now frame/subframe synchronized in time (that is they
all transmit the exact same frame and subframe at the same time).
Use -no-sync to disable synchronization.

Some bugs were fixed:
- memory initialized to 0
- ignore SIGPIPE that was delivered sometimes when an eNB disconnects
- set tx_sample_advance to 40, which is used in the usrp lib of openair
  (srsUE did not connect well with 0)

.dockerignore

@@ -1,8 +0,0 @@
-*.log
-cmake_targets/log/
-cmake_targets/ran_build/
-common/utils/T/T_IDs.h
-common/utils/T/T_messages.txt.h
-common/utils/T/genids
-common/utils/T/genids.o
-targets/bin/

.gitignore

@@ -2,19 +2,7 @@
 *.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
-
-# Tags for vim/global
-GPATH
-GRTAGS
-GTAGS
-tags
+cmake_targets/nas_sim_tools/build/

.vscode/launch.json

@@ -1,28 +0,0 @@
-{
-    // 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
-                }
-            ]
-        }
-    ]
-}

CHANGELOG.md

@@ -1,96 +0,0 @@
-# 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

@@ -1,22 +0,0 @@
-# Contributing to OpenAirInterface #
-
-We want to make contributing to this project as easy and transparent as possible.
-
-1. Sign and return a Contributor License Agreement to OAI team.
-2. We recommend that you provide us with a professional or student email address 
-2. Register on [Eurecom GitLab Server](https://gitlab.eurecom.fr/users/sign_in)
-3. Provide the OAI team with the **username** of this account to (mailto:contact@openairinterface.org) ; we will give you the 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.md

@@ -1,27 +0,0 @@
-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/ ##
-
-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: ##
-
-The Regents of the University of California: BSD 3-Clause Licence.
-
-## Credits for source code common/utils/collection/tree.h: ##
-
-Niels Provos <provos@citi.umich.edu>: BSD 2-Clause Licence.
-
-## Credits for source code openair3/GTPV1-U/nw-gtpv1u: ##
-
-Amit Chawre <http://www.amitchawre.net/contact.html>: BSD 2-Clause Licence.
-

NOTICE.txt

@@ -0,0 +1,21 @@
+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.
+
+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:
+"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."
+
+
+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:
+Niels Provos <provos@citi.umich.edu>: BSD 2-Clause Licence.
+
+
+

README.md

@@ -1,73 +0,0 @@
-# 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

@@ -0,0 +1,94 @@
+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. 
+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

channel_simulator/Makefile

@@ -0,0 +1,16 @@
+CC=gcc
+CFLAGS=-Wall -g -pthread
+
+CFLAGS += -O3 -ffast-math -march=native
+
+PROG=channel_simulator
+OBJS=main.o channel_simulator.o connection_manager.o utils.o
+
+$(PROG): $(OBJS)
+	$(CC) $(CFLAGS) -o $@ $^
+
+%.o: %.c
+	$(CC) $(CFLAGS) -c -o $@ $<
+
+clean:
+	rm -f $(PROG) *.o core

channel_simulator/README.x2_handover

@@ -0,0 +1,725 @@
+How to perform X2 handover with the channel simulator and only one USRP device
+==============================================================================
+
+This document describes the configuration and the steps used to perform
+X2 handover with the channel simulator and one USRP device (B210).
+
+The setup we used is as follows.
+Three computers are on the same LAN.
+
+The LAN we have is not very fast, so computer 1 and computer 2 are also
+directly connected using an ethernet cable. The connection is 1Gb/s. It
+cannot be less because it has to support the stream of IQ data (around
+500 Mb/s for 25 RBs).
+
+Computer 1 has LAN IP address 192.168.12.196 and 10.0.0.1 for the direct
+connection with computer 2.
+
+Computer 2 has LAN IP address 192.168.12.108 and 10.0.0.2 for the direct
+connection with computer 1.
+
+Computer 3 has LAN IP address 192.168.12.148.
+
+Computer 1 runs:
+  - channel_simulator
+  - usrp
+  - one eNB
+  - gain.sh to set gains (source below)
+
+Computer 2 runs only one eNB.
+
+Computer 3 runs a proprietary EPC (this is not openair-cn).
+
+The USRP device is connected to computer 1.
+
+Configuration
+=============
+
+The configuration files for computer 1 (computer1.conf) and computer 2
+(computer2.conf) are identical, except for the following.
+
+/homes/roux> diff computer1.conf computer2.conf
+11c11
+<     eNB_ID    =  0xe00;
+---
+>     eNB_ID    =  0xe01;
+42c42
+<                          Nid_cell                                           = 0;
+---
+>                          Nid_cell                                           = 1;
+188c188,193
+<
+---
+>     target_enb_x2_ip_address      = (
+>                                      { ipv4       = "192.168.12.196";
+>                                        ipv6       = "192:168:30::17";
+>                                        preference = "ipv4";
+>                                      }
+>                                     );
+192c197
+<         ENB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.12.196/24";
+---
+>         ENB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.12.108/24";
+195c200
+<         ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.12.196/24";
+---
+>         ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.12.108/24";
+198c203
+<         ENB_IPV4_ADDRESS_FOR_X2C                 = "192.168.12.196/24";
+---
+>         ENB_IPV4_ADDRESS_FOR_X2C                 = "192.168.12.108/24";
+/homes/roux>
+
+The eNB_ID and Nid_cell need to be different. The IP address settings
+also.
+
+For the X2 configuration, for computer 1, we have:
+
+    ///X2
+    enable_x2 = "yes";
+    t_reloc_prep      = 1000;      /* unit: millisecond */
+    tx2_reloc_overall = 2000;      /* unit: millisecond */
+
+
+And for computer 2, we have:
+
+    ///X2
+    enable_x2 = "yes";
+    t_reloc_prep      = 1000;      /* unit: millisecond */
+    tx2_reloc_overall = 2000;      /* unit: millisecond */
+    target_enb_x2_ip_address      = (
+                                     { ipv4       = "192.168.12.196";
+                                       ipv6       = "192:168:30::17";
+                                       preference = "ipv4";
+                                     }
+                                    );
+
+The full content of computer1.conf and computer2.conf are below, for
+reference. It is better to start from a sample configuration file found in
+the source tree and change the neeeded values rather than using those files.
+They are put here for reference only and may fail to work with future
+versions of the software.
+
+Steps
+=====
+
+- on computer 3:
+   - launch the EPC
+
+- on computer 1:
+   - run: ./channel_simulator
+   - as root, run: CHANNEL_SIMULATOR_RX_FREQUENCY=2 CHANNEL_SIMULATOR_TX_FREQUENCY=1 CHANNEL_SIMULATOR_TX_SAMPLE_ADVANCE=15360 ./lte-softmodem -O computer1.conf
+
+- on computer 2:
+   - as root, run: CHANNEL_SIMULATOR_IP=10.0.0.1 CHANNEL_SIMULATOR_RX_FREQUENCY=2 CHANNEL_SIMULATOR_TX_FREQUENCY=1 CHANNEL_SIMULATOR_TX_SAMPLE_ADVANCE=15360 ./lte-softmodem -O computer2.conf
+
+- on computer 1:
+   - as root, run: ./usrp
+   - run: ./gain.sh 0 -30
+
+- connect the UE
+   the UE should connect to the eNB on computer 1 due to the gains.
+
+- on computer 1:
+   - run gain.sh (source below) repeatedly
+     at each run, decrease first number, increase second, eg.:
+     - ./gain.sh -5 -25
+     - ./gain.sh -10 -20
+     - ./gain.sh -15 -15
+     - ./gain.sh -20 -10
+     - ./gain.sh -25 -5
+     - ./gain.sh -30 -0
+     note: actual values may need to be different. The basic idea is to
+           increase the gain for the target eNB and decrease the gain for
+           the source eNB to trigger X2 handover based on A3 measurement
+           report.
+
+Script to set gains (gain.sh)
+=============================
+
+Here comes the script used to set gains.
+
+/homes/roux> cat gain.sh
+echo set gain $1 to 10.0.0.1
+echo $1|telnet 10.0.0.1 4025
+
+echo set gain $2 to 10.0.0.1
+echo $2|telnet 10.0.0.2 4025
+/homes/roux>
+
+==============================================================================
+Content of computer1.conf
+==============================================================================
+
+/homes/roux> cat computer1.conf
+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 = "eNodeB_3GPP";
+                           node_timing = "synch_to_ext_device";
+                           node_synch_ref = 0;
+                           nb_antenna_ports = 1;
+                           ue_TransmissionMode = 1;
+  			   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_antennas_tx          			      = 1;
+                           nb_antennas_rx          			      = 1;
+                           prach_root              			      = 0;
+			   tx_gain                                            = 90;
+			   rx_gain                                            = 115;
+                           pbch_repetition                                    = "FALSE";
+                           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_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                                   = -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;
+
+      //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       = "192.168.12.148";
+                              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            = "eth1";
+        ENB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.12.196/24";
+
+        ENB_INTERFACE_NAME_FOR_S1U               = "eth1";
+        ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.12.196/24";
+        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
+
+        ENB_IPV4_ADDRESS_FOR_X2C                 = "192.168.12.196/24";
+        ENB_PORT_FOR_X2C                         = 36422; # Spec 36422
+    };
+
+    log_config :
+    {
+	global_log_level                      ="info";
+    	global_log_verbosity                  ="high";
+	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                         ="debug";
+    	rlc_log_verbosity                     ="high";
+	pdcp_log_level                        ="info";
+    	pdcp_log_verbosity                    ="high";
+	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;
+        }
+);
+
+THREAD_STRUCT = (
+  {
+    parallel_config = "PARALLEL_RU_L1_TRX_SPLITaaaaaa";
+    worker_config = "ENABLE";
+  }
+);
+
+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                    = 118;
+         eNB_instances  = [0];
+
+    }
+);
+
+    log_config :
+    {
+	global_log_level                      ="info";
+    	global_log_verbosity                  ="high";
+	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                     ="high";
+	pdcp_log_level                        ="info";
+    	pdcp_log_verbosity                    ="high";
+	rrc_log_level                         ="info";
+    	rrc_log_verbosity                     ="medium";
+   };	
+/homes/roux>
+
+==============================================================================
+Content of computer2.conf
+==============================================================================
+
+/homes/roux> cat computer2.conf
+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    =  0xe01;
+
+    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 = "eNodeB_3GPP";
+                           node_timing = "synch_to_ext_device";
+                           node_synch_ref = 0;
+                           nb_antenna_ports = 1;
+                           ue_TransmissionMode = 1;
+  			   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					      = 1;
+                           N_RB_DL                 			      = 25;
+                           Nid_cell_mbsfn          			      = 0;
+                           nb_antennas_tx          			      = 1;
+                           nb_antennas_rx          			      = 1;
+                           prach_root              			      = 0;
+			   tx_gain                                            = 90;
+			   rx_gain                                            = 115;
+                           pbch_repetition                                    = "FALSE";
+                           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_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                                   = -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;
+
+      //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       = "192.168.12.148";
+                              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       = "192.168.12.196";
+                                       ipv6       = "192:168:30::17";
+                                       preference = "ipv4";
+                                     }
+                                    );
+    NETWORK_INTERFACES :
+    {
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth1";
+        ENB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.12.108/24";
+
+        ENB_INTERFACE_NAME_FOR_S1U               = "eth1";
+        ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.12.108/24";
+        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
+
+        ENB_IPV4_ADDRESS_FOR_X2C                 = "192.168.12.108/24";
+        ENB_PORT_FOR_X2C                         = 36422; # Spec 36422
+    };
+
+    log_config :
+    {
+	global_log_level                      ="info";
+    	global_log_verbosity                  ="high";
+	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                         ="debug";
+    	rlc_log_verbosity                     ="high";
+	pdcp_log_level                        ="info";
+    	pdcp_log_verbosity                    ="high";
+	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;
+        }
+);
+
+THREAD_STRUCT = (
+  {
+    parallel_config = "PARALLEL_RU_L1_TRX_SPLITaaaaaa";
+    worker_config = "ENABLE";
+  }
+);
+
+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                    = 118;
+         eNB_instances  = [0];
+
+    }
+);
+
+    log_config :
+    {
+	global_log_level                      ="info";
+    	global_log_verbosity                  ="high";
+	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                     ="high";
+	pdcp_log_level                        ="info";
+    	pdcp_log_verbosity                    ="high";
+	rrc_log_level                         ="info";
+    	rrc_log_verbosity                     ="medium";
+   };	
+/homes/roux>

channel_simulator/channel_simulator.c

@@ -0,0 +1,343 @@
+#include "channel_simulator.h"
+
+#include "utils.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <inttypes.h>
+#include <unistd.h>
+#include <sys/socket.h>
+#include <immintrin.h>
+
+void init_channel_simulator(channel_simulator *c,
+    uint32_t samplerate, int n_samples)
+{
+  c->timestamp = 1024;         /* timestamps [0..1023] used as commands */
+  c->samplerate = samplerate;
+  c->n_samples = n_samples;
+  c->channels = NULL;
+  c->channels_count = 0;
+  c->connections = NULL;
+  c->connections_count = 0;
+}
+
+void cleanup_connections(channel_simulator *c)
+{
+  connection *con;
+  int i;
+
+  /* remove dead connections */
+  i = 0;
+  while (i < c->connections_count) {
+    if (c->connections[i].socket != -1) { i++; continue; }
+    con = &c->connections[i];
+    c->channels[con->rx_channel_index].connection_count--;
+    c->channels[con->tx_channel_index].connection_count--;
+    free(con->iq_buffer);
+    if (c->connections_count == 1) {
+      free(c->connections);
+      c->connections = NULL;
+      c->connections_count = 0;
+      break;
+    }
+    c->connections_count--;
+    memmove(&c->connections[i], &c->connections[i+1],
+            (c->connections_count-i) * sizeof(connection));
+    c->connections = realloc(c->connections,
+                             c->connections_count * sizeof(connection));
+    if (c->connections == NULL) goto oom;
+  }
+
+  /* remove channels with no more connections */
+  i = 0;
+  while (i < c->channels_count) {
+    if (c->channels[i].connection_count) { i++; continue; }
+    free(c->channels[i].data);
+    if (c->channels_count == 1) {
+      free(c->channels);
+      c->channels = NULL;
+      c->channels_count = 0;
+      break;
+    }
+    c->channels_count--;
+    memmove(&c->channels[i], &c->channels[i+1],
+            (c->channels_count-i) * sizeof(channel));
+    c->channels = realloc(c->channels, c->channels_count * sizeof(channel));
+    if (c->channels == NULL) goto oom;
+  }
+
+  return;
+
+oom:
+  printf("ERROR: cleanup_connections: out of memory\n");
+  exit(1);
+}
+
+static int find_or_create_channel(channel_simulator *c, uint64_t freq,
+                                  uint32_t sample_advance)
+{
+  channel *chan;
+  int i;
+  for (i = 0; i < c->channels_count; i++) {
+    if (c->channels[i].frequency != freq) continue;
+    if (c->channels[i].sample_advance != sample_advance) {
+      printf("ERROR: bad sample_advance\n");
+      exit(1);
+    }
+    return i;
+  }
+
+  c->channels_count++;
+  c->channels = realloc(c->channels, c->channels_count * sizeof(channel));
+  if (c->channels == NULL) goto oom;
+
+  chan = &c->channels[i];
+  chan->frequency = freq;
+  chan->sample_advance = sample_advance;
+  if (posix_memalign((void **)&chan->data, 32, c->n_samples * 4) != 0)
+    goto oom;
+  memset(chan->data, 0, c->n_samples * 4);
+  chan->connection_count = 0;
+
+  return i;
+
+oom:
+  printf("ERROR: find_or_create_channel: out of memory\n");
+  exit(1);
+}
+
+void channel_simulator_add_connection(channel_simulator *c,
+            int socket, uint64_t rx_frequency, uint64_t tx_frequency,
+            uint32_t rx_sample_advance, uint32_t tx_sample_advance)
+{
+  connection *con;
+
+  printf("INFO: new connection RX %"PRIu64" TX %"PRIu64"\n",
+         rx_frequency, tx_frequency);
+
+  c->connections_count++;
+  c->connections = realloc(c->connections,
+                           c->connections_count * sizeof(connection));
+  if (c->connections == NULL) goto oom;
+  con = &c->connections[c->connections_count-1];
+
+  con->socket = socket;
+  if (posix_memalign((void **)&con->iq_buffer, 32, c->n_samples * 4) != 0)
+    goto oom;
+  memset(con->iq_buffer, 0, c->n_samples * 4);
+  con->rx_frequency = rx_frequency;
+  con->tx_frequency = tx_frequency;
+  con->rx_channel_index = find_or_create_channel(c, rx_frequency,
+                                                 rx_sample_advance);
+  con->tx_channel_index = find_or_create_channel(c, tx_frequency,
+                                                 tx_sample_advance);
+  con->running = 0;
+
+  c->channels[con->rx_channel_index].connection_count++;
+  c->channels[con->tx_channel_index].connection_count++;
+
+  if (posix_memalign(&con->gain, 32, 32) != 0) {
+    printf("posix_memalign failed\n");
+    exit(1);
+  }
+
+  /* default gain = 1 (actually 1 - 1/2^15) */
+  *(__m256i *)con->gain = _mm256_set1_epi16(0x7fff);
+
+  return;
+
+oom:
+  printf("ERROR: channel_simulator_add_connection: out of memory\n");
+  exit(1);
+}
+
+void connection_send_rx(connection *c, uint64_t timestamp,
+    uint32_t *data, int n_samples)
+{
+  unsigned char b[8+4];
+  int k;
+  int16_t *from;
+  int16_t *to;
+  __m256i *gain;
+
+  if (c->socket == -1) return;
+
+  /* apply gain on data to send */
+  from = (int16_t *)data;
+  to = (int16_t *)c->iq_buffer;
+  gain = (__m256i *)c->gain;
+
+  /* does: to[] = from[] * gain[] */
+  for (k = 0; k < n_samples * 2; k+=16) {
+    __m256i *a, *b;
+    a = (__m256i *)&to[k];
+    b = (__m256i *)&from[k];
+    *a = _mm256_mulhrs_epi16(*b, *gain);
+  }
+
+  pu64(b, timestamp);
+  pu32(b+8, n_samples);
+  if (fullwrite(c->socket, b, 8+4) != 8+4 ||
+      fullwrite(c->socket, c->iq_buffer, n_samples * 4) != n_samples * 4) {
+    printf("ERROR: connection_send_rx failed, dropping\n");
+    shutdown(c->socket, SHUT_RDWR);
+    close(c->socket);
+    c->socket = -1;
+  }
+}
+
+void command_set_frequency(channel_simulator *cs, connection *con, int n)
+{
+  unsigned char b[8*2];
+  uint64_t rx_frequency;
+  uint64_t tx_frequency;
+  uint32_t rx_sample_advance;
+  uint32_t tx_sample_advance;
+
+  if (n != 8*2) goto err;
+  if (fullread(con->socket, b, 8*2) != 8*2) goto err;
+  rx_frequency = gu64(b);
+  tx_frequency = gu64(b+8);
+
+  printf("INFO: setting new frequencies RX %"PRIu64" and TX %"PRIu64"\n",
+         rx_frequency, tx_frequency);
+
+  cs->channels[con->rx_channel_index].connection_count--;
+  cs->channels[con->tx_channel_index].connection_count--;
+
+  rx_sample_advance = cs->channels[con->rx_channel_index].sample_advance;
+  tx_sample_advance = cs->channels[con->tx_channel_index].sample_advance;
+
+  con->rx_frequency = rx_frequency;
+  con->tx_frequency = tx_frequency;
+  con->rx_channel_index = find_or_create_channel(cs, rx_frequency,
+                                                 rx_sample_advance);
+  con->tx_channel_index = find_or_create_channel(cs, tx_frequency,
+                                                 tx_sample_advance);
+  cs->channels[con->rx_channel_index].connection_count++;
+  cs->channels[con->tx_channel_index].connection_count++;
+
+  return;
+
+err:
+  printf("ERROR: command_set_frequency failed, dropping\n");
+  shutdown(con->socket, SHUT_RDWR);
+  close(con->socket);
+  con->socket = -1;
+}
+
+void command_set_gain(channel_simulator *cs, connection *con, int n)
+{
+  unsigned char b[4];
+  int v;
+  if (n != 4) goto err;
+  if (fullread(con->socket, b, 4) != 4) goto err;
+  v = gu32(b);
+
+  *(__m256i *)con->gain = _mm256_set1_epi16(v);
+
+  printf("INFO: setting gain to %d\n", v);
+
+  return;
+
+err:
+  printf("ERROR: command_set_gain failed, dropping\n");
+  shutdown(con->socket, SHUT_RDWR);
+  close(con->socket);
+  con->socket = -1;
+}
+
+void do_command(channel_simulator *cs, connection *c, uint64_t command, int n)
+{
+  switch (command) {
+  case 0: return command_set_frequency(cs, c, n);
+  case 1: return command_set_gain(cs, c, n);
+  default:
+    printf("ERROR: bad command %"PRIu64", dropping\n", command);
+    shutdown(c->socket, SHUT_RDWR);
+    close(c->socket);
+    c->socket = -1;
+  }
+}
+
+void connection_receive_tx(channel_simulator *cs,
+    connection *c, uint64_t timestamp, int n_samples)
+{
+  unsigned char b[8+4];
+  uint64_t recv_timestamp;
+  uint32_t recv_n_samples;
+
+again:
+  if (c->socket == -1) return;
+
+  if (fullread(c->socket, b, 8+4) != 8+4) goto err;
+  recv_timestamp = gu64(b);
+  recv_n_samples = gu32(b+8);
+
+  if (recv_timestamp < 1024) {
+    do_command(cs, c, recv_timestamp, recv_n_samples);
+    goto again;
+  }
+
+  if (timestamp != recv_timestamp) {
+    printf("ERROR: bad timestamp, got %"PRIu64" expected %"PRIu64"\n",
+           recv_timestamp, timestamp);
+    goto err;
+  }
+  if (n_samples != recv_n_samples) {
+    printf("ERROR, bad n_samples, got %d expected %d\n",
+           recv_n_samples, n_samples);
+    goto err;
+  }
+  if (fullread(c->socket, c->iq_buffer, n_samples * 4) != n_samples * 4)
+    goto err;
+
+  return;
+
+err:
+  printf("ERROR: connection_receive_tx failed, dropping\n");
+  shutdown(c->socket, SHUT_RDWR);
+  close(c->socket);
+  c->socket = -1;
+}
+
+void channel_simulate(channel_simulator *c)
+{
+  int i;
+  int k;
+  connection *con;
+  channel *chan;
+  int16_t *to;
+  int16_t *from;
+  int16_t mix[c->channels_count][c->n_samples*2] __attribute__ ((aligned (32)));
+
+  memset(mix, 0, c->channels_count * c->n_samples*2 * 2);
+
+  /* clear channels */
+  for (i = 0; i < c->channels_count; i++)
+    memset(c->channels[i].data, 0, c->n_samples * 4);
+
+  /* basic mixing */
+  for (i = 0; i < c->connections_count; i++) {
+    __m256i *gain;
+    con = &c->connections[i];
+    from = (int16_t *)con->iq_buffer;
+    gain = (__m256i *)con->gain;
+
+    /* does: mix[] = mix[] + from[] * gain[] */
+    for (k = 0; k < c->n_samples * 2; k+=16) {
+      __m256i *a, *b, v;
+      a = (__m256i *)&mix[con->tx_channel_index][k];
+      b = (__m256i *)&from[k];
+      v = _mm256_mulhrs_epi16(*b, *gain);
+      *a = _mm256_adds_epi16(*a, v);
+    }
+  }
+
+  for (i = 0; i < c->channels_count; i++) {
+    chan = &c->channels[i];
+    to = (int16_t *)chan->data;
+    memcpy(to, mix[i], c->n_samples * 2 * 2);
+  }
+}

channel_simulator/channel_simulator.h

@@ -0,0 +1,51 @@
+#ifndef _CHANNEL_SIMULATOR_H_
+#define _CHANNEL_SIMULATOR_H_
+
+#include <stdint.h>
+
+typedef struct {
+  uint64_t frequency;         /* unit: Hz */
+  uint32_t sample_advance;
+  uint32_t *data;
+  int      connection_count;
+} channel;
+
+typedef struct {
+  int      socket;
+  /* iq_buffer is used both in tx and rx */
+  uint32_t *iq_buffer;
+  uint64_t rx_frequency;
+  uint64_t tx_frequency;
+  int      rx_channel_index;
+  int      tx_channel_index;
+  /* gain to apply to rx and tx data */
+  void     *gain;           /* actually __m256i * */
+  /* running: used to synchronize eNB in time */
+  int      running;
+} connection;
+
+typedef struct {
+  uint64_t   timestamp;
+  uint32_t   samplerate;
+  int        n_samples;                /* handle n_samples at a time */
+  channel    *channels;
+  int        channels_count;
+  connection *connections;
+  int        connections_count;
+} channel_simulator;
+
+void init_channel_simulator(channel_simulator *c,
+    uint32_t samplerate, int n_samples);
+void cleanup_connections(channel_simulator *c);
+void channel_simulator_add_connection(channel_simulator *c,
+    int socket, uint64_t rx_frequency, uint64_t tx_frequency,
+    uint32_t rx_sample_advance, uint32_t tx_sample_advance);
+
+void connection_send_rx(connection *c, uint64_t timestamp,
+    uint32_t *data, int n_samples);
+void connection_receive_tx(channel_simulator *cs,
+    connection *c, uint64_t timestamp, int n_samples);
+
+void channel_simulate(channel_simulator *c);
+
+#endif /* _CHANNEL_SIMULATOR_H_ */

channel_simulator/connection_manager.c

@@ -0,0 +1,109 @@
+#include "connection_manager.h"
+
+#include "utils.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <stdint.h>
+#include <unistd.h>
+
+typedef struct {
+  uint64_t rx_frequency;
+  uint64_t tx_frequency;
+  uint32_t rx_sample_advance;
+  uint32_t tx_sample_advance;
+  uint32_t samplerate;
+} init_message;
+
+static int get_init_message(init_message *m, int s)
+{
+  unsigned char b[8*2+4*3];
+  if (fullread(s, b, 8*2+4*3) != 8*2+4*3) return -1;
+  m->rx_frequency      = gu64(b);
+  m->tx_frequency      = gu64(b+8);
+  m->rx_sample_advance = gu32(b+8*2);
+  m->tx_sample_advance = gu32(b+8*2+4);
+  m->samplerate        = gu32(b+8*2+4*2);
+  return 0;
+}
+
+static void *connection_manager_thread(void *_cm)
+{
+  connection_manager *cm = _cm;
+  init_message m;
+  int s;
+  int t;
+
+  s = create_listen_socket(cm->ip, cm->port);
+
+  while (1) {
+    t = socket_accept(s);
+    if (t == -1) {
+      printf("ERROR: socket_accept failed (%s)\n", strerror(errno));
+      continue;
+    }
+    if (get_init_message(&m, t) == -1) {
+      printf("ERROR: get_init_message failed\n");
+      close(t);
+      continue;
+    }
+
+    connection_manager_lock(cm);
+    cm->new_connections++;
+    cm->c = realloc(cm->c, cm->new_connections * sizeof(new_connection));
+    if (cm->c == NULL) {
+      printf("ERROR: get_init_message: out of memory\n");
+      exit(1);
+    }
+    cm->c[cm->new_connections-1].socket            = t;
+    cm->c[cm->new_connections-1].rx_frequency      = m.rx_frequency;
+    cm->c[cm->new_connections-1].tx_frequency      = m.tx_frequency;
+    cm->c[cm->new_connections-1].rx_sample_advance = m.rx_sample_advance;
+    cm->c[cm->new_connections-1].tx_sample_advance = m.tx_sample_advance;
+    cm->c[cm->new_connections-1].samplerate        = m.samplerate;
+    lock_signal(&cm->l);
+    connection_manager_unlock(cm);
+  }
+
+  return NULL;
+}
+
+void init_connection_manager(connection_manager *cm, char *listen_ip, int port)
+{
+  cm->ip = strdup(listen_ip);
+  if (cm->ip == NULL) {
+    printf("ERROR: init_connection_manager: out of memory\n");
+    exit(1);
+  }
+  cm->port = port;
+  cm->new_connections = 0;
+  cm->c = NULL;
+  init_lock(&cm->l);
+  new_thread(connection_manager_thread, cm);
+}
+
+void connection_manager_lock(connection_manager *cm)
+{
+  lock(&cm->l);
+}
+
+void connection_manager_unlock(connection_manager *cm)
+{
+  unlock(&cm->l);
+}
+
+/* this function must be called with lock acquired */
+void connection_manager_wait_connection(connection_manager *cm)
+{
+  while (cm->new_connections == 0) lock_wait(&cm->l);
+}
+
+/* this function must be called with lock acquired */
+void connection_manager_clear(connection_manager *cm)
+{
+  free(cm->c);
+  cm->c = NULL;
+  cm->new_connections = 0;
+}

channel_simulator/connection_manager.h

@@ -0,0 +1,30 @@
+#ifndef _CONNECTION_MANAGER_H_
+#define _CONNECTION_MANAGER_H_
+
+#include <stdint.h>
+#include "utils.h"
+
+typedef struct {
+  int      socket;
+  uint64_t rx_frequency;
+  uint64_t tx_frequency;
+  uint32_t tx_sample_advance;
+  uint32_t rx_sample_advance;
+  uint32_t samplerate;
+} new_connection;
+
+typedef struct {
+  char           *ip;
+  int            port;
+  volatile int   new_connections;
+  new_connection *c;
+  lock_t         l;
+} connection_manager;
+
+void init_connection_manager(connection_manager *cm, char *listen_ip, int port);
+void connection_manager_lock(connection_manager *cm);
+void connection_manager_unlock(connection_manager *cm);
+void connection_manager_wait_connection(connection_manager *cm);
+void connection_manager_clear(connection_manager *cm);
+
+#endif /* _CONNECTION_MANAGER_H_ */

channel_simulator/main.c

@@ -0,0 +1,89 @@
+#include "channel_simulator.h"
+#include "connection_manager.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/socket.h>
+#include <signal.h>
+
+void usage(void)
+{
+  printf("options:\n");
+  printf("    -no-sync\n");
+  printf("        do not synchronize eNBs in time\n");
+  exit(0);
+}
+
+int main(int n, char **v)
+{
+  channel_simulator c;
+  connection_manager cm;
+  int i;
+  int samplerate = 7680000;
+  int do_synchronize = 1;
+
+  for (i = 1; i < n; i++) {
+    if (!strcmp(v[i], "-h") || !strcmp(v[i], "--help")) usage();
+    if (!strcmp(v[i], "-no-sync")) { do_synchronize = 0; continue; }
+    usage();
+  }
+
+  signal(SIGPIPE, SIG_IGN);
+
+  init_connection_manager(&cm, "0.0.0.0", 4024);
+  init_channel_simulator(&c, samplerate, 512);
+
+  while (1) {
+    connection_manager_lock(&cm);
+    if (c.connections_count == 0) connection_manager_wait_connection(&cm);
+    if (cm.new_connections) {
+      for (i = 0; i < cm.new_connections; i++) {
+        if (cm.c[i].samplerate != samplerate) {
+          printf("ERROR: new connection has bad samplerate %d, dropping\n",
+                 cm.c[i].samplerate);
+          shutdown(cm.c[i].socket, SHUT_RDWR);
+          close(cm.c[i].socket);
+          continue;
+        }
+        channel_simulator_add_connection(&c,
+            cm.c[i].socket, cm.c[i].rx_frequency, cm.c[i].tx_frequency,
+            cm.c[i].rx_sample_advance, cm.c[i].tx_sample_advance);
+      }
+      connection_manager_clear(&cm);
+    }
+    connection_manager_unlock(&cm);
+
+    for (i = 0 ; i < c.connections_count; i++) {
+      connection *con = &c.connections[i];
+      channel    *ch_rx  = &c.channels[con->rx_channel_index];
+      channel    *ch_tx  = &c.channels[con->tx_channel_index];
+      if (do_synchronize && con->running == 0) {
+        if (c.timestamp % (samplerate/1000*1024*10))
+          continue;
+        con->running = 1;
+      }
+      connection_send_rx(con, c.timestamp + ch_rx->sample_advance,
+                         ch_rx->data, c.n_samples);
+      connection_receive_tx(&c, con, c.timestamp + ch_tx->sample_advance
+                                                 + c.n_samples, c.n_samples);
+    }
+
+    cleanup_connections(&c);
+
+    c.timestamp += c.n_samples;
+    channel_simulate(&c);
+
+#if 0
+    static int processed = 0;
+    processed += c.n_samples;
+    if (processed >= samplerate/1000) {
+      processed -= samplerate/1000;
+      usleep(2000);
+    }
+#endif
+  }
+
+  return 0;
+}

channel_simulator/usrp/Makefile

@@ -0,0 +1,18 @@
+CC=gcc
+CPP=g++
+CFLAGS=-Wall -g -pthread -march=native -O3 -ffast-math
+
+PROG=usrp
+OBJS=main.o usrp.o ../utils.o
+
+$(PROG): $(OBJS)
+	$(CPP) $(CFLAGS) -o $@ $^ -luhd -lboost_system
+
+%.o: %.c
+	$(CC) $(CFLAGS) -c -o $@ $<
+
+%.o: %.cc
+	$(CPP) $(CFLAGS) -c -o $@ $<
+
+clean:
+	rm -f $(PROG) *.o core

channel_simulator/usrp/main.c

@@ -0,0 +1,175 @@
+#define _GNU_SOURCE
+#include "usrp.h"
+#include "../utils.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <netinet/in.h>
+#include <netinet/tcp.h>
+#include <arpa/inet.h>
+#include <unistd.h>
+#include <string.h>
+#include <sys/types.h>
+#include <pthread.h>
+#include <immintrin.h>
+
+#include <inttypes.h>
+
+typedef struct {
+  char *data;
+  uint32_t n_samples;
+  uint64_t timestamp;
+} buffer_t;
+
+void receive_from_channel_simulator(int sock, buffer_t *buf)
+{
+  unsigned char b[8+4];
+  uint32_t n_samples;
+
+  if (fullread(sock, b, 8+4) != 8+4) goto err;
+
+  buf->timestamp = gu64(b);
+  n_samples = gu32(b+8);
+  if (n_samples != buf->n_samples) {
+    free(buf->data);
+    buf->n_samples = n_samples;
+    if (posix_memalign((void **)&buf->data, 32, buf->n_samples * 4) != 0) goto err;
+  }
+  if (fullread(sock, buf->data, buf->n_samples * 4) != buf->n_samples * 4)
+    goto err;
+
+  return;
+
+err:
+  printf("ERROR: receive_from_channel_simulator failed\n");
+  exit(1);
+}
+
+void send_to_channel_simulator(int sock, char *usrp_data, int n_samples,
+                               uint64_t timestamp)
+{
+  unsigned char b[8+4];
+
+  pu64(b, timestamp);
+  pu32(b+8, n_samples);
+  if (fullwrite(sock, b, 8+4) != 8+4 ||
+      fullwrite(sock, usrp_data, n_samples * 4) != n_samples * 4) {
+    printf("ERROR: send_to_channel_simulator failed\n");
+    exit(1);
+  }
+}
+
+int connect_to_channel_simulator(void)
+{
+  int port = 4024;
+  char *ip = "127.0.0.1";
+  struct sockaddr_in addr;
+  int sock;
+  int v;
+
+  sock = socket(AF_INET, SOCK_STREAM, 0);
+  if (sock == -1) { perror("socket"); exit(1); }
+
+  v = 1;
+  if (setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, &v, sizeof(v)) == -1)
+    { perror("channel_simulator: setsockopt(NODELAY)"); exit(1); }
+
+  addr.sin_family = AF_INET;
+  addr.sin_port = htons(port);
+  addr.sin_addr.s_addr = inet_addr(ip);
+
+  while (1) {
+    printf("trying to connect to %s:%d\n", ip, port);
+
+    if (connect(sock, (struct sockaddr *)&addr, sizeof(addr)) == 0) {
+      printf("connection established\n");
+      return sock;
+    }
+
+    perror("channel_simulator");
+    sleep(1);
+  }
+}
+
+void init_connection(int sock, uint64_t rx_frequency, uint64_t tx_frequency,
+                     int samples_per_subframe)
+{
+  unsigned char b[8*2+4*3];
+
+  pu64(b, rx_frequency);
+  pu64(b+8, tx_frequency);
+  pu32(b+8*2, samples_per_subframe * 2);         /* RX sample advance */
+  pu32(b+8*2+4, 0);                              /* TX sample advance */
+  pu32(b+8*2+4*2, samples_per_subframe * 1000);
+
+  if (fullwrite(sock, b, 8*2+4*3) != 8*2+4*3) {
+    printf("ERROR: init_connection failed\n");
+    exit(1);
+  }
+}
+
+void go_realtime(void)
+{
+  struct sched_param sparam;
+  int policy;
+  memset(&sparam, 0, sizeof(sparam));
+  sparam.sched_priority = sched_get_priority_max(SCHED_FIFO)-1;
+  policy = SCHED_FIFO ;
+  if (pthread_setschedparam(pthread_self(), policy, &sparam) != 0) {
+    printf("ERROR: Failed to set pthread priority\n");
+    exit(1);
+  }
+}
+
+int main(void)
+{
+  int sock;
+  buffer_t buf = { data:NULL, n_samples:0, timestamp:0 };
+  uint64_t sim_timestamp;
+  uint64_t usrp_timestamp;
+  int samples_per_subframe = 7680;
+  int tx_sample_advance = 40;
+  char *usrp_data;
+
+  go_realtime();
+
+  usrp_init_connection(2560000000, 2680000000);
+
+  sock = connect_to_channel_simulator();
+  init_connection(sock, 1, 2, samples_per_subframe);
+
+  receive_from_channel_simulator(sock, &buf);
+  sim_timestamp = buf.timestamp - 2 * samples_per_subframe + buf.n_samples;
+
+  if (posix_memalign((void **)&usrp_data, 32, buf.n_samples * 4) != 0) {
+    printf("ERROR: out of memory\n");
+    exit(1);
+  }
+  memset(usrp_data, 0, buf.n_samples * 4);
+
+  send_to_channel_simulator(sock, usrp_data, buf.n_samples, sim_timestamp);
+  sim_timestamp += buf.n_samples;
+
+  usrp_start();
+  usrp_timestamp = usrp_read(usrp_data, buf.n_samples);
+
+  while (1) {
+    int i;
+    for (i = 0; i < buf.n_samples * 2; i += 16) {
+      __m256i *a = (__m256i *)&((int16_t *)buf.data)[i];
+      *a = _mm256_slli_epi16(*a, 4);
+    }
+    usrp_write(buf.data, buf.n_samples,
+               usrp_timestamp - buf.n_samples + 2 * samples_per_subframe - tx_sample_advance);
+    usrp_timestamp = usrp_read(usrp_data, buf.n_samples);
+    for (i = 0; i < buf.n_samples * 2; i += 16) {
+      __m256i *a = (__m256i *)&((int16_t *)usrp_data)[i];
+      *a = _mm256_srai_epi16(*a, 4);
+    }
+    send_to_channel_simulator(sock, usrp_data, buf.n_samples, sim_timestamp);
+    sim_timestamp += buf.n_samples;
+    receive_from_channel_simulator(sock, &buf);
+  }
+
+  return 0;
+}

channel_simulator/usrp/usrp.cc

@@ -0,0 +1,106 @@
+/* g++ bug-3.13.1.0.cc -luhd -lboost_system */
+#include <uhd/usrp/multi_usrp.hpp>
+#include <stdio.h>
+#include <stdlib.h>
+
+static uhd::usrp::multi_usrp::sptr usrp;
+static uhd::rx_streamer::sptr rx_stream;
+static uhd::tx_streamer::sptr tx_stream;
+static uhd::rx_metadata_t rx_md;
+static uhd::tx_metadata_t tx_md;
+
+extern "C" {
+
+#include "usrp.h"
+
+void usrp_init_connection(uint64_t rx_freq, uint64_t tx_freq)
+{
+  std::string args = "type=b200";
+  uhd::device_addrs_t device_adds = uhd::device::find(args);
+  if (device_adds.size() == 0) { printf("no device\n"); exit(1); }
+  if (device_adds[0].get("type") != "b200") { printf("no b200\n"); exit(1); }
+
+  double usrp_master_clock = 30.72e6;
+  args += boost::str(boost::format(",master_clock_rate=%f") % usrp_master_clock);
+  //args += ",num_send_frames=256,num_recv_frames=256, send_frame_size=3840, recv_frame_size=3840";
+  args += ",num_send_frames=256,num_recv_frames=256";
+
+  usrp = uhd::usrp::multi_usrp::make(args);
+
+  usrp->set_clock_source("internal");
+  usrp->set_master_clock_rate(30.72e6);
+
+  usrp->set_rx_rate(7680000, 0);
+  usrp->set_rx_freq(rx_freq, 0);
+  usrp->set_rx_gain(62.2, 0);
+
+  usrp->set_tx_rate(7680000, 0);
+  usrp->set_tx_freq(tx_freq, 0);
+  usrp->set_tx_gain(89.75, 0);
+
+  uhd::stream_args_t stream_args_rx("sc16", "sc16");
+  stream_args_rx.args["spp"] = str(boost::format("%d") % 768 );
+  stream_args_rx.channels.push_back(0);
+  rx_stream = usrp->get_rx_stream(stream_args_rx);
+
+  uhd::stream_args_t stream_args_tx("sc16", "sc16");
+  stream_args_tx.channels.push_back(0);
+  tx_stream = usrp->get_tx_stream(stream_args_tx);
+
+  usrp->set_tx_bandwidth(20e6);
+  usrp->set_rx_bandwidth(20e6);
+}
+
+void usrp_start(void)
+{
+  uhd::stream_cmd_t cmd(uhd::stream_cmd_t::STREAM_MODE_START_CONTINUOUS);
+  cmd.stream_now = false; // start at constant delay
+  cmd.time_spec = usrp->get_time_now() + uhd::time_spec_t(0.05);
+  rx_stream->issue_stream_cmd(cmd);
+
+  tx_md.start_of_burst = true;
+  tx_md.end_of_burst = false;
+}
+
+uint64_t usrp_read(char *buf, int samples_count)
+{
+    std::vector<void *> buff_ptrs;
+    buff_ptrs.push_back(buf);
+
+    int recv = rx_stream->recv(buff_ptrs, samples_count, rx_md);
+    return rx_md.time_spec.to_ticks(7680000);
+}
+
+void usrp_write(char *buf, int samples_count, uint64_t timestamp)
+{
+  tx_md.time_spec = uhd::time_spec_t::from_ticks(timestamp, 7680000);
+  tx_md.has_time_spec = true;
+  int sendv = tx_stream->send(buf, samples_count, tx_md, 10 /*1e-3*/);
+  tx_md.start_of_burst = false;
+}
+
+#if 0
+  while (1) {
+    char buf[7680*2*2];
+    std::vector<void *> buff_ptrs;
+    buff_ptrs.push_back(buf);
+
+    int recv = rx_stream->recv(buff_ptrs, 7680, rx_md);
+    //printf("got %d samples ret %d [%lld]\n", recv, rx_md.error_code, rx_md.time_spec.to_ticks(7680000));
+
+    unsigned long long ts = rx_md.time_spec.to_ticks(7680000) + 4 * 7680;
+
+    tx_md.time_spec = uhd::time_spec_t::from_ticks(ts, 7680000);
+    tx_md.has_time_spec = true;
+
+    int sendv = tx_stream->send(buf, 7680, tx_md, 1e-3);
+    //printf("send %d samples\n", sendv);
+
+    tx_md.start_of_burst = false;
+  }
+
+  return 0;
+}
+#endif
+
+} /* extern "C" */

channel_simulator/usrp/usrp.h

@@ -0,0 +1,11 @@
+#ifndef _USRP_H_openair
+#define _USRP_H_openair
+
+#include <stdint.h>
+
+void usrp_init_connection(uint64_t rx_freq, uint64_t tx_freq);
+void usrp_start(void);
+uint64_t usrp_read(char *buf, int samples_count);
+void usrp_write(char *buf, int samples_count, uint64_t timestamp);
+
+#endif /* _USRP_H_openair */

channel_simulator/utils.c

@@ -0,0 +1,184 @@
+#include "utils.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <pthread.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <unistd.h>
+
+/************************************************************************/
+/* lock                                                                 */
+/************************************************************************/
+
+void init_lock(lock_t *l)
+{
+  if (pthread_mutex_init(&l->m, NULL) ||
+      pthread_cond_init(&l->c, NULL)) {
+    printf("ERROR: init_lock failed\n");
+    exit(1);
+  }
+}
+
+void lock(lock_t *l)
+{
+  if (pthread_mutex_lock(&l->m)) {
+    printf("ERROR: lock failed\n");
+    exit(1);
+  }
+}
+
+void unlock(lock_t *l)
+{
+  if (pthread_mutex_unlock(&l->m)) {
+    printf("ERROR: unlock failed\n");
+    exit(1);
+  }
+}
+
+void lock_wait(lock_t *l)
+{
+  if (pthread_cond_wait(&l->c, &l->m)) {
+    printf("ERROR: lock_wait failed\n");
+    exit(1);
+  }
+}
+
+void lock_signal(lock_t *l)
+{
+  if (pthread_cond_broadcast(&l->c)) {
+    printf("ERROR: lock_signal failed\n");
+    exit(1);
+  }
+}
+
+/************************************************************************/
+/* thread                                                               */
+/************************************************************************/
+
+void new_thread(void *(*f)(void *), void *data)
+{
+  pthread_t t;
+  pthread_attr_t att;
+
+  if (pthread_attr_init(&att)) goto error;
+  if (pthread_attr_setdetachstate(&att, PTHREAD_CREATE_DETACHED)) goto error;
+  if (pthread_attr_setstacksize(&att, 10000000)) goto error;
+  if (pthread_create(&t, &att, f, data)) goto error;
+  if (pthread_attr_destroy(&att)) goto error;
+  return;
+
+error:
+  printf("ERROR: new_thread failed\n");
+  exit(1);
+}
+
+/************************************************************************/
+/* socket                                                               */
+/************************************************************************/
+
+#include <netinet/tcp.h>
+
+int create_listen_socket(char *addr, int port)
+{
+  struct sockaddr_in a;
+  int s;
+  int v;
+
+  s = socket(AF_INET, SOCK_STREAM, 0);
+  if (s == -1) { perror("socket"); exit(1); }
+  v = 1;
+  if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &v, sizeof(int)))
+    { perror("setsockopt"); exit(1); }
+
+  v = 1;
+  if (setsockopt(s, IPPROTO_TCP, TCP_NODELAY, &v, sizeof(v)) == -1)
+    { perror("setsockopt(NODELAY)"); exit(1); }
+
+  a.sin_family = AF_INET;
+  a.sin_port = htons(port);
+  a.sin_addr.s_addr = inet_addr(addr);
+
+  if (bind(s, (struct sockaddr *)&a, sizeof(a))) { perror("bind"); exit(1); }
+  if (listen(s, 5)) { perror("listen"); exit(1); }
+
+  return s;
+}
+
+int socket_accept(int s)
+{
+  struct sockaddr_in a;
+  socklen_t alen;
+  alen = sizeof(a);
+  return accept(s, (struct sockaddr *)&a, &alen);
+}
+
+int fullread(int fd, void *_buf, int count)
+{
+  char *buf = _buf;
+  int ret = 0;
+  int l;
+  while (count) {
+    l = read(fd, buf, count);
+    if (l <= 0) return -1;
+    count -= l;
+    buf += l;
+    ret += l;
+  }
+  return ret;
+}
+
+int fullwrite(int fd, void *_buf, int count)
+{
+  char *buf = _buf;
+  int ret = 0;
+  int l;
+  while (count) {
+    l = write(fd, buf, count);
+    if (l <= 0) return -1;
+    count -= l;
+    buf += l;
+    ret += l;
+  }
+  return ret;
+}
+
+uint32_t gu32(unsigned char *x)
+{
+  return (uint32_t)x[0] |
+       (((uint32_t)x[1]) <<  8) |
+       (((uint32_t)x[2]) << 16) |
+       (((uint32_t)x[3]) << 24);
+}
+
+uint64_t gu64(unsigned char *x)
+{
+  return (uint64_t)x[0] |
+       (((uint64_t)x[1]) <<  8) |
+       (((uint64_t)x[2]) << 16) |
+       (((uint64_t)x[3]) << 24) |
+       (((uint64_t)x[4]) << 32) |
+       (((uint64_t)x[5]) << 40) |
+       (((uint64_t)x[6]) << 48) |
+       (((uint64_t)x[7]) << 56);
+}
+
+void pu32(unsigned char *x, uint32_t v)
+{
+  x[0] =  v        & 255;
+  x[1] = (v >>  8) & 255;
+  x[2] = (v >> 16) & 255;
+  x[3] = (v >> 24) & 255;
+}
+
+void pu64(unsigned char *x, uint64_t v)
+{
+  x[0] =  v        & 255;
+  x[1] = (v >>  8) & 255;
+  x[2] = (v >> 16) & 255;
+  x[3] = (v >> 24) & 255;
+  x[4] = (v >> 32) & 255;
+  x[5] = (v >> 40) & 255;
+  x[6] = (v >> 48) & 255;
+  x[7] = (v >> 56) & 255;
+}

channel_simulator/utils.h

@@ -0,0 +1,30 @@
+#ifndef _UTILS_H_
+#define _UTILS_H_
+
+#include <stdint.h>
+#include <pthread.h>
+
+typedef struct {
+  pthread_mutex_t m;
+  pthread_cond_t c;
+} lock_t;
+
+void init_lock(lock_t *l);
+void lock(lock_t *l);
+void unlock(lock_t *l);
+void lock_wait(lock_t *l);
+void lock_signal(lock_t *l);
+
+void new_thread(void *(*f)(void *), void *data);
+
+int create_listen_socket(char *addr, int port);
+int socket_accept(int s);
+int fullread(int fd, void *buf, int count);
+int fullwrite(int fd, void *buf, int count);
+
+uint32_t gu32(unsigned char *x);
+uint64_t gu64(unsigned char *x);
+void pu32(unsigned char *x, uint32_t v);
+void pu64(unsigned char *x, uint64_t v);
+
+#endif /* _UTILS_H_ */

ci-scripts/.gitignore

@@ -1,4 +1,3 @@
-r*.raw
 enb_*.log
 ue_*.log
 ping_*.*
@@ -6,5 +5,3 @@ iperf_*.*
 phones_list.txt
 modules_list.txt
 test_results*.html
-pMain*
-__pycache__

ci-scripts/Jenkinsfile-gitlab

@@ -30,14 +30,12 @@ def sendSocialMediaMessage(pipeChannel, pipeColor, pipeMessage) {
     }
 }
 
+def doRedHatBuild = false
 def doFlexranCtrlTest = false
 
 // Location of the executor node
 def nodeExecutor = params.nodeExecutor
 
-// VM Lockable resources
-def vmResource = params.vmLockableResource
-
 pipeline {
     agent {
         label nodeExecutor
@@ -46,31 +44,7 @@ pipeline {
         disableConcurrentBuilds()
         timestamps()
         gitLabConnection('OAI GitLab')
-        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",
-            "Test-OCP-FDD-Band7"
-        ])
+        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 L2-sim", "Test-Mono-FDD-Band7", "Test-Mono-TDD-Band40", "Test-IF4p5-FDD-Band7", "Test-IF4p5-TDD-Band40", "Test-Mono-FDD-Band13", "Test-IF4p5-TDD-Band38-Multi-RRU" , "Test-Mono-FDD-Band13-X2-HO"])
         ansiColor('xterm')
     }
 
@@ -87,6 +61,21 @@ pipeline {
                         echo "Platform is ${env.TESTPLATFORM_OWNER}"
                     }
 
+                    if (params.RedHatRemoteServer == null) {
+                        allParametersPresent = false
+                    }
+                    if (params.RedHatRemoteCredentials == null) {
+                        allParametersPresent = false
+                    }
+                    if (params.RedHatWorkingPath == null) {
+                        allParametersPresent = false
+                    }
+                    if (allParametersPresent) {
+                        echo "Performing Red Hat Build"
+                        doRedHatBuild = true
+                    } else {
+                        doRedHatBuild = false
+                    }
                     if (params.FlexRanRtcGitLabRepository_Credentials != null) {
                         doFlexranCtrlTest = true
                     }
@@ -142,8 +131,8 @@ pipeline {
                                 [$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 "sed -i -e 's#add-apt-repository.*cleishm.*neo4j#add-apt-repository ppa:cleishm/neo4j -y#' -e 's#libneo4j-client-dev#libneo4j-client-dev -y#' tools/install_dependencies"
                             sh "zip -r -qq flexran.zip ."
                         }
                     }
@@ -162,81 +151,49 @@ pipeline {
 
         stage ("Start VM -- basic-sim") {
             steps {
-              lock (vmResource) {
                 timeout (time: 5, unit: 'MINUTES') {
                     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 {
-              lock (vmResource) {
-                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 {
-              lock (vmResource) {
-                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 {
-              lock (vmResource) {
                 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"
                 }
-              }
             }
         }
 
-        stage ("Start VM -- phy-sim") {
-            steps {
-              lock (vmResource) {
-                timeout (time: 5, unit: 'MINUTES') {
-                    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 {
-              lock (vmResource) {
-                timeout (time: 7, unit: 'MINUTES') {
+                timeout (time: 5, unit: 'MINUTES') {
                     sh "./ci-scripts/oai-ci-vm-tool build --workspace $WORKSPACE --variant enb-ethernet --job-name ${JOB_NAME} --build-id ${BUILD_ID} --daemon"
                 }
-              }
             }
         }
 
         stage ("Start VM -- ue-ethernet") {
             steps {
-              lock (vmResource) {
-                timeout (time: 7, unit: 'MINUTES') {
+                timeout (time: 5, unit: 'MINUTES') {
                     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 -- phy-sim") {
+            steps {
+                timeout (time: 5, unit: 'MINUTES') {
+                    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 -- cppcheck") {
             steps {
-              lock (vmResource) {
-                timeout (time: 7, unit: 'MINUTES') {
+                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"
                 }
-              }
             }
         }
 
@@ -251,6 +208,15 @@ pipeline {
                         }
                     }
                 }
+                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}"
+                            }
+                        }
+                    }
+                }
                 stage ("Build basic simulator") {
                     steps {
                         gitlabCommitStatus(name: "Build basic-sim") {
@@ -260,29 +226,20 @@ pipeline {
                         }
                     }
                 }
-                stage ("Build 5G gNB-USRP") {
+                stage ("Build eNb-ethernet") {
                     steps {
-                        gitlabCommitStatus(name: "Build gNB-USRP") {
+                        gitlabCommitStatus(name: "Build eNb-ethernet") {
                             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"
+                                sh "./ci-scripts/oai-ci-vm-tool wait --workspace $WORKSPACE --variant enb-ethernet --job-name ${JOB_NAME} --build-id ${BUILD_ID} --keep-vm-alive"
                             }
                         }
                     }
                 }
-                stage ("Build 5G NR-UE-USRP") {
+                stage ("Build UE-ethernet") {
                     steps {
-                        gitlabCommitStatus(name: "Build nr-UE-USRP") {
+                        gitlabCommitStatus(name: "Build UE-ethernet") {
                             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}"
+                                sh "./ci-scripts/oai-ci-vm-tool wait --workspace $WORKSPACE --variant ue-ethernet --job-name ${JOB_NAME} --build-id ${BUILD_ID} --keep-vm-alive"
                             }
                         }
                     }
@@ -296,25 +253,26 @@ pipeline {
                         }
                     }
                 }
-                stage ("Build eNB-ethernet") {
-                    steps {
-                        gitlabCommitStatus(name: "Build eNB-ethernet") {
-                            timeout (time: 20, unit: 'MINUTES') {
-                                sh "./ci-scripts/oai-ci-vm-tool wait --workspace $WORKSPACE --variant enb-ethernet --job-name ${JOB_NAME} --build-id ${BUILD_ID} --keep-vm-alive"
-                            }
-                        }
+                stage ("Build eNb-USRP on Red Hat") {
+                    when {
+                        expression {doRedHatBuild}
                     }
-                }
-                stage ("Build UE-ethernet") {
                     steps {
-                      // This is typically the last one to finish.
-                      lock (vmResource) {
-                        gitlabCommitStatus(name: "Build UE-ethernet") {
-                            timeout (time: 20, unit: 'MINUTES') {
-                                sh "./ci-scripts/oai-ci-vm-tool wait --workspace $WORKSPACE --variant ue-ethernet --job-name ${JOB_NAME} --build-id ${BUILD_ID} --keep-vm-alive"
+                        gitlabCommitStatus(name: "Build eNb-USRP-RHE") {
+                            script {
+                                try {
+                                    withCredentials([
+                                        [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.RedHatRemoteCredentials}", usernameVariable: 'RH_Username', passwordVariable: 'RH_Password']
+                                    ]) {
+                                        timeout (time: 20, unit: 'MINUTES') {
+                                            sh "./ci-scripts/buildOnRH.sh --workspace $WORKSPACE --job-name ${JOB_NAME} --build-id ${BUILD_ID} --remote-host ${params.RedHatRemoteServer} --remote-path ${params.RedHatWorkingPath} --remote-user-name ${RH_Username} --remote-password ${RH_Password}"
+                                        }
+                                    }
+                                } catch (Exception e) {
+                                    echo "Red Hat build failed but we could keep running pipeline if all ubuntu-based build passed"
+                                }
                             }
                         }
-                      }
                     }
                 }
             }
@@ -327,11 +285,7 @@ pipeline {
                 always {
                     script {
                         dir ('archives') {
-                            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"
-                            }
+                            sh "zip -r -qq vm_build_logs.zip basic_sim enb_usrp phy_sim cppcheck enb_eth ue_eth red_hat"
                         }
                         if(fileExists('archives/vm_build_logs.zip')) {
                             archiveArtifacts artifacts: 'archives/vm_build_logs.zip'
@@ -376,9 +330,8 @@ pipeline {
                     stages {
                         stage ("Test physical simulators") {
                             steps {
-                              lock (vmResource) {
                                 script {
-                                    timeout (time: 90, unit: 'MINUTES') {
+                                    timeout (time: 20, 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}"
@@ -388,7 +341,6 @@ pipeline {
                                         }
                                     }
                                 }
-                              }
                             }
                         }
                         stage ("Build Flexran Controller") {
@@ -396,7 +348,6 @@ pipeline {
                                 expression {doFlexranCtrlTest}
                             }
                             steps {
-                              lock (vmResource) {
                                 script {
                                     timeout (time: 20, unit: 'MINUTES') {
                                         try {
@@ -406,12 +357,10 @@ pipeline {
                                         }
                                     }
                                 }
-                              }
                             }
                         }
                         stage ("Test basic simulator") {
                             steps {
-                              lock (vmResource) {
                                 script {
                                     timeout (time: 30, unit: 'MINUTES') {
                                         try {
@@ -423,12 +372,10 @@ pipeline {
                                         }
                                     }
                                 }
-                              }
                             }
                         }
                         stage ("Test L1 simulator") {
                             steps {
-                              lock (vmResource) {
                                 script {
                                     timeout (time: 30, unit: 'MINUTES') {
                                         try {
@@ -440,14 +387,12 @@ pipeline {
                                         }
                                     }
                                 }
-                              }
                             }
                         }
                         stage ("Test RF simulator") {
                             steps {
-                              lock (vmResource) {
                                 script {
-                                    timeout (time: 40, unit: 'MINUTES') {
+                                    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"
@@ -457,12 +402,10 @@ pipeline {
                                         }
                                     }
                                 }
-                              }
                             }
                         }
                         stage ("Test L2 simulator") {
                             steps {
-                              lock (vmResource) {
                                 script {
                                     timeout (time: 30, unit: 'MINUTES') {
                                         try {
@@ -474,14 +417,11 @@ pipeline {
                                         }
                                     }
                                 }
-                              }
                             }
                         }
                         stage ("Destroy all Virtual Machines") {
                             steps {
-                              lock (vmResource) {
                                 sh "./ci-scripts/oai-ci-vm-tool destroy --job-name ${JOB_NAME} --build-id ${BUILD_ID}"
-                              }
                             }
                         }
                     }
@@ -544,46 +484,6 @@ pipeline {
                         }
                     }
                 }
-                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 {
@@ -623,6 +523,46 @@ pipeline {
                         }
                     }
                 }
+                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')
+                        }
+                    }
+                    post {
+                        always {
+                            script {
+                                finalizeSlaveJob('eNB-CI-MONO-FDD-Band13-B210')
+                            }
+                        }
+                        failure {
+                            script {
+                                currentBuild.result = 'FAILURE'
+                            }
+                        }
+                    }
+                }
                 stage ("Test OAI UE - FDD - Band 20 - B200") {
                     steps {
                         script {
@@ -663,44 +603,6 @@ pipeline {
                         }
                     }
                 }
-                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'
-                            }
-                        }
-                    }
-                }
-                stage ("Test OAI OCP-eNB - FDD - Band 7 - B210") {
-                    steps {
-                        script {
-                            triggerSlaveJob ('OCPeNB-FDD-Band7-B210', 'Test-OCP-FDD-Band7')
-                        }
-                    }
-                    post {
-                        always {
-                            script {
-                                finalizeSlaveJob('OCPeNB-FDD-Band7-B210')
-                            }
-                        }
-                        failure {
-                            script {
-                                currentBuild.result = 'FAILURE'
-                            }
-                        }
-                    }
-                }
             }
             post {
                 always {
@@ -778,50 +680,48 @@ 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"
+    if ("MERGE".equals(env.gitlabActionType)) {
+        gitlabCommitStatus(name: gitlabStatusName) {
+            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: true),
+                    string(name: 'eNB_TargetBranch', value: String.valueOf(env.gitlabTargetBranch))
+                ]
         }
+    } else {
+        gitlabCommitStatus(name: gitlabStatusName) {
+            build job: jobName,
+                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)
+                ]
+       }
     }
 }
 
 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"
+    if ("MERGE".equals(env.gitlabActionType)) {
+        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: true),
+                string(name: 'eNB_TargetBranch', value: String.valueOf(env.gitlabTargetBranch))
+            ]
     } else {
-       echo "${jobName} Slave Job is KO"
-       sh "ci-scripts/fail.sh"
+        build job: jobName,
+            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)
+            ]
     }
 }
 

ci-scripts/Jenkinsfile-inria-r2lab

@@ -59,10 +59,6 @@ def r2labEPC0IpAddr = r2labBaseIpAddr + r2labEPC0Idx
 def r2labUE0Idx = '6'
 def r2labUE0 = 'fit0' + r2labUE0Idx
 def r2labUE0IpAddr = r2labBaseIpAddr + r2labUE0Idx
-def r2labENB1Idx = '16'
-def r2labENB1 = 'fit' + r2labENB1Idx
-def r2labENB1IpAddr = r2labBaseIpAddr + r2labENB1Idx
-def r2labDoAllOff = true
 
 pipeline {
     agent {
@@ -135,17 +131,7 @@ pipeline {
                         [$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} | grep -v nightly"
-                    }
-
-                    // Adding a tempo after booking leases
-                    sh "sleep 10"
-                    LEASE_STATUS = sh returnStdout: true, script: "ssh -t inria_oaici@faraday.inria.fr 'rleases --check'"
-                    LEASE_STATUS = LEASE_STATUS.trim()
-                    if (LEASE_STATUS ==~ /.*Access currently denied to inria_oaici.*/) {
-                        r2labDoAllOff = false
-                        currentBuild.result = 'ABORTED'
-                        error('Stopping early because R2LAB not available')
+                        sh "python3 /home/eurecom/inria-scripts/booking-lease.py --get-leases ${r2labuser} ${r2labpassword}"
                     }
                 }
             }
@@ -153,49 +139,25 @@ pipeline {
         stage ("Load Images") {
             steps {
                 script {
-                    sh "ssh -t inria_oaici@faraday.inria.fr 'all-off'"
-                    sh "sleep 10"
-
                     echo '\u2705 \u001B[32mLoad Image for Python Executor\u001B[0m'
-                    try {
-                       sh "ssh -t inria_oaici@faraday.inria.fr 'rload -i oai-ci-cd-u18-lowlatency-enb-ue ${r2labPythonExeIdx} > /dev/null 2>&1'"
-                    } catch (Exception e) {
-                       echo "Why is it wrong?"
-                    }
-                    try {
-                       //sh "ssh -t inria_oaici@faraday.inria.fr 'rwait --silent ${r2labPythonExeIdx}'"
-                       sh "ssh -t inria_oaici@faraday.inria.fr 'rwait ${r2labPythonExeIdx}'"
-                    } catch (Exception e) {
-                       echo "Why is it wrong?"
-                    }
+                    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 two (2) eNBs\u001B[0m'
-                    try {
-                      sh "ssh -t inria_oaici@faraday.inria.fr 'rload -i oai-ci-cd-u18-lowlatency-enb-ue ${r2labENB0Idx},${r2labENB1Idx} > /dev/null 2>&1'"
-                    } catch (Exception e) {
-                       echo "Why is it wrong?"
-                    }
-                    try {
-                       sh "ssh -t inria_oaici@faraday.inria.fr 'rwait --silent ${r2labENB0Idx},${r2labENB1Idx}'"
-                    } catch (Exception e) {
-                       echo "Why is it wrong?"
-                    }
-                    sh "ssh -t inria_oaici@faraday.inria.fr 'uon ${r2labENB0Idx},${r2labENB1Idx}'"
-                    sh "sleep 5"
-                    sh "ssh -t inria_oaici@faraday.inria.fr 'uon ${r2labENB0Idx},${r2labENB1Idx}'"
+                    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}'"
-                    sh "sleep 5"
-                    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},${r2labENB1Idx} && st'"
+                    sh "ssh -t inria_oaici@faraday.inria.fr 'nodes ${r2labUE0Idx},${r2labPythonExeIdx},${r2labEPC0Idx},${r2labENB0Idx} && st'"
                 }
             }
         }
@@ -221,6 +183,7 @@ pipeline {
                         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\"'"
@@ -232,6 +195,9 @@ pipeline {
                         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\"'"
                     }
@@ -248,7 +214,7 @@ pipeline {
                         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 --eNB1IPAddress=${r2labENB1IpAddr} --eNB1UserName=${fituser} --eNB1Password=${fitpasswd} --eNB1SourceCodePath=/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}\"'"
+                                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
@@ -446,11 +412,9 @@ pipeline {
     post {
         always {
             script {
-                if (r2labDoAllOff) {
-                    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"'
-                }
+                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"'
             }
         }
     }

ci-scripts/Jenkinsfile-poll-gNB-UE

@@ -1,376 +0,0 @@
-#!/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)
-                }
-            }
-        }
-    }
-}
-

ci-scripts/Jenkinsfile-tmp-full-ran

@@ -54,10 +54,6 @@ def eNB_CommitID
 def eNB_AllowMergeRequestProcess = false
 def eNB_TargetBranch
 
-def doEpcLogCollection = true
-
-
-
 pipeline {
     agent {
         label pythonExecutor
@@ -65,7 +61,7 @@ pipeline {
     options {
         disableConcurrentBuilds()
         ansiColor('xterm')
-        lock(extra: [[resource: oaiUEResource]], resource: ciSmartPhoneResource)
+        lock(extra: [[resource: ciSmartPhoneResource]], resource: ciSmartPhoneResource)
     }
 
     stages {
@@ -143,11 +139,6 @@ pipeline {
 
                     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
@@ -176,8 +167,8 @@ pipeline {
                             sh "git checkout -f ${eNB_CommitID}"
                         }
                     } else {
-                        currentBuild.result = 'ABORTED'
-                        error('Stopping early because some parameters are missing')
+                        echo "Some parameters are missing"
+                        sh "./ci-scripts/fail.sh"
                     }
                 }
             }
@@ -208,12 +199,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 --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}"
+                            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}"
                             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}"
+                                    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}"
                                 } catch (Exception e) {
                                     currentBuild.result = 'FAILURE'
                                     buildStageStatus = false
@@ -266,42 +257,6 @@ pipeline {
         }
         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 (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 (eNB - Run)') {
                     steps {
                         withCredentials([
@@ -344,9 +299,6 @@ pipeline {
                     }
                 }
                 stage('Log Collection (Ping)') {
-                    when {
-                       expression {doEpcLogCollection}
-                    }
                     steps {
                         withCredentials([
                              [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password']
@@ -365,9 +317,6 @@ pipeline {
                     }
                 }
                 stage('Log Collection (Iperf)') {
-                    when {
-                       expression {doEpcLogCollection}
-                    }
                     steps {
                         withCredentials([
                              [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password']
@@ -386,9 +335,6 @@ pipeline {
                     }
                 }
                 stage('Log Collection (SPGW)') {
-                    when {
-                       expression {doEpcLogCollection}
-                    }
                     steps {
                         withCredentials([
                              [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password']
@@ -407,9 +353,6 @@ pipeline {
                     }
                 }
                 stage('Log Collection (MME)') {
-                    when {
-                       expression {doEpcLogCollection}
-                    }
                     steps {
                         withCredentials([
                              [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password']
@@ -428,9 +371,6 @@ pipeline {
                     }
                 }
                 stage('Log Collection (HSS)') {
-                    when {
-                       expression {doEpcLogCollection}
-                    }
                     steps {
                         withCredentials([
                              [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password']

ci-scripts/Jenkinsfile-tmp-ran

@@ -36,9 +36,6 @@ 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
@@ -67,7 +64,7 @@ pipeline {
     options {
         disableConcurrentBuilds()
         ansiColor('xterm')
-        lock(extra: [[resource: ciEpcResource]], resource: ciSmartPhoneResource)
+        lock (ciSmartPhoneResource)
     }
     // the following parameter options are commented out so it shows the ones
     // that you SHALL have to run the job.
@@ -220,12 +217,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 --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}"
+                            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}"
                             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}"
+                                    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}"
                                 } 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 --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}"
+                            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}"
                             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}"
+                                    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}"
                                 } catch (Exception e) {
                                     currentBuild.result = 'FAILURE'
                                     buildStageStatus = false

ci-scripts/args_parse.py

@@ -1,229 +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
-# */
-#---------------------------------------------------------------------
-# Python for CI of OAI-eNB + COTS-UE
-#
-#   Required Python Version
-#     Python 3.x
-#
-#   Required Python Package
-#     pexpect
-#---------------------------------------------------------------------
-
-#-----------------------------------------------------------
-# Import Libs
-#-----------------------------------------------------------
-import sys		# arg
-import re		# reg
-import yaml
-import constants as CONST
-
-#-----------------------------------------------------------
-# Parsing Command Line Arguements
-#-----------------------------------------------------------
-
-
-def ArgsParse(argvs,CiTestObj,RAN,HTML,EPC,ldpc,HELP):
-
-
-    py_param_file_present = False
-    py_params={}
-
-    while len(argvs) > 1:
-        myArgv = argvs.pop(1)	# 0th is this file's name
-
-	    #--help
-        if re.match('^\-\-help$', myArgv, re.IGNORECASE):
-            HELP.GenericHelp(CONST.Version)
-            sys.exit(0)
-
-	    #--apply=<filename> as parameters file, to replace inline parameters
-        elif re.match('^\-\-Apply=(.+)$', myArgv, re.IGNORECASE):
-            matchReg = re.match('^\-\-Apply=(.+)$', myArgv, re.IGNORECASE)
-            py_params_file = matchReg.group(1)
-            with open(py_params_file,'r') as file:
-          	# The FullLoader parameter handles the conversion from YAML
-        	# scalar values to Python dictionary format
-                py_params = yaml.load(file,Loader=yaml.FullLoader)
-                py_param_file_present = True #to be removed once validated
-	    		#AssignParams(py_params) #to be uncommented once validated
-
-	    #consider inline parameters
-        elif re.match('^\-\-mode=(.+)$', myArgv, re.IGNORECASE):
-            matchReg = re.match('^\-\-mode=(.+)$', myArgv, re.IGNORECASE)
-            mode = matchReg.group(1)
-        elif re.match('^\-\-eNBRepository=(.+)$|^\-\-ranRepository(.+)$', myArgv, re.IGNORECASE):
-            if re.match('^\-\-eNBRepository=(.+)$', myArgv, re.IGNORECASE):
-                matchReg = re.match('^\-\-eNBRepository=(.+)$', myArgv, re.IGNORECASE)
-            else:
-                matchReg = re.match('^\-\-ranRepository=(.+)$', myArgv, re.IGNORECASE)
-            CiTestObj.ranRepository = matchReg.group(1)
-            RAN.ranRepository=matchReg.group(1)
-            HTML.ranRepository=matchReg.group(1)
-            ldpc.ranRepository=matchReg.group(1)
-        elif re.match('^\-\-eNB_AllowMerge=(.+)$|^\-\-ranAllowMerge=(.+)$', myArgv, re.IGNORECASE):
-            if re.match('^\-\-eNB_AllowMerge=(.+)$', myArgv, re.IGNORECASE):
-                matchReg = re.match('^\-\-eNB_AllowMerge=(.+)$', myArgv, re.IGNORECASE)
-            else:
-                matchReg = re.match('^\-\-ranAllowMerge=(.+)$', myArgv, re.IGNORECASE)
-            doMerge = matchReg.group(1)
-            ldpc.ranAllowMerge=matchReg.group(1)
-            if ((doMerge == 'true') or (doMerge == 'True')):
-                CiTestObj.ranAllowMerge = True
-                RAN.ranAllowMerge=True
-                HTML.ranAllowMerge=True
-        elif re.match('^\-\-eNBBranch=(.+)$|^\-\-ranBranch=(.+)$', myArgv, re.IGNORECASE):
-            if re.match('^\-\-eNBBranch=(.+)$', myArgv, re.IGNORECASE):
-                matchReg = re.match('^\-\-eNBBranch=(.+)$', myArgv, re.IGNORECASE)
-            else:
-                matchReg = re.match('^\-\-ranBranch=(.+)$', myArgv, re.IGNORECASE)
-            CiTestObj.ranBranch = matchReg.group(1)
-            RAN.ranBranch=matchReg.group(1)
-            HTML.ranBranch=matchReg.group(1)
-            ldpc.ranBranch=matchReg.group(1)
-        elif re.match('^\-\-eNBCommitID=(.*)$|^\-\-ranCommitID=(.*)$', myArgv, re.IGNORECASE):
-            if re.match('^\-\-eNBCommitID=(.*)$', myArgv, re.IGNORECASE):
-                matchReg = re.match('^\-\-eNBCommitID=(.*)$', myArgv, re.IGNORECASE)
-            else:
-                matchReg = re.match('^\-\-ranCommitID=(.*)$', myArgv, re.IGNORECASE)
-            CiTestObj.ranCommitID = matchReg.group(1)
-            RAN.ranCommitID=matchReg.group(1)
-            HTML.ranCommitID=matchReg.group(1)
-            ldpc.ranCommitID=matchReg.group(1)
-        elif re.match('^\-\-eNBTargetBranch=(.*)$|^\-\-ranTargetBranch=(.*)$', myArgv, re.IGNORECASE):
-            if re.match('^\-\-eNBTargetBranch=(.*)$', myArgv, re.IGNORECASE):
-                matchReg = re.match('^\-\-eNBTargetBranch=(.*)$', myArgv, re.IGNORECASE)
-            else:
-                matchReg = re.match('^\-\-ranTargetBranch=(.*)$', myArgv, re.IGNORECASE)
-            CiTestObj.ranTargetBranch = matchReg.group(1)
-            RAN.ranTargetBranch=matchReg.group(1)
-            HTML.ranTargetBranch=matchReg.group(1)
-            ldpc.ranTargetBranch=matchReg.group(1)
-        elif re.match('^\-\-eNBIPAddress=(.+)$|^\-\-eNB[1-2]IPAddress=(.+)$', myArgv, re.IGNORECASE):
-            if re.match('^\-\-eNBIPAddress=(.+)$', myArgv, re.IGNORECASE):
-                matchReg = re.match('^\-\-eNBIPAddress=(.+)$', myArgv, re.IGNORECASE)
-                RAN.eNBIPAddress=matchReg.group(1)
-                ldpc.eNBIpAddr=matchReg.group(1)
-            elif re.match('^\-\-eNB1IPAddress=(.+)$', myArgv, re.IGNORECASE):
-                matchReg = re.match('^\-\-eNB1IPAddress=(.+)$', myArgv, re.IGNORECASE)
-                RAN.eNB1IPAddress=matchReg.group(1)
-            elif re.match('^\-\-eNB2IPAddress=(.+)$', myArgv, re.IGNORECASE):
-                matchReg = re.match('^\-\-eNB2IPAddress=(.+)$', myArgv, re.IGNORECASE)
-                RAN.eNB2IPAddress=matchReg.group(1)
-        elif re.match('^\-\-eNBUserName=(.+)$|^\-\-eNB[1-2]UserName=(.+)$', myArgv, re.IGNORECASE):
-            if re.match('^\-\-eNBUserName=(.+)$', myArgv, re.IGNORECASE):
-                matchReg = re.match('^\-\-eNBUserName=(.+)$', myArgv, re.IGNORECASE)
-                RAN.eNBUserName=matchReg.group(1)
-                ldpc.eNBUserName=matchReg.group(1)
-            elif re.match('^\-\-eNB1UserName=(.+)$', myArgv, re.IGNORECASE):
-                matchReg = re.match('^\-\-eNB1UserName=(.+)$', myArgv, re.IGNORECASE)
-                RAN.eNB1UserName=matchReg.group(1)
-            elif re.match('^\-\-eNB2UserName=(.+)$', myArgv, re.IGNORECASE):
-                matchReg = re.match('^\-\-eNB2UserName=(.+)$', myArgv, re.IGNORECASE)
-                RAN.eNB2UserName=matchReg.group(1)
-        elif re.match('^\-\-eNBPassword=(.+)$|^\-\-eNB[1-2]Password=(.+)$', myArgv, re.IGNORECASE):
-            if re.match('^\-\-eNBPassword=(.+)$', myArgv, re.IGNORECASE):
-                matchReg = re.match('^\-\-eNBPassword=(.+)$', myArgv, re.IGNORECASE)
-                RAN.eNBPassword=matchReg.group(1)
-                ldpc.eNBPassWord=matchReg.group(1)
-            elif re.match('^\-\-eNB1Password=(.+)$', myArgv, re.IGNORECASE):
-                matchReg = re.match('^\-\-eNB1Password=(.+)$', myArgv, re.IGNORECASE)
-                RAN.eNB1Password=matchReg.group(1)
-            elif re.match('^\-\-eNB2Password=(.+)$', myArgv, re.IGNORECASE):
-                matchReg = re.match('^\-\-eNB2Password=(.+)$', myArgv, re.IGNORECASE)
-                RAN.eNB2Password=matchReg.group(1)
-        elif re.match('^\-\-eNBSourceCodePath=(.+)$|^\-\-eNB[1-2]SourceCodePath=(.+)$', myArgv, re.IGNORECASE):
-            if re.match('^\-\-eNBSourceCodePath=(.+)$', myArgv, re.IGNORECASE):
-                matchReg = re.match('^\-\-eNBSourceCodePath=(.+)$', myArgv, re.IGNORECASE)
-                RAN.eNBSourceCodePath=matchReg.group(1)
-                ldpc.eNBSourceCodePath=matchReg.group(1)
-            elif re.match('^\-\-eNB1SourceCodePath=(.+)$', myArgv, re.IGNORECASE):
-                matchReg = re.match('^\-\-eNB1SourceCodePath=(.+)$', myArgv, re.IGNORECASE)
-                RAN.eNB1SourceCodePath=matchReg.group(1)
-            elif re.match('^\-\-eNB2SourceCodePath=(.+)$', myArgv, re.IGNORECASE):
-                matchReg = re.match('^\-\-eNB2SourceCodePath=(.+)$', myArgv, re.IGNORECASE)
-                RAN.eNB2SourceCodePath=matchReg.group(1)
-        elif re.match('^\-\-EPCIPAddress=(.+)$', myArgv, re.IGNORECASE):
-            matchReg = re.match('^\-\-EPCIPAddress=(.+)$', myArgv, re.IGNORECASE)
-            EPC.IPAddress=matchReg.group(1)
-        elif re.match('^\-\-EPCUserName=(.+)$', myArgv, re.IGNORECASE):
-            matchReg = re.match('^\-\-EPCUserName=(.+)$', myArgv, re.IGNORECASE)
-            EPC.UserName=matchReg.group(1)
-        elif re.match('^\-\-EPCPassword=(.+)$', myArgv, re.IGNORECASE):
-            matchReg = re.match('^\-\-EPCPassword=(.+)$', myArgv, re.IGNORECASE)
-            EPC.Password=matchReg.group(1)
-        elif re.match('^\-\-EPCSourceCodePath=(.+)$', myArgv, re.IGNORECASE):
-            matchReg = re.match('^\-\-EPCSourceCodePath=(.+)$', myArgv, re.IGNORECASE)
-            EPC.SourceCodePath=matchReg.group(1)
-        elif re.match('^\-\-EPCType=(.+)$', myArgv, re.IGNORECASE):
-            matchReg = re.match('^\-\-EPCType=(.+)$', myArgv, re.IGNORECASE)
-            if re.match('OAI', matchReg.group(1), re.IGNORECASE) or re.match('ltebox', matchReg.group(1), re.IGNORECASE) or re.match('OAI-Rel14-CUPS', matchReg.group(1), re.IGNORECASE) or re.match('OAI-Rel14-Docker', matchReg.group(1), re.IGNORECASE):
-                EPC.Type=matchReg.group(1)
-            else:
-                sys.exit('Invalid EPC Type: ' + matchReg.group(1) + ' -- (should be OAI or ltebox or OAI-Rel14-CUPS or OAI-Rel14-Docker)')
-        elif re.match('^\-\-EPCContainerPrefix=(.+)$', myArgv, re.IGNORECASE):
-            matchReg = re.match('^\-\-EPCContainerPrefix=(.+)$', myArgv, re.IGNORECASE)
-            EPC.ContainerPrefix=matchReg.group(1)
-        elif re.match('^\-\-ADBIPAddress=(.+)$', myArgv, re.IGNORECASE):
-            matchReg = re.match('^\-\-ADBIPAddress=(.+)$', myArgv, re.IGNORECASE)
-            CiTestObj.ADBIPAddress = matchReg.group(1)
-        elif re.match('^\-\-ADBUserName=(.+)$', myArgv, re.IGNORECASE):
-            matchReg = re.match('^\-\-ADBUserName=(.+)$', myArgv, re.IGNORECASE)
-            CiTestObj.ADBUserName = matchReg.group(1)
-        elif re.match('^\-\-ADBType=(.+)$', myArgv, re.IGNORECASE):
-            matchReg = re.match('^\-\-ADBType=(.+)$', myArgv, re.IGNORECASE)
-            if re.match('centralized', matchReg.group(1), re.IGNORECASE) or re.match('distributed', matchReg.group(1), re.IGNORECASE):
-                if re.match('distributed', matchReg.group(1), re.IGNORECASE):
-                    CiTestObj.ADBCentralized = False
-                else:
-                    CiTestObj.ADBCentralized = True
-            else:
-                sys.exit('Invalid ADB Type: ' + matchReg.group(1) + ' -- (should be centralized or distributed)')
-        elif re.match('^\-\-ADBPassword=(.+)$', myArgv, re.IGNORECASE):
-            matchReg = re.match('^\-\-ADBPassword=(.+)$', myArgv, re.IGNORECASE)
-            CiTestObj.ADBPassword = matchReg.group(1)
-        elif re.match('^\-\-XMLTestFile=(.+)$', myArgv, re.IGNORECASE):
-            matchReg = re.match('^\-\-XMLTestFile=(.+)$', myArgv, re.IGNORECASE)
-            CiTestObj.testXMLfiles.append(matchReg.group(1))
-            HTML.testXMLfiles.append(matchReg.group(1))
-            HTML.nbTestXMLfiles=HTML.nbTestXMLfiles+1
-        elif re.match('^\-\-UEIPAddress=(.+)$', myArgv, re.IGNORECASE):
-            matchReg = re.match('^\-\-UEIPAddress=(.+)$', myArgv, re.IGNORECASE)
-            CiTestObj.UEIPAddress = matchReg.group(1)
-        elif re.match('^\-\-UEUserName=(.+)$', myArgv, re.IGNORECASE):
-            matchReg = re.match('^\-\-UEUserName=(.+)$', myArgv, re.IGNORECASE)
-            CiTestObj.UEUserName = matchReg.group(1)
-        elif re.match('^\-\-UEPassword=(.+)$', myArgv, re.IGNORECASE):
-            matchReg = re.match('^\-\-UEPassword=(.+)$', myArgv, re.IGNORECASE)
-            CiTestObj.UEPassword = matchReg.group(1)
-        elif re.match('^\-\-UESourceCodePath=(.+)$', myArgv, re.IGNORECASE):
-            matchReg = re.match('^\-\-UESourceCodePath=(.+)$', myArgv, re.IGNORECASE)
-            CiTestObj.UESourceCodePath = matchReg.group(1)
-        elif re.match('^\-\-finalStatus=(.+)$', myArgv, re.IGNORECASE):
-            matchReg = re.match('^\-\-finalStatus=(.+)$', myArgv, re.IGNORECASE)
-            finalStatus = matchReg.group(1)
-            if ((finalStatus == 'true') or (finalStatus == 'True')):
-                CiTestObj.finalStatus = True
-        else:
-            HELP.GenericHelp(CONST.Version)
-            sys.exit('Invalid Parameter: ' + myArgv)
-
-    return py_param_file_present, py_params, mode

ci-scripts/buildOnRH.sh

@@ -179,7 +179,7 @@ echo "############################################################"
 echo "Checking build status" 
 echo "############################################################"
 
-LOG_PATTERN=.Rel15.txt
+LOG_PATTERN=.Rel14.txt
 NB_PATTERN_FILES=7
 
 LOG_FILES=`ls $ARCHIVES_LOC/*.txt`

ci-scripts/buildOnVM.sh

@@ -68,12 +68,11 @@ 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 --disk $VM_DISK --unsafe-caching --template ci-scripts/template-host.xml
+        uvt-kvm create $VM_NAME release=$VM_OSREL --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
 
@@ -104,7 +103,6 @@ function build_on_vm {
     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 ]
@@ -137,21 +135,11 @@ function build_on_vm {
         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
+            echo "sudo apt-get --yes install zip subversion libboost-dev >> zip-install.txt 2>&1" >> $VM_CMDS
         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
+            echo "sudo apt-get --yes install zip daemon subversion libboost-dev >> zip-install.txt 2>&1" >> $VM_CMDS
         fi
     fi
     echo "mkdir tmp" >> $VM_CMDS
@@ -180,23 +168,13 @@ 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.Rel14.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

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 | 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/*/*.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`
 
 echo ""
 echo "List of files that have been modified by the Merge Request AND"

ci-scripts/checkCodingFormattingRules.sh

@@ -59,33 +59,9 @@ if [ $# -eq 0 ]
 then
     echo " ---- Checking the whole repository ----"
     echo ""
-    NB_FILES_TO_FORMAT=`astyle --dry-run --options=ci-scripts/astyle-options.txt --recursive *.c *.h | grep -c Formatted || true`
+    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" . | egrep -v "openair3/NAS/COMMON/milenage.h" > 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" || true`
-       IS_OAI_LICENCE_PRESENT=`egrep -c "OAI Public License" $FILE || true`
-       IS_BSD_LICENCE_PRESENT=`egrep -c "the terms of the BSD Licence" $FILE || true`
-       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|openair3/GTPV1-U/nw-gtpv1u|openair2/UTIL/OPT/ws_|openair3/NAS/COMMON/milenage.h" || true`
-       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
 
@@ -155,66 +131,21 @@ 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" ]
     then
-        TO_FORMAT=`astyle --dry-run --options=ci-scripts/astyle-options.txt $FULLFILE | grep -c Formatted || true`
+        TO_FORMAT=`astyle --dry-run --options=ci-scripts/astyle-options.txt $FULLFILE | grep -c Formatted `
         NB_TO_FORMAT=$((NB_TO_FORMAT + TO_FORMAT))
         if [ $TO_FORMAT -ne 0 ]
         then
             echo $FULLFILE
             echo $FULLFILE >> ./oai_rules_result_list.txt
         fi
-        # Testing if explicit GNU GPL license banner
-        GNU_EXCEPTION=`echo $FULLFILE | egrep -c "openair3/NAS/COMMON/milenage.h" || true`
-        if [ $GNU_EXCEPTION -eq 0 ]
-        then
-            egrep -il "General Public License" $FULLFILE >> files-w-gnu-gpl-license-banner.txt
-        fi
-        # Looking at exotic/suspect banner
-        IS_BANNER=`egrep -i -c "Copyright|copyleft" $FULLFILE || true`
-        if [ $IS_BANNER -ne 0 ]
-        then
-            IS_NFAPI=`echo $FULLFILE | egrep -c "nfapi/open-nFAPI|nfapi/oai_integration/vendor_ext" || true`
-            IS_OAI_LICENCE_PRESENT=`egrep -c "OAI Public License" $FULLFILE || true`
-            IS_BSD_LICENCE_PRESENT=`egrep -c "the terms of the BSD Licence" $FULLFILE || true`
-            IS_EXCEPTION=`echo $FULLFILE | 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|openair3/GTPV1-U/nw-gtpv1u|openair2/UTIL/OPT/ws_|openair3/NAS/COMMON/milenage.h" || true`
-            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 $FULLFILE >> ./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_cots_ue.py

@@ -1,138 +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
-# */
-#---------------------------------------------------------------------
-# Python for CI of OAI-eNB + COTS-UE
-#
-#   Required Python Version
-#     Python 3.x
-#
-#   Required Python Package
-#     pexpect
-#---------------------------------------------------------------------
-
-#to use isfile
-import os
-import sys
-#to use logging.info()
-import logging
-#to create a SSH object locally in the methods
-import sshconnection
-#time.sleep
-import time
-#to load cots_ue dictionary
-import yaml
-
-class CotsUe:
-	def __init__(self,ADBIPAddr,ADBUserName,ADBPassWord):
-		self.cots_id = '' #cots id from yaml oppo, s10 etc...
-		self.ADBIPAddr = ADBIPAddr 
-		self.ADBUserName = ADBUserName
-		self.ADBPassWord = ADBPassWord
-		self.cots_run_mode = '' #on of off to toggle airplane mode on/off
-		self.__cots_cde_dict_file = 'cots_ue_ctl.yaml'
-		self.__SetAirplaneRetry = 3
-
-
-#-----------------$
-#PUBLIC Methods$
-#-----------------$
-
-	def Check_Airplane(self):
-		mySSH = sshconnection.SSHConnection()
-		mySSH.open(self.ADBIPAddr, self.ADBUserName, self.ADBPassWord)
-		status=mySSH.cde_check_value('adb shell settings get global airplane_mode_on ', ['0','1'],5)
-		mySSH.close()
-		return status
-
-	#simply check if the device id exists in the dictionary
-	#returns true if it exists, false otherwise
-	def Check_Exists(self,target_id):
-		#load cots commands dictionary
-		if (os.path.isfile(self.__cots_cde_dict_file)):
-			yaml_file=self.__cots_cde_dict_file
-		elif (os.path.isfile('ci-scripts/'+self.__cots_cde_dict_file)):
-			yaml_file='ci-scripts/'+self.__cots_cde_dict_file
-		else:
-			logging.error("COTS UE dictionary yaml file cannot be found")
-			sys.exit("COTS UE dictionary yaml file cannot be found")
-		
-		#load cots commands dictionary
-		with open(yaml_file,'r') as file:
-			cots_ue_ctl = yaml.load(file,Loader=yaml.FullLoader)
-		#check if ue id is in the dictionary
-		if target_id in cots_ue_ctl:
-			return True
-		else:
-			return False
-
-	def Set_Airplane(self, target_id, target_state_str):
-		#loading cots commands dictionary
-
-		if (os.path.isfile(self.__cots_cde_dict_file)):
-			yaml_file=self.__cots_cde_dict_file
-		elif (os.path.isfile('ci-scripts/'+self.__cots_cde_dict_file)):
-			yaml_file='ci-scripts/'+self.__cots_cde_dict_file
-		else:
-			logging.error("COTS UE dictionary yaml file cannot be found")
-			sys.exit("COTS UE dictionary yaml file cannot be found")
-		
-		#load cots commands dictionary
-		with open(yaml_file,'r') as file:
-			cots_ue_ctl = yaml.load(file,Loader=yaml.FullLoader)
-		#check if ue id is in the dictionary
-		if target_id in cots_ue_ctl:
-			mySSH = sshconnection.SSHConnection()
-			mySSH.open(self.ADBIPAddr, self.ADBUserName, self.ADBPassWord)
-			logging.info(str(self.ADBIPAddr)+' '+str(self.ADBUserName)+' '+str(self.ADBPassWord))
-			mySSH.command('adb start-server','\$',5)
-			mySSH.command('adb devices','\$',5)
-			logging.info("Toggling COTS UE Airplane mode to : "+target_state_str)
-			#get current state
-			current_state = self.Check_Airplane()
-			if target_state_str.lower()=="on": 
-				target_state=1
-			else:
-				target_state=0
-			if current_state != target_state:
-				#toggle state
-				retry = 0 
-				while (current_state!=target_state) and (retry < self.__SetAirplaneRetry):
-					#loop over the command list from dictionary for the selected ue, to switch to required state
-					for i in range (0,len(cots_ue_ctl[target_id])):
-						mySSH.command(cots_ue_ctl[target_id][i], '\$', 5)
-					time.sleep(1)
-					current_state = self.Check_Airplane()
-					retry+=1
-				#could not toggle despite the retry
-				if current_state != target_state:
-					logging.error("ATTENTION : Could not toggle to : "+target_state_str)
-					logging.error("Current state is : "+ str(current_state))
-			else:
-				logging.info("Airplane mode is already "+ target_state_str)
-			mySSH.command('adb kill-server','\$',5)
-			mySSH.close()
-		#ue id is NOT in the dictionary
-		else:
-			logging.error("COTS UE Id from XML could not be found in UE YAML dictionary " + self.__cots_cde_dict_file)
-			sys.exit("COTS UE Id from XML could not be found in UE YAML dictionary " + self.__cots_cde_dict_file)
-
-
-
-

ci-scripts/cls_physim.py

@@ -1,191 +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
-# */
-#---------------------------------------------------------------------
-# 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.25PRB.usrpb210.conf

@@ -184,8 +184,6 @@ eNBs =
     enable_x2 = "yes";
     t_reloc_prep      = 1000;      /* unit: millisecond */
     tx2_reloc_overall = 2000;      /* unit: millisecond */
-    t_dc_prep         = 1000;      /* unit: millisecond */
-    t_dc_overall      = 2000;      /* unit: millisecond */
 
     NETWORK_INTERFACES :
     {

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

@@ -367,8 +367,6 @@ eNBs =
     enable_x2 = "no";
     t_reloc_prep      = 1000;      /* unit: millisecond */
     tx2_reloc_overall = 2000;      /* unit: millisecond */
-    t_dc_prep         = 1000;      /* unit: millisecond */
-    t_dc_overall      = 2000;      /* unit: millisecond */
 
     NETWORK_INTERFACES :
     {

ci-scripts/conf_files/enb.band17.tm1.25PRB.usrpb210.conf

@@ -1,276 +0,0 @@
-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;
-      mbms_dedicated_serving_cell                       = "DISABLE"
-
-      //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 */
-    t_dc_prep         = 1000;      /* unit: millisecond */
-    t_dc_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";
-    };
-

ci-scripts/conf_files/enb.band17.tm1.mbms.25PRB.usrpb210.conf

@@ -1,420 +0,0 @@
-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;
-      mbms_dedicated_serving_cell                       = "DISABLE"
-
-
-      //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 */
-    t_dc_prep         = 1000;      /* unit: millisecond */
-    t_dc_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 = 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=40;
-                        data_mcs=20;
-                        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=5; #this must be properly defined lcid:8+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=59; #xx111011 #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) 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";
-    };
-

ci-scripts/conf_files/enb.band40.tm1.100PRB.FairScheduler.usrpb210.conf

@@ -147,8 +147,6 @@ eNBs =
     enable_x2 = "no";
     t_reloc_prep      = 1000;      /* unit: millisecond */
     tx2_reloc_overall = 2000;      /* unit: millisecond */
-    t_dc_prep         = 1000;      /* unit: millisecond */
-    t_dc_overall      = 2000;      /* unit: millisecond */
 
     NETWORK_INTERFACES :
     {

ci-scripts/conf_files/enb.band40.tm1.25PRB.FairScheduler.usrpb210.conf

@@ -147,8 +147,6 @@ eNBs =
     enable_x2 = "no";
     t_reloc_prep      = 1000;      /* unit: millisecond */
     tx2_reloc_overall = 2000;      /* unit: millisecond */
-    t_dc_prep         = 1000;      /* unit: millisecond */
-    t_dc_overall      = 2000;      /* unit: millisecond */
 
     NETWORK_INTERFACES :
     {

ci-scripts/conf_files/enb.band40.tm1.50PRB.FairScheduler.usrpb210.conf

@@ -147,8 +147,6 @@ eNBs =
     enable_x2 = "no";
     t_reloc_prep      = 1000;      /* unit: millisecond */
     tx2_reloc_overall = 2000;      /* unit: millisecond */
-    t_dc_prep         = 1000;      /* unit: millisecond */
-    t_dc_overall      = 2000;      /* unit: millisecond */
 
     NETWORK_INTERFACES :
     {

ci-scripts/conf_files/enb.band40.tm2.25PRB.FairScheduler.usrpb210.conf

@@ -145,8 +145,6 @@ eNBs =
     enable_x2 = "no";
     t_reloc_prep      = 1000;      /* unit: millisecond */
     tx2_reloc_overall = 2000;      /* unit: millisecond */
-    t_dc_prep         = 1000;      /* unit: millisecond */
-    t_dc_overall      = 2000;      /* unit: millisecond */
 
     NETWORK_INTERFACES :
     {

ci-scripts/conf_files/enb.band7.tm1.100PRB.usrpb210.conf

@@ -184,8 +184,6 @@ eNBs =
     enable_x2 = "no";
     t_reloc_prep      = 1000;      /* unit: millisecond */
     tx2_reloc_overall = 2000;      /* unit: millisecond */
-    t_dc_prep         = 1000;      /* unit: millisecond */
-    t_dc_overall      = 2000;      /* unit: millisecond */
 
     NETWORK_INTERFACES :
     {

ci-scripts/conf_files/enb.band7.tm1.25PRB.slave.usrpb210.conf

@@ -1,281 +0,0 @@
-Active_eNBs = ( "eNB-Eurecom-LTEBox");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-eNBs =
-(
- {
-    ////////// Identification parameters:
-    eNB_ID    =  0xe10;
-
-    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              			      = 7;
-      downlink_frequency      			      = 2680000000L;
-      uplink_frequency_offset 			      = -120000000;
-      Nid_cell					      = 10;
-      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 */
-    t_dc_prep         = 1000;      /* unit: millisecond */
-    t_dc_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     =  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";
-    };
-

ci-scripts/conf_files/enb.band7.tm1.25PRB.usrpb210.conf

@@ -187,8 +187,6 @@ eNBs =
     enable_x2 = "no";
     t_reloc_prep      = 1000;      /* unit: millisecond */
     tx2_reloc_overall = 2000;      /* unit: millisecond */
-    t_dc_prep         = 1000;      /* unit: millisecond */
-    t_dc_overall      = 2000;      /* unit: millisecond */
 
     NETWORK_INTERFACES :
     {

ci-scripts/conf_files/enb.band7.tm1.50PRB.usrpb210.conf

@@ -192,8 +192,6 @@ eNBs =
     enable_x2 = "no";
     t_reloc_prep      = 1000;      /* unit: millisecond */
     tx2_reloc_overall = 2000;      /* unit: millisecond */
-    t_dc_prep         = 1000;      /* unit: millisecond */
-    t_dc_overall      = 2000;      /* unit: millisecond */
 
     NETWORK_INTERFACES :
     {

ci-scripts/conf_files/enb.band7.tm1.fr1.25PRB.usrpb210.conf

@@ -1,288 +0,0 @@
-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    =  0xe01;
-    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 = 222; mnc = 01; mnc_length = 2; }
-    );
-    
-    tr_s_preference     = "local_mac"
-
-    ////////// Physical parameters:
-  
-    component_carriers = (
-      {
-        node_function                    = "eNodeB_3GPP";
-        node_timing                      = "synch_to_ext_device";
-        node_synch_ref                   = 0;
-        nb_antenna_ports                 = 1;
-        ue_TransmissionMode              = 1;
-        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_antennas_tx                   = 1;
-        nb_antennas_rx                   = 1; 
-        prach_root                       = 0;
-        tx_gain                          = 90;
-        rx_gain                          = 115;
-        pbch_repetition                  = "FALSE";
-
-        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_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                 = -96;
-        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;
-
-      //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;
-
-      //SSB central frequency of NR secondary cell group (for ENDC NSA)
-      nr_scg_ssb_freq = 641272;
-    }
-  );
-
-    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;
-    };
-
-    enable_measurement_reports = "yes";
-
-    ////////// 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 */
-    t_dc_prep         = 1000;      /* unit: millisecond */
-    t_dc_overall      = 2000;      /* unit: millisecond */
-
-    NETWORK_INTERFACES : 
-    {
-        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth1";
-        ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
-
-        ENB_INTERFACE_NAME_FOR_S1U               = "eth1";
-        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                  ="high";
-     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                         ="debug"; 
-     rlc_log_verbosity                     ="high";
-     pdcp_log_level                        ="info"; 
-     pdcp_log_verbosity                    ="high";
-     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     =  160;
-    puCch10xSnr     =  160;
-  }  
-);
-
-THREAD_STRUCT = (
-  {
-    parallel_config = "PARALLEL_RU_L1_TRX_SPLIT";
-    worker_config   = "ENABLE";
-  }
-);
-
-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                    = 118;
-    eNB_instances  = [0];
-    clock_src      = "external";
-  }
-);  
-
-log_config : 
-  {
-     global_log_level                      ="info"; 
-     global_log_verbosity                  ="high";
-     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                     ="high";
-     pdcp_log_level                        ="info"; 
-     pdcp_log_verbosity                    ="high";
-     rrc_log_level                         ="info"; 
-     rrc_log_verbosity                     ="medium";
-  }; 

ci-scripts/conf_files/enb.band7.tm2.25PRB.usrpb210.conf

@@ -187,8 +187,6 @@ eNBs =
     enable_x2 = "no";
     t_reloc_prep      = 1000;      /* unit: millisecond */
     tx2_reloc_overall = 2000;      /* unit: millisecond */
-    t_dc_prep         = 1000;      /* unit: millisecond */
-    t_dc_overall      = 2000;      /* unit: millisecond */
 
     NETWORK_INTERFACES :
     {

ci-scripts/conf_files/enb.slave.band13.tm1.25PRB.usrpb210.conf

@@ -183,8 +183,6 @@ eNBs =
     enable_x2 = "yes";
     t_reloc_prep      = 1000;      /* unit: millisecond */
     tx2_reloc_overall = 2000;      /* unit: millisecond */
-    t_dc_prep         = 1000;      /* unit: millisecond */
-    t_dc_overall      = 2000;      /* unit: millisecond */
     target_enb_x2_ip_address      = (
                                      { ipv4       = "CI_RCC_IP_ADDR";
                                        ipv6       = "192:168:30::17";

ci-scripts/conf_files/gnb.band78.tm1.106PRB.usrpn300.conf

@@ -1,283 +0,0 @@
-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:
-
-    ssb_SubcarrierOffset                                      = 0;
-    pdsch_AntennaPorts                                        = 1;
-	
-    servingCellConfigCommon = (
-    {
- #spCellConfigCommon
-
-      physCellId                                                    = 0;
-
-#  downlinkConfigCommon
-    #frequencyInfoDL
-      # this is 3600 MHz + 43 PRBs@30kHz SCS (same as initial BWP)
-      absoluteFrequencySSB                                          = 641032;
-      dl_frequencyBand                                                 = 78;
-      # this is 3600 MHz
-      dl_absoluteFrequencyPointA                                       = 640000;
-      #scs-SpecificCarrierList
-        dl_offstToCarrier                                              = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
-        dl_subcarrierSpacing                                           = 1;
-        dl_carrierBandwidth                                            = 106;
-     #initialDownlinkBWP
-      #genericParameters
-        # this is RBstart=41,L=24 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                                        = 6366;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
-        initialDLBWPsubcarrierSpacing                                           = 1;
-      #pdcch-ConfigCommon
-        initialDLBWPcontrolResourceSetZero                                      = 12;
-        initialDLBWPsearchSpaceZero                                             = 0;
-      #pdsch-ConfigCommon
-        #pdschTimeDomainAllocationList (up to 16 entries)
-             initialDLBWPk0_0                    = 0;
-             #initialULBWPmappingType
-	     #0=typeA,1=typeB
-             initialDLBWPmappingType_0           = 0;
-             #this is SS=1,L=13
-             initialDLBWPstartSymbolAndLength_0  = 40;
-
-             initialDLBWPk0_1                    = 0;
-             initialDLBWPmappingType_1           = 0;
-             #this is SS=2,L=12 
-             initialDLBWPstartSymbolAndLength_1  = 53;
-
-             initialDLBWPk0_2                    = 0;
-             initialDLBWPmappingType_2           = 0;
-             #this is SS=1,L=12 
-             initialDLBWPstartSymbolAndLength_2  = 54;
-
-             initialDLBWPk0_3                    = 0;
-             initialDLBWPmappingType_3           = 0;
-             #this is SS=1,L=5
-             initialDLBWPstartSymbolAndLength_3  = 57;
-
-  #uplinkConfigCommon 
-     #frequencyInfoUL
-      ul_frequencyBand                                                 = 78;
-      #scs-SpecificCarrierList
-      ul_offstToCarrier                                              = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
-      ul_subcarrierSpacing                                           = 1;
-      ul_carrierBandwidth                                            = 106;
-      pMax                                                          = 20;
-     #initialUplinkBWP
-      #genericParameters
-        initialULBWPlocationAndBandwidth                                        = 6366;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
-        initialULBWPsubcarrierSpacing                                           = 1;
-      #rach-ConfigCommon
-        #rach-ConfigGeneric
-          prach_ConfigurationIndex                                  = 98;
-#prach_msg1_FDM
-#0 = one, 1=two, 2=four, 3=eight
-          prach_msg1_FDM                                            = 0;
-          prach_msg1_FrequencyStart                                 = 0;
-          zeroCorrelationZoneConfig                                 = 13;
-          preambleReceivedTargetPower                               = -118;
-#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
-          preambleTransMax                                          = 6;
-#powerRampingStep
-# 0=dB0,1=dB2,2=dB4,3=dB6
-        powerRampingStep                                            = 1;
-#ra_ReponseWindow
-#1,2,4,8,10,20,40,80
-        ra_ResponseWindow                                           = 4;
-#ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
-#1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
-#oneHalf (0..15) 4,8,12,16,...60,64
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;
-#ra_ContentionResolutionTimer
-#(0..7) 8,16,24,32,40,48,56,64
-        ra_ContentionResolutionTimer                                = 7;
-        rsrp_ThresholdSSB                                           = 19;
-#prach-RootSequenceIndex_PR
-#1 = 839, 2 = 139
-        prach_RootSequenceIndex_PR                                  = 2;
-        prach_RootSequenceIndex                                     = 1;
-        # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
-        #  
-        msg1_SubcarrierSpacing                                      = 1,
-# restrictedSetConfig
-# 0=unrestricted, 1=restricted type A, 2=restricted type B
-        restrictedSetConfig                                         = 0,
-
-      # pusch-ConfigCommon (up to 16 elements)
-        initialULBWPk2_0                      = 6;
-        initialULBWPmappingType_0             = 1
-        # this is SS=0 L=11
-        initialULBWPstartSymbolAndLength_0    = 55;
-
-        initialULBWPk2_1                      = 6;
-        initialULBWPmappingType_1             = 1;
-        # this is SS=0 L=12
-        initialULBWPstartSymbolAndLength_1    = 69;
-
-        initialULBWPk2_2                      = 7;
-        initialULBWPmappingType_2             = 1;
-        # this is SS=10 L=4
-        initialULBWPstartSymbolAndLength_2    = 52;
-
-        msg3_DeltaPreamble                                          = 1;
-        p0_NominalWithGrant                                         =-90;
-
-# pucch-ConfigCommon setup :
-# pucchGroupHopping
-# 0 = neither, 1= group hopping, 2=sequence hopping
-        pucchGroupHopping                                           = 0;
-        hoppingId                                                   = 40;
-        p0_nominal                                                  = -90;
-# ssb_PositionsInBurs_BitmapPR
-# 1=short, 2=medium, 3=long
-      ssb_PositionsInBurst_PR                                       = 2;
-      ssb_PositionsInBurst_Bitmap                                   = 1;
-
-# ssb_periodicityServingCell
-# 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1 
-      ssb_periodicityServingCell                                    = 2;
-
-# dmrs_TypeA_position
-# 0 = pos2, 1 = pos3
-      dmrs_TypeA_Position                                           = 0;
-
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
-      subcarrierSpacing                                             = 1;
-
-
-  #tdd-UL-DL-ConfigurationCommon
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
-      referenceSubcarrierSpacing                                    = 1;
-      # pattern1 
-      # dl_UL_TransmissionPeriodicity
-      # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
-      dl_UL_TransmissionPeriodicity                                 = 6;
-      nrofDownlinkSlots                                             = 7;
-      nrofDownlinkSymbols                                           = 6;
-      nrofUplinkSlots                                               = 2;
-      nrofUplinkSymbols                                             = 4;
-
-  ssPBCH_BlockPower                                             = 10;
-  }
-
-  );
-
-
-    # ------- 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                    = 75;
-         eNB_instances  = [0];
-         #beamforming 1x4 matrix:
-         bf_weights = [0x00007fff, 0x0000, 0x0000, 0x0000];
-         sdr_addrs = "addr=192.168.10.2,mgmt_addr=192.168.10.2,second_addr=192.168.20.2";
-         clock_src = "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";
-  }
-);
-
-     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";
-    };
-

ci-scripts/conf_files/gnb.band78.tm1.fr1.106PRB.usrpb210.conf

@@ -1,296 +0,0 @@
-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 = 222; mnc = 01; mnc_length = 2;});   
-
-    tr_s_preference     = "local_mac"
-
-    ////////// Physical parameters:
-
-    ssb_SubcarrierOffset                                      = 31; //0;
-    pdsch_AntennaPorts                                        = 1;
-  
-    servingCellConfigCommon = (
-    {
- #spCellConfigCommon
-
-      physCellId                                                    = 0;
-
-#  downlinkConfigCommon
-    #frequencyInfoDL
-      # this is 3600 MHz + 84 PRBs@30kHz SCS (same as initial BWP)
-      absoluteFrequencySSB                                          = 641272; //641032;      #641968; 641968=start of ssb at 3600MHz + 82 RBs    641032=center of SSB at center of cell
-      dl_frequencyBand                                                 = 78;
-      # this is 3600 MHz
-      dl_absoluteFrequencyPointA                                       = 640000;
-      #scs-SpecificCarrierList
-        dl_offstToCarrier                                              = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
-        dl_subcarrierSpacing                                           = 1;
-        dl_carrierBandwidth                                            = 106;
-     #initialDownlinkBWP
-      #genericParameters
-        # this is RBstart=84,L=13 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                                        = 6366; //28875; //6366; #6407; #3384;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
-        initialDLBWPsubcarrierSpacing                                           = 1;
-      #pdcch-ConfigCommon
-        initialDLBWPcontrolResourceSetZero                                      = 0;
-        initialDLBWPsearchSpaceZero                                             = 0;
-      #pdsch-ConfigCommon
-        #pdschTimeDomainAllocationList (up to 16 entries)
-             initialDLBWPk0_0                    = 0;
-             #initialULBWPmappingType
-       #0=typeA,1=typeB
-             initialDLBWPmappingType_0           = 0;
-             #this is SS=1,L=13
-             initialDLBWPstartSymbolAndLength_0  = 40;
-
-             initialDLBWPk0_1                    = 0;
-             initialDLBWPmappingType_1           = 0;
-             #this is SS=2,L=12 
-             initialDLBWPstartSymbolAndLength_1  = 53;
-
-             initialDLBWPk0_2                    = 0;
-             initialDLBWPmappingType_2           = 0;
-             #this is SS=1,L=12 
-             initialDLBWPstartSymbolAndLength_2  = 54;
-
-             initialDLBWPk0_3                    = 0;
-             initialDLBWPmappingType_3           = 0;
-             #this is SS=1,L=4 //5 (4 is for 43, 5 is for 57)
-             initialDLBWPstartSymbolAndLength_3  = 57; //43; //57;
-  #uplinkConfigCommon 
-     #frequencyInfoUL
-      ul_frequencyBand                                                 = 78;
-      #scs-SpecificCarrierList
-      ul_offstToCarrier                                              = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
-      ul_subcarrierSpacing                                           = 1;
-      ul_carrierBandwidth                                            = 106;
-      pMax                                                          = 20;
-     #initialUplinkBWP
-      #genericParameters
-        initialULBWPlocationAndBandwidth                                        = 6366; //28875; //6366; #6407; #3384;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
-        initialULBWPsubcarrierSpacing                                           = 1;
-      #rach-ConfigCommon
-        #rach-ConfigGeneric
-          prach_ConfigurationIndex                                  = 98;
-#prach_msg1_FDM
-#0 = one, 1=two, 2=four, 3=eight
-          prach_msg1_FDM                                            = 0;
-          prach_msg1_FrequencyStart                                 = 0;
-          zeroCorrelationZoneConfig                                 = 13;
-          preambleReceivedTargetPower                               = -100;
-#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
-          preambleTransMax                                          = 6;
-#powerRampingStep
-# 0=dB0,1=dB2,2=dB4,3=dB6
-        powerRampingStep                                            = 1;
-#ra_ReponseWindow
-#1,2,4,8,10,20,40,80
-        ra_ResponseWindow                                           = 5;
-#ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
-#1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
-#oneHalf (0..15) 4,8,12,16,...60,64
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 14; //15;
-#ra_ContentionResolutionTimer
-#(0..7) 8,16,24,32,40,48,56,64
-        ra_ContentionResolutionTimer                                = 7;
-        rsrp_ThresholdSSB                                           = 19;
-#prach-RootSequenceIndex_PR
-#1 = 839, 2 = 139
-        prach_RootSequenceIndex_PR                                  = 2;
-        prach_RootSequenceIndex                                     = 1;
-        # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
-        #  
-        msg1_SubcarrierSpacing                                      = 1,
-
-# restrictedSetConfig
-# 0=unrestricted, 1=restricted type A, 2=restricted type B
-        restrictedSetConfig                                         = 0,
-      # pusch-ConfigCommon (up to 16 elements)
-        initialULBWPk2_0                      = 2;
-        initialULBWPmappingType_0             = 1
-        # this is SS=0 L=11
-        initialULBWPstartSymbolAndLength_0    = 55;
-   
-  initialULBWPk2_1                      = 2;
-        initialULBWPmappingType_1             = 1;
-        # this is SS=0 L=12
-        initialULBWPstartSymbolAndLength_1    = 69;
-
-        initialULBWPk2_2                      = 7;
-        initialULBWPmappingType_2             = 1;
-        # this is SS=10 L=4
-        initialULBWPstartSymbolAndLength_2    = 52;
-
-        msg3_DeltaPreamble                                          = 1;
-        p0_NominalWithGrant                                         =-90;
-
-# pucch-ConfigCommon setup :
-# pucchGroupHopping
-# 0 = neither, 1= group hopping, 2=sequence hopping
-        pucchGroupHopping                                           = 0;
-        hoppingId                                                   = 40;
-        p0_nominal                                                  = -90;
-# ssb_PositionsInBurs_BitmapPR
-# 1=short, 2=medium, 3=long
-      ssb_PositionsInBurst_PR                                       = 2;
-      ssb_PositionsInBurst_Bitmap                                   = 1; #0x80;
-
-# ssb_periodicityServingCell
-# 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1 
-      ssb_periodicityServingCell                                    = 2;
-
-# dmrs_TypeA_position
-# 0 = pos2, 1 = pos3
-      dmrs_TypeA_Position                                           = 0;
-
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
-      subcarrierSpacing                                             = 1;
-
-
-  #tdd-UL-DL-ConfigurationCommon
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
-      referenceSubcarrierSpacing                                    = 1;
-      # pattern1 
-      # dl_UL_TransmissionPeriodicity
-      # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
-      dl_UL_TransmissionPeriodicity                                 = 6;
-      nrofDownlinkSlots                                             = 7; //8; //7;
-      nrofDownlinkSymbols                                           = 6; //0; //6;
-      nrofUplinkSlots                                               = 2;
-      nrofUplinkSymbols                                             = 4; //0; //4;
-
-  ssPBCH_BlockPower                                             = -25;
-  }
-
-  );
-
-
-    # ------- 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 */
-    t_dc_prep         = 1000;      /* unit: millisecond */
-    t_dc_overall      = 2000;      /* unit: millisecond */
-    target_enb_x2_ip_address      = (
-                                     { ipv4       = "CI_FR1_CTL_ENB_IP_ADDR";
-                                       ipv6       = "192:168:30::17";
-                                       preference = "ipv4";
-                                     }
-                                    );
-
-    NETWORK_INTERFACES :
-    {
-
-        GNB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
-        GNB_IPV4_ADDRESS_FOR_S1_MME              = "CI_GNB_IP_ADDR";
-        GNB_INTERFACE_NAME_FOR_S1U               = "eth0";
-        GNB_IPV4_ADDRESS_FOR_S1U                 = "CI_GNB_IP_ADDR";
-        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
-        GNB_IPV4_ADDRESS_FOR_X2C                 = "CI_GNB_IP_ADDR";
-        GNB_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_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];
-         clock_src = "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";
-    //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";
-    };
-
-uicc: {
-opc = "testopc";
-};

ci-scripts/conf_files/lte-fdd-basic-sim.conf

@@ -184,8 +184,6 @@ eNBs =
     enable_x2 = "no";
     t_reloc_prep      = 1000;      /* unit: millisecond */
     tx2_reloc_overall = 2000;      /* unit: millisecond */
-    t_dc_prep         = 1000;      /* unit: millisecond */
-    t_dc_overall      = 2000;      /* unit: millisecond */
 
     NETWORK_INTERFACES :
     {

ci-scripts/conf_files/lte-fdd-fembms-basic-sim.conf

@@ -1,428 +0,0 @@
-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;
-      mbms_dedicated_serving_cell                       = "ENABLE"
-
-      //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 */
-    t_dc_prep         = 1000;      /* unit: millisecond */
-    t_dc_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=512;
-                        data_mcs=15;
-                        mch_scheduling_period = 0; #rf8(0) rf16(1) rf32(2) rf64(3) rf128(4) rf256(5) rf512(6) rf1024(7)
-                        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                       = 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
-
-            };
-        }
-);
-
-
-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";
-    };
-
-//rfsimulator :
-//{
-   //options = ("chanmod");
-   //modelname = "AWGN";
-//};
-        

ci-scripts/conf_files/lte-fdd-mbms-basic-sim.conf

@@ -1,428 +0,0 @@
-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;
-      mbms_dedicated_serving_cell                       = "DISABLE"
-
-      //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 */
-    t_dc_prep         = 1000;      /* unit: millisecond */
-    t_dc_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=15;
-                        mch_scheduling_period = 0; #rf8(0) rf16(1) rf32(2) rf64(3) rf128(4) rf256(5) rf512(6) rf1024(7)
-                        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                       = 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
-
-            };
-        }
-);
-
-
-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";
-    };
-
-//rfsimulator :
-//{
-   //options = ("chanmod");
-   //modelname = "AWGN";
-//};
-        

ci-scripts/conf_files/lte-tdd-basic-sim.conf

@@ -147,8 +147,6 @@ eNBs =
     enable_x2 = "no";
     t_reloc_prep      = 1000;      /* unit: millisecond */
     tx2_reloc_overall = 2000;      /* unit: millisecond */
-    t_dc_prep         = 1000;      /* unit: millisecond */
-    t_dc_overall      = 2000;      /* unit: millisecond */
 
     NETWORK_INTERFACES :
     {

ci-scripts/conf_files/rcc.band40.tm1.100PRB.FairScheduler.usrpb210.conf

@@ -150,8 +150,6 @@ eNBs =
     enable_x2 = "no";
     t_reloc_prep      = 1000;      /* unit: millisecond */
     tx2_reloc_overall = 2000;      /* unit: millisecond */
-    t_dc_prep         = 1000;      /* unit: millisecond */
-    t_dc_overall      = 2000;      /* unit: millisecond */
 
     NETWORK_INTERFACES :
     {

ci-scripts/conf_files/rcc.band40.tm1.25PRB.FairScheduler.usrpb210.conf

@@ -150,8 +150,6 @@ eNBs =
     enable_x2 = "no";
     t_reloc_prep      = 1000;      /* unit: millisecond */
     tx2_reloc_overall = 2000;      /* unit: millisecond */
-    t_dc_prep         = 1000;      /* unit: millisecond */
-    t_dc_overall      = 2000;      /* unit: millisecond */
 
     NETWORK_INTERFACES :
     {

ci-scripts/conf_files/rcc.band40.tm1.50PRB.FairScheduler.usrpb210.conf

@@ -150,8 +150,6 @@ eNBs =
     enable_x2 = "no";
     t_reloc_prep      = 1000;      /* unit: millisecond */
     tx2_reloc_overall = 2000;      /* unit: millisecond */
-    t_dc_prep         = 1000;      /* unit: millisecond */
-    t_dc_overall      = 2000;      /* unit: millisecond */
 
     NETWORK_INTERFACES :
     {

ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.100PRB.usrpb210.conf

@@ -187,8 +187,6 @@ eNBs =
     enable_x2 = "no";
     t_reloc_prep      = 1000;      /* unit: millisecond */
     tx2_reloc_overall = 2000;      /* unit: millisecond */
-    t_dc_prep         = 1000;      /* unit: millisecond */
-    t_dc_overall      = 2000;      /* unit: millisecond */
 
     NETWORK_INTERFACES :
     {

ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.25PRB.usrpb210.conf

@@ -187,8 +187,6 @@ eNBs =
     enable_x2 = "no";
     t_reloc_prep      = 1000;      /* unit: millisecond */
     tx2_reloc_overall = 2000;      /* unit: millisecond */
-    t_dc_prep         = 1000;      /* unit: millisecond */
-    t_dc_overall      = 2000;      /* unit: millisecond */
 
     NETWORK_INTERFACES :
     {

ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.50PRB.usrpb210.conf

@@ -187,8 +187,6 @@ eNBs =
     enable_x2 = "no";
     t_reloc_prep      = 1000;      /* unit: millisecond */
     tx2_reloc_overall = 2000;      /* unit: millisecond */
-    t_dc_prep         = 1000;      /* unit: millisecond */
-    t_dc_overall      = 2000;      /* unit: millisecond */
 
     NETWORK_INTERFACES :
     {

ci-scripts/conf_files/rcc.band7.tm1.mbms-s1ap.if4p5.50PRB.lo.conf

@@ -1,380 +0,0 @@
-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 */
-    t_dc_prep         = 1000;      /* unit: millisecond */
-    t_dc_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";
-};

ci-scripts/conf_files/rcc.band7.tm1.mbms.if4p5.50PRB.lo.conf

@@ -1,380 +0,0 @@
-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 */
-    t_dc_prep         = 1000;      /* unit: millisecond */
-    t_dc_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";
-};

ci-scripts/conf_files/rcc.band7.tm1.nfapi.conf

@@ -185,8 +185,6 @@ eNBs =
     enable_x2 = "no";
     t_reloc_prep      = 1000;      /* unit: millisecond */
     tx2_reloc_overall = 2000;      /* unit: millisecond */
-    t_dc_prep         = 1000;      /* unit: millisecond */
-    t_dc_overall      = 2000;      /* unit: millisecond */
 
     NETWORK_INTERFACES :
     {

ci-scripts/constants.py

@@ -1,72 +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
-# */
-#---------------------------------------------------------------------
-# 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/cots_ue_ctl.yaml

@@ -1,20 +0,0 @@
-9d690a12: #oppo
-  - adb shell input keyevent KEYCODE_POWER
-  - adb shell input swipe 300 700 300 0
-  - adb shell am start -a android.settings.AIRPLANE_MODE_SETTINGS
-  - adb shell input keyevent 20
-  - adb shell input tap 968 324
-002: #s10
-  - adb shell input keyevent KEYCODE_POWER
-  - adb shell input swipe 200 900 200 300
-  - adb shell am start -a android.settings.AIRPLANE_MODE_SETTINGS
-  - adb shell input tap 968 324
-003: #s20
-  - adb shell input keyevent KEYCODE_POWER
-  - adb shell input swipe 200 900 200 300
-  - adb shell am start -a android.settings.AIRPLANE_MODE_SETTINGS
-  - adb shell input tap 968 324
-004: #xperia
-  - tbd
-  - tbd
-  - tbd

ci-scripts/cppcheck_suppressions.list

@@ -37,7 +37,6 @@ 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.
@@ -77,16 +76,7 @@ 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
 //
-//-----------------------------------------------------------------------------
-// cppcheck does not understand the different lengths of arrays
-arrayIndexOutOfBounds:openair1/SIMULATION/TOOLS/random_channel.c:705
-arrayIndexOutOfBounds:openair1/SIMULATION/TOOLS/random_channel.c:706
 //*****************************************************************************
 //
 // True problems we don't know how to fix, Suppression is commented out,

ci-scripts/createVM.sh

@@ -85,13 +85,12 @@ 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 --disk $VM_DISK --unsafe-caching --template ci-scripts/template-host.xml
+    uvt-kvm create $VM_NAME release=$VM_OSREL --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
 

ci-scripts/doc/vm_based_simulator_build.md

@@ -51,20 +51,18 @@ Mandatory Options:
 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  )
+    --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
  # non-OSA Build Variants
-    --variant flexran-rtc     OR -v10    ( build and test non-OSA )
+    --variant flexran-rtc  OR -v10
  # OpenAirInterface Test Variants
-    --variant l1-sim          OR -v20    ( test  )
-    --variant rf-sim          OR -v21    ( test  )
-    --variant l2-sim          OR -v22    ( test  )
+    --variant l1-sim       OR -v20
+    --variant rf-sim       OR -v21
+    --variant l2-sim       OR -v22
     Specify the variant to build.
 
     --keep-vm-alive OR -k

ci-scripts/doc/vm_based_simulator_check_build.md

@@ -34,7 +34,6 @@ 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,20 +44,18 @@ Mandatory Options:
     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  )
+    --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
  # non-OSA Build Variants
-    --variant flexran-rtc     OR -v10    ( build and test non-OSA )
+    --variant flexran-rtc  OR -v10
  # OpenAirInterface Test Variants
-    --variant l1-sim          OR -v20    ( test  )
-    --variant rf-sim          OR -v21    ( test  )
-    --variant l2-sim          OR -v22    ( test  )
+    --variant l1-sim       OR -v20
+    --variant rf-sim       OR -v21
+    --variant l2-sim       OR -v22
     Specify the variant to build.
 
     --help OR -h
@@ -75,7 +73,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 --disk $VM_DISK --unsafe-caching --template ci-scripts/template-host.xml
+uvt-kvm create $VM_NAME release=xenial --memory $VM_MEMORY --cpu $VM_CPU --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,6 +38,7 @@ 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_main_scripts.md

@@ -83,43 +83,43 @@ You can get the list of variant specific variables specifying the variant argume
                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     
+               LOG_PATTERN=.Rel14.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     
+               LOG_PATTERN=.Rel14.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     
+               LOG_PATTERN=.Rel14.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     
+               LOG_PATTERN=.Rel14.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     
+               LOG_PATTERN=.Rel14.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     
+               LOG_PATTERN=.Rel14.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     
+               LOG_PATTERN=.Rel14.txt     
 
     --variant cppcheck        OR -v4     ( build and test  )
                VM_NAME=ci-cppcheck              ARCHIVES_LOC=cppcheck       
@@ -131,13 +131,13 @@ You can get the list of variant specific variables specifying the variant argume
                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     
+               LOG_PATTERN=.Rel14.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     
+               LOG_PATTERN=.Rel14.txt     
 
 ```
 

ci-scripts/doc/vm_based_simulator_test.md

@@ -72,20 +72,18 @@ Options:
     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  )
+    --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
  # non-OSA Build Variants
-    --variant flexran-rtc     OR -v10    ( build and test non-OSA )
+    --variant flexran-rtc  OR -v10
  # OpenAirInterface Test Variants
-    --variant l1-sim          OR -v20    ( test  )
-    --variant rf-sim          OR -v21    ( test  )
-    --variant l2-sim          OR -v22    ( test  )
+    --variant l1-sim       OR -v20
+    --variant rf-sim       OR -v21
+    --variant l2-sim       OR -v22
     Specify the variant to build.
 
     --keep-vm-alive OR -k

ci-scripts/epc.py

@@ -1,468 +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
-# */
-#---------------------------------------------------------------------
-# Python for CI of OAI-eNB + COTS-UE
-#
-#   Required Python Version
-#     Python 3.x
-#
-#   Required Python Package
-#     pexpect
-#---------------------------------------------------------------------
-
-#-----------------------------------------------------------
-# Import
-#-----------------------------------------------------------
-import sys              # arg
-import re               # reg
-import logging
-import os
-import time
-import signal
-
-from multiprocessing import Process, Lock, SimpleQueue
-
-#-----------------------------------------------------------
-# OAI Testing modules
-#-----------------------------------------------------------
-import sshconnection as SSH 
-import helpreadme as HELP
-import constants as CONST
-import html
-
-#-----------------------------------------------------------
-# Class Declaration
-#-----------------------------------------------------------
-class EPCManagement():
-
-	def __init__(self):
-		
-		self.IPAddress = ''
-		self.UserName = ''
-		self.Password = ''
-		self.SourceCodePath = ''
-		self.Type = ''
-		self.PcapFileName = ''
-		self.htmlObj = None
-		self.testCase_id = ''
-		self.MmeIPAddress = ''
-		self.containerPrefix = 'prod'
-		self.mmeConfFile = 'mme.conf'
-
-
-#-----------------------------------------------------------
-# EPC management functions
-#-----------------------------------------------------------
-
-	def InitializeHSS(self):
-		if self.IPAddress == '' or self.UserName == '' or self.Password == '' or self.SourceCodePath == '' or self.Type == '':
-			HELP.GenericHelp(CONST.Version)
-			HELP.EPCSrvHelp(self.IPAddress, self.UserName, self.Password, self.SourceCodePath, self.Type)
-			sys.exit('Insufficient EPC Parameters')
-		mySSH = SSH.SSHConnection() 
-		mySSH.open(self.IPAddress, self.UserName, self.Password)
-		if re.match('OAI-Rel14-Docker', self.Type, re.IGNORECASE):
-			logging.debug('Using the OAI EPC Release 14 Cassandra-based HSS in Docker')
-			mySSH.command('if [ -d ' + self.SourceCodePath + '/scripts ]; then echo ' + self.Password + ' | sudo -S rm -Rf ' + self.SourceCodePath + '/scripts ; fi', '\$', 5)
-			mySSH.command('mkdir -p ' + self.SourceCodePath + '/scripts', '\$', 5)
-			mySSH.command('docker exec -d ' + self.containerPrefix + '-oai-hss /bin/bash -c "nohup tshark -i eth0 -i eth1 -w /tmp/hss_check_run.pcap 2>&1 > /dev/null"', '\$', 5)
-			time.sleep(5)
-			mySSH.command('docker exec -d ' + self.containerPrefix + '-oai-hss /bin/bash -c "nohup ./bin/oai_hss -j ./etc/hss_rel14.json --reloadkey true > hss_check_run.log 2>&1"', '\$', 5)
-		elif re.match('OAI-Rel14-CUPS', self.Type, re.IGNORECASE):
-			logging.debug('Using the OAI EPC Release 14 Cassandra-based HSS')
-			mySSH.command('cd ' + self.SourceCodePath + '/scripts', '\$', 5)
-			logging.debug('\u001B[1m Launching tshark on all interfaces \u001B[0m')
-			self.PcapFileName = 'epc_' + self.testCase_id + '.pcap'
-			mySSH.command('echo ' + self.Password + ' | sudo -S rm -f ' + self.PcapFileName, '\$', 5)
-			mySSH.command('echo $USER; nohup sudo tshark -f "tcp port not 22 and port not 53" -i any -w ' + self.SourceCodePath + '/scripts/' + self.PcapFileName + ' > /tmp/tshark.log 2>&1 &', self.UserName, 5)
-			mySSH.command('echo ' + self.Password + ' | sudo -S mkdir -p logs', '\$', 5)
-			mySSH.command('echo ' + self.Password + ' | sudo -S rm -f hss_' + self.testCase_id + '.log logs/hss*.*', '\$', 5)
-			mySSH.command('echo "oai_hss -j /usr/local/etc/oai/hss_rel14.json" > ./my-hss.sh', '\$', 5)
-			mySSH.command('chmod 755 ./my-hss.sh', '\$', 5)
-			mySSH.command('sudo daemon --unsafe --name=hss_daemon --chdir=' + self.SourceCodePath + '/scripts -o ' + self.SourceCodePath + '/scripts/hss_' + self.testCase_id + '.log ./my-hss.sh', '\$', 5)
-		elif re.match('OAI', self.Type, re.IGNORECASE):
-			logging.debug('Using the OAI EPC HSS')
-			mySSH.command('cd ' + self.SourceCodePath, '\$', 5)
-			mySSH.command('source oaienv', '\$', 5)
-			mySSH.command('cd scripts', '\$', 5)
-			mySSH.command('echo ' + self.Password + ' | sudo -S ./run_hss 2>&1 | stdbuf -o0 awk \'{ print strftime("[%Y/%m/%d %H:%M:%S] ",systime()) $0 }\' | stdbuf -o0 tee -a hss_' + self.testCase_id + '.log &', 'Core state: 2 -> 3', 35)
-		elif re.match('ltebox', self.Type, re.IGNORECASE):
-			logging.debug('Using the ltebox simulated HSS')
-			mySSH.command('if [ -d ' + self.SourceCodePath + '/scripts ]; then echo ' + self.Password + ' | sudo -S rm -Rf ' + self.SourceCodePath + '/scripts ; fi', '\$', 5)
-			mySSH.command('mkdir -p ' + self.SourceCodePath + '/scripts', '\$', 5)
-			mySSH.command('cd /opt/hss_sim0609', '\$', 5)
-			mySSH.command('echo ' + self.Password + ' | sudo -S rm -f hss.log', '\$', 5)
-			mySSH.command('echo ' + self.Password + ' | sudo -S echo "Starting sudo session" && sudo su -c "screen -dm -S simulated_hss ./starthss"', '\$', 5)
-		else:
-			logging.error('This option should not occur!')
-		mySSH.close()
-		if self.htmlObj is not None:
-			self.htmlObj.CreateHtmlTestRow(self.Type, 'OK', CONST.ALL_PROCESSES_OK)
-
-	def InitializeMME(self):
-		if self.IPAddress == '' or self.UserName == '' or self.Password == '' or self.SourceCodePath == '' or self.Type == '':
-			HELP.GenericHelp(CONST.Version)
-			HELP.EPCSrvHelp(self.IPAddress, self.UserName, self.Password, self.SourceCodePath, self.Type)
-			sys.exit('Insufficient EPC Parameters')
-		mySSH = SSH.SSHConnection() 
-		mySSH.open(self.IPAddress, self.UserName, self.Password)
-		if re.match('OAI-Rel14-Docker', self.Type, re.IGNORECASE):
-			logging.debug('Using the OAI EPC Release 14 MME in Docker')
-			mySSH.command('docker exec -d ' + self.containerPrefix + '-oai-mme /bin/bash -c "nohup tshark -i eth0 -i lo:s10 -w /tmp/mme_check_run.pcap 2>&1 > /dev/null"', '\$', 5)
-			time.sleep(5)
-			mySSH.command('docker exec -d ' + self.containerPrefix + '-oai-mme /bin/bash -c "nohup ./bin/oai_mme -c ./etc/' + self.mmeConfFile + ' > mme_check_run.log 2>&1"', '\$', 5)
-		elif re.match('OAI-Rel14-CUPS', self.Type, re.IGNORECASE):
-			logging.debug('Using the OAI EPC Release 14 MME')
-			mySSH.command('cd ' + self.SourceCodePath + '/scripts', '\$', 5)
-			mySSH.command('echo ' + self.Password + ' | sudo -S rm -f mme_' + self.testCase_id + '.log', '\$', 5)
-			mySSH.command('echo "./run_mme --config-file /usr/local/etc/oai/mme.conf --set-virt-if" > ./my-mme.sh', '\$', 5)
-			mySSH.command('chmod 755 ./my-mme.sh', '\$', 5)
-			mySSH.command('sudo daemon --unsafe --name=mme_daemon --chdir=' + self.SourceCodePath + '/scripts -o ' + self.SourceCodePath + '/scripts/mme_' + self.testCase_id + '.log ./my-mme.sh', '\$', 5)
-		elif re.match('OAI', self.Type, re.IGNORECASE):
-			mySSH.command('cd ' + self.SourceCodePath, '\$', 5)
-			mySSH.command('source oaienv', '\$', 5)
-			mySSH.command('cd scripts', '\$', 5)
-			mySSH.command('stdbuf -o0 hostname', '\$', 5)
-			result = re.search('hostname\\\\r\\\\n(?P<host_name>[a-zA-Z0-9\-\_]+)\\\\r\\\\n', mySSH.getBefore())
-			if result is None:
-				logging.debug('\u001B[1;37;41m Hostname Not Found! \u001B[0m')
-				sys.exit(1)
-			host_name = result.group('host_name')
-			mySSH.command('echo ' + self.Password + ' | sudo -S ./run_mme 2>&1 | stdbuf -o0 tee -a mme_' + self.testCase_id + '.log &', 'MME app initialization complete', 100)
-		elif re.match('ltebox', self.Type, re.IGNORECASE):
-			mySSH.command('cd /opt/ltebox/tools', '\$', 5)
-			mySSH.command('echo ' + self.Password + ' | sudo -S ./start_mme', '\$', 5)
-		else:
-			logging.error('This option should not occur!')
-		mySSH.close()
-		if self.htmlObj is not None:
-			self.htmlObj.CreateHtmlTestRow(self.Type, 'OK', CONST.ALL_PROCESSES_OK)
-
-	def SetMmeIPAddress(self):
-		# Not an error if we don't need an EPC
-		if self.IPAddress == '' or self.UserName == '' or self.Password == '' or self.SourceCodePath == '' or self.Type == '':
-			return
-		if self.IPAddress == 'none':
-			return
-		# Only in case of Docker containers, MME IP address is not the EPC HOST IP address
-		if re.match('OAI-Rel14-Docker', self.Type, re.IGNORECASE):
-			mySSH = SSH.SSHConnection() 
-			mySSH.open(self.IPAddress, self.UserName, self.Password)
-			mySSH.command('docker inspect --format="MME_IP_ADDR = {{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}" ' + self.containerPrefix + '-oai-mme', '\$', 5)
-			result = re.search('MME_IP_ADDR = (?P<mme_ip_addr>[0-9\.]+)', mySSH.getBefore())
-			if result is not None:
-				self.MmeIPAddress = result.group('mme_ip_addr')
-				logging.debug('MME IP Address is ' + self.MmeIPAddress)
-			mySSH.close()
-		else:
-			self.MmeIPAddress = self.IPAddress
-
-	def InitializeSPGW(self):
-		if self.IPAddress == '' or self.UserName == '' or self.Password == '' or self.SourceCodePath == '' or self.Type == '':
-			HELP.GenericHelp(CONST.Version)
-			HELP.EPCSrvHelp(self.IPAddress, self.UserName, self.Password, self.SourceCodePath, self.Type)
-			sys.exit('Insufficient EPC Parameters')
-		mySSH = SSH.SSHConnection() 
-		mySSH.open(self.IPAddress, self.UserName, self.Password)
-		if re.match('OAI-Rel14-Docker', self.Type, re.IGNORECASE):
-			logging.debug('Using the OAI EPC Release 14 SPGW-CUPS in Docker')
-			mySSH.command('docker exec -d ' + self.containerPrefix + '-oai-spgwc /bin/bash -c "nohup tshark -i eth0 -i lo:p5c -i lo:s5c -w /tmp/spgwc_check_run.pcap 2>&1 > /dev/null"', '\$', 5)
-			mySSH.command('docker exec -d ' + self.containerPrefix + '-oai-spgwu-tiny /bin/bash -c "nohup tshark -i eth0 -w /tmp/spgwu_check_run.pcap 2>&1 > /dev/null"', '\$', 5)
-			time.sleep(5)
-			mySSH.command('docker exec -d ' + self.containerPrefix + '-oai-spgwc /bin/bash -c "nohup ./bin/oai_spgwc -o -c ./etc/spgw_c.conf > spgwc_check_run.log 2>&1"', '\$', 5)
-			time.sleep(5)
-			mySSH.command('docker exec -d ' + self.containerPrefix + '-oai-spgwu-tiny /bin/bash -c "nohup ./bin/oai_spgwu -o -c ./etc/spgw_u.conf > spgwu_check_run.log 2>&1"', '\$', 5)
-		elif re.match('OAI-Rel14-CUPS', self.Type, re.IGNORECASE):
-			logging.debug('Using the OAI EPC Release 14 SPGW-CUPS')
-			mySSH.command('cd ' + self.SourceCodePath + '/scripts', '\$', 5)
-			mySSH.command('echo ' + self.Password + ' | sudo -S rm -f spgwc_' + self.testCase_id + '.log spgwu_' + self.testCase_id + '.log', '\$', 5)
-			mySSH.command('echo "spgwc -c /usr/local/etc/oai/spgw_c.conf" > ./my-spgwc.sh', '\$', 5)
-			mySSH.command('chmod 755 ./my-spgwc.sh', '\$', 5)
-			mySSH.command('sudo daemon --unsafe --name=spgwc_daemon --chdir=' + self.SourceCodePath + '/scripts -o ' + self.SourceCodePath + '/scripts/spgwc_' + self.testCase_id + '.log ./my-spgwc.sh', '\$', 5)
-			time.sleep(5)
-			mySSH.command('echo "spgwu -c /usr/local/etc/oai/spgw_u.conf" > ./my-spgwu.sh', '\$', 5)
-			mySSH.command('chmod 755 ./my-spgwu.sh', '\$', 5)
-			mySSH.command('sudo daemon --unsafe --name=spgwu_daemon --chdir=' + self.SourceCodePath + '/scripts -o ' + self.SourceCodePath + '/scripts/spgwu_' + self.testCase_id + '.log ./my-spgwu.sh', '\$', 5)
-		elif re.match('OAI', self.Type, re.IGNORECASE):
-			mySSH.command('cd ' + self.SourceCodePath, '\$', 5)
-			mySSH.command('source oaienv', '\$', 5)
-			mySSH.command('cd scripts', '\$', 5)
-			mySSH.command('echo ' + self.Password + ' | sudo -S ./run_spgw 2>&1 | stdbuf -o0 tee -a spgw_' + self.testCase_id + '.log &', 'Initializing SPGW-APP task interface: DONE', 30)
-		elif re.match('ltebox', self.Type, re.IGNORECASE):
-			mySSH.command('cd /opt/ltebox/tools', '\$', 5)
-			mySSH.command('echo ' + self.Password + ' | sudo -S ./start_xGw', '\$', 5)
-		else:
-			logging.error('This option should not occur!')
-		mySSH.close()
-		if self.htmlObj is not None:
-			self.htmlObj.CreateHtmlTestRow(self.Type, 'OK', CONST.ALL_PROCESSES_OK)
-
-	def CheckHSSProcess(self, status_queue):
-		try:
-			mySSH = SSH.SSHConnection() 
-			mySSH.open(self.IPAddress, self.UserName, self.Password)
-			if re.match('OAI-Rel14-Docker', self.Type, re.IGNORECASE):
-				mySSH.command('docker exec -it ' + self.containerPrefix + '-oai-hss /bin/bash -c "ps aux | grep oai_hss"', '\$', 5)
-			else:
-				mySSH.command('stdbuf -o0 ps -aux | grep --color=never hss | grep -v grep', '\$', 5)
-			if re.match('OAI-Rel14-CUPS', self.Type, re.IGNORECASE) or re.match('OAI-Rel14-Docker', self.Type, re.IGNORECASE):
-				result = re.search('oai_hss -j', mySSH.getBefore())
-			elif re.match('OAI', self.Type, re.IGNORECASE):
-				result = re.search('\/bin\/bash .\/run_', mySSH.getBefore())
-			elif re.match('ltebox', self.Type, re.IGNORECASE):
-				result = re.search('hss_sim s6as diam_hss', mySSH.getBefore())
-			else:
-				logging.error('This should not happen!')
-			if result is None:
-				logging.debug('\u001B[1;37;41m HSS Process Not Found! \u001B[0m')
-				status_queue.put(CONST.HSS_PROCESS_FAILED)
-			else:
-				status_queue.put(CONST.HSS_PROCESS_OK)
-			mySSH.close()
-		except:
-			os.kill(os.getppid(),signal.SIGUSR1)
-
-	def CheckMMEProcess(self, status_queue):
-		try:
-			mySSH = SSH.SSHConnection() 
-			mySSH.open(self.IPAddress, self.UserName, self.Password)
-			if re.match('OAI-Rel14-Docker', self.Type, re.IGNORECASE):
-				mySSH.command('docker exec -it ' + self.containerPrefix + '-oai-mme /bin/bash -c "ps aux | grep oai_mme"', '\$', 5)
-			else:
-				mySSH.command('stdbuf -o0 ps -aux | grep --color=never mme | grep -v grep', '\$', 5)
-			if re.match('OAI-Rel14-Docker', self.Type, re.IGNORECASE):
-				result = re.search('oai_mme -c ', mySSH.getBefore())
-			elif re.match('OAI-Rel14-CUPS', self.Type, re.IGNORECASE):
-				result = re.search('mme -c', mySSH.getBefore())
-			elif re.match('OAI', self.Type, re.IGNORECASE):
-				result = re.search('\/bin\/bash .\/run_', mySSH.getBefore())
-			elif re.match('ltebox', self.Type, re.IGNORECASE):
-				result = re.search('mme', mySSH.getBefore())
-			else:
-				logging.error('This should not happen!')
-			if result is None:
-				logging.debug('\u001B[1;37;41m MME Process Not Found! \u001B[0m')
-				status_queue.put(CONST.MME_PROCESS_FAILED)
-			else:
-				status_queue.put(CONST.MME_PROCESS_OK)
-			mySSH.close()
-		except:
-			os.kill(os.getppid(),signal.SIGUSR1)
-
-	def CheckSPGWProcess(self, status_queue):
-		try:
-			mySSH = SSH.SSHConnection() 
-			mySSH.open(self.IPAddress, self.UserName, self.Password)
-			if re.match('OAI-Rel14-Docker', self.Type, re.IGNORECASE):
-				mySSH.command('docker exec -it ' + self.containerPrefix + '-oai-spgwc /bin/bash -c "ps aux | grep oai_spgwc"', '\$', 5)
-				result = re.search('oai_spgwc -o -c ', mySSH.getBefore())
-				if result is not None:
-					mySSH.command('docker exec -it ' + self.containerPrefix + '-oai-spgwu-tiny /bin/bash -c "ps aux | grep oai_spgwu"', '\$', 5)
-					result = re.search('oai_spgwu -o -c ', mySSH.getBefore())
-			elif re.match('OAI-Rel14-CUPS', self.Type, re.IGNORECASE):
-				mySSH.command('stdbuf -o0 ps -aux | grep --color=never spgw | grep -v grep', '\$', 5)
-				result = re.search('spgwu -c ', mySSH.getBefore())
-			elif re.match('OAI', self.Type, re.IGNORECASE):
-				mySSH.command('stdbuf -o0 ps -aux | grep --color=never spgw | grep -v grep', '\$', 5)
-				result = re.search('\/bin\/bash .\/run_', mySSH.getBefore())
-			elif re.match('ltebox', self.Type, re.IGNORECASE):
-				mySSH.command('stdbuf -o0 ps -aux | grep --color=never xGw | grep -v grep', '\$', 5)
-				result = re.search('xGw', mySSH.getBefore())
-			else:
-				logging.error('This should not happen!')
-			if result is None:
-				logging.debug('\u001B[1;37;41m SPGW Process Not Found! \u001B[0m')
-				status_queue.put(CONST.SPGW_PROCESS_FAILED)
-			else:
-				status_queue.put(CONST.SPGW_PROCESS_OK)
-			mySSH.close()
-		except:
-			os.kill(os.getppid(),signal.SIGUSR1)
-
-	def TerminateHSS(self):
-		mySSH = SSH.SSHConnection() 
-		mySSH.open(self.IPAddress, self.UserName, self.Password)
-		if re.match('OAI-Rel14-Docker', self.Type, re.IGNORECASE):
-			mySSH.command('docker exec -it ' + self.containerPrefix + '-oai-hss /bin/bash -c "killall --signal SIGINT oai_hss tshark"', '\$', 5)
-			time.sleep(2)
-			mySSH.command('docker exec -it ' + self.containerPrefix + '-oai-hss /bin/bash -c "ps aux | grep oai_hss"', '\$', 5)
-			result = re.search('oai_hss -j ', mySSH.getBefore())
-			if result is not None:
-				mySSH.command('docker exec -it ' + self.containerPrefix + '-oai-hss /bin/bash -c "killall --signal SIGKILL oai_hss"', '\$', 5)
-		elif re.match('OAI-Rel14-CUPS', self.Type, re.IGNORECASE):
-			mySSH.command('echo ' + self.Password + ' | sudo -S killall --signal SIGINT oai_hss || true', '\$', 5)
-			time.sleep(2)
-			mySSH.command('stdbuf -o0  ps -aux | grep hss | grep -v grep', '\$', 5)
-			result = re.search('oai_hss -j', mySSH.getBefore())
-			if result is not None:
-				mySSH.command('echo ' + self.Password + ' | sudo -S killall --signal SIGKILL oai_hss || true', '\$', 5)
-			mySSH.command('rm -f ' + self.SourceCodePath + '/scripts/my-hss.sh', '\$', 5)
-		elif re.match('OAI', self.Type, re.IGNORECASE):
-			mySSH.command('echo ' + self.Password + ' | sudo -S killall --signal SIGINT run_hss oai_hss || true', '\$', 5)
-			time.sleep(2)
-			mySSH.command('stdbuf -o0  ps -aux | grep hss | grep -v grep', '\$', 5)
-			result = re.search('\/bin\/bash .\/run_', mySSH.getBefore())
-			if result is not None:
-				mySSH.command('echo ' + self.Password + ' | sudo -S killall --signal SIGKILL run_hss oai_hss || true', '\$', 5)
-		elif re.match('ltebox', self.Type, re.IGNORECASE):
-			mySSH.command('cd ' + self.SourceCodePath, '\$', 5)
-			mySSH.command('cd scripts', '\$', 5)
-			time.sleep(1)
-			mySSH.command('echo ' + self.Password + ' | sudo -S killall --signal SIGKILL hss_sim', '\$', 5)
-		else:
-			logging.error('This should not happen!')
-		mySSH.close()
-		if self.htmlObj is not None:
-			self.htmlObj.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
-
-	def TerminateMME(self):
-		mySSH = SSH.SSHConnection() 
-		mySSH.open(self.IPAddress, self.UserName, self.Password)
-		if re.match('OAI-Rel14-Docker', self.Type, re.IGNORECASE):
-			mySSH.command('docker exec -it ' + self.containerPrefix + '-oai-mme /bin/bash -c "killall --signal SIGINT oai_mme tshark"', '\$', 5)
-			time.sleep(2)
-			mySSH.command('docker exec -it ' + self.containerPrefix + '-oai-mme /bin/bash -c "ps aux | grep oai_mme"', '\$', 5)
-			result = re.search('oai_mme -c ', mySSH.getBefore())
-			if result is not None:
-				mySSH.command('docker exec -it ' + self.containerPrefix + '-oai-mme /bin/bash -c "killall --signal SIGKILL oai_mme"', '\$', 5)
-		elif re.match('OAI', self.Type, re.IGNORECASE) or re.match('OAI-Rel14-CUPS', self.Type, re.IGNORECASE):
-			mySSH.command('echo ' + self.Password + ' | sudo -S killall --signal SIGINT run_mme mme || true', '\$', 5)
-			time.sleep(2)
-			mySSH.command('stdbuf -o0 ps -aux | grep mme | grep -v grep', '\$', 5)
-			result = re.search('mme -c', mySSH.getBefore())
-			if result is not None:
-				mySSH.command('echo ' + self.Password + ' | sudo -S killall --signal SIGKILL run_mme mme || true', '\$', 5)
-			mySSH.command('rm -f ' + self.SourceCodePath + '/scripts/my-mme.sh', '\$', 5)
-		elif re.match('ltebox', self.Type, re.IGNORECASE):
-			mySSH.command('cd /opt/ltebox/tools', '\$', 5)
-			mySSH.command('echo ' + self.Password + ' | sudo -S ./stop_mme', '\$', 5)
-		else:
-			logging.error('This should not happen!')
-		mySSH.close()
-		if self.htmlObj is not None:
-			self.htmlObj.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
-
-	def TerminateSPGW(self):
-		mySSH = SSH.SSHConnection() 
-		mySSH.open(self.IPAddress, self.UserName, self.Password)
-		if re.match('OAI-Rel14-Docker', self.Type, re.IGNORECASE):
-			mySSH.command('docker exec -it ' + self.containerPrefix + '-oai-spgwc /bin/bash -c "killall --signal SIGINT oai_spgwc tshark"', '\$', 5)
-			mySSH.command('docker exec -it ' + self.containerPrefix + '-oai-spgwu-tiny /bin/bash -c "killall --signal SIGINT oai_spgwu tshark"', '\$', 5)
-			time.sleep(2)
-			mySSH.command('docker exec -it ' + self.containerPrefix + '-oai-spgwc /bin/bash -c "ps aux | grep oai_spgwc"', '\$', 5)
-			result = re.search('oai_spgwc -o -c ', mySSH.getBefore())
-			if result is not None:
-				mySSH.command('docker exec -it ' + self.containerPrefix + '-oai-spgwc /bin/bash -c "killall --signal SIGKILL oai_spgwc"', '\$', 5)
-			mySSH.command('docker exec -it ' + self.containerPrefix + '-oai-spgwu-tiny /bin/bash -c "ps aux | grep oai_spgwu"', '\$', 5)
-			result = re.search('oai_spgwu -o -c ', mySSH.getBefore())
-			if result is not None:
-				mySSH.command('docker exec -it ' + self.containerPrefix + '-oai-spgwu-tiny /bin/bash -c "killall --signal SIGKILL oai_spgwu"', '\$', 5)
-		elif re.match('OAI-Rel14-CUPS', self.Type, re.IGNORECASE):
-			mySSH.command('echo ' + self.Password + ' | sudo -S killall --signal SIGINT spgwc spgwu || true', '\$', 5)
-			time.sleep(2)
-			mySSH.command('stdbuf -o0 ps -aux | grep spgw | grep -v grep', '\$', 5)
-			result = re.search('spgwc -c |spgwu -c ', mySSH.getBefore())
-			if result is not None:
-				mySSH.command('echo ' + self.Password + ' | sudo -S killall --signal SIGKILL spgwc spgwu || true', '\$', 5)
-			mySSH.command('rm -f ' + self.SourceCodePath + '/scripts/my-spgw*.sh', '\$', 5)
-			mySSH.command('stdbuf -o0 ps -aux | grep tshark | grep -v grep', '\$', 5)
-			result = re.search('-w ', mySSH.getBefore())
-			if result is not None:
-				mySSH.command('echo ' + self.Password + ' | sudo -S killall --signal SIGINT tshark || true', '\$', 5)
-				mySSH.command('echo ' + self.Password + ' | sudo -S chmod 666 ' + self.SourceCodePath + '/scripts/*.pcap', '\$', 5)
-		elif re.match('OAI', self.Type, re.IGNORECASE):
-			mySSH.command('echo ' + self.Password + ' | sudo -S killall --signal SIGINT run_spgw spgw || true', '\$', 5)
-			time.sleep(2)
-			mySSH.command('stdbuf -o0 ps -aux | grep spgw | grep -v grep', '\$', 5)
-			result = re.search('\/bin\/bash .\/run_', mySSH.getBefore())
-			if result is not None:
-				mySSH.command('echo ' + self.Password + ' | sudo -S killall --signal SIGKILL run_spgw spgw || true', '\$', 5)
-		elif re.match('ltebox', self.Type, re.IGNORECASE):
-			mySSH.command('cd /opt/ltebox/tools', '\$', 5)
-			mySSH.command('echo ' + self.Password + ' | sudo -S ./stop_xGw', '\$', 5)
-		else:
-			logging.error('This should not happen!')
-		mySSH.close()
-		if self.htmlObj is not None:
-			self.htmlObj.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
-
-	def LogCollectHSS(self):
-		mySSH = SSH.SSHConnection() 
-		mySSH.open(self.IPAddress, self.UserName, self.Password)
-		mySSH.command('cd ' + self.SourceCodePath + '/scripts', '\$', 5)
-		mySSH.command('rm -f hss.log.zip', '\$', 5)
-		if re.match('OAI-Rel14-Docker', self.Type, re.IGNORECASE):
-			mySSH.command('docker cp ' + self.containerPrefix + '-oai-hss:/openair-hss/hss_check_run.log .', '\$', 60)
-			mySSH.command('docker cp ' + self.containerPrefix + '-oai-hss:/tmp/hss_check_run.pcap .', '\$', 60)
-			mySSH.command('zip hss.log.zip hss_check_run.*', '\$', 60)
-		elif re.match('OAI', self.Type, re.IGNORECASE) or re.match('OAI-Rel14-CUPS', self.Type, re.IGNORECASE):
-			mySSH.command('zip hss.log.zip hss*.log', '\$', 60)
-			mySSH.command('echo ' + self.Password + ' | sudo -S rm hss*.log', '\$', 5)
-			if re.match('OAI-Rel14-CUPS', self.Type, re.IGNORECASE):
-				mySSH.command('zip hss.log.zip logs/hss*.* *.pcap', '\$', 60)
-				mySSH.command('echo ' + self.Password + ' | sudo -S rm -f logs/hss*.* *.pcap', '\$', 5)
-		elif re.match('ltebox', self.Type, re.IGNORECASE):
-			mySSH.command('cp /opt/hss_sim0609/hss.log .', '\$', 60)
-			mySSH.command('zip hss.log.zip hss.log', '\$', 60)
-		else:
-			logging.error('This option should not occur!')
-		mySSH.close()
-
-	def LogCollectMME(self):
-		mySSH = SSH.SSHConnection() 
-		mySSH.open(self.IPAddress, self.UserName, self.Password)
-		mySSH.command('cd ' + self.SourceCodePath + '/scripts', '\$', 5)
-		mySSH.command('rm -f mme.log.zip', '\$', 5)
-		if re.match('OAI-Rel14-Docker', self.Type, re.IGNORECASE):
-			mySSH.command('docker cp ' + self.containerPrefix + '-oai-mme:/openair-mme/mme_check_run.log .', '\$', 60)
-			mySSH.command('docker cp ' + self.containerPrefix + '-oai-mme:/tmp/mme_check_run.pcap .', '\$', 60)
-			mySSH.command('zip mme.log.zip mme_check_run.*', '\$', 60)
-		elif re.match('OAI', self.Type, re.IGNORECASE) or re.match('OAI-Rel14-CUPS', self.Type, re.IGNORECASE):
-			mySSH.command('zip mme.log.zip mme*.log', '\$', 60)
-			mySSH.command('echo ' + self.Password + ' | sudo -S rm mme*.log', '\$', 5)
-		elif re.match('ltebox', self.Type, re.IGNORECASE):
-			mySSH.command('cp /opt/ltebox/var/log/*Log.0 .', '\$', 5)
-			mySSH.command('zip mme.log.zip mmeLog.0 s1apcLog.0 s1apsLog.0 s11cLog.0 libLog.0 s1apCodecLog.0', '\$', 60)
-		else:
-			logging.error('This option should not occur!')
-		mySSH.close()
-
-	def LogCollectSPGW(self):
-		mySSH = SSH.SSHConnection() 
-		mySSH.open(self.IPAddress, self.UserName, self.Password)
-		mySSH.command('cd ' + self.SourceCodePath + '/scripts', '\$', 5)
-		mySSH.command('rm -f spgw.log.zip', '\$', 5)
-		if re.match('OAI-Rel14-Docker', self.Type, re.IGNORECASE):
-			mySSH.command('docker cp ' + self.containerPrefix + '-oai-spgwc:/openair-spgwc/spgwc_check_run.log .', '\$', 60)
-			mySSH.command('docker cp ' + self.containerPrefix + '-oai-spgwu-tiny:/openair-spgwu-tiny/spgwu_check_run.log .', '\$', 60)
-			mySSH.command('docker cp ' + self.containerPrefix + '-oai-spgwc:/tmp/spgwc_check_run.pcap .', '\$', 60)
-			mySSH.command('docker cp ' + self.containerPrefix + '-oai-spgwu-tiny:/tmp/spgwu_check_run.pcap .', '\$', 60)
-			mySSH.command('zip spgw.log.zip spgw*_check_run.*', '\$', 60)
-		elif re.match('OAI', self.Type, re.IGNORECASE) or re.match('OAI-Rel14-CUPS', self.Type, re.IGNORECASE):
-			mySSH.command('zip spgw.log.zip spgw*.log', '\$', 60)
-			mySSH.command('echo ' + self.Password + ' | sudo -S rm spgw*.log', '\$', 5)
-		elif re.match('ltebox', self.Type, re.IGNORECASE):
-			mySSH.command('cp /opt/ltebox/var/log/xGwLog.0 .', '\$', 5)
-			mySSH.command('zip spgw.log.zip xGwLog.0', '\$', 60)
-		else:
-			logging.error('This option should not occur!')
-		mySSH.close()
-

ci-scripts/helpreadme.py

@@ -1,81 +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
-# */
-#---------------------------------------------------------------------
-# 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/html.py

@@ -1,434 +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
-# */
-#---------------------------------------------------------------------
-# Python for CI of OAI-eNB + COTS-UE
-#
-#   Required Python Version
-#     Python 3.x
-#
-#   Required Python Package
-#     pexpect
-#---------------------------------------------------------------------
-
-#-----------------------------------------------------------
-# Import
-#-----------------------------------------------------------
-import sys              # arg
-import re               # reg
-import logging
-import os
-import time
-import subprocess
-from multiprocessing import Process, Lock, SimpleQueue
-
-import constants as CONST
-
-#-----------------------------------------------------------
-# Class Declaration
-#-----------------------------------------------------------
-class HTMLManagement():
-
-	def __init__(self):
-	
-		self.htmlFile = ''
-		self.htmlHeaderCreated = False
-		self.htmlFooterCreated = False
-
-		self.ranRepository = ''
-		self.ranBranch = ''
-		self.ranCommitID = ''
-		self.ranAllowMerge = False
-		self.ranTargetBranch = ''
-
-		self.nbTestXMLfiles = 0
-		self.htmlTabRefs = []
-		self.htmlTabNames = []
-		self.htmlTabIcons = []
-		self.testXMLfiles = []
-
-		self.testUnstable = False
-		self.testMinStableId = '999999'
-		self.testStabilityPointReached = False
-
-		self.htmleNBFailureMsg = ''
-		self.htmlUEFailureMsg = ''
-
-		self.startTime = int(round(time.time() * 1000))
-		self.testCase_id = ''
-		self.desc = ''
-
-		self.OsVersion = ['', '']
-		self.KernelVersion = ['', '']
-		self.UhdVersion = ['', '']
-		self.UsrpBoard = ['', '']
-		self.CpuNb = ['', '']
-		self.CpuModel = ['', '']
-		self.CpuMHz = ['', '']
-
-#-----------------------------------------------------------
-# Setters and Getters
-#-----------------------------------------------------------
-	
-	def SethtmlUEConnected(self, nbUEs):
-		if nbUEs > 0:
-			self.htmlUEConnected = nbUEs
-		else:
-			self.htmlUEConnected = 1
-	
-
-
-#-----------------------------------------------------------
-# HTML structure creation functions
-#-----------------------------------------------------------
-
-
-	def CreateHtmlHeader(self, ADBIPAddress):
-		if (not self.htmlHeaderCreated):
-			logging.debug('\u001B[1m----------------------------------------\u001B[0m')
-			logging.debug('\u001B[1m  Creating HTML header \u001B[0m')
-			logging.debug('\u001B[1m----------------------------------------\u001B[0m')
-			self.htmlFile = open('test_results.html', 'w')
-			self.htmlFile.write('<!DOCTYPE html>\n')
-			self.htmlFile.write('<html class="no-js" lang="en-US">\n')
-			self.htmlFile.write('<head>\n')
-			self.htmlFile.write('  <meta name="viewport" content="width=device-width, initial-scale=1">\n')
-			self.htmlFile.write('  <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">\n')
-			self.htmlFile.write('  <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>\n')
-			self.htmlFile.write('  <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>\n')
-			self.htmlFile.write('  <title>Test Results for TEMPLATE_JOB_NAME job build #TEMPLATE_BUILD_ID</title>\n')
-			self.htmlFile.write('</head>\n')
-			self.htmlFile.write('<body><div class="container">\n')
-			self.htmlFile.write('  <br>\n')
-			self.htmlFile.write('  <table style="border-collapse: collapse; border: none;">\n')
-			self.htmlFile.write('    <tr style="border-collapse: collapse; border: none;">\n')
-			self.htmlFile.write('      <td style="border-collapse: collapse; border: none;">\n')
-			self.htmlFile.write('        <a href="http://www.openairinterface.org/">\n')
-			self.htmlFile.write('           <img src="http://www.openairinterface.org/wp-content/uploads/2016/03/cropped-oai_final_logo2.png" alt="" border="none" height=50 width=150>\n')
-			self.htmlFile.write('           </img>\n')
-			self.htmlFile.write('        </a>\n')
-			self.htmlFile.write('      </td>\n')
-			self.htmlFile.write('      <td style="border-collapse: collapse; border: none; vertical-align: center;">\n')
-			self.htmlFile.write('        <b><font size = "6">Job Summary -- Job: TEMPLATE_JOB_NAME -- Build-ID: TEMPLATE_BUILD_ID</font></b>\n')
-			self.htmlFile.write('      </td>\n')
-			self.htmlFile.write('    </tr>\n')
-			self.htmlFile.write('  </table>\n')
-			self.htmlFile.write('  <br>\n')
-			self.htmlFile.write('  <div class="alert alert-info"><strong> <span class="glyphicon glyphicon-dashboard"></span> TEMPLATE_STAGE_NAME</strong></div>\n')
-			self.htmlFile.write('  <table border = "1">\n')
-			self.htmlFile.write('     <tr>\n')
-			self.htmlFile.write('       <td bgcolor = "lightcyan" > <span class="glyphicon glyphicon-time"></span> Build Start Time (UTC) </td>\n')
-			self.htmlFile.write('       <td>TEMPLATE_BUILD_TIME</td>\n')
-			self.htmlFile.write('     </tr>\n')
-			self.htmlFile.write('     <tr>\n')
-			self.htmlFile.write('       <td bgcolor = "lightcyan" > <span class="glyphicon glyphicon-cloud-upload"></span> GIT Repository </td>\n')
-			self.htmlFile.write('       <td><a href="' + self.ranRepository + '">' + self.ranRepository + '</a></td>\n')
-			self.htmlFile.write('     </tr>\n')
-			self.htmlFile.write('     <tr>\n')
-			self.htmlFile.write('       <td bgcolor = "lightcyan" > <span class="glyphicon glyphicon-wrench"></span> Job Trigger </td>\n')
-			if (self.ranAllowMerge):
-				self.htmlFile.write('       <td>Merge-Request</td>\n')
-			else:
-				self.htmlFile.write('       <td>Push to Branch</td>\n')
-			self.htmlFile.write('     </tr>\n')
-			self.htmlFile.write('     <tr>\n')
-			if (self.ranAllowMerge):
-				self.htmlFile.write('       <td bgcolor = "lightcyan" > <span class="glyphicon glyphicon-log-out"></span> Source Branch </td>\n')
-			else:
-				self.htmlFile.write('       <td bgcolor = "lightcyan" > <span class="glyphicon glyphicon-tree-deciduous"></span> Branch</td>\n')
-			self.htmlFile.write('       <td>' + self.ranBranch + '</td>\n')
-			self.htmlFile.write('     </tr>\n')
-			self.htmlFile.write('     <tr>\n')
-			if (self.ranAllowMerge):
-				self.htmlFile.write('       <td bgcolor = "lightcyan" > <span class="glyphicon glyphicon-tag"></span> Source Commit ID </td>\n')
-			else:
-				self.htmlFile.write('       <td bgcolor = "lightcyan" > <span class="glyphicon glyphicon-tag"></span> Commit ID </td>\n')
-			self.htmlFile.write('       <td>' + self.ranCommitID + '</td>\n')
-			self.htmlFile.write('     </tr>\n')
-			if self.ranAllowMerge != '':
-				commit_message = subprocess.check_output("git log -n1 --pretty=format:\"%s\" " + self.ranCommitID, shell=True, universal_newlines=True)
-				commit_message = commit_message.strip()
-				self.htmlFile.write('     <tr>\n')
-				if (self.ranAllowMerge):
-					self.htmlFile.write('       <td bgcolor = "lightcyan" > <span class="glyphicon glyphicon-comment"></span> Source Commit Message </td>\n')
-				else:
-					self.htmlFile.write('       <td bgcolor = "lightcyan" > <span class="glyphicon glyphicon-comment"></span> Commit Message </td>\n')
-				self.htmlFile.write('       <td>' + commit_message + '</td>\n')
-				self.htmlFile.write('     </tr>\n')
-			if (self.ranAllowMerge):
-				self.htmlFile.write('     <tr>\n')
-				self.htmlFile.write('       <td bgcolor = "lightcyan" > <span class="glyphicon glyphicon-log-in"></span> Target Branch </td>\n')
-				if (self.ranTargetBranch == ''):
-					self.htmlFile.write('       <td>develop</td>\n')
-				else:
-					self.htmlFile.write('       <td>' + self.ranTargetBranch + '</td>\n')
-				self.htmlFile.write('     </tr>\n')
-			self.htmlFile.write('  </table>\n')
-
-			if (ADBIPAddress != 'none'):
-				self.htmlFile.write('  <h2><span class="glyphicon glyphicon-phone"></span> <span class="glyphicon glyphicon-menu-right"></span> ' + str(self.htmlNb_Smartphones) + ' UE(s) is(are) connected to ADB bench server</h2>\n')
-				self.htmlFile.write('  <h2><span class="glyphicon glyphicon-phone"></span> <span class="glyphicon glyphicon-menu-right"></span> ' + str(self.htmlNb_CATM_Modules) + ' CAT-M UE(s) is(are) connected to bench server</h2>\n')
-			else:
-				self.htmlUEConnected = 1
-				self.htmlFile.write('  <h2><span class="glyphicon glyphicon-phone"></span> <span class="glyphicon glyphicon-menu-right"></span> 1 OAI UE(s) is(are) connected to CI bench</h2>\n')
-			self.htmlFile.write('  <br>\n')
-			self.htmlFile.write('  <ul class="nav nav-pills">\n')
-			count = 0
-			while (count < self.nbTestXMLfiles):
-				pillMsg = '    <li><a data-toggle="pill" href="#'
-				pillMsg += self.htmlTabRefs[count]
-				pillMsg += '">'
-				pillMsg += '__STATE_' + self.htmlTabNames[count] + '__'
-				pillMsg += self.htmlTabNames[count]
-				pillMsg += ' <span class="glyphicon glyphicon-'
-				pillMsg += self.htmlTabIcons[count]
-				pillMsg += '"></span></a></li>\n'
-				self.htmlFile.write(pillMsg)
-				count += 1
-			self.htmlFile.write('  </ul>\n')
-			self.htmlFile.write('  <div class="tab-content">\n')
-			self.htmlFile.close()
-
-	def CreateHtmlTabHeader(self):
-		if (not self.htmlHeaderCreated):
-			if (not os.path.isfile('test_results.html')):
-				self.CreateHtmlHeader('none')
-			self.htmlFile = open('test_results.html', 'a')
-			if (self.nbTestXMLfiles == 1):
-				self.htmlFile.write('  <div id="' + self.htmlTabRefs[0] + '" class="tab-pane fade">\n')
-				self.htmlFile.write('  <h3>Test Summary for <span class="glyphicon glyphicon-file"></span> ' + self.testXMLfiles[0] + '</h3>\n')
-			else:
-				self.htmlFile.write('  <div id="build-tab" class="tab-pane fade">\n')
-			self.htmlFile.write('  <table class="table" border = "1">\n')
-			self.htmlFile.write('      <tr bgcolor = "#33CCFF" >\n')
-			self.htmlFile.write('        <th>Relative Time (ms)</th>\n')
-			self.htmlFile.write('        <th>Test Id</th>\n')
-			self.htmlFile.write('        <th>Test Desc</th>\n')
-			self.htmlFile.write('        <th>Test Options</th>\n')
-			self.htmlFile.write('        <th>Test Status</th>\n')
-
-			i = 0
-			while (i < self.htmlUEConnected):
-				self.htmlFile.write('        <th>UE' + str(i) + ' Status</th>\n')
-				i += 1
-			self.htmlFile.write('      </tr>\n')
-			self.htmlFile.close()
-		self.htmlHeaderCreated = True
-
-	def CreateHtmlTabFooter(self, passStatus):
-		if ((not self.htmlFooterCreated) and (self.htmlHeaderCreated)):
-			testOkEvenIfUnstable = False
-			if self.testUnstable and not passStatus:
-				if self.testStabilityPointReached or self.testMinStableId == '999999':
-					testOkEvenIfUnstable = True
-			self.htmlFile = open('test_results.html', 'a')
-			self.htmlFile.write('      <tr>\n')
-			self.htmlFile.write('        <th bgcolor = "#33CCFF" colspan=3>Final Tab Status</th>\n')
-			if passStatus:
-				self.htmlFile.write('        <th bgcolor = "green" colspan=' + str(2 + self.htmlUEConnected) + '><font color="white">PASS <span class="glyphicon glyphicon-ok"></span> </font></th>\n')
-			else:
-				if testOkEvenIfUnstable:
-					self.htmlFile.write('        <th bgcolor = "orange" colspan=' + str(2 + self.htmlUEConnected) + '><font color="white">KNOWN UNSTABLE SCENARIO <span class="glyphicon glyphicon-exclamation-sign"></span> </font></th>\n')
-				else:
-					self.htmlFile.write('        <th bgcolor = "red" colspan=' + str(2 + self.htmlUEConnected) + '><font color="white">FAIL <span class="glyphicon glyphicon-remove"></span> </font></th>\n')
-			self.htmlFile.write('      </tr>\n')
-			self.htmlFile.write('  </table>\n')
-			self.htmlFile.write('  </div>\n')
-			self.htmlFile.close()
-			time.sleep(1)
-			if passStatus:
-				cmd = "sed -i -e 's/__STATE_" + self.htmlTabNames[0] + "__//' test_results.html"
-				subprocess.run(cmd, shell=True)
-			else:
-				if testOkEvenIfUnstable:
-					cmd = "sed -i -e 's/__STATE_" + self.htmlTabNames[0] + "__/<span class=\"glyphicon glyphicon-exclamation-sign\"><\/span>/' test_results.html"
-				else:
-					cmd = "sed -i -e 's/__STATE_" + self.htmlTabNames[0] + "__/<span class=\"glyphicon glyphicon-remove\"><\/span>/' test_results.html"
-				subprocess.run(cmd, shell=True)
-		self.htmlFooterCreated = False
-
-	def CreateHtmlFooter(self, passStatus):
-		if (os.path.isfile('test_results.html')):
-			self.htmlFile = open('test_results.html', 'a')
-			self.htmlFile.write('</div>\n')
-			self.htmlFile.write('  <p></p>\n')
-			self.htmlFile.write('  <table class="table table-condensed">\n')
-
-			machines = [ 'eNB', 'UE' ]
-			for machine in machines:
-				if machine == 'eNB':
-					idx = 0
-				else:
-					idx = 1
-				if self.OsVersion[idx] == '':
-					continue
-
-				self.htmlFile.write('      <tr>\n')
-				self.htmlFile.write('        <th colspan=8>' + str(machine) + ' Server Characteristics</th>\n')
-				self.htmlFile.write('      </tr>\n')
-				self.htmlFile.write('      <tr>\n')
-				self.htmlFile.write('        <td>OS Version</td>\n')
-				self.htmlFile.write('        <td><span class="label label-default">' + self.OsVersion[idx] + '</span></td>\n')
-				self.htmlFile.write('        <td>Kernel Version</td>\n')
-				self.htmlFile.write('        <td><span class="label label-default">' + self.KernelVersion[idx] + '</span></td>\n')
-				self.htmlFile.write('        <td>UHD Version</td>\n')
-				self.htmlFile.write('        <td><span class="label label-default">' + self.UhdVersion[idx] + '</span></td>\n')
-				self.htmlFile.write('        <td>USRP Board</td>\n')
-				self.htmlFile.write('        <td><span class="label label-default">' + self.UsrpBoard[idx] + '</span></td>\n')
-				self.htmlFile.write('      </tr>\n')
-				self.htmlFile.write('      <tr>\n')
-				self.htmlFile.write('        <td>Nb CPUs</td>\n')
-				self.htmlFile.write('        <td><span class="label label-default">' + self.CpuNb[idx] + '</span></td>\n')
-				self.htmlFile.write('        <td>CPU Model Name</td>\n')
-				self.htmlFile.write('        <td><span class="label label-default">' + self.CpuModel[idx] + '</span></td>\n')
-				self.htmlFile.write('        <td>CPU Frequency</td>\n')
-				self.htmlFile.write('        <td><span class="label label-default">' + self.CpuMHz[idx] + '</span></td>\n')
-				self.htmlFile.write('        <td></td>\n')
-				self.htmlFile.write('        <td></td>\n')
-				self.htmlFile.write('      </tr>\n')
-
-			self.htmlFile.write('      <tr>\n')
-			self.htmlFile.write('        <th colspan=5 bgcolor = "#33CCFF">Final Status</th>\n')
-			if passStatus:
-				self.htmlFile.write('        <th colspan=3 bgcolor="green"><font color="white">PASS <span class="glyphicon glyphicon-ok"></span></font></th>\n')
-			else:
-				self.htmlFile.write('        <th colspan=3 bgcolor="red"><font color="white">FAIL <span class="glyphicon glyphicon-remove"></span> </font></th>\n')
-			self.htmlFile.write('      </tr>\n')
-			self.htmlFile.write('  </table>\n')
-			self.htmlFile.write('  <p></p>\n')
-			self.htmlFile.write('  <div class="well well-lg">End of Test Report -- Copyright <span class="glyphicon glyphicon-copyright-mark"></span> 2018 <a href="http://www.openairinterface.org/">OpenAirInterface</a>. All Rights Reserved.</div>\n')
-			self.htmlFile.write('</div></body>\n')
-			self.htmlFile.write('</html>\n')
-			self.htmlFile.close()
-
-	def CreateHtmlRetrySeparator(self, cntnumfails):
-		if ((not self.htmlFooterCreated) and (self.htmlHeaderCreated)):
-			self.htmlFile = open('test_results.html', 'a')
-			self.htmlFile.write('      <tr bgcolor = "#F0F0F0" >\n')
-			self.htmlFile.write('        <td colspan=' + str(5+self.htmlUEConnected) + '><b> ---- Try Run #' + str(cntnumfails) + ' ---- </b></td>\n')
-			self.htmlFile.write('      </tr>\n')
-			self.htmlFile.close()
-
-	def CreateHtmlTestRow(self, options, status, processesStatus, machine='eNB'):
-		if (self.htmlFooterCreated or (not self.htmlHeaderCreated)):
-			return
-		self.htmlFile = open('test_results.html', 'a')
-		currentTime = int(round(time.time() * 1000)) - self.startTime
-		self.htmlFile.write('      <tr>\n')
-		self.htmlFile.write('        <td bgcolor = "lightcyan" >' + format(currentTime / 1000, '.1f') + '</td>\n')
-		self.htmlFile.write('        <td bgcolor = "lightcyan" >' + self.testCase_id  + '</td>\n')
-		self.htmlFile.write('        <td>' + self.desc  + '</td>\n')
-		self.htmlFile.write('        <td>' + str(options)  + '</td>\n')
-		if (str(status) == 'OK'):
-			self.htmlFile.write('        <td bgcolor = "lightgreen" >' + str(status)  + '</td>\n')
-		elif (str(status) == 'KO'):
-			if (processesStatus == 0):
-				self.htmlFile.write('        <td bgcolor = "lightcoral" >' + str(status)  + '</td>\n')
-			elif (processesStatus == CONST.ENB_PROCESS_FAILED):
-				self.htmlFile.write('        <td bgcolor = "lightcoral" >KO - eNB process not found</td>\n')
-			elif (processesStatus == CONST.OAI_UE_PROCESS_FAILED):
-				self.htmlFile.write('        <td bgcolor = "lightcoral" >KO - OAI UE process not found</td>\n')
-			elif (processesStatus == CONST.ENB_PROCESS_SEG_FAULT) or (processesStatus == CONST.OAI_UE_PROCESS_SEG_FAULT):
-				self.htmlFile.write('        <td bgcolor = "lightcoral" >KO - ' + machine + ' process ended in Segmentation Fault</td>\n')
-			elif (processesStatus == CONST.ENB_PROCESS_ASSERTION) or (processesStatus == CONST.OAI_UE_PROCESS_ASSERTION):
-				self.htmlFile.write('        <td bgcolor = "lightcoral" >KO - ' + machine + ' process ended in Assertion</td>\n')
-			elif (processesStatus == CONST.ENB_PROCESS_REALTIME_ISSUE):
-				self.htmlFile.write('        <td bgcolor = "lightcoral" >KO - ' + machine + ' process faced Real Time issue(s)</td>\n')
-			elif (processesStatus == CONST.ENB_PROCESS_NOLOGFILE_TO_ANALYZE) or (processesStatus == CONST.OAI_UE_PROCESS_NOLOGFILE_TO_ANALYZE):
-				self.htmlFile.write('        <td bgcolor = "orange" >OK?</td>\n')
-			elif (processesStatus == CONST.ENB_PROCESS_SLAVE_RRU_NOT_SYNCED):
-				self.htmlFile.write('        <td bgcolor = "lightcoral" >KO - ' + machine + ' Slave RRU could not synch</td>\n')
-			elif (processesStatus == CONST.OAI_UE_PROCESS_COULD_NOT_SYNC):
-				self.htmlFile.write('        <td bgcolor = "lightcoral" >KO - UE could not sync</td>\n')
-			elif (processesStatus == CONST.HSS_PROCESS_FAILED):
-				self.htmlFile.write('        <td bgcolor = "lightcoral" >KO - HSS process not found</td>\n')
-			elif (processesStatus == CONST.MME_PROCESS_FAILED):
-				self.htmlFile.write('        <td bgcolor = "lightcoral" >KO - MME process not found</td>\n')
-			elif (processesStatus == CONST.SPGW_PROCESS_FAILED):
-				self.htmlFile.write('        <td bgcolor = "lightcoral" >KO - SPGW process not found</td>\n')
-			elif (processesStatus == CONST.UE_IP_ADDRESS_ISSUE):
-				self.htmlFile.write('        <td bgcolor = "lightcoral" >KO - Could not retrieve UE IP address</td>\n')
-			else:
-				self.htmlFile.write('        <td bgcolor = "lightcoral" >' + str(status)  + '</td>\n')
-		else:
-			self.htmlFile.write('        <td bgcolor = "orange" >' + str(status)  + '</td>\n')
-		if (len(str(self.htmleNBFailureMsg)) > 2):
-			cellBgColor = 'white'
-			result = re.search('ended with|faced real time issues', self.htmleNBFailureMsg)
-			if result is not None:
-				cellBgColor = 'red'
-			else:
-				result = re.search('showed|Reestablishment|Could not copy eNB logfile', self.htmleNBFailureMsg)
-				if result is not None:
-					cellBgColor = 'orange'
-			self.htmlFile.write('        <td bgcolor = "' + cellBgColor + '" colspan=' + str(self.htmlUEConnected) + '><pre style="background-color:' + cellBgColor + '">' + self.htmleNBFailureMsg + '</pre></td>\n')
-			self.htmleNBFailureMsg = ''
-		elif (len(str(self.htmlUEFailureMsg)) > 2):
-			cellBgColor = 'white'
-			result = re.search('ended with|faced real time issues', self.htmlUEFailureMsg)
-			if result is not None:
-				cellBgColor = 'red'
-			else:
-				result = re.search('showed|Could not copy UE logfile|oaitun_ue1 interface is either NOT mounted or NOT configured', self.htmlUEFailureMsg)
-				if result is not None:
-					cellBgColor = 'orange'
-			self.htmlFile.write('        <td bgcolor = "' + cellBgColor + '" colspan=' + str(self.htmlUEConnected) + '><pre style="background-color:' + cellBgColor + '">' + self.htmlUEFailureMsg + '</pre></td>\n')
-			self.htmlUEFailureMsg = ''
-		else:
-			i = 0
-			while (i < self.htmlUEConnected):
-				self.htmlFile.write('        <td>-</td>\n')
-				i += 1
-		self.htmlFile.write('      </tr>\n')
-		self.htmlFile.close()
-
-	def CreateHtmlTestRowQueue(self, options, status, ue_status, ue_queue):
-		if ((not self.htmlFooterCreated) and (self.htmlHeaderCreated)):
-			self.htmlFile = open('test_results.html', 'a')
-			currentTime = int(round(time.time() * 1000)) - self.startTime
-			addOrangeBK = False
-			self.htmlFile.write('      <tr>\n')
-			self.htmlFile.write('        <td bgcolor = "lightcyan" >' + format(currentTime / 1000, '.1f') + '</td>\n')
-			self.htmlFile.write('        <td bgcolor = "lightcyan" >' + self.testCase_id  + '</td>\n')
-			self.htmlFile.write('        <td>' + self.desc  + '</td>\n')
-			self.htmlFile.write('        <td>' + str(options)  + '</td>\n')
-			if (str(status) == 'OK'):
-				self.htmlFile.write('        <td bgcolor = "lightgreen" >' + str(status)  + '</td>\n')
-			elif (str(status) == 'KO'):
-				self.htmlFile.write('        <td bgcolor = "lightcoral" >' + str(status)  + '</td>\n')
-			else:
-				addOrangeBK = True
-				self.htmlFile.write('        <td bgcolor = "orange" >' + str(status)  + '</td>\n')
-			i = 0
-			while (i < self.htmlUEConnected):
-				if (i < ue_status):
-					if (not ue_queue.empty()):
-						if (addOrangeBK):
-							self.htmlFile.write('        <td bgcolor = "orange" >' + str(ue_queue.get()).replace('white', 'orange') + '</td>\n')
-						else:
-							self.htmlFile.write('        <td>' + str(ue_queue.get()) + '</td>\n')
-					else:
-						self.htmlFile.write('        <td>-</td>\n')
-				else:
-					self.htmlFile.write('        <td>-</td>\n')
-				i += 1
-			self.htmlFile.write('      </tr>\n')
-			self.htmlFile.close()
-

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           VM_DISK=%-15s\n" "$VM_MEMORY" "$VM_CPU" "$VM_DISK"
+            printf  "               VM_MEMORY=%-15s        VM_CPU=%-15s\n" "$VM_MEMORY" "$VM_CPU"       
             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
@@ -182,32 +182,16 @@ function variant__v2__basic_sim {
 }
 
 function variant__v3__phy_sim {
-    NB_PATTERN_FILES=13
+    NB_PATTERN_FILES=3
     BUILD_OPTIONS="--phy_simulators"
-    VM_MEMORY=8192
-    VM_DISK=20
-    RUN_OPTIONS="./run_exec_autotests.bash -g \"01510* 015111 015112\" -q -np -b"
+    RUN_OPTIONS="./run_exec_autotests.bash -g \"01510*\" -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=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"
+    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"
 }
 
 function variant__v7__enb_ethernet {
@@ -216,7 +200,6 @@ function variant__v7__enb_ethernet {
     NB_PATTERN_FILES=8
     BUILD_OPTIONS="--eNB"
 }
-
 function variant__v8__ue_ethernet {
     VM_MEMORY=4096
     ARCHIVES_LOC=ue_eth
@@ -227,10 +210,9 @@ 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"
 }
-
 function variant__v20__l1_sim {
     ARCHIVES_LOC=l1_sim
     RUN_OPTIONS="complex"
@@ -238,8 +220,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 {
@@ -277,7 +259,6 @@ 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]//"-"/"_"}
@@ -371,11 +352,10 @@ fi
 VM_TEMPLATE=ci-
 
 
-# look for ASN1 release in cmake directives
+# look for default 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//)}
+ASN1VEROPT=( `grep "add_list2_option(RRC_ASN1_VERSION" cmake_targets/CMakeLists.txt` )
+ASN1VER=${ASN1VEROPT[1]//\"}
 unset ASN1VEROPT
 
 # variable to identify and store the command (build, create ...)
@@ -500,7 +480,6 @@ AUTHORIZED_VAR=("VM_OSREL RUN_EXPERIMENTAL OPTIONAL_APTCACHER TESTPLATFORM_OWNER
 # -V<xx> option.
 VM_NAME=""
 VM_MEMORY=0
-VM_DISK=0
 VM_CPU=0
 ARCHIVES_LOC=""
 LOG_PATTERN=""

ci-scripts/py_params.yaml

@@ -1,53 +0,0 @@
-eNBRepository : b
-ranRepository : c
-eNB_AllowMerge : 
-ranAllowMerge : 
-eNBBranch : f
-ranBranch : g
-eNBCommitID :  
-ranCommitID : i
-eNBTargetBranch : j
-ranTargetBranch : k
-
-nodes : 
-  - type : eNB
-    IPAddress : 001.1.1
-    UserName : toto
-    Password : qwe
-    SourceCodePath : l
-  - type : gNB
-    IPAddress : 002.2.2
-    UserName : tata
-    Password : asd
-    SourceCodePath : m  
-  - type : eNB
-    IPAddress : 003.3.3
-    UserName : titi
-    Password : zxc
-    SourceCodePath : n
-  - type : gNB
-    IPAddress : 004.4.4
-    UserName : caca
-    Password : pepe
-    SourceCodePath :  o   
-
-EPCIPAddress : p
-EPCUserName : q
-EPCPassword : r
-EPCSourceCodePath : s
-EPCType : t
-EPCContainerPrefix : u
-
-ADBIPAddress : v
-ADBUserName : w
-ADBType : x
-ADBPassword : y
-
-XMLTestFile : z
-
-UEIPAddress : qqq
-UEUserName : www
-UEPassword : eee
-UESourceCodePath : yyy
-
-finalStatus : bbb

ci-scripts/py_params_template.yaml

@@ -1,97 +0,0 @@
-eNBRepository : b
-ranRepository : c
-eNB_AllowMerge : 
-ranAllowMerge : 
-eNBBranch : f
-ranBranch : g
-eNBCommitID :  
-ranCommitID : i
-eNBTargetBranch : j
-ranTargetBranch : k
-
-
-RAN:
-  RAN_inst_0:
-    name : RAN_1
-    nodes : 
-    - type : eNB
-      IPAddress : 001.1.1
-      UserName : toto
-      Password : qwe
-      SourceCodePath : l
-    - type : gNB
-      IPAddress : 002.2.2
-      UserName : tata
-      Password : asd
-      SourceCodePath : m  
-    - type : eNB
-      IPAddress : 003.3.3
-      UserName : titi
-      Password : zxc
-      SourceCodePath : n
-    - type : gNB
-      IPAddress : 004.4.4
-      UserName : caca
-      Password : pepe
-      SourceCodePath :  o        
-  RAN_inst_1:
-    name : RAN_2
-    nodes : 
-    - type : eNB
-      IPAddress : 101.1.1
-      UserName : toto
-      Password : qwe
-      SourceCodePath : l
-    - type : gNB
-      IPAddress : 102.2.2
-      UserName : zaza
-      Password : asd
-      SourceCodePath : m  
-    - type : eNB
-      IPAddress : 103.3.3
-      UserName : zizi
-      Password : zxc
-      SourceCodePath : n
-    - type : gNB
-      IPAddress : 104.4.4
-      UserName : aaaa
-      Password : pepe
-      SourceCodePath :  o   
-
-
-
-EPC:
-  EPC_inst_0:
-    EPCIPAddress : p
-    EPCUserName : q
-    EPCPassword : r
-    EPCSourceCodePath : s
-    EPCType : t
-    EPCContainerPrefix : u
-
-ADB:
-  ADBIPAddress : v
-  ADBUserName : w
-  ADBType : x
-  ADBPassword : y
-
-
-UE:
-  UE_inst_0:
-    name : UE_1 
-    type :
-    UEIPAddress : qqq  
-    UEUserName : www
-    UEPassword : eee
-    UESourceCodePath : yyy
-  UE_inst_1:
-    name : UE_2
-    type :
-    UEIPAddress : bloblob  
-    UEUserName : gwou
-    UEPassword : zebu
-    UESourceCodePath : pop
-
-
-XMLTestFile : z
-finalStatus : bbb

ci-scripts/reportBuildLocally.sh

@@ -53,7 +53,7 @@ function details_table {
     echo "        <th>Message</th>" >> $3
     echo "      </tr>" >> $3
 
-    LIST_MESSAGES=`egrep "error:|warning:" $2 | egrep -v "jobserver unavailable|Clock skew detected.|flexran.proto|disabling jobserver mode"`
+    LIST_MESSAGES=`egrep "error:|warning:" $2 | egrep -v "jobserver unavailable|Clock skew detected.|flexran.proto"`
     COMPLETE_MESSAGE="start"
     for MESSAGE in $LIST_MESSAGES
     do
@@ -146,7 +146,7 @@ function summary_table_row {
         else
             echo "        <td bgcolor = \"red\" >$NB_ERRORS</th>" >> ./build_results.html
         fi
-        NB_WARNINGS=`egrep "warning:" $2 | egrep -v "jobserver unavailable|Clock skew detected.|flexran.proto|disabling jobserver mode" | egrep -c "warning:"`
+        NB_WARNINGS=`egrep "warning:" $2 | egrep -v "jobserver unavailable|Clock skew detected.|flexran.proto" | egrep -c "warning:"`
         if [ $NB_WARNINGS -eq 0 ]
         then
             echo "        <td bgcolor = \"green\" >$NB_WARNINGS</th>" >> ./build_results.html
@@ -492,77 +492,6 @@ function report_build {
             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
-            echo "   <br>" >> ./build_results.html
-        fi
-        if [ -f ./header-files-w-incorrect-define.txt ]
-        then
-            NB_FILES_IN_ERROR=`wc -l ./header-files-w-incorrect-define.txt | sed -e "s@ .*@@"`
-            if [ $NB_FILES_IN_ERROR -eq 0 ]
-            then
-                echo "   <div class=\"alert alert-success\">" >> ./build_results.html
-                if [ $MR_TRIG -eq 1 ]; then echo "   <strong>No Issue for CIRCULAR DEPENDENCY PROTECTION in modified files</strong>" >> ./build_results.html; fi
-                if [ $PU_TRIG -eq 1 ]; then echo "   <strong>No Issue for CIRCULAR DEPENDENCY PROTECTION in the whole repository</strong>" >> ./build_results.html; fi
-                echo "   </div>" >> ./build_results.html
-            else
-                echo "   <div class=\"alert alert-warning\">" >> ./build_results.html
-                if [ $MR_TRIG -eq 1 ]; then echo "   <strong>${NB_FILES_IN_ERROR} modified files MAY NOT HAVE CIRCULAR DEPENDENCY PROTECTION</strong>" >> ./build_results.html; fi
-                if [ $PU_TRIG -eq 1 ]; then echo "   <strong>${NB_FILES_IN_ERROR} files in repository MAY NOT HAVE CIRCULAR DEPENDENCY PROTECTION in the whole repository</strong>" >> ./build_results.html; fi
-                echo "   </div>" >> ./build_results.html
-                echo "   <button data-toggle=\"collapse\" data-target=\"#oai-circular-details\">More details on circular dependency protection check</button>" >> ./build_results.html
-                echo "   <div id=\"oai-circular-details\" class=\"collapse\">" >> ./build_results.html
-                echo "   <table border = 1>" >> ./build_results.html
-                echo "      <tr>" >> ./build_results.html
-                echo "        <th bgcolor = \"lightcyan\" >Potential Issue</th>" >> ./build_results.html
-                echo "        <th bgcolor = \"lightcyan\" >Impacted File</th>" >> ./build_results.html
-                echo "        <th bgcolor = \"lightcyan\" >Incorrect Macro</th>" >> ./build_results.html
-                echo "      </tr>" >> ./build_results.html
-                awk '{if($0 ~/error in/){print "      <tr><td>error in declaration</td><td>"$4"</td><td>"$5"</td></tr>"};if($0 ~/files with same/){print "      <tr><td>files with same #define</td><td>"$5"</td><td>"$6"</td></tr>"}}' ./header-files-w-incorrect-define.txt >> ./build_results.html
-                echo "   </table>" >> ./build_results.html
-                echo "   </div>" >> ./build_results.html
-                echo "   <br>" >> ./build_results.html
-            fi
-        fi
-        if [ -f ./files-w-gnu-gpl-license-banner.txt ]
-        then
-            NB_FILES_IN_ERROR=`wc -l ./files-w-gnu-gpl-license-banner.txt | sed -e "s@ .*@@"`
-            if [ $NB_FILES_IN_ERROR -ne 0 ]
-            then
-                echo "   <div class=\"alert alert-danger\">" >> ./build_results.html
-                if [ $MR_TRIG -eq 1 ]; then echo "   <strong>${NB_FILES_IN_ERROR} modified files HAVE a GNU GPL license banner</strong>" >> ./build_results.html; fi
-                if [ $PU_TRIG -eq 1 ]; then echo "   <strong>${NB_FILES_IN_ERROR} files in repository HAVE a GNU GPL license banner</strong>" >> ./build_results.html; fi
-                echo "   </div>" >> ./build_results.html
-                echo "   <button data-toggle=\"collapse\" data-target=\"#oai-license-gpl\">More details on GNU GPL license banner issue</button>" >> ./build_results.html
-                echo "   <div id=\"oai-license-gpl\" class=\"collapse\">" >> ./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>"}' ./files-w-gnu-gpl-license-banner.txt >> ./build_results.html
-                echo "   </table>" >> ./build_results.html
-                echo "   </div>" >> ./build_results.html
-                echo "   <br>" >> ./build_results.html
-            fi
-        fi
-        if [ -f ./files-w-suspect-banner.txt ]
-        then
-            NB_FILES_IN_ERROR=`wc -l ./files-w-suspect-banner.txt | sed -e "s@ .*@@"`
-            if [ $NB_FILES_IN_ERROR -ne 0 ]
-            then
-                echo "   <div class=\"alert alert-warning\">" >> ./build_results.html
-                if [ $MR_TRIG -eq 1 ]; then echo "   <strong>${NB_FILES_IN_ERROR} modified files HAVE a suspect license banner</strong>" >> ./build_results.html; fi
-                if [ $PU_TRIG -eq 1 ]; then echo "   <strong>${NB_FILES_IN_ERROR} files in repository HAVE a suspect license banner</strong>" >> ./build_results.html; fi
-                echo "   </div>" >> ./build_results.html
-                echo "   <button data-toggle=\"collapse\" data-target=\"#oai-license-suspect\">More details on suspect banner files</button>" >> ./build_results.html
-                echo "   <div id=\"oai-license-suspect\" class=\"collapse\">" >> ./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>"}' ././files-w-suspect-banner.txt >> ./build_results.html
-                echo "   </table>" >> ./build_results.html
-                echo "   </div>" >> ./build_results.html
-                echo "   <br>" >> ./build_results.html
-            fi
         fi
     fi
 
@@ -580,133 +509,81 @@ function report_build {
     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: 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_header "OAI Build eNB -- USRP option" ./archives/enb_usrp
+    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 "OAI ETHERNET transport - Release 14" ./archives/enb_usrp/oai_eth_transpro.Rel14.txt "Built target oai_eth_transpro" ./enb_usrp_row4.html
+    summary_table_row "Parameters Lib Config - Release 14" ./archives/enb_usrp/params_libconfig.Rel14.txt "Built target params_libconfig" ./enb_usrp_row5.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_header "OAI Build basic simulator option" ./archives/basic_sim
+    summary_table_row "LTE SoftModem - Release 14" ./archives/basic_sim/lte-softmodem.Rel14.txt "Built target lte-softmodem" ./basic_sim_row1.html
+    summary_table_row "LTE UE SoftModem - Release 14" ./archives/basic_sim/lte-uesoftmodem.Rel14.txt "Built target lte-uesoftmodem" ./basic_sim_row2.htm
+    summary_table_row "Conf 2 UE data - Release 14" ./archives/basic_sim/conf2uedata.Rel14.txt "Built target conf2uedata" ./basic_sim_row3.html
+    summary_table_row "RB Tool - Release 14" ./archives/basic_sim/rb_tool.Rel14.txt "Built target rb_tool" ./basic_sim_row4.html
+    summary_table_row "NASMESH - Release 14" ./archives/basic_sim/nasmesh.Rel14.txt "Built target nasmesh" ./basic_sim_row5.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_header "OAI Build Physical simulators option" ./archives/phy_sim
+    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
 
-    if [ -f archives/gnb_usrp/nr-softmodem.Rel15.txt ]
+
+    if [ -f archives/gnb_usrp/nr-softmodem.Rel14.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_header "OAI Build gNB -- USRP option" ./archives/gnb_usrp
+        summary_table_row "LTE SoftModem - Release 14" ./archives/gnb_usrp/nr-softmodem.Rel14.txt "Built target nr-softmodem" ./gnb_usrp_row1.html
+        summary_table_row "Coding - Release 14" ./archives/gnb_usrp/coding.Rel14.txt "Built target coding" ./gnb_usrp_row2.html
+        summary_table_row "OAI USRP device if - Release 14" ./archives/gnb_usrp/oai_usrpdevif.Rel14.txt "Built target oai_usrpdevif" ./gnb_usrp_row3.html
+        summary_table_row "Parameters Lib Config - Release 14" ./archives/gnb_usrp/params_libconfig.Rel14.txt "Built target params_libconfig" ./gnb_usrp_row4.html
         summary_table_footer
     fi
 
-    if [ -f archives/nr_ue_usrp/nr-uesoftmodem.Rel15.txt ]
+    if [ -f archives/nrue_usrp/nr-uesoftmodem.Rel14.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_header "OAI Build 5G NR UE -- USRP option" ./archives/nrue_usrp
+        summary_table_row "UE SoftModem - Release 14" ./archives/nrue_usrp/nr-uesoftmodem.Rel14.txt "Built target nr-uesoftmodem" ./nrue_usrp_row1.html
+        summary_table_row "Coding - Release 14" ./archives/nrue_usrp/coding.Rel14.txt "Built target coding" ./nrue_usrp_row2.html
+        summary_table_row "OAI USRP device if - Release 14" ./archives/nrue_usrp/oai_usrpdevif.Rel14.txt "Built target oai_usrpdevif" ./nrue_usrp_row3.html
+        summary_table_row "Parameters Lib Config - Release 14" ./archives/nrue_usrp/params_libconfig.Rel14.txt "Built target params_libconfig" ./nrue_usrp_row4.html
         summary_table_footer
     fi
 
-    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_header "OAI Build eNB -- ETHERNET transport option" ./archives/enb_eth
+    summary_table_row "LTE SoftModem - Release 14" ./archives/enb_eth/lte-softmodem.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 "RF Simulator - Release 14" ./archives/enb_eth/rfsimulator.Rel14.txt "Built target rfsimulator" ./enb_eth_row5.html
+    summary_table_row "TCP OAI Bridge - Release 14" ./archives/enb_eth/tcp_bridge_oai.Rel14.txt "Built target tcp_bridge_oai" ./enb_eth_row6.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_header "OAI Build UE -- ETHERNET transport option" ./archives/ue_eth
+    summary_table_row "LTE UE SoftModem - Release 14" ./archives/ue_eth/lte-uesoftmodem.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 "RF Simulator - Release 14" ./archives/ue_eth/rfsimulator.Rel14.txt "Built target rfsimulator" ./ue_eth_row5.html
+    summary_table_row "TCP OAI Bridge - Release 14" ./archives/ue_eth/tcp_bridge_oai.Rel14.txt "Built target tcp_bridge_oai" ./ue_eth_row6.html
+    summary_table_row "Conf 2 UE Data - Release 14" ./archives/ue_eth/conf2uedata.Rel14.txt "Built target conf2uedata" ./ue_eth_row7.html
+    summary_table_row "NVRAM - Release 14" ./archives/ue_eth/nvram.Rel14.txt "Built target nvram" ./ue_eth_row8.html
+    summary_table_row "UE IP - Release 14" ./archives/ue_eth/ue_ip.Rel14.txt "Built target ue_ip" ./ue_eth_row9.html
+    summary_table_row "USIM - Release 14" ./archives/ue_eth/usim.Rel14.txt "Built target usim" ./ue_eth_row9a.html
     summary_table_footer
 
     if [ -e ./archives/red_hat ]
     then
         echo "   <h2>Red Hat Enterprise Linux Server release 7.6) -- Summary</h2>" >> ./build_results.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_header "Red Hat -- OAI Build eNB -- USRP option" ./archives/red_hat
+        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 "OAI ETHERNET transport - Release 14" ./archives/red_hat/oai_eth_transpro.Rel14.txt "Built target oai_eth_transpro" ./enb_usrp_rh_row4.html
+        summary_table_row "Parameters Lib Config - Release 14" ./archives/red_hat/params_libconfig.Rel14.txt "Built target params_libconfig" ./enb_usrp_rh_row5.html
         summary_table_footer
     fi
 
@@ -728,7 +605,7 @@ function report_build {
             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 ]
+    if [ -f ./phy_sim_row1.html ] || [ -f ./phy_sim_row2.html ] || [ -f ./phy_sim_row3.html ]
     then
         for DETAILS_TABLE in `ls ./phy_sim_row*.html`
         do
@@ -742,9 +619,9 @@ function report_build {
             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 ]
+    if [ -f ./nrue_usrp_row1.html ] || [ -f ./nrue_usrp_row2.html ] || [ -f ./nrue_usrp_row3.html ] || [ -f ./nrue_usrp_row4.html ]
     then
-        for DETAILS_TABLE in `ls ./nr_ue_usrp_row*.html`
+        for DETAILS_TABLE in `ls ./nrue_usrp_row*.html`
         do
             cat $DETAILS_TABLE >> ./build_results.html
         done

ci-scripts/reportTestLocally.sh

@@ -97,22 +97,16 @@ function analyzeIperfFiles {
         FILE_COMPLETE=`egrep -c "Server Report" $IPERF_CASE`
         if [ $FILE_COMPLETE -eq 0 ]
         then
+            echo "        <td bgcolor = \"red\" >KO</td>" >> ./test_simulator_results.html
             SERVER_FILE=`echo $IPERF_CASE | sed -e "s#client#server#"`
             FLOAT_EFF_BITRATE=`grep --color=never sec $SERVER_FILE | sed -e "s#^.*Bytes *##" -e "s#sec *.*#sec#" | awk 'BEGIN{s=0;n=0}{n++;if ($2 ~/Mbits/){a = $1 * 1000000};if ($2 ~/Kbits/){a = $1 * 1000};s=s+a}END{br=s/n; printf "%.0f", br}'`
-            EFFECTIVE_BITRATE=`grep --color=never sec $SERVER_FILE | sed -e "s#^.*Bytes *##" -e "s#sec *.*#sec#" | awk 'BEGIN{s=0;n=0}{n++;if ($2 ~/Mbits/){a = $1 * 1000000};if ($2 ~/Kbits/){a = $1 * 1000};s=s+a}END{br=s/n; if(br>1000000){printf "%.2f MBits/sec", br/1000000}else{printf "%.2f KBits/sec", br/1000}}'`
+            EFFECTIVE_BITRATE=`grep --color=never sec $SERVER_FILE | sed -e "s#^.*Bytes *##" -e "s#sec *.*#sec#" | awk 'BEGIN{s=0;n=0}{n++;if ($2 ~/Mbits/){a = $1 * 1000000};if ($2 ~/Kbits/){a = $1 * 1000};s=s+a}END{br=s/n; if(br>1000000){printf "%.2f MBits/sec", br/1000000}}'`
             PERF=`echo "100 * $FLOAT_EFF_BITRATE / $FLOAT_REQ_BITRATE" | bc -l | awk '{printf "%.2f", $0}'`
-            PERF_INT=`echo "100 * $FLOAT_EFF_BITRATE / $FLOAT_REQ_BITRATE" | bc -l | awk '{printf "%.0f", $0}'`
             JITTER=`grep --color=never sec $SERVER_FILE | sed -e "s#^.*/sec *##" -e "s# *ms.*##" | awk 'BEGIN{s=0;n=0}{n++;s+=$1}END{jitter=s/n; printf "%.3f ms", jitter}'`
             PACKETLOSS_NOSIGN=`grep --color=never sec $SERVER_FILE | sed -e "s#^.*(##" -e "s#%.*##" | awk 'BEGIN{s=0;n=0}{n++;s+=$1}END{per=s/n; printf "%.1f", per}'`
             PACKETLOSS=`echo "${PACKETLOSS_NOSIGN}%"`
-            if [[ $PERF_INT -lt 80 ]]
-            then
-                echo "        <td bgcolor = \"red\" >KO</td>" >> ./test_simulator_results.html
-            else
-                echo "        <td bgcolor = \"green\" >OK</td>" >> ./test_simulator_results.html
-            fi
         else
-            EFFECTIVE_BITRATE=`tail -n3 $IPERF_CASE | egrep "bits/sec" | sed -e "s#^.*Bytes *##" -e "s#sec.*#sec#"`
+            EFFECTIVE_BITRATE=`tail -n3 $IPERF_CASE | egrep "Mbits/sec" | sed -e "s#^.*MBytes *##" -e "s#sec.*#sec#"`
             if [[ $EFFECTIVE_BITRATE =~ .*Kbits/sec.* ]]
             then
                 EFFECTIVE_BITRATE=`echo $EFFECTIVE_BITRATE | sed -e "s# *Kbits/sec.*##"`
@@ -136,9 +130,9 @@ function analyzeIperfFiles {
             else
                 echo "        <td bgcolor = \"green\" >OK</td>" >> ./test_simulator_results.html
             fi
-            EFFECTIVE_BITRATE=`tail -n3 $IPERF_CASE | egrep "bits/sec" | sed -e "s#^.*Bytes *##" -e "s#sec.*#sec#"`
-            JITTER=`tail -n3 $IPERF_CASE | egrep "bits/sec" | sed -e "s#^.*bits/sec *##" -e "s#ms.*#ms#"`
-            PACKETLOSS=`tail -n3 $IPERF_CASE | egrep "bits/sec" | sed -e "s#^.*(##" -e "s#).*##"`
+            EFFECTIVE_BITRATE=`tail -n3 $IPERF_CASE | egrep "Mbits/sec" | sed -e "s#^.*MBytes *##" -e "s#sec.*#sec#"`
+            JITTER=`tail -n3 $IPERF_CASE | egrep "Mbits/sec" | sed -e "s#^.*Mbits/sec *##" -e "s#ms.*#ms#"`
+            PACKETLOSS=`tail -n3 $IPERF_CASE | egrep "Mbits/sec" | sed -e "s#^.*(##" -e "s#).*##"`
         fi
         echo "        <td>" >> ./test_simulator_results.html
         echo "            <pre>" >> ./test_simulator_results.html
@@ -253,7 +247,7 @@ function report_test {
     ARCHIVES_LOC=archives/basic_sim/test
     if [ -d $ARCHIVES_LOC ]
     then
-        echo "   <h3>4G LTE Basic Simulator Check</h3>" >> ./test_simulator_results.html
+        echo "   <h3>Basic Simulator Check</h3>" >> ./test_simulator_results.html
 
         if [ -f $ARCHIVES_LOC/test_final_status.log ]
         then
@@ -373,7 +367,7 @@ function report_test {
 
     if [ -e $JENKINS_WKSP/flexran/flexran_build_complete.txt ]
     then
-        echo "   <h3>4G LTE Basic Simulator + FlexRan Controller Check</h3>" >> ./test_simulator_results.html
+        echo "   <h3>Basic Simulator + FlexRan Controller Check</h3>" >> ./test_simulator_results.html
         echo "   <div class=\"alert alert-success\">" >> ./test_simulator_results.html
         echo "      <strong>TEST was SUCCESSFUL <span class=\"glyphicon glyphicon-ok-circle\"></span></strong>" >> ./test_simulator_results.html
         echo "   </div>" >> ./test_simulator_results.html
@@ -400,491 +394,10 @@ function report_test {
         echo "   </div>" >> ./test_simulator_results.html
     fi
 
-    ARCHIVES_LOC=archives/rf_sim/test
-    if [ -d $ARCHIVES_LOC ]
-    then
-        echo "   <h3>4G LTE RF Simulator Check</h3>" >> ./test_simulator_results.html
-
-        if [ -f $ARCHIVES_LOC/test_final_status.log ]
-        then
-            if [ `egrep -c "LTE: TEST_OK" $ARCHIVES_LOC/test_final_status.log` -eq 1 ]
-            then
-                echo "   <div class=\"alert alert-success\">" >> ./test_simulator_results.html
-                echo "      <strong>TEST was SUCCESSFUL <span class=\"glyphicon glyphicon-ok-circle\"></span></strong>" >> ./test_simulator_results.html
-                echo "   </div>" >> ./test_simulator_results.html
-            else
-                echo "   <div class=\"alert alert-danger\">" >> ./test_simulator_results.html
-                echo "      <strong>TEST was a FAILURE! <span class=\"glyphicon glyphicon-ban-circle\"></span></strong>" >> ./test_simulator_results.html
-                echo "   </div>" >> ./test_simulator_results.html
-            fi
-        else
-            echo "   <div class=\"alert alert-danger\">" >> ./test_simulator_results.html
-            echo "      <strong>COULD NOT DETERMINE TEST FINAL STATUS! <span class=\"glyphicon glyphicon-ban-circle\"></span></strong>" >> ./test_simulator_results.html
-            echo "   </div>" >> ./test_simulator_results.html
-        fi
-
-        echo "   <button data-toggle=\"collapse\" data-target=\"#oai-lte-rf-sim-test-details\">More details on 4G LTE RF Simulator test results</button>" >> ./test_simulator_results.html
-        echo "   <div id=\"oai-lte-rf-sim-test-details\" class=\"collapse\">" >> ./test_simulator_results.html
-        echo "   <table border = \"1\">" >> ./test_simulator_results.html
-        echo "      <tr bgcolor = \"#33CCFF\" >" >> ./test_simulator_results.html
-        echo "        <th>Log File Name</th>" >> ./test_simulator_results.html
-        echo "        <th>Command</th>" >> ./test_simulator_results.html
-        echo "        <th>Status</th>" >> ./test_simulator_results.html
-        echo "        <th>Statistics</th>" >> ./test_simulator_results.html
-        echo "      </tr>" >> ./test_simulator_results.html
-
-        EPC_CONFIGS=("wS1 noS1")
-        TRANS_MODES=("fdd")
-        BW_CASES=(05 10)
-        for CN_CONFIG in ${EPC_CONFIGS[@]}
-        do
-          for TMODE in ${TRANS_MODES[@]}
-          do
-            for BW in ${BW_CASES[@]}
-            do
-                echo "      <tr bgcolor = \"#8FBC8F\" >" >> ./test_simulator_results.html
-                if [[ $CN_CONFIG =~ .*wS1.* ]]
-                then
-                    echo "          <td align = \"center\" colspan = 4 >Test with EPC (aka withS1): ${TMODE} -- ${BW}MHz </td>" >> ./test_simulator_results.html
-                else
-                    echo "          <td align = \"center\" colspan = 4 >Test without EPC (aka noS1): ${TMODE} -- ${BW}MHz </td>" >> ./test_simulator_results.html
-                fi
-                echo "      </tr>" >> ./test_simulator_results.html
-                ENB_LOG=$ARCHIVES_LOC/${TMODE}_${BW}MHz_${CN_CONFIG}_enb.log
-                UE_LOG=`echo $ENB_LOG | sed -e "s#enb#ue#"`
-                if [ -f $ENB_LOG ] && [ -f $UE_LOG ]
-                then
-                    NAME_ENB=`echo $ENB_LOG | sed -e "s#$ARCHIVES_LOC/##"`
-                    NAME_UE=`echo $UE_LOG | sed -e "s#$ARCHIVES_LOC/##"`
-                    echo "      <tr>" >> ./test_simulator_results.html
-                    echo "        <td>$NAME_ENB --- $NAME_UE</td>" >> ./test_simulator_results.html
-                    echo "        <td>N/A</td>" >> ./test_simulator_results.html
-                    NB_ENB_GOT_SYNC=`egrep -c "got sync" $ENB_LOG`
-                    if [[ $CN_CONFIG =~ .*noS1.* ]]
-                    then
-                        NB_ENB_TUNNEL_UP=`egrep -c "Interface oaitun_enb1 successfully configured" $ENB_LOG`
-                    fi
-                    NB_UE_GOT_SYNC=`egrep -c "rfsimulator: Success" $UE_LOG`
-                    NB_ENB_SYNCED_WITH_UE=`egrep -c "Generating RRCConnectionReconfigurationComplete" $UE_LOG`
-                    if [[ $CN_CONFIG =~ .*noS1.* ]]
-                    then
-                        NB_UE_TUNNEL_UP=`egrep -c "Interface oaitun_ue1 successfully configured" $UE_LOG`
-                    else
-                        NB_UE_TUNNEL_UP=`egrep -c "ip link set oaitun_ue1 up" $UE_LOG`
-                    fi
-                    if [ $NB_ENB_GOT_SYNC -gt 0 ] && [ $NB_UE_GOT_SYNC -gt 0 ] && [ $NB_ENB_SYNCED_WITH_UE -gt 0 ]
-                    then
-                        echo "        <td bgcolor = \"green\" >OK</td>" >> ./test_simulator_results.html
-                    else
-                        echo "        <td bgcolor = \"red\" >KO</td>" >> ./test_simulator_results.html
-                    fi
-                    echo "        <td><pre>" >> ./test_simulator_results.html
-                    if [ $NB_ENB_GOT_SYNC -gt 0 ]
-                    then
-                        echo "<font color = \"blue\">- eNB --> got sync</font>" >> ./test_simulator_results.html
-                    else
-                        echo "<font color = \"red\"><b>- eNB NEVER got sync</b></font>" >> ./test_simulator_results.html
-                    fi
-                    if [[ $CN_CONFIG =~ .*noS1.* ]]
-                    then
-                        if [ $NB_ENB_TUNNEL_UP -gt 0 ]
-                        then
-                            echo "<font color = \"blue\">- eNB mounted oaitun_enb1 interface</font>" >> ./test_simulator_results.html
-                        else
-                            echo "<font color = \"red\"><b>- eNB NEVER mounted oaitun_enb1 interface</b></font>" >> ./test_simulator_results.html
-                        fi
-                    fi
-                    if [ $NB_UE_GOT_SYNC -gt 0 ]
-                    then
-                        echo "<font color = \"blue\">- LTE UE --> got sync</font>" >> ./test_simulator_results.html
-                    else
-                        echo "<font color = \"red\"><b>- LTE UE NEVER got sync</b></font>" >> ./test_simulator_results.html
-                    fi
-                    if [ $NB_ENB_SYNCED_WITH_UE -gt 0 ]
-                    then
-                        echo "<font color = \"blue\">- LTE UE attached to eNB</font>" >> ./test_simulator_results.html
-                    else
-                        echo "<font color = \"red\"><b>- LTE UE NEVER attached to eNB</b></font>" >> ./test_simulator_results.html
-                    fi
-                    if [ $NB_UE_TUNNEL_UP -gt 0 ]
-                    then
-                        echo "<font color = \"blue\">- LTE UE mounted oaitun_ue1 interface</font>" >> ./test_simulator_results.html
-                    else
-                        echo "<font color = \"red\"><b>- LTE UE NEVER mounted oaitun_ue1 interface</b></font>" >> ./test_simulator_results.html
-                    fi
-                    echo "        </pre></td>" >> ./test_simulator_results.html
-                    echo "      </tr>" >> ./test_simulator_results.html
-                fi
-                PING_LOGS=`ls $ARCHIVES_LOC/${TMODE}_${BW}MHz_${CN_CONFIG}_ping*.log 2> /dev/null`
-                analyzePingFiles
-
-                IPERF_TESTS=`ls $ARCHIVES_LOC/${TMODE}_${BW}MHz_${CN_CONFIG}_iperf_dl*client*txt | grep -v mbms 2> /dev/null`
-                analyzeIperfFiles
-
-                IPERF_TESTS=`ls $ARCHIVES_LOC/${TMODE}_${BW}MHz_${CN_CONFIG}_iperf_ul*client*txt | grep -v mbms 2> /dev/null`
-                analyzeIperfFiles
-            done
-          done
-        done
-
-        # MBMS Case
-        CN_CONFIG="noS1"
-        TMODE="fdd"
-        BW_CASES=(05)
-        for BW in ${BW_CASES[@]}
-        do
-            echo "      <tr bgcolor = \"#8FBC8F\" >" >> ./test_simulator_results.html
-            echo "          <td align = \"center\" colspan = 4 >Test MBMS without EPC (aka noS1): ${TMODE} -- ${BW}MHz </td>" >> ./test_simulator_results.html
-            echo "      </tr>" >> ./test_simulator_results.html
-            ENB_LOG=$ARCHIVES_LOC/${TMODE}_${BW}MHz_${CN_CONFIG}_enb_mbms.log
-            UE_LOG=`echo $ENB_LOG | sed -e "s#enb#ue#"`
-            if [ -f $ENB_LOG ] && [ -f $UE_LOG ]
-            then
-                NAME_ENB=`echo $ENB_LOG | sed -e "s#$ARCHIVES_LOC/##"`
-                NAME_UE=`echo $UE_LOG | sed -e "s#$ARCHIVES_LOC/##"`
-                echo "      <tr>" >> ./test_simulator_results.html
-                echo "        <td>$NAME_ENB --- $NAME_UE</td>" >> ./test_simulator_results.html
-                echo "        <td>N/A</td>" >> ./test_simulator_results.html
-                NB_ENB_GOT_SYNC=`egrep -c "got sync" $ENB_LOG`
-                NB_ENB_TUNNEL_UP=`egrep -c "Interface oaitun_enb1 successfully configured" $ENB_LOG`
-                NB_ENB_MTUNNEL_UP=`egrep -c "Interface oaitun_enm1 successfully configured" $ENB_LOG`
-                NB_UE_GOT_SYNC=`egrep -c "rfsimulator: Success" $UE_LOG`
-                NB_ENB_SYNCED_WITH_UE=`egrep -c "Generating RRCConnectionReconfigurationComplete" $UE_LOG`
-                NB_UE_TUNNEL_UP=`egrep -c "Interface oaitun_ue1 successfully configured" $UE_LOG`
-                NB_UE_MTUNNEL_UP=`egrep -c "Interface oaitun_uem1 successfully configured" $UE_LOG`
-                NB_UE_MBMS_PUSH_MSG=`egrep -c "TRIED TO PUSH MBMS DATA TO" $UE_LOG`
-                if [ $NB_ENB_GOT_SYNC -gt 0 ] && [ $NB_UE_GOT_SYNC -gt 0 ] && [ $NB_ENB_SYNCED_WITH_UE -gt 0 ] && [ $NB_UE_MBMS_PUSH_MSG -gt 0 ]
-                then
-                    echo "        <td bgcolor = \"green\" >OK</td>" >> ./test_simulator_results.html
-                else
-                    echo "        <td bgcolor = \"red\" >KO</td>" >> ./test_simulator_results.html
-                fi
-                echo "        <td><pre>" >> ./test_simulator_results.html
-                if [ $NB_ENB_GOT_SYNC -gt 0 ]
-                then
-                    echo "<font color = \"blue\">- eNB --> got sync</font>" >> ./test_simulator_results.html
-                else
-                    echo "<font color = \"red\"><b>- eNB NEVER got sync</b></font>" >> ./test_simulator_results.html
-                fi
-                if [ $NB_ENB_TUNNEL_UP -gt 0 ]
-                then
-                    echo "<font color = \"blue\">- eNB mounted oaitun_enb1 interface</font>" >> ./test_simulator_results.html
-                else
-                    echo "<font color = \"red\"><b>- eNB NEVER mounted oaitun_enb1 interface</b></font>" >> ./test_simulator_results.html
-                fi
-                if [ $NB_ENB_MTUNNEL_UP -gt 0 ]
-                then
-                    echo "<font color = \"blue\">- eNB mounted oaitun_enm1 interface</font>" >> ./test_simulator_results.html
-                else
-                    echo "<font color = \"red\"><b>- eNB NEVER mounted oaitun_enm1 interface</b></font>" >> ./test_simulator_results.html
-                fi
-                if [ $NB_UE_GOT_SYNC -gt 0 ]
-                then
-                    echo "<font color = \"blue\">- LTE UE --> got sync</font>" >> ./test_simulator_results.html
-                else
-                    echo "<font color = \"red\"><b>- LTE UE NEVER got sync</b></font>" >> ./test_simulator_results.html
-                fi
-                if [ $NB_ENB_SYNCED_WITH_UE -gt 0 ]
-                then
-                    echo "<font color = \"blue\">- LTE UE attached to eNB</font>" >> ./test_simulator_results.html
-                else
-                    echo "<font color = \"red\"><b>- LTE UE NEVER attached to eNB</b></font>" >> ./test_simulator_results.html
-                fi
-                if [ $NB_UE_TUNNEL_UP -gt 0 ]
-                then
-                    echo "<font color = \"blue\">- LTE UE mounted oaitun_ue1 interface</font>" >> ./test_simulator_results.html
-                else
-                    echo "<font color = \"red\"><b>- LTE UE NEVER mounted oaitun_ue1 interface</b></font>" >> ./test_simulator_results.html
-                fi
-                if [ $NB_UE_MTUNNEL_UP -gt 0 ]
-                then
-                    echo "<font color = \"blue\">- LTE UE mounted oaitun_uem1 interface</font>" >> ./test_simulator_results.html
-                else
-                    echo "<font color = \"red\"><b>- LTE UE NEVER mounted oaitun_uem1 interface</b></font>" >> ./test_simulator_results.html
-                fi
-                if [ $NB_UE_MBMS_PUSH_MSG -gt 0 ]
-                then
-                    echo "<font color = \"blue\">- LTE UE tried to push ${NB_UE_MBMS_PUSH_MSG} MBMS DATA</font>" >> ./test_simulator_results.html
-                else
-                    echo "<font color = \"red\"><b>- LTE UE NEVER pushed MBMS DATA</b></font>" >> ./test_simulator_results.html
-                fi
-                echo "        </pre></td>" >> ./test_simulator_results.html
-                echo "      </tr>" >> ./test_simulator_results.html
-            fi
-            #PING_LOGS=`ls $ARCHIVES_LOC/${TMODE}_${BW}MHz_${CN_CONFIG}_ping*.log 2> /dev/null`
-            #analyzePingFiles
-
-            #IPERF_TESTS=`ls $ARCHIVES_LOC/${TMODE}_${BW}MHz_${CN_CONFIG}_iperf_dl*client*txt | grep -v mbms 2> /dev/null`
-            #analyzeIperfFiles
-
-            #IPERF_TESTS=`ls $ARCHIVES_LOC/${TMODE}_${BW}MHz_${CN_CONFIG}_iperf_ul*client*txt | grep -v mbms 2> /dev/null`
-            #analyzeIperfFiles
-        done
-
-        # FeMBMS Case
-        CN_CONFIG="noS1"
-        TMODE="fdd"
-        BW_CASES=(05)
-        for BW in ${BW_CASES[@]}
-        do
-            echo "      <tr bgcolor = \"#8FBC8F\" >" >> ./test_simulator_results.html
-            echo "          <td align = \"center\" colspan = 4 >Test FeMBMS without EPC (aka noS1): ${TMODE} -- ${BW}MHz </td>" >> ./test_simulator_results.html
-            echo "      </tr>" >> ./test_simulator_results.html
-            ENB_LOG=$ARCHIVES_LOC/${TMODE}_${BW}MHz_${CN_CONFIG}_enb_fembms.log
-            UE_LOG=`echo $ENB_LOG | sed -e "s#enb#ue#"`
-            if [ -f $ENB_LOG ] && [ -f $UE_LOG ]
-            then
-                NAME_ENB=`echo $ENB_LOG | sed -e "s#$ARCHIVES_LOC/##"`
-                NAME_UE=`echo $UE_LOG | sed -e "s#$ARCHIVES_LOC/##"`
-                echo "      <tr>" >> ./test_simulator_results.html
-                echo "        <td>$NAME_ENB --- $NAME_UE</td>" >> ./test_simulator_results.html
-                echo "        <td>N/A</td>" >> ./test_simulator_results.html
-                #NB_ENB_GOT_SYNC=`egrep -c "got sync" $ENB_LOG`
-                NB_ENB_TUNNEL_UP=`egrep -c "Interface oaitun_enb1 successfully configured" $ENB_LOG`
-                NB_ENB_MTUNNEL_UP=`egrep -c "Interface oaitun_enm1 successfully configured" $ENB_LOG`
-                #NB_UE_GOT_SYNC=`egrep -c "rfsimulator: Success" $UE_LOG`
-                #NB_ENB_SYNCED_WITH_UE=`egrep -c "Generating RRCConnectionReconfigurationComplete" $UE_LOG`
-                NB_UE_TUNNEL_UP=`egrep -c "Interface oaitun_ue1 successfully configured" $UE_LOG`
-                NB_UE_MTUNNEL_UP=`egrep -c "Interface oaitun_uem1 successfully configured" $UE_LOG`
-                NB_UE_MBMS_PUSH_MSG=`egrep -c "TRIED TO PUSH MBMS DATA TO" $UE_LOG`
-                #if [ $NB_ENB_GOT_SYNC -gt 0 ] && [ $NB_UE_GOT_SYNC -gt 0 ] && [ $NB_ENB_SYNCED_WITH_UE -gt 0 ] && [ $NB_UE_MBMS_PUSH_MSG -gt 0 ]
-                if  [ $NB_UE_MBMS_PUSH_MSG -gt 0 ]
-                then
-                    echo "        <td bgcolor = \"green\" >OK</td>" >> ./test_simulator_results.html
-                else
-                    echo "        <td bgcolor = \"red\" >KO</td>" >> ./test_simulator_results.html
-                fi
-                echo "        <td><pre>" >> ./test_simulator_results.html
-                #if [ $NB_ENB_GOT_SYNC -gt 0 ]
-                #then
-                #    echo "<font color = \"blue\">- eNB --> got sync</font>" >> ./test_simulator_results.html
-                #else
-                #    echo "<font color = \"red\"><b>- eNB NEVER got sync</b></font>" >> ./test_simulator_results.html
-                #fi
-                if [ $NB_ENB_TUNNEL_UP -gt 0 ]
-                then
-                    echo "<font color = \"blue\">- eNB mounted oaitun_enb1 interface</font>" >> ./test_simulator_results.html
-                else
-                    echo "<font color = \"red\"><b>- eNB NEVER mounted oaitun_enb1 interface</b></font>" >> ./test_simulator_results.html
-                fi
-                if [ $NB_ENB_MTUNNEL_UP -gt 0 ]
-                then
-                    echo "<font color = \"blue\">- eNB mounted oaitun_enm1 interface</font>" >> ./test_simulator_results.html
-                else
-                    echo "<font color = \"red\"><b>- eNB NEVER mounted oaitun_enm1 interface</b></font>" >> ./test_simulator_results.html
-                fi
-                #if [ $NB_UE_GOT_SYNC -gt 0 ]
-                #then
-                #    echo "<font color = \"blue\">- LTE UE --> got sync</font>" >> ./test_simulator_results.html
-                #else
-                #    echo "<font color = \"red\"><b>- LTE UE NEVER got sync</b></font>" >> ./test_simulator_results.html
-                #fi
-                #if [ $NB_ENB_SYNCED_WITH_UE -gt 0 ]
-                #then
-                #    echo "<font color = \"blue\">- LTE UE attached to eNB</font>" >> ./test_simulator_results.html
-                #else
-                #    echo "<font color = \"red\"><b>- LTE UE NEVER attached to eNB</b></font>" >> ./test_simulator_results.html
-                #fi
-                if [ $NB_UE_TUNNEL_UP -gt 0 ]
-                then
-                    echo "<font color = \"blue\">- LTE UE mounted oaitun_ue1 interface</font>" >> ./test_simulator_results.html
-                else
-                    echo "<font color = \"red\"><b>- LTE UE NEVER mounted oaitun_ue1 interface</b></font>" >> ./test_simulator_results.html
-                fi
-                if [ $NB_UE_MTUNNEL_UP -gt 0 ]
-                then
-                    echo "<font color = \"blue\">- LTE UE mounted oaitun_uem1 interface</font>" >> ./test_simulator_results.html
-                else
-                    echo "<font color = \"red\"><b>- LTE UE NEVER mounted oaitun_uem1 interface</b></font>" >> ./test_simulator_results.html
-                fi
-                if [ $NB_UE_MBMS_PUSH_MSG -gt 0 ]
-                then
-                    echo "<font color = \"blue\">- LTE UE tried to push ${NB_UE_MBMS_PUSH_MSG} MBMS DATA</font>" >> ./test_simulator_results.html
-                else
-                    echo "<font color = \"red\"><b>- LTE UE NEVER pushed MBMS DATA</b></font>" >> ./test_simulator_results.html
-                fi
-                echo "        </pre></td>" >> ./test_simulator_results.html
-                echo "      </tr>" >> ./test_simulator_results.html
-            fi
-            #PING_LOGS=`ls $ARCHIVES_LOC/${TMODE}_${BW}MHz_${CN_CONFIG}_ping*.log 2> /dev/null`
-            #analyzePingFiles
-
-            #IPERF_TESTS=`ls $ARCHIVES_LOC/${TMODE}_${BW}MHz_${CN_CONFIG}_iperf_dl*client*txt | grep -v mbms 2> /dev/null`
-            #analyzeIperfFiles
-
-            #IPERF_TESTS=`ls $ARCHIVES_LOC/${TMODE}_${BW}MHz_${CN_CONFIG}_iperf_ul*client*txt | grep -v mbms 2> /dev/null`
-            #analyzeIperfFiles
-        done
-        echo "   </table>" >> ./test_simulator_results.html
-        echo "   </div>" >> ./test_simulator_results.html
-
-        echo "   <h3>5G NR RF Simulator Check</h3>" >> ./test_simulator_results.html
-
-        if [ -f $ARCHIVES_LOC/test_final_status.log ]
-        then
-            if [ `egrep -c "5G-NR: TEST_OK" $ARCHIVES_LOC/test_final_status.log` -eq 1 ]
-            then
-                echo "   <div class=\"alert alert-success\">" >> ./test_simulator_results.html
-                echo "      <strong>TEST was SUCCESSFUL <span class=\"glyphicon glyphicon-ok-circle\"></span></strong>" >> ./test_simulator_results.html
-                echo "   </div>" >> ./test_simulator_results.html
-            else
-                echo "   <div class=\"alert alert-danger\">" >> ./test_simulator_results.html
-                echo "      <strong>TEST was a FAILURE! <span class=\"glyphicon glyphicon-ban-circle\"></span></strong>" >> ./test_simulator_results.html
-                echo "   </div>" >> ./test_simulator_results.html
-            fi
-        else
-            echo "   <div class=\"alert alert-danger\">" >> ./test_simulator_results.html
-            echo "      <strong>COULD NOT DETERMINE TEST FINAL STATUS! <span class=\"glyphicon glyphicon-ban-circle\"></span></strong>" >> ./test_simulator_results.html
-            echo "   </div>" >> ./test_simulator_results.html
-        fi
-
-        echo "   <button data-toggle=\"collapse\" data-target=\"#oai-nr-rf-sim-test-details\">More details on 5G NR RF Simulator test results</button>" >> ./test_simulator_results.html
-        echo "   <div id=\"oai-nr-rf-sim-test-details\" class=\"collapse\">" >> ./test_simulator_results.html
-        echo "   <table border = \"1\">" >> ./test_simulator_results.html
-        echo "      <tr bgcolor = \"#33CCFF\" >" >> ./test_simulator_results.html
-        echo "        <th>Log File Name</th>" >> ./test_simulator_results.html
-        echo "        <th>Command</th>" >> ./test_simulator_results.html
-        echo "        <th>Status</th>" >> ./test_simulator_results.html
-        echo "        <th>Statistics</th>" >> ./test_simulator_results.html
-        echo "      </tr>" >> ./test_simulator_results.html
-
-        EPC_CONFIGS=("noS1")
-        TRANS_MODES=("tdd")
-        BW_CASES=(106)
-        for CN_CONFIG in ${EPC_CONFIGS[@]}
-        do
-          for TMODE in ${TRANS_MODES[@]}
-          do
-            for BW in ${BW_CASES[@]}
-            do
-                echo "      <tr bgcolor = \"#8FBC8F\" >" >> ./test_simulator_results.html
-                if [[ $CN_CONFIG =~ .*wS1.* ]]
-                then
-                    echo "          <td align = \"center\" colspan = 4 >Test with EPC (aka withS1): ${TMODE} -- ${BW}PRB </td>" >> ./test_simulator_results.html
-                else
-                    echo "          <td align = \"center\" colspan = 4 >Test without EPC (aka noS1): ${TMODE} -- ${BW}PRB </td>" >> ./test_simulator_results.html
-                fi
-                echo "      </tr>" >> ./test_simulator_results.html
-
-                #RA test (--do-ra option)
-
-                #build log files names
-                RA_ENB_LOG=$ARCHIVES_LOC/${TMODE}_${BW}prb_${CN_CONFIG}_gnb_ra_test.log
-                RA_UE_LOG=$ARCHIVES_LOC/${TMODE}_${BW}prb_${CN_CONFIG}_ue_ra_test.log
-                if [ -f $RA_ENB_LOG ] && [ -f $RA_UE_LOG ]
-                then
-                    #get rid of full path
-                    NAME_ENB=`echo $RA_ENB_LOG | sed -e "s#$ARCHIVES_LOC/##"`
-                    NAME_UE=`echo $RA_UE_LOG | sed -e "s#$ARCHIVES_LOC/##"`
-                    echo "      <tr>" >> ./test_simulator_results.html
-                    echo "        <td>$NAME_ENB --- $NAME_UE</td>" >> ./test_simulator_results.html
-                    echo "        <td>Check if RA proc succeeded</td>" >> ./test_simulator_results.html
-
-                    #gNB RA check
-                    GNB_RECEIVED=`egrep -c "\[RAPROC\] PUSCH with TC_RNTI (.+) received correctly" $RA_ENB_LOG`
-                    #UE RA check
-                    UE_RA_PROC_OK=`egrep -c "\[RAPROC\] RA procedure succeeded" $RA_UE_LOG`
-
-
-                    if [ $GNB_RECEIVED -gt 0 ] && [ $UE_RA_PROC_OK -gt 0 ]
-                    then
-                        echo "        <td bgcolor = \"green\" >OK</td>" >> ./test_simulator_results.html
-                    else
-                        echo "        <td bgcolor = \"red\" >KO</td>" >> ./test_simulator_results.html
-                    fi
-
-                    echo "        <td><pre>" >> ./test_simulator_results.html
-                    if [ $GNB_RECEIVED -gt 0 ]
-                    then
-                        echo "<font color = \"blue\">- gNB --> RA received</font>" >> ./test_simulator_results.html
-                    else
-                        echo "<font color = \"red\"><b>- gNB RA NOT RECEIVED</b></font>" >> ./test_simulator_results.html
-                    fi
-                    if [ $UE_RA_PROC_OK -gt 0 ]
-                    then
-                        echo "<font color = \"blue\">- NR UE  --> RA procedure succeded</font>" >> ./test_simulator_results.html
-                    else
-                        echo "<font color = \"red\"><b>- NR UE RA procedure failed</b></font>" >> ./test_simulator_results.html
-                    fi
-                    echo "        </pre></td>" >> ./test_simulator_results.html
-                    echo "      </tr>" >> ./test_simulator_results.html
-                fi
-
-                #SYNC test
-                ENB_LOG=$ARCHIVES_LOC/${TMODE}_${BW}prb_${CN_CONFIG}_gnb.log
-                UE_LOG=`echo $ENB_LOG | sed -e "s#gnb#ue#"`
-                if [ -f $ENB_LOG ] && [ -f $UE_LOG ]
-                then
-                    NAME_ENB=`echo $ENB_LOG | sed -e "s#$ARCHIVES_LOC/##"`
-                    NAME_UE=`echo $UE_LOG | sed -e "s#$ARCHIVES_LOC/##"`
-                    echo "      <tr>" >> ./test_simulator_results.html
-                    echo "        <td>$NAME_ENB --- $NAME_UE</td>" >> ./test_simulator_results.html
-                    echo "        <td>N/A</td>" >> ./test_simulator_results.html
-                    NB_ENB_GOT_SYNC=`egrep -c "got sync" $ENB_LOG`
-                    NB_ENB_TUNNEL_UP=`egrep -c "Interface oaitun_enb1 successfully configured" $ENB_LOG`
-                    NB_UE_GOT_SYNC=`egrep -c "rfsimulator: Success" $UE_LOG`
-                    NB_ENB_SYNCED_WITH_UE=`egrep -c "Initial sync: starting PBCH detection" $UE_LOG`
-                    NB_UE_TUNNEL_UP=`egrep -c "Interface oaitun_ue1 successfully configured" $UE_LOG`
-                    if [ $NB_ENB_GOT_SYNC -gt 0 ] && [ $NB_UE_GOT_SYNC -gt 0 ] && [ $NB_ENB_SYNCED_WITH_UE -gt 0 ]
-                    then
-                        echo "        <td bgcolor = \"green\" >OK</td>" >> ./test_simulator_results.html
-                    else
-                        echo "        <td bgcolor = \"red\" >KO</td>" >> ./test_simulator_results.html
-                    fi
-                    echo "        <td><pre>" >> ./test_simulator_results.html
-                    if [ $NB_ENB_GOT_SYNC -gt 0 ]
-                    then
-                        echo "<font color = \"blue\">- gNB --> got sync</font>" >> ./test_simulator_results.html
-                    else
-                        echo "<font color = \"red\"><b>- gNB NEVER got sync</b></font>" >> ./test_simulator_results.html
-                    fi
-                    if [ $NB_ENB_TUNNEL_UP -gt 0 ]
-                    then
-                        echo "<font color = \"blue\">- gNB mounted oaitun_enb1 interface</font>" >> ./test_simulator_results.html
-                    else
-                        echo "<font color = \"red\"><b>- gNB NEVER mounted oaitun_enb1 interface</b></font>" >> ./test_simulator_results.html
-                    fi
-                    if [ $NB_UE_GOT_SYNC -gt 0 ]
-                    then
-                        echo "<font color = \"blue\">- NR UE --> got sync</font>" >> ./test_simulator_results.html
-                    else
-                        echo "<font color = \"red\"><b>- NR UE NEVER got sync</b></font>" >> ./test_simulator_results.html
-                    fi
-                    if [ $NB_ENB_SYNCED_WITH_UE -gt 0 ]
-                    then
-                        echo "<font color = \"blue\">- NR UE attached to gNB</font>" >> ./test_simulator_results.html
-                    else
-                        echo "<font color = \"red\"><b>- NR UE NEVER attached to eNB</b></font>" >> ./test_simulator_results.html
-                    fi
-                    if [ $NB_UE_TUNNEL_UP -gt 0 ]
-                    then
-                        echo "<font color = \"blue\">- NR UE mounted oaitun_ue1 interface</font>" >> ./test_simulator_results.html
-                    else
-                        echo "<font color = \"red\"><b>- NR UE NEVER mounted oaitun_ue1 interface</b></font>" >> ./test_simulator_results.html
-                    fi
-                    echo "        </pre></td>" >> ./test_simulator_results.html
-                    echo "      </tr>" >> ./test_simulator_results.html
-                fi
-                PING_LOGS=`ls $ARCHIVES_LOC/${TMODE}_${BW}prb_${CN_CONFIG}_ping*.log 2> /dev/null`
-                analyzePingFiles
-
-                IPERF_TESTS=`ls $ARCHIVES_LOC/${TMODE}_${BW}prb_${CN_CONFIG}_iperf_dl*client*txt 2> /dev/null`
-                analyzeIperfFiles
-
-                IPERF_TESTS=`ls $ARCHIVES_LOC/${TMODE}_${BW}prb_${CN_CONFIG}_iperf_ul*client*txt 2> /dev/null`
-                analyzeIperfFiles
-            done
-          done
-        done
-
-        echo "   </table>" >> ./test_simulator_results.html
-        echo "   </div>" >> ./test_simulator_results.html
-    fi
-
     ARCHIVES_LOC=archives/l2_sim/test
     if [ -d $ARCHIVES_LOC ]
     then
-        echo "   <h3>4G LTE L2-NFAPI Simulator Check</h3>" >> ./test_simulator_results.html
+        echo "   <h3>L2-NFAPI Simulator Check</h3>" >> ./test_simulator_results.html
 
         if [ -f $ARCHIVES_LOC/test_final_status.log ]
         then

ci-scripts/sshconnection.py

@@ -1,233 +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
-# */
-#---------------------------------------------------------------------
-# Python for CI of OAI-eNB + COTS-UE
-#
-#   Required Python Version
-#     Python 3.x
-#
-#   Required Python Package
-#     pexpect
-#---------------------------------------------------------------------
-
-#-----------------------------------------------------------
-# Import
-#-----------------------------------------------------------
-import pexpect          # pexpect
-import logging
-import time             # sleep
-import re
-import sys
-
-#-----------------------------------------------------------
-# Class Declaration
-#-----------------------------------------------------------
-class SSHConnection():
-	def __init__(self):
-		self.ssh = ''
-		self.picocom_closure = False
-
-	def disablePicocomClosure(self):
-		self.picocom_closure = False
-
-	def enablePicocomClosure(self):
-		self.picocom_closure = True
-
-	def open(self, ipaddress, username, password):
-		extraSshOptions = ''
-		count = 0
-		connect_status = False
-		if ipaddress == '192.168.18.197':
-			extraSshOptions = ' -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no'
-		while count < 4:
-			self.ssh = pexpect.spawn('ssh', [username + '@' + ipaddress + extraSshOptions], timeout = 5)
-			self.sshresponse = self.ssh.expect(['Are you sure you want to continue connecting (yes/no)?', 'password:', 'Last login', pexpect.EOF, pexpect.TIMEOUT])
-			if self.sshresponse == 0:
-				self.ssh.sendline('yes')
-				self.sshresponse = self.ssh.expect(['password:', username + '@'])
-				if self.sshresponse == 0:
-					self.ssh.sendline(password)
-				self.sshresponse = self.ssh.expect(['\$', 'Permission denied', 'password:', pexpect.EOF, pexpect.TIMEOUT])
-				if self.sshresponse == 0:
-					count = 10
-					connect_status = True
-				else:
-					logging.debug('self.sshresponse = ' + str(self.sshresponse))
-			elif self.sshresponse == 1:
-				self.ssh.sendline(password)
-				self.sshresponse = self.ssh.expect(['\$', 'Permission denied', 'password:', pexpect.EOF, pexpect.TIMEOUT])
-				if self.sshresponse == 0:
-					count = 10
-					connect_status = True
-				else:
-					logging.debug('self.sshresponse = ' + str(self.sshresponse))
-			elif self.sshresponse == 2:
-				# Checking if we are really on the remote client defined by its IP address
-				self.command('stdbuf -o0 ifconfig | egrep --color=never "inet addr:|inet "', '\$', 5)
-				result = re.search(str(ipaddress), str(self.ssh.before))
-				if result is None:
-					self.close()
-				else:
-					count = 10
-					connect_status = True
-			else:
-				# debug output
-				logging.debug(str(self.ssh.before))
-				logging.debug('self.sshresponse = ' + str(self.sshresponse))
-			# adding a tempo when failure
-			if not connect_status:
-				time.sleep(1)
-			count += 1
-		if connect_status:
-			pass
-		else:
-			sys.exit('SSH Connection Failed')
-
-
-
-
-	def cde_check_value(self, commandline, expected, timeout):
-		logging.debug(commandline)
-		self.ssh.timeout = timeout
-		self.ssh.sendline(commandline)
-		expected.append(pexpect.EOF)
-		expected.append(pexpect.TIMEOUT)
-		self.sshresponse = self.ssh.expect(expected)
-		return self.sshresponse
-
-	def command(self, commandline, expectedline, timeout):
-		logging.debug(commandline)
-		self.ssh.timeout = timeout
-		self.ssh.sendline(commandline)
-		self.sshresponse = self.ssh.expect([expectedline, pexpect.EOF, pexpect.TIMEOUT])
-		if self.sshresponse == 0:
-			return 0
-		elif self.sshresponse == 1:
-			logging.debug('\u001B[1;37;41m Unexpected EOF \u001B[0m')
-			logging.debug('Expected Line : ' + expectedline)
-			logging.debug(str(self.ssh.before))
-			sys.exit(self.sshresponse)
-		elif self.sshresponse == 2:
-			logging.debug('\u001B[1;37;41m Unexpected TIMEOUT \u001B[0m')
-			logging.debug('Expected Line : ' + expectedline)
-			result = re.search('ping |iperf |picocom', str(commandline))
-			if result is None:
-				logging.debug(str(self.ssh.before))
-				sys.exit(self.sshresponse)
-			else:
-				return -1
-		else:
-			logging.debug('\u001B[1;37;41m Unexpected Others \u001B[0m')
-			logging.debug('Expected Line : ' + expectedline)
-			sys.exit(self.sshresponse)
-
-	def close(self):
-		self.ssh.timeout = 5
-		self.ssh.sendline('exit')
-		self.sshresponse = self.ssh.expect([pexpect.EOF, pexpect.TIMEOUT])
-		if self.sshresponse == 0:
-			pass
-		elif self.sshresponse == 1:
-			if not self.picocom_closure:
-				logging.debug('\u001B[1;37;41m Unexpected TIMEOUT during closing\u001B[0m')
-		else:
-			logging.debug('\u001B[1;37;41m Unexpected Others during closing\u001B[0m')
-
-	def copyin(self, ipaddress, username, password, source, destination):
-		count = 0
-		copy_status = False
-		logging.debug('scp '+ username + '@' + ipaddress + ':' + source + ' ' + destination)
-		while count < 10:
-			scp_spawn = pexpect.spawn('scp '+ username + '@' + ipaddress + ':' + source + ' ' + destination, timeout = 100)
-			scp_response = scp_spawn.expect(['Are you sure you want to continue connecting (yes/no)?', 'password:', pexpect.EOF, pexpect.TIMEOUT])
-			if scp_response == 0:
-				scp_spawn.sendline('yes')
-				scp_spawn.expect('password:')
-				scp_spawn.sendline(password)
-				scp_response = scp_spawn.expect(['\$', 'Permission denied', 'password:', pexpect.EOF, pexpect.TIMEOUT])
-				if scp_response == 0:
-					count = 10
-					copy_status = True
-				else:
-					logging.debug('1 - scp_response = ' + str(scp_response))
-			elif scp_response == 1:
-				scp_spawn.sendline(password)
-				scp_response = scp_spawn.expect(['\$', 'Permission denied', 'password:', pexpect.EOF, pexpect.TIMEOUT])
-				if scp_response == 0 or scp_response == 3:
-					count = 10
-					copy_status = True
-				else:
-					logging.debug('2 - scp_response = ' + str(scp_response))
-			elif scp_response == 2:
-				count = 10
-				copy_status = True
-			else:
-				logging.debug('3 - scp_response = ' + str(scp_response))
-			# adding a tempo when failure
-			if not copy_status:
-				time.sleep(1)
-			count += 1
-		if copy_status:
-			return 0
-		else:
-			return -1
-
-	def copyout(self, ipaddress, username, password, source, destination):
-		count = 0
-		copy_status = False
-		logging.debug('scp ' + source + ' ' + username + '@' + ipaddress + ':' + destination)
-		while count < 4:
-			scp_spawn = pexpect.spawn('scp ' + source + ' ' + username + '@' + ipaddress + ':' + destination, timeout = 100)
-			scp_response = scp_spawn.expect(['Are you sure you want to continue connecting (yes/no)?', 'password:', pexpect.EOF, pexpect.TIMEOUT])
-			if scp_response == 0:
-				scp_spawn.sendline('yes')
-				scp_spawn.expect('password:')
-				scp_spawn.sendline(password)
-				scp_response = scp_spawn.expect(['\$', 'Permission denied', 'password:', pexpect.EOF, pexpect.TIMEOUT])
-				if scp_response == 0:
-					count = 10
-					copy_status = True
-				else:
-					logging.debug('1 - scp_response = ' + str(scp_response))
-			elif scp_response == 1:
-				scp_spawn.sendline(password)
-				scp_response = scp_spawn.expect(['\$', 'Permission denied', 'password:', pexpect.EOF, pexpect.TIMEOUT])
-				if scp_response == 0 or scp_response == 3:
-					count = 10
-					copy_status = True
-				else:
-					logging.debug('2 - scp_response = ' + str(scp_response))
-			elif scp_response == 2:
-				count = 10
-				copy_status = True
-			else:
-				logging.debug('3 - scp_response = ' + str(scp_response))
-			# adding a tempo when failure
-			if not copy_status:
-				time.sleep(1)
-			count += 1
-		if copy_status:
-			pass
-		else:
-			sys.exit('SCP failed')
-
-	def getBefore(self):
-		return str(self.ssh.before)

ci-scripts/waitBuildOnVM.sh

@@ -76,8 +76,6 @@ 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
@@ -136,10 +134,14 @@ function check_on_vm_build {
         if [[ $FULLFILE == *"$LOG_PATTERN"* ]]
         then
             filename=$(basename -- "$FULLFILE")
-            if [ "$LOG_PATTERN" == ".Rel15.txt" ]
+            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"
@@ -170,9 +172,6 @@ function check_on_vm_build {
     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

ci-scripts/xml_class_list.yml

@@ -1,34 +0,0 @@
-  - Build_PhySim
-  - Run_PhySim
-  - Build_eNB
-  - WaitEndBuild_eNB
-  - Initialize_eNB
-  - Terminate_eNB
-  - Initialize_UE
-  - Terminate_UE
-  - Attach_UE
-  - Detach_UE
-  - Build_OAI_UE
-  - Initialize_OAI_UE
-  - Terminate_OAI_UE
-  - DataDisable_UE
-  - DataEnable_UE
-  - CheckStatusUE
-  - Ping
-  - Iperf
-  - Reboot_UE
-  - Initialize_FlexranCtrl
-  - Terminate_FlexranCtrl
-  - Initialize_HSS
-  - Terminate_HSS
-  - Initialize_MME
-  - Terminate_MME
-  - Initialize_SPGW
-  - Terminate_SPGW
-  - Initialize_CatM_module
-  - Terminate_CatM_module
-  - Attach_CatM_module
-  - Detach_CatM_module
-  - Ping_CatM_module
-  - IdleSleep
-  - Perform_X2_Handover

ci-scripts/xml_files/enb_ocp_usrp210_band7_test_05mhz_tm1.xml

@@ -1,147 +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>
-	<htmlTabRef>test-05-tm1</htmlTabRef>
-	<htmlTabName>Test-05MHz-TM1</htmlTabName>
-	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>4</repeatCount>
-	<TestCaseRequestedList>
- 030201
- 040101
- 030101 040301 040501 040603 040604 040605 040606 040607 040641 040642 040643 040644 040401 040201 030201
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-
-	<testCase id="030101">
-		<class>Initialize_eNB</class>
-		<desc>Initialize OCP-eNB (FDD/Band7/5MHz)</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band7.tm1.25PRB.usrpb210.conf</Initialize_eNB_args>
-		<air_interface>ocp</air_interface>
-	</testCase>
-
-	<testCase id="030201">
-		<class>Terminate_eNB</class>
-		<desc>Terminate OCP-eNB</desc>
-		<air_interface>ocp</air_interface>
-	</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="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>
-
-</testCaseList>

ci-scripts/xml_files/enb_ocp_usrp210_build.xml

@@ -1,38 +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>
-	<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 OCP (USRP)</desc>
-		<Build_eNB_args>-w USRP -c --eNBocp --ninja</Build_eNB_args>
-	</testCase>
-
-</testCaseList>

ci-scripts/xml_files/enb_ue_usrp210_band7_build.xml

@@ -1,38 +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>
-	<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>

ci-scripts/xml_files/enb_ue_usrp210_band7_epc_start.xml

@@ -25,10 +25,23 @@
 	<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>

ci-scripts/xml_files/enb_ue_usrp210_band7_test_05mhz_tm1.xml

@@ -109,8 +109,8 @@
 
 	<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>
+		<desc>iperf (5MHz - UL/8Mbps/UDP)(30 sec)</desc>
+		<iperf_args>-c 10.0.1.1 -u -b 8M -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>

ci-scripts/xml_files/enb_ue_usrp210_band7_test_05mhz_tm1_fembms_no_s1.xml

@@ -1,82 +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>
-	<htmlTabRef>test-05-tm1-fembms-nos1-tunnel</htmlTabRef>
-	<htmlTabName>Test-05MHz-FEMBMS-TM1-noS1-tunnel</htmlTabName>
-	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>2</repeatCount>
-	<TestCaseRequestedList>
- 030201 090109
- 030104 000001 090104 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="030104">
-		<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 --eNBs.[0].component_carriers.[0].mbms_dedicated_serving_cell ENABLE --MCEs.[0].mbms_sched_info.mbms_area_config_list.[0].pmch_config_list.[0].allocated_sf_end 512</Initialize_eNB_args>
-	</testCase>
-
-	<testCase id="030201">
-		<class>Terminate_eNB</class>
-		<desc>Terminate eNB</desc>
-	</testCase>
-
-	<testCase id="090104">
-		<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>

ci-scripts/xml_files/enb_ue_usrp210_band7_test_05mhz_tm1_mbms_no_s1.xml

@@ -1,82 +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>
-	<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>

ci-scripts/xml_files/enb_ue_usrp210_band7_test_05mhz_tm1_s1.xml

@@ -96,8 +96,8 @@
 
 	<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>
+		<desc>iperf (5MHz - UL/8Mbps/UDP)(30 sec)</desc>
+		<iperf_args>-u -b 8M -t 30 -i 1 -fm -R</iperf_args>
 		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
 		<iperf_profile>balanced</iperf_profile>
 	</testCase>

ci-scripts/xml_files/enb_ue_usrp210_band7_ue_build.xml

@@ -1,38 +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>
-	<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>