Merge remote-tracking branch 'origin/develop-gaussZiggurat' into integration_2022_wk47

CMakeLists.txt

@@ -2545,7 +2545,6 @@ target_link_libraries(nrscope ${XFORMS_LIBRARIES})
 add_library(rfsimulator MODULE
   ${OPENAIR_DIR}/radio/rfsimulator/simulator.c
   ${OPENAIR_DIR}/radio/rfsimulator/apply_channelmod.c
-  ${OPENAIR_DIR}/radio/rfsimulator/new_channel_sim.c
   ${OPENAIR1_DIR}/PHY/TOOLS/signal_energy.c
 	)
 target_link_libraries(rfsimulator SIMU_COMMON ${ATLAS_LIBRARIES})

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: 0.1.1
+version: 1.0.0
 
 # 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/templates/NOTES.txt

-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-100rb-tm2.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-100rb-tm2.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "oai-dlsim-100rb-tm2.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-100rb-tm2.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.100rb+tm2/templates/deployment.yaml → charts/physims/charts/dlsim.100rb+tm2/templates/job.yaml

-apiVersion: apps/v1
-kind: Deployment
+apiVersion: batch/v1
+kind: Job
 metadata:
   name: {{ .Chart.Name }}
-  labels:
-    {{- include "oai-dlsim-100rb-tm2.labels" . | nindent 4 }}
 spec:
-  replicas: {{ .Values.replicaCount }}
-  selector:
-    matchLabels:
-      {{- include "oai-dlsim-100rb-tm2.selectorLabels" . | nindent 6 }}
-  strategy:
-    type: Recreate
   template:
     metadata:
       labels:
-        {{- include "oai-dlsim-100rb-tm2.selectorLabels" . | nindent 8 }}
+        app: physim
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
@@ -28,8 +20,6 @@ spec:
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
-        ports:
-        - containerPort: 80
         env:
         - name: OPENAIR_DIR
           value: /opt/oai-physim
@@ -39,7 +29,9 @@ spec:
           cmake_targets/autotests/run_exec_autotests.bash -g "dlsim.100rb+tm2" -d bin/ &&
           echo "FINISHED" && sleep infinity
       dnsPolicy: ClusterFirst
-      restartPolicy: Always
+      restartPolicy: Never
       schedulerName: default-scheduler
       serviceAccountName: {{ .Values.global.serviceAccountName }}
       terminationGracePeriodSeconds: 30
+      nodeSelector:
+         {{- toYaml .Values.global.nodeSelector | nindent 12 }}

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

-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ .Chart.Name }}
-  labels:
-    {{- include "oai-dlsim-100rb-tm2.labels" . | nindent 4 }}
-spec:
-  type: {{ .Values.service.type }}
-{{- if  contains "ClusterIP" .Values.service.type }}
-  clusterIP: None
-{{- end }}
-  ports:
-    - name: oai-dlsim-100rb-tm2
-      # 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-100rb-tm2.selectorLabels" . | nindent 4 }}

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

@@ -27,19 +27,7 @@ podSecurityContext:
   runAsGroup: 0
 
 securityContext:
-  privileged: true
-  capabilities:
-    add:
-      - SYS_CAP_PTRACE
-  #   drop:
-  #   - ALL
-  # readOnlyRootFilesystem: true
-  # runAsNonRoot: true
-  # runAsUser: 1000
-
-service:
-  type: ClusterIP
-  port: 80
+  privileged: false
 
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious

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

-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-basic.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-basic.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "oai-dlsim-basic.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-basic.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.basic/templates/deployment.yaml → charts/physims/charts/dlsim.basic/templates/job.yaml

-apiVersion: apps/v1
-kind: Deployment
+apiVersion: batch/v1
+kind: Job
 metadata:
-  name: {{ .Chart.Name }}
-  labels:
-    {{- include "oai-dlsim-basic.labels" . | nindent 4 }}
+  name: {{ .Chart.Name }}    
 spec:
-  replicas: {{ .Values.replicaCount }}
-  selector:
-    matchLabels:
-      {{- include "oai-dlsim-basic.selectorLabels" . | nindent 6 }}
-  strategy:
-    type: Recreate
   template:
     metadata:
       labels:
-        {{- include "oai-dlsim-basic.selectorLabels" . | nindent 8 }}
+         app: physim
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
@@ -28,8 +20,6 @@ spec:
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
-        ports:
-        - containerPort: 80
         env:
         - name: OPENAIR_DIR
           value: /opt/oai-physim
@@ -39,7 +29,9 @@ spec:
           cmake_targets/autotests/run_exec_autotests.bash -g "dlsim.basic" -d bin/ &&
           echo "FINISHED" && sleep infinity
       dnsPolicy: ClusterFirst
-      restartPolicy: Always
+      restartPolicy: Never
       schedulerName: default-scheduler
-      serviceAccountName: {{ .Values.global.serviceAccountName }}
+      serviceAccountName: {{ .Values.global.serviceAccountName }} 
       terminationGracePeriodSeconds: 30
+      nodeSelector:
+         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
\ No newline at end of file

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

-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ .Chart.Name }}
-  labels:
-    {{- include "oai-dlsim-basic.labels" . | nindent 4 }}
-spec:
-  type: {{ .Values.service.type }}
-{{- if  contains "ClusterIP" .Values.service.type }}
-  clusterIP: None
-{{- end }}
-  ports:
-    - name: oai-dlsim-basic
-      # 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-basic.selectorLabels" . | nindent 4 }}

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

@@ -27,31 +27,15 @@ podSecurityContext:
   runAsGroup: 0
 
 securityContext:
-  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
-  # 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
+  privileged: false
+
+resources:
+   limits:
+     cpu: 100m
+     memory: 128Mi
+   requests:
+     cpu: 100m
+     memory: 128Mi
 
 nodeSelector: {}
 

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

-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 → charts/physims/charts/ldpctest/templates/job.yaml

-apiVersion: apps/v1
-kind: Deployment
+apiVersion: batch/v1
+kind: Job
 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:
-        {{- include "oai-ldpctest.selectorLabels" . | nindent 8 }}
+        app: physim
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
@@ -28,18 +20,18 @@ spec:
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
-        ports:
-        - containerPort: 80
         env:
         - name: OPENAIR_DIR
           value: /opt/oai-physim
         command: ["/bin/sh", "-c"]
         args:
-        - >  
+        - >
           cmake_targets/autotests/run_exec_autotests.bash -g "ldpctest" -d bin/ &&
           echo "FINISHED" && sleep infinity
       dnsPolicy: ClusterFirst
-      restartPolicy: Always
+      restartPolicy: Never
       schedulerName: default-scheduler
       serviceAccountName: {{ .Values.global.serviceAccountName }}
       terminationGracePeriodSeconds: 30
+      nodeSelector:
+         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
\ No newline at end of file

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

-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

@@ -27,19 +27,7 @@ podSecurityContext:
   runAsGroup: 0
 
 securityContext:
-  privileged: true
-  capabilities:
-    add:
-      - SYS_CAP_PTRACE
-  #   drop:
-  #   - ALL
-  # readOnlyRootFilesystem: true
-  # runAsNonRoot: true
-  # runAsUser: 1000
-
-service:
-  type: ClusterIP
-  port: 80
+  privileged: false
 
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious

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

-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 → charts/physims/charts/nr-dlschsim/templates/job.yaml

-apiVersion: apps/v1
-kind: Deployment
+apiVersion: batch/v1
+kind: Job
 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 }}
+        app: physim
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
@@ -28,18 +20,18 @@ spec:
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
-        ports:
-        - containerPort: 80
         env:
         - name: OPENAIR_DIR
           value: /opt/oai-physim
         command: ["/bin/sh", "-c"]
         args:
-        - >  
+        - >
           cmake_targets/autotests/run_exec_autotests.bash -g "nr_dlschsim" -d bin/ &&
           echo "FINISHED" && sleep infinity
       dnsPolicy: ClusterFirst
-      restartPolicy: Always
+      restartPolicy: Never
       schedulerName: default-scheduler
       serviceAccountName: {{ .Values.global.serviceAccountName }}
       terminationGracePeriodSeconds: 30
+      nodeSelector:
+         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
\ No newline at end of file

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

-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

@@ -27,19 +27,7 @@ podSecurityContext:
   runAsGroup: 0
 
 securityContext:
-  privileged: true
-  capabilities:
-    add:
-      - SYS_CAP_PTRACE
-  #   drop:
-  #   - ALL
-  # readOnlyRootFilesystem: true
-  # runAsNonRoot: true
-  # runAsUser: 1000
-
-service:
-  type: ClusterIP
-  port: 80
+  privileged: false
 
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious

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

-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-basic.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-basic.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "oai-nr-dlsim-basic.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-basic.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.basic/templates/deployment.yaml → charts/physims/charts/nr-dlsim.basic/templates/job.yaml

-apiVersion: apps/v1
-kind: Deployment
+apiVersion: batch/v1
+kind: Job
 metadata:
   name: {{ .Chart.Name }}
-  labels:
-    {{- include "oai-nr-dlsim-basic.labels" . | nindent 4 }}
 spec:
-  replicas: {{ .Values.replicaCount }}
-  selector:
-    matchLabels:
-      {{- include "oai-nr-dlsim-basic.selectorLabels" . | nindent 6 }}
-  strategy:
-    type: Recreate
   template:
     metadata:
       labels:
-        {{- include "oai-nr-dlsim-basic.selectorLabels" . | nindent 8 }}
+        app: physim
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
@@ -28,8 +20,6 @@ spec:
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
-        ports:
-        - containerPort: 80
         env:
         - name: OPENAIR_DIR
           value: /opt/oai-physim
@@ -39,7 +29,9 @@ spec:
           cmake_targets/autotests/run_exec_autotests.bash -g "nr_dlsim.basic" -d bin/ &&
           echo "FINISHED" && sleep infinity
       dnsPolicy: ClusterFirst
-      restartPolicy: Always
+      restartPolicy: Never
       schedulerName: default-scheduler
       serviceAccountName: {{ .Values.global.serviceAccountName }}
       terminationGracePeriodSeconds: 30
+      nodeSelector:
+         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
\ No newline at end of file

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

-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ .Chart.Name }}
-  labels:
-    {{- include "oai-nr-dlsim-basic.labels" . | nindent 4 }}
-spec:
-  type: {{ .Values.service.type }}
-{{- if  contains "ClusterIP" .Values.service.type }}
-  clusterIP: None
-{{- end }}
-  ports:
-    - name: oai-nr-dlsim-basic
-      # 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-basic.selectorLabels" . | nindent 4 }}

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

@@ -27,19 +27,7 @@ podSecurityContext:
   runAsGroup: 0
 
 securityContext:
-  privileged: true
-  capabilities:
-    add:
-      - SYS_CAP_PTRACE
-  #   drop:
-  #   - ALL
-  # readOnlyRootFilesystem: true
-  # runAsNonRoot: true
-  # runAsUser: 1000
-
-service:
-  type: ClusterIP
-  port: 80
+  privileged: false
 
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious

charts/physims/charts/nr-dlsim.dmrs+ptrs/templates/NOTES.txt

-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-dmrs-ptrs.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-dmrs-ptrs.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "oai-nr-dlsim-dmrs-ptrs.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-dmrs-ptrs.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.dmrs+ptrs/templates/deployment.yaml → charts/physims/charts/nr-dlsim.dmrs+ptrs/templates/job.yaml

-apiVersion: apps/v1
-kind: Deployment
+apiVersion: batch/v1
+kind: Job
 metadata:
   name: {{ .Chart.Name }}
-  labels:
-    {{- include "oai-nr-dlsim-dmrs-ptrs.labels" . | nindent 4 }}
 spec:
-  replicas: {{ .Values.replicaCount }}
-  selector:
-    matchLabels:
-      {{- include "oai-nr-dlsim-dmrs-ptrs.selectorLabels" . | nindent 6 }}
-  strategy:
-    type: Recreate
   template:
     metadata:
       labels:
-        {{- include "oai-nr-dlsim-dmrs-ptrs.selectorLabels" . | nindent 8 }}
+        app: physim
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
@@ -28,8 +20,6 @@ spec:
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
-        ports:
-        - containerPort: 80
         env:
         - name: OPENAIR_DIR
           value: /opt/oai-physim
@@ -39,7 +29,9 @@ spec:
           cmake_targets/autotests/run_exec_autotests.bash -g "nr_dlsim.dmrs+ptrs" -d bin/ &&
           echo "FINISHED" && sleep infinity
       dnsPolicy: ClusterFirst
-      restartPolicy: Always
+      restartPolicy: Never
       schedulerName: default-scheduler
       serviceAccountName: {{ .Values.global.serviceAccountName }}
       terminationGracePeriodSeconds: 30
+      nodeSelector:
+         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
\ No newline at end of file

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

-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ .Chart.Name }}
-  labels:
-    {{- include "oai-nr-dlsim-dmrs-ptrs.labels" . | nindent 4 }}
-spec:
-  type: {{ .Values.service.type }}
-{{- if  contains "ClusterIP" .Values.service.type }}
-  clusterIP: None
-{{- end }}
-  ports:
-    - name: oai-nr-dlsim-dmrs-ptrs
-      # 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-dmrs-ptrs.selectorLabels" . | nindent 4 }}

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

@@ -27,19 +27,7 @@ podSecurityContext:
   runAsGroup: 0
 
 securityContext:
-  privileged: true
-  capabilities:
-    add:
-      - SYS_CAP_PTRACE
-  #   drop:
-  #   - ALL
-  # readOnlyRootFilesystem: true
-  # runAsNonRoot: true
-  # runAsUser: 1000
-
-service:
-  type: ClusterIP
-  port: 80
+  privileged: false
 
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious

charts/physims/charts/nr-dlsim.mcs+mimo/templates/NOTES.txt

-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-mcs-mimo.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-mcs-mimo.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "oai-nr-dlsim-mcs-mimo.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-mcs-mimo.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.mcs+mimo/templates/deployment.yaml → charts/physims/charts/nr-dlsim.mcs+mimo/templates/job.yaml

-apiVersion: apps/v1
-kind: Deployment
+apiVersion: batch/v1
+kind: Job
 metadata:
   name: {{ .Chart.Name }}
-  labels:
-    {{- include "oai-nr-dlsim-mcs-mimo.labels" . | nindent 4 }}
 spec:
-  replicas: {{ .Values.replicaCount }}
-  selector:
-    matchLabels:
-      {{- include "oai-nr-dlsim-mcs-mimo.selectorLabels" . | nindent 6 }}
-  strategy:
-    type: Recreate
   template:
     metadata:
       labels:
-        {{- include "oai-nr-dlsim-mcs-mimo.selectorLabels" . | nindent 8 }}
+        app: physim
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
@@ -28,8 +20,6 @@ spec:
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
-        ports:
-        - containerPort: 80
         env:
         - name: OPENAIR_DIR
           value: /opt/oai-physim
@@ -39,7 +29,9 @@ spec:
           cmake_targets/autotests/run_exec_autotests.bash -g "nr_dlsim.mcs+mimo" -d bin/ &&
           echo "FINISHED" && sleep infinity
       dnsPolicy: ClusterFirst
-      restartPolicy: Always
+      restartPolicy: Never
       schedulerName: default-scheduler
       serviceAccountName: {{ .Values.global.serviceAccountName }}
       terminationGracePeriodSeconds: 30
+      nodeSelector:
+         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
\ No newline at end of file

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

-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ .Chart.Name }}
-  labels:
-    {{- include "oai-nr-dlsim-mcs-mimo.labels" . | nindent 4 }}
-spec:
-  type: {{ .Values.service.type }}
-{{- if  contains "ClusterIP" .Values.service.type }}
-  clusterIP: None
-{{- end }}
-  ports:
-    - name: oai-nr-dlsim-mcs-mimo
-      # 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-mcs-mimo.selectorLabels" . | nindent 4 }}

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

@@ -27,19 +27,7 @@ podSecurityContext:
   runAsGroup: 0
 
 securityContext:
-  privileged: true
-  capabilities:
-    add:
-      - SYS_CAP_PTRACE
-  #   drop:
-  #   - ALL
-  # readOnlyRootFilesystem: true
-  # runAsNonRoot: true
-  # runAsUser: 1000
-
-service:
-  type: ClusterIP
-  port: 80
+  privileged: false
 
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious

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

-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-offset.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-offset.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "oai-nr-dlsim-offset.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-offset.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.offset/templates/deployment.yaml → charts/physims/charts/nr-dlsim.offset/templates/job.yaml

-apiVersion: apps/v1
-kind: Deployment
+apiVersion: batch/v1
+kind: Job
 metadata:
   name: {{ .Chart.Name }}
-  labels:
-    {{- include "oai-nr-dlsim-offset.labels" . | nindent 4 }}
 spec:
-  replicas: {{ .Values.replicaCount }}
-  selector:
-    matchLabels:
-      {{- include "oai-nr-dlsim-offset.selectorLabels" . | nindent 6 }}
-  strategy:
-    type: Recreate
   template:
     metadata:
       labels:
-        {{- include "oai-nr-dlsim-offset.selectorLabels" . | nindent 8 }}
+        app: physim
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
@@ -28,8 +20,6 @@ spec:
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
-        ports:
-        - containerPort: 80
         env:
         - name: OPENAIR_DIR
           value: /opt/oai-physim
@@ -39,7 +29,9 @@ spec:
           cmake_targets/autotests/run_exec_autotests.bash -g "nr_dlsim.offset" -d bin/ &&
           echo "FINISHED" && sleep infinity
       dnsPolicy: ClusterFirst
-      restartPolicy: Always
+      restartPolicy: Never
       schedulerName: default-scheduler
       serviceAccountName: {{ .Values.global.serviceAccountName }}
       terminationGracePeriodSeconds: 30
+      nodeSelector:
+         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
\ No newline at end of file

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

-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ .Chart.Name }}
-  labels:
-    {{- include "oai-nr-dlsim-offset.labels" . | nindent 4 }}
-spec:
-  type: {{ .Values.service.type }}
-{{- if  contains "ClusterIP" .Values.service.type }}
-  clusterIP: None
-{{- end }}
-  ports:
-    - name: oai-nr-dlsim-offset
-      # 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-offset.selectorLabels" . | nindent 4 }}

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

@@ -27,19 +27,7 @@ podSecurityContext:
   runAsGroup: 0
 
 securityContext:
-  privileged: true
-  capabilities:
-    add:
-      - SYS_CAP_PTRACE
-  #   drop:
-  #   - ALL
-  # readOnlyRootFilesystem: true
-  # runAsNonRoot: true
-  # runAsUser: 1000
-
-service:
-  type: ClusterIP
-  port: 80
+  privileged: false
 
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious

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

-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-106rb.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-106rb.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "oai-nr-pbchsim-106rb.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-106rb.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.106rb/templates/deployment.yaml → charts/physims/charts/nr-pbchsim.106rb/templates/job.yaml

-apiVersion: apps/v1
-kind: Deployment
+apiVersion: batch/v1
+kind: Job
 metadata:
   name: {{ .Chart.Name }}
-  labels:
-    {{- include "oai-nr-pbchsim-106rb.labels" . | nindent 4 }}
 spec:
-  replicas: {{ .Values.replicaCount }}
-  selector:
-    matchLabels:
-      {{- include "oai-nr-pbchsim-106rb.selectorLabels" . | nindent 6 }}
-  strategy:
-    type: Recreate
   template:
     metadata:
       labels:
-        {{- include "oai-nr-pbchsim-106rb.selectorLabels" . | nindent 8 }}
+        app: physim
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
@@ -28,8 +20,6 @@ spec:
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
-        ports:
-        - containerPort: 80
         env:
         - name: OPENAIR_DIR
           value: /opt/oai-physim
@@ -39,7 +29,9 @@ spec:
           cmake_targets/autotests/run_exec_autotests.bash -g "nr_pbchsim.106rb" -d bin/ &&
           echo "FINISHED" && sleep infinity
       dnsPolicy: ClusterFirst
-      restartPolicy: Always
+      restartPolicy: Never
       schedulerName: default-scheduler
       serviceAccountName: {{ .Values.global.serviceAccountName }}
       terminationGracePeriodSeconds: 30
+      nodeSelector:
+         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
\ No newline at end of file

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

-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ .Chart.Name }}
-  labels:
-    {{- include "oai-nr-pbchsim-106rb.labels" . | nindent 4 }}
-spec:
-  type: {{ .Values.service.type }}
-{{- if  contains "ClusterIP" .Values.service.type }}
-  clusterIP: None
-{{- end }}
-  ports:
-    - name: oai-nr-pbchsim-106rb
-      # 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-106rb.selectorLabels" . | nindent 4 }}

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

@@ -27,19 +27,7 @@ podSecurityContext:
   runAsGroup: 0
 
 securityContext:
-  privileged: true
-  capabilities:
-    add:
-      - SYS_CAP_PTRACE
-  #   drop:
-  #   - ALL
-  # readOnlyRootFilesystem: true
-  # runAsNonRoot: true
-  # runAsUser: 1000
-
-service:
-  type: ClusterIP
-  port: 80
+  privileged: false
 
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious

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

-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-217rb.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-217rb.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "oai-nr-pbchsim-217rb.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-217rb.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.217rb/templates/deployment.yaml → charts/physims/charts/nr-pbchsim.217rb/templates/job.yaml

-apiVersion: apps/v1
-kind: Deployment
+apiVersion: batch/v1
+kind: Job
 metadata:
   name: {{ .Chart.Name }}
-  labels:
-    {{- include "oai-nr-pbchsim-217rb.labels" . | nindent 4 }}
 spec:
-  replicas: {{ .Values.replicaCount }}
-  selector:
-    matchLabels:
-      {{- include "oai-nr-pbchsim-217rb.selectorLabels" . | nindent 6 }}
-  strategy:
-    type: Recreate
   template:
     metadata:
       labels:
-        {{- include "oai-nr-pbchsim-217rb.selectorLabels" . | nindent 8 }}
+        app: physim
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
@@ -28,8 +20,6 @@ spec:
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
-        ports:
-        - containerPort: 80
         env:
         - name: OPENAIR_DIR
           value: /opt/oai-physim
@@ -39,7 +29,9 @@ spec:
           cmake_targets/autotests/run_exec_autotests.bash -g "nr_pbchsim.217rb" -d bin/ &&
           echo "FINISHED" && sleep infinity
       dnsPolicy: ClusterFirst
-      restartPolicy: Always
+      restartPolicy: Never
       schedulerName: default-scheduler
       serviceAccountName: {{ .Values.global.serviceAccountName }}
       terminationGracePeriodSeconds: 30
+      nodeSelector:
+         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
\ No newline at end of file

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

-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ .Chart.Name }}
-  labels:
-    {{- include "oai-nr-pbchsim-217rb.labels" . | nindent 4 }}
-spec:
-  type: {{ .Values.service.type }}
-{{- if  contains "ClusterIP" .Values.service.type }}
-  clusterIP: None
-{{- end }}
-  ports:
-    - name: oai-nr-pbchsim-217rb
-      # 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-217rb.selectorLabels" . | nindent 4 }}

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

@@ -27,19 +27,7 @@ podSecurityContext:
   runAsGroup: 0
 
 securityContext:
-  privileged: true
-  capabilities:
-    add:
-      - SYS_CAP_PTRACE
-  #   drop:
-  #   - ALL
-  # readOnlyRootFilesystem: true
-  # runAsNonRoot: true
-  # runAsUser: 1000
-
-service:
-  type: ClusterIP
-  port: 80
+  privileged: false
 
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious

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

-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-273rb.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-273rb.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "oai-nr-pbchsim-273rb.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-273rb.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.273rb/templates/deployment.yaml → charts/physims/charts/nr-pbchsim.273rb/templates/job.yaml

-apiVersion: apps/v1
-kind: Deployment
+apiVersion: batch/v1
+kind: Job
 metadata:
   name: {{ .Chart.Name }}
-  labels:
-    {{- include "oai-nr-pbchsim-273rb.labels" . | nindent 4 }}
 spec:
-  replicas: {{ .Values.replicaCount }}
-  selector:
-    matchLabels:
-      {{- include "oai-nr-pbchsim-273rb.selectorLabels" . | nindent 6 }}
-  strategy:
-    type: Recreate
   template:
     metadata:
       labels:
-        {{- include "oai-nr-pbchsim-273rb.selectorLabels" . | nindent 8 }}
+        app: physim
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
@@ -28,8 +20,6 @@ spec:
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
-        ports:
-        - containerPort: 80
         env:
         - name: OPENAIR_DIR
           value: /opt/oai-physim
@@ -39,7 +29,9 @@ spec:
           cmake_targets/autotests/run_exec_autotests.bash -g "nr_pbchsim.273rb" -d bin/ &&
           echo "FINISHED" && sleep infinity
       dnsPolicy: ClusterFirst
-      restartPolicy: Always
+      restartPolicy: Never
       schedulerName: default-scheduler
       serviceAccountName: {{ .Values.global.serviceAccountName }}
       terminationGracePeriodSeconds: 30
+      nodeSelector:
+         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
\ No newline at end of file

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

-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ .Chart.Name }}
-  labels:
-    {{- include "oai-nr-pbchsim-273rb.labels" . | nindent 4 }}
-spec:
-  type: {{ .Values.service.type }}
-{{- if  contains "ClusterIP" .Values.service.type }}
-  clusterIP: None
-{{- end }}
-  ports:
-    - name: oai-nr-pbchsim-273rb
-      # 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-273rb.selectorLabels" . | nindent 4 }}

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

@@ -27,19 +27,7 @@ podSecurityContext:
   runAsGroup: 0
 
 securityContext:
-  privileged: true
-  capabilities:
-    add:
-      - SYS_CAP_PTRACE
-  #   drop:
-  #   - ALL
-  # readOnlyRootFilesystem: true
-  # runAsNonRoot: true
-  # runAsUser: 1000
-
-service:
-  type: ClusterIP
-  port: 80
+  privileged: false
 
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious

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

-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 → charts/physims/charts/nr-prachsim/templates/job.yaml

-apiVersion: apps/v1
-kind: Deployment
+apiVersion: batch/v1
+kind: Job
 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 }}
+        app: physim
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
@@ -28,18 +20,18 @@ spec:
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
-        ports:
-        - containerPort: 80
         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: Always
+      restartPolicy: Never
       schedulerName: default-scheduler
       serviceAccountName: {{ .Values.global.serviceAccountName }}
       terminationGracePeriodSeconds: 30
+      nodeSelector:
+         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
\ No newline at end of file

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

-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

@@ -27,19 +27,7 @@ podSecurityContext:
   runAsGroup: 0
 
 securityContext:
-  privileged: true
-  capabilities:
-    add:
-      - SYS_CAP_PTRACE
-  #   drop:
-  #   - ALL
-  # readOnlyRootFilesystem: true
-  # runAsNonRoot: true
-  # runAsUser: 1000
-
-service:
-  type: ClusterIP
-  port: 80
+  privileged: false
 
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious

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

-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 → charts/physims/charts/nr-pucchsim/templates/job.yaml

-apiVersion: apps/v1
-kind: Deployment
+apiVersion: batch/v1
+kind: Job
 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 }}
+        app: physim
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
@@ -28,18 +20,18 @@ spec:
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
-        ports:
-        - containerPort: 80
         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: Always
+      restartPolicy: Never
       schedulerName: default-scheduler
       serviceAccountName: {{ .Values.global.serviceAccountName }}
       terminationGracePeriodSeconds: 30
+      nodeSelector:
+         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
\ No newline at end of file

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

-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

@@ -27,15 +27,7 @@ podSecurityContext:
   runAsGroup: 0
 
 securityContext:
-  privileged: true
-  capabilities:
-    add:
-      - SYS_CAP_PTRACE
-  #   drop:
-  #   - ALL
-  # readOnlyRootFilesystem: true
-  # runAsNonRoot: true
-  # runAsUser: 1000
+  privileged: false
 
 service:
   type: ClusterIP

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

-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 → charts/physims/charts/nr-ulschsim/templates/job.yaml

-apiVersion: apps/v1
-kind: Deployment
+apiVersion: batch/v1
+kind: Job
 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 }}
+        app: physim
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
@@ -28,18 +20,18 @@ spec:
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
-        ports:
-        - containerPort: 80
         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: Always
+      restartPolicy: Never
       schedulerName: default-scheduler
       serviceAccountName: {{ .Values.global.serviceAccountName }}
       terminationGracePeriodSeconds: 30
+      nodeSelector:
+         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
\ No newline at end of file

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

-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

@@ -27,19 +27,7 @@ podSecurityContext:
   runAsGroup: 0
 
 securityContext:
-  privileged: true
-  capabilities:
-    add:
-      - SYS_CAP_PTRACE
-  #   drop:
-  #   - ALL
-  # readOnlyRootFilesystem: true
-  # runAsNonRoot: true
-  # runAsUser: 1000
-
-service:
-  type: ClusterIP
-  port: 80
+  privileged: false
 
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious

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

-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-3gpp.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-3gpp.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "oai-nr-ulsim-3gpp.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-3gpp.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.3gpp/templates/deployment.yaml → charts/physims/charts/nr-ulsim.3gpp/templates/job.yaml

-apiVersion: apps/v1
-kind: Deployment
+apiVersion: batch/v1
+kind: Job
 metadata:
   name: {{ .Chart.Name }}
-  labels:
-    {{- include "oai-nr-ulsim-3gpp.labels" . | nindent 4 }}
 spec:
-  replicas: {{ .Values.replicaCount }}
-  selector:
-    matchLabels:
-      {{- include "oai-nr-ulsim-3gpp.selectorLabels" . | nindent 6 }}
-  strategy:
-    type: Recreate
   template:
     metadata:
       labels:
-        {{- include "oai-nr-ulsim-3gpp.selectorLabels" . | nindent 8 }}
+        app: physim
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
@@ -28,8 +20,6 @@ spec:
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
-        ports:
-        - containerPort: 80
         env:
         - name: OPENAIR_DIR
           value: /opt/oai-physim
@@ -39,7 +29,9 @@ spec:
           cmake_targets/autotests/run_exec_autotests.bash -g "nr_ulsim.3gpp" -d bin/ &&
           echo "FINISHED" && sleep infinity
       dnsPolicy: ClusterFirst
-      restartPolicy: Always
+      restartPolicy: Never
       schedulerName: default-scheduler
       serviceAccountName: {{ .Values.global.serviceAccountName }}
       terminationGracePeriodSeconds: 30
+      nodeSelector:
+         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
\ No newline at end of file

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

-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ .Chart.Name }}
-  labels:
-    {{- include "oai-nr-ulsim-3gpp.labels" . | nindent 4 }}
-spec:
-  type: {{ .Values.service.type }}
-{{- if  contains "ClusterIP" .Values.service.type }}
-  clusterIP: None
-{{- end }}
-  ports:
-    - name: oai-nr-ulsim-3gpp
-      # 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-3gpp.selectorLabels" . | nindent 4 }}

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

@@ -27,19 +27,7 @@ podSecurityContext:
   runAsGroup: 0
 
 securityContext:
-  privileged: true
-  capabilities:
-    add:
-      - SYS_CAP_PTRACE
-  #   drop:
-  #   - ALL
-  # readOnlyRootFilesystem: true
-  # runAsNonRoot: true
-  # runAsUser: 1000
-
-service:
-  type: ClusterIP
-  port: 80
+  privileged: false
 
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious

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

-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-mimo.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-mimo.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "oai-nr-ulsim-mimo.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-mimo.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.mimo/templates/deployment.yaml → charts/physims/charts/nr-ulsim.mimo/templates/job.yaml

-apiVersion: apps/v1
-kind: Deployment
+apiVersion: batch/v1
+kind: Job
 metadata:
   name: {{ .Chart.Name }}
-  labels:
-    {{- include "oai-nr-ulsim-mimo.labels" . | nindent 4 }}
 spec:
-  replicas: {{ .Values.replicaCount }}
-  selector:
-    matchLabels:
-      {{- include "oai-nr-ulsim-mimo.selectorLabels" . | nindent 6 }}
-  strategy:
-    type: Recreate
   template:
     metadata:
       labels:
-        {{- include "oai-nr-ulsim-mimo.selectorLabels" . | nindent 8 }}
+        app: physim
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
@@ -28,8 +20,6 @@ spec:
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
-        ports:
-        - containerPort: 80
         env:
         - name: OPENAIR_DIR
           value: /opt/oai-physim
@@ -39,7 +29,9 @@ spec:
           cmake_targets/autotests/run_exec_autotests.bash -g "nr_ulsim.mimo" -d bin/ &&
           echo "FINISHED" && sleep infinity
       dnsPolicy: ClusterFirst
-      restartPolicy: Always
+      restartPolicy: Never
       schedulerName: default-scheduler
       serviceAccountName: {{ .Values.global.serviceAccountName }}
       terminationGracePeriodSeconds: 30
+      nodeSelector:
+         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
\ No newline at end of file

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

-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ .Chart.Name }}
-  labels:
-    {{- include "oai-nr-ulsim-mimo.labels" . | nindent 4 }}
-spec:
-  type: {{ .Values.service.type }}
-{{- if  contains "ClusterIP" .Values.service.type }}
-  clusterIP: None
-{{- end }}
-  ports:
-    - name: oai-nr-ulsim-mimo
-      # 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-mimo.selectorLabels" . | nindent 4 }}

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

@@ -27,19 +27,7 @@ podSecurityContext:
   runAsGroup: 0
 
 securityContext:
-  privileged: true
-  capabilities:
-    add:
-      - SYS_CAP_PTRACE
-  #   drop:
-  #   - ALL
-  # readOnlyRootFilesystem: true
-  # runAsNonRoot: true
-  # runAsUser: 1000
-
-service:
-  type: ClusterIP
-  port: 80
+  privileged: false
 
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious

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

-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-misc.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-misc.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "oai-nr-ulsim-misc.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-misc.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.misc/templates/deployment.yaml → charts/physims/charts/nr-ulsim.misc/templates/job.yaml

-apiVersion: apps/v1
-kind: Deployment
+apiVersion: batch/v1
+kind: Job
 metadata:
   name: {{ .Chart.Name }}
-  labels:
-    {{- include "oai-nr-ulsim-misc.labels" . | nindent 4 }}
 spec:
-  replicas: {{ .Values.replicaCount }}
-  selector:
-    matchLabels:
-      {{- include "oai-nr-ulsim-misc.selectorLabels" . | nindent 6 }}
-  strategy:
-    type: Recreate
   template:
     metadata:
       labels:
-        {{- include "oai-nr-ulsim-misc.selectorLabels" . | nindent 8 }}
+        app: physim
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
@@ -28,8 +20,6 @@ spec:
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
-        ports:
-        - containerPort: 80
         env:
         - name: OPENAIR_DIR
           value: /opt/oai-physim
@@ -39,7 +29,9 @@ spec:
           cmake_targets/autotests/run_exec_autotests.bash -g "nr_ulsim.misc" -d bin/ &&
           echo "FINISHED" && sleep infinity
       dnsPolicy: ClusterFirst
-      restartPolicy: Always
+      restartPolicy: Never
       schedulerName: default-scheduler
       serviceAccountName: {{ .Values.global.serviceAccountName }}
       terminationGracePeriodSeconds: 30
+      nodeSelector:
+         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
\ No newline at end of file

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

-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ .Chart.Name }}
-  labels:
-    {{- include "oai-nr-ulsim-misc.labels" . | nindent 4 }}
-spec:
-  type: {{ .Values.service.type }}
-{{- if  contains "ClusterIP" .Values.service.type }}
-  clusterIP: None
-{{- end }}
-  ports:
-    - name: oai-nr-ulsim-misc
-      # 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-misc.selectorLabels" . | nindent 4 }}

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

@@ -27,19 +27,7 @@ podSecurityContext:
   runAsGroup: 0
 
 securityContext:
-  privileged: true
-  capabilities:
-    add:
-      - SYS_CAP_PTRACE
-  #   drop:
-  #   - ALL
-  # readOnlyRootFilesystem: true
-  # runAsNonRoot: true
-  # runAsUser: 1000
-
-service:
-  type: ClusterIP
-  port: 80
+  privileged: false
 
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious

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

-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-sc-fdma.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-sc-fdma.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "oai-nr-ulsim-sc-fdma.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-sc-fdma.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.sc-fdma/templates/deployment.yaml → charts/physims/charts/nr-ulsim.sc-fdma/templates/job.yaml

-apiVersion: apps/v1
-kind: Deployment
+apiVersion: batch/v1
+kind: Job
 metadata:
   name: {{ .Chart.Name }}
-  labels:
-    {{- include "oai-nr-ulsim-sc-fdma.labels" . | nindent 4 }}
 spec:
-  replicas: {{ .Values.replicaCount }}
-  selector:
-    matchLabels:
-      {{- include "oai-nr-ulsim-sc-fdma.selectorLabels" . | nindent 6 }}
-  strategy:
-    type: Recreate
   template:
     metadata:
       labels:
-        {{- include "oai-nr-ulsim-sc-fdma.selectorLabels" . | nindent 8 }}
+        app: physim
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
@@ -39,7 +31,9 @@ spec:
           cmake_targets/autotests/run_exec_autotests.bash -g "nr_ulsim.sc-fdma" -d bin/ &&
           echo "FINISHED" && sleep infinity
       dnsPolicy: ClusterFirst
-      restartPolicy: Always
+      restartPolicy: Never
       schedulerName: default-scheduler
       serviceAccountName: {{ .Values.global.serviceAccountName }}
       terminationGracePeriodSeconds: 30
+      nodeSelector:
+         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
\ No newline at end of file

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

-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ .Chart.Name }}
-  labels:
-    {{- include "oai-nr-ulsim-sc-fdma.labels" . | nindent 4 }}
-spec:
-  type: {{ .Values.service.type }}
-{{- if  contains "ClusterIP" .Values.service.type }}
-  clusterIP: None
-{{- end }}
-  ports:
-    - name: oai-nr-ulsim-sc-fdma
-      # 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-sc-fdma.selectorLabels" . | nindent 4 }}

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

@@ -27,19 +27,7 @@ podSecurityContext:
   runAsGroup: 0
 
 securityContext:
-  privileged: true
-  capabilities:
-    add:
-      - SYS_CAP_PTRACE
-  #   drop:
-  #   - ALL
-  # readOnlyRootFilesystem: true
-  # runAsNonRoot: true
-  # runAsUser: 1000
-
-service:
-  type: ClusterIP
-  port: 80
+  privileged: false
 
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious

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

-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 → charts/physims/charts/polartest/templates/job.yaml

-apiVersion: apps/v1
-kind: Deployment
+apiVersion: batch/v1
+kind: Job
 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 }}
+        app: physim
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
@@ -28,18 +20,18 @@ spec:
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
-        ports:
-        - containerPort: 80
         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: Always
+      restartPolicy: Never
       schedulerName: default-scheduler
       serviceAccountName: {{ .Values.global.serviceAccountName }}
       terminationGracePeriodSeconds: 30
+      nodeSelector:
+         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
\ No newline at end of file

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

-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

@@ -27,19 +27,7 @@ podSecurityContext:
   runAsGroup: 0
 
 securityContext:
-  privileged: true
-  capabilities:
-    add:
-      - SYS_CAP_PTRACE
-  #   drop:
-  #   - ALL
-  # readOnlyRootFilesystem: true
-  # runAsNonRoot: true
-  # runAsUser: 1000
-
-service:
-  type: ClusterIP
-  port: 80
+  privileged: false
 
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious

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

-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 → charts/physims/charts/smallblocktest/templates/job.yaml

-apiVersion: apps/v1
-kind: Deployment
+apiVersion: batch/v1
+kind: Job
 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 }}
+        app: physim
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
@@ -28,18 +20,18 @@ spec:
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
-        ports:
-        - containerPort: 80
         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: Always
+      restartPolicy: Never
       schedulerName: default-scheduler
       serviceAccountName: {{ .Values.global.serviceAccountName }}
       terminationGracePeriodSeconds: 30
+      nodeSelector:
+         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
\ No newline at end of file

charts/physims/charts/smallblocktest/templates/service.yaml

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

charts/physims/charts/smallblocktest/values.yaml

@@ -27,19 +27,7 @@ podSecurityContext:
   runAsGroup: 0
 
 securityContext:
-  privileged: true
-  capabilities:
-    add:
-      - SYS_CAP_PTRACE
-  #   drop:
-  #   - ALL
-  # readOnlyRootFilesystem: true
-  # runAsNonRoot: true
-  # runAsUser: 1000
-
-service:
-  type: ClusterIP
-  port: 80
+  privileged: false
 
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious

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

-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-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-ulsim.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "oai-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-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/ulsim/templates/deployment.yaml → charts/physims/charts/ulsim/templates/job.yaml

-apiVersion: apps/v1
-kind: Deployment
+apiVersion: batch/v1
+kind: Job
 metadata:
   name: {{ .Chart.Name }}
-  labels:
-    {{- include "oai-ulsim.labels" . | nindent 4 }}
 spec:
-  replicas: {{ .Values.replicaCount }}
-  selector:
-    matchLabels:
-      {{- include "oai-ulsim.selectorLabels" . | nindent 6 }}
-  strategy:
-    type: Recreate
   template:
     metadata:
       labels:
-        {{- include "oai-ulsim.selectorLabels" . | nindent 8 }}
+        app: physim
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
@@ -28,18 +20,18 @@ spec:
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
-        ports:
-        - containerPort: 80
         env:
         - name: OPENAIR_DIR
           value: /opt/oai-physim
         command: ["/bin/sh", "-c"]
         args:
-        - >  
+        - >
           cmake_targets/autotests/run_exec_autotests.bash -g "ulsim" -d bin/ &&
           echo "FINISHED" && sleep infinity
       dnsPolicy: ClusterFirst
-      restartPolicy: Always
+      restartPolicy: Never
       schedulerName: default-scheduler
       serviceAccountName: {{ .Values.global.serviceAccountName }}
       terminationGracePeriodSeconds: 30
+      nodeSelector:
+         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
\ No newline at end of file

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

-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ .Chart.Name }}
-  labels:
-    {{- include "oai-ulsim.labels" . | nindent 4 }}
-spec:
-  type: {{ .Values.service.type }}
-{{- if  contains "ClusterIP" .Values.service.type }}
-  clusterIP: None
-{{- end }}
-  ports:
-    - name: oai-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-ulsim.selectorLabels" . | nindent 4 }}

charts/physims/charts/ulsim/values.yaml

@@ -27,19 +27,7 @@ podSecurityContext:
   runAsGroup: 0
 
 securityContext:
-  privileged: true
-  capabilities:
-    add:
-      - SYS_CAP_PTRACE
-  #   drop:
-  #   - ALL
-  # readOnlyRootFilesystem: true
-  # runAsNonRoot: true
-  # runAsUser: 1000
-
-service:
-  type: ClusterIP
-  port: 80
+  privileged: false
 
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious

charts/physims/templates/rbac.yaml

@@ -6,7 +6,7 @@ rules:
 - apiGroups:
   - security.openshift.io
   resourceNames:
-  - privileged
+  - anyuid
   resources:
   - securitycontextconstraints
   verbs:

charts/physims/templates/serviceaccount.yaml

 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{ .Values.global.serviceAccountName }}
+  name: oai-physim-sa #{{ .Values.global.serviceAccountName }}

charts/physims/values.yaml

@@ -5,137 +5,12 @@
 global:
   serviceAccountName: oai-physim-sa
   namespace: "OAICICD_PROJECT"
-  image:
+  image: 
     registry: local
     repository: image-registry.openshift-image-registry.svc:5000/oaicicd-ran/oai-physim
     version: TAG
     # pullPolicy: IfNotPresent or Never or Always
     pullPolicy: Always
+  nodeSelector:
+    worker: "telco"
 
-## Declaring values specific to coressponding physim to overwrite
-
-dlsim.basic:
-  replicaCount: 1
-  service:
-    type: ClusterIP
-    port: 80
-
-dlsim.100rb+tm2:
-  replicaCount: 1
-  service:
-    type: ClusterIP
-    port: 80
-
-ulsim:
-  replicaCount: 1
-  service:
-    type: ClusterIP
-    port: 80
-
-ldpctest:
-  replicaCount: 1
-  service:
-    type: ClusterIP
-    port: 80
-
-polartest:
-  replicaCount: 1
-  service:
-    type: ClusterIP
-    port: 80
-
-nr-pbchsim.106rb:
-  replicaCount: 1
-  service:
-    type: ClusterIP
-    port: 80
-
-nr-pbchsim.217rb:
-  replicaCount: 1
-  service:
-    type: ClusterIP
-    port: 80
-
-nr-pbchsim.273rb:
-  replicaCount: 1
-  service:
-    type: ClusterIP
-    port: 80
-
-nr-dlsim.basic:
-  replicaCount: 1
-  service:
-    type: ClusterIP
-    port: 80
-
-nr-dlsim.dmrs+ptrs:
-  replicaCount: 1
-  service:
-    type: ClusterIP
-    port: 80
-
-nr-dlsim.mcs+mimo:
-  replicaCount: 1
-  service:
-    type: ClusterIP
-    port: 80
-
-nr-dlsim.offset:
-  replicaCount: 1
-  service:
-    type: ClusterIP
-    port: 80
-
-nr-dlschsim:
-  replicaCount: 1
-  service:
-    type: ClusterIP
-    port: 80
-
-smallblocktest:
-  replicaCount: 1
-  service:
-    type: ClusterIP
-    port: 80
-
-nr-ulschsim:
-  replicaCount: 1
-  service:
-    type: ClusterIP
-    port: 80
-
-nr-pucchsim:
-  replicaCount: 1
-  service:
-    type: ClusterIP
-    port: 80
-
-nr-ulsim.3gpp:
-  replicaCount: 1
-  service:
-    type: ClusterIP
-    port: 80
-
-nr-ulsim.mimo:
-  replicaCount: 1
-  service:
-    type: ClusterIP
-    port: 80
-
-nr-ulsim.misc:
-  replicaCount: 1
-  service:
-    type: ClusterIP
-    port: 80
-
-nr-ulsim.sc-fdma:
-  replicaCount: 1
-  service:
-    type: ClusterIP
-    port: 80
-
-nr-prachsim:
-  replicaCount: 1
-  service:
-    type: ClusterIP
-    port: 80

ci-scripts/cls_physim1.py

@@ -139,14 +139,14 @@ class PhySim:
 		# Using helm charts deployment
 		mySSH.command(f'grep -rl OAICICD_PROJECT ./charts/ | xargs sed -i -e "s#OAICICD_PROJECT#{ocProjectName}#"', '\$', 30)
 		mySSH.command(f'sed -i -e "s#TAG#{imageTag}#g" ./charts/physims/values.yaml', '\$', 6)
-		mySSH.command('helm install physim ./charts/physims/ 2>&1 | tee -a cmake_targets/log/physim_helm_summary.txt', '\$', 30)
+		mySSH.command('helm install physim ./charts/physims/ --wait 2>&1 | tee -a cmake_targets/log/physim_helm_summary.txt', '\$', 30)
 		if mySSH.getBefore().count('STATUS: deployed') == 0:
 			logging.error('\u001B[1m Deploying PhySim Failed using helm chart on OC Cluster\u001B[0m')
-			mySSH.command('helm uninstall physim >> cmake_targets/log/physim_helm_summary.txt 2>&1', '\$', 30)
+			mySSH.command('helm uninstall physim | tee -a cmake_targets/log/physim_helm_summary.txt 2>&1', '\$', 30)
 			isFinished1 = False
 			while(isFinished1 == False):
 				time.sleep(20)
-				mySSH.command('oc get pods -l app.kubernetes.io/instance=physim', '\$', 6, resync=True)
+				mySSH.command('oc get pods -l app=physim', '\$', 6, resync=True)
 				if re.search('No resources found', mySSH.getBefore()):
 					isFinished1 = True
 			mySSH.command('oc logout', '\$', 30)
@@ -158,24 +158,27 @@ class PhySim:
 			logging.debug('\u001B[1m   Deployed PhySim Successfully using helm chart\u001B[0m')
 		isRunning = False
 		count = 0
+		# Check whether the containers are in Running state or not under 2 mins
 		while(count < 2 and isRunning == False):
 			time.sleep(60)
-			mySSH.command('oc get pods -o wide -l app.kubernetes.io/instance=physim | tee -a cmake_targets/log/physim_pods_summary.txt', '\$', 30, resync=True)
-			if mySSH.getBefore().count('Running') == 21:
+			mySSH.command('oc get pods -o wide -l app=physim | tee -a cmake_targets/log/physim_pods_summary.txt', '\$', 30, resync=True)
+			running_count = mySSH.getBefore().count('Running')
+			completed_count = mySSH.getBefore().count('Completed')
+			if (running_count + completed_count) == 21:
 				logging.debug('\u001B[1m Running the physim test Scenarios\u001B[0m')
 				isRunning = True
 				podNames = re.findall('oai-[\S\d\w]+', mySSH.getBefore())
 			count +=1
 		if isRunning == False:
-			logging.error('\u001B[1m Some PODS Running FAILED \u001B[0m')
-			mySSH.command('oc get pods -l app.kubernetes.io/instance=physim 2>&1 | tee -a cmake_targets/log/physim_pods_summary.txt', '\$', 6)
+			logging.error('\u001B[1m Some pods are in Error state \u001B[0m')
+			mySSH.command('oc get pods -l app=physim 2>&1 | tee -a cmake_targets/log/physim_pods_summary.txt', '\$', 6)
 			mySSH.command('for pod in $(oc get pods | tail -n +2 | awk \'{print $1}\'); do oc describe pod $pod >> cmake_targets/log/physim_pods_summary.txt; done', '\$', 10)
-			mySSH.command('helm uninstall physim 2>&1 >> cmake_targets/log/physim_helm_summary.txt', '\$', 6)
+			mySSH.command('helm uninstall physim | tee -a cmake_targets/log/physim_helm_summary.txt 2>&1', '\$', 6)
 			self.AnalyzeLogFile_phySim()
 			isFinished1 = False
 			while(isFinished1 == False):
 				time.sleep(20)
-				mySSH.command('oc get pods -l app.kubernetes.io/instance=physim', '\$', 6, resync=True)
+				mySSH.command('oc get pods -l app=physim', '\$', 6, resync=True)
 				if re.search('No resources found', mySSH.getBefore()):
 					isFinished1 = True
 			mySSH.command('oc logout', '\$', 30)
@@ -188,7 +191,7 @@ class PhySim:
 		isFinished = False
 		# doing a deep copy!
 		tmpPodNames = podNames.copy()
-		while(count < 15 and isFinished == False):
+		while(count < 9 and isFinished == False):
 			time.sleep(60)
 			for podName in tmpPodNames:
 				mySSH.command2(f'oc logs --tail=1 {podName} 2>&1', 6, silent=True)
@@ -230,7 +233,7 @@ class PhySim:
 		isFinished1 = False
 		while(isFinished1 == False):
 			time.sleep(20)
-			mySSH.command('oc get pods -l app.kubernetes.io/instance=physim', '\$', 6, resync=True)
+			mySSH.command('oc get pods -l app=physim', '\$', 6, resync=True)
 			if re.search('No resources found', mySSH.getBefore()):
 				isFinished1 = True
 		if isFinished1 == True:

cmake_targets/autotests/run_exec_autotests.bash

 #!/bin/bash
+#set -xv
 #/*
 # * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
 # * contributor license agreements.  See the NOTICE file distributed with
@@ -68,7 +69,7 @@ function test_run() {
     mkdir -p $log_dir
 
     echo "" > $temp_exec_log
-    echo "" > $log_file
+    echo "start at $(date)" > "$log_file"
     #echo "log_dir = $log_dir"
     #echo "log_file = $log_file"
     #echo "exec_file = $exec_file"
@@ -92,78 +93,61 @@ function test_run() {
     tags_array_index=0
     for main_exec_args_array_index in "${main_exec_args_array[@]}"
     do
-      global_result=1
+      global_result=PASS
       result_string=""
       PROPER_DESC=`echo ${desc_array[$tags_array_index]} | sed -e "s@^.*Test cases.*(Test@Test@" -e "s@^ *(@@" -e"s/)$//" -e "s/),$//"`
       echo_info "$PROPER_DESC"
 
      for (( run_index=1; run_index <= $nruns; run_index++ ))
       do
-        temp_exec_log=$log_dir/test.$test_case_name.${tags_array[$tags_array_index]}.run_$run_index
-        echo "" > $temp_exec_log
-
+        temp_exec_log="$log_dir/test.$test_case_name.${tags_array[$tags_array_index]}.run_$run_index"
         echo "Executing test case $test_case_name.${tags_array[$tags_array_index]}, Run Index = $run_index, Execution Log file = $temp_exec_log"
 
-        echo "-----------------------------------------------------------------------------" >> $temp_exec_log  2>&1
-        echo "<EXECUTION LOG Test Case = $test_case_name.${tags_array[$tags_array_index]}, Run = $run_index >" >> $temp_exec_log  2>&1
-        echo "Executing $main_exec $main_exec_args_array_index " | tee $temp_exec_log
-        { uname -a ; eval "$main_exec $main_exec_args_array_index" ;} >> $temp_exec_log  2>&1
+        echo "-----------------------------------------------------------------------------" > "$temp_exec_log"
+        echo "<EXECUTION LOG Test Case = $test_case_name.${tags_array[$tags_array_index]}, Run = $run_index >" >> "$temp_exec_log"
+        echo "Executing $main_exec $main_exec_args_array_index at $(date)" >> "$temp_exec_log"
+        uname -a >> "$temp_exec_log"
+        time "$main_exec" $main_exec_args_array_index >> "$temp_exec_log"  2>&1 &
+     done
 
-        echo "</EXECUTION LOG Test Case = $test_case_name.${tags_array[$tags_array_index]},  Run = $run_index >" >> $temp_exec_log  2>&1
-        cat $temp_exec_log >> $log_file  2>&1
+     wait
 
+     for (( run_index=1; run_index <= $nruns; run_index++ ))
+      do
+        echo "</EXECUTION LOG Test Case = $test_case_name.${tags_array[$tags_array_index]},  Run = $run_index >" >> $temp_exec_log  2>&1
+        cat "$temp_exec_log" >> "$log_file"  2>&1
 
-        result=1
+        result=PASS
         for search_expr in "${search_expr_array[@]}"
         do
-
-          search_result=`grep -E "$search_expr" $temp_exec_log`
-
-          if [ -z "$search_result" ]; then
-            let "result = result & 0"
-          else
-            let "result = result & 1"
-          fi
+          grep -Eq "$search_expr" $temp_exec_log || result=FAIL
         done
 
         #If we find a negative search result then there is crash of program and test case is failed even if above condition is true
-        search_result=`grep -iE "$search_expr_negative" $temp_exec_log`
-        if [ -n "$search_result" ]; then
-          result=0
-        fi
-        let "global_result = global_result & result"
-
-        #echo "result = $result"
-
-        if [ "$result" -eq "0" ]; then
-          result_string=$result_string" Run_$run_index =FAIL"
+        grep -q -iE "$search_expr_negative" $temp_exec_log && result=FAIL
+        
+        if [ "$result" != PASS ]; then
           echo_error "$test_case_name.${tags_array[$tags_array_index]} RUN = $run_index Result = FAIL"
-        fi
-
-        if [ "$result" -eq "1" ]; then
-          result_string=$result_string" Run_$run_index =PASS"
+        else
           echo_success "$test_case_name.${tags_array[$tags_array_index]} RUN = $run_index Result = PASS"
         fi
 
+        result_string=$result_string" Run_$run_index =$result"
+        if [ $result != PASS ] ; then 
+          global_result=FAIL
+        fi
 
-      done #End of for loop (nindex)
+     done #End of for loop (nindex)
 
-     echo " Result String = $result_string"
+     echo "END at $(date)" >> "$log_file"
 
-     if [ "$result_string" == "" ]; then
-         echo_error "execution $test_case_name.${tags_array[$tags_array_index]} {$PROPER_DESC} Run_Result = \"$result_string\"  Result = FAIL"
-         xUnit_fail "execution" "$test_case_name.${tags_array[$tags_array_index]}" "FAIL" "$result_string" "$xmlfile_testcase" "$PROPER_DESC"
-     else
-      if [ "$global_result" == "0" ]; then
+      if [ "$global_result" != PASS ]; then
          echo_error "execution $test_case_name.${tags_array[$tags_array_index]} {$PROPER_DESC} Run_Result = \"$result_string\" Result =  FAIL"
          xUnit_fail "execution" "$test_case_name.${tags_array[$tags_array_index]}" "FAIL" "$result_string" "$xmlfile_testcase" "$PROPER_DESC"
-      fi
-
-      if [ "$global_result" == "1" ]; then
+       else
          echo_success "execution $test_case_name.${tags_array[$tags_array_index]} {$PROPER_DESC} Run_Result = \"$result_string\"  Result = PASS "
          xUnit_success "execution" "$test_case_name.${tags_array[$tags_array_index]}" "PASS" "$result_string"   "$xmlfile_testcase"  "$PROPER_DESC"
       fi
-     fi
 
      let "tags_array_index++"
    done

cmake_targets/autotests/test_case_list.xml

@@ -127,8 +127,8 @@
       <desc>nr_pbchsim Test cases. (Test1: PBCH-only, 217 PRB),
                                    (Test2: PBCH and synchronization, 217 RPB)</desc>
       <main_exec>nr_pbchsim</main_exec>
-      <main_exec_args>-s-11 -S-8 -n10 -R217
-                      -s-11 -S-8 -n10 -o8000 -I -R217</main_exec_args>
+      <main_exec_args>-s-10 -S-8 -n10 -R217
+                      -s-10 -S-8 -n10 -o8000 -I -R217</main_exec_args>
       <tags>test1 test2</tags>
       <search_expr_true>PBCH test OK</search_expr_true>
       <search_expr_false>segmentation fault|assertion|exiting|fatal</search_expr_false>
@@ -139,8 +139,8 @@
       <desc>nr_pbchsim Test cases. (Test1: PBCH-only, 273 PRB),
                                    (Test2: PBCH and synchronization, 273 PRB)</desc>
       <main_exec>nr_pbchsim</main_exec>
-      <main_exec_args>-s-11 -S-8 -n10 -R273
-                      -s-11 -S-8 -n10 -o8000 -I -R273</main_exec_args>
+      <main_exec_args>-s-10 -S-8 -n10 -R273
+                      -s-10 -S-8 -n10 -o8000 -I -R273</main_exec_args>
       <tags>test1 test2</tags>
       <search_expr_true>PBCH test OK</search_expr_true>
       <search_expr_false>segmentation fault|assertion|exiting|fatal</search_expr_false>

openair1/SIMULATION/TOOLS/multipath_channel.c

@@ -38,7 +38,7 @@ uint8_t multipath_channel_nosigconv(channel_desc_t *desc)
 
 //#define CHANNEL_SSE
 #ifdef CHANNEL_SSE
-void multipath_channel(channel_desc_t *desc,
+void __attribute__ ((no_sanitize_address)) multipath_channel(channel_desc_t *desc,
                        double tx_sig_re[NB_ANTENNAS_TX][30720*2],
                        double tx_sig_im[NB_ANTENANS_TX][30720*2],
                        double rx_sig_re[NB_ANTENNAS_RX][30720*2],
@@ -160,8 +160,8 @@ void add_noise(c16_t **rxdata,
   for (int i = 0; i < length; i++) {
     for (int ap = 0; ap < nb_antennas_rx; ap++) {
       c16_t *rxd = &rxdata[ap][slot_offset + i + delay];
-      rxd->r = r_re[ap][i] + sqrt(sigma / 2) * gaussdouble(0.0, 1.0); // convert to fixed point
-      rxd->i = r_im[ap][i] + sqrt(sigma / 2) * gaussdouble(0.0, 1.0);
+      rxd->r = r_re[ap][i] + sqrt(sigma / 2) * gaussZiggurat(0.0, 1.0); // convert to fixed point
+      rxd->i = r_im[ap][i] + sqrt(sigma / 2) * gaussZiggurat(0.0, 1.0);
       /* Add phase noise if enabled */
       if (pdu_bit_map & PUSCH_PDU_BITMAP_PUSCH_PTRS) {
         phase_noise(ts, &rxdata[ap][slot_offset + i + delay].r, &rxdata[ap][slot_offset + i + delay].i);
@@ -170,7 +170,7 @@ void add_noise(c16_t **rxdata,
   }
 }
 
-void multipath_channel(channel_desc_t *desc,
+void __attribute__ ((no_sanitize_address)) multipath_channel(channel_desc_t *desc,
                        double *tx_sig_re[NB_ANTENNAS_TX],
                        double *tx_sig_im[NB_ANTENNAS_TX],
                        double *rx_sig_re[NB_ANTENNAS_RX],
@@ -180,9 +180,6 @@ void multipath_channel(channel_desc_t *desc,
 		                   int log_channel)
 {
 
-  int i,ii,j,l;
-  struct complexd rx_tmp,tx;
-
   double path_loss = pow(10,desc->path_loss_dB/20);
   int dd;
   dd = abs(desc->channel_offset);
@@ -204,29 +201,24 @@ void multipath_channel(channel_desc_t *desc,
   }
 #endif
 
-  for (i=0; i<((int)length-dd); i++) {
-    for (ii=0; ii<desc->nb_rx; ii++) {
-      rx_tmp.r = 0;
-      rx_tmp.i = 0;
-
-      for (j=0; j<desc->nb_tx; j++) {
-        for (l = 0; l<(int)desc->channel_length; l++) {
+  for (int i=0; i<((int)length-dd); i++) {
+    for (int ii=0; ii<desc->nb_rx; ii++) {
+      struct complexd rx_tmp={0};
+      for (int j=0; j<desc->nb_tx; j++) {
+        struct complexd *chan=desc->ch[ii+(j*desc->nb_rx)];        
+        for (int l = 0; l<(int)desc->channel_length; l++) {
           if ((i>=0) && (i-l)>=0) {
+            struct complexd tx;
             tx.r = tx_sig_re[j][i-l];
             tx.i = tx_sig_im[j][i-l];
-          } else {
-            tx.r =0;
-            tx.i =0;
+            rx_tmp.r += (tx.r * chan[l].r) - (tx.i * chan[l].i);
+            rx_tmp.i += (tx.i * chan[l].r) + (tx.r * chan[l].i);
           }
-
-          rx_tmp.r += (tx.r * desc->ch[ii+(j*desc->nb_rx)][l].r) - (tx.i * desc->ch[ii+(j*desc->nb_rx)][l].i);
-          rx_tmp.i += (tx.i * desc->ch[ii+(j*desc->nb_rx)][l].r) + (tx.r * desc->ch[ii+(j*desc->nb_rx)][l].i);
-
           if (i==0 && log_channel == 1) {
 	           printf("channel[%d][%d][%d] = %f dB \t(%e, %e)\n",
-                    ii, j, l, 10*log10(pow(desc->ch[ii+(j*desc->nb_rx)][l].r,2.0)+pow(desc->ch[ii+(j*desc->nb_rx)][l].i,2.0)),
-		         desc->ch[ii+(j*desc->nb_rx)][l].r,
-		         desc->ch[ii+(j*desc->nb_rx)][l].i);
+                    ii, j, l, 10*log10(pow(chan[l].r,2.0)+pow(chan[l].i,2.0)),
+		         chan[l].r,
+		         chan[l].i);
 	        }
         } //l
       }  // j

openair1/SIMULATION/TOOLS/random_channel.c

@@ -467,8 +467,9 @@ double get_normalization_ch_factor(channel_desc_t *desc)
     for (int l = 0; l < (int)desc->nb_taps; l++) {
       for (int aarx = 0; aarx < desc->nb_rx; aarx++) {
         for (int aatx = 0; aatx < desc->nb_tx; aatx++) {
-          anew[aarx + (aatx * desc->nb_rx)].r = sqrt(desc->ricean_factor * desc->amps[l] / 2) * gaussdouble(0.0, 1.0);
-          anew[aarx + (aatx * desc->nb_rx)].i = sqrt(desc->ricean_factor * desc->amps[l] / 2) * gaussdouble(0.0, 1.0);
+          struct complexd *anewp = &anew[aarx + (aatx * desc->nb_rx)];
+          anewp->r = sqrt(desc->ricean_factor * desc->amps[l] / 2) * gaussZiggurat(0.0, 1.0);
+          anewp->i = sqrt(desc->ricean_factor * desc->amps[l] / 2) * gaussZiggurat(0.0, 1.0);
           if ((l == 0) && (desc->ricean_factor != 1.0)) {
             anew[aarx + (aatx * desc->nb_rx)].r += sqrt((1.0 - desc->ricean_factor) / 2);
             anew[aarx + (aatx * desc->nb_rx)].i += sqrt((1.0 - desc->ricean_factor) / 2);
@@ -527,6 +528,12 @@ channel_desc_t *new_channel_desc_scm(uint8_t nb_tx,
                                      int32_t channel_offset,
                                      double path_loss_dB,
                                      float noise_power_dB) {
+
+  // To create tables for normal distribution
+  struct timespec t;
+  clock_gettime(CLOCK_MONOTONIC, &t);
+  tableNor((long)(t.tv_nsec%INT_MAX));
+
   channel_desc_t *chan_desc = (channel_desc_t *)calloc(1,sizeof(channel_desc_t));
 
   for(int i=0; i<max_chan; i++) {
@@ -1712,8 +1719,9 @@ int random_channel(channel_desc_t *desc, uint8_t abstraction_flag) {
     for (aarx=0; aarx<desc->nb_rx; aarx++) {
       for (aatx=0; aatx<desc->nb_tx; aatx++) {
 
-        anew[aarx + (aatx * desc->nb_rx)].r = sqrt(desc->ricean_factor * desc->amps[i] / 2) * gaussdouble(0.0, 1.0) * desc->normalization_ch_factor;
-        anew[aarx + (aatx * desc->nb_rx)].i = sqrt(desc->ricean_factor * desc->amps[i] / 2) * gaussdouble(0.0, 1.0) * desc->normalization_ch_factor;
+        struct complexd *anewp = &anew[aarx + (aatx * desc->nb_rx)];
+        anewp->r = sqrt(desc->ricean_factor * desc->amps[i] / 2) * gaussZiggurat(0.0, 1.0) * desc->normalization_ch_factor;
+        anewp->i = sqrt(desc->ricean_factor * desc->amps[i] / 2) * gaussZiggurat(0.0, 1.0) * desc->normalization_ch_factor;
 
         if ((i==0) && (desc->ricean_factor != 1.0)) {
           if (desc->random_aoa==1) {

openair1/SIMULATION/TOOLS/rangen_double.c

@@ -86,7 +86,7 @@ double uniformrandom(void)
 
 /*!\brief Gaussian random number generator based on modified Box-Muller transformation.Returns a double-precision floating-point number. */
 
-double gaussdouble(double mean, double variance)
+double __attribute__ ((no_sanitize_address)) gaussdouble(double mean, double variance)
 {
   static int iset=0;
   static double gset;
@@ -109,7 +109,85 @@ double gaussdouble(double mean, double variance)
   }
 }
 
+// Ziggurat
+static bool tableNordDone=false;
+static double wn[128], fn[128];
+static uint32_t iz, jz, jsr = 123456789, kn[128];
+static int32_t hz;
+#define SHR3 (jz = jsr, jsr ^= (jsr << 13), jsr ^= (jsr >> 17), jsr ^= (jsr << 5), jz + jsr)
+#define UNI (0.5 + (signed)SHR3 * 0.2328306e-9)
 
+double nfix(void)
+{
+  const double r = 3.442620;
+  static double x, y;
+
+  for (;;) {
+    x = hz * wn[iz];
+
+    if (iz == 0) {
+      do {
+        x = -0.2904764 * log(UNI);
+        y = -log(UNI);
+      } while (y + y < x * x);
+
+      return (hz > 0) ? r + x : -r - x;
+    }
+
+    if (fn[iz] + UNI * (fn[iz - 1] - fn[iz]) < exp(-0.5 * x * x)) {
+      return x;
+    }
+
+    hz = SHR3;
+    iz = hz & 127;
+
+    if (abs(hz) < kn[iz]) {
+      return ((hz)*wn[iz]);
+    }
+  }
+}
+
+/*!\Procedure to create tables for normal distribution kn,wn and fn. */
+void tableNor(unsigned long seed)
+{
+  jsr = seed;
+  double dn = 3.442619855899;
+  int i;
+  const double m1 = 2147483648.0;
+  double q;
+  double tn = 3.442619855899;
+  const double vn = 9.91256303526217E-03;
+  q = vn / exp(-0.5 * dn * dn);
+  kn[0] = ((dn / q) * m1);
+  kn[1] = 0;
+  wn[0] = (q / m1);
+  wn[127] = (dn / m1);
+  fn[0] = 1.0;
+  fn[127] = (exp(-0.5 * dn * dn));
+
+  for (i = 126; 1 <= i; i--) {
+    dn = sqrt(-2.0 * log(vn / dn + exp(-0.5 * dn * dn)));
+    kn[i + 1] = ((dn / tn) * m1);
+    tn = dn;
+    fn[i] = (exp(-0.5 * dn * dn));
+    wn[i] = (dn / m1);
+  }
+  tableNordDone=true;
+  return;
+}
+
+double __attribute__ ((no_sanitize_address)) gaussZiggurat(double mean, double variance)
+{
+  if (!tableNordDone) {
+    // let's make reasonnable constant tables
+    struct timespec t;
+    clock_gettime(CLOCK_MONOTONIC, &t);
+    tableNor((long)(t.tv_nsec%INT_MAX));
+  }
+  hz = SHR3;
+  iz = hz & 127;
+  return abs(hz) < kn[iz] ? hz * wn[iz] : nfix();
+}
 
 #ifdef MAIN
 main(int argc,char **argv)

openair1/SIMULATION/TOOLS/sim.h

@@ -513,6 +513,8 @@ int gauss(unsigned int *gauss_LUT,unsigned char Nbits);
 double gaussdouble(double,double);
 void randominit(unsigned int seed_init);
 double uniformrandom(void);
+double gaussZiggurat(double mean, double variance);
+void tableNor(unsigned long seed);
 int freq_channel(channel_desc_t *desc,uint16_t nb_rb, int16_t n_samples,int scs);
 int init_freq_channel(channel_desc_t *desc,uint16_t nb_rb,int16_t n_samples,int scs);
 void term_freq_channel(void);

radio/rfsimulator/new_channel_sim.c

-/*
-* Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
-* contributor license agreements.  See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The OpenAirInterface Software Alliance licenses this file to You under
-* the OAI Public License, Version 1.1  (the "License"); you may not use this file
-* except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*      http://www.openairinterface.org/?page_id=698
-*
-* Author and copyright: Laurent Thomas, open-cells.com
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*-------------------------------------------------------------------------------
-* For more information about the OpenAirInterface (OAI) Software Alliance:
-*      contact@openairinterface.org
-*/
-
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <stdbool.h>
-#include <errno.h>
-
-
-#include <common/utils/assertions.h>
-#include <common/utils/LOG/log.h>
-#include <common/config/config_userapi.h>
-#include <openair1/SIMULATION/TOOLS/sim.h>
-#include "rfsimulator.h"
-
-// Ziggurat 
-static double wn[128],fn[128];
-static uint32_t iz,jz,jsr=123456789,kn[128];
-static int32_t hz;
-#define SHR3 (jz=jsr, jsr^=(jsr<<13),jsr^=(jsr>>17),jsr^=(jsr<<5),jz+jsr)
-#define UNI (0.5+(signed) SHR3 * 0.2328306e-9)
-
-double nfix(void) {
-  const double r = 3.442620;
-  static double x, y;
-
-  for (;;) {
-    x=hz *  wn[iz];
-
-    if (iz==0) {
-      do {
-        x = - 0.2904764 * log (UNI);
-        y = - log (UNI);
-      } while (y+y < x*x);
-
-      return (hz>0)? r+x : -r-x;
-    }
-
-    if (fn[iz]+UNI*(fn[iz-1]-fn[iz])<exp(-0.5*x*x)) {
-      return x;
-    }
-
-    hz = SHR3;
-    iz = hz&127;
-
-    if (abs(hz) < kn[iz]) {
-      return ((hz)*wn[iz]);
-    }
-  }
-}
-
-/*!\Procedure to create tables for normal distribution kn,wn and fn. */
-
-void tableNor(unsigned long seed) {
-  jsr=seed;
-  double dn = 3.442619855899;
-  int i;
-  const double m1 = 2147483648.0;
-  double q;
-  double tn = 3.442619855899;
-  const double vn = 9.91256303526217E-03;
-  q = vn/exp(-0.5*dn*dn);
-  kn[0] = ((dn/q)*m1);
-  kn[1] = 0;
-  wn[0] =  ( q / m1 );
-  wn[127] = ( dn / m1 );
-  fn[0] = 1.0;
-  fn[127] = ( exp ( - 0.5 * dn * dn ) );
-
-  for ( i = 126; 1 <= i; i-- ) {
-    dn = sqrt (-2.0 * log ( vn/dn + exp(-0.5*dn*dn)));
-    kn[i+1] = ((dn / tn)*m1);
-    tn = dn;
-    fn[i] = (exp (-0.5*dn*dn));
-    wn[i] = (dn / m1);
-  }
-
-  return;
-}
-
-double gaussZiggurat(double mean, double variance) {
-  hz=SHR3;
-  iz=hz&127;
-  return abs(hz)<kn[iz]? hz*wn[iz] : nfix();
-}

radio/rfsimulator/rfsimulator.h

@@ -23,8 +23,6 @@
 
 #ifndef __RFSIMULATOR_H
 #define  __RFSIMULATOR_H
-double gaussZiggurat(double mean, double variance);
-void tableNor(unsigned long seed);
 void rxAddInput( const c16_t *input_sig,
                  c16_t *after_channel_sig,
                  int rxAnt,