Fix: avoid using id 0 for slice

Note: assume default slice nssai is sst 0 and sd 0, which is reserved for SRB. it needs to be assigned to sched_ctrl before gnb created slice from RC control message in order to be able associated to the corresponding slice

.gitignore

@@ -25,4 +25,3 @@ tags
 nfapi_nr_interface_scf
 *.log
 *.out
-CMakeUserPresets.json

CHANGELOG.md

@@ -1,88 +1,5 @@
 # RELEASE NOTES: #
 
-## [v2.2.0](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tags/v2.2.0) -> November 2024. ##
-
-General 5G improvements (both gNB and UE):
-- Make standalone mode (SA) the default (see [`RUNMODEM.md`](doc/RUNMODEM.md))
-- Experimental support for FR2 operation
-- Support for GEO NTN and simulation of GEO satellite channel in RFsimulator
-  (see [`RUNMODEM.md`](doc/RUNMODEM.md))
-- Support 2-step RA
-- Add optional LTTng logger in logging module (see
-  [`lttng_logs.md`](common/utils/LOG/DOC/lttng_logs.md))
-- Support for YAML-based config files (alongside libconfig) (see
-  [`gnb.sa.band78.106prb.rfsim.yaml`](ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.yaml) and
-  [`nrue.uicc.yaml`](ci-scripts/conf_files/nrue.uicc.yaml))
-- Add new L1 scope based on Dear ImGui (see [`readme.md`](openair1/PHY/TOOLS/readme.md))
-- Allow cross-compilation on ARM (via SIMDE SIMD emulation library)
-- Allow to build and run with clang
-- Support/check for Linux capabilities, allow to run without sudo (see
-  [`tuning_and_security.md`](doc/tuning_and_security.md))
-- OAI does not modify CPU frequency and networking stack
-  ([`tuning_and_security.md`](doc/tuning_and_security.md))
-- Bugfixes in the entire stack (e.g.  #547, #663, #674, #687, #712, #736, #739,
-  #741, #756, #762, #773, ...)
-
-5G gNB:
-- Support for FR2 interoperability with COTS UE (no beam switching supported yet)
-- Add 4-layer DL MIMO (experimental)
-- Add gNB Neighbour configuration and Mobility over F1 interface (see
-  [`handover-tutorial.md`](doc/handover-tutorial.md))
-- Enhance O-RAN FHI 7.2: (see [`ORAN_FHI7.2_Tutorial.md`](doc/ORAN_FHI7.2_Tutorial.md))
-  * Support different bandwidths (40/60/80/100MHz) and antenna configs (1x1 up
-    to 4x4) for Benetel/VVDN/LITEON RUs
-  * Add support for multi-RU support (single-cell/distributed antenna)
-- Support AMD T2 Telco card look-aside L1 accelerator (see
-  [`LDPC_T2_OFFLOAD_SETUP.md`](doc/LDPC_T2_OFFLOAD_SETUP.md))
-- Support Nvidia Aerial/ARC in-line L1 accelerator (see
-  [`Aerial_FAPI_Split_Tutorial.md`](doc/Aerial_FAPI_Split_Tutorial.md))
-- Various fixes for multi-UE operation: by default support of up to 16 UEs concurrently
-- Documentation for
-  - 5G MAC (see [`mac-usage.md`](doc/MAC/mac-usage.md))
-  - 5G RRC (see [`rrc-usage.md`](doc/RRC/rrc-usage.md))
-  - E1 (see [`E1-design.md`](doc/E1AP/E1-design.md))
-  - F1 (see [`F1-design.md`](doc/F1AP/F1-design.md))
-
-5G UE:
-- Basic interoperability with COTS gNB (Nokia gNB)
-- Implement PHR reporting
-- Implement RRC re-establishment
-- Implement PUCCH/PUSCH/SRS power control
-- Implement UCI on PUSCH and aperiodic CSI reporting
-- Support of cell search (within the selected UE bandwidth) (see [`RUNMODEM.md`](doc/RUNMODEM.md))
-- Enhance connection control: implement timers, resync
-- A lot of internal cleanup
-
-This release also includes many fixes and documentation updates. See
-`doc/README.md` in the repository for an overview of documentation.
-
-## [v2.1.0](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tags/v2.1.0) -> February 2024. ##
-
-This release improves existing 5G support and adds various new features.
-
-* 5G gNB
-  - Add support for O-RAN 7.2 fronthaul interface
-    (tested with 3 O-RUs: Benetel, LITEON, VVDN)
-  - Add support for 2-layer UL MIMO
-  - FDD interoperability with COTS UE
-  - Compiles on ARM (through SIMDE)
-  - Introduce E2 agent and basic support for E2SM-KPM and E2SM-RC
-  - Add support for E1AP
-  - Add support for multiple DUs and CU-UPs at one CU-CP
-  - FR2 SA with OAI UE
-  - Improve computational efficiency
-* 5G UE
-  - Cleanup in MAC and RRC towards support of 3rd-party gNB
-  - FR2 SA with OAI gNB
-  - Improve computational efficiency
-
-Overall the stability is improved for the same resource usage.
-
-There is basic FR2 support between OAI gNB and OAI nrUE. COTS UE
-interoperability is under testing.
-
-This release also includes many fixes and documentation updates.
-
 ## [v2.0.0](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tags/v2.0.0) -> August 2023. ##
 
 This release adds support for 5G and maintains previous features:

CMakePresets.json

@@ -1,64 +0,0 @@
-{
-    "version": 3,
-    "configurePresets": [
-        {
-            "name": "default",
-            "displayName": "Default Config",
-            "description": "Default build using Ninja generator",
-            "generator": "Ninja",
-            "binaryDir": "${sourceDir}/cmake_targets/ran_build/build",
-            "cacheVariables": {
-                "CMAKE_BUILD_TYPE": "RelWithDebInfo"
-            }
-        },
-        {
-            "name": "tests",
-            "displayName": "Default unit test config",
-            "inherits": "default",
-            "binaryDir": "${sourceDir}/cmake_targets/ran_build/build_test",
-            "cacheVariables": {
-                "ENABLE_TESTS": "ON",
-                "SANITIZE_ADDRESS": "ON",
-                "CMAKE_BUILD_TYPE": "RelWithDebInfo"
-            }
-        }
-    ],
-    "buildPresets": [
-        {
-            "name": "5gdefault",
-            "configurePreset": "default",
-            "targets": [
-                "nr-uesoftmodem",
-                "nr-softmodem",
-                "rfsimulator",
-                "dfts",
-                "ldpc",
-                "params_libconfig",
-                "params_yaml"
-            ]
-        },
-        {
-            "name": "default",
-            "inherits": "5gdefault"
-        },
-        {
-            "name": "4gdefault",
-            "configurePreset": "default",
-            "targets": [
-                "lte-softmodem",
-                "lte-uesoftmodem",
-                "dfts",
-                "coding",
-                "rfsimulator",
-                "params_libconfig"
-            ]
-        },
-        {
-            "name": "tests",
-            "configurePreset": "tests",
-            "targets": [
-                "tests"
-            ]
-        }
-    ]
-}

CONTRIBUTING.md

@@ -5,26 +5,22 @@ We want to make contributing to this project as easy and transparent as possible
 Please refer to the steps described on our website: [How to contribute to OAI](https://www.openairinterface.org/?page_id=112).
 
 1. Sign and return a Contributor License Agreement to OAI team.
-2. Register on [Eurecom GitLab Server](https://gitlab.eurecom.fr/users/sign_up)
-   if you do not have any.
+2. Register on [Eurecom GitLab Server](https://gitlab.eurecom.fr/users/sign_up) if you do not have any.
    - We recommend that you register with a professional or student email address.
-   - If your email domain (`@domain.com`) is not whitelisted, please contact us
-     (mailto:contact@openairinterface.org).
+   - If your email domain (`@domain.com`) is not whitelisted, please contact us (mailto:contact@openairinterface.org).
    - Eurecom GitLab does NOT accept public email domains.
-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 contributing policies are described in the [corresponding documentation
-   page](doc/code-style-contrib.md).
-   - 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.
+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.
 
-# License #
+## Coding Styles ##
 
-By contributing to OpenAirInterface, you agree that your contributions will be
-licensed under the license described in the file [`LICENSE`](./LICENSE) in the
-root directory of this source tree.
+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

@@ -4,6 +4,15 @@ For more details of the license, refer to [LICENSE](LICENSE) file in the same di
 
 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.

README.md

@@ -4,11 +4,12 @@
 
 <p align="center">
     <a href="https://gitlab.eurecom.fr/oai/openairinterface5g/-/blob/master/LICENSE"><img src="https://img.shields.io/badge/license-OAI--Public--V1.1-blue" alt="License"></a>
+    <a href="https://releases.ubuntu.com/18.04/"><img src="https://img.shields.io/badge/OS-Ubuntu18-Green" alt="Supported OS Ubuntu 18"></a>
     <a href="https://releases.ubuntu.com/20.04/"><img src="https://img.shields.io/badge/OS-Ubuntu20-Green" alt="Supported OS Ubuntu 20"></a>
     <a href="https://releases.ubuntu.com/22.04/"><img src="https://img.shields.io/badge/OS-Ubuntu22-Green" alt="Supported OS Ubuntu 22"></a>
-    <a href="https://releases.ubuntu.com/24.04/"><img src="https://img.shields.io/badge/OS-Ubuntu24-Green" alt="Supported OS Ubuntu 24"></a>
+    <a href="https://www.redhat.com/en/technologies/linux-platforms/enterprise-linux"><img src="https://img.shields.io/badge/OS-RHEL8-Green" alt="Supported OS RHEL8"></a>
     <a href="https://www.redhat.com/en/technologies/linux-platforms/enterprise-linux"><img src="https://img.shields.io/badge/OS-RHEL9-Green" alt="Supported OS RELH9"></a>
-    <a href="https://getfedora.org/en/workstation/"><img src="https://img.shields.io/badge/OS-Fedore41-Green" alt="Supported OS Fedora 41"></a>
+    <a href="https://getfedora.org/en/workstation/"><img src="https://img.shields.io/badge/OS-Fedore37-Green" alt="Supported OS Fedora 37"></a>
 </p>
 
 <p align="center">
@@ -24,7 +25,6 @@
   <a href="https://hub.docker.com/r/oaisoftwarealliance/oai-nr-ue"><img alt="Docker Pulls" src="https://img.shields.io/docker/pulls/oaisoftwarealliance/oai-nr-ue?label=NR-UE%20docker%20pulls"></a>
   <a href="https://hub.docker.com/r/oaisoftwarealliance/oai-enb"><img alt="Docker Pulls" src="https://img.shields.io/docker/pulls/oaisoftwarealliance/oai-enb?label=eNB%20docker%20pulls"></a>
   <a href="https://hub.docker.com/r/oaisoftwarealliance/oai-lte-ue"><img alt="Docker Pulls" src="https://img.shields.io/docker/pulls/oaisoftwarealliance/oai-lte-ue?label=LTE-UE%20docker%20pulls"></a>
-  <a href="https://hub.docker.com/r/oaisoftwarealliance/oai-nr-cuup"><img alt="Docker Pulls" src="https://img.shields.io/docker/pulls/oaisoftwarealliance/oai-nr-cuup?label=NR-CUUP%20docker%20pulls"></a>
 </p>
 
 # OpenAirInterface License #
@@ -42,7 +42,6 @@ Please see [NOTICE](NOTICE.md) file for third party software that is included in
 
  *  [General overview of documentation](./doc/README.md)
  *  [The implemented features](./doc/FEATURE_SET.md)
- *  [System Requirements for Using OAI Stack](./doc/system_requirements.md)
  *  [How to build](./doc/BUILD.md)
  *  [How to run the modems](./doc/RUNMODEM.md)
 
@@ -70,28 +69,10 @@ openairinterface5g
 ├── executables       : Top-level executable source files (gNB, eNB, ...)
 ├── maketags          : Script to generate emacs tags.
 ├── nfapi             : (n)FAPI code for MAC-PHY interface
-├── openair1          : Layer 1 (3GPP LTE Rel-10/12 PHY, NR Rel-15 PHY)
-├── openair2          : Layer 2 (3GPP LTE Rel-10 MAC/RLC/PDCP/RRC/X2AP, LTE Rel-14 M2AP, NR Rel-15+ MAC/RLC/PDCP/SDAP/RRC/X2AP/F1AP/E1AP), E2AP
-├── openair3          : Layer 3 (3GPP LTE Rel-10 S1AP/GTP, NR Rel-15 NGAP/GTP)
+├── openair1          : 3GPP LTE Rel-10/12 PHY layer / 3GPP NR Rel-15 layer. A local Readme file provides more details.
+├── 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.
+├── openair3          : 3GPP LTE Rel10 for S1AP, NAS GTPV1-U for both ENB and UE.
 ├── openshift         : OpenShift helm charts for some deployment options of OAI
-├── radio             : Drivers for various radios such as USRP, AW2S, RFsim, 7.2 FHI, ...
-├── targets           : Some configuration files; only historical relevance, and might be deleted in the future
-└── tools             : Tools for use by the developers/ci machines: code analysis and formatting
+├── radio             : Drivers for various radios such as USRP, AW2S, RFsim, ...
+└── targets           : Some configuration files; only historical relevance, and might be deleted in the future
 ```
-
-# How to get support from the OAI Community # 
-
-You can ask your question on the [mailing lists](https://gitlab.eurecom.fr/oai/openairinterface5g/-/wikis/MailingList).
-
-Your email should contain below information:
-
-- A clear subject in your email.
-- For all the queries there should be [Query\] in the subject of the email and for problems there should be [Problem\].
-- In case of a problem, add a small description.
-- Do not share any photos unless you want to share a diagram.
-- OAI gNB/DU/CU/CU-CP/CU-UP configuration file in `.conf` format only.
-- Logs of OAI gNB/DU/CU/CU-CP/CU-UP in `.log` or `.txt` format only.
-- In case your question is related to performance, include a small description of the machine (Operating System, Kernel version, CPU, RAM and networking card) and diagram of your testing environment.
-- Known/open issues are present on [GitLab](https://gitlab.eurecom.fr/oai/openairinterface5g/-/issues), so keep checking.
-
-Always remember a structured email will help us understand your issues quickly.

charts/physims/charts/dlsim.100rb+tm2/templates/job.yaml

@@ -18,11 +18,6 @@ spec:
       - name: physim
         image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
-        {{- if .Values.global.resources.define}}
-        resources:
-          requests:
-            cpu: {{ .Values.global.resources.requests.cpu | quote }}
-        {{- end}}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
         env:
@@ -42,6 +37,6 @@ spec:
       nodeSelector:
          {{- toYaml .Values.global.nodeSelector | nindent 12 }}
       {{- end }}
-      {{- if .Values.global.nodeName}}
+      {{- if .Values.global.nodeName.dlsim100rbtm2}}
       nodeName: {{ .Values.global.nodeName.dlsim100rbtm2 }}
       {{- end }}

charts/physims/charts/dlsim.basic/templates/job.yaml

@@ -18,11 +18,6 @@ spec:
       - name: physim
         image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
-        {{- if .Values.global.resources.define}}
-        resources:
-          requests:
-            cpu: {{ .Values.global.resources.requests.cpu | quote }}
-        {{- end}}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
         env:
@@ -42,6 +37,6 @@ spec:
       nodeSelector:
          {{- toYaml .Values.global.nodeSelector | nindent 12 }}
       {{- end }}
-      {{- if .Values.global.nodeName}}
+      {{- if .Values.global.nodeName.dlsimbasic}}
       nodeName: {{ .Values.global.nodeName.dlsimbasic }}
       {{- end }}

charts/physims/charts/ldpctest/templates/job.yaml

@@ -18,11 +18,6 @@ spec:
       - name: physim
         image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
-        {{- if .Values.global.resources.define}}
-        resources:
-          requests:
-            cpu: {{ .Values.global.resources.requests.cpu | quote }}
-        {{- end}}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
         env:
@@ -42,6 +37,6 @@ spec:
       nodeSelector:
          {{- toYaml .Values.global.nodeSelector | nindent 12 }}
       {{- end }}
-      {{- if .Values.global.nodeName}}
+      {{- if .Values.global.nodeName.ldpctest}}
       nodeName: {{ .Values.global.nodeName.ldpctest }}
       {{- end }}

charts/physims/charts/nr-dlschsim/templates/job.yaml

@@ -18,11 +18,6 @@ spec:
       - name: physim
         image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
-        {{- if .Values.global.resources.define}}
-        resources:
-          requests:
-            cpu: {{ .Values.global.resources.requests.cpu | quote }}
-        {{- end}}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
         env:
@@ -42,6 +37,6 @@ spec:
       nodeSelector:
          {{- toYaml .Values.global.nodeSelector | nindent 12 }}
       {{- end }}
-      {{- if .Values.global.nodeName}}
+      {{- if .Values.global.nodeName.nrdlschsim}}
       nodeName: {{ .Values.global.nodeName.nrdlschsim }}
       {{- end }}

charts/physims/charts/nr-dlsim.basic/templates/job.yaml

@@ -18,11 +18,6 @@ spec:
       - name: physim
         image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
-        {{- if .Values.global.resources.define}}
-        resources:
-          requests:
-            cpu: {{ .Values.global.resources.requests.cpu | quote }}
-        {{- end}}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
         env:
@@ -42,6 +37,6 @@ spec:
       nodeSelector:
          {{- toYaml .Values.global.nodeSelector | nindent 12 }}
       {{- end }}
-      {{- if .Values.global.nodeName}}
+      {{- if .Values.global.nodeName.nrdlsimbasic}}
       nodeName: {{ .Values.global.nodeName.nrdlsimbasic }}
       {{- end }}

charts/physims/charts/nr-dlsim.dmrs+ptrs/templates/job.yaml

@@ -18,11 +18,6 @@ spec:
       - name: physim
         image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
-        {{- if .Values.global.resources.define}}
-        resources:
-          requests:
-            cpu: {{ .Values.global.resources.requests.cpu | quote }}
-        {{- end}}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
         env:
@@ -42,6 +37,6 @@ spec:
       nodeSelector:
          {{- toYaml .Values.global.nodeSelector | nindent 12 }}
       {{- end }}
-      {{- if .Values.global.nodeName}}
+      {{- if .Values.global.nodeName.nrdlsimdmrsptrs}}
       nodeName: {{ .Values.global.nodeName.nrdlsimdmrsptrs }}
       {{- end }}

charts/physims/charts/nr-dlsim.mcs+mimo/templates/job.yaml

@@ -18,11 +18,6 @@ spec:
       - name: physim
         image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
-        {{- if .Values.global.resources.define}}
-        resources:
-          requests:
-            cpu: {{ .Values.global.resources.requests.cpu | quote }}
-        {{- end}}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
         env:
@@ -42,6 +37,6 @@ spec:
       nodeSelector:
          {{- toYaml .Values.global.nodeSelector | nindent 12 }}
       {{- end }}
-      {{- if .Values.global.nodeName}}
+      {{- if .Values.global.nodeName.nrdlsimmcsmimo}}
       nodeName: {{ .Values.global.nodeName.nrdlsimmcsmimo }}
       {{- end }}

charts/physims/charts/nr-dlsim.offset/templates/job.yaml

@@ -18,11 +18,6 @@ spec:
       - name: physim
         image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
-        {{- if .Values.global.resources.define}}
-        resources:
-          requests:
-            cpu: {{ .Values.global.resources.requests.cpu | quote }}
-        {{- end}}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
         env:
@@ -42,6 +37,6 @@ spec:
       nodeSelector:
          {{- toYaml .Values.global.nodeSelector | nindent 12 }}
       {{- end }}
-      {{- if .Values.global.nodeName}}
+      {{- if .Values.global.nodeName.nrdlsimoffset}}
       nodeName: {{ .Values.global.nodeName.nrdlsimoffset }}
       {{- end }}

charts/physims/charts/nr-pbchsim.106rb/templates/job.yaml

@@ -18,11 +18,6 @@ spec:
       - name: physim
         image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
-        {{- if .Values.global.resources.define}}
-        resources:
-          requests:
-            cpu: {{ .Values.global.resources.requests.cpu | quote }}
-        {{- end}}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
         env:
@@ -42,6 +37,6 @@ spec:
       nodeSelector:
          {{- toYaml .Values.global.nodeSelector | nindent 12 }}
       {{- end }}
-      {{- if .Values.global.nodeName}}
+      {{- if .Values.global.nodeName.nrpbschsim106rb}}
       nodeName: {{ .Values.global.nodeName.nrpbschsim106rb }}
       {{- end }}

charts/physims/charts/nr-pbchsim.217rb/templates/job.yaml

@@ -18,11 +18,6 @@ spec:
       - name: physim
         image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
-        {{- if .Values.global.resources.define}}
-        resources:
-          requests:
-            cpu: {{ .Values.global.resources.requests.cpu | quote }}
-        {{- end}}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
         env:
@@ -42,6 +37,6 @@ spec:
       nodeSelector:
          {{- toYaml .Values.global.nodeSelector | nindent 12 }}
       {{- end }}
-      {{- if .Values.global.nodeName}}
+      {{- if .Values.global.nodeName.nrpbchsim217rb}}
       nodeName: {{ .Values.global.nodeName.nrpbchsim217rb }}
       {{- end }}

charts/physims/charts/nr-pbchsim.273rb/templates/job.yaml

@@ -18,11 +18,6 @@ spec:
       - name: physim
         image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
-        {{- if .Values.global.resources.define}}
-        resources:
-          requests:
-            cpu: {{ .Values.global.resources.requests.cpu | quote }}
-        {{- end}}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
         env:
@@ -42,6 +37,6 @@ spec:
       nodeSelector:
          {{- toYaml .Values.global.nodeSelector | nindent 12 }}
       {{- end }}
-      {{- if .Values.global.nodeName}}
+      {{- if .Values.global.nodeName.nrpbchsim273rb}}
       nodeName: {{ .Values.global.nodeName.nrpbchsim273rb }}
       {{- end }}

charts/physims/charts/nr-pbchsim.scs/Chart.yaml

@@ -1,36 +0,0 @@
-apiVersion: v1
-name: oai-nr-pbchsim-scs
-description: A Helm subchart for nr-pbchsim network function ("Other SCS" tests)
-
-# A chart can be either an 'application' or a 'library' chart.
-#
-# Application charts are a collection of templates that can be packaged into versioned archives
-# to be deployed.
-#
-# Library charts provide useful utilities or functions for the chart developer. They're included as
-# a dependency of application charts to inject those utilities and functions into the rendering
-# pipeline. Library charts do not define any templates and therefore cannot be deployed.
-type: application
-
-icon: http://www.openairinterface.org/wp-content/uploads/2015/06/cropped-oai_final_logo.png
-
-# This is the chart version. This version number should be incremented each time you make changes
-# to the chart and its templates, including the app version.
-version: 0.1.1
-
-# This is the version number of the application being deployed. This version number should be
-# incremented each time you make changes to the application.
-appVersion: v1
-
-keywords:
-  - Physical Simulator
-  - nr-pbchsim
-  - RAN
-  - 5G
-
-sources:
-  - https://gitlab.eurecom.fr/oai/openairinterface5g
-
-maintainers:
-  - name:  OPENAIRINTERFACE
-    email: contact@openairinterface.org

charts/physims/charts/nr-pbchsim.scs/templates/_helpers.tpl

@@ -1,63 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "oai-nr-pbchsim-scs.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
-*/}}
-{{- define "oai-nr-pbchsim-scs.fullname" -}}
-{{- if .Values.fullnameOverride -}}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- if contains $name .Release.Name -}}
-{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "oai-nr-pbchsim-scs.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Common labels
-*/}}
-{{- define "oai-nr-pbchsim-scs.labels" -}}
-helm.sh/chart: {{ include "oai-nr-pbchsim-scs.chart" . }}
-{{ include "oai-nr-pbchsim-scs.selectorLabels" . }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end -}}
-
-{{/*
-Selector labels
-*/}}
-{{- define "oai-nr-pbchsim-scs.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "oai-nr-pbchsim-scs.name" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end -}}
-
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "oai-nr-pbchsim-scs.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create -}}
-    {{ default (include "oai-nr-pbchsim-scs.fullname" .) .Values.serviceAccount.name }}
-{{- else -}}
-    {{ default "default" .Values.serviceAccount.name }}
-{{- end -}}
-{{- end -}}

charts/physims/charts/nr-pbchsim.scs/templates/job.yaml

@@ -1,47 +0,0 @@
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: {{ .Chart.Name }}
-spec:
-  template:
-    metadata:
-      labels:
-        app: physim
-    spec:
-      securityContext:
-        {{- toYaml .Values.podSecurityContext | nindent 8 }}
-    {{- if .Values.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-    {{- end }}
-      containers:
-      - name: physim
-        image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
-        imagePullPolicy: {{ .Values.image.pullPolicy }}
-        {{- if .Values.global.resources.define}}
-        resources:
-          requests:
-            cpu: {{ .Values.global.resources.requests.cpu | quote }}
-        {{- end}}
-        securityContext:
-          {{- toYaml .Values.securityContext | nindent 12 }}
-        env:
-        - name: OPENAIR_DIR
-          value: /opt/oai-physim
-        command: ["/bin/sh", "-c"]
-        args:
-        - >
-          cmake_targets/autotests/run_exec_autotests.bash -g "nr_pbchsim.otherSCS" -d bin/ &&
-          echo "FINISHED" && sleep infinity
-      dnsPolicy: ClusterFirst
-      restartPolicy: Never
-      schedulerName: default-scheduler
-      serviceAccountName: {{ .Values.global.serviceAccountName }}
-      terminationGracePeriodSeconds: 30
-      {{- if .Values.global.nodeSelector}}
-      nodeSelector:
-         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
-      {{- end }}
-      {{- if .Values.global.nodeName}}
-      nodeName: {{ .Values.global.nodeName.nrpbchsim273rb }}
-      {{- end }}

charts/physims/charts/nr-pbchsim.scs/values.yaml

@@ -1,48 +0,0 @@
-# Default values for oai-nr-pbchsim-scs
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-replicaCount: 1
-
-image:
-  # pullPolicy: IfNotPresent or Never or Always
-  pullPolicy: Always
-
-imagePullSecrets: []
-
-nameOverride: ""
-fullnameOverride: ""
-
-serviceAccount:
-  # Specifies whether a service account should be created
-  create: true
-  # Annotations to add to the service account
-  annotations: {}
-  # The name of the service account to use.
-  # If not set and create is true, a name is generated using the fullname template
-  name: "oai-nr-pbchsim-scs"
-
-podSecurityContext:
-  runAsUser: 0
-  runAsGroup: 0
-
-securityContext:
-  privileged: false
-
-resources: {}
-  # We usually recommend not to specify default resources and to leave this as a conscious
-  # choice for the user. This also increases chances charts run on environments with little
-  # resources, such as Minikube. If you do want to specify resources, uncomment the following
-  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-  # limits:
-  #   cpu: 100m
-  #   memory: 128Mi
-  # requests:
-  #   cpu: 100m
-  #   memory: 128Mi
-
-nodeSelector: {}
-
-tolerations: []
-
-affinity: {}

charts/physims/charts/nr-prachsim/templates/job.yaml

@@ -18,11 +18,6 @@ spec:
       - name: physim
         image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
-        {{- if .Values.global.resources.define}}
-        resources:
-          requests:
-            cpu: {{ .Values.global.resources.requests.cpu | quote }}
-        {{- end}}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
         env:
@@ -42,6 +37,6 @@ spec:
       nodeSelector:
          {{- toYaml .Values.global.nodeSelector | nindent 12 }}
       {{- end }}
-      {{- if .Values.global.nodeName}}
+      {{- if .Values.global.nodeName.nrprachsim}}
       nodeName: {{ .Values.global.nodeName.nrprachsim }}
       {{- end }}

charts/physims/charts/nr-psbchsim/Chart.yaml

@@ -1,36 +0,0 @@
-apiVersion: v1
-name: oai-nr-psbchsim
-description: A Helm subchart for nr-psbchsim network function
-
-# A chart can be either an 'application' or a 'library' chart.
-#
-# Application charts are a collection of templates that can be packaged into versioned archives
-# to be deployed.
-#
-# Library charts provide useful utilities or functions for the chart developer. They're included as
-# a dependency of application charts to inject those utilities and functions into the rendering
-# pipeline. Library charts do not define any templates and therefore cannot be deployed.
-type: application
-
-icon: http://www.openairinterface.org/wp-content/uploads/2015/06/cropped-oai_final_logo.png
-
-# This is the chart version. This version number should be incremented each time you make changes
-# to the chart and its templates, including the app version.
-version: 0.1.1
-
-# This is the version number of the application being deployed. This version number should be
-# incremented each time you make changes to the application.
-appVersion: v1
-
-keywords:
-  - Physical Simulator
-  - nr-psbchsim
-  - RAN
-  - 5G
-
-sources:
-  - https://gitlab.eurecom.fr/oai/openairinterface5g
-
-maintainers:
-  - name:  OPENAIRINTERFACE
-    email: contact@openairinterface.org

charts/physims/charts/nr-psbchsim/templates/_helpers.tpl

@@ -1,63 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "oai-nr-psbchsim.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
-*/}}
-{{- define "oai-nr-psbchsim.fullname" -}}
-{{- if .Values.fullnameOverride -}}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- if contains $name .Release.Name -}}
-{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "oai-nr-psbchsim.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Common labels
-*/}}
-{{- define "oai-nr-psbchsim.labels" -}}
-helm.sh/chart: {{ include "oai-nr-psbchsim.chart" . }}
-{{ include "oai-nr-psbchsim.selectorLabels" . }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end -}}
-
-{{/*
-Selector labels
-*/}}
-{{- define "oai-nr-psbchsim.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "oai-nr-psbchsim.name" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end -}}
-
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "oai-nr-psbchsim.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create -}}
-    {{ default (include "oai-nr-psbchsim.fullname" .) .Values.serviceAccount.name }}
-{{- else -}}
-    {{ default "default" .Values.serviceAccount.name }}
-{{- end -}}
-{{- end -}}

charts/physims/charts/nr-psbchsim/templates/job.yaml

@@ -1,47 +0,0 @@
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: {{ .Chart.Name }}
-spec:
-  template:
-    metadata:
-      labels:
-        app: physim
-    spec:
-      securityContext:
-        {{- toYaml .Values.podSecurityContext | nindent 8 }}
-    {{- if .Values.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-    {{- end }}
-      containers:
-      - name: physim
-        image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
-        imagePullPolicy: {{ .Values.image.pullPolicy }}
-        {{- if .Values.global.resources.define}}
-        resources:
-          requests:
-            cpu: {{ .Values.global.resources.requests.cpu | quote }}
-        {{- end}}
-        securityContext:
-          {{- toYaml .Values.securityContext | nindent 12 }}
-        env:
-        - name: OPENAIR_DIR
-          value: /opt/oai-physim
-        command: ["/bin/sh", "-c"]
-        args:
-        - >
-          cmake_targets/autotests/run_exec_autotests.bash -g "nr_psbchsim" -d bin/ &&
-          echo "FINISHED" && sleep infinity
-      dnsPolicy: ClusterFirst
-      restartPolicy: Never
-      schedulerName: default-scheduler
-      serviceAccountName: {{ .Values.global.serviceAccountName }}
-      terminationGracePeriodSeconds: 30
-      {{- if .Values.global.nodeSelector}}
-      nodeSelector:
-         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
-      {{- end }}
-      {{- if .Values.global.nodeName}}
-      nodeName: {{ .Values.global.nodeName.nrpsbchsim }}
-      {{- end }}

charts/physims/charts/nr-psbchsim/values.yaml

@@ -1,48 +0,0 @@
-# Default values for oai-nr-psbchsim
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-replicaCount: 1
-
-image:
-  # pullPolicy: IfNotPresent or Never or Always
-  pullPolicy: Always
-
-imagePullSecrets: []
-
-nameOverride: ""
-fullnameOverride: ""
-
-serviceAccount:
-  # Specifies whether a service account should be created
-  create: true
-  # Annotations to add to the service account
-  annotations: {}
-  # The name of the service account to use.
-  # If not set and create is true, a name is generated using the fullname template
-  name: "oai-nr-psbchsim"
-
-podSecurityContext:
-  runAsUser: 0
-  runAsGroup: 0
-
-securityContext:
-  privileged: false
-
-resources: {}
-  # We usually recommend not to specify default resources and to leave this as a conscious
-  # choice for the user. This also increases chances charts run on environments with little
-  # resources, such as Minikube. If you do want to specify resources, uncomment the following
-  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-  # limits:
-  #   cpu: 100m
-  #   memory: 128Mi
-  # requests:
-  #   cpu: 100m
-  #   memory: 128Mi
-
-nodeSelector: {}
-
-tolerations: []
-
-affinity: {}

charts/physims/charts/nr-pucchsim/templates/job.yaml

@@ -18,11 +18,6 @@ spec:
       - name: physim
         image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
-        {{- if .Values.global.resources.define}}
-        resources:
-          requests:
-            cpu: {{ .Values.global.resources.requests.cpu | quote }}
-        {{- end}}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
         env:
@@ -42,6 +37,6 @@ spec:
       nodeSelector:
          {{- toYaml .Values.global.nodeSelector | nindent 12 }}
       {{- end }}
-      {{- if .Values.global.nodeName}}
+      {{- if .Values.global.nodeName.nrpucchsim}}
       nodeName: {{ .Values.global.nodeName.nrpucchsim }}
       {{- end }}

charts/physims/charts/nr-ulschsim/templates/job.yaml

@@ -18,11 +18,6 @@ spec:
       - name: physim
         image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
-        {{- if .Values.global.resources.define}}
-        resources:
-          requests:
-            cpu: {{ .Values.global.resources.requests.cpu | quote }}
-        {{- end}}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
         env:
@@ -42,6 +37,6 @@ spec:
       nodeSelector:
          {{- toYaml .Values.global.nodeSelector | nindent 12 }}
       {{- end }}
-      {{- if .Values.global.nodeName}}
+      {{- if .Values.global.nodeName.nrulschsim}}
       nodeName: {{ .Values.global.nodeName.nrulschsim }}
       {{- end }}

charts/physims/charts/nr-ulsim.3gpp/templates/job.yaml

@@ -18,11 +18,6 @@ spec:
       - name: physim
         image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
-        {{- if .Values.global.resources.define}}
-        resources:
-          requests:
-            cpu: {{ .Values.global.resources.requests.cpu | quote }}
-        {{- end}}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
         env:
@@ -42,6 +37,6 @@ spec:
       nodeSelector:
          {{- toYaml .Values.global.nodeSelector | nindent 12 }}
       {{- end }}
-      {{- if .Values.global.nodeName}}
+      {{- if .Values.global.nodeName.nrulsim3gpp}}
       nodeName: {{ .Values.global.nodeName.nrulsim3gpp }}
       {{- end }}

charts/physims/charts/nr-ulsim.mimo/templates/job.yaml

@@ -18,11 +18,6 @@ spec:
       - name: physim
         image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
-        {{- if .Values.global.resources.define}}
-        resources:
-          requests:
-            cpu: {{ .Values.global.resources.requests.cpu | quote }}
-        {{- end}}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
         env:
@@ -42,6 +37,6 @@ spec:
       nodeSelector:
          {{- toYaml .Values.global.nodeSelector | nindent 12 }}
       {{- end }}
-      {{- if .Values.global.nodeName}}
+      {{- if .Values.global.nodeName.nrulsimmimo}}
       nodeName: {{ .Values.global.nodeName.nrulsimmimo }}
       {{- end }}

charts/physims/charts/nr-ulsim.misc/templates/job.yaml

@@ -18,11 +18,6 @@ spec:
       - name: physim
         image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
-        {{- if .Values.global.resources.define}}
-        resources:
-          requests:
-            cpu: {{ .Values.global.resources.requests.cpu | quote }}
-        {{- end}}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
         env:
@@ -42,6 +37,6 @@ spec:
       nodeSelector:
          {{- toYaml .Values.global.nodeSelector | nindent 12 }}
       {{- end }}
-      {{- if .Values.global.nodeName}}
+      {{- if .Values.global.nodeName.nrulsimmisc}}
       nodeName: {{ .Values.global.nodeName.nrulsimmisc }}
       {{- end }}

charts/physims/charts/nr-ulsim.sc-fdma/templates/job.yaml

@@ -18,11 +18,6 @@ spec:
       - name: physim
         image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
-        {{- if .Values.global.resources.define}}
-        resources:
-          requests:
-            cpu: {{ .Values.global.resources.requests.cpu | quote }}
-        {{- end}}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
         ports:
@@ -44,6 +39,6 @@ spec:
       nodeSelector:
          {{- toYaml .Values.global.nodeSelector | nindent 12 }}
       {{- end }}
-      {{- if .Values.global.nodeName}}
+      {{- if .Values.global.nodeName.nrulsimscfdma}}
       nodeName: {{ .Values.global.nodeName.nrulsimscfdma }}
       {{- end }}

charts/physims/charts/polartest/templates/job.yaml

@@ -18,11 +18,6 @@ spec:
       - name: physim
         image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
-        {{- if .Values.global.resources.define}}
-        resources:
-          requests:
-            cpu: {{ .Values.global.resources.requests.cpu | quote }}
-        {{- end}}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
         env:
@@ -42,6 +37,6 @@ spec:
       nodeSelector:
          {{- toYaml .Values.global.nodeSelector | nindent 12 }}
       {{- end }}
-      {{- if .Values.global.nodeName}}
+      {{- if .Values.global.nodeName.polartest}}
       nodeName: {{ .Values.global.nodeName.polartest }}
       {{- end }}

charts/physims/charts/smallblocktest/templates/job.yaml

@@ -18,11 +18,6 @@ spec:
       - name: physim
         image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
-        {{- if .Values.global.resources.define}}
-        resources:
-          requests:
-            cpu: {{ .Values.global.resources.requests.cpu | quote }}
-        {{- end}}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
         env:
@@ -42,6 +37,6 @@ spec:
       nodeSelector:
          {{- toYaml .Values.global.nodeSelector | nindent 12 }}
       {{- end }}
-      {{- if .Values.global.nodeName}}
+      {{- if .Values.global.nodeName.smallblocktest}}
       nodeName: {{ .Values.global.nodeName.smallblocktest }}
       {{- end }}

charts/physims/charts/ulsim/templates/job.yaml

@@ -18,11 +18,6 @@ spec:
       - name: physim
         image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
-        {{- if .Values.global.resources.define}}
-        resources:
-          requests:
-            cpu: {{ .Values.global.resources.requests.cpu | quote }}
-        {{- end}}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
         env:
@@ -42,6 +37,6 @@ spec:
       nodeSelector:
          {{- toYaml .Values.global.nodeSelector | nindent 12 }}
       {{- end }}
-      {{- if .Values.global.nodeName}}
+      {{- if .Values.global.nodeName.ulsim}}
       nodeName: {{ .Values.global.nodeName.ulsim }}
       {{- end }}

charts/physims/values.yaml

@@ -1,21 +1,39 @@
 # Default values for oai-physim.
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
+
 global:
   serviceAccountName: oai-physim-sa
   namespace: "OAICICD_PROJECT"
-  image:
+  image: 
     registry: local
     repository: image-registry.openshift-image-registry.svc:5000/oaicicd-ran/oai-physim
     version: TAG
     # pullPolicy: IfNotPresent or Never or Always
     pullPolicy: Always
   # removing the node selector
-  # will place on two nodes intel 3rd gen and 5th gen with RT kernel
-  nodeSelector:
-    type: ran
-  nodeName: ''
-  resources:
-    define: false
-    requests:
-      cpu: 1.5
+  nodeSelector: {}
+  # It is not a good way of assigning pods to the nodes: this way we bypass the scheduler. At the moment we don't provide the resource information of these pods.
+  # Therefore, Openshift assigns the pods to the same node because it thinks the pods don't consume much resources. This isn't the case, they consume a lot of resources.
+  nodeName:
+    dlsim100rbtm2: acamas
+    dlsimbasic: acamas
+    ldpctest: acamas
+    nrdlschsim: acamas
+    nrdlsimbasic: acamas
+    nrdlsimdmrsptrs: acamas
+    nrdlsimmcsmimo: acamas
+    nrdlsimoffset: dedale
+    nrpbschsim106rb: dedale
+    nrpbchsim217rb: dedale
+    nrpbchsim273rb: dedale
+    nrprachsim: dedale
+    nrpucchsim: dedale
+    nrulschsim: theseus
+    nrulsim3gpp: theseus
+    nrulsimmimo: theseus
+    nrulsimmisc: theseus
+    nrulsimscfdma: theseus
+    polartest: theseus
+    smallblocktest: theseus
+    ulsim: theseus

ci-scripts/Jenkinsfile-GitLab-Container

@@ -27,7 +27,6 @@ def nodeExecutor = params.nodeExecutor
 def doBuild = true
 def do4Gtest = false
 def do5Gtest = false
-def do5GUeTest = false
 
 //
 def gitCommitAuthorEmailAddr
@@ -65,24 +64,17 @@ pipeline {
               message += " - ~BUILD-ONLY (execute only build stages)\n"
               message += " - ~4G-LTE (perform 4G tests)\n"
               message += " - ~5G-NR (perform 5G tests)\n"
-              message += " - ~CI (perform both 4G and 5G tests)\n"
-              message += " - ~nrUE (perform only 5G-UE related tests including physims excluding LDPC tests)\n\n"
+              message += " - ~CI (perform both 4G and 5G tests)\n\n"
               message += "Not performing CI due to lack of labels"
               addGitLabMRComment comment: message
               error('Not performing CI due to lack of labels')
             } else if (LABEL_CHECK == 'FULL') {
               do4Gtest = true
               do5Gtest = true
-              do5GUeTest = true
             } else if (LABEL_CHECK == "SHORTEN-4G") {
               do4Gtest = true
             } else if (LABEL_CHECK == 'SHORTEN-5G') {
               do5Gtest = true
-            } else if (LABEL_CHECK == 'SHORTEN-5G-UE') {
-              do5GUeTest = true
-            } else if (LABEL_CHECK == 'SHORTEN-4G-5G-UE') {
-              do4Gtest = true
-              do5GUeTest = true
             } else if (LABEL_CHECK == 'documentation') {
               doBuild = false
             } else {
@@ -153,28 +145,6 @@ pipeline {
             }
           }
         }
-        stage ("Ubuntu-ARM-Image-Builder") {
-          steps {
-            script {
-              triggerSlaveJob ('RAN-Ubuntu-ARM-Image-Builder', 'Ubuntu-ARM-Image-Builder')
-            }
-          }
-          post {
-            always {
-              script {
-                // Using a unique variable name for each test stage to avoid overwriting on a global variable
-                // due to parallel-time concurrency
-                ubuntuArmBuildStatus = finalizeSlaveJob('RAN-Ubuntu-ARM-Image-Builder')
-              }
-            }
-            failure {
-              script {
-                currentBuild.result = 'FAILURE'
-                failingStages += ubuntuArmBuildStatus
-              }
-            }
-          }
-        }
         stage ("RHEL-Cluster-Image-Builder") {
           steps {
             script {
@@ -247,7 +217,7 @@ pipeline {
       when { expression {doBuild} }
       parallel {
         stage ("PhySim-Cluster") {
-          when { expression {do4Gtest || do5Gtest || do5GUeTest} }
+          when { expression {do4Gtest || do5Gtest} }
           steps {
             script {
               triggerSlaveJob ('RAN-PhySim-Cluster', 'PhySim-Cluster')
@@ -293,7 +263,7 @@ pipeline {
           }
         }
         stage ("RF-Sim-Test-5G") {
-          when { expression {do5Gtest || do5GUeTest} }
+          when { expression {do5Gtest} }
           steps {
             script {
               triggerSlaveJob ('RAN-RF-Sim-Test-5G', 'RF-Sim-Test-5G')
@@ -315,29 +285,6 @@ pipeline {
             }
           }
         }
-        stage ("OAI-FLEXRIC-RAN-Integration-Test") {
-          when { expression {do5Gtest || do5GUeTest} }
-          steps {
-            script {
-              triggerSlaveJob ('OAI-FLEXRIC-RAN-Integration-Test', 'OAI-FLEXRIC-RAN-Integration-Test')
-            }
-          }
-          post {
-            always {
-              script {
-                // Using a unique variable name for each test stage to avoid overwriting on a global variable
-                // due to parallel-time concurrency
-                flexricRAN5GStatus = finalizeSlaveJob('OAI-FLEXRIC-RAN-Integration-Test')
-              }
-            }
-            failure {
-              script {
-                currentBuild.result = 'FAILURE'
-                failingStages += flexricRAN5GStatus
-              }
-            }
-          }
-        }
         stage ("L2-Sim-Test-4G") {
           when { expression {do4Gtest} }
           steps {
@@ -361,6 +308,29 @@ pipeline {
             }
           }
         }
+        stage ("L2-Sim-Test-5G") {
+          when { expression {do5Gtest} }
+          steps {
+            script {
+              triggerSlaveJob ('RAN-L2-Sim-Test-5G', 'L2-Sim-Test-5G')
+            }
+          }
+          post {
+            always {
+              script {
+                // Using a unique variable name for each test stage to avoid overwriting on a global variable
+                // due to parallel-time concurrency
+                l2Sim5GStatus = finalizeSlaveJob('RAN-L2-Sim-Test-5G')
+              }
+            }
+            failure {
+              script {
+                currentBuild.result = 'FAILURE'
+                failingStages += l2Sim5GStatus
+              }
+            }
+          }
+        }
         stage ("LTE-B200-FDD-LTEBOX-Container") {
           when { expression {do4Gtest} }
           steps {
@@ -546,6 +516,29 @@ pipeline {
             }
           }
         }
+        stage ("Interop-F1") {
+          when { expression {do5Gtest} }
+          steps {
+            script {
+              triggerSlaveJob ('RAN-Interop-F1', 'Interop-F1')
+            }
+          }
+          post {
+            always {
+              script {
+                // Using a unique variable name for each test stage to avoid overwriting on a global variable
+                // due to parallel-time concurrency
+                f1InteropStatus = finalizeSlaveJob('RAN-Interop-F1')
+              }
+            }
+            failure {
+              script {
+                currentBuild.result = 'FAILURE'
+                failingStages += f1InteropStatus
+              }
+            }
+          }
+        }
         stage ("Sanity-Check OAI-CN5G") {
           when { expression {do5Gtest} }
           steps {
@@ -569,77 +562,8 @@ pipeline {
             }
           }
         }
-        stage ("SA-AERIAL-CN5G") {
-          when { expression {do5Gtest} }
-          steps {
-            script {
-              triggerSlaveJob ('RAN-SA-AERIAL-CN5G', 'SA-AERIAL-CN5G')
-            }
-          }
-          post {
-            always {
-              script {
-                // Using a unique variable name for each test stage to avoid overwriting on a global variable
-                // due to parallel-time concurrency
-                saAERIALStatus = finalizeSlaveJob('RAN-SA-AERIAL-CN5G')
-              }
-            }
-            failure {
-              script {
-                currentBuild.result = 'FAILURE'
-                failingStages += saAERIALStatus
-              }
-            }
-          }
-        }
-        stage ("SA-2x2-Module-CN5G") {
-          when { expression {do5Gtest} }
-          steps {
-            script {
-              triggerSlaveJob ('RAN-SA-2x2-Module-CN5G', 'SA-2x2-Module-CN5G')
-            }
-          }
-          post {
-            always {
-              script {
-                // Using a unique variable name for each test stage to avoid overwriting on a global variable
-                // due to parallel-time concurrency
-                saTDD2x2Status = finalizeSlaveJob('RAN-SA-2x2-Module-CN5G')
-              }
-            }
-            failure {
-              script {
-                currentBuild.result = 'FAILURE'
-                failingStages += saTDD2x2Status
-              }
-            }
-          }
-        }
-        stage ("SA-FHI72-CN5G") {
-          when { expression {do5Gtest} }
-          steps {
-            script {
-              triggerSlaveJob ('RAN-SA-FHI72-CN5G', 'SA-FHI72-CN5G')
-            }
-          }
-          post {
-            always {
-              script {
-                // Using a unique variable name for each test stage to avoid overwriting on a global variable
-                // due to parallel-time concurrency
-                saFHI72Status = finalizeSlaveJob('RAN-SA-FHI72-CN5G')
-              }
-            }
-            failure {
-              script {
-                currentBuild.result = 'FAILURE'
-                failingStages += saFHI72Status
-              }
-            }
-          }
-        }
         stage ("SA-OAIUE-CN5G") {
-          when { expression {do5Gtest || do5GUeTest} }
+          when { expression {do5Gtest} }
           steps {
             script {
               triggerSlaveJob ('RAN-SA-OAIUE-CN5G', 'SA-OAIUE-CN5G')
@@ -688,6 +612,9 @@ pipeline {
         if ("MERGE".equals(env.gitlabActionType)) {
           addGitLabMRComment comment: message
           def message2 = message + " -- MergeRequest #" + env.gitlabMergeRequestIid + " (" + env.gitlabMergeRequestTitle + ")"
+          sendSocialMediaMessage('ci-enb', 'good', message2)
+        } else {
+          sendSocialMediaMessage('ci-enb', 'good', message)
         }
         echo "Pipeline is SUCCESSFUL"
       }
@@ -699,6 +626,9 @@ pipeline {
           def fullMessage = message + '\n\nList of failing test stages:' + failingStages
           addGitLabMRComment comment: fullMessage
           def message2 = message + " -- MergeRequest #" + env.gitlabMergeRequestIid + " (" + env.gitlabMergeRequestTitle + ")"
+          sendSocialMediaMessage('ci-enb', 'danger', message2)
+        } else {
+          sendSocialMediaMessage('ci-enb', 'danger', message)
         }
         echo "Pipeline FAILED"
       }
@@ -822,3 +752,9 @@ def finalizeSlaveJob(jobName) {
     return artifactUrl
   }
 }
+
+// Abstraction function to send social media messages:
+// like on Slack or Mattermost
+def sendSocialMediaMessage(pipeChannel, pipeColor, pipeMessage) {
+  slackSend channel: pipeChannel, color: pipeColor, message: pipeMessage
+}

ci-scripts/Jenkinsfile-cluster

@@ -200,8 +200,6 @@ pipeline {
               if (fileExists(xmlFile)) {
                 mainPythonAllXmlFiles += "--XMLTestFile=" + xmlFile + " "
                 echo "Test XML file         :   ${xmlFile}"
-              } else {
-                echo "Test XML file ${xmlFile}: no such file"
               }
             }
             withCredentials([

ci-scripts/Jenkinsfile-colosseum

@@ -1,124 +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
- */
-
-def node = "${params.JenkinsNode}"
-def resource = "${params.JenkinsResource}"
-
-pipeline {
-  agent {
-    label node
-  }
-  options {
-    timestamps()
-    ansiColor('xterm')
-    timeout(time: 3, unit: 'HOURS')
-  }
-  stages {
-    stage ("Trigger NEU CI") {
-      steps {
-        lock (resource) {
-          script {
-            withCredentials([
-              [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.ColosseumCredentials}", usernameVariable: 'col_username', passwordVariable: 'col_password'],
-            ]) {
-              // use eNB target branch variable if eNB repository is empty
-              def git_Branch = ""
-              if (params.eNB_Branch.isEmpty()) {
-                echo 'eNB_Branch parameter is empty, using eNB_TargetBranch instead'
-                git_Branch = params.eNB_TargetBranch
-              } else {
-                git_Branch = params.eNB_Branch
-              }
-
-              // use default 10011 rf scenario if not specified
-              if (params.Colosseum_Rf_Scenario.isEmpty()) {
-                echo 'Colosseum_Rf_Scenario parameter is empty, defaulting to 10011'
-                rf_scenario = "10011"
-              } else {
-                rf_scenario = params.Colosseum_Rf_Scenario
-              }
-
-              sh "echo Testing reachability of Colosseum endpoint"
-              sh "ping -c 3 10.100.1.253"
-
-              sh "./ci-scripts/colosseum_scripts/launch-job.sh ${col_username} ${col_password} ${currentBuild.number} ${params.eNB_Repository} ${git_Branch} ${rf_scenario} ${env.JOB_URL}"
-            }
-          }
-        }
-      }
-    }
-    stage ("Wait for job to finish") {
-      steps {
-        lock (resource) {
-          script {
-            withCredentials([
-              [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.ColosseumCredentials}", usernameVariable: 'col_username', passwordVariable: 'col_password'],
-            ]) {
-              timeout (time: 2, unit: 'HOURS') {
-                sh "./ci-scripts/colosseum_scripts/wait-job-end.sh ${col_username} ${col_password}"
-              }
-            }
-          }
-        }
-      }
-    }
-    stage ("Get test results") {
-      steps {
-        lock (resource) {
-          script {
-            withCredentials([
-              [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.ColosseumCredentials}", usernameVariable: 'col_username', passwordVariable: 'col_password'],
-            ]) {
-              sh "./ci-scripts/colosseum_scripts/get-test-results.sh ${col_username} ${col_password}"
-            }
-
-            if(fileExists("results.tar.xz")) {
-              archiveArtifacts "results.tar.xz"
-
-              sh "mkdir -p results"
-              sh "tar -xf results.tar.xz -C results --strip-components=1"
-
-              if(fileExists("results/test_summary.html")) {
-                archiveArtifacts "results/test_summary.html"
-              }
-
-              // check if test passed
-              sh "./ci-scripts/colosseum_scripts/check-results.sh results/test_summary.html"
-
-              sh "rm -Rf ./results"
-            }
-          }
-        }
-      }
-    }
-    stage ("Set job status") {
-      steps {
-        lock (resource) {
-          script {
-            echo 'Set job status'
-            sh "./ci-scripts/colosseum_scripts/set-job-status.sh"
-          }
-        }
-      }
-    }
-  }
-}

ci-scripts/Jenkinsfile-nrue

@@ -193,8 +193,6 @@ pipeline {
                 if (fileExists(xmlFile)) {
                   mainPythonAllXmlFiles += "--XMLTestFile=" + xmlFile + " "
                   echo "Test XML file         :   ${xmlFile}"
-                } else {
-                  echo "Test XML file ${xmlFile}: no such file"
                 }
               }
             }
@@ -231,10 +229,6 @@ pipeline {
             // Zipping all archived log files
               sh "mkdir test_logs"
               sh "mv *.log* test_logs || true"
-              // Zip all log files matching cmake_targets/{*.log*,log/*} into test_logs_XXXX.zip
-              if (fileExists('../cmake_targets/log')) {
-                sh "mv ../cmake_targets/log/* test_logs || true"
-              }
               sh "zip -r -qq test_logs_${env.BUILD_ID}.zip *test_log*/"
               sh "rm -rf *test_log*/"
               if (fileExists("test_logs_${env.BUILD_ID}.zip")) {

ci-scripts/Jenkinsfile-physim-deploy

@@ -186,8 +186,6 @@ pipeline {
                 if (fileExists(xmlFile)) {
                   mainPythonAllXmlFiles += "--XMLTestFile=" + xmlFile + " "
                   echo "Test XML file         :   ${xmlFile}"
-                } else {
-                  echo "Test XML file ${xmlFile}: no such file"
                 }
               }
             }
@@ -223,10 +221,6 @@ pipeline {
             // Zipping all archived log files
               sh "mkdir test_logs"
               sh "mv *.log* test_logs || true"
-              // Zip all log files matching cmake_targets/{*.log*,log/*} into test_logs_XXXX.zip
-              if (fileExists('../cmake_targets/log')) {
-                sh "mv ../cmake_targets/log/* test_logs || true"
-              }
               sh "zip -r -qq test_logs_${env.BUILD_ID}.zip *test_log*/"
               sh "rm -rf *test_log*/"
               if (fileExists("test_logs_${env.BUILD_ID}.zip")) {

ci-scripts/Jenkinsfile-push-registry

@@ -76,7 +76,7 @@ pipeline {
           withCredentials([
             [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.DH_Credentials}", usernameVariable: 'DH_Username', passwordVariable: 'DH_Password']
           ]) {
-            def listOfImages = ["oai-enb", "oai-gnb", "oai-lte-ue", "oai-nr-ue", "oai-nr-cuup", "oai-gnb-fhi72"]
+            def listOfImages = ["oai-enb", "oai-gnb", "oai-lte-ue", "oai-nr-ue", "oai-nr-cuup"]
             // Logging in on both registries
             sh "docker login -u ${DH_Username} -p ${DH_Password} > /dev/null 2>&1"
             sh "docker login -u oaicicd -p oaicicd porcepix.sboai.cs.eurecom.fr > /dev/null 2>&1"

ci-scripts/Jenkinsfile-tmp-full-ran

@@ -39,8 +39,10 @@ if (params.LockResources != null && params.LockResources.trim().length() > 0)
 
 // Terminate Status
 def termENB = 0
-def termStatusArray = new Boolean[termENB + 1]
+def termOAIUE = 1
+def termStatusArray = new Boolean[termOAIUE + 1]
 termStatusArray[termENB] = false
+termStatusArray[termOAIUE] = false
 
 // Global Parameters. Normally they should be populated when the master job
 // triggers the slave job with parameters
@@ -192,8 +194,6 @@ pipeline {
                                 if (fileExists(xmlFile)) {
                                     mainPythonAllXmlFiles += "--XMLTestFile=" + xmlFile + " "
                                     echo "Test XML file         :   ${xmlFile}"
-                                } else {
-                                    echo "Test XML file ${xmlFile}: no such file"
                                 }
                             }
                         }
@@ -241,6 +241,23 @@ pipeline {
                         }
                     }
                 }
+                stage('Terminate OAI-UE') {
+                    steps {
+                        echo '\u2705 \u001B[32mTerminate OAI-UE\u001B[0m'
+                        withCredentials([
+                            [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.UE_Credentials}", usernameVariable: 'UE_Username', passwordVariable: 'UE_Password']
+                        ]) {
+                            sh "python3 ci-scripts/main.py --mode=TerminateOAIUE --UEIPAddress=${params.UE_IPAddress} --UEUserName=${UE_Username} --UEPassword=${UE_Password}"
+                        }
+                    }
+                    post {
+                        success {
+                            script {
+                                termStatusArray[termOAIUE] = true
+                            }
+                        }
+                    }
+                }
             }
         }
         stage('Log Collection') {
@@ -287,7 +304,7 @@ pipeline {
                              [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password']
                         ]) {
                             echo '\u2705 \u001B[32mLog Collection (eNB - Run)\u001B[0m'
-                            sh "python3 ci-scripts/main.py --mode=LogCollecteNB --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --BuildId=${env.BUILD_ID}"
+                            sh "python3 ci-scripts/main.py --mode=LogCollecteNB --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath}"
 
                             echo '\u2705 \u001B[32mLog Transfer (eNB - Run)\u001B[0m'
                             sh "sshpass -p \'${eNB_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${eNB_Username}@${params.eNB_IPAddress}:${eNB_SourceCodePath}/cmake_targets/enb.log.zip ./enb.log.${env.BUILD_ID}.zip || true"
@@ -456,6 +473,13 @@ pipeline {
                         sh "python3 ci-scripts/main.py --mode=TerminateeNB --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password}"
                     }
                 }
+                if (!termStatusArray[termOAIUE]) {
+                    withCredentials([
+                        [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.UE_Credentials}", usernameVariable: 'UE_Username', passwordVariable: 'UE_Password']
+                    ]) {
+                        sh "python3 ci-scripts/main.py --mode=TerminateOAIUE --UEIPAddress=${params.UE_IPAddress} --UEUserName=${UE_Username} --UEPassword=${UE_Password}"
+                    }
+                }
             }
         }
     }

ci-scripts/Jenkinsfile-tmp-multi-enb

@@ -189,8 +189,6 @@ pipeline {
                                 if (fileExists(xmlFile)) {
                                     mainPythonAllXmlFiles += "--XMLTestFile=" + xmlFile + " "
                                     echo "Test XML file         :   ${xmlFile}"
-                                } else {
-                                    echo "Test XML file ${xmlFile}: no such file"
                                 }
                             }
                         }

ci-scripts/Jenkinsfile-tmp-multi-enb-nsa

@@ -200,8 +200,6 @@ pipeline {
                 if (fileExists(xmlFile)) {
                   mainPythonAllXmlFiles += "--XMLTestFile=" + xmlFile + " "
                   echo "Test XML file     :   ${xmlFile}"
-                } else {
-                  echo "Test XML file ${xmlFile}: no such file"
                 }
               }
             }
@@ -276,7 +274,7 @@ pipeline {
                [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password']
             ]) {
               echo '\u2705 \u001B[32mLog Collection (eNB - Run)\u001B[0m'
-              sh "python3 ci-scripts/main.py --mode=LogCollecteNB --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --BuildId=${env.BUILD_ID}"
+              sh "python3 ci-scripts/main.py --mode=LogCollecteNB --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath}"
 
               echo '\u2705 \u001B[32mLog Transfer (eNB - Run)\u001B[0m'
               sh "sshpass -p \'${eNB_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${eNB_Username}@${params.eNB_IPAddress}:${eNB_SourceCodePath}/cmake_targets/enb.log.zip ./enb.log.${env.BUILD_ID}.zip || true"

ci-scripts/Jenkinsfile-tmp-ran

@@ -58,8 +58,6 @@ def eNB_CommitID
 def eNB_AllowMergeRequestProcess = false
 def eNB_TargetBranch
 
-def flexricOption = ""
-
 pipeline {
     agent {
         label pythonExecutor
@@ -150,24 +148,18 @@ pipeline {
                         allParametersPresent = false
                     }
 
-                    if (params.Flexric_Tag != null) {
-                        echo "This pipeline is configured to run with a FlexRIC deployment."
-                        echo "Appending FlexRicTag option to the list of options"
-                        flexricOption = "--FlexRicTag=${params.Flexric_Tag}"
-                        echo "Using new Flexric option: ${flexricOption}"
-                    }
-
                     if (allParametersPresent) {
                         echo "All parameters are present"
                         if (eNB_AllowMergeRequestProcess) {
                             sh "git fetch"
                             sh "./ci-scripts/doGitLabMerge.sh --src-branch ${eNB_Branch} --src-commit ${eNB_CommitID} --target-branch ${eNB_TargetBranch} --target-commit latest"
-                        } else if (eNB_CommitID != 'develop') {
+                        } else {
                             sh "git fetch"
                             sh "git checkout -f ${eNB_CommitID}"
                         }
                     } else {
-                        error "Some parameters are missing"
+                        echo "Some parameters are missing"
+                        sh "./ci-scripts/fail.sh"
                     }
                 }
             }
@@ -189,8 +181,6 @@ pipeline {
                                 if (fileExists(xmlFile)) {
                                     mainPythonAllXmlFiles += "--XMLTestFile=" + xmlFile + " "
                                     echo "Test XML file         :   ${xmlFile}"
-                                } else {
-                                    echo "Test XML file ${xmlFile}: no such file"
                                 }
                             }
                         }
@@ -198,13 +188,13 @@ pipeline {
                             [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password'],
                             [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password'],
                         ]) {
-                            sh "python3 main.py --mode=InitiateHtml --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} ${flexricOption} ${mainPythonAllXmlFiles}"
+                            sh "python3 main.py --mode=InitiateHtml --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} ${mainPythonAllXmlFiles}"
                             String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
                             for (xmlFile in myXmlTestSuite) {
                             if (fileExists(xmlFile)) {
                                 try {
                                   timeout (time: 60, unit: 'MINUTES') {
-                                    sh "python3 main.py --mode=TesteNB --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} ${flexricOption} --eNBIPAddress=${params.eNB_IPAddress} --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} --XMLTestFile=${xmlFile}"
+                                    sh "python3 main.py --mode=TesteNB --eNBIPAddress=${params.eNB_IPAddress} --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --EPCIPAddress=${params.EPC_IPAddress} --EPCType=${params.EPC_Type} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --XMLTestFile=${xmlFile}"
                                   }
                                 } catch (Exception e) {
                                     currentBuild.result = 'FAILURE'

ci-scripts/Jenkinsfile-tmp-ue

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

ci-scripts/Jenkinsfile-trig-nsa

@@ -0,0 +1,160 @@
+#!/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
+ */
+
+// necessary for reading JSON
+import groovy.json.JsonSlurper
+
+// Template Jenkins Declarative Pipeline script to run Test w/ RF HW
+
+// Location of the python executor node shall be in the same subnet as the others servers
+def pythonExecutor = params.pythonExecutor
+
+def TARGET_BRANCH = "develop"
+def ALLOW_MERGE = true
+def GitPostArgs = ''
+def jobStatus
+
+pipeline {
+    agent {
+        label pythonExecutor
+    }
+    stages {
+        stage ("Launcher") {
+            steps {
+                script {
+                    // retrieve MR that are opened nd with tag NSA
+                    MR_LIST = sh returnStdout: true, script: 'curl --silent "https://gitlab.eurecom.fr/api/v4/projects/oai%2Fopenairinterface5g/merge_requests?state=opened&per_page=100&labels=NSA" | jq -cj "[.[].iid]"'
+                    echo "List of selected MRs: ${MR_LIST.trim()}"
+                    def MR_ARRAY = new JsonSlurper().parseText(MR_LIST.trim())
+                    // for every selected MR, retrieve the branch name and the latest commit
+                    for (MR in MR_ARRAY) {
+                        SRC_BRANCH=sh returnStdout: true, script: """curl --silent "https://gitlab.eurecom.fr/api/v4/projects/oai%2Fopenairinterface5g/merge_requests/${MR}" | jq ".source_branch" || true """
+                        SRC_BRANCH=SRC_BRANCH.trim()
+                        COMMIT_ID=sh returnStdout: true, script:  """curl --silent "https://gitlab.eurecom.fr/api/v4/projects/oai%2Fopenairinterface5g/merge_requests/${MR}" | jq ".sha" || true """
+                        COMMIT_ID=COMMIT_ID.trim()
+                        echo "Testing NSA on : ${MR} ${SRC_BRANCH} ${COMMIT_ID}"
+                        commit = COMMIT_ID.replace("\"","")
+                        GitPostArgs = MR + ' ' + commit + ' '
+                        echo GitPostArgs
+
+                        //calling LTE 2x2
+                        jobName = "RAN-LTE-2x2-Module-OAIEPC"
+                        jobStatus =  build job: jobName, wait : true, propagate : false, parameters: [
+                            string(name: 'eNB_MR', value: String.valueOf(MR)),
+                            string(name: 'eNB_Branch', value: String.valueOf(SRC_BRANCH)),
+                            string(name: 'eNB_CommitID', value: String.valueOf(COMMIT_ID)),
+                            string(name: 'eNB_TargetBranch', value: String.valueOf(TARGET_BRANCH)),
+                            booleanParam(name: 'eNB_mergeRequest', value: Boolean.valueOf(ALLOW_MERGE))
+                        ]
+                        jobResult = jobStatus.getResult()
+                        build_url = jobStatus.getAbsoluteUrl()
+                        build_id = jobStatus.getNumber().toString()
+                        GitPostArgs += jobName + ' ' + build_url + ' ' + build_id + ' ' + jobResult + ' '
+                        echo GitPostArgs
+
+                        //calling NSA B200
+                        jobName = "RAN-NSA-B200-Module-LTEBOX"
+                        jobStatus =  build job: jobName, wait : true, propagate : false, parameters: [
+                            string(name: 'eNB_MR', value: String.valueOf(MR)),
+                            string(name: 'eNB_Branch', value: String.valueOf(SRC_BRANCH)),
+                            string(name: 'eNB_CommitID', value: String.valueOf(COMMIT_ID)),
+                            string(name: 'eNB_TargetBranch', value: String.valueOf(TARGET_BRANCH)),
+                            booleanParam(name: 'eNB_mergeRequest', value: Boolean.valueOf(ALLOW_MERGE))
+                        ]
+                        jobResult = jobStatus.getResult()
+                        build_url = jobStatus.getAbsoluteUrl()
+                        build_id = jobStatus.getNumber().toString()
+                        GitPostArgs += jobName + ' ' + build_url + ' ' + build_id + ' ' + jobResult + ' '
+                        echo GitPostArgs
+
+                        //calling NSA 2x2
+                        jobName = "RAN-NSA-2x2-Module-OAIEPC"
+                        jobStatus =  build job: jobName, wait : true, propagate : false, parameters: [
+                            string(name: 'eNB_MR', value: String.valueOf(MR)),
+                            string(name: 'eNB_Branch', value: String.valueOf(SRC_BRANCH)),
+                            string(name: 'eNB_CommitID', value: String.valueOf(COMMIT_ID)),
+                            string(name: 'eNB_TargetBranch', value: String.valueOf(TARGET_BRANCH)),
+                            booleanParam(name: 'eNB_mergeRequest', value: Boolean.valueOf(ALLOW_MERGE))
+                        ]
+                        jobResult = jobStatus.getResult()
+                        build_url = jobStatus.getAbsoluteUrl()
+                        build_id = jobStatus.getNumber().toString()
+                        GitPostArgs += jobName + ' ' + build_url + ' ' + build_id + ' ' + jobResult + ' '
+                        echo GitPostArgs
+
+                        //calling SA 
+                        jobName = "RAN-SA-Module-CN5G"
+                        jobStatus =  build job: jobName, wait : true, propagate : false, parameters: [
+                            string(name: 'eNB_MR', value: String.valueOf(MR)),
+                            string(name: 'eNB_Branch', value: String.valueOf(SRC_BRANCH)),
+                            string(name: 'eNB_CommitID', value: String.valueOf(COMMIT_ID)),
+                            string(name: 'eNB_TargetBranch', value: String.valueOf(TARGET_BRANCH)),
+                            booleanParam(name: 'eNB_mergeRequest', value: Boolean.valueOf(ALLOW_MERGE))
+                        ]
+                        jobResult = jobStatus.getResult()
+                        build_url = jobStatus.getAbsoluteUrl()
+                        build_id = jobStatus.getNumber().toString()
+                        GitPostArgs += jobName + ' ' + build_url + ' ' + build_id + ' ' + jobResult + ' '
+                        echo GitPostArgs
+
+                        //calling SA-AmariS
+                        jobName = "RAN-SA-AmariS-CN5G"
+                        jobStatus =  build job: jobName, wait : true, propagate : false, parameters: [
+                            string(name: 'eNB_MR', value: String.valueOf(MR)),
+                            string(name: 'eNB_Branch', value: String.valueOf(SRC_BRANCH)),
+                            string(name: 'eNB_CommitID', value: String.valueOf(COMMIT_ID)),
+                            string(name: 'eNB_TargetBranch', value: String.valueOf(TARGET_BRANCH)),
+                            booleanParam(name: 'eNB_mergeRequest', value: Boolean.valueOf(ALLOW_MERGE))
+                        ]
+                        jobResult = jobStatus.getResult()
+                        build_url = jobStatus.getAbsoluteUrl()
+                        build_id = jobStatus.getNumber().toString()
+                        GitPostArgs += jobName + ' ' + build_url + ' ' + build_id + ' ' + jobResult + ' '
+                        echo GitPostArgs
+
+                        //calling OAIUE N310-X300
+                        jobName = "RAN-SA-OAIUE-N310-X300-CN5G"
+                        jobStatus =  build job: jobName, wait : true, propagate : false, parameters: [
+                            string(name: 'eNB_MR', value: String.valueOf(MR)),
+                            string(name: 'eNB_Branch', value: String.valueOf(SRC_BRANCH)),
+                            string(name: 'eNB_CommitID', value: String.valueOf(COMMIT_ID)),
+                            string(name: 'eNB_TargetBranch', value: String.valueOf(TARGET_BRANCH)),
+                            booleanParam(name: 'eNB_mergeRequest', value: Boolean.valueOf(ALLOW_MERGE))
+                        ]
+                        jobResult = jobStatus.getResult()
+                        build_url = jobStatus.getAbsoluteUrl()
+                        build_id = jobStatus.getNumber().toString()
+                        GitPostArgs += jobName + ' ' + build_url + ' ' + build_id + ' ' + jobResult + ' '
+                        echo GitPostArgs
+
+                        //git report the test results in 1 block, at the end of the test sequence of one MR
+                        dir ('ci-scripts/ran_dashboard') {
+                            sh "python3 Hdashboard.py gitpost ${GitPostArgs}"
+                        }                        
+                    }
+                }                                  
+            }   
+        }
+    }
+}
+
+

ci-scripts/active_net_interfaces.awk

@@ -18,11 +18,4 @@
 # * For more information about the OpenAirInterface (OAI) Software Alliance:
 # *      contact@openairinterface.org
 # */
-
-add_library(nr_pdcp_snow3g OBJECT
-            nr_pdcp_integrity_nia1.c
-            nr_pdcp_security_nea1.c)
-
-if (ENABLE_TESTS)
-  add_subdirectory(tests)
-endif ()
+/inet.*brd/{print "interfaceToUse="$NF"done"}

ci-scripts/add_user_to_conf_file.awk

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

ci-scripts/add_user_to_subscriber_list.awk

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

ci-scripts/args_parse.py

@@ -41,13 +41,12 @@ import constants as CONST
 #-----------------------------------------------------------
 
 
-def ArgsParse(argvs,CiTestObj,RAN,HTML,EPC,CONTAINERS,HELP,SCA,PHYSIM,CLUSTER):
+def ArgsParse(argvs,CiTestObj,RAN,HTML,EPC,ldpc,CONTAINERS,HELP,SCA,PHYSIM,CLUSTER):
 
 
     py_param_file_present = False
     py_params={}
 
-    force_local = False
     while len(argvs) > 1:
         myArgv = argvs.pop(1)	# 0th is this file's name
 
@@ -55,9 +54,6 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,EPC,CONTAINERS,HELP,SCA,PHYSIM,CLUSTER):
         if re.match('^\-\-help$', myArgv, re.IGNORECASE):
             HELP.GenericHelp(CONST.Version)
             sys.exit(0)
-        if re.match('^\-\-local$', myArgv, re.IGNORECASE):
-            force_local = True
-
 
 	    #--apply=<filename> as parameters file, to replace inline parameters
         elif re.match('^\-\-Apply=(.+)$', myArgv, re.IGNORECASE):
@@ -82,6 +78,7 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,EPC,CONTAINERS,HELP,SCA,PHYSIM,CLUSTER):
             CiTestObj.ranRepository = matchReg.group(1)
             RAN.ranRepository=matchReg.group(1)
             HTML.ranRepository=matchReg.group(1)
+            ldpc.ranRepository=matchReg.group(1)
             CONTAINERS.ranRepository=matchReg.group(1)
             SCA.ranRepository=matchReg.group(1)
             PHYSIM.ranRepository=matchReg.group(1)
@@ -92,6 +89,7 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,EPC,CONTAINERS,HELP,SCA,PHYSIM,CLUSTER):
             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
@@ -108,6 +106,7 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,EPC,CONTAINERS,HELP,SCA,PHYSIM,CLUSTER):
             CiTestObj.ranBranch = matchReg.group(1)
             RAN.ranBranch=matchReg.group(1)
             HTML.ranBranch=matchReg.group(1)
+            ldpc.ranBranch=matchReg.group(1)
             CONTAINERS.ranBranch=matchReg.group(1)
             SCA.ranBranch=matchReg.group(1)
             PHYSIM.ranBranch=matchReg.group(1)
@@ -120,6 +119,7 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,EPC,CONTAINERS,HELP,SCA,PHYSIM,CLUSTER):
             CiTestObj.ranCommitID = matchReg.group(1)
             RAN.ranCommitID=matchReg.group(1)
             HTML.ranCommitID=matchReg.group(1)
+            ldpc.ranCommitID=matchReg.group(1)
             CONTAINERS.ranCommitID=matchReg.group(1)
             SCA.ranCommitID=matchReg.group(1)
             PHYSIM.ranCommitID=matchReg.group(1)
@@ -132,6 +132,7 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,EPC,CONTAINERS,HELP,SCA,PHYSIM,CLUSTER):
             CiTestObj.ranTargetBranch = matchReg.group(1)
             RAN.ranTargetBranch=matchReg.group(1)
             HTML.ranTargetBranch=matchReg.group(1)
+            ldpc.ranTargetBranch=matchReg.group(1)
             CONTAINERS.ranTargetBranch=matchReg.group(1)
             SCA.ranTargetBranch=matchReg.group(1)
             PHYSIM.ranTargetBranch=matchReg.group(1)
@@ -140,6 +141,7 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,EPC,CONTAINERS,HELP,SCA,PHYSIM,CLUSTER):
             if re.match('^\-\-eNBIPAddress=(.+)$', myArgv, re.IGNORECASE):
                 matchReg = re.match('^\-\-eNBIPAddress=(.+)$', myArgv, re.IGNORECASE)
                 RAN.eNBIPAddress=matchReg.group(1)
+                ldpc.eNBIpAddr=matchReg.group(1)
                 CONTAINERS.eNBIPAddress=matchReg.group(1)
                 SCA.eNBIPAddress=matchReg.group(1)
                 PHYSIM.eNBIPAddress=matchReg.group(1)
@@ -156,6 +158,7 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,EPC,CONTAINERS,HELP,SCA,PHYSIM,CLUSTER):
             if re.match('^\-\-eNBUserName=(.+)$', myArgv, re.IGNORECASE):
                 matchReg = re.match('^\-\-eNBUserName=(.+)$', myArgv, re.IGNORECASE)
                 RAN.eNBUserName=matchReg.group(1)
+                ldpc.eNBUserName=matchReg.group(1)
                 CONTAINERS.eNBUserName=matchReg.group(1)
                 SCA.eNBUserName=matchReg.group(1)
                 PHYSIM.eNBUserName=matchReg.group(1)
@@ -172,6 +175,7 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,EPC,CONTAINERS,HELP,SCA,PHYSIM,CLUSTER):
             if re.match('^\-\-eNBPassword=(.+)$', myArgv, re.IGNORECASE):
                 matchReg = re.match('^\-\-eNBPassword=(.+)$', myArgv, re.IGNORECASE)
                 RAN.eNBPassword=matchReg.group(1)
+                ldpc.eNBPassWord=matchReg.group(1)
                 CONTAINERS.eNBPassword=matchReg.group(1)
                 SCA.eNBPassword=matchReg.group(1)
                 PHYSIM.eNBPassword=matchReg.group(1)
@@ -188,6 +192,7 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,EPC,CONTAINERS,HELP,SCA,PHYSIM,CLUSTER):
             if re.match('^\-\-eNBSourceCodePath=(.+)$', myArgv, re.IGNORECASE):
                 matchReg = re.match('^\-\-eNBSourceCodePath=(.+)$', myArgv, re.IGNORECASE)
                 RAN.eNBSourceCodePath=matchReg.group(1)
+                ldpc.eNBSourceCodePath=matchReg.group(1)
                 CONTAINERS.eNBSourceCodePath=matchReg.group(1)
                 SCA.eNBSourceCodePath=matchReg.group(1)
                 PHYSIM.eNBSourceCodePath=matchReg.group(1)
@@ -268,11 +273,8 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,EPC,CONTAINERS,HELP,SCA,PHYSIM,CLUSTER):
         elif re.match('^\-\-BuildId=(.+)$', myArgv, re.IGNORECASE):
             matchReg = re.match('^\-\-BuildId=(.+)$', myArgv, re.IGNORECASE)
             RAN.BuildId = matchReg.group(1)
-        elif re.match('^\-\-FlexRicTag=(.+)$', myArgv, re.IGNORECASE):
-            matchReg = re.match('^\-\-FlexRicTag=(.+)$', myArgv, re.IGNORECASE)
-            CONTAINERS.flexricTag = matchReg.group(1)
         else:
             HELP.GenericHelp(CONST.Version)
             sys.exit('Invalid Parameter: ' + myArgv)
 
-    return py_param_file_present, py_params, mode, force_local
+    return py_param_file_present, py_params, mode

ci-scripts/as_ue/aw2s-multi-00102-20.cfg

@@ -1,284 +0,0 @@
-/* UE simulator configuration file version 2021-06-17
- * LTE / 5G Non StandAlone
- * Copyright (C) 2019-2021 Amarisoft
- */
-{
-#define N_ANTENNA_DL 1
-#define N_ANTENNA_UL 1
-#define DL_ARFCN 631296
-#define TDD 1
-
-log_options: "all.level=warn,all.max_size=0,nas.level=debug,nas.max_size=1,rrc.level=debug,rrc.max_size=1",
-log_filename: "/tmp/ue.log",
-
-/* Enable remote API and Web interface */
-com_addr: "0.0.0.0:9002",
-
-include "rf_driver_20/1chan.cfg",
-
-/* If true, allow the simulation of several UEs at the same time and
-allow dynamic UE creation from remote API */
-
-  cell_groups: [{
-      group_type: "nr",
-      multi_ue: true,
-      ldpc_max_its:8,
-      cells: [{
-      rf_port: 0,
-      bandwidth: 20,
-      band: 78,
-      dl_nr_arfcn: DL_ARFCN,
-      ssb_nr_arfcn: DL_ARFCN,
-      subcarrier_spacing: 30,
-      n_antenna_dl: N_ANTENNA_DL,
-      n_antenna_ul: N_ANTENNA_UL,
-      rx_to_tx_latency:2,
-      global_timing_advance:-1,
-    }],
-  }],
-
-  /* UE capabilities */
-  /* USIM data */
-  ue_list: [
-    {
-      "ue_id" : 1,
-      "imsi": "001020000000001",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 2,
-      "imsi": "001020000000002",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 3,
-      "imsi": "001020000000003",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 4,
-      "imsi": "001020000000004",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 5,
-      "imsi": "001020000000005",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 6,
-      "imsi": "001020000000006",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 7,
-      "imsi": "001020000000007",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 8,
-      "imsi": "001020000000008",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 9,
-      "imsi": "001020000000009",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 10,
-      "imsi": "001020000000010",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 11,
-      "imsi": "001020000000011",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 12,
-      "imsi": "001020000000012",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 13,
-      "imsi": "001020000000013",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-        {
-      "ue_id" : 14,
-      "imsi": "001020000000014",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 15,
-      "imsi": "001020000000015",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 16,
-      "imsi": "001020000000016",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
- ],
-}

ci-scripts/as_ue/aw2s-multi-20897.cfg

@@ -4,8 +4,6 @@
  */
 {
 #define N_ANTENNA_DL 2
-#define N_ANTENNA_UL 2
-#define DL_ARFCN 631296
 #define TDD 1
 
 log_options: "all.level=warn,all.max_size=0,nas.level=debug,nas.max_size=1,rrc.level=debug,rrc.max_size=1",
@@ -18,7 +16,7 @@ include "rf_driver/1chan.cfg",
 
 /* If true, allow the simulation of several UEs at the same time and
 allow dynamic UE creation from remote API */
-
+                    
   cell_groups: [{
       group_type: "nr",
       multi_ue: true,
@@ -26,21 +24,21 @@ allow dynamic UE creation from remote API */
       rf_port: 0,
       bandwidth: 20,
       band: 78,
-      dl_nr_arfcn: DL_ARFCN,
-      ssb_nr_arfcn: DL_ARFCN,
+      dl_nr_arfcn:627360,
+      ssb_nr_arfcn:627360,
       subcarrier_spacing: 30,
       n_antenna_dl: N_ANTENNA_DL,
-      n_antenna_ul: N_ANTENNA_UL,
+      n_antenna_ul: 1,
       rx_to_tx_latency:2,
     }],
   }],
 
   /* UE capabilities */
-  /* USIM data */
+  /* USIM data */     
   ue_list: [
     {
       "ue_id" : 1,
-      "imsi": "001020000000001",
+      "imsi": "208970000000111",
       "K": "fec86ba6eb707ed08905757b1bb44b8f",
       "sim_algo":"milenage",
       "op": "1006020f0a478bf6b699f15c062e42b3",
@@ -55,7 +53,7 @@ allow dynamic UE creation from remote API */
     },
     {
       "ue_id" : 2,
-      "imsi": "001020000000002",
+      "imsi": "208970000000112",
       "K": "fec86ba6eb707ed08905757b1bb44b8f",
       "sim_algo":"milenage",
       "op": "1006020f0a478bf6b699f15c062e42b3",
@@ -70,7 +68,7 @@ allow dynamic UE creation from remote API */
     },
     {
       "ue_id" : 3,
-      "imsi": "001020000000003",
+      "imsi": "208970000000113",
       "K": "fec86ba6eb707ed08905757b1bb44b8f",
       "sim_algo":"milenage",
       "op": "1006020f0a478bf6b699f15c062e42b3",
@@ -85,7 +83,7 @@ allow dynamic UE creation from remote API */
     },
     {
       "ue_id" : 4,
-      "imsi": "001020000000004",
+      "imsi": "208970000000114",
       "K": "fec86ba6eb707ed08905757b1bb44b8f",
       "sim_algo":"milenage",
       "op": "1006020f0a478bf6b699f15c062e42b3",
@@ -100,7 +98,7 @@ allow dynamic UE creation from remote API */
     },
     {
       "ue_id" : 5,
-      "imsi": "001020000000005",
+      "imsi": "208970000000115",
       "K": "fec86ba6eb707ed08905757b1bb44b8f",
       "sim_algo":"milenage",
       "op": "1006020f0a478bf6b699f15c062e42b3",
@@ -115,7 +113,7 @@ allow dynamic UE creation from remote API */
     },
     {
       "ue_id" : 6,
-      "imsi": "001020000000006",
+      "imsi": "208970000000116",
       "K": "fec86ba6eb707ed08905757b1bb44b8f",
       "sim_algo":"milenage",
       "op": "1006020f0a478bf6b699f15c062e42b3",
@@ -130,7 +128,7 @@ allow dynamic UE creation from remote API */
     },
     {
       "ue_id" : 7,
-      "imsi": "001020000000007",
+      "imsi": "208970000000117",
       "K": "fec86ba6eb707ed08905757b1bb44b8f",
       "sim_algo":"milenage",
       "op": "1006020f0a478bf6b699f15c062e42b3",
@@ -145,7 +143,7 @@ allow dynamic UE creation from remote API */
     },
     {
       "ue_id" : 8,
-      "imsi": "001020000000008",
+      "imsi": "208970000000118",
       "K": "fec86ba6eb707ed08905757b1bb44b8f",
       "sim_algo":"milenage",
       "op": "1006020f0a478bf6b699f15c062e42b3",
@@ -160,7 +158,7 @@ allow dynamic UE creation from remote API */
     },
     {
       "ue_id" : 9,
-      "imsi": "001020000000009",
+      "imsi": "208970000000119",
       "K": "fec86ba6eb707ed08905757b1bb44b8f",
       "sim_algo":"milenage",
       "op": "1006020f0a478bf6b699f15c062e42b3",
@@ -175,7 +173,7 @@ allow dynamic UE creation from remote API */
     },
     {
       "ue_id" : 10,
-      "imsi": "001020000000010",
+      "imsi": "208970000000120",
       "K": "fec86ba6eb707ed08905757b1bb44b8f",
       "sim_algo":"milenage",
       "op": "1006020f0a478bf6b699f15c062e42b3",
@@ -190,7 +188,7 @@ allow dynamic UE creation from remote API */
     },
     {
       "ue_id" : 11,
-      "imsi": "001020000000011",
+      "imsi": "208970000000121",
       "K": "fec86ba6eb707ed08905757b1bb44b8f",
       "sim_algo":"milenage",
       "op": "1006020f0a478bf6b699f15c062e42b3",
@@ -205,7 +203,7 @@ allow dynamic UE creation from remote API */
     },
     {
       "ue_id" : 12,
-      "imsi": "001020000000012",
+      "imsi": "208970000000122",
       "K": "fec86ba6eb707ed08905757b1bb44b8f",
       "sim_algo":"milenage",
       "op": "1006020f0a478bf6b699f15c062e42b3",
@@ -220,7 +218,7 @@ allow dynamic UE creation from remote API */
     },
     {
       "ue_id" : 13,
-      "imsi": "001020000000013",
+      "imsi": "208970000000123",
       "K": "fec86ba6eb707ed08905757b1bb44b8f",
       "sim_algo":"milenage",
       "op": "1006020f0a478bf6b699f15c062e42b3",
@@ -235,7 +233,7 @@ allow dynamic UE creation from remote API */
     },
         {
       "ue_id" : 14,
-      "imsi": "001020000000014",
+      "imsi": "208970000000124",
       "K": "fec86ba6eb707ed08905757b1bb44b8f",
       "sim_algo":"milenage",
       "op": "1006020f0a478bf6b699f15c062e42b3",
@@ -250,7 +248,7 @@ allow dynamic UE creation from remote API */
     },
     {
       "ue_id" : 15,
-      "imsi": "001020000000015",
+      "imsi": "208970000000125",
       "K": "fec86ba6eb707ed08905757b1bb44b8f",
       "sim_algo":"milenage",
       "op": "1006020f0a478bf6b699f15c062e42b3",
@@ -265,7 +263,7 @@ allow dynamic UE creation from remote API */
     },
     {
       "ue_id" : 16,
-      "imsi": "001020000000016",
+      "imsi": "208970000000126",
       "K": "fec86ba6eb707ed08905757b1bb44b8f",
       "sim_algo":"milenage",
       "op": "1006020f0a478bf6b699f15c062e42b3",

ci-scripts/build_fr1_from_yaml.py

@@ -0,0 +1,79 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+"""
+Created on Tue Jul  7 23:04:51 2020
+
+@author: hardy
+"""
+
+
+
+import yaml
+import sys
+import subprocess
+
+      
+
+def main():
+  f_yaml=sys.argv[1]
+  f_sh=sys.argv[2]
+  #filename='py_params_template.yaml'
+  with open(f_yaml,'r') as file:
+    # The FullLoader parameter handles the conversion from YAML
+    # scalar values to Python the dictionary format
+    print('Loading '+f_yaml)
+    params = yaml.load(file,Loader=yaml.FullLoader)
+
+
+  with open(f_sh,'w') as f:
+    f.write('#!/bin/sh\n')
+    for i in range (0, len(params['steps'])):
+      step=params['steps'][i].split(',')
+      mode=step[0]
+      f_xml=step[1]
+      line='python3 main.py ' + \
+           '--mode='+ mode + ' ' + \
+           '--ranRepository=' + params['ranRepository'] + ' ' + \
+           '--ranBranch=' + params['ranBranch'] + ' ' + \
+           '--ranCommitID=' + params['ranCommitID'] + ' ' + \
+           '--ranAllowMerge=' + params['ranAllowMerge'] + ' ' + \
+           '--ranTargetBranch=' + params['ranTargetBranch'] + ' ' + \
+           \
+           '--UEIPAddress=' + params['UE']['UEIPAddress'] + ' ' + \
+           '--UEUserName=' + params['UE']['UEUserName'] + ' ' + \
+           '--UEPassword=' + params['UE']['UEPassword'] + ' ' + \
+           '--UESourceCodePath=' + params['UE']['UESourceCodePath'] + ' ' + \
+           \
+           '--EPCIPAddress=' + params['EPC']['EPCIPAddress'] + ' ' + \
+           '--EPCUserName=' + params['EPC']['EPCUserName'] + ' ' + \
+           '--EPCPassword=' + params['EPC']['EPCPassword'] + ' ' + \
+           '--EPCSourceCodePath=' + params['EPC']['EPCSourceCodePath'] + ' ' + \
+           '--EPCType=' + params['EPC']['EPCType'] + ' ' + \
+           \
+           '--eNBIPAddress=' + params['RAN'][0]['eNBIPAddress'] + ' ' + \
+           '--eNBUserName=' + params['RAN'][0]['eNBUserName'] + ' ' + \
+           '--eNBPassword=' + params['RAN'][0]['eNBPassword'] + ' ' + \
+           '--eNBSourceCodePath=' + params['RAN'][0]['eNBSourceCodePath'] + ' ' + \
+           \
+           '--eNB1IPAddress=' + params['RAN'][1]['eNB1IPAddress'] + ' ' + \
+           '--eNB1UserName=' + params['RAN'][1]['eNB1UserName'] + ' ' + \
+           '--eNB1Password=' + params['RAN'][1]['eNB1Password'] + ' ' + \
+           '--eNB1SourceCodePath=' + params['RAN'][1]['eNB1SourceCodePath'] + ' '
+      if mode!="InitiateHtml":
+         line+='--XMLTestFile=' + f_xml
+      #if mode is InitiateHTML we have a special processing to mention all xml files from the list
+      #loop starting at 1 to avoid the xml file mentioned with InitiateHtml in yaml file (file is none)
+      else:
+         for i in range (1, len(params['steps'])):
+            step=params['steps'][i].split(',')
+            f_xml=step[1]
+            line+='--XMLTestFile=' + f_xml+' '
+      line+='\n'
+      print(line)
+      f.write(line)
+  subprocess.call(['chmod','777',f_sh])
+
+if __name__ == "__main__":
+    main()
+
+

ci-scripts/build_fr1_template.yaml

@@ -0,0 +1,40 @@
+
+ranRepository : https://gitlab.eurecom.fr/oai/openairinterface5g.git
+ranBranch : integration_2021_wk13_a  
+ranCommitID : 104aa7eed5d6702c1b9da663414079ef698da206     
+ranAllowMerge : 'yes' 
+ranTargetBranch : develop
+
+steps:
+  - InitiateHtml,none
+  - TesteNB,xml_files/fr1_multi_node_build.xml
+  - TesteNB,xml_files/fr1_epc_start.xml
+  - TesteNB,xml_files/fr1_nsa_base_next.xml #ue toggle, nodes initialize, ue toggle, ping, nodes terminate
+  - TesteNB,xml_files/fr1_epc_closure.xml
+
+RAN:
+    - eNBIPAddress : 192.168.18.199 #eNB on Minimassive
+      eNBUserName : oaicicd
+      eNBPassword : HzB*nkryaITdVd08TKlT#2Z5a!7M#~qn
+      eNBSourceCodePath : /tmp/CI-FR1-eNB
+    - eNB1IPAddress : 192.168.18.198 #gNB on Mozart
+      eNB1UserName : oaicicd
+      eNB1Password : 7zkDOFgh@w3HvRBMPTMh@BAx
+      eNB1SourceCodePath : /tmp/CI-FR1-gNB
+
+
+EPC: #on Nikaia 
+  EPCIPAddress : 192.168.18.99
+  EPCUserName : nikaia
+  EPCPassword : linux
+  EPCSourceCodePath : /tmp/CI-FR1-EPC
+  EPCType : ltebox
+
+
+UE:
+  UEIPAddress : none
+  UEUserName : none
+  UEPassword : none
+  UESourceCodePath : none
+
+

ci-scripts/checkAddedWarnings.sh

@@ -106,11 +106,11 @@ echo "Merged Commit is    : $MERGE_COMMMIT"
 echo "Target Init   is    : $TARGET_INIT_COMMIT"
 
 # Retrieve the list of modified files since the latest develop commit
-MODIFIED_FILES=`git log $TARGET_INIT_COMMIT..$MERGE_COMMMIT --oneline --name-status | grep -E "^M|^A" | sed -e "s@^M\t*@@" -e "s@^A\t*@@" | sort | uniq`
+MODIFIED_FILES=`git log $TARGET_INIT_COMMIT..$MERGE_COMMMIT --oneline --name-status | egrep "^M|^A" | sed -e "s@^M\t*@@" -e "s@^A\t*@@" | sort | uniq`
 NB_WARNINGS_FILES=0
 
 # Retrieve list of warnings 
-LIST_WARNING_FILES=`grep -E "error:|warning:" archives/*/*.txt | grep -E -v "jobserver unavailable|Clock skew detected." | 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/*/*.txt | egrep -v "jobserver unavailable|Clock skew detected." | 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

@@ -64,19 +64,18 @@ then
     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
-    grep -E -irl --exclude-dir=.git --include=*.cpp --include=*.c --include=*.h "General Public License" . | grep -E -v "openair3/NAS/COMMON/milenage.h" > files-w-gnu-gpl-license-banner.txt
+    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=`grep -E -irl --exclude-dir=.git --include=*.cpp --include=*.c --include=*.h "Copyright|copyleft" .`
+    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 | grep -E -c "nfapi/open-nFAPI|nfapi/oai_integration/vendor_ext" || true`
-       IS_OAI_LICENCE_PRESENT=`grep -E -c "OAI Public License" $FILE || true`
-       IS_BSD_LICENCE_PRESENT=`grep -E -c "the terms of the BSD Licence|License-Identifier: BSD-2-Clause|License-Identifier: BSD-3-Clause" $FILE || true`
-       IS_MIT_LICENCE_PRESENT=`grep -E -c "MIT License" $FILE || true`
-       IS_EXCEPTION=`echo $FILE | grep -E -c "common/utils/collection/tree.h|common/utils/collection/queue.h|openair2/UTIL/OPT/packet-rohc.h|openair3/NAS/COMMON/milenage.h|openair1/PHY/CODING/crc.h|openair1/PHY/CODING/crcext.h|openair1/PHY/CODING/types.h" || true`
-       if [ $IS_OAI_LICENCE_PRESENT -eq 0 ] && [ $IS_BSD_LICENCE_PRESENT -eq 0 ] && [ $IS_MIT_LICENCE_PRESENT -eq 0 ]
+       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|License-Identifier: BSD-2-Clause" $FILE || true`
+       IS_EXCEPTION=`echo $FILE | egrep -c "common/utils/collection/tree.h|common/utils/collection/queue.h|openair2/UTIL/OPT/packet-rohc.h|openair3/NAS/COMMON/milenage.h|openair1/PHY/CODING/crc.h|openair1/PHY/CODING/crcext.h|openair1/PHY/CODING/types.h|openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder_offload.c|openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_offload.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
@@ -147,7 +146,7 @@ echo " ----------------------------------------------------------"
 echo ""
 
 # Retrieve the list of modified files since the latest develop commit
-MODIFIED_FILES=`git log $TARGET_INIT_COMMIT..$MERGE_COMMMIT --oneline --name-status | grep -E "^M|^A" | sed -e "s@^M\t*@@" -e "s@^A\t*@@" | sort | uniq`
+MODIFIED_FILES=`git log $TARGET_INIT_COMMIT..$MERGE_COMMMIT --oneline --name-status | egrep "^M|^A" | sed -e "s@^M\t*@@" -e "s@^A\t*@@" | sort | uniq`
 NB_TO_FORMAT=0
 if [ -f header-files-w-incorrect-define.txt ]
 then
@@ -173,21 +172,20 @@ do
     if [ $EXT = "c" ] || [ $EXT = "h" ] || [ $EXT = "cpp" ] || [ $EXT = "hpp" ]
     then
         # Testing if explicit GNU GPL license banner
-        GNU_EXCEPTION=`echo $FULLFILE | grep -E -c "openair3/NAS/COMMON/milenage.h" || true`
+        GNU_EXCEPTION=`echo $FULLFILE | egrep -c "openair3/NAS/COMMON/milenage.h" || true`
         if [ $GNU_EXCEPTION -eq 0 ]
         then
-            grep -E -il "General Public License" $FULLFILE >> files-w-gnu-gpl-license-banner.txt
+            egrep -il "General Public License" $FULLFILE >> files-w-gnu-gpl-license-banner.txt
         fi
         # Looking at exotic/suspect banner
-        IS_BANNER=`grep -E -i -c "Copyright|copyleft" $FULLFILE || true`
+        IS_BANNER=`egrep -i -c "Copyright|copyleft" $FULLFILE || true`
         if [ $IS_BANNER -ne 0 ]
         then
-            IS_NFAPI=`echo $FULLFILE | grep -E -c "nfapi/open-nFAPI|nfapi/oai_integration/vendor_ext" || true`
-            IS_OAI_LICENCE_PRESENT=`grep -E -c "OAI Public License" $FULLFILE || true`
-            IS_BSD_LICENCE_PRESENT=`grep -E -c "the terms of the BSD Licence|License-Identifier: BSD-2-Clause|License-Identifier: BSD-3-Clause" $FULLFILE || true`
-            IS_MIT_LICENCE_PRESENT=`grep -E -c "MIT License" $FULLFILE || true`
-            IS_EXCEPTION=`echo $FULLFILE | grep -E -c "common/utils/collection/tree.h|common/utils/collection/queue.h|openair2/UTIL/OPT/packet-rohc.h|openair3/NAS/COMMON/milenage.h|openair1/PHY/CODING/crc.h|openair1/PHY/CODING/crcext.h|openair1/PHY/CODING/types.h" || true`
-            if [ $IS_OAI_LICENCE_PRESENT -eq 0 ] && [ $IS_BSD_LICENCE_PRESENT -eq 0 ] && [ $IS_MIT_LICENCE_PRESENT -eq 0 ]
+            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|License-Identifier: BSD-2-Clause" $FULLFILE || true`
+            IS_EXCEPTION=`echo $FULLFILE | egrep -c "common/utils/collection/tree.h|common/utils/collection/queue.h|openair2/UTIL/OPT/packet-rohc.h|openair3/NAS/COMMON/milenage.h|openair1/PHY/CODING/crc.h|openair1/PHY/CODING/crcext.h|openair1/PHY/CODING/types.h|openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder_offload.c|openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_offload.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

ci-scripts/checkGitLabMergeRequestLabels.sh

@@ -78,10 +78,9 @@ IS_MR_BUILD_ONLY=`echo $LABELS | grep -c BUILD-ONLY`
 IS_MR_CI=`echo $LABELS | grep -c CI`
 IS_MR_4G=`echo $LABELS | grep -c 4G-LTE`
 IS_MR_5G=`echo $LABELS | grep -c 5G-NR`
-IS_MR_5G_UE=`echo $LABELS | grep -c nrUE`
 
 # none is present! No CI
-if [ $IS_MR_BUILD_ONLY -eq 0 ] && [ $IS_MR_CI -eq 0 ] && [ $IS_MR_4G -eq 0 ] && [ $IS_MR_5G -eq 0 ] && [ $IS_MR_DOCUMENTATION -eq 0 ] && [ $IS_MR_5G_UE -eq 0 ]
+if [ $IS_MR_BUILD_ONLY -eq 0 ] && [ $IS_MR_CI -eq 0 ] && [ $IS_MR_4G -eq 0 ] && [ $IS_MR_5G -eq 0 ] && [ $IS_MR_DOCUMENTATION -eq 0 ]
 then
     echo "NONE"
     exit 0
@@ -94,12 +93,6 @@ then
     exit 0
 fi
 
-if [ $IS_MR_5G_UE -eq 1 ] && [ $IS_MR_4G -eq 1 ]
-then
-    echo "SHORTEN-4G-5G-UE"
-    exit 0
-fi
-
 # 4G is present: run only 4G
 if [ $IS_MR_4G -eq 1 ]
 then
@@ -114,12 +107,6 @@ then
     exit 0
 fi
 
-if [ $IS_MR_5G_UE -eq 1 ]
-then
-    echo "SHORTEN-5G-UE"
-    exit 0
-fi
-
 # BUILD-ONLY is present: only build stages
 if [ $IS_MR_BUILD_ONLY -eq 1 ]
 then

ci-scripts/ci_ueinfra.yaml

@@ -9,30 +9,16 @@ idefix:
   MTU: 1500
   Trace: True
   LogStore: /media/usb-drive/ci_qlogs
-
-up2:
-  Host: up2
-  AttachScript: sudo /opt/mbim/start_quectel_mbim.sh
-  DetachScript: sudo /opt/mbim/stop_quectel_mbim.sh
-  NetworkScript: ip a show dev wwan0
-  IF: wwan0
-  MTU: 1500
-
-up2-fhi72:
-  Host: up2
-  AttachScript: sudo /opt/mbim-fhi72/start_quectel_mbim.sh
-  DetachScript: sudo /opt/mbim-fhi72/stop_quectel_mbim.sh
-  NetworkScript: ip a show dev wwan0
-  IF: wwan0
-  MTU: 1500
-
-up2-aerial:
-  Host: up2
-  AttachScript: sudo /opt/mbim-fhi72/start_quectel_mbim.sh
-  DetachScript: sudo /opt/mbim-fhi72/stop_quectel_mbim.sh
+nrmodule2_quectel:
+  Host: nrmodule2
+  InitScript: sudo stdbuf -oL /home/nrmodule2/quectel-CM/quectel-CM -4 -s oai.ipv4 &> /tmp/quecel-cm.log &
+  TermScript: sudo -S killall --signal SIGKILL quectel-CM
+  AttachScript: sudo python3 ci_ctl_qtel.py /dev/ttyUSB2 wup
+  DetachScript: sudo python3 ci_ctl_qtel.py /dev/ttyUSB2 detach
   NetworkScript: ip a show dev wwan0
   IF: wwan0
   MTU: 1500
+  LogStore: /media/ci_qlogs
 
 adb_ue_1:
   Host: nano
@@ -61,72 +47,9 @@ adb_ue_2:
   MTU: 1500
   LogStore: /media/usb-drive/ci_adb_2-logs
 
-oc-cn5g:
-  Host: avra
-  Namespace: "oaicicd-core-for-ci-ran"
-  CNPath: "/opt/oai-cn5g-fed-develop-2025-jan"
-  NetworkScript: echo "inet 172.21.6.102"
-  RunIperf3Server: False
-
-oc-cn5g-20897:
-  Host: cacofonix
-  Namespace: "oaicicd-core-for-fhi72"
-  CNPath: "/opt/oai-cn5g-fed-develop-2025-jan"
-  NetworkScript: echo "inet 172.21.6.105"
-  RunIperf3Server: False
-
-oc-cn5g-20897-aerial2:
-  Host: aerial2
-  Namespace: "oaicicd-core-for-nvidia-aerial"
-  CNPath: "/opt/oai-cn5g-fed-develop-2025-jan"
-  NetworkScript: echo "inet 172.21.6.105"
-  RunIperf3Server: False
-
-matix-cn5g:
-  Host: matix
-  NetworkScript: docker exec prod-trf-gen ip a show dev eth0
-  CmdPrefix: docker exec prod-trf-gen
-  RunIperf3Server: False
-
-porcepix-cn4g:
-  Host: porcepix
-  NetworkScript: docker exec prod-trf-gen ip a show dev eth0
-  CmdPrefix: docker exec prod-trf-gen
-
-porcepix-cn5g:
-  Host: porcepix
-  NetworkScript: docker exec prod-trf-gen ip a show dev eth0
-  CmdPrefix: docker exec prod-trf-gen
-  RunIperf3Server: False
-
-nano-cn4g:
-  Host: nano
-  NetworkScript: docker exec prod-trf-gen ip a show dev eth0
-  CmdPrefix: docker exec prod-trf-gen
-
-ltebox-nano:
-  Host: nano
-  NetworkScript: ip a show dev tun1
-
-sabox-nepes:
-  Host: nepes
-  NetworkScript: ip a show dev tun1
-
-ltebox-nepes:
-  Host: nepes
-  NetworkScript: ip a show dev tun1
-
 amarisoft_ue:
   Host: amariue
-  InitScript: /root/lteue-linux-2023-10-27/ue/lteue /root/oaicicd/ran_sa_aw2s_asue/aw2s-multi-00102-20.cfg &
-  TermScript: /root/2023-10-27/libs/ws.js -t 10 127.0.0.1:9002 '{"message":"quit"}' || killall -KILL lteue-avx2
-amarisoft_ue_2x2:
-  Host: amariue
-  InitScript: /root/lteue-linux-2023-10-27/ue/lteue /root/oaicicd/ran_sa_aw2s_asue_2x2/aw2s-multi-00102-2x2-v2.cfg &
-  TermScript: /root/2023-10-27/libs/ws.js -t 10 127.0.0.1:9002 '{"message":"quit"}' || killall -KILL lteue-avx2
-amarisoft_ue_fhi72:
-  Host: amariue
-  InitScript: /root/lteue-linux-2023-10-27/ue/lteue /root/oaicicd/ran_sa_fhi72_asue_2x2_benetel550/fhi72-multi-20897-2x2.cfg &
+  InitScript: /root/lteue-linux-2023-10-27/ue/lteue /root/oaicicd/ran_sa_aw2s_asue/aw2s-multi-20897-2x2.cfg &
   TermScript: /root/2023-10-27/libs/ws.js -t 10 127.0.0.1:9002 '{"message":"quit"}' || killall -KILL lteue-avx2
 amarisoft_ue_1:
   Host: amariue
@@ -198,48 +121,6 @@ amarisoft_ue_10:
   NetworkScript: ip netns exec ue10 ip a show dev pdn0
   CmdPrefix: ip netns exec ue10
   MTU: 1500
-amarisoft_ue_11:
-  Host: amariue
-  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":11}'
-  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":11}'
-  NetworkScript: ip netns exec ue11 ip a show dev pdn0
-  CmdPrefix: ip netns exec ue11
-  MTU: 1500
-amarisoft_ue_12:
-  Host: amariue
-  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":12}'
-  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":12}'
-  NetworkScript: ip netns exec ue12 ip a show dev pdn0
-  CmdPrefix: ip netns exec ue12
-  MTU: 1500
-amarisoft_ue_13:
-  Host: amariue
-  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":13}'
-  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":13}'
-  NetworkScript: ip netns exec ue13 ip a show dev pdn0
-  CmdPrefix: ip netns exec ue13
-  MTU: 1500
-amarisoft_ue_14:
-  Host: amariue
-  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":14}'
-  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":14}'
-  NetworkScript: ip netns exec ue14 ip a show dev pdn0
-  CmdPrefix: ip netns exec ue14
-  MTU: 1500
-amarisoft_ue_15:
-  Host: amariue
-  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":15}'
-  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":15}'
-  NetworkScript: ip netns exec ue15 ip a show dev pdn0
-  CmdPrefix: ip netns exec ue15
-  MTU: 1500
-amarisoft_ue_16:
-  Host: amariue
-  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":16}'
-  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":16}'
-  NetworkScript: ip netns exec ue16 ip a show dev pdn0
-  CmdPrefix: ip netns exec ue16
-  MTU: 1500
 
 oai_ue_caracal:
   Host: caracal
@@ -257,13 +138,13 @@ lte_oai_ue_carabe:
   MTU: 1500
 
 rfsim5g_gnb_nos1:
-  Host: "%%current_host%%"
+  Host: localhost
   NetworkScript: docker exec rfsim5g-oai-gnb ip a show dev oaitun_enb1
   CmdPrefix: docker exec rfsim5g-oai-gnb
   IF: oaitun_enb1
 
 rfsim5g_ue:
-  Host: "%%current_host%%"
+  Host: localhost
   NetworkScript: docker exec rfsim5g-oai-nr-ue ip a show dev oaitun_ue1
   CmdPrefix: docker exec rfsim5g-oai-nr-ue
   IF: oaitun_ue1
@@ -272,7 +153,7 @@ rfsim5g_ue:
   MTU: 1500
 
 rfsim5g_ue2:
-  Host: "%%current_host%%"
+  Host: localhost
   NetworkScript: docker exec rfsim5g-oai-nr-ue2 ip a show dev oaitun_ue1
   CmdPrefix: docker exec rfsim5g-oai-nr-ue2
   IF: oaitun_ue1
@@ -281,7 +162,7 @@ rfsim5g_ue2:
   MTU: 1500
 
 rfsim5g_ue3:
-  Host: "%%current_host%%"
+  Host: localhost
   NetworkScript: docker exec rfsim5g-oai-nr-ue3 ip a show dev oaitun_ue1
   CmdPrefix: docker exec rfsim5g-oai-nr-ue3
   IF: oaitun_ue1
@@ -290,7 +171,7 @@ rfsim5g_ue3:
   MTU: 1500
 
 rfsim5g_ue4:
-  Host: "%%current_host%%"
+  Host: localhost
   NetworkScript: docker exec rfsim5g-oai-nr-ue4 ip a show dev oaitun_ue1
   CmdPrefix: docker exec rfsim5g-oai-nr-ue4
   IF: oaitun_ue1
@@ -299,7 +180,7 @@ rfsim5g_ue4:
   MTU: 1500
 
 rfsim5g_ue5:
-  Host: "%%current_host%%"
+  Host: localhost
   NetworkScript: docker exec rfsim5g-oai-nr-ue5 ip a show dev oaitun_ue1
   CmdPrefix: docker exec rfsim5g-oai-nr-ue5
   IF: oaitun_ue1
@@ -308,7 +189,7 @@ rfsim5g_ue5:
   MTU: 1500
 
 rfsim5g_ue6:
-  Host: "%%current_host%%"
+  Host: localhost
   NetworkScript: docker exec rfsim5g-oai-nr-ue6 ip a show dev oaitun_ue1
   CmdPrefix: docker exec rfsim5g-oai-nr-ue6
   IF: oaitun_ue1
@@ -317,7 +198,7 @@ rfsim5g_ue6:
   MTU: 1500
 
 rfsim5g_ue7:
-  Host: "%%current_host%%"
+  Host: localhost
   NetworkScript: docker exec rfsim5g-oai-nr-ue7 ip a show dev oaitun_ue1
   CmdPrefix: docker exec rfsim5g-oai-nr-ue7
   IF: oaitun_ue1
@@ -326,7 +207,7 @@ rfsim5g_ue7:
   MTU: 1500
 
 rfsim5g_ue8:
-  Host: "%%current_host%%"
+  Host: localhost
   NetworkScript: docker exec rfsim5g-oai-nr-ue8 ip a show dev oaitun_ue1
   CmdPrefix: docker exec rfsim5g-oai-nr-ue8
   IF: oaitun_ue1
@@ -335,7 +216,7 @@ rfsim5g_ue8:
   MTU: 1500
 
 rfsim5g_ue9:
-  Host: "%%current_host%%"
+  Host: localhost
   NetworkScript: docker exec rfsim5g-oai-nr-ue9 ip a show dev oaitun_ue1
   CmdPrefix: docker exec rfsim5g-oai-nr-ue9
   IF: oaitun_ue1
@@ -344,7 +225,7 @@ rfsim5g_ue9:
   MTU: 1500
 
 rfsim5g_ue10:
-  Host: "%%current_host%%"
+  Host: localhost
   NetworkScript: docker exec rfsim5g-oai-nr-ue10 ip a show dev oaitun_ue1
   CmdPrefix: docker exec rfsim5g-oai-nr-ue10
   IF: oaitun_ue1
@@ -353,44 +234,43 @@ rfsim5g_ue10:
   MTU: 1500
 
 rfsim5g_ext_dn:
-  Host: "%%current_host%%"
+  Host: localhost
   NetworkScript: docker exec rfsim5g-oai-ext-dn ip a show dev eth0
   CmdPrefix: docker exec rfsim5g-oai-ext-dn
 
 rfsim4g_ue:
-  Host: "%%current_host%%"
+  Host: localhost
   NetworkScript: docker exec rfsim4g-oai-lte-ue0 ip a show dev oaitun_ue1
   CmdPrefix: docker exec rfsim4g-oai-lte-ue0
   IF: oaitun_ue1
-  AttachScript: docker start rfsim4g-oai-lte-ue0
-  DetachScript: docker stop rfsim4g-oai-lte-ue0
-  MTU: 1500
 
 rfsim4g_ext_dn:
-  Host: "%%current_host%%"
+  Host: localhost
   NetworkScript: docker exec rfsim4g-trf-gen ip a show dev eth0
   CmdPrefix: docker exec rfsim4g-trf-gen
 
 rfsim4g_enb_nos1:
-  Host: "%%current_host%%"
+  Host: localhost
   NetworkScript: docker exec rfsim4g-oai-enb ip a show dev oaitun_enb1
   CmdPrefix: docker exec rfsim4g-oai-enb
   IF: oaitun_enb1
 
-rfsim4g_enb_fembms:
-  Host: "%%current_host%%"
-  NetworkScript: docker exec rfsim4g-oai-enb ip a show dev oaitun_enm1
-  CmdPrefix: docker exec rfsim4g-oai-enb
-  IF: oaitun_enm1
+l2sim5g_ue:
+  Host: localhost
+  AttachScript: docker start l2sim-oai-nr-ue0
+  DetachScript: docker stop l2sim-oai-nr-ue0
+  NetworkScript: docker exec l2sim-oai-nr-ue0 ip a show dev oaitun_ue1
+  CmdPrefix: docker exec l2sim-oai-nr-ue0
+  IF: oaitun_ue1
+  MTU: 1500
 
-rfsim4g_ue_fembms:
-  Host: "%%current_host%%"
-  NetworkScript: docker exec rfsim4g-oai-lte-ue0 ip a show dev oaitun_uem1
-  CmdPrefix: docker exec rfsim4g-oai-lte-ue0
-  IF: oaitun_uem1
+l2sim5g_ext_dn:
+  Host: localhost
+  NetworkScript: docker exec l2sim-oai-ext-dn ip a show dev eth0
+  CmdPrefix: docker exec l2sim-oai-ext-dn
 
 l2sim4g_ue:
-  Host: "%%current_host%%"
+  Host: localhost
   AttachScript: docker start l2sim4g-oai-lte-ue1
   DetachScript: docker stop l2sim4g-oai-lte-ue1
   NetworkScript: docker exec l2sim4g-oai-lte-ue1 ip a show dev oaitun_ue1
@@ -399,10 +279,6 @@ l2sim4g_ue:
   MTU: 1500
 
 l2sim4g_ext_dn:
-  Host: "%%current_host%%"
+  Host: localhost
   NetworkScript: docker exec l2sim4g-trf-gen ip a show dev eth0
   CmdPrefix: docker exec l2sim4g-trf-gen
-
-test:
-  Host: localhost
-  NetworkScript: echo "inet 127.0.0.1 mtu 1500"

ci-scripts/cls_analysis.py

@@ -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
-# */
-#---------------------------------------------------------------------
-
-import logging
-import re
-
-# Define the mapping of physim_test values to search patterns
-PHYSIM_PATTERN_MAPPING = {
-	'nr_ulsim': [
-		r'(Total PHY proc rx)\s+(\d+\.\d+)\s+us',  # Pattern for RX PHY processing time
-		r'(ULSCH total decoding time)\s+(\d+\.\d+)\s+us',  # Pattern for ULSCH decoding time
-	],
-	'nr_dlsim': [
-		r'(PHY proc tx)\s+(\d+\.\d+)\s+us',  # Pattern for TX PHY processing time
-		r'(DLSCH encoding time)\s+(\d+\.\d+)\s+us',  # Pattern for DLSCH encoding time
-	],
-	'ldpctest': [
-		r'(Encoding time mean):\s+(\d+\.\d+)\s+us',  # Pattern for encoding time mean
-		r'(Decoding time mean):\s+(\d+\.\d+)\s+us',  # Pattern for decoding time mean
-	],
-}
-# Define test conditions based on the simulation type
-PHYSIM_TEST_CONDITION = {
-	'nr_ulsim': 'test OK',  # For nr_ulsim, check if 'test OK' is present
-	'nr_dlsim': 'test OK',  # For nr_dlsim, check if 'test OK' is present
-	'ldpctest': None,	  # No condition for ldpctest, just process the patterns
-}
-
-class Analysis():
-
-	def analyze_physim(log, physim_test, options, threshold):
-		search_patterns = PHYSIM_PATTERN_MAPPING.get(physim_test)
-		test_condition = PHYSIM_TEST_CONDITION.get(physim_test)
-		success = False
-		msg = ''
-
-		try:
-			with open(log, 'r') as f:
-				log_content = f.read()
-		except FileNotFoundError as e:
-			msg = f'{log} file not found, exception: {e}'
-			return False, msg
-		except Exception as e:
-			msg = f'Error while parsing log file {log}: exception: {e}'
-			return False, msg
-
-		if test_condition and test_condition not in log_content:
-			msg = f"Test did not succeed, '{test_condition}' not found in log file {log}."
-			return False, msg
-
-		time1_match = re.search(search_patterns[0], log_content)
-		time2_match = re.search(search_patterns[1], log_content)
-		if not(time1_match and time2_match):
-			msg = f"Processing time not found in log file {log}."
-			return False, msg
-
-		success = float(time2_match.group(2)) < float(threshold)
-		if success:
-			msg = f'{time1_match.group(1)}: {time1_match.group(2)} us\n{time2_match.group(1)}: {time2_match.group(2)} us'
-		else:
-			msg = f'{time1_match.group(1)}: {time1_match.group(2)} us\n{time2_match.group(1)}: {time2_match.group(2)} us exceeds a limit of {threshold} us'
-
-		return success,msg

ci-scripts/cls_cluster.py

@@ -41,18 +41,16 @@ import cls_cmd
 IMAGE_REGISTRY_SERVICE_NAME = "image-registry.openshift-image-registry.svc"
 NAMESPACE = "oaicicd-ran"
 OCUrl = "https://api.oai.cs.eurecom.fr:6443"
-OCRegistry = "default-route-openshift-image-registry.apps.oai.cs.eurecom.fr"
+OCRegistry = "default-route-openshift-image-registry.apps.oai.cs.eurecom.fr/"
 CI_OC_RAN_NAMESPACE = "oaicicd-ran"
-CN_IMAGES = ["mysql", "oai-nrf", "oai-amf", "oai-smf", "oai-upf", "oai-ausf", "oai-udm", "oai-udr", "oai-traffic-server"]
-CN_CONTAINERS = ["", "-c nrf", "-c amf", "-c smf", "-c upf", "-c ausf", "-c udm", "-c udr", ""]
-
+CI_OC_CORE_NAMESPACE = "oaicicd-core-for-ci-ran"
 
 def OC_login(cmd, ocUserName, ocPassword, ocProjectName):
 	if ocUserName == '' or ocPassword == '' or ocProjectName == '':
 		HELP.GenericHelp(CONST.Version)
-		raise ValueError('Insufficient Parameter: no OC Credentials')
-	if OCRegistry.startswith("http") or OCRegistry.endswith("/"):
-		raise ValueError(f'ocRegistry {OCRegistry} should not start with http:// or https:// and not end on a slash /')
+		sys.exit('Insufficient Parameter: no OC Credentials')
+	if OCRegistry.startswith("http") and not self.OCRegistry.endswith("/"):
+		sys.exit(f'ocRegistry {OCRegistry} should not start with http:// or https:// and end on a slash /')
 	ret = cmd.run(f'oc login -u {ocUserName} -p {ocPassword} --server {OCUrl}')
 	if ret.returncode != 0:
 		logging.error('\u001B[1m OC Cluster Login Failed\u001B[0m')
@@ -67,49 +65,6 @@ def OC_login(cmd, ocUserName, ocPassword, ocProjectName):
 def OC_logout(cmd):
 	cmd.run(f'oc logout')
 
-def OC_deploy_CN(cmd, ocUserName, ocPassword, ocNamespace, path):
-	logging.debug(f'OC OAI CN5G: Deploying OAI CN5G on Openshift Cluster: {ocNamespace}')
-	succeeded = OC_login(cmd, ocUserName, ocPassword, ocNamespace)
-	if not succeeded:
-		return False, CONST.OC_LOGIN_FAIL
-	cmd.run(f'helm list -aq -n {ocNamespace} | xargs -r helm uninstall -n {ocNamespace} --wait')
-	ret = cmd.run(f'helm install --wait oai5gcn {path}/ci-scripts/charts/oai-5g-basic/.')
-	if ret.returncode != 0:
-		logging.error('OC OAI CN5G: Deployment failed')
-		OC_logout(cmd)
-		return False, CONST.OC_PROJECT_FAIL
-	report = cmd.run('oc get pods')
-	OC_logout(cmd)
-	return True, report
-
-def OC_undeploy_CN(cmd, ocUserName, ocPassword, ocNamespace, path):
-	logging.debug(f'OC OAI CN5G: Terminating CN on Openshift Cluster: {ocNamespace}')
-	succeeded = OC_login(cmd, ocUserName, ocPassword, ocNamespace)
-	if not succeeded:
-		return False, CONST.OC_LOGIN_FAIL
-	cmd.run(f'rm -Rf {path}/logs')
-	cmd.run(f'mkdir -p {path}/logs')
-	logging.debug('OC OAI CN5G: Collecting log files to workspace')
-	cmd.run(f'oc describe pod &> {path}/logs/describe-pods-post-test.log')
-	cmd.run(f'oc get pods.metrics.k8s &> {path}/logs/nf-resource-consumption.log')
-	for ii, ci in zip(CN_IMAGES, CN_CONTAINERS):
-		podName = cmd.run(f"oc get pods | grep {ii} | awk \'{{print $1}}\'").stdout.strip()
-		if not podName:
-			logging.debug(f'{ii} pod not found!')
-		else:
-			cmd.run(f'oc logs -f {podName} {ci} &> {path}/logs/{ii}.log &')
-	cmd.run(f'cd {path}/logs && zip -r -qq test_logs_CN.zip *.log')
-	cmd.copyin(f'{path}/logs/test_logs_CN.zip','test_logs_CN.zip')
-	ret = cmd.run(f'helm list -aq -n {ocNamespace} | xargs -r helm uninstall -n {ocNamespace} --wait')
-	if ret.returncode != 0:
-		logging.error('OC OAI CN5G: Undeployment failed')
-		cmd.run(f'helm list -aq -n {ocNamespace} | xargs -r helm uninstall -n {ocNamespace} --wait')
-		OC_logout(cmd)
-		return False, CONST.OC_PROJECT_FAIL
-	report = cmd.run('oc get pods')
-	OC_logout(cmd)
-	return True, report
-
 class Cluster:
 	def __init__(self):
 		self.eNBIPAddress = ""
@@ -118,20 +73,32 @@ class Cluster:
 		self.OCUserName = ""
 		self.OCPassword = ""
 		self.OCProjectName = ""
-		self.OCUrl = OCUrl
-		self.OCRegistry = OCRegistry
+		self.OCUrl = "https://api.oai.cs.eurecom.fr:6443"
+		self.OCRegistry = "default-route-openshift-image-registry.apps.oai.cs.eurecom.fr/"
 		self.ranRepository = ""
 		self.ranBranch = ""
 		self.ranCommitID = ""
 		self.ranAllowMerge = False
 		self.ranTargetBranch = ""
 		self.cmd = None
+		self.imageToPull = ''
+		self.testSvrId = None
 
 	def _recreate_entitlements(self):
 		# recreating entitlements, don't care if deletion fails
-		self.cmd.run(f'oc delete secret etc-pki-entitlement')
-		ret = self.cmd.run(f"oc get secret etc-pki-entitlement -n openshift-config-managed -o json | jq 'del(.metadata.resourceVersion)' | jq 'del(.metadata.creationTimestamp)' | jq 'del(.metadata.uid)' | jq 'del(.metadata.namespace)' | oc create -f -", silent=True)
-		if ret.returncode != 0:
+		self.cmd.run('oc delete secret etc-pki-entitlement')
+		ret = self.cmd.run('ls /etc/pki/entitlement/???????????????????.pem | tail -1', silent=True)
+		regres1 = re.search(r"/etc/pki/entitlement/[0-9]+.pem", ret.stdout)
+		ret = self.cmd.run('ls /etc/pki/entitlement/???????????????????-key.pem | tail -1', silent=True)
+		regres2 = re.search(r"/etc/pki/entitlement/[0-9]+-key.pem", ret.stdout)
+		if regres1 is None or regres2 is None:
+			logging.error("could not find entitlements")
+			return False
+		file1 = regres1.group(0)
+		file2 = regres2.group(0)
+		ret = self.cmd.run(f'oc create secret generic etc-pki-entitlement --from-file {file1} --from-file {file2}')
+		regres = re.search(r"secret/etc-pki-entitlement created", ret.stdout)
+		if ret.returncode != 0 or regres is None:
 			logging.error("could not create secret/etc-pki-entitlement")
 			return False
 		return True
@@ -165,7 +132,7 @@ class Cluster:
 	def _start_build(self, name):
 		# will return "immediately" but build runs in background
 		# if multiple builds are started at the same time, this can take some time, however
-		ret = self.cmd.run(f'oc start-build {name} --from-dir={self.eNBSourceCodePath} --exclude=""')
+		ret = self.cmd.run(f'oc start-build {name} --from-file={self.eNBSourceCodePath}')
 		regres = re.search(r'build.build.openshift.io/(?P<jobname>[a-zA-Z0-9\-]+) started', ret.stdout)
 		if ret.returncode != 0 or ret.stdout.count('Uploading finished') != 1 or regres is None:
 			logging.error(f"error during oc start-build: {ret.stdout}")
@@ -208,7 +175,7 @@ class Cluster:
 			return -1
 		return int(result.group("size"))
 
-	def _deploy_pod(self, filename, timeout = 120):
+	def _deploy_pod(self, filename, timeout = 30):
 		ret = self.cmd.run(f'oc create -f {filename}')
 		result = re.search(f'pod/(?P<pod>[a-zA-Z0-9_\-]+) created', ret.stdout)
 		if result is None:
@@ -216,9 +183,11 @@ class Cluster:
 			return None
 		pod = result.group("pod")
 		logging.debug(f'checking if pod {pod} is in Running state')
-		ret = self.cmd.run(f'oc wait --for=condition=ready pod {pod} --timeout={timeout}s', silent=True)
-		if ret.returncode == 0:
-			return pod
+		while timeout > 0:
+			ret = self.cmd.run(f'oc get pod {pod} -o json | jq -Mc .status.phase', silent=True)
+			if re.search('"Running"', ret.stdout) is not None: return pod
+			timeout -= 1
+			time.sleep(1)
 		logging.error(f'pod {pod} did not reach Running state')
 		self._undeploy_pod(filename)
 		return None
@@ -226,47 +195,59 @@ class Cluster:
 	def _undeploy_pod(self, filename):
 		self.cmd.run(f'oc delete -f {filename}')
 
-	def PullClusterImage(self, HTML, node, images, tag_prefix):
-		logging.debug(f'Pull OC image {images} to server {node}')
+	def PullClusterImage(self, HTML, RAN):
+		if self.testSvrId == None: self.testSvrId = self.eNBIPAddress
+		if self.imageToPull == '':
+			HELP.GenericHelp(CONST.Version)
+			sys.exit('Insufficient Parameter')
+		logging.debug(f'Pull OC image {self.imageToPull} to server {self.testSvrId}')
 		self.testCase_id = HTML.testCase_id
-		with cls_cmd.getConnection(node) as cmd:
-			succeeded = OC_login(cmd, self.OCUserName, self.OCPassword, CI_OC_RAN_NAMESPACE)
-			if not succeeded:
-				HTML.CreateHtmlTestRow('N/A', 'KO', CONST.OC_LOGIN_FAIL)
-				return False
-			ret = cmd.run(f'oc whoami -t | docker login -u oaicicd --password-stdin {self.OCRegistry}')
-			if ret.returncode != 0:
-				logging.error(f'cannot authenticate at registry')
-				OC_logout(cmd)
-				HTML.CreateHtmlTestRow('N/A', 'KO', CONST.OC_LOGIN_FAIL)
-				return False
-			tag = cls_containerize.CreateTag(self.ranCommitID, self.ranBranch, self.ranAllowMerge)
-			registry = f'{self.OCRegistry}/{CI_OC_RAN_NAMESPACE}'
-			success, msg = cls_containerize.Containerize.Pull_Image(cmd, images, tag, tag_prefix, registry, None, None)
+		cmd = cls_cmd.getConnection(self.testSvrId)
+		succeeded = OC_login(cmd, self.OCUserName, self.OCPassword, CI_OC_RAN_NAMESPACE)
+		if not succeeded:
+			logging.error('\u001B[1m OC Cluster Login Failed\u001B[0m')
+			HTML.CreateHtmlTestRow('N/A', 'KO', CONST.OC_LOGIN_FAIL)
+			return False
+		ret = cmd.run(f'oc whoami -t | docker login -u oaicicd --password-stdin {self.OCRegistry}')
+		if ret.returncode != 0:
+			logging.error(f'\u001B[1m Unable to access OC project {CI_OC_RAN_NAMESPACE}\u001B[0m')
 			OC_logout(cmd)
-		param = f"on node {node}"
-		if success:
-			HTML.CreateHtmlTestRowQueue(param, 'OK', [msg])
-		else:
-			HTML.CreateHtmlTestRowQueue(param, 'KO', [msg])
-		return success
+			cmd.close()
+			HTML.CreateHtmlTestRow('N/A', 'KO', CONST.OC_LOGIN_FAIL)
+			return False
+		for image in self.imageToPull:
+			imagePrefix = f'{self.OCRegistry}{CI_OC_RAN_NAMESPACE}'
+			imageTag = cls_containerize.ImageTagToUse(image, self.ranCommitID, self.ranBranch, self.ranAllowMerge)
+			ret = cmd.run(f'docker pull {imagePrefix}/{imageTag}')
+			if ret.returncode != 0:
+				logging.error(f'Could not pull {image} from local registry : {self.OCRegistry}')
+				OC_logout(cmd)
+				cmd.close()
+				HTML.CreateHtmlTestRow('msg', 'KO', CONST.ALL_PROCESSES_OK)
+				return False
+			cmd.run(f'docker tag {imagePrefix}/{imageTag} oai-ci/{imageTag}')
+			cmd.run(f'docker rmi {imagePrefix}/{imageTag}')
+		OC_logout(cmd)
+		cmd.close()
+		HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
+		return True
 
 	def BuildClusterImage(self, HTML):
 		if self.ranRepository == '' or self.ranBranch == '' or self.ranCommitID == '':
 			HELP.GenericHelp(CONST.Version)
-			raise ValueError(f'Insufficient Parameter: ranRepository {self.ranRepository} ranBranch {ranBranch} ranCommitID {self.ranCommitID}')
+			sys.exit(f'Insufficient Parameter: ranRepository {self.ranRepository} ranBranch {ranBranch} ranCommitID {self.ranCommitID}')
 		lIpAddr = self.eNBIPAddress
 		lSourcePath = self.eNBSourceCodePath
 		if lIpAddr == '' or lSourcePath == '':
-			raise ValueError('Insufficient Parameter: eNBSourceCodePath missing')
+			sys.exit('Insufficient Parameter: eNBSourceCodePath missing')
 		ocUserName = self.OCUserName
 		ocPassword = self.OCPassword
 		ocProjectName = self.OCProjectName
 		if ocUserName == '' or ocPassword == '' or ocProjectName == '':
 			HELP.GenericHelp(CONST.Version)
-			raise ValueError('Insufficient Parameter: no OC Credentials')
-		if self.OCRegistry.startswith("http") or self.OCRegistry.endswith("/"):
-			raise ValueError(f'ocRegistry {self.OCRegistry} should not start with http:// or https:// and not end on a slash /')
+			sys.exit('Insufficient Parameter: no OC Credentials')
+		if self.OCRegistry.startswith("http") and not self.OCRegistry.endswith("/"):
+			sys.exit(f'ocRegistry {self.OCRegistry} should not start with http:// or https:// and end on a slash /')
 
 		logging.debug(f'Building on cluster triggered from server: {lIpAddr}')
 		self.cmd = cls_cmd.RemoteCmd(lIpAddr)
@@ -274,7 +255,10 @@ class Cluster:
 		self.testCase_id = HTML.testCase_id
 
 		# Workaround for some servers, we need to erase completely the workspace
-		self.cmd.cd(lSourcePath)
+		if self.forcedWorkspaceCleanup:
+			self.cmd.run(f'rm -Rf {lSourcePath}')
+		cls_containerize.CreateWorkspace(self.cmd, lSourcePath, self.ranRepository, self.ranCommitID, self.ranTargetBranch, self.ranAllowMerge)
+
 		# to reduce the amount of data send to OpenShift, we
 		# manually delete all generated files in the workspace
 		self.cmd.run(f'rm -rf {lSourcePath}/cmake_targets/ran_build');
@@ -290,11 +274,6 @@ class Cluster:
 				if result is not None:
 					forceBaseImageBuild = True
 					baseTag = 'ci-temp'
-			# if the branch name contains integration_20xx_wyy, let rebuild ran-base
-			result = re.search('integration_20([0-9]{2})_w([0-9]{2})', self.ranBranch)
-			if not forceBaseImageBuild and result is not None:
-				forceBaseImageBuild = True
-				baseTag = 'ci-temp'
 		else:
 			imageTag = f'develop-{self.ranCommitID[0:8]}'
 			forceBaseImageBuild = True
@@ -315,9 +294,9 @@ class Cluster:
 
 		# delete old images by Sagar Arora <sagar.arora@openairinterface.org>:
 		# 1. retrieve all images and their timestamp
-		# 2. awk retrieves those whose timestamp is older than 3 weeks
+		# 2. awk retrieves those whose timestamp is older than 4 weeks
 		# 3. issue delete command on corresponding istags (the images are dangling and will be cleaned by the registry)
-		delete_cmd = "oc get istag -o go-template --template '{{range .items}}{{.metadata.name}} {{.metadata.creationTimestamp}}{{\"\\n\"}}{{end}}' | awk '$2 <= \"'$(date -d '-3weeks' -Ins --utc | sed 's/+0000/Z/')'\" { print $1 }' | xargs --no-run-if-empty oc delete istag"
+		delete_cmd = "oc get istag -o go-template --template '{{range .items}}{{.metadata.name}} {{.metadata.creationTimestamp}}{{\"\\n\"}}{{end}}' | awk '$2 <= \"'$(date -d '-4weeks' -Ins --utc | sed 's/+0000/Z/')'\" { print $1 }' | xargs --no-run-if-empty oc delete istag"
 		response = self.cmd.run(delete_cmd)
 		logging.debug(f"deleted images:\n{response.stdout}")
 
@@ -330,7 +309,7 @@ class Cluster:
 			self._recreate_bc('ran-base', baseTag, 'openshift/ran-base-bc.yaml')
 			ranbase_job = self._start_build('ran-base')
 			attemptedImages += ['ran-base']
-			status = ranbase_job is not None and self._wait_build_end([ranbase_job], 1000)
+			status = ranbase_job is not None and self._wait_build_end([ranbase_job], 800)
 			if not status: logging.error('failure during build of ran-base')
 			self.cmd.run(f'oc logs {ranbase_job} &> cmake_targets/log/ran-base.log') # cannot use cmd.run because of redirect
 			# recover logs by mounting image
@@ -392,7 +371,7 @@ class Cluster:
 			gnb_aw2s_job = self._start_build('oai-gnb-aw2s')
 			attemptedImages += ['oai-gnb-aw2s']
 
-			wait = enb_job is not None and gnb_job is not None and gnb_aw2s_job is not None and self._wait_build_end([enb_job, gnb_job, gnb_aw2s_job], 800)
+			wait = enb_job is not None and gnb_job is not None and gnb_aw2s_job is not None and self._wait_build_end([enb_job, gnb_job, gnb_aw2s_job], 600)
 			if not wait: logging.error('error during build of eNB/gNB')
 			status = status and wait
 			# recover logs
@@ -421,7 +400,7 @@ class Cluster:
 			nrue_job = self._start_build('oai-nr-ue')
 			attemptedImages += ['oai-nr-ue']
 
-			wait = nr_cuup_job is not None and lteue_job is not None and nrue_job is not None and self._wait_build_end([nr_cuup_job, lteue_job, nrue_job], 800)
+			wait = nr_cuup_job is not None and lteue_job is not None and nrue_job is not None and self._wait_build_end([nr_cuup_job, lteue_job, nrue_job], 600)
 			if not wait: logging.error('error during build of nr-cuup/lteUE/nrUE')
 			status = status and wait
 			# recover logs
@@ -430,34 +409,6 @@ class Cluster:
 			self.cmd.run(f'oc logs {nrue_job} &> cmake_targets/log/oai-nr-ue.log')
 			self.cmd.run(f'oc get pods.metrics.k8s.io &>> cmake_targets/log/build-metrics.log', '\$', 10)
 
-		if status:
-			self._recreate_is_tag('ran-build-fhi72', imageTag, 'openshift/ran-build-fhi72-is.yaml')
-			self._recreate_bc('ran-build-fhi72', imageTag, 'openshift/ran-build-fhi72-bc.yaml')
-			self._retag_image_statement('ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.build.fhi72.rhel9')
-			ranbuildfhi72_job = self._start_build('ran-build-fhi72')
-			attemptedImages += ['ran-build-fhi72']
-
-			wait = ranbuildfhi72_job is not None and self._wait_build_end([ranbuildfhi72_job], 1200)
-			if not wait: logging.error('error during build of ranbuildfhi72_job')
-			status = status and wait
-			self.cmd.run(f'oc logs {ranbuildfhi72_job} &> cmake_targets/log/ran-build-fhi72.log')
-			self.cmd.run(f'oc get pods.metrics.k8s.io &>> cmake_targets/log/build-metrics.log', '\$', 10)
-
-		if status:
-			self._recreate_is_tag('oai-gnb-fhi72', imageTag, 'openshift/oai-gnb-fhi72-is.yaml')
-			self._recreate_bc('oai-gnb-fhi72', imageTag, 'openshift/oai-gnb-fhi72-bc.yaml')
-			self._retag_image_statement('ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.gNB.fhi72.rhel9')
-			self._retag_image_statement('ran-build-fhi72', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-build-fhi72', imageTag, 'docker/Dockerfile.gNB.fhi72.rhel9')
-			gnb_fhi72_job = self._start_build('oai-gnb-fhi72')
-			attemptedImages += ['oai-gnb-fhi72']
-
-			wait = gnb_fhi72_job is not None and self._wait_build_end([gnb_fhi72_job], 600)
-			if not wait: logging.error('error during build of gNB-fhi72')
-			status = status and wait
-			# recover logs
-			self.cmd.run(f'oc logs {gnb_fhi72_job} &> cmake_targets/log/oai-gnb-fhi72.log')
-			self.cmd.run(f'oc get pods.metrics.k8s.io &>> cmake_targets/log/build-metrics.log', '\$', 10)
-
 		# split and analyze logs
 		imageSize = {}
 		for image in attemptedImages:

ci-scripts/cls_cmd.py

@@ -31,26 +31,17 @@ import subprocess as sp
 import os
 import paramiko
 import uuid
-import time
+import sys 
 
 SSHTIMEOUT=7
 
-def is_local(host):
-	return host is None or host.lower() in ["", "none", "localhost"]
-
 # helper that returns either LocalCmd or RemoteCmd based on passed host name
 def getConnection(host, d=None):
-	if is_local(host):
+	if host is None or host.lower() in ["", "none", "localhost"]:
 		return LocalCmd(d=d)
 	else:
 		return RemoteCmd(host, d=d)
 
-def runScript(host, path, timeout, parameters=None, redirect=None, silent=False):
-	if is_local(host):
-		return LocalCmd.exec_script(path, timeout, parameters, redirect, silent)
-	else:
-		return RemoteCmd.exec_script(host, path, timeout, parameters, redirect, silent)
-
 # provides a partial interface for the legacy SSHconnection class (getBefore(), command())
 class Cmd(metaclass=abc.ABCMeta):
 	def cd(self, d, silent=False):
@@ -66,10 +57,6 @@ class Cmd(metaclass=abc.ABCMeta):
 		if not silent:
 			logging.debug(f'cd {self.cwd}')
 
-	@abc.abstractmethod
-	def exec_script(path, timeout, parameters=None, redirect=None, silent=False):
-		return
-
 	@abc.abstractmethod
 	def run(self, line, timeout=300, silent=False):
 		return
@@ -99,45 +86,22 @@ class Cmd(metaclass=abc.ABCMeta):
 		return
 
 class LocalCmd(Cmd):
-	def __enter__(self):
-		return self
-
-	def __exit__(self, exc_type, exc_value, exc_traceback):
-		self.close()
-
 	def __init__(self, d = None):
 		self.cwd = d
 		if self.cwd is not None:
 			logging.debug(f'Working dir is {self.cwd}')
 		self.cp = sp.CompletedProcess(args='', returncode=0, stdout='')
 
-	def exec_script(path, timeout, parameters=None, redirect=None, silent=False):
-		if redirect and not redirect.startswith("/"):
-			raise ValueError(f"redirect must be absolute, but is {redirect}")
-		c = f"{path} {parameters}" if parameters else path
-		if not redirect:
-			ret = sp.run(c, shell=True, timeout=timeout, stdout=sp.PIPE, stderr=sp.STDOUT)
-			ret.stdout = ret.stdout.decode('utf-8').strip()
-		else:
-			with open(redirect, "w") as f:
-				ret = sp.run(c, shell=True, timeout=timeout, stdout=f, stderr=f)
-			ret.args += f" &> {redirect}"
-			ret.stdout = ""
-		if not silent:
-			logging.info(f"local> {ret.args}")
-		return ret
-
 	def run(self, line, timeout=300, silent=False, reportNonZero=True):
 		if not silent:
-			logging.info(f"local> {line}")
+			logging.info(line)
 		try:
 			if line.strip().endswith('&'):
 				# if we wait for stdout, subprocess does not return before the end of the command
 				# however, we don't want to wait for commands with &, so just return fake command
-				ret = sp.run(line, shell=True, cwd=self.cwd, timeout=5, executable='/bin/bash')
-				time.sleep(0.1)
+				ret = sp.run(line, shell=True, cwd=self.cwd, timeout=5)
 			else:
-				ret = sp.run(line, shell=True, cwd=self.cwd, stdout=sp.PIPE, stderr=sp.STDOUT, timeout=timeout, executable='/bin/bash')
+				ret = sp.run(line, shell=True, cwd=self.cwd, stdout=sp.PIPE, stderr=sp.STDOUT, timeout=timeout)
 		except Exception as e:
 			ret = sp.CompletedProcess(args=line, returncode=255, stdout=f'Exception: {str(e)}'.encode('utf-8'))
 		if ret.stdout is None:
@@ -156,48 +120,19 @@ class LocalCmd(Cmd):
 
 	def copyin(self, src, tgt, recursive=False):
 		if src[0] != '/' or tgt[0] != '/':
-			raise Exception(f'support only absolute file paths (src {src} tgt {tgt})!')
-		if src == tgt:
-			return # nothing to copy, file is already where it should go
+			raise Exception('support only absolute file paths!')
 		opt = '-r' if recursive else ''
-		return self.run(f'cp {opt} {src} {tgt}').returncode == 0
+		self.run(f'cp {opt} {src} {tgt}')
 
 	def copyout(self, src, tgt, recursive=False):
-		return self.copyin(src, tgt, recursive)
-
-def PutFile(client, src, tgt):
-	success = True
-	sftp = client.open_sftp()
-	try:
-		sftp.put(src, tgt)
-	except FileNotFoundError as error:
-		logging.error(f"error while putting {src}: {error}")
-		success = False
-	sftp.close()
-	return success
-
-def GetFile(client, src, tgt):
-	success = True
-	sftp = client.open_sftp()
-	try:
-		sftp.get(src, tgt)
-	except FileNotFoundError as error:
-		logging.error(f"error while getting {src}: {error}")
-		success = False
-	sftp.close()
-	return success
+		self.copyin(src, tgt, recursive)
 
 class RemoteCmd(Cmd):
-	def __enter__(self):
-		return self
-
-	def __exit__(self, exc_type, exc_value, exc_traceback):
-		self.close()
-
 	def __init__(self, hostname, d=None):
 		cIdx = 0
-		self.hostname = hostname
-		self.client = RemoteCmd._ssh_init()
+		logging.getLogger('paramiko').setLevel(logging.ERROR) # prevent spamming through Paramiko
+		self.client = paramiko.SSHClient()
+		self.client.set_missing_host_key_policy(paramiko.AutoAddPolicy())
 		cfg = RemoteCmd._lookup_ssh_config(hostname)
 		self.cwd = d
 		self.cp = sp.CompletedProcess(args='', returncode=0, stdout='')
@@ -210,15 +145,7 @@ class RemoteCmd(Cmd):
 				cIdx +=1
 		raise Exception ("Error: max retries, did not connect to host")
 
-	def _ssh_init():
-		logging.getLogger('paramiko').setLevel(logging.ERROR) # prevent spamming through Paramiko
-		client = paramiko.SSHClient()
-		client.set_missing_host_key_policy(paramiko.AutoAddPolicy())
-		return client
-
 	def _lookup_ssh_config(hostname):
-		if is_local(hostname):
-			raise ValueError("Using localhost as SSH target is not allowed: use LocalCmd instead.")
 		ssh_config = paramiko.SSHConfig()
 		user_config_file = os.path.expanduser("~/.ssh/config")
 		if os.path.exists(user_config_file):
@@ -238,33 +165,9 @@ class RemoteCmd(Cmd):
 			cfg['sock'] = paramiko.ProxyCommand(ucfg['proxycommand'])
 		return cfg
 
-	def exec_script(host, path, timeout, parameters=None, redirect=None, silent=False):
-		if redirect and not redirect.startswith("/"):
-			raise ValueError(f"redirect must be absolute, but is {redirect}")
-		p = parameters if parameters else ""
-		r = f"> {redirect}" if redirect else ""
-		if not silent:
-			logging.info(f"local> ssh {host} bash -s {p} < {path} {r} # {path} from localhost")
-		client = RemoteCmd._ssh_init()
-		cfg = RemoteCmd._lookup_ssh_config(host)
-		client.connect(**cfg)
-		bash_opt = 'BASH_XTRACEFD=1' # write bash set -x output to stdout, see bash(1)
-		stdin, stdout, stderr = client.exec_command(f"{bash_opt} bash -s {p} {r}", timeout=timeout)
-		# open() the file f at path, read() it and write() it into the stdin of the bash -s cmd
-		with open(path) as f:
-			stdin.write(f.read())
-			stdin.close()
-		cmd = path
-		if parameters: cmd += f" {parameters}"
-		if redirect: cmd += f" &> {redirect}"
-		ret = sp.CompletedProcess(args=cmd, returncode=stdout.channel.recv_exit_status(), stdout=stdout.read(size=None) + stderr.read(size=None))
-		ret.stdout = ret.stdout.decode('utf-8').strip()
-		client.close()
-		return ret
-
 	def run(self, line, timeout=300, silent=False, reportNonZero=True):
 		if not silent:
-			logging.info(f"ssh[{self.hostname}]> {line}")
+			logging.info(line)
 		if self.cwd:
 			line = f"cd {self.cwd} && {line}"
 		try:
@@ -273,7 +176,6 @@ class RemoteCmd(Cmd):
 				# however, we don't want to wait for commands with &, so just return fake command
 				self.client.exec_command(line, timeout = 5)
 				ret = sp.CompletedProcess(args=line, returncode=0, stdout=b'')
-				time.sleep(0.1)
 			else:
 				stdin, stdout, stderr = self.client.exec_command(line, timeout=timeout)
 				ret = sp.CompletedProcess(args=line, returncode=stdout.channel.recv_exit_status(), stdout=stdout.read(size=None) + stderr.read(size=None))
@@ -291,38 +193,36 @@ class RemoteCmd(Cmd):
 	def getBefore(self):
 		return self.cp.stdout
 
-	# if recursive is True, tgt must be a directory (and src is file or directory)
-	# if recursive is False, tgt and src must be a file name
 	def copyout(self, src, tgt, recursive=False):
-		logging.debug(f"copyout: local:{src} -> {self.hostname}:{tgt}")
+		logging.debug(f"copyout: local:{src} -> remote:{tgt}")
 		if recursive:
 			tmpfile = f"{uuid.uuid4()}.tar"
 			abstmpfile = f"/tmp/{tmpfile}"
-			with LocalCmd() as cmd:
-				if cmd.run(f"tar -cf {abstmpfile} {src}").returncode != 0:
-					return False
-				if not PutFile(self.client, abstmpfile, abstmpfile):
-					return False
-				cmd.run(f"rm {abstmpfile}")
-				ret = self.run(f"mv {abstmpfile} {tgt}; cd {tgt} && tar -xf {tmpfile} && rm {tmpfile}")
-				return ret.returncode == 0
+			cmd = LocalCmd()
+			cmd.run(f"tar -cf {abstmpfile} {src}")
+			sftp = self.client.open_sftp()
+			sftp.put(abstmpfile, abstmpfile)
+			sftp.close()
+			cmd.run(f"rm {abstmpfile}")
+			self.run(f"mv {abstmpfile} {tgt}; cd {tgt} && tar -xf {tmpfile} && rm {tmpfile}")
 		else:
-			return PutFile(self.client, src, tgt)
+			sftp = self.client.open_sftp()
+			sftp.put(src, tgt)
+			sftp.close()
 
-	# if recursive is True, tgt must be a directory (and src is file or directory)
-	# if recursive is False, tgt and src must be a file name
 	def copyin(self, src, tgt, recursive=False):
-		logging.debug(f"copyin: {self.hostname}:{src} -> local:{tgt}")
+		logging.debug(f"copyin: remote:{src} -> local:{tgt}")
 		if recursive:
 			tmpfile = f"{uuid.uuid4()}.tar"
 			abstmpfile = f"/tmp/{tmpfile}"
-			if self.run(f"tar -cf {abstmpfile} {src}").returncode != 0:
-				return False
-			if not GetFile(self.client, abstmpfile, abstmpfile):
-				return False
+			self.run(f"tar -cf {abstmpfile} {src}")
+			sftp = self.client.open_sftp()
+			sftp.get(abstmpfile, abstmpfile)
+			sftp.close()
 			self.run(f"rm {abstmpfile}")
-			with LocalCmd() as cmd:
-				ret = cmd.run(f"mv {abstmpfile} {tgt}; cd {tgt} && tar -xf {tmpfile} && rm {tmpfile}")
-				return ret.returncode == 0
+			cmd = LocalCmd()
+			cmd.run(f"mv {abstmpfile} {tgt}; cd {tgt} && tar -xf {tmpfile} && rm {tmpfile}")
 		else:
-			return GetFile(self.client, src, tgt)
+			sftp = self.client.open_sftp()
+			sftp.get(src, tgt)
+			sftp.close()

ci-scripts/cls_log_mgt.py

@@ -0,0 +1,94 @@
+# * 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
+# */
+#---------------------------------------------------------------------
+#
+#   Required Python Version
+#     Python 3.x
+#
+#---------------------------------------------------------------------
+
+#USAGE: 
+#	log=Log_Mgt(Username,IPAddress,Password,Path)
+#	log.LogRotation()
+
+
+
+import logging
+import re
+import subprocess
+import sshconnection
+
+class Log_Mgt:
+
+	def __init__(self,Username, IPAddress,Password,Path):
+		self.Username=Username
+		self.IPAddress=IPAddress
+		self.Password=Password
+		self.path=Path
+
+#-----------------$
+#PRIVATE# Methods$
+#-----------------$
+
+
+	def __CheckUsedSpace(self):
+		HOST=self.Username+'@'+self.IPAddress
+		COMMAND="df "+ self.path
+		ssh = subprocess.Popen(["ssh", "%s" % HOST, COMMAND],shell=False,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
+		result = ssh.stdout.readlines()
+		s=result[1].decode('utf-8').rstrip()#result[1] is the second line with the results we are looking for
+		used=s.split()[4] #get 4th field ex: 70%
+		m = re.match('^(\d+)\%',used)
+		if m is not None:
+			return int(m.group(1))
+
+	def __RemoveOldest(self, days):
+		mySSH = sshconnection.SSHConnection()
+		mySSH.open(self.IPAddress, self.Username, self.Password)
+		COMMAND='echo ' + self.Password + ' | sudo -S find ' + self.path + ' -type f -mtime +' +  str(days) + ' -delete'
+		mySSH.command(COMMAND,'\$',20)
+		mySSH.close()
+
+
+
+#-----------------$
+#PUBLIC Methods$
+#-----------------$
+
+
+	def LogRotation(self):
+		doLoop = True
+		nbDays = 14
+		while doLoop and nbDays > 1:
+			used_space = self.__CheckUsedSpace() #avail space in target folder
+			if used_space > 80 :
+				logging.debug('\u001B[1;37;41m  Used Disk (' + str(used_space) + '%) > 80%, on '  + self.Username+'@'+self.IPAddress + '\u001B[0m')
+				logging.debug('\u001B[1;37;41m  Removing Artifacts older than ' + str(nbDays) + ' days \u001B[0m')
+				self.__RemoveOldest(nbDays)
+				nbDays -= 1
+			else:
+				logging.debug('Used Disk (' + str(used_space) + '%) < 80%, on '  + self.Username+'@'+self.IPAddress +', no cleaning required')
+				doLoop = False
+
+
+			
+
+
+

ci-scripts/cls_module_ue.py

@@ -25,28 +25,30 @@
 #---------------------------------------------------------------------
 
 #to use isfile
+import os
+import sys
 import logging
 #time.sleep
 import time
 import re
+import subprocess
+from datetime import datetime
 import yaml
 
+#for log rotation mgt
+import cls_log_mgt
 import cls_cmd
 
 class Module_UE:
 
-	def __init__(self, module_name, node=None, filename="ci_infra.yaml"):
+	def __init__(self, module_name, filename="ci_ueinfra.yaml"):
 		with open(filename, 'r') as f:
 			all_ues = yaml.load(f, Loader=yaml.FullLoader)
 			m = all_ues.get(module_name)
 			if m is None:
 				raise Exception(f'no such module name "{module_name}" in "{filename}"')
 			self.module_name = module_name
-			self.host = m['Host'] if m['Host'] != "%%current_host%%" else None
-			if node is None and self.host is None:
-				raise Exception(f'node not provided when needed')
-			elif node is not None and self.host is None:
-				self.host = node
+			self.host = m['Host']
 			self.cmd_dict = {
 				"attach": m.get('AttachScript'),
 				"detach": m.get('DetachScript'),
@@ -62,10 +64,7 @@ class Module_UE:
 			self.trace = m.get('trace') == True
 			self.logStore = m.get('LogStore')
 			self.cmd_prefix = m.get('CmdPrefix')
-			self.runIperf3Server = m.get('RunIperf3Server', True)
-			self.namespace = m.get('Namespace')
-			self.cnPath = m.get('CNPath')
-			logging.info(f'initialized {self.module_name}@{self.host} from {filename}')
+			logging.info(f'initialized UE {self.module_name}@{self.host} from {filename}')
 
 	def __str__(self):
 		return f"{self.module_name}@{self.host} [IP: {self.getIP()}]"
@@ -190,23 +189,40 @@ class Module_UE:
 	def getHost(self):
 		return self.host
 
-	def getNamespace(self):
-		return self.namespace
-
-	def getCNPath(self):
-		return self.cnPath
-
-	def getRunIperf3Server(self):
-		return self.runIperf3Server
-
 	def getCmdPrefix(self):
 		return self.cmd_prefix if self.cmd_prefix else ""
 
 	def _enableTrace(self):
 		raise Exception("not implemented")
+		mySSH = sshconnection.SSHConnection()
+		mySSH.open(self.HostIPAddress, self.HostUsername, self.HostPassword)
+		#delete old artifacts
+		mySSH.command('echo ' + ' '  + ' | sudo -S rm -rf ci_qlog','\$',5)
+		#start Trace, artifact is created in home dir
+		mySSH.command('echo $USER; nohup sudo -E QLog/QLog -s ci_qlog -f NR5G.cfg > /dev/null 2>&1 &','\$', 5)
+		mySSH.close()
 
 	def _disableTrace(self):
 		raise Exception("not implemented")
+		mySSH = sshconnection.SSHConnection()
+		mySSH.open(self.HostIPAddress, self.HostUsername, self.HostPassword)
+		mySSH.command('echo ' + ' '  + ' | sudo -S killall --signal=SIGINT *QLog*', '\$',5)
+		mySSH.close()
+
 
 	def _logCollect(self):
 		raise Exception("not implemented")
+		mySSH = sshconnection.SSHConnection()
+		mySSH.open(self.HostIPAddress, self.HostUsername, self.HostPassword)
+		#archive qlog to USB stick in /media/usb-drive/ci_qlogs with datetime suffix
+		now=datetime.now()
+		now_string = now.strftime("%Y%m%d-%H%M")
+		source='ci_qlog'
+		destination= self.LogStore + '/ci_qlog_'+now_string+'.zip'
+		#qlog artifact is zipped into the target folder
+		mySSH.command('echo $USER; echo ' + ' '  + ' | nohup sudo -S zip -r '+destination+' '+source+' > /dev/null 2>&1 &','\$', 10)
+		mySSH.close()
+		#post action : log cleaning to make sure enough space is reserved for the next run
+		Log_Mgt=cls_log_mgt.Log_Mgt(self.HostUsername,self.HostIPAddress, self.HostPassword, self.LogStore)
+		return destination
+

ci-scripts/cls_native.py

@@ -1,84 +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
-# */
-#---------------------------------------------------------------------
-
-import logging
-import re
-import os
-
-import cls_cmd
-import cls_oai_html
-import cls_analysis
-import constants as CONST
-
-LOG_PATH_PHYSIM = 'phy_sim_logs'
-
-class Native():
-
-	def Build(test_case, HTML, host, directory, options):
-		logging.debug(f'Building on server: {host}')
-		HTML.testCase_id = test_case
-
-		with cls_cmd.getConnection(host) as ssh:
-			base = f"{directory}/cmake_targets"
-			ret = ssh.run(f"{base}/build_oai {options} > {base}/log/build_oai.log", timeout=900)
-			success = ret.returncode == 0
-			logs = ssh.run(f"cat {base}/log/build_oai.log", silent=True)
-			logging.debug(f"build finished with code {ret.returncode}, output:\n{logs.stdout}")
-
-			# create log directory, and copy build logs
-			target = f"{base}/build_log_{test_case}/"
-			ssh.run(f"mkdir -p {target}")
-			ssh.run(f"mv {base}/log/* {target}")
-
-			# check if build artifacts are there
-			# NOTE: build_oai should fail with exit code if it could not build, but it does not
-			build_dir = f"{base}/ran_build/build"
-			build_gnb = re.search('--gNB', options) is not None
-			if build_gnb:
-				success = success and ssh.run(f"ls {build_dir}/nr-softmodem").returncode == 0
-			build_enb = re.search('--eNB', options) is not None
-			if build_enb:
-				success = success and ssh.run(f"ls {build_dir}/lte-softmodem").returncode == 0
-
-		if success:
-			logging.info('\u001B[1m Building OAI Pass\u001B[0m')
-			HTML.CreateHtmlTestRow(options, 'OK', CONST.ALL_PROCESSES_OK)
-		else:
-			logging.error('\u001B[1m Building OAI Failed\u001B[0m')
-			HTML.CreateHtmlTestRow(options, 'KO', CONST.ALL_PROCESSES_OK)
-		return success
-
-	def Run_Physim(HTML, host, directory, options, physim_test, threshold):
-		logging.debug(f'Runnin {physim_test} on server: {host}')
-		workSpacePath = f'{directory}/cmake_targets'
-		os.system(f'mkdir -p ./{LOG_PATH_PHYSIM}')
-		runLogFile=f'physim_{HTML.testCase_id}.log'
-		with cls_cmd.getConnection(host) as cmd:
-			cmd.run(f'sudo {workSpacePath}/ran_build/build/{physim_test} {options} >> {workSpacePath}/{runLogFile}')
-			cmd.copyin(src=f'{workSpacePath}/{runLogFile}', tgt=f'{LOG_PATH_PHYSIM}/{runLogFile}')
-		success, msg = cls_analysis.Analysis.analyze_physim(f'{LOG_PATH_PHYSIM}/{runLogFile}', physim_test, options, threshold)
-		if success:
-			HTML.CreateHtmlTestRowQueue(options, 'OK', [msg])
-		else:
-			logging.error(msg)
-			HTML.CreateHtmlTestRowQueue(options, 'KO', [msg])
-		return success

ci-scripts/cls_oai_html.py

@@ -31,12 +31,14 @@
 #-----------------------------------------------------------
 # Import
 #-----------------------------------------------------------
+import sys              # arg
 import re               # reg
 import fileinput
 import logging
 import os
 import time
 import subprocess
+from multiprocessing import Process, Lock, SimpleQueue
 
 import constants as CONST
 
@@ -63,6 +65,10 @@ class HTMLManagement():
 		self.htmlTabIcons = []
 		self.testXMLfiles = []
 
+		self.testUnstable = False
+		self.testMinStableId = '999999'
+		self.testStabilityPointReached = False
+
 		self.htmleNBFailureMsg = ''
 		self.htmlUEFailureMsg = ''
 
@@ -147,7 +153,7 @@ class HTMLManagement():
 				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 != '' and self.ranCommitID != 'develop':
+			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')
@@ -213,13 +219,20 @@ class HTMLManagement():
 
 	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="3"><font color="white">PASS <span class="glyphicon glyphicon-ok"></span> </font></th>\n')
 			else:
-				self.htmlFile.write('        <th bgcolor = "red" colspan="3"><font color="white">FAIL <span class="glyphicon glyphicon-remove"></span> </font></th>\n')
+				if testOkEvenIfUnstable:
+					self.htmlFile.write('        <th bgcolor = "orange" colspan="3"><font color="white">KNOWN UNSTABLE SCENARIO <span class="glyphicon glyphicon-exclamation-sign"></span> </font></th>\n')
+				else:
+					self.htmlFile.write('        <th bgcolor = "red" colspan="3"><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')
@@ -229,7 +242,10 @@ class HTMLManagement():
 				cmd = "sed -i -e 's/__STATE_" + self.htmlTabNames[0] + "__//' test_results.html"
 				subprocess.run(cmd, shell=True)
 			else:
-				cmd = "sed -i -e 's/__STATE_" + self.htmlTabNames[0] + "__/<span class=\"glyphicon glyphicon-remove\"><\/span>/' test_results.html"
+				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
 
@@ -263,6 +279,14 @@ class HTMLManagement():
 			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="6"><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
@@ -413,19 +437,13 @@ class HTMLManagement():
 
 		for k in DataLog['Data']:
 			# TestRow 
-			avg = DataLog['Data'][k][0]
-			maxval = DataLog['Data'][k][1]
-			count = DataLog['Data'][k][2]
-			valnorm = float(DataLog['Data'][k][3])
-			dev = DataLog['DeviationThreshold'][k]
-			ref = DataLog['Ref'][k]
 			self.htmlFile.write('      <tr>\n')
 			self.htmlFile.write('        <td colspan="3" bgcolor = "lightcyan" >' + k  + ' </td>\n')				
-			self.htmlFile.write(f'        <td colspan="2" bgcolor = "lightcyan" >{avg}; {maxval}; {count}</td>\n')
-			if valnorm > 1.0 + dev or valnorm < 1.0 - dev:
-				self.htmlFile.write(f'        <th bgcolor = "red" >{valnorm} (Avg over Ref = {avg} over {ref}; max allowed deviation = {dev})</th>\n')
+			self.htmlFile.write('        <td colspan="2" bgcolor = "lightcyan" >' + DataLog['Data'][k][0] + '; ' + DataLog['Data'][k][1] + '; ' + DataLog['Data'][k][2] + ' </td>\n')
+			if float(DataLog['Data'][k][3])> DataLog['Threshold'][k]:
+				self.htmlFile.write('        <th bgcolor = "red" >' + DataLog['Data'][k][3]  + ' (Ref = ' + str(DataLog['Ref'][k]) + ' ; Thres = '   +str(DataLog['Threshold'][k])+') ' + '</th>\n')
 			else:
-				self.htmlFile.write(f'        <th bgcolor = "green" ><font color="white">{valnorm} (Avg over Ref = {avg} over {ref}; max allowed deviation = {dev})</font></th>\n')
+				self.htmlFile.write('        <th bgcolor = "green" ><font color="white">' + DataLog['Data'][k][3]  + ' (Ref = ' + str(DataLog['Ref'][k]) + ' ; Thres = '   +str(DataLog['Threshold'][k])+') ' + '</th>\n')
 			self.htmlFile.write('      </tr>\n')
 		self.htmlFile.close()
 
@@ -444,8 +462,6 @@ class HTMLManagement():
 				self.htmlFile.write(f'        <td bgcolor = "lightgreen" >{status}</td>\n')
 			elif (str(status) == 'KO'):
 				self.htmlFile.write(f'        <td bgcolor = "lightcoral" >{status}</td>\n')
-			elif str(status) == 'SKIP':
-				self.htmlFile.write(f'        <td bgcolor = "lightgray" >{status}</td>\n')
 			else:
 				addOrangeBK = True
 				self.htmlFile.write(f'        <td bgcolor = "orange" >{status}</td>\n')

ci-scripts/cls_physim.py

@@ -0,0 +1,278 @@
+# * 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 cls_oai_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.__runLogPath='phy_sim_logs'
+
+
+#-----------------
+#PRIVATE Methods
+#-----------------
+
+	def __CheckResults_LDPCTest(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
+		runResults=[]
+		with open(self.__runLogFile) as f:
+			for line in f:
+				if 'mean' in line:
+					runResults.append(line)
+		#the values are appended for each mean value (2), so we take these 2 values from the list
+		info = runResults[0] + runResults[1]
+
+		#once parsed move the local logfile to its folder for tidiness
+		os.system('mv '+self.__runLogFile+' '+ self.__runLogPath+'/.')
+
+		HTML.CreateHtmlTestRowQueue(self.runargs, 'OK', [info])
+		return HTML
+
+	def __CheckResults_LDPCt1Test(self,HTML,CONST,testcase_id):
+		thrs_NOK = 500
+		thrs_KO = 1000
+		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 Decoding values
+		runResultsT1=[]
+		with open(self.__runLogFile) as g:
+			for line in g:
+				if 'decoding time' in line:
+					runResultsT1.append(line)
+
+		# In case the T1 board does work properly, there is no statistics
+		if len(runResultsT1) == 0:
+			logging.error('no statistics')
+			HTML.CreateHtmlTestRowQueue(self.runargs, 'KO', ['no statistics'])
+			self.exitStatus = 1
+			os.system('mv '+self.__runLogFile+' '+ self.__runLogPath+'/.')
+			return HTML
+
+		info = runResultsT1[0][15:-13]
+		result = int(''.join(filter(str.isdigit, info)))/100
+		#once parsed move the local logfile to its folder for tidiness
+		os.system('mv '+self.__runLogFile+' '+ self.__runLogPath+'/.')
+		if result < thrs_NOK:
+			HTML.CreateHtmlTestRowQueue(self.runargs, 'OK', [info])
+		elif result > thrs_KO:
+			error_msg = f'Decoding time exceeds a limit of {thrs_KO} us'
+			logging.error(error_msg)
+			HTML.CreateHtmlTestRowQueue(self.runargs, 'KO', [info + '\n' + error_msg])
+			self.exitStatus = 1
+		else:
+			HTML.CreateHtmlTestRowQueue(self.runargs, 'NOK', [info])
+		return HTML
+
+	def __CheckResults_NRulsimTest(self, HTML, CONST, testcase_id):
+		#retrieve run log file and store it locally
+		mySSH = sshconnection.SSHConnection()
+		filename = self.__workSpacePath + self.__runLogFile
+		ret = mySSH.copyin(self.eNBIpAddr, self.eNBUserName, self.eNBPassWord, filename, '.')
+		if ret != 0:
+			error_msg = f'could not recover test result file {filename}'
+			logging.error(error_msg)
+			HTML.CreateHtmlTestRowQueue("could not recover results", 'KO', [error_msg])
+			self.exitStatus = 1
+			return HTML
+
+		PUSCH_OK = False
+		with open(self.__runLogFile) as f:
+			PUSCH_OK = 'PUSCH test OK' in f.read()
+
+		# once parsed move the local logfile to its folder for tidiness
+		os.system(f'mv {self.__runLogFile} {self.__runLogPath}/.')
+
+		#updating the HTML with results
+		if PUSCH_OK:
+			HTML.CreateHtmlTestRowQueue(self.runargs, 'OK', 1, ["succeeded"])
+		else:
+			error_msg = 'error: no "PUSCH test OK"'
+			logging.error(error_msg)
+			HTML.CreateHtmlTestRowQueue(self.runargs, 'KO', 1, [error_msg])
+			self.exitStatus = 1
+		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
+		with open(self.__buildLogFile) as f:
+			if 'BUILD SHOULD BE SUCCESSFUL' in f.read():
+				HTML.CreateHtmlTestRow(self.buildargs, 'OK', CONST.ALL_PROCESSES_OK, 'PhySim')
+				self.exitStatus=0
+				return HTML
+		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, '\$', 30)
+		# 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"', '\$', 30)
+			else:
+				logging.info('Merging with the target branch: ' + self.ranTargetBranch)
+				mySSH.command('git merge --ff origin/' + self.ranTargetBranch + ' -m "Temporary merge for CI"', '\$', 30)
+
+		#build
+		mySSH.command('source oaienv', '\$', 5)
+		mySSH.command('cd cmake_targets', '\$', 5)
+		mySSH.command('mkdir -p log', '\$', 5)
+		mySSH.command(f'./build_oai {self.buildargs} 2>&1 | tee {self.__buildLogFile}', '\$', 1500)
+
+		mySSH.close()
+		#check build status and update HTML object
+		lHTML = cls_oai_html.HTMLManagement()
+		lHTML=self.__CheckBuild_PhySim(htmlObj,constObj)
+		return lHTML
+
+
+	def Run_LDPCTest(self,htmlObj,constObj,testcase_id):
+		self.__workSpacePath = self.eNBSourceCodePath+'/cmake_targets/'
+		#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+'ran_build/build/ldpctest ' + self.runargs + ' >> '+self.__runLogFile, '\$', 30)
+		mySSH.close()
+		#return updated HTML to main
+		lHTML = cls_oai_html.HTMLManagement()
+		lHTML=self.__CheckResults_LDPCTest(htmlObj,constObj,testcase_id)
+		return lHTML
+
+	def Run_LDPCt1Test(self,htmlObj,constObj,testcase_id):
+		self.__workSpacePath = self.eNBSourceCodePath+'/cmake_targets/'
+		#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(f'sudo {self.__workSpacePath}ran_build/build/nr_ulsim {self.runargs} > {self.__runLogFile} 2>&1', '\$', 30)
+		mySSH.close()
+		#return updated HTML to main
+		lHTML = cls_oai_html.HTMLManagement()
+		lHTML=self.__CheckResults_LDPCt1Test(htmlObj,constObj,testcase_id)
+		return lHTML
+
+	def Run_NRulsimTest(self, htmlObj, constObj, testcase_id):
+		self.__workSpacePath=self.eNBSourceCodePath+'/cmake_targets/'
+		os.system(f'mkdir -p ./{self.__runLogPath}')
+		self.__runLogFile = f'physim_{testcase_id}.log'
+		mySSH = sshconnection.SSHConnection()
+		mySSH.open(self.eNBIpAddr, self.eNBUserName, self.eNBPassWord)
+		mySSH.command(f'cd {self.__workSpacePath}', '\$', 5)
+		mySSH.command(f'sudo {self.__workSpacePath}ran_build/build/nr_ulsim {self.runargs} > {self.__runLogFile} 2>&1', '\$', 30)
+		mySSH.close()
+		#return updated HTML to main
+		lHTML = self.__CheckResults_NRulsimTest(htmlObj, constObj, testcase_id)
+		return lHTML

ci-scripts/cls_physim1.py

@@ -65,7 +65,7 @@ class PhySim:
 #PUBLIC Methods$
 #-----------------$
 
-	def Deploy_PhySim(self, HTML):
+	def Deploy_PhySim(self, HTML, RAN):
 		if self.ranRepository == '' or self.ranBranch == '' or self.ranCommitID == '':
 			HELP.GenericHelp(CONST.Version)
 			sys.exit('Insufficient Parameter')
@@ -123,7 +123,8 @@ class PhySim:
 			logging.error('\u001B[1m OC Cluster Login Failed\u001B[0m')
 			mySSH.close()
 			HTML.CreateHtmlTestRow('N/A', 'KO', CONST.OC_LOGIN_FAIL)
-			return False
+			RAN.prematureExit = True
+			return
 		else:
 			logging.debug('\u001B[1m   Login to OC Cluster Successfully\u001B[0m')
 		mySSH.command(f'oc project {ocProjectName}', '\$', 30)
@@ -132,12 +133,15 @@ class PhySim:
 			mySSH.command('oc logout', '\$', 30)
 			mySSH.close()
 			HTML.CreateHtmlTestRow('N/A', 'KO', CONST.OC_PROJECT_FAIL)
-			return False
+			RAN.prematureExit = True
+			return
 		else:
 			logging.debug(f'\u001B[1m   Now using project {ocProjectName}\u001B[0m')
 
 		# Using helm charts deployment
-		mySSH.command(f'helm install physim ./charts/physims/ --set global.image.version={imageTag} --wait 2>&1 | tee -a cmake_targets/log/physim_helm_summary.txt', '\$', 30)
+		mySSH.command(f'grep -rl OAICICD_PROJECT ./charts/ | xargs sed -i -e "s#OAICICD_PROJECT#{ocProjectName}#"', '\$', 30)
+		mySSH.command(f'sed -i -e "s#TAG#{imageTag}#g" ./charts/physims/values.yaml', '\$', 6)
+		mySSH.command('helm install physim ./charts/physims/ --wait 2>&1 | tee -a cmake_targets/log/physim_helm_summary.txt', '\$', 30)
 		if mySSH.getBefore().count('STATUS: deployed') == 0:
 			logging.error('\u001B[1m Deploying PhySim Failed using helm chart on OC Cluster\u001B[0m')
 			mySSH.command('helm uninstall physim | tee -a cmake_targets/log/physim_helm_summary.txt 2>&1', '\$', 30)
@@ -150,7 +154,8 @@ class PhySim:
 			mySSH.command('oc logout', '\$', 30)
 			mySSH.close()
 			self.AnalyzeLogFile_phySim()
-			return False
+			RAN.prematureExit = True
+			return
 		else:
 			logging.debug('\u001B[1m   Deployed PhySim Successfully using helm chart\u001B[0m')
 		isRunning = False
@@ -161,7 +166,7 @@ class PhySim:
 			mySSH.command('oc get pods -o wide -l app=physim | tee -a cmake_targets/log/physim_pods_summary.txt', '\$', 30, resync=True)
 			running_count = mySSH.getBefore().count('Running')
 			completed_count = mySSH.getBefore().count('Completed')
-			if (running_count + completed_count) == 23:
+			if (running_count + completed_count) == 21:
 				logging.debug('\u001B[1m Running the physim test Scenarios\u001B[0m')
 				isRunning = True
 				podNames = re.findall('oai-[\S\d\w]+', mySSH.getBefore())
@@ -181,7 +186,8 @@ class PhySim:
 			mySSH.command('oc logout', '\$', 30)
 			HTML.CreateHtmlTestRow('N/A', 'KO', CONST.OC_PHYSIM_DEPLOY_FAIL)
 			HTML.CreateHtmlTestRowPhySimTestResult(self.testSummary,self.testResult)
-			return False
+			RAN.prematureExit = True
+			return
 		# Waiting to complete the running test
 		count = 0
 		isFinished = False
@@ -208,7 +214,7 @@ class PhySim:
 		mySSH.command('for pod in $(oc get pods | tail -n +2 | awk \'{print $1}\'); do oc describe pod $pod >> cmake_targets/log/physim_pods_summary.txt; done', '\$', 10)
 		mySSH.copyin(lIpAddr, lUserName, lPassWord, lSourcePath + '/cmake_targets/log/physim_test.txt', '.')
 		try:
-			listLogFiles =  subprocess.check_output('grep -E --colour=never "Execution Log file|Linux oai-" physim_test.txt', shell=True, universal_newlines=True)
+			listLogFiles =  subprocess.check_output('egrep --colour=never "Execution Log file|Linux oai-" physim_test.txt', shell=True, universal_newlines=True)
 			for line in listLogFiles.split('\n'):
 				res1 = re.search('Linux (?P<pod>oai-[a-zA-Z0-9\-]+) ', str(line))
 				res2 = re.search('Execution Log file = (?P<name>[a-zA-Z0-9\-\/\.\_\+]+)', str(line))
@@ -242,13 +248,13 @@ class PhySim:
 			HTML.CreateHtmlTestRowPhySimTestResult(self.testSummary,self.testResult)
 			logging.info('\u001B[1m Physical Simulator Pass\u001B[0m')
 		else:
+			RAN.prematureExit = True
 			if isFinished:
 				HTML.CreateHtmlTestRow('N/A', 'KO', CONST.ALL_PROCESSES_OK)
 			else:
 				HTML.CreateHtmlTestRow('Some test(s) timed-out!', 'KO', CONST.ALL_PROCESSES_OK)
 			HTML.CreateHtmlTestRowPhySimTestResult(self.testSummary,self.testResult)
 			logging.error('\u001B[1m Physical Simulator Fail\u001B[0m')
-		return self.testStatus
 
 	def AnalyzeLogFile_phySim(self):
 		mySSH = SSH.SSHConnection()

ci-scripts/cls_static_code_analysis.py

@@ -36,6 +36,8 @@ import re               # reg
 import logging
 import os
 from pathlib import Path
+import time
+from multiprocessing import Process, Lock, SimpleQueue
 
 #-----------------------------------------------------------
 # OAI Testing modules
@@ -43,6 +45,7 @@ from pathlib import Path
 import helpreadme as HELP
 import constants as CONST
 import cls_cmd
+from cls_containerize import CreateWorkspace
 
 #-----------------------------------------------------------
 # Class Declaration
@@ -102,7 +105,8 @@ class StaticCodeAnalysis():
 		else:
 			full_ran_repo_name = self.ranRepository + '.git'
 
-		cmd.cd(lSourcePath)
+		CreateWorkspace(cmd, lSourcePath, full_ran_repo_name, self.ranCommitID, self.ranTargetBranch, self.ranAllowMerge)
+
 		logDir = f'{lSourcePath}/cmake_targets/build_log_{self.testCase_id}'
 		cmd.run(f'mkdir -p {logDir}')
 		cmd.run('docker image rm oai-cppcheck:bionic oai-cppcheck:focal')
@@ -211,12 +215,12 @@ class StaticCodeAnalysis():
 		HTML.CreateHtmlTestRowCppCheckResults(CCR)
 		logging.info('\u001B[1m Static Code Analysis Pass\u001B[0m')
 
-		return True
+		return 0
 
 	def LicenceAndFormattingCheck(self, HTML):
-		# Workspace is no longer recreated from scratch.
-		# It implies that this method shall be called last within a build pipeline
-		# where workspace is already created
+		if self.ranRepository == '' or self.ranBranch == '' or self.ranCommitID == '':
+			HELP.GenericHelp(CONST.Version)
+			sys.exit('Insufficient Parameter')
 		lIpAddr = self.eNBIPAddress
 		lUserName = self.eNBUserName
 		lPassWord = self.eNBPassword
@@ -228,7 +232,14 @@ class StaticCodeAnalysis():
 		logging.debug('Building on server: ' + lIpAddr)
 		cmd = cls_cmd.getConnection(lIpAddr)
 		self.testCase_id = HTML.testCase_id
+		# on RedHat/CentOS .git extension is mandatory
+		result = re.search('([a-zA-Z0-9\:\-\.\/])+\.git', self.ranRepository)
+		if result is not None:
+			full_ran_repo_name = self.ranRepository.replace('git/', 'git')
+		else:
+			full_ran_repo_name = self.ranRepository + '.git'
 
+		CreateWorkspace(cmd, lSourcePath, full_ran_repo_name, self.ranCommitID, self.ranTargetBranch, self.ranAllowMerge)
 		check_options = ''
 		if self.ranAllowMerge:
 			check_options = f'--build-arg MERGE_REQUEST=true --build-arg SRC_BRANCH={self.ranBranch}'
@@ -241,7 +252,7 @@ class StaticCodeAnalysis():
 		logDir = f'{lSourcePath}/cmake_targets/build_log_{self.testCase_id}'
 		cmd.run(f'mkdir -p {logDir}')
 		cmd.run('docker image rm oai-formatting-check:latest')
-		cmd.run(f'docker build --target oai-formatting-check --tag oai-formatting-check:latest {check_options} --file {lSourcePath}/ci-scripts/docker/Dockerfile.formatting.bionic {lSourcePath} > {logDir}/oai-formatting-check.txt 2>&1')
+		cmd.run(f'docker build --target oai-formatting-check --tag oai-formatting-check:latest {check_options} --file {lSourcePath}/ci-scripts/docker/Dockerfile.formatting.bionic . > {logDir}/oai-formatting-check.txt 2>&1')
 
 		cmd.run('docker image rm oai-formatting-check:latest')
 		cmd.run('docker image prune --force')
@@ -353,4 +364,4 @@ class StaticCodeAnalysis():
 			HTML.htmleNBFailureMsg = 'Could not access oai-formatting-check.txt file'
 			HTML.CreateHtmlTestRow('N/A', 'KO', CONST.ENB_PROCESS_NOLOGFILE_TO_ANALYZE)
 
-		return finalStatus == 0
+		return finalStatus

ci-scripts/colosseum_scripts/README.md

@@ -1,11 +0,0 @@
-# Colosseum Automated Testing
-
-These scripts are used by a Jenkins [job](../Jenkinsfile-colosseum) to trigger automated testing of OpenAirInterface (OAI) gNB and softUE on the [Colosseum](https://www.northeastern.edu/colosseum/) Open RAN digital twin.
-Once a test is triggered, a new OAI LXC container at the specified OAI version will be built on Colosseum (if not already present), and gNB and softUE will perform TCP uplink and downlink connectivity test via the iPerf [tool](https://iperf.fr/).
-The OAI branch to build and test can be specified through the `eNB_Branch` parameter passed through Jenkins (`eNB_TargetBranch`, which defaults to the `develop` branch, is used if `eNB_Branch` is not specified).
-The Colosseum network scenario to test is specified through the `Colosseum_Rf_Scenario` Jenkins parameter, which defaults to a base Colosseum scenario without artificially added channel effects (e.g., only hardware impariments of software-defined radios, cables, and channel emulator).
-
-Once the test ends, results are analyzed through the OAI automated test report generation tool available [here](https://github.com/ztouchnetworks/openairinterface-automated-test-reports), which builds a test report from the iPerf and OAI logs, and marks the test as successful or unsuccessful.
-Results from successful tests are saved in history files and used to compare more recent tests.
-A test is considered successful if the downlink throughput achieved during the test is greather than or equal to the average of the test history, which spans successful test executed since May 2024.
-This is used to identify possible regressions of OAI runs executed on the Colosseum testbed.

ci-scripts/colosseum_scripts/get-test-results.sh

@@ -1,38 +0,0 @@
-#!/bin/bash
-#/*
-# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
-# * contributor license agreements.  See the NOTICE file distributed with
-# * this work for additional information regarding copyright ownership.
-# * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
-# * except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# *      http://www.openairinterface.org/?page_id=698
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-# *-------------------------------------------------------------------------------
-# * For more information about the OpenAirInterface (OAI) Software Alliance:
-# *      contact@openairinterface.org
-# */
-
-set -eu
-
-AWX_API_URL=https://10.100.1.253
-AWX_JOB_EVENT_QUERY=job_events/?search=results_url
-
-COL_USER=$1
-COL_PASS=$2
-
-AWX_API_JOB_PATH=$(jq -r '.url' launch.json)
-
-# get result url and download test results
-curl -s -f -k -u ${COL_USER}:${COL_PASS} -X GET ${AWX_API_URL}${AWX_API_JOB_PATH}${AWX_JOB_EVENT_QUERY} > result.json
-
-set -x
-RESULT=$(jq -r '.results[0].event_data.res.ansible_facts.results_url' result.json)
-wget -q -O - ${RESULT} > results.tar.xz

ci-scripts/colosseum_scripts/launch-job.sh

@@ -1,53 +0,0 @@
-#!/bin/bash
-#/*
-# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
-# * contributor license agreements.  See the NOTICE file distributed with
-# * this work for additional information regarding copyright ownership.
-# * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
-# * except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# *      http://www.openairinterface.org/?page_id=698
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-# *-------------------------------------------------------------------------------
-# * For more information about the OpenAirInterface (OAI) Software Alliance:
-# *      contact@openairinterface.org
-# */
-
-set -eu
-
-AWX_API_URL=https://10.100.1.253
-AWX_JOB_ID=16
-AWX_API_LAUNCH_PATH=/api/v2/job_templates/${AWX_JOB_ID}/launch/
-
-COL_USER=$1
-COL_PASS=$2
-JENKINS_JOB_ID=$3
-GIT_REPOSITORY=$4
-GIT_BRANCH=$5
-COLOSSEUM_RF_SCENARIO=$6
-JENKINS_JOB_URL=$7
-
-# assemble data to send
-CURL_DATA=$(cat <<-END | jq -c .
-{
-    "extra_vars":
-    {
-        "oai_repo": "${GIT_REPOSITORY}",
-        "oai_branch": "${GIT_BRANCH}",
-        "colosseum_rf_scenario": "${COLOSSEUM_RF_SCENARIO}",
-        "jenkins_job_id": "${JENKINS_JOB_ID}",
-        "jenkins_job_url": "${JENKINS_JOB_URL}"
-    }
-}
-END
-)
-
-# launch job
-curl -s -f -k -u ${COL_USER}:${COL_PASS} -X POST -H "Content-Type: application/json" -d ${CURL_DATA} ${AWX_API_URL}${AWX_API_LAUNCH_PATH} > launch.json

ci-scripts/colosseum_scripts/wait-job-end.sh

@@ -1,47 +0,0 @@
-#!/bin/bash
-#/*
-# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
-# * contributor license agreements.  See the NOTICE file distributed with
-# * this work for additional information regarding copyright ownership.
-# * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
-# * except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# *      http://www.openairinterface.org/?page_id=698
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-# *-------------------------------------------------------------------------------
-# * For more information about the OpenAirInterface (OAI) Software Alliance:
-# *      contact@openairinterface.org
-# */
-
-set -xeu
-
-AWX_API_URL=https://10.100.1.253
-AWX_MAX_API_CHECKS=120
-
-COL_USER=$1
-COL_PASS=$2
-
-AWX_API_JOB_PATH=$(jq -r '.url' launch.json)
-
-# wait for job to complete
-for ((try = 1; try <= ${AWX_MAX_API_CHECKS}; try++)); do
-  set +x
-  curl -s -f -k -u ${COL_USER}:${COL_PASS} -X GET ${AWX_API_URL}${AWX_API_JOB_PATH} > status.json
-  set -x
-
-  FINISHED=$(jq -r '.finished' status.json)
-  [ "${FINISHED}" = "null" ] || break
-
-  sleep 60
-done
-
-[ $try != $AWX_MAX_API_CHECKS ] || echo "WARNING: stopped retrying after $AWX_MAX_API_CHECKS times; timed out?"
-
-echo "AWX job completed $FINISHED"

ci-scripts/conf_files/enb-rcc.band40.25prb.tm1.if4p5.fair-scheduler.conf

@@ -137,7 +137,13 @@ eNBs =
     };
 
     ////////// MME parameters:
-    mme_ip_address = ({ ipv4 = "172.21.18.48"; port = 36412; });
+    mme_ip_address      = ( { ipv4       = "172.21.18.48";
+                              ipv6       = "192:168:30::17";
+                              port       = 36412 ;
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
 
     enable_measurement_reports = "no";
 
@@ -150,7 +156,9 @@ eNBs =
 
     NETWORK_INTERFACES :
     {
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1_MME              = "172.21.18.45";
+        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "172.21.18.45";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
         ENB_IPV4_ADDRESS_FOR_X2C                 = "172.21.18.45";

ci-scripts/conf_files/enb-rcc.band7.25prb.tm1.if4p5.conf

@@ -174,7 +174,13 @@ eNBs =
 
 
     ////////// MME parameters:
-    mme_ip_address = ({ ipv4 = "172.21.18.48"; port = 36412; });
+    mme_ip_address      = ( { ipv4       = "172.21.18.48";
+                              ipv6       = "192:168:30::17";
+                              port       = 36412 ;
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
 
     enable_measurement_reports = "no";
 
@@ -187,7 +193,9 @@ eNBs =
 
     NETWORK_INTERFACES :
     {
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1_MME              = "172.21.18.46";
+        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "172.21.18.46";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
         ENB_IPV4_ADDRESS_FOR_X2C                 = "172.21.18.46";
@@ -228,7 +236,7 @@ RUs = (
         nb_tx          = 1
         nb_rx          = 1
         att_tx         = 0
-        att_rx         = 6;
+        att_rx         = 0;
         eNB_instances  = [0];
     }
 );

ci-scripts/conf_files/enb.band38.25prb.rfsim.conf

@@ -134,7 +134,13 @@ eNBs =
     };
 
     ////////// MME parameters:
-    mme_ip_address = ({ ipv4 = "192.168.61.3"; port = 36412; });
+    mme_ip_address      = ( { ipv4       = "192.168.61.3";
+                              ipv6       = "192:168:30::17";
+                              port       = 36412 ;
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
 
     enable_measurement_reports = "no";
 
@@ -147,7 +153,9 @@ eNBs =
 
     NETWORK_INTERFACES :
     {
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.61.20";
+        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.61.20";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
         ENB_IPV4_ADDRESS_FOR_X2C                 = "192.168.61.20";

ci-scripts/conf_files/enb.band38.lte_2x2.100prb.usrpn310.conf

@@ -172,7 +172,12 @@ eNBs =
 
 
     ////////// MME parameters:
-    mme_ip_address = ({ ipv4 = "192.168.61.195"; });
+    mme_ip_address      = ( { ipv4       = "192.168.61.195";
+                              ipv6       = "192:168:30::17";
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
 
     enable_measurement_reports = "no";
 
@@ -185,7 +190,9 @@ eNBs =
 
     NETWORK_INTERFACES :
     {
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eno1";
         ENB_IPV4_ADDRESS_FOR_S1_MME              = "172.21.16.128";
+        ENB_INTERFACE_NAME_FOR_S1U               = "eno1";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "172.21.16.128";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
         ENB_IPV4_ADDRESS_FOR_X2C                 = "172.21.16.128";
@@ -204,8 +211,8 @@ MACRLCs = (
         bler_target_upper = 20.0;
         bler_target_lower = 10.0;
         max_ul_rb_index   = 27;
-        puSch10xSnr     =  250;
-        puCch10xSnr     =  230;
+        puSch10xSnr     =  190;
+        puCch10xSnr     =  160;
         }  
 );
 
@@ -224,13 +231,13 @@ RUs = (
        local_rf       = "yes"
          nb_tx          = 2
          nb_rx          = 2
-         att_tx         = 12
-         att_rx         = 0;
+         att_tx         = 10
+         att_rx         = 5;
          bands          = [38];
          max_pdschReferenceSignalPower = -27;
          max_rxgain                    = 75;
          eNB_instances  = [0];
-         sdr_addrs      = "addr=192.168.80.250";
+         sdr_addrs      = "mgmt_addr=172.21.19.13,addr=192.168.80.250";
 
     }
 );  

ci-scripts/conf_files/enb.band38.lte_2x2_tm2.100prb.usrpn310.conf

@@ -172,7 +172,12 @@ eNBs =
 
 
     ////////// MME parameters:
-    mme_ip_address = ({ ipv4 = "192.168.61.195"; });
+    mme_ip_address      = ( { ipv4       = "192.168.61.195";
+                              ipv6       = "192:168:30::17";
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
 
     enable_measurement_reports = "no";
 
@@ -185,7 +190,9 @@ eNBs =
 
     NETWORK_INTERFACES :
     {
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eno1";
         ENB_IPV4_ADDRESS_FOR_S1_MME              = "172.21.16.128";
+        ENB_INTERFACE_NAME_FOR_S1U               = "eno1";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "172.21.16.128";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
         ENB_IPV4_ADDRESS_FOR_X2C                 = "172.21.16.128";
@@ -204,8 +211,8 @@ MACRLCs = (
         bler_target_upper = 20.0;
         bler_target_lower = 10.0;
         max_ul_rb_index   = 27;
-        puSch10xSnr     =  280;
-        puCch10xSnr     =  250;
+        puSch10xSnr     =  190;
+        puCch10xSnr     =  160;
         }  
 );
 
@@ -224,13 +231,13 @@ RUs = (
        local_rf       = "yes"
          nb_tx          = 2
          nb_rx          = 2
-         att_tx         = 18
-         att_rx         = 0;
+         att_tx         = 10
+         att_rx         = 5;
          bands          = [38];
          max_pdschReferenceSignalPower = -27;
          max_rxgain                    = 75;
          eNB_instances  = [0];
-         sdr_addrs      = "addr=192.168.80.250";
+         sdr_addrs      = "mgmt_addr=172.21.19.13,addr=192.168.80.250";
 
     }
 );  

ci-scripts/conf_files/enb.band38.nsa_2x2.100prb.usrpn310.conf

@@ -172,7 +172,12 @@ eNBs =
 
 
     ////////// MME parameters:
-    mme_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; });
+    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
+                              ipv6       = "192:168:30::17";
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
 
     enable_measurement_reports = "no";
 
@@ -185,7 +190,9 @@ eNBs =
 
     NETWORK_INTERFACES :
     {
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eno1";
         ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
+        ENB_INTERFACE_NAME_FOR_S1U               = "eno1";
         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";
@@ -230,7 +237,7 @@ RUs = (
          max_pdschReferenceSignalPower = -27;
          max_rxgain                    = 75;
          eNB_instances  = [0];
-         sdr_addrs      = "addr=192.168.80.250";
+         sdr_addrs      = "mgmt_addr=172.21.19.13,addr=192.168.80.250";
 
     }
 );  

ci-scripts/conf_files/enb.band40.100prb.usrpb200.tm1-defaultscheduler.conf

@@ -134,7 +134,13 @@ eNBs =
     };
 
     ////////// MME parameters:
-    mme_ip_address = ({ ipv4 = "172.21.18.48"; port = 36412; });
+    mme_ip_address      = ( { ipv4       = "172.21.18.48";
+                              ipv6       = "192:168:30::17";
+                              port       = 36412 ;
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
 
     enable_measurement_reports = "no";
 
@@ -147,7 +153,9 @@ eNBs =
 
     NETWORK_INTERFACES :
     {
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1_MME              = "172.21.18.45";
+        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "172.21.18.45";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
         ENB_IPV4_ADDRESS_FOR_X2C                 = "172.21.18.45";
@@ -191,7 +199,7 @@ RUs = (
          nb_tx          = 1
          nb_rx          = 1
          att_tx         = 6
-         att_rx         = 12;
+         att_rx         = 6;
          bands          = [38];
          max_pdschReferenceSignalPower = -27;
          max_rxgain                    = 125;

ci-scripts/conf_files/enb.band40.25prb.usrpb200.conf

@@ -134,7 +134,13 @@ eNBs =
     };
 
     ////////// MME parameters:
-    mme_ip_address = ({ ipv4 = "172.21.18.48"; port = 36412; });
+    mme_ip_address      = ( { ipv4       = "172.21.18.48";
+                              ipv6       = "192:168:30::17";
+                              port       = 36412 ;
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
 
     enable_measurement_reports = "no";
 
@@ -147,7 +153,9 @@ eNBs =
 
     NETWORK_INTERFACES :
     {
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1_MME              = "172.21.18.45";
+        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "172.21.18.45";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
         ENB_IPV4_ADDRESS_FOR_X2C                 = "172.21.18.45";
@@ -191,7 +199,7 @@ RUs = (
          nb_tx          = 1
          nb_rx          = 1
          att_tx         = 6
-         att_rx         = 12;
+         att_rx         = 6;
          bands          = [38];
          max_pdschReferenceSignalPower = -27;
          max_rxgain                    = 125;

ci-scripts/conf_files/enb.band7.100prb.rfsim.conf

@@ -177,7 +177,13 @@ eNBs =
     enable_measurement_reports = "no";
 
     ////////// MME parameters:
-    mme_ip_address = ({ ipv4 = "192.168.61.3"; port = 36412; });
+    mme_ip_address      = ( { ipv4       = "192.168.61.3";
+                              ipv6       = "192:168:30::17";
+                              port       = 36412 ;
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
 
     ///X2
     enable_x2         = "no";
@@ -188,7 +194,9 @@ eNBs =
 
     NETWORK_INTERFACES : 
     {
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.61.20";
+        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.61.20";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
         ENB_IPV4_ADDRESS_FOR_X2C                 = "192.168.61.20";
@@ -224,7 +232,7 @@ RUs =
     nb_tx                         = 1
     nb_rx                         = 1
     att_tx                        = 3
-    att_rx                        = 6;
+    att_rx                        = 0;
     bands                         = [7];
     max_pdschReferenceSignalPower = -27;
     max_rxgain                    = 115;

ci-scripts/conf_files/enb.band7.100prb.usrpb200.tm1.conf

@@ -177,7 +177,13 @@ eNBs =
     enable_measurement_reports = "no";
 
     ////////// MME parameters:
-    mme_ip_address = ({ ipv4 = "172.21.18.48"; port = 36412; });
+    mme_ip_address      = ( { ipv4       = "172.21.18.48";
+                              ipv6       = "192:168:30::17";
+                              port       = 36412 ;
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
 
     ///X2
     enable_x2         = "no";
@@ -188,7 +194,9 @@ eNBs =
 
     NETWORK_INTERFACES : 
     {
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1_MME              = "172.21.18.46";
+        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "172.21.18.46";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
         ENB_IPV4_ADDRESS_FOR_X2C                 = "172.21.18.46";
@@ -224,7 +232,7 @@ RUs =
     nb_tx                         = 1
     nb_rx                         = 1
     att_tx                        = 3
-    att_rx                        = 6;
+    att_rx                        = 0;
     bands                         = [7];
     max_pdschReferenceSignalPower = -27;
     max_rxgain                    = 115;

ci-scripts/conf_files/enb.band7.25prb.l2sim.conf

@@ -172,7 +172,13 @@ eNBs =
 
 
     ////////// MME parameters:
-    mme_ip_address = ({ ipv4 = "192.168.61.3"; port = 36412; });
+    mme_ip_address      = ( { ipv4       = "192.168.61.3";
+                              ipv6       = "192:168:30::17";
+                              port       = 36412 ;
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
 
     enable_measurement_reports = "no";
 
@@ -185,7 +191,9 @@ eNBs =
 
     NETWORK_INTERFACES :
     {
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.61.1";
+        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.61.1";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
         ENB_IPV4_ADDRESS_FOR_X2C                 = "192.168.61.1";
@@ -198,6 +206,7 @@ eNBs =
 MACRLCs = (
 	{
 	num_cc = 1;
+	local_s_if_name  = "lo";
 	remote_s_address = "127.0.0.1";
 	local_s_address  = "127.0.0.1";
 	local_s_portc    = 50001;

ci-scripts/conf_files/enb.band7.25prb.rfsim.conf

@@ -177,7 +177,13 @@ eNBs =
     enable_measurement_reports = "no";
 
     ////////// MME parameters:
-    mme_ip_address = ({ ipv4 = "192.168.61.3"; port = 36412; });
+    mme_ip_address      = ( { ipv4       = "192.168.61.3";
+                              ipv6       = "192:168:30::17";
+                              port       = 36412 ;
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
 
     ///X2
     enable_x2         = "no";
@@ -188,7 +194,9 @@ eNBs =
 
     NETWORK_INTERFACES : 
     {
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.61.20";
+        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.61.20";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
         ENB_IPV4_ADDRESS_FOR_X2C                 = "192.168.61.20";
@@ -224,7 +232,7 @@ RUs =
     nb_tx                         = 1
     nb_rx                         = 1
     att_tx                        = 3
-    att_rx                        = 6;
+    att_rx                        = 0;
     bands                         = [7];
     max_pdschReferenceSignalPower = -27;
     max_rxgain                    = 115;

ci-scripts/conf_files/enb.band7.25prb.rfsim.nos1.conf

@@ -177,7 +177,13 @@ eNBs =
     enable_measurement_reports = "no";
 
     ////////// MME parameters:
-    mme_ip_address = ({ ipv4 = "192.168.61.3"; port = 36412; });
+    mme_ip_address      = ( { ipv4       = "192.168.61.3";
+                              ipv6       = "192:168:30::17";
+                              port       = 36412 ;
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
 
     ///X2
     enable_x2         = "no";
@@ -188,7 +194,9 @@ eNBs =
 
     NETWORK_INTERFACES : 
     {
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.61.20";
+        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.61.20";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
         ENB_IPV4_ADDRESS_FOR_X2C                 = "192.168.61.20";
@@ -224,7 +232,7 @@ RUs =
     nb_tx                         = 1
     nb_rx                         = 1
     att_tx                        = 3
-    att_rx                        = 6;
+    att_rx                        = 0;
     bands                         = [7];
     max_pdschReferenceSignalPower = -27;
     max_rxgain                    = 115;

ci-scripts/conf_files/enb.band7.25prb.usrpb200.conf

@@ -177,7 +177,13 @@ eNBs =
     enable_measurement_reports = "no";
 
     ////////// MME parameters:
-    mme_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; port = 36412; });
+    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
+                              ipv6       = "192:168:30::17";
+                              port       = 36412 ;
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
 
     ///X2
     enable_x2         = "no";
@@ -188,7 +194,9 @@ eNBs =
 
     NETWORK_INTERFACES : 
     {
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.61.30";
+        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.61.30";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
         ENB_IPV4_ADDRESS_FOR_X2C                 = "192.168.61.30";

ci-scripts/conf_files/enb.band7.25prb.usrpb200.tm1-norrc.conf

@@ -177,7 +177,13 @@ eNBs =
     enable_measurement_reports = "no";
 
     ////////// MME parameters:
-    mme_ip_address = ({ ipv4 = "172.21.18.48"; port = 36412; });
+    mme_ip_address      = ( { ipv4       = "172.21.18.48";
+                              ipv6       = "192:168:30::17";
+                              port       = 36412 ;
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
 
     ///X2
     enable_x2         = "no";
@@ -188,7 +194,9 @@ eNBs =
 
     NETWORK_INTERFACES : 
     {
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1_MME              = "172.21.18.46";
+        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "172.21.18.46";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
         ENB_IPV4_ADDRESS_FOR_X2C                 = "172.21.18.46";

ci-scripts/conf_files/enb.band7.25prb.usrpb200.tm1.conf

@@ -177,7 +177,13 @@ eNBs =
     enable_measurement_reports = "no";
 
     ////////// MME parameters:
-    mme_ip_address = ({ ipv4 = "172.21.18.48"; port = 36412; });
+    mme_ip_address      = ( { ipv4       = "172.21.18.48";
+                              ipv6       = "192:168:30::17";
+                              port       = 36412 ;
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
 
     ///X2
     enable_x2         = "no";
@@ -188,7 +194,9 @@ eNBs =
 
     NETWORK_INTERFACES : 
     {
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1_MME              = "172.21.18.46";
+        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "172.21.18.46";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
         ENB_IPV4_ADDRESS_FOR_X2C                 = "172.21.18.46";

ci-scripts/conf_files/enb.band7.50prb.rfsim.conf

@@ -177,7 +177,13 @@ eNBs =
     enable_measurement_reports = "no";
 
     ////////// MME parameters:
-    mme_ip_address = ({ ipv4 = "192.168.61.3"; port = 36412; });
+    mme_ip_address      = ( { ipv4       = "192.168.61.3";
+                              ipv6       = "192:168:30::17";
+                              port       = 36412 ;
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
 
     ///X2
     enable_x2         = "no";
@@ -188,7 +194,9 @@ eNBs =
 
     NETWORK_INTERFACES : 
     {
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.61.20";
+        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.61.20";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
         ENB_IPV4_ADDRESS_FOR_X2C                 = "192.168.61.20";
@@ -224,7 +232,7 @@ RUs =
     nb_tx                         = 1
     nb_rx                         = 1
     att_tx                        = 3
-    att_rx                        = 6;
+    att_rx                        = 0;
     bands                         = [7];
     max_pdschReferenceSignalPower = -27;
     max_rxgain                    = 115;

ci-scripts/conf_files/enb.band7.50prb.usrpb200.tm1.conf

@@ -177,7 +177,13 @@ eNBs =
     enable_measurement_reports = "no";
 
     ////////// MME parameters:
-    mme_ip_address = ({ ipv4 = "172.21.18.48"; port = 36412; });
+    mme_ip_address      = ( { ipv4       = "172.21.18.48";
+                              ipv6       = "192:168:30::17";
+                              port       = 36412 ;
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
 
     ///X2
     enable_x2         = "no";
@@ -188,7 +194,9 @@ eNBs =
 
     NETWORK_INTERFACES : 
     {
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1_MME              = "172.21.18.46";
+        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "172.21.18.46";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
         ENB_IPV4_ADDRESS_FOR_X2C                 = "172.21.18.46";
@@ -224,7 +232,7 @@ RUs =
     nb_tx                         = 1
     nb_rx                         = 1
     att_tx                        = 3
-    att_rx                        = 6;
+    att_rx                        = 0;
     bands                         = [7];
     max_pdschReferenceSignalPower = -27;
     max_rxgain                    = 115;

ci-scripts/conf_files/enb.band7.tm1.25prb.rfsim.mbms.conf

@@ -180,7 +180,12 @@ eNBs =
     t_dc_overall      = 2000;      /* unit: millisecond */
 
  ////////// MCE parameters:
-    target_mce_m2_ip_address = ({ ipv4 = "127.0.0.7"; });
+    target_mce_m2_ip_address      = ( { ipv4       = "127.0.0.7";
+                              ipv6       = "192:168:30::17";
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
 
     ///M2
     enable_enb_m2 = "yes";
@@ -203,7 +208,9 @@ eNBs =
     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";
@@ -245,7 +252,12 @@ MCEs = (
             //M3
             enable_mce_m3 = "yes";
 
-            target_mme_m3_ip_address = ({ ipv4 = "127.0.0.18"; });
+            target_mme_m3_ip_address      = ( { ipv4       = "127.0.0.18";
+                              ipv6       = "192:168:30::17";
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
 
 
 

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

@@ -179,7 +179,13 @@ eNBs =
 
 
     ////////// MME parameters:
-    mme_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; port = 36412; });
+    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
+                              ipv6       = "192:168:30::17";
+                              port       = 36412 ;
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
 
     enable_measurement_reports = "no";
 
@@ -192,7 +198,9 @@ eNBs =
 
     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";

ci-scripts/conf_files/enb.nsa.band7.25prb.usrpb200.conf

@@ -177,7 +177,13 @@ eNBs =
     enable_measurement_reports = "yes";
 
     ////////// MME parameters:
-    mme_ip_address = ({ ipv4 = "172.21.16.137"; port = 36412; });
+    mme_ip_address      = ( { ipv4       = "172.21.16.137";
+                              ipv6       = "192:168:30::17";
+                              port       = 36412 ;
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
 
     ///X2
     enable_x2         = "yes";
@@ -188,7 +194,9 @@ eNBs =
 
     NETWORK_INTERFACES : 
     {
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.68.130";
+        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.68.130";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
         ENB_IPV4_ADDRESS_FOR_X2C                 = "192.168.68.130";

ci-scripts/conf_files/gnb-cu.sa.band78.106prb.conf

@@ -1,6 +1,7 @@
 Active_gNBs = ( "cu-rfsim");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";
+Num_Threads_PUSCH = 8;
 
 gNBs =
 (
@@ -21,8 +22,9 @@ gNBs =
 
     tr_s_preference = "f1";
 
-    local_s_address = "192.168.71.150";
-    remote_s_address = "192.168.71.171";
+    local_s_if_name = "eth0";
+    local_s_address = "192.168.71.140";
+    remote_s_address = "192.168.71.142";
     local_s_portc   = 501;
     local_s_portd   = 2153;
     remote_s_portc  = 500;
@@ -38,13 +40,20 @@ gNBs =
 
 
     ////////// AMF parameters:
-    amf_ip_address = ({ ipv4 = "192.168.71.132"; });
+        amf_ip_address      = ( { ipv4       = "192.168.71.132";
+                              ipv6       = "192:168:30::17";
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
 
     NETWORK_INTERFACES :
     {
 
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.71.150";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.71.150";
+        GNB_INTERFACE_NAME_FOR_NG_AMF            = "eth0";
+        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.71.140";
+        GNB_INTERFACE_NAME_FOR_NGU               = "eth0";
+        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.71.140";
         GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
     };
   }

ci-scripts/conf_files/gnb-cu.sa.f1.conf

@@ -1,6 +1,7 @@
 Active_gNBs = ( "gNB-Eurecom-CU");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";
+Num_Threads_PUSCH = 8;
 
 gNBs =
 (
@@ -21,8 +22,9 @@ gNBs =
 
     tr_s_preference = "f1";
 
-    local_s_address = "127.0.0.4";
-    remote_s_address = "127.0.0.5";
+    local_s_if_name = "eth0";
+    local_s_address = "192.168.68.194";
+    remote_s_address = "192.168.68.195";
     local_s_portc   = 501;
     local_s_portd   = 2153;
     remote_s_portc  = 500;
@@ -38,13 +40,20 @@ gNBs =
 
 
     ////////// AMF parameters:
-    amf_ip_address = ({ ipv4 = "172.21.16.137"; });
+        amf_ip_address      = ( { ipv4       = "172.21.16.137";
+                              ipv6       = "192:168:30::17";
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
 
     NETWORK_INTERFACES :
     {
 
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.16.109";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.16.109";
+        GNB_INTERFACE_NAME_FOR_NG_AMF            = "eth0";
+        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.68.194";
+        GNB_INTERFACE_NAME_FOR_NGU               = "eth0";
+        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.68.194";
         GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
     };
   }