modification to initial_synch

.clang-format

@@ -9,10 +9,9 @@ AlignEscapedNewlines: Left
 AlignOperands:   true
 AlignTrailingComments: false
 AllowAllParametersOfDeclarationOnNextLine: false
-AllowAllArgumentsOnNextLine: false
 AllowShortBlocksOnASingleLine: false
 AllowShortCaseLabelsOnASingleLine: false
-AllowShortFunctionsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: None
 AllowShortIfStatementsOnASingleLine: false
 AllowShortLoopsOnASingleLine: false
 AlwaysBreakAfterDefinitionReturnType: None
@@ -45,7 +44,7 @@ BreakBeforeTernaryOperators: true
 BreakConstructorInitializersBeforeComma: false
 BreakConstructorInitializers: BeforeColon
 BreakStringLiterals: true
-ColumnLimit:     132
+ColumnLimit:     200
 CommentPragmas:  '^ IWYU pragma:'
 CompactNamespaces: false
 ConstructorInitializerAllOnOneLineOrOnePerLine: true
@@ -104,85 +103,5 @@ SpacesInParentheses: false
 SpacesInSquareBrackets: false
 TabWidth:        2
 UseTab:          Never
----
-Language: JavaScript
-# BasedOnStyle:  Google
-AccessModifierOffset: -1
-AlignAfterOpenBracket: Align
-AlignConsecutiveAssignments: false
-AlignConsecutiveDeclarations: false
-AlignOperands:   true
-AlignTrailingComments: false
-AllowAllParametersOfDeclarationOnNextLine: false
-AllowShortBlocksOnASingleLine: false
-AllowShortCaseLabelsOnASingleLine: false
-AllowShortFunctionsOnASingleLine: None
-AllowShortIfStatementsOnASingleLine: false
-AllowShortLoopsOnASingleLine: false
-AlwaysBreakAfterDefinitionReturnType: None
-AlwaysBreakAfterReturnType: None
-AlwaysBreakBeforeMultilineStrings: true
-BinPackArguments: false
-BinPackParameters: false
-BraceWrapping:
-  AfterClass:      false
-  AfterControlStatement: false
-  AfterEnum:       false
-  AfterFunction:   true
-  AfterNamespace:  false
-  AfterObjCDeclaration: false
-  BeforeCatch:     false
-  BeforeElse:      false
-  IndentBraces:    false
-  SplitEmptyFunction: true
-  SplitEmptyRecord: true
-  SplitEmptyNamespace: true
-BreakBeforeBinaryOperators: NonAssignment
-BreakBeforeBraces: Custom
-BreakBeforeInheritanceComma: false
-BreakBeforeTernaryOperators: true
-BreakConstructorInitializersBeforeComma: false
-BreakConstructorInitializers: BeforeColon
-BreakStringLiterals: true
-ColumnLimit:     200
-CommentPragmas:  '^ IWYU pragma:'
-CompactNamespaces: false
-ConstructorInitializerAllOnOneLineOrOnePerLine: true
-ConstructorInitializerIndentWidth: 4
-ContinuationIndentWidth: 4
-Cpp11BracedListStyle: true
-DisableFormat:   false
-FixNamespaceComments: true
-IndentCaseLabels: true
-IndentPPDirectives: None
-IndentWidth:     2
-IndentWrappedFunctionNames: false
-KeepEmptyLinesAtTheStartOfBlocks: false
-MaxEmptyLinesToKeep: 1
-NamespaceIndentation: None
-PenaltyBreakAssignment: 2
-PenaltyBreakBeforeFirstCallParameter: 1
-PenaltyBreakComment: 300
-PenaltyBreakFirstLessLess: 120
-PenaltyBreakString: 1000
-PenaltyExcessCharacter: 1000000
-PenaltyReturnTypeOnItsOwnLine: 200
-ReflowComments:  true
-SortUsingDeclarations: false
-SpaceAfterCStyleCast: false
-SpaceAfterTemplateKeyword: true
-SpaceBeforeAssignmentOperators: true
-SpaceBeforeParens: ControlStatements
-SpaceInEmptyParentheses: false
-SpacesBeforeTrailingComments: 1
-SpacesInAngles:  false
-SpacesInContainerLiterals: true
-SpacesInCStyleCastParentheses: false
-SpacesInParentheses: false
-SpacesInSquareBrackets: false
-DeriveLineEnding: true
-TabWidth:        2
-JavaScriptQuotes: Double 
-UseTab:          Never
 ...
 

.dockerignore

@@ -5,3 +5,4 @@ common/utils/T/T_IDs.h
 common/utils/T/T_messages.txt.h
 common/utils/T/genids
 common/utils/T/genids.o
+targets/bin/

.gitignore

@@ -8,6 +8,7 @@ cmake_targets/ran_build/
 cmake_targets/nas_sim_tools/build/
 log/
 lte_build_oai/
+targets/bin/
 
 # vscode
 .vscode

.gitmodules

@@ -1,4 +0,0 @@
-[submodule "openair2/E2AP/flexric"]
-	path = openair2/E2AP/flexric
-	url = https://gitlab.eurecom.fr/mosaic5g/flexric.git
-	branch = remotes/origin/mir_dev

CONTRIBUTING.md

@@ -2,26 +2,20 @@
 
 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.
-   - 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).
-   - Eurecom GitLab does NOT accept public email domains.
+2. We recommend that you provide us with a professional or student email address 
+2. Register on [Eurecom GitLab Server](https://gitlab.eurecom.fr/users/sign_in)
 3. Provide the OAI team with the **username** of this account to (mailto:contact@openairinterface.org) ; we will give you the developer rights on this repository.
-4. The policies are described in these wiki pages: [OAI Policies](https://gitlab.eurecom.fr/oai/openairinterface5g/wikis/oai-policies-home).
+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.
-   - All merge requests SHALL have source branch names that SHALL not contain the `/` character.
-      * We are using a `docker` registry scheme and the image names are based on the source branch name.
 
 ## Coding Styles ##
 
-There are described [here](https://gitlab.eurecom.fr/oai/openairinterface5g/wikis/guidelines/guidelines-home).
+There are described [here](https://gitlab.eurecom.fr/oai/openairinterface5g/wikis/guidelines/guidelines-home)
 
 ## License ##
 

README.md

@@ -4,12 +4,8 @@
 
 <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://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-Fedore37-Green" alt="Supported OS Fedora 37"></a>
+    <a href="https://releases.ubuntu.com/18.04/"><img src="https://img.shields.io/badge/OS-Ubuntu18-Green" alt="Supported OS"></a>
+    <a href="https://www.redhat.com/en/enterprise-linux-8"><img src="https://img.shields.io/badge/OS-RHEL8-Green" alt="Supported OS"></a>
 </p>
 
 <p align="center">
@@ -17,10 +13,10 @@
 </p>
 
 <p align="center">
-  <a href="https://hub.docker.com/r/oaisoftwarealliance/oai-gnb"><img alt="Docker Pulls" src="https://img.shields.io/docker/pulls/oaisoftwarealliance/oai-gnb?label=gNB%20docker%20pulls"></a>
-  <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/rdefosseoai/oai-enb"><img alt="Docker Pulls" src="https://img.shields.io/docker/pulls/rdefosseoai/oai-enb?label=eNB%20docker%20pulls"></a>
+  <a href="https://hub.docker.com/r/rdefosseoai/oai-lte-ue"><img alt="Docker Pulls" src="https://img.shields.io/docker/pulls/rdefosseoai/oai-lte-ue?label=LTE-UE%20docker%20pulls"></a>
+  <a href="https://hub.docker.com/r/rdefosseoai/oai-gnb"><img alt="Docker Pulls" src="https://img.shields.io/docker/pulls/rdefosseoai/oai-gnb?label=gNB%20docker%20pulls"></a>
+  <a href="https://hub.docker.com/r/rdefosseoai/oai-nr-ue"><img alt="Docker Pulls" src="https://img.shields.io/docker/pulls/rdefosseoai/oai-nr-ue?label=NR-UE%20docker%20pulls"></a>
 </p>
 
 # OpenAirInterface License #
@@ -36,39 +32,61 @@ Please see [NOTICE](NOTICE.md) file for third party software that is included in
 
 # Where to Start #
 
- *  [General overview of documentation](./doc/README.md)
  *  [The implemented features](./doc/FEATURE_SET.md)
  *  [How to build](./doc/BUILD.md)
  *  [How to run the modems](./doc/RUNMODEM.md)
 
-Not all information is available in a central place, and information for
-specific sub-systems might be available in the corresponding sub-directories.
-To find all READMEs, this command might be handy:
-
-```
-find . -iname "readme*"
-```
-
 # RAN repository structure #
 
 The OpenAirInterface (OAI) software is composed of the following parts: 
 
-```
+<pre>
 openairinterface5g
-├── charts
 ├── ci-scripts        : Meta-scripts used by the OSA CI process. Contains also configuration files used day-to-day by CI.
-├── CMakeLists.txt    : Top-level CMakeLists.txt for building
 ├── cmake_targets     : Build utilities to compile (simulation, emulation and real-time platforms), and generated build files.
-├── common            : Some common OAI utilities, some other tools can be found at openair2/UTILS.
-├── doc               : Documentation
-├── docker            : Dockerfiles to build for Ubuntu and RHEL
-├── executables       : Top-level executable source files (gNB, eNB, ...)
+├── common            : Some common OAI utilities, other tools can be found at openair2/UTILS.
+├── doc               : Contains an up-to-date feature set list and starting tutorials.
+├── executables       : Top-level executable source files.
+├── LICENSE           : License file.
 ├── maketags          : Script to generate emacs tags.
-├── nfapi             : (n)FAPI code for MAC-PHY interface
+├── nfapi             : Contains the NFAPI code. A local Readme file provides more details.
 ├── openair1          : 3GPP LTE Rel-10/12 PHY layer / 3GPP NR Rel-15 layer. A local Readme file provides more details.
+│   ├── PHY
+│   ├── SCHED
+│   ├── SCHED_NBIOT
+│   ├── SCHED_NR
+│   ├── SCHED_NR_UE
+│   ├── SCHED_UE
+│   └── SIMULATION    : PHY RF simulation.
 ├── openair2          : 3GPP LTE Rel-10 RLC/MAC/PDCP/RRC/X2AP + LTE Rel-14 M2AP implementation. Also 3GPP NR Rel-15 RLC/MAC/PDCP/RRC/X2AP.
+│   ├── COMMON
+│   ├── DOCS
+│   ├── ENB_APP
+│   ├── F1AP
+│   ├── GNB_APP
+│   ├── LAYER2/RLC/   : with the following subdirectories: UM_v9.3.0, TM_v9.3.0, and AM_v9.3.0.
+│   ├── LAYER2/PDCP/PDCP_v10.1.0
+│   ├── M2AP
+│   ├── MCE_APP
+│   ├── NETWORK_DRIVER
+│   ├── NR_PHY_INTERFACE
+│   ├── NR_UE_PHY_INTERFACE
+│   ├── PHY_INTERFACE
+│   ├── RRC
+│   ├── UTIL
+│   └── X2AP
 ├── openair3          : 3GPP LTE Rel10 for S1AP, NAS GTPV1-U for both ENB and UE.
-├── openshift         : OpenShift helm charts for some deployment options of OAI
-├── radio             : Drivers for various radios such as USRP, AW2S, RFsim, ...
-└── targets           : Some configuration files; only historical relevance, and might be deleted in the future
-```
+│   ├── COMMON
+│   ├── DOCS
+│   ├── GTPV1-U
+│   ├── M3AP
+│   ├── MME_APP
+│   ├── NAS
+│   ├── S1AP
+│   ├── SCTP
+│   ├── SECU
+│   ├── TEST
+│   ├── UDP
+│   └── UTILS
+└── targets           : Top-level wrappers for unitary simulation for PHY channels, system-level emulation (eNB-UE with and without S1), and realtime eNB and UE and RRH GW.
+</pre>

charts/physims/Chart.yaml

@@ -16,7 +16,7 @@ icon: http://www.openairinterface.org/wp-content/uploads/2015/06/cropped-oai_fin
 
 # 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: 1.0.0
+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.

charts/physims/charts/dlsim.100rb+tm2/Chart.yaml

@@ -1,36 +0,0 @@
-apiVersion: v1
-name: oai-dlsim-100rb-tm2
-description: A Helm subchart for dlsim network function ("100rb+tm2" 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
-  - dlsim
-  - RAN
-  - 4G
-
-sources:
-  - https://gitlab.eurecom.fr/oai/openairinterface5g
-
-maintainers:
-  - name:  OPENAIRINTERFACE
-    email: contact@openairinterface.org

charts/physims/charts/dlsim.100rb+tm2/templates/_helpers.tpl

@@ -1,63 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "oai-dlsim-100rb-tm2.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-dlsim-100rb-tm2.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-dlsim-100rb-tm2.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Common labels
-*/}}
-{{- define "oai-dlsim-100rb-tm2.labels" -}}
-helm.sh/chart: {{ include "oai-dlsim-100rb-tm2.chart" . }}
-{{ include "oai-dlsim-100rb-tm2.selectorLabels" . }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end -}}
-
-{{/*
-Selector labels
-*/}}
-{{- define "oai-dlsim-100rb-tm2.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "oai-dlsim-100rb-tm2.name" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end -}}
-
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "oai-dlsim-100rb-tm2.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create -}}
-    {{ default (include "oai-dlsim-100rb-tm2.fullname" .) .Values.serviceAccount.name }}
-{{- else -}}
-    {{ default "default" .Values.serviceAccount.name }}
-{{- end -}}
-{{- end -}}

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

@@ -1,42 +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 }}
-        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 "dlsim.100rb+tm2" -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.dlsim100rbtm2}}
-      nodeName: {{ .Values.global.nodeName.dlsim100rbtm2 }}
-      {{- end }}

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

@@ -1,42 +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 }}
-        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 "dlsim.basic" -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.dlsimbasic}}
-      nodeName: {{ .Values.global.nodeName.dlsimbasic }}
-      {{- end }}

charts/physims/charts/dlsim.basic/values.yaml

@@ -1,44 +0,0 @@
-# Default values for oai-dlsim-basic
-# 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-dlsim-basic"
-
-podSecurityContext:
-  runAsUser: 0
-  runAsGroup: 0
-
-securityContext:
-  privileged: false
-
-resources:
-   limits:
-     cpu: 100m
-     memory: 128Mi
-   requests:
-     cpu: 100m
-     memory: 128Mi
-
-nodeSelector: {}
-
-tolerations: []
-
-affinity: {}

charts/physims/charts/dlsim/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
-name: oai-dlsim-basic
-description: A Helm subchart for dlsim network function ("basic" tests)
+name: oai-dlsim
+description: A Helm subchart for dlsim network function
 
 # A chart can be either an 'application' or a 'library' chart.
 #

charts/physims/charts/dlsim/templates/NOTES.txt

@@ -0,0 +1,15 @@
+1. Get the application URL by running these commands:
+{{- if contains "NodePort" .Values.service.type }}
+  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "oai-dlsim.fullname" . }})
+  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
+  echo http://$NODE_IP:$NODE_PORT
+{{- else if contains "LoadBalancer" .Values.service.type }}
+     NOTE: It may take a few minutes for the LoadBalancer IP to be available.
+           You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "oai-dlsim.fullname" . }}'
+  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "oai-dlsim.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
+  echo http://$SERVICE_IP:{{ .Values.service.port }}
+{{- else if contains "ClusterIP" .Values.service.type }}
+  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "oai-dlsim.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+  echo "Visit http://127.0.0.1:8080 to use your application"
+  kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:80
+{{- end }}

charts/physims/charts/dlsim/templates/_helpers.tpl

@@ -2,7 +2,7 @@
 {{/*
 Expand the name of the chart.
 */}}
-{{- define "oai-dlsim-basic.name" -}}
+{{- define "oai-dlsim.name" -}}
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
@@ -11,7 +11,7 @@ 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-dlsim-basic.fullname" -}}
+{{- define "oai-dlsim.fullname" -}}
 {{- if .Values.fullnameOverride -}}
 {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
 {{- else -}}
@@ -27,16 +27,16 @@ If release name contains chart name it will be used as a full name.
 {{/*
 Create chart name and version as used by the chart label.
 */}}
-{{- define "oai-dlsim-basic.chart" -}}
+{{- define "oai-dlsim.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
 {{/*
 Common labels
 */}}
-{{- define "oai-dlsim-basic.labels" -}}
-helm.sh/chart: {{ include "oai-dlsim-basic.chart" . }}
-{{ include "oai-dlsim-basic.selectorLabels" . }}
+{{- define "oai-dlsim.labels" -}}
+helm.sh/chart: {{ include "oai-dlsim.chart" . }}
+{{ include "oai-dlsim.selectorLabels" . }}
 {{- if .Chart.AppVersion }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
@@ -46,17 +46,17 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{/*
 Selector labels
 */}}
-{{- define "oai-dlsim-basic.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "oai-dlsim-basic.name" . }}
+{{- define "oai-dlsim.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "oai-dlsim.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}
 
 {{/*
 Create the name of the service account to use
 */}}
-{{- define "oai-dlsim-basic.serviceAccountName" -}}
+{{- define "oai-dlsim.serviceAccountName" -}}
 {{- if .Values.serviceAccount.create -}}
-    {{ default (include "oai-dlsim-basic.fullname" .) .Values.serviceAccount.name }}
+    {{ default (include "oai-dlsim.fullname" .) .Values.serviceAccount.name }}
 {{- else -}}
     {{ default "default" .Values.serviceAccount.name }}
 {{- end -}}

charts/physims/charts/dlsim/templates/deployment.yaml

@@ -1,12 +1,20 @@
-apiVersion: batch/v1
-kind: Job
+apiVersion: apps/v1
+kind: Deployment
 metadata:
   name: {{ .Chart.Name }}
+  labels:
+    {{- include "oai-dlsim.labels" . | nindent 4 }}
 spec:
+  replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      {{- include "oai-dlsim.selectorLabels" . | nindent 6 }}
+  strategy:
+    type: Recreate
   template:
     metadata:
       labels:
-        app: physim
+        {{- include "oai-dlsim.selectorLabels" . | nindent 8 }}
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
@@ -22,23 +30,20 @@ spec:
           {{- toYaml .Values.securityContext | nindent 12 }}
         ports:
         - containerPort: 80
-        env:
-        - name: OPENAIR_DIR
-          value: /opt/oai-physim
+          name: oai-dlsim
+        # volumeMounts:
+        # - mountPath: /opt/oai-dlsim/certs
+        #   name: certs
         command: ["/bin/sh", "-c"]
         args:
-        - >
-          cmake_targets/autotests/run_exec_autotests.bash -g "nr_ulsim.sc-fdma" -d bin/ &&
-          echo "FINISHED" && sleep infinity
+        - >  
+          export OPENAIR_DIR=/opt/oai-physim &&
+          cd cmake_targets/autotests &&
+          ./run_exec_autotests.bash -g "015100" -q -np -b &&
+          echo "FINISHED" &&
+          sleep infinity
       dnsPolicy: ClusterFirst
-      restartPolicy: Never
+      restartPolicy: Always
       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.nrulsimscfdma}}
-      nodeName: {{ .Values.global.nodeName.nrulsimscfdma }}
-      {{- end }}

charts/physims/charts/dlsim/templates/service.yaml

@@ -0,0 +1,20 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Chart.Name }}
+  labels:
+    {{- include "oai-dlsim.labels" . | nindent 4 }}
+spec:
+  type: {{ .Values.service.type }}
+{{- if  contains "ClusterIP" .Values.service.type }}
+  clusterIP: None
+{{- end }}
+  ports:
+    - name: oai-dlsim
+      # Port accessible outside cluster
+      port: {{ .Values.service.port }}
+      # Port to forward to inside the pod
+      targetPort: {{ .Values.service.Port }}
+      protocol: TCP
+  selector:
+    {{- include "oai-dlsim.selectorLabels" . | nindent 4 }}

charts/physims/charts/dlsim/values.yaml

@@ -1,10 +1,15 @@
-# Default values for oai-dlsim-100rb+tm2
+# Default values for oai-dlsim.
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
 replicaCount: 1
 
+namespace: "OAICICD_PROJECT"
+
 image:
+  registry: local
+  repository: image-registry.openshift-image-registry.svc:5000/OAICICD_PROJECT/oai-physim
+  version: temp
   # pullPolicy: IfNotPresent or Never or Always
   pullPolicy: Always
 
@@ -20,14 +25,26 @@ serviceAccount:
   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-dlsim-100rb-tm2"
+  name: "oai-dlsim-sa"
 
 podSecurityContext:
   runAsUser: 0
   runAsGroup: 0
 
 securityContext:
-  privileged: false
+  privileged: true
+  capabilities:
+    add:
+      - SYS_CAP_PTRACE
+  #   drop:
+  #   - ALL
+  # readOnlyRootFilesystem: true
+  # runAsNonRoot: true
+  # runAsUser: 1000
+
+service:
+  type: ClusterIP
+  port: 80
 
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious

charts/physims/charts/ldpctest/templates/NOTES.txt

@@ -0,0 +1,15 @@
+1. Get the application URL by running these commands:
+{{- if contains "NodePort" .Values.service.type }}
+  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "oai-ldpctest.fullname" . }})
+  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
+  echo http://$NODE_IP:$NODE_PORT
+{{- else if contains "LoadBalancer" .Values.service.type }}
+     NOTE: It may take a few minutes for the LoadBalancer IP to be available.
+           You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "oai-ldpctest.fullname" . }}'
+  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "oai-ldpctest.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
+  echo http://$SERVICE_IP:{{ .Values.service.port }}
+{{- else if contains "ClusterIP" .Values.service.type }}
+  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "oai-ldpctest.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+  echo "Visit http://127.0.0.1:8080 to use your application"
+  kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:80
+{{- end }}

charts/physims/charts/ldpctest/templates/deployment.yaml

@@ -1,12 +1,20 @@
-apiVersion: batch/v1
-kind: Job
+apiVersion: apps/v1
+kind: Deployment
 metadata:
   name: {{ .Chart.Name }}
+  labels:
+    {{- include "oai-ldpctest.labels" . | nindent 4 }}
 spec:
+  replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      {{- include "oai-ldpctest.selectorLabels" . | nindent 6 }}
+  strategy:
+    type: Recreate
   template:
     metadata:
       labels:
-        app: physim
+        {{- include "oai-ldpctest.selectorLabels" . | nindent 8 }}
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
@@ -20,23 +28,22 @@ spec:
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
-        env:
-        - name: OPENAIR_DIR
-          value: /opt/oai-physim
+        ports:
+        - containerPort: 80
+          name: oai-ldpctest
+        # volumeMounts:
+        # - mountPath: /opt/oai-ldpctest/certs
+        #   name: certs
         command: ["/bin/sh", "-c"]
         args:
-        - >
-          cmake_targets/autotests/run_exec_autotests.bash -g "ldpctest" -d bin/ &&
-          echo "FINISHED" && sleep infinity
+        - >  
+          export OPENAIR_DIR=/opt/oai-physim &&
+          cd cmake_targets/autotests &&
+          ./run_exec_autotests.bash -g "015102" -q -np -b &&
+          echo "FINISHED" &&
+          sleep infinity
       dnsPolicy: ClusterFirst
-      restartPolicy: Never
+      restartPolicy: Always
       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.ldpctest}}
-      nodeName: {{ .Values.global.nodeName.ldpctest }}
-      {{- end }}

charts/physims/charts/ldpctest/templates/service.yaml

@@ -0,0 +1,20 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Chart.Name }}
+  labels:
+    {{- include "oai-ldpctest.labels" . | nindent 4 }}
+spec:
+  type: {{ .Values.service.type }}
+{{- if  contains "ClusterIP" .Values.service.type }}
+  clusterIP: None
+{{- end }}
+  ports:
+    - name: oai-ldpctest
+      # Port accessible outside cluster
+      port: {{ .Values.service.port }}
+      # Port to forward to inside the pod
+      targetPort: {{ .Values.service.Port }}
+      protocol: TCP
+  selector:
+    {{- include "oai-ldpctest.selectorLabels" . | nindent 4 }}

charts/physims/charts/ldpctest/values.yaml

@@ -4,7 +4,12 @@
 
 replicaCount: 1
 
+namespace: "OAICICD_PROJECT"
+
 image:
+  registry: local
+  repository: image-registry.openshift-image-registry.svc:5000/OAICICD_PROJECT/oai-physim
+  version: temp
   # pullPolicy: IfNotPresent or Never or Always
   pullPolicy: Always
 
@@ -27,7 +32,19 @@ podSecurityContext:
   runAsGroup: 0
 
 securityContext:
-  privileged: false
+  privileged: true
+  capabilities:
+    add:
+      - SYS_CAP_PTRACE
+  #   drop:
+  #   - ALL
+  # readOnlyRootFilesystem: true
+  # runAsNonRoot: true
+  # runAsUser: 1000
+
+service:
+  type: ClusterIP
+  port: 80
 
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious

charts/physims/charts/nr-dlschsim/templates/NOTES.txt

@@ -0,0 +1,15 @@
+1. Get the application URL by running these commands:
+{{- if contains "NodePort" .Values.service.type }}
+  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "oai-nr-dlschsim.fullname" . }})
+  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
+  echo http://$NODE_IP:$NODE_PORT
+{{- else if contains "LoadBalancer" .Values.service.type }}
+     NOTE: It may take a few minutes for the LoadBalancer IP to be available.
+           You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "oai-nr-dlschsim.fullname" . }}'
+  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "oai-nr-dlschsim.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
+  echo http://$SERVICE_IP:{{ .Values.service.port }}
+{{- else if contains "ClusterIP" .Values.service.type }}
+  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "oai-nr-dlschsim.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+  echo "Visit http://127.0.0.1:8080 to use your application"
+  kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:80
+{{- end }}

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

@@ -0,0 +1,49 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ .Chart.Name }}
+  labels:
+    {{- include "oai-nr-dlschsim.labels" . | nindent 4 }}
+spec:
+  replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      {{- include "oai-nr-dlschsim.selectorLabels" . | nindent 6 }}
+  strategy:
+    type: Recreate
+  template:
+    metadata:
+      labels:
+        {{- include "oai-nr-dlschsim.selectorLabels" . | nindent 8 }}
+    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 }}
+        securityContext:
+          {{- toYaml .Values.securityContext | nindent 12 }}
+        ports:
+        - containerPort: 80
+          name: oai-nr-dlschsim
+        # volumeMounts:
+        # - mountPath: /opt/oai-nr-dlschsim/certs
+        #   name: certs
+        command: ["/bin/sh", "-c"]
+        args:
+        - >  
+          export OPENAIR_DIR=/opt/oai-physim &&
+          cd cmake_targets/autotests &&
+          ./run_exec_autotests.bash -g "015106" -q -np -b &&
+          echo "FINISHED" &&
+          sleep infinity
+      dnsPolicy: ClusterFirst
+      restartPolicy: Always
+      schedulerName: default-scheduler
+      serviceAccountName: {{ .Values.global.serviceAccountName }}
+      terminationGracePeriodSeconds: 30

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

@@ -0,0 +1,20 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Chart.Name }}
+  labels:
+    {{- include "oai-nr-dlschsim.labels" . | nindent 4 }}
+spec:
+  type: {{ .Values.service.type }}
+{{- if  contains "ClusterIP" .Values.service.type }}
+  clusterIP: None
+{{- end }}
+  ports:
+    - name: oai-nr-dlschsim
+      # Port accessible outside cluster
+      port: {{ .Values.service.port }}
+      # Port to forward to inside the pod
+      targetPort: {{ .Values.service.Port }}
+      protocol: TCP
+  selector:
+    {{- include "oai-nr-dlschsim.selectorLabels" . | nindent 4 }}

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

@@ -4,7 +4,12 @@
 
 replicaCount: 1
 
+namespace: "OAICICD_PROJECT"
+
 image:
+  registry: local
+  repository: image-registry.openshift-image-registry.svc:5000/OAICICD_PROJECT/oai-physim
+  version: temp
   # pullPolicy: IfNotPresent or Never or Always
   pullPolicy: Always
 
@@ -27,7 +32,19 @@ podSecurityContext:
   runAsGroup: 0
 
 securityContext:
-  privileged: false
+  privileged: true
+  capabilities:
+    add:
+      - SYS_CAP_PTRACE
+  #   drop:
+  #   - ALL
+  # readOnlyRootFilesystem: true
+  # runAsNonRoot: true
+  # runAsUser: 1000
+
+service:
+  type: ClusterIP
+  port: 80
 
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious

charts/physims/charts/nr-dlsim.basic/templates/_helpers.tpl

@@ -1,63 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "oai-nr-dlsim-basic.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-dlsim-basic.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-dlsim-basic.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Common labels
-*/}}
-{{- define "oai-nr-dlsim-basic.labels" -}}
-helm.sh/chart: {{ include "oai-nr-dlsim-basic.chart" . }}
-{{ include "oai-nr-dlsim-basic.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-dlsim-basic.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "oai-nr-dlsim-basic.name" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end -}}
-
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "oai-nr-dlsim-basic.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create -}}
-    {{ default (include "oai-nr-dlsim-basic.fullname" .) .Values.serviceAccount.name }}
-{{- else -}}
-    {{ default "default" .Values.serviceAccount.name }}
-{{- end -}}
-{{- end -}}

charts/physims/charts/nr-dlsim.dmrs+ptrs/Chart.yaml

@@ -1,36 +0,0 @@
-apiVersion: v1
-name: oai-nr-dlsim-dmrs-ptrs
-description: A Helm subchart for nr-dlsim network function ("dmrs+ptrs" 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-dlsim
-  - RAN
-  - 5G
-
-sources:
-  - https://gitlab.eurecom.fr/oai/openairinterface5g
-
-maintainers:
-  - name:  OPENAIRINTERFACE
-    email: contact@openairinterface.org

charts/physims/charts/nr-dlsim.dmrs+ptrs/templates/_helpers.tpl

@@ -1,63 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "oai-nr-dlsim-dmrs-ptrs.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-dlsim-dmrs-ptrs.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-dlsim-dmrs-ptrs.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Common labels
-*/}}
-{{- define "oai-nr-dlsim-dmrs-ptrs.labels" -}}
-helm.sh/chart: {{ include "oai-nr-dlsim-dmrs-ptrs.chart" . }}
-{{ include "oai-nr-dlsim-dmrs-ptrs.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-dlsim-dmrs-ptrs.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "oai-nr-dlsim-dmrs-ptrs.name" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end -}}
-
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "oai-nr-dlsim-dmrs-ptrs.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create -}}
-    {{ default (include "oai-nr-dlsim-dmrs-ptrs.fullname" .) .Values.serviceAccount.name }}
-{{- else -}}
-    {{ default "default" .Values.serviceAccount.name }}
-{{- end -}}
-{{- end -}}

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

@@ -1,42 +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 }}
-        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_dlsim.dmrs+ptrs" -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.nrdlsimdmrsptrs}}
-      nodeName: {{ .Values.global.nodeName.nrdlsimdmrsptrs }}
-      {{- end }}

charts/physims/charts/nr-dlsim.mcs+mimo/Chart.yaml

@@ -1,36 +0,0 @@
-apiVersion: v1
-name: oai-nr-dlsim-mcs-mimo
-description: A Helm subchart for nr-dlsim network function ("mcs+mimo" 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-dlsim
-  - RAN
-  - 5G
-
-sources:
-  - https://gitlab.eurecom.fr/oai/openairinterface5g
-
-maintainers:
-  - name:  OPENAIRINTERFACE
-    email: contact@openairinterface.org

charts/physims/charts/nr-dlsim.mcs+mimo/templates/_helpers.tpl

@@ -1,63 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "oai-nr-dlsim-mcs-mimo.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-dlsim-mcs-mimo.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-dlsim-mcs-mimo.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Common labels
-*/}}
-{{- define "oai-nr-dlsim-mcs-mimo.labels" -}}
-helm.sh/chart: {{ include "oai-nr-dlsim-mcs-mimo.chart" . }}
-{{ include "oai-nr-dlsim-mcs-mimo.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-dlsim-mcs-mimo.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "oai-nr-dlsim-mcs-mimo.name" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end -}}
-
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "oai-nr-dlsim-mcs-mimo.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create -}}
-    {{ default (include "oai-nr-dlsim-mcs-mimo.fullname" .) .Values.serviceAccount.name }}
-{{- else -}}
-    {{ default "default" .Values.serviceAccount.name }}
-{{- end -}}
-{{- end -}}

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

@@ -1,42 +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 }}
-        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_dlsim.mcs+mimo" -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.nrdlsimmcsmimo}}
-      nodeName: {{ .Values.global.nodeName.nrdlsimmcsmimo }}
-      {{- end }}

charts/physims/charts/nr-dlsim.offset/Chart.yaml

@@ -1,36 +0,0 @@
-apiVersion: v1
-name: oai-nr-dlsim-offset
-description: A Helm subchart for nr-dlsim network function ("offset" 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-dlsim
-  - RAN
-  - 5G
-
-sources:
-  - https://gitlab.eurecom.fr/oai/openairinterface5g
-
-maintainers:
-  - name:  OPENAIRINTERFACE
-    email: contact@openairinterface.org

charts/physims/charts/nr-dlsim.offset/templates/_helpers.tpl

@@ -1,63 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "oai-nr-dlsim-offset.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-dlsim-offset.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-dlsim-offset.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Common labels
-*/}}
-{{- define "oai-nr-dlsim-offset.labels" -}}
-helm.sh/chart: {{ include "oai-nr-dlsim-offset.chart" . }}
-{{ include "oai-nr-dlsim-offset.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-dlsim-offset.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "oai-nr-dlsim-offset.name" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end -}}
-
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "oai-nr-dlsim-offset.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create -}}
-    {{ default (include "oai-nr-dlsim-offset.fullname" .) .Values.serviceAccount.name }}
-{{- else -}}
-    {{ default "default" .Values.serviceAccount.name }}
-{{- end -}}
-{{- end -}}

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

@@ -1,42 +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 }}
-        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_dlsim.offset" -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.nrdlsimoffset}}
-      nodeName: {{ .Values.global.nodeName.nrdlsimoffset }}
-      {{- end }}

charts/physims/charts/nr-dlsim.offset/values.yaml

@@ -1,48 +0,0 @@
-# Default values for oai-nr-dlsim-offset
-# 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-dlsim-offset"
-
-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-dlsim/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
-name: oai-nr-dlsim-basic
-description: A Helm subchart for nr-dlsim network function ("basic" tests)
+name: oai-nr-dlsim
+description: A Helm subchart for nr-dlsim network function
 
 # A chart can be either an 'application' or a 'library' chart.
 #

charts/physims/charts/nr-dlsim/templates/NOTES.txt

@@ -0,0 +1,15 @@
+1. Get the application URL by running these commands:
+{{- if contains "NodePort" .Values.service.type }}
+  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "oai-nr-dlsim.fullname" . }})
+  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
+  echo http://$NODE_IP:$NODE_PORT
+{{- else if contains "LoadBalancer" .Values.service.type }}
+     NOTE: It may take a few minutes for the LoadBalancer IP to be available.
+           You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "oai-nr-dlsim.fullname" . }}'
+  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "oai-nr-dlsim.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
+  echo http://$SERVICE_IP:{{ .Values.service.port }}
+{{- else if contains "ClusterIP" .Values.service.type }}
+  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "oai-nr-dlsim.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+  echo "Visit http://127.0.0.1:8080 to use your application"
+  kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:80
+{{- end }}

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

@@ -2,7 +2,7 @@
 {{/*
 Expand the name of the chart.
 */}}
-{{- define "oai-nr-ulsim-3gpp.name" -}}
+{{- define "oai-nr-dlsim.name" -}}
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
@@ -11,7 +11,7 @@ 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-ulsim-3gpp.fullname" -}}
+{{- define "oai-nr-dlsim.fullname" -}}
 {{- if .Values.fullnameOverride -}}
 {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
 {{- else -}}
@@ -27,16 +27,16 @@ If release name contains chart name it will be used as a full name.
 {{/*
 Create chart name and version as used by the chart label.
 */}}
-{{- define "oai-nr-ulsim-3gpp.chart" -}}
+{{- define "oai-nr-dlsim.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
 {{/*
 Common labels
 */}}
-{{- define "oai-nr-ulsim-3gpp.labels" -}}
-helm.sh/chart: {{ include "oai-nr-ulsim-3gpp.chart" . }}
-{{ include "oai-nr-ulsim-3gpp.selectorLabels" . }}
+{{- define "oai-nr-dlsim.labels" -}}
+helm.sh/chart: {{ include "oai-nr-dlsim.chart" . }}
+{{ include "oai-nr-dlsim.selectorLabels" . }}
 {{- if .Chart.AppVersion }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
@@ -46,17 +46,17 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{/*
 Selector labels
 */}}
-{{- define "oai-nr-ulsim-3gpp.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "oai-nr-ulsim-3gpp.name" . }}
+{{- define "oai-nr-dlsim.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "oai-nr-dlsim.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}
 
 {{/*
 Create the name of the service account to use
 */}}
-{{- define "oai-nr-ulsim-3gpp.serviceAccountName" -}}
+{{- define "oai-nr-dlsim.serviceAccountName" -}}
 {{- if .Values.serviceAccount.create -}}
-    {{ default (include "oai-nr-ulsim.fullname" .) .Values.serviceAccount.name }}
+    {{ default (include "oai-nr-dlsim.fullname" .) .Values.serviceAccount.name }}
 {{- else -}}
     {{ default "default" .Values.serviceAccount.name }}
 {{- end -}}

charts/physims/charts/nr-dlsim/templates/deployment.yaml

@@ -1,12 +1,20 @@
-apiVersion: batch/v1
-kind: Job
+apiVersion: apps/v1
+kind: Deployment
 metadata:
   name: {{ .Chart.Name }}
+  labels:
+    {{- include "oai-nr-dlsim.labels" . | nindent 4 }}
 spec:
+  replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      {{- include "oai-nr-dlsim.selectorLabels" . | nindent 6 }}
+  strategy:
+    type: Recreate
   template:
     metadata:
       labels:
-        app: physim
+        {{- include "oai-nr-dlsim.selectorLabels" . | nindent 8 }}
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
@@ -20,23 +28,22 @@ spec:
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
-        env:
-        - name: OPENAIR_DIR
-          value: /opt/oai-physim
+        ports:
+        - containerPort: 80
+          name: oai-nr-dlsim
+        # volumeMounts:
+        # - mountPath: /opt/oai-nr-dlsim/certs
+        #   name: certs
         command: ["/bin/sh", "-c"]
         args:
-        - >
-          cmake_targets/autotests/run_exec_autotests.bash -g "nr_dlschsim" -d bin/ &&
-          echo "FINISHED" && sleep infinity
+        - >  
+          export OPENAIR_DIR=/opt/oai-physim &&
+          cd cmake_targets/autotests &&
+          ./run_exec_autotests.bash -g "015105" -q -np -b &&
+          echo "FINISHED" &&
+          sleep infinity
       dnsPolicy: ClusterFirst
-      restartPolicy: Never
+      restartPolicy: Always
       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.nrdlschsim}}
-      nodeName: {{ .Values.global.nodeName.nrdlschsim }}
-      {{- end }}

charts/physims/charts/nr-dlsim/templates/service.yaml

@@ -0,0 +1,20 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Chart.Name }}
+  labels:
+    {{- include "oai-nr-dlsim.labels" . | nindent 4 }}
+spec:
+  type: {{ .Values.service.type }}
+{{- if  contains "ClusterIP" .Values.service.type }}
+  clusterIP: None
+{{- end }}
+  ports:
+    - name: oai-nr-dlsim
+      # Port accessible outside cluster
+      port: {{ .Values.service.port }}
+      # Port to forward to inside the pod
+      targetPort: {{ .Values.service.Port }}
+      protocol: TCP
+  selector:
+    {{- include "oai-nr-dlsim.selectorLabels" . | nindent 4 }}

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

@@ -1,10 +1,15 @@
-# Default values for oai-nr-dlsim-basic
+# Default values for oai-nr-dlsim.
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
 replicaCount: 1
 
+namespace: "OAICICD_PROJECT"
+
 image:
+  registry: local
+  repository: image-registry.openshift-image-registry.svc:5000/OAICICD_PROJECT/oai-physim
+  version: temp
   # pullPolicy: IfNotPresent or Never or Always
   pullPolicy: Always
 
@@ -20,14 +25,26 @@ serviceAccount:
   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-dlsim-basic"
+  name: "oai-nr-dlsim-sa"
 
 podSecurityContext:
   runAsUser: 0
   runAsGroup: 0
 
 securityContext:
-  privileged: false
+  privileged: true
+  capabilities:
+    add:
+      - SYS_CAP_PTRACE
+  #   drop:
+  #   - ALL
+  # readOnlyRootFilesystem: true
+  # runAsNonRoot: true
+  # runAsUser: 1000
+
+service:
+  type: ClusterIP
+  port: 80
 
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious

charts/physims/charts/nr-pbchsim.106rb/Chart.yaml

@@ -1,36 +0,0 @@
-apiVersion: v1
-name: oai-nr-pbchsim-106rb
-description: A Helm subchart for nr-pbchsim network function ("106rb" 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.106rb/templates/_helpers.tpl

@@ -1,63 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "oai-nr-pbchsim-106rb.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-106rb.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-106rb.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Common labels
-*/}}
-{{- define "oai-nr-pbchsim-106rb.labels" -}}
-helm.sh/chart: {{ include "oai-nr-pbchsim-106rb.chart" . }}
-{{ include "oai-nr-pbchsim-106rb.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-106rb.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "oai-nr-pbchsim-106rb.name" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end -}}
-
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "oai-nr-pbchsim-106rb.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create -}}
-    {{ default (include "oai-nr-pbchsim-106rb.fullname" .) .Values.serviceAccount.name }}
-{{- else -}}
-    {{ default "default" .Values.serviceAccount.name }}
-{{- end -}}
-{{- end -}}

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

@@ -1,42 +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 }}
-        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.106rb" -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.nrpbschsim106rb}}
-      nodeName: {{ .Values.global.nodeName.nrpbschsim106rb }}
-      {{- end }}

charts/physims/charts/nr-pbchsim.106rb/values.yaml

@@ -1,48 +0,0 @@
-# Default values for oai-nr-pbchsim-106rb
-# 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-106rb"
-
-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-pbchsim.217rb/Chart.yaml

@@ -1,36 +0,0 @@
-apiVersion: v1
-name: oai-nr-pbchsim-217rb
-description: A Helm subchart for nr-pbchsim network function ("217rb" 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.217rb/templates/_helpers.tpl

@@ -1,63 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "oai-nr-pbchsim-217rb.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-217rb.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-217rb.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Common labels
-*/}}
-{{- define "oai-nr-pbchsim-217rb.labels" -}}
-helm.sh/chart: {{ include "oai-nr-pbchsim-217rb.chart" . }}
-{{ include "oai-nr-pbchsim-217rb.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-217rb.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "oai-nr-pbchsim-217rb.name" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end -}}
-
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "oai-nr-pbchsim-217rb.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create -}}
-    {{ default (include "oai-nr-pbchsim-217rb.fullname" .) .Values.serviceAccount.name }}
-{{- else -}}
-    {{ default "default" .Values.serviceAccount.name }}
-{{- end -}}
-{{- end -}}

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

@@ -1,42 +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 }}
-        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.217rb" -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.nrpbchsim217rb}}
-      nodeName: {{ .Values.global.nodeName.nrpbchsim217rb }}
-      {{- end }}

charts/physims/charts/nr-pbchsim.217rb/values.yaml

@@ -1,48 +0,0 @@
-# Default values for oai-nr-pbchsim-217rb
-# 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-217rb"
-
-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-pbchsim.273rb/templates/_helpers.tpl

@@ -1,63 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "oai-nr-pbchsim-273rb.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-273rb.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-273rb.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Common labels
-*/}}
-{{- define "oai-nr-pbchsim-273rb.labels" -}}
-helm.sh/chart: {{ include "oai-nr-pbchsim-273rb.chart" . }}
-{{ include "oai-nr-pbchsim-273rb.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-273rb.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "oai-nr-pbchsim-273rb.name" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end -}}
-
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "oai-nr-pbchsim-273rb.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create -}}
-    {{ default (include "oai-nr-pbchsim-273rb.fullname" .) .Values.serviceAccount.name }}
-{{- else -}}
-    {{ default "default" .Values.serviceAccount.name }}
-{{- end -}}
-{{- end -}}

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

@@ -1,42 +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 }}
-        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.273rb" -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.nrpbchsim273rb}}
-      nodeName: {{ .Values.global.nodeName.nrpbchsim273rb }}
-      {{- end }}

charts/physims/charts/nr-pbchsim.273rb/values.yaml

@@ -1,48 +0,0 @@
-# Default values for oai-nr-pbchsim-273rb
-# 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-273rb"
-
-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-pbchsim/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
-name: oai-nr-pbchsim-273rb
-description: A Helm subchart for nr-pbchsim network function ("273rb" tests)
+name: oai-nr-pbchsim
+description: A Helm subchart for nr-pbchsim network function
 
 # A chart can be either an 'application' or a 'library' chart.
 #

charts/physims/charts/nr-pbchsim/templates/NOTES.txt

@@ -0,0 +1,15 @@
+1. Get the application URL by running these commands:
+{{- if contains "NodePort" .Values.service.type }}
+  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "oai-nr-pbchsim.fullname" . }})
+  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
+  echo http://$NODE_IP:$NODE_PORT
+{{- else if contains "LoadBalancer" .Values.service.type }}
+     NOTE: It may take a few minutes for the LoadBalancer IP to be available.
+           You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "oai-nr-pbchsim.fullname" . }}'
+  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "oai-nr-pbchsim.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
+  echo http://$SERVICE_IP:{{ .Values.service.port }}
+{{- else if contains "ClusterIP" .Values.service.type }}
+  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "oai-nr-pbchsim.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+  echo "Visit http://127.0.0.1:8080 to use your application"
+  kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:80
+{{- end }}

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

@@ -2,7 +2,7 @@
 {{/*
 Expand the name of the chart.
 */}}
-{{- define "oai-nr-ulsim-mimo.name" -}}
+{{- define "oai-nr-pbchsim.name" -}}
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
@@ -11,7 +11,7 @@ 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-ulsim-mimo.fullname" -}}
+{{- define "oai-nr-pbchsim.fullname" -}}
 {{- if .Values.fullnameOverride -}}
 {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
 {{- else -}}
@@ -27,16 +27,16 @@ If release name contains chart name it will be used as a full name.
 {{/*
 Create chart name and version as used by the chart label.
 */}}
-{{- define "oai-nr-ulsim-mimo.chart" -}}
+{{- define "oai-nr-pbchsim.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
 {{/*
 Common labels
 */}}
-{{- define "oai-nr-ulsim-mimo.labels" -}}
-helm.sh/chart: {{ include "oai-nr-ulsim-mimo.chart" . }}
-{{ include "oai-nr-ulsim-mimo.selectorLabels" . }}
+{{- define "oai-nr-pbchsim.labels" -}}
+helm.sh/chart: {{ include "oai-nr-pbchsim.chart" . }}
+{{ include "oai-nr-pbchsim.selectorLabels" . }}
 {{- if .Chart.AppVersion }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
@@ -46,17 +46,17 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{/*
 Selector labels
 */}}
-{{- define "oai-nr-ulsim-mimo.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "oai-nr-ulsim-mimo.name" . }}
+{{- define "oai-nr-pbchsim.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "oai-nr-pbchsim.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}
 
 {{/*
 Create the name of the service account to use
 */}}
-{{- define "oai-nr-ulsim-mimo.serviceAccountName" -}}
+{{- define "oai-nr-pbchsim.serviceAccountName" -}}
 {{- if .Values.serviceAccount.create -}}
-    {{ default (include "oai-nr-ulsim.fullname" .) .Values.serviceAccount.name }}
+    {{ default (include "oai-nr-pbchsim.fullname" .) .Values.serviceAccount.name }}
 {{- else -}}
     {{ default "default" .Values.serviceAccount.name }}
 {{- end -}}

charts/physims/charts/nr-pbchsim/templates/deployment.yaml

@@ -0,0 +1,49 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ .Chart.Name }}
+  labels:
+    {{- include "oai-nr-pbchsim.labels" . | nindent 4 }}
+spec:
+  replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      {{- include "oai-nr-pbchsim.selectorLabels" . | nindent 6 }}
+  strategy:
+    type: Recreate
+  template:
+    metadata:
+      labels:
+        {{- include "oai-nr-pbchsim.selectorLabels" . | nindent 8 }}
+    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 }}
+        securityContext:
+          {{- toYaml .Values.securityContext | nindent 12 }}
+        ports:
+        - containerPort: 80
+          name: oai-nr-pbchsim
+        # volumeMounts:
+        # - mountPath: /opt/oai-nr-pbchsim/certs
+        #   name: certs
+        command: ["/bin/sh", "-c"]
+        args:
+        - >  
+          export OPENAIR_DIR=/opt/oai-physim &&
+          cd cmake_targets/autotests &&
+          ./run_exec_autotests.bash -g "015104" -q -np -b &&
+          echo "FINISHED" &&
+          sleep infinity
+      dnsPolicy: ClusterFirst
+      restartPolicy: Always
+      schedulerName: default-scheduler
+      serviceAccountName: {{ .Values.global.serviceAccountName }}
+      terminationGracePeriodSeconds: 30

charts/physims/charts/nr-pbchsim/templates/service.yaml

@@ -0,0 +1,20 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Chart.Name }}
+  labels:
+    {{- include "oai-nr-pbchsim.labels" . | nindent 4 }}
+spec:
+  type: {{ .Values.service.type }}
+{{- if  contains "ClusterIP" .Values.service.type }}
+  clusterIP: None
+{{- end }}
+  ports:
+    - name: oai-nr-pbchsim
+      # Port accessible outside cluster
+      port: {{ .Values.service.port }}
+      # Port to forward to inside the pod
+      targetPort: {{ .Values.service.Port }}
+      protocol: TCP
+  selector:
+    {{- include "oai-nr-pbchsim.selectorLabels" . | nindent 4 }}

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

@@ -1,10 +1,15 @@
-# Default values for oai-nr-dlsim-mcs-mimo
+# Default values for oai-nr-pbchsim.
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
 replicaCount: 1
 
+namespace: "OAICICD_PROJECT"
+
 image:
+  registry: local
+  repository: image-registry.openshift-image-registry.svc:5000/OAICICD_PROJECT/oai-physim
+  version: temp
   # pullPolicy: IfNotPresent or Never or Always
   pullPolicy: Always
 
@@ -20,14 +25,26 @@ serviceAccount:
   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-dlsim-mcs-mimo"
+  name: "oai-nr-pbchsim-sa"
 
 podSecurityContext:
   runAsUser: 0
   runAsGroup: 0
 
 securityContext:
-  privileged: false
+  privileged: true
+  capabilities:
+    add:
+      - SYS_CAP_PTRACE
+  #   drop:
+  #   - ALL
+  # readOnlyRootFilesystem: true
+  # runAsNonRoot: true
+  # runAsUser: 1000
+
+service:
+  type: ClusterIP
+  port: 80
 
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious

charts/physims/charts/nr-prachsim/templates/NOTES.txt

@@ -0,0 +1,15 @@
+1. Get the application URL by running these commands:
+{{- if contains "NodePort" .Values.service.type }}
+  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "oai-nr-prachsim.fullname" . }})
+  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
+  echo http://$NODE_IP:$NODE_PORT
+{{- else if contains "LoadBalancer" .Values.service.type }}
+     NOTE: It may take a few minutes for the LoadBalancer IP to be available.
+           You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "oai-nr-prachsim.fullname" . }}'
+  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "oai-nr-prachsim.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
+  echo http://$SERVICE_IP:{{ .Values.service.port }}
+{{- else if contains "ClusterIP" .Values.service.type }}
+  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "oai-nr-prachsim.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+  echo "Visit http://127.0.0.1:8080 to use your application"
+  kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:80
+{{- end }}

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

@@ -0,0 +1,49 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ .Chart.Name }}
+  labels:
+    {{- include "oai-nr-prachsim.labels" . | nindent 4 }}
+spec:
+  replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      {{- include "oai-nr-prachsim.selectorLabels" . | nindent 6 }}
+  strategy:
+    type: Recreate
+  template:
+    metadata:
+      labels:
+        {{- include "oai-nr-prachsim.selectorLabels" . | nindent 8 }}
+    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 }}
+        securityContext:
+          {{- toYaml .Values.securityContext | nindent 12 }}
+        ports:
+        - containerPort: 80
+          name: oai-nr-prachsim
+        # volumeMounts:
+        # - mountPath: /opt/oai-nr-prachsim/certs
+        #   name: certs
+        command: ["/bin/sh", "-c"]
+        args:
+        - >  
+          export OPENAIR_DIR=/opt/oai-physim &&
+          cd cmake_targets/autotests &&
+          ./run_exec_autotests.bash -g "015112" -q -np -b &&
+          echo "FINISHED" &&
+          sleep infinity
+      dnsPolicy: ClusterFirst
+      restartPolicy: Always
+      schedulerName: default-scheduler
+      serviceAccountName: {{ .Values.global.serviceAccountName }}
+      terminationGracePeriodSeconds: 30

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

@@ -1,42 +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 }}
-        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_prachsim" -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.nrprachsim}}
-      nodeName: {{ .Values.global.nodeName.nrprachsim }}
-      {{- end }}

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

@@ -0,0 +1,20 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Chart.Name }}
+  labels:
+    {{- include "oai-nr-prachsim.labels" . | nindent 4 }}
+spec:
+  type: {{ .Values.service.type }}
+{{- if  contains "ClusterIP" .Values.service.type }}
+  clusterIP: None
+{{- end }}
+  ports:
+    - name: oai-nr-prachsim
+      # Port accessible outside cluster
+      port: {{ .Values.service.port }}
+      # Port to forward to inside the pod
+      targetPort: {{ .Values.service.Port }}
+      protocol: TCP
+  selector:
+    {{- include "oai-nr-prachsim.selectorLabels" . | nindent 4 }}

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

@@ -4,7 +4,12 @@
 
 replicaCount: 1
 
+namespace: "OAICICD_PROJECT"
+
 image:
+  registry: local
+  repository: image-registry.openshift-image-registry.svc:5000/OAICICD_PROJECT/oai-physim
+  version: temp
   # pullPolicy: IfNotPresent or Never or Always
   pullPolicy: Always
 
@@ -27,7 +32,19 @@ podSecurityContext:
   runAsGroup: 0
 
 securityContext:
-  privileged: false
+  privileged: true
+  capabilities:
+    add:
+      - SYS_CAP_PTRACE
+  #   drop:
+  #   - ALL
+  # readOnlyRootFilesystem: true
+  # runAsNonRoot: true
+  # runAsUser: 1000
+
+service:
+  type: ClusterIP
+  port: 80
 
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious

charts/physims/charts/nr-pucchsim/templates/NOTES.txt

@@ -0,0 +1,15 @@
+1. Get the application URL by running these commands:
+{{- if contains "NodePort" .Values.service.type }}
+  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "oai-nr-pucchsim.fullname" . }})
+  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
+  echo http://$NODE_IP:$NODE_PORT
+{{- else if contains "LoadBalancer" .Values.service.type }}
+     NOTE: It may take a few minutes for the LoadBalancer IP to be available.
+           You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "oai-nr-pucchsim.fullname" . }}'
+  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "oai-nr-pucchsim.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
+  echo http://$SERVICE_IP:{{ .Values.service.port }}
+{{- else if contains "ClusterIP" .Values.service.type }}
+  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "oai-nr-pucchsim.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+  echo "Visit http://127.0.0.1:8080 to use your application"
+  kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:80
+{{- end }}

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

@@ -0,0 +1,49 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ .Chart.Name }}
+  labels:
+    {{- include "oai-nr-pucchsim.labels" . | nindent 4 }}
+spec:
+  replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      {{- include "oai-nr-pucchsim.selectorLabels" . | nindent 6 }}
+  strategy:
+    type: Recreate
+  template:
+    metadata:
+      labels:
+        {{- include "oai-nr-pucchsim.selectorLabels" . | nindent 8 }}
+    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 }}
+        securityContext:
+          {{- toYaml .Values.securityContext | nindent 12 }}
+        ports:
+        - containerPort: 80
+          name: oai-nr-pucchsim
+        # volumeMounts:
+        # - mountPath: /opt/oai-nr-pucchsim/certs
+        #   name: certs
+        command: ["/bin/sh", "-c"]
+        args:
+        - >  
+          export OPENAIR_DIR=/opt/oai-physim &&
+          cd cmake_targets/autotests &&
+          ./run_exec_autotests.bash -g "015109" -q -np -b &&
+          echo "FINISHED" &&
+          sleep infinity
+      dnsPolicy: ClusterFirst
+      restartPolicy: Always
+      schedulerName: default-scheduler
+      serviceAccountName: {{ .Values.global.serviceAccountName }}
+      terminationGracePeriodSeconds: 30

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

@@ -1,42 +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 }}
-        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_pucchsim" -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.nrpucchsim}}
-      nodeName: {{ .Values.global.nodeName.nrpucchsim }}
-      {{- end }}

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

@@ -0,0 +1,20 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Chart.Name }}
+  labels:
+    {{- include "oai-nr-pucchsim.labels" . | nindent 4 }}
+spec:
+  type: {{ .Values.service.type }}
+{{- if  contains "ClusterIP" .Values.service.type }}
+  clusterIP: None
+{{- end }}
+  ports:
+    - name: oai-nr-pucchsim
+      # Port accessible outside cluster
+      port: {{ .Values.service.port }}
+      # Port to forward to inside the pod
+      targetPort: {{ .Values.service.Port }}
+      protocol: TCP
+  selector:
+    {{- include "oai-nr-pucchsim.selectorLabels" . | nindent 4 }}

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

@@ -4,7 +4,12 @@
 
 replicaCount: 1
 
+namespace: "OAICICD_PROJECT"
+
 image:
+  registry: local
+  repository: image-registry.openshift-image-registry.svc:5000/OAICICD_PROJECT/oai-physim
+  version: temp
   # pullPolicy: IfNotPresent or Never or Always
   pullPolicy: Always
 
@@ -27,7 +32,15 @@ podSecurityContext:
   runAsGroup: 0
 
 securityContext:
-  privileged: false
+  privileged: true
+  capabilities:
+    add:
+      - SYS_CAP_PTRACE
+  #   drop:
+  #   - ALL
+  # readOnlyRootFilesystem: true
+  # runAsNonRoot: true
+  # runAsUser: 1000
 
 service:
   type: ClusterIP

charts/physims/charts/nr-ulschsim/templates/NOTES.txt

@@ -0,0 +1,15 @@
+1. Get the application URL by running these commands:
+{{- if contains "NodePort" .Values.service.type }}
+  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "oai-nr-ulschsim.fullname" . }})
+  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
+  echo http://$NODE_IP:$NODE_PORT
+{{- else if contains "LoadBalancer" .Values.service.type }}
+     NOTE: It may take a few minutes for the LoadBalancer IP to be available.
+           You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "oai-nr-ulschsim.fullname" . }}'
+  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "oai-nr-ulschsim.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
+  echo http://$SERVICE_IP:{{ .Values.service.port }}
+{{- else if contains "ClusterIP" .Values.service.type }}
+  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "oai-nr-ulschsim.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+  echo "Visit http://127.0.0.1:8080 to use your application"
+  kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:80
+{{- end }}

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

@@ -0,0 +1,49 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ .Chart.Name }}
+  labels:
+    {{- include "oai-nr-ulschsim.labels" . | nindent 4 }}
+spec:
+  replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      {{- include "oai-nr-ulschsim.selectorLabels" . | nindent 6 }}
+  strategy:
+    type: Recreate
+  template:
+    metadata:
+      labels:
+        {{- include "oai-nr-ulschsim.selectorLabels" . | nindent 8 }}
+    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 }}
+        securityContext:
+          {{- toYaml .Values.securityContext | nindent 12 }}
+        ports:
+        - containerPort: 80
+          name: oai-nr-ulschsim
+        # volumeMounts:
+        # - mountPath: /opt/oai-nr-ulschsim/certs
+        #   name: certs
+        command: ["/bin/sh", "-c"]
+        args:
+        - >  
+          export OPENAIR_DIR=/opt/oai-physim &&
+          cd cmake_targets/autotests &&
+          ./run_exec_autotests.bash -g "015108" -q -np -b &&
+          echo "FINISHED" &&
+          sleep infinity
+      dnsPolicy: ClusterFirst
+      restartPolicy: Always
+      schedulerName: default-scheduler
+      serviceAccountName: {{ .Values.global.serviceAccountName }}
+      terminationGracePeriodSeconds: 30

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

@@ -1,42 +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 }}
-        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_ulschsim" -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.nrulschsim}}
-      nodeName: {{ .Values.global.nodeName.nrulschsim }}
-      {{- end }}

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

@@ -0,0 +1,20 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Chart.Name }}
+  labels:
+    {{- include "oai-nr-ulschsim.labels" . | nindent 4 }}
+spec:
+  type: {{ .Values.service.type }}
+{{- if  contains "ClusterIP" .Values.service.type }}
+  clusterIP: None
+{{- end }}
+  ports:
+    - name: oai-nr-ulschsim
+      # Port accessible outside cluster
+      port: {{ .Values.service.port }}
+      # Port to forward to inside the pod
+      targetPort: {{ .Values.service.Port }}
+      protocol: TCP
+  selector:
+    {{- include "oai-nr-ulschsim.selectorLabels" . | nindent 4 }}

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

@@ -4,7 +4,12 @@
 
 replicaCount: 1
 
+namespace: "OAICICD_PROJECT"
+
 image:
+  registry: local
+  repository: image-registry.openshift-image-registry.svc:5000/OAICICD_PROJECT/oai-physim
+  version: temp
   # pullPolicy: IfNotPresent or Never or Always
   pullPolicy: Always
 
@@ -27,7 +32,19 @@ podSecurityContext:
   runAsGroup: 0
 
 securityContext:
-  privileged: false
+  privileged: true
+  capabilities:
+    add:
+      - SYS_CAP_PTRACE
+  #   drop:
+  #   - ALL
+  # readOnlyRootFilesystem: true
+  # runAsNonRoot: true
+  # runAsUser: 1000
+
+service:
+  type: ClusterIP
+  port: 80
 
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious

charts/physims/charts/nr-ulsim.3gpp/Chart.yaml

@@ -1,36 +0,0 @@
-apiVersion: v1
-name: oai-nr-ulsim-3gpp
-description: A Helm subchart for nr-ulsim network function ("3gpp" 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-ulsim
-  - RAN
-  - 5G
-
-sources:
-  - https://gitlab.eurecom.fr/oai/openairinterface5g
-
-maintainers:
-  - name:  OPENAIRINTERFACE
-    email: contact@openairinterface.org

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

@@ -1,42 +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 }}
-        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_ulsim.3gpp" -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.nrulsim3gpp}}
-      nodeName: {{ .Values.global.nodeName.nrulsim3gpp }}
-      {{- end }}

charts/physims/charts/nr-ulsim.3gpp/values.yaml

@@ -1,48 +0,0 @@
-# Default values for oai-nr-ulsim-3gpp
-# 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-ulsim-3gpp"
-
-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-ulsim.mimo/Chart.yaml

@@ -1,36 +0,0 @@
-apiVersion: v1
-name: oai-nr-ulsim-mimo
-description: A Helm subchart for nr-ulsim network function ("mimo" 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-ulsim
-  - RAN
-  - 5G
-
-sources:
-  - https://gitlab.eurecom.fr/oai/openairinterface5g
-
-maintainers:
-  - name:  OPENAIRINTERFACE
-    email: contact@openairinterface.org

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

@@ -1,42 +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 }}
-        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_ulsim.mimo" -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.nrulsimmimo}}
-      nodeName: {{ .Values.global.nodeName.nrulsimmimo }}
-      {{- end }}

charts/physims/charts/nr-ulsim.mimo/values.yaml

@@ -1,48 +0,0 @@
-# Default values for oai-nr-ulsim-mimo
-# 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-ulsim-mimo"
-
-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-ulsim.misc/templates/job.yaml

@@ -1,42 +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 }}
-        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_ulsim.misc" -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.nrulsimmisc}}
-      nodeName: {{ .Values.global.nodeName.nrulsimmisc }}
-      {{- end }}

charts/physims/charts/nr-ulsim.misc/values.yaml

@@ -1,48 +0,0 @@
-# Default values for oai-nr-ulsim-misc
-# 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-ulsim-misc"
-
-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-ulsim.sc-fdma/Chart.yaml

@@ -1,36 +0,0 @@
-apiVersion: v1
-name: oai-nr-ulsim-sc-fdma
-description: A Helm subchart for nr-ulsim network function ("sc-fdma" 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-ulsim
-  - RAN
-  - 5G
-
-sources:
-  - https://gitlab.eurecom.fr/oai/openairinterface5g
-
-maintainers:
-  - name:  OPENAIRINTERFACE
-    email: contact@openairinterface.org

charts/physims/charts/nr-ulsim.sc-fdma/templates/_helpers.tpl

@@ -1,63 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "oai-nr-ulsim-sc-fdma.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-ulsim-sc-fdma.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-ulsim-sc-fdma.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Common labels
-*/}}
-{{- define "oai-nr-ulsim-sc-fdma.labels" -}}
-helm.sh/chart: {{ include "oai-nr-ulsim-sc-fdma.chart" . }}
-{{ include "oai-nr-ulsim-sc-fdma.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-ulsim-sc-fdma.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "oai-nr-ulsim-sc-fdma.name" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end -}}
-
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "oai-nr-ulsim-sc-fdma.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create -}}
-    {{ default (include "oai-nr-ulsim.fullname" .) .Values.serviceAccount.name }}
-{{- else -}}
-    {{ default "default" .Values.serviceAccount.name }}
-{{- end -}}
-{{- end -}}

charts/physims/charts/nr-ulsim.sc-fdma/values.yaml

@@ -1,48 +0,0 @@
-# Default values for oai-nr-ulsim-sc-fdma
-# 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-ulsim-sc-fdma"
-
-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-ulsim/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
-name: oai-nr-ulsim-misc
-description: A Helm subchart for nr-ulsim network function ("misc" tests)
+name: oai-nr-ulsim
+description: A Helm subchart for nr-ulsim network function
 
 # A chart can be either an 'application' or a 'library' chart.
 #

charts/physims/charts/nr-ulsim/templates/NOTES.txt

@@ -0,0 +1,15 @@
+1. Get the application URL by running these commands:
+{{- if contains "NodePort" .Values.service.type }}
+  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "oai-nr-ulsim.fullname" . }})
+  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
+  echo http://$NODE_IP:$NODE_PORT
+{{- else if contains "LoadBalancer" .Values.service.type }}
+     NOTE: It may take a few minutes for the LoadBalancer IP to be available.
+           You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "oai-nr-ulsim.fullname" . }}'
+  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "oai-nr-ulsim.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
+  echo http://$SERVICE_IP:{{ .Values.service.port }}
+{{- else if contains "ClusterIP" .Values.service.type }}
+  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "oai-nr-ulsim.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+  echo "Visit http://127.0.0.1:8080 to use your application"
+  kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:80
+{{- end }}

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

@@ -2,7 +2,7 @@
 {{/*
 Expand the name of the chart.
 */}}
-{{- define "oai-nr-ulsim-misc.name" -}}
+{{- define "oai-nr-ulsim.name" -}}
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
@@ -11,7 +11,7 @@ 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-ulsim-misc.fullname" -}}
+{{- define "oai-nr-ulsim.fullname" -}}
 {{- if .Values.fullnameOverride -}}
 {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
 {{- else -}}
@@ -27,16 +27,16 @@ If release name contains chart name it will be used as a full name.
 {{/*
 Create chart name and version as used by the chart label.
 */}}
-{{- define "oai-nr-ulsim-misc.chart" -}}
+{{- define "oai-nr-ulsim.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
 {{/*
 Common labels
 */}}
-{{- define "oai-nr-ulsim-misc.labels" -}}
-helm.sh/chart: {{ include "oai-nr-ulsim-misc.chart" . }}
-{{ include "oai-nr-ulsim-misc.selectorLabels" . }}
+{{- define "oai-nr-ulsim.labels" -}}
+helm.sh/chart: {{ include "oai-nr-ulsim.chart" . }}
+{{ include "oai-nr-ulsim.selectorLabels" . }}
 {{- if .Chart.AppVersion }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
@@ -46,15 +46,15 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{/*
 Selector labels
 */}}
-{{- define "oai-nr-ulsim-misc.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "oai-nr-ulsim-misc.name" . }}
+{{- define "oai-nr-ulsim.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "oai-nr-ulsim.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}
 
 {{/*
 Create the name of the service account to use
 */}}
-{{- define "oai-nr-ulsim-misc.serviceAccountName" -}}
+{{- define "oai-nr-ulsim.serviceAccountName" -}}
 {{- if .Values.serviceAccount.create -}}
     {{ default (include "oai-nr-ulsim.fullname" .) .Values.serviceAccount.name }}
 {{- else -}}

charts/physims/charts/nr-ulsim/templates/deployment.yaml

@@ -0,0 +1,49 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ .Chart.Name }}
+  labels:
+    {{- include "oai-nr-ulsim.labels" . | nindent 4 }}
+spec:
+  replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      {{- include "oai-nr-ulsim.selectorLabels" . | nindent 6 }}
+  strategy:
+    type: Recreate
+  template:
+    metadata:
+      labels:
+        {{- include "oai-nr-ulsim.selectorLabels" . | nindent 8 }}
+    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 }}
+        securityContext:
+          {{- toYaml .Values.securityContext | nindent 12 }}
+        ports:
+        - containerPort: 80
+          name: oai-nr-ulsim
+        # volumeMounts:
+        # - mountPath: /opt/oai-nr-ulsim/certs
+        #   name: certs
+        command: ["/bin/sh", "-c"]
+        args:
+        - >  
+          export OPENAIR_DIR=/opt/oai-physim &&
+          cd cmake_targets/autotests &&
+          ./run_exec_autotests.bash -g "015111" -q -np -b &&
+          echo "FINISHED" &&
+          sleep infinity
+      dnsPolicy: ClusterFirst
+      restartPolicy: Always
+      schedulerName: default-scheduler
+      serviceAccountName: {{ .Values.global.serviceAccountName }}
+      terminationGracePeriodSeconds: 30

charts/physims/charts/nr-ulsim/templates/service.yaml

@@ -0,0 +1,20 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Chart.Name }}
+  labels:
+    {{- include "oai-nr-ulsim.labels" . | nindent 4 }}
+spec:
+  type: {{ .Values.service.type }}
+{{- if  contains "ClusterIP" .Values.service.type }}
+  clusterIP: None
+{{- end }}
+  ports:
+    - name: oai-nr-ulsim
+      # Port accessible outside cluster
+      port: {{ .Values.service.port }}
+      # Port to forward to inside the pod
+      targetPort: {{ .Values.service.Port }}
+      protocol: TCP
+  selector:
+    {{- include "oai-nr-ulsim.selectorLabels" . | nindent 4 }}

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

@@ -1,10 +1,15 @@
-# Default values for oai-nr-dlsim-dmrs+ptrs
+# Default values for oai-nr-ulsim.
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
 replicaCount: 1
 
+namespace: "OAICICD_PROJECT"
+
 image:
+  registry: local
+  repository: image-registry.openshift-image-registry.svc:5000/OAICICD_PROJECT/oai-physim
+  version: temp
   # pullPolicy: IfNotPresent or Never or Always
   pullPolicy: Always
 
@@ -20,14 +25,26 @@ serviceAccount:
   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-dlsim-dmrs-ptrs"
+  name: "oai-nr-ulsim-sa"
 
 podSecurityContext:
   runAsUser: 0
   runAsGroup: 0
 
 securityContext:
-  privileged: false
+  privileged: true
+  capabilities:
+    add:
+      - SYS_CAP_PTRACE
+  #   drop:
+  #   - ALL
+  # readOnlyRootFilesystem: true
+  # runAsNonRoot: true
+  # runAsUser: 1000
+
+service:
+  type: ClusterIP
+  port: 80
 
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious

charts/physims/charts/polartest/templates/NOTES.txt

@@ -0,0 +1,15 @@
+1. Get the application URL by running these commands:
+{{- if contains "NodePort" .Values.service.type }}
+  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "oai-polartest.fullname" . }})
+  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
+  echo http://$NODE_IP:$NODE_PORT
+{{- else if contains "LoadBalancer" .Values.service.type }}
+     NOTE: It may take a few minutes for the LoadBalancer IP to be available.
+           You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "oai-polartest.fullname" . }}'
+  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "oai-polartest.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
+  echo http://$SERVICE_IP:{{ .Values.service.port }}
+{{- else if contains "ClusterIP" .Values.service.type }}
+  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "oai-polartest.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+  echo "Visit http://127.0.0.1:8080 to use your application"
+  kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:80
+{{- end }}

charts/physims/charts/polartest/templates/deployment.yaml

@@ -0,0 +1,49 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ .Chart.Name }}
+  labels:
+    {{- include "oai-polartest.labels" . | nindent 4 }}
+spec:
+  replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      {{- include "oai-polartest.selectorLabels" . | nindent 6 }}
+  strategy:
+    type: Recreate
+  template:
+    metadata:
+      labels:
+        {{- include "oai-polartest.selectorLabels" . | nindent 8 }}
+    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 }}
+        securityContext:
+          {{- toYaml .Values.securityContext | nindent 12 }}
+        ports:
+        - containerPort: 80
+          name: oai-polartest
+        # volumeMounts:
+        # - mountPath: /opt/oai-polartest/certs
+        #   name: certs
+        command: ["/bin/sh", "-c"]
+        args:
+        - >  
+          export OPENAIR_DIR=/opt/oai-physim &&
+          cd cmake_targets/autotests &&
+          ./run_exec_autotests.bash -g "015103" -q -np -b &&
+          echo "FINISHED" &&
+          sleep infinity
+      dnsPolicy: ClusterFirst
+      restartPolicy: Always
+      schedulerName: default-scheduler
+      serviceAccountName: {{ .Values.global.serviceAccountName }}
+      terminationGracePeriodSeconds: 30

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

@@ -1,42 +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 }}
-        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 "polartest" -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.polartest}}
-      nodeName: {{ .Values.global.nodeName.polartest }}
-      {{- end }}

charts/physims/charts/polartest/templates/service.yaml

@@ -0,0 +1,20 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Chart.Name }}
+  labels:
+    {{- include "oai-polartest.labels" . | nindent 4 }}
+spec:
+  type: {{ .Values.service.type }}
+{{- if  contains "ClusterIP" .Values.service.type }}
+  clusterIP: None
+{{- end }}
+  ports:
+    - name: oai-polartest
+      # Port accessible outside cluster
+      port: {{ .Values.service.port }}
+      # Port to forward to inside the pod
+      targetPort: {{ .Values.service.Port }}
+      protocol: TCP
+  selector:
+    {{- include "oai-polartest.selectorLabels" . | nindent 4 }}

charts/physims/charts/polartest/values.yaml

@@ -4,7 +4,12 @@
 
 replicaCount: 1
 
+namespace: "OAICICD_PROJECT"
+
 image:
+  registry: local
+  repository: image-registry.openshift-image-registry.svc:5000/OAICICD_PROJECT/oai-physim
+  version: temp
   # pullPolicy: IfNotPresent or Never or Always
   pullPolicy: Always
 
@@ -27,7 +32,19 @@ podSecurityContext:
   runAsGroup: 0
 
 securityContext:
-  privileged: false
+  privileged: true
+  capabilities:
+    add:
+      - SYS_CAP_PTRACE
+  #   drop:
+  #   - ALL
+  # readOnlyRootFilesystem: true
+  # runAsNonRoot: true
+  # runAsUser: 1000
+
+service:
+  type: ClusterIP
+  port: 80
 
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious

charts/physims/charts/smallblocktest/templates/NOTES.txt

@@ -0,0 +1,15 @@
+1. Get the application URL by running these commands:
+{{- if contains "NodePort" .Values.service.type }}
+  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "oai-smallblocktest.fullname" . }})
+  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
+  echo http://$NODE_IP:$NODE_PORT
+{{- else if contains "LoadBalancer" .Values.service.type }}
+     NOTE: It may take a few minutes for the LoadBalancer IP to be available.
+           You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "oai-smallblocktest.fullname" . }}'
+  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "oai-smallblocktest.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
+  echo http://$SERVICE_IP:{{ .Values.service.port }}
+{{- else if contains "ClusterIP" .Values.service.type }}
+  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "oai-smallblocktest.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+  echo "Visit http://127.0.0.1:8080 to use your application"
+  kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:80
+{{- end }}

charts/physims/charts/smallblocktest/templates/deployment.yaml

@@ -0,0 +1,49 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ .Chart.Name }}
+  labels:
+    {{- include "oai-smallblocktest.labels" . | nindent 4 }}
+spec:
+  replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      {{- include "oai-smallblocktest.selectorLabels" . | nindent 6 }}
+  strategy:
+    type: Recreate
+  template:
+    metadata:
+      labels:
+        {{- include "oai-smallblocktest.selectorLabels" . | nindent 8 }}
+    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 }}
+        securityContext:
+          {{- toYaml .Values.securityContext | nindent 12 }}
+        ports:
+        - containerPort: 80
+          name: oai-smallblock
+        # volumeMounts:
+        # - mountPath: /opt/oai-smallblocktest/certs
+        #   name: certs
+        command: ["/bin/sh", "-c"]
+        args:
+        - >  
+          export OPENAIR_DIR=/opt/oai-physim &&
+          cd cmake_targets/autotests &&
+          ./run_exec_autotests.bash -g "015107" -q -np -b &&
+          echo "FINISHED" &&
+          sleep infinity
+      dnsPolicy: ClusterFirst
+      restartPolicy: Always
+      schedulerName: default-scheduler
+      serviceAccountName: {{ .Values.global.serviceAccountName }}
+      terminationGracePeriodSeconds: 30

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

@@ -1,42 +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 }}
-        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 "smallblocktest" -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.smallblocktest}}
-      nodeName: {{ .Values.global.nodeName.smallblocktest }}
-      {{- end }}