From 255ad2441053df7fc88ad1b44a42372fc346f796 Mon Sep 17 00:00:00 2001
From: Roberto Louro Magueta <rmagueta@allbesmart.pt>
Date: Wed, 2 Nov 2022 12:30:22 +0000
Subject: [PATCH 01/31] Replace gaussdouble() by gaussZiggurat() in
 random_channel() and add_noise()

---
 CMakeLists.txt                                |   1 -
 openair1/SIMULATION/TOOLS/multipath_channel.c |   4 +-
 openair1/SIMULATION/TOOLS/random_channel.c    |  19 ++-
 openair1/SIMULATION/TOOLS/rangen_double.c     |  71 ++++++++++++
 openair1/SIMULATION/TOOLS/sim.h               |   2 +
 radio/rfsimulator/new_channel_sim.c           | 108 ------------------
 radio/rfsimulator/rfsimulator.h               |   2 -
 7 files changed, 90 insertions(+), 117 deletions(-)
 delete mode 100644 radio/rfsimulator/new_channel_sim.c

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8559320d51..4bb1fa6545 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2546,7 +2546,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})
diff --git a/openair1/SIMULATION/TOOLS/multipath_channel.c b/openair1/SIMULATION/TOOLS/multipath_channel.c
index 6adc33b646..c1bc268916 100644
--- a/openair1/SIMULATION/TOOLS/multipath_channel.c
+++ b/openair1/SIMULATION/TOOLS/multipath_channel.c
@@ -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);
diff --git a/openair1/SIMULATION/TOOLS/random_channel.c b/openair1/SIMULATION/TOOLS/random_channel.c
index 8f7cc8ea0e..b11e4b7f67 100644
--- a/openair1/SIMULATION/TOOLS/random_channel.c
+++ b/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,15 @@ 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
+  uint64_t rand;
+  FILE *h = fopen("/dev/random", "r");
+  if (fread(&rand, sizeof(rand), 1, h) != 1) {
+    LOG_W(HW, "Simulator can't read /dev/random\n");
+  }
+  tableNor(rand);
+
   channel_desc_t *chan_desc = (channel_desc_t *)calloc(1,sizeof(channel_desc_t));
 
   for(int i=0; i<max_chan; i++) {
@@ -1712,8 +1722,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) {
diff --git a/openair1/SIMULATION/TOOLS/rangen_double.c b/openair1/SIMULATION/TOOLS/rangen_double.c
index 0ba9e196b1..20bd9c1ecb 100644
--- a/openair1/SIMULATION/TOOLS/rangen_double.c
+++ b/openair1/SIMULATION/TOOLS/rangen_double.c
@@ -109,7 +109,78 @@ double gaussdouble(double mean, double variance)
   }
 }
 
+// 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();
+}
 
 #ifdef MAIN
 main(int argc,char **argv)
diff --git a/openair1/SIMULATION/TOOLS/sim.h b/openair1/SIMULATION/TOOLS/sim.h
index 9b3fd98ae6..1e2602650f 100644
--- a/openair1/SIMULATION/TOOLS/sim.h
+++ b/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);
diff --git a/radio/rfsimulator/new_channel_sim.c b/radio/rfsimulator/new_channel_sim.c
deleted file mode 100644
index fcfa85265b..0000000000
--- a/radio/rfsimulator/new_channel_sim.c
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
-* Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
-* contributor license agreements.  See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The OpenAirInterface Software Alliance licenses this file to You under
-* the OAI Public License, Version 1.1  (the "License"); you may not use this file
-* except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*      http://www.openairinterface.org/?page_id=698
-*
-* 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();
-}
diff --git a/radio/rfsimulator/rfsimulator.h b/radio/rfsimulator/rfsimulator.h
index e69d41fa6c..068250a149 100644
--- a/radio/rfsimulator/rfsimulator.h
+++ b/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,

From d9660677c4fbe43a82d63aef3eeda444d91cf95a Mon Sep 17 00:00:00 2001
From: laurent <laurent Thomas>
Date: Wed, 2 Nov 2022 23:19:39 +0100
Subject: [PATCH 02/31] start snr closer to the target for nr pbchsim

---
 cmake_targets/autotests/test_case_list.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/cmake_targets/autotests/test_case_list.xml b/cmake_targets/autotests/test_case_list.xml
index 759c145468..6f3f5dd5a0 100755
--- a/cmake_targets/autotests/test_case_list.xml
+++ b/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>

From 2d46638aa1bf56801a6c768c85a3be5997ccb514 Mon Sep 17 00:00:00 2001
From: laurent <laurent Thomas>
Date: Fri, 4 Nov 2022 13:42:48 +0100
Subject: [PATCH 03/31] fix cpu cost in phy simulation with sanitize addr, some
 code un-obfuscation

---
 .../autotests/run_exec_autotests.bash         | 62 ++++++-------------
 openair1/SIMULATION/TOOLS/multipath_channel.c | 36 +++++------
 openair1/SIMULATION/TOOLS/rangen_double.c     |  4 +-
 3 files changed, 36 insertions(+), 66 deletions(-)

diff --git a/cmake_targets/autotests/run_exec_autotests.bash b/cmake_targets/autotests/run_exec_autotests.bash
index c00500cfc3..fd5cc45e77 100755
--- a/cmake_targets/autotests/run_exec_autotests.bash
+++ b/cmake_targets/autotests/run_exec_autotests.bash
@@ -1,4 +1,5 @@
 #!/bin/bash
+#set -xv
 #/*
 # * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
 # * contributor license agreements.  See the NOTICE file distributed with
@@ -92,78 +93,55 @@ 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 " >> "$temp_exec_log"
+        uname -a >> "$temp_exec_log"
+        "$main_exec" $main_exec_args_array_index >> "$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
         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)
 
-     echo " Result String = $result_string"
-
-     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
diff --git a/openair1/SIMULATION/TOOLS/multipath_channel.c b/openair1/SIMULATION/TOOLS/multipath_channel.c
index c1bc268916..992c6be461 100644
--- a/openair1/SIMULATION/TOOLS/multipath_channel.c
+++ b/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],
@@ -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
diff --git a/openair1/SIMULATION/TOOLS/rangen_double.c b/openair1/SIMULATION/TOOLS/rangen_double.c
index 20bd9c1ecb..8f6f1bdfd9 100644
--- a/openair1/SIMULATION/TOOLS/rangen_double.c
+++ b/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;
@@ -175,7 +175,7 @@ void tableNor(unsigned long seed)
   return;
 }
 
-double gaussZiggurat(double mean, double variance)
+double __attribute__ ((no_sanitize_address)) gaussZiggurat(double mean, double variance)
 {
   hz = SHR3;
   iz = hz & 127;

From 6ceaf084bcb2a1600a77325b35fbcb77fcbab458 Mon Sep 17 00:00:00 2001
From: laurent <laurent Thomas>
Date: Fri, 4 Nov 2022 15:24:27 +0100
Subject: [PATCH 04/31] remove usage of /dev/random in case openshit has a
 problem with this

remove usage of /dev/random in case openshit has a problem with this
---
 openair1/SIMULATION/TOOLS/random_channel.c | 9 +++------
 openair1/SIMULATION/TOOLS/rangen_double.c  | 9 ++++++++-
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/openair1/SIMULATION/TOOLS/random_channel.c b/openair1/SIMULATION/TOOLS/random_channel.c
index b11e4b7f67..39c5e5f564 100644
--- a/openair1/SIMULATION/TOOLS/random_channel.c
+++ b/openair1/SIMULATION/TOOLS/random_channel.c
@@ -530,12 +530,9 @@ channel_desc_t *new_channel_desc_scm(uint8_t nb_tx,
                                      float noise_power_dB) {
 
   // To create tables for normal distribution
-  uint64_t rand;
-  FILE *h = fopen("/dev/random", "r");
-  if (fread(&rand, sizeof(rand), 1, h) != 1) {
-    LOG_W(HW, "Simulator can't read /dev/random\n");
-  }
-  tableNor(rand);
+  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));
 
diff --git a/openair1/SIMULATION/TOOLS/rangen_double.c b/openair1/SIMULATION/TOOLS/rangen_double.c
index 8f6f1bdfd9..863012f69a 100644
--- a/openair1/SIMULATION/TOOLS/rangen_double.c
+++ b/openair1/SIMULATION/TOOLS/rangen_double.c
@@ -110,6 +110,7 @@ double __attribute__ ((no_sanitize_address)) gaussdouble(double mean, double var
 }
 
 // Ziggurat
+static bool tableNordDone=false;
 static double wn[128], fn[128];
 static uint32_t iz, jz, jsr = 123456789, kn[128];
 static int32_t hz;
@@ -171,12 +172,18 @@ void tableNor(unsigned long seed)
     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();

From 5ee6cf5de7d8fdbfb5ced964725b1c44198208ac Mon Sep 17 00:00:00 2001
From: laurent <laurent Thomas>
Date: Fri, 4 Nov 2022 15:47:34 +0100
Subject: [PATCH 05/31] change the logic in
 cmake_targets/autotests/run_exec_autotests.bash to run all runs of same test
 in //

---
 cmake_targets/autotests/run_exec_autotests.bash | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/cmake_targets/autotests/run_exec_autotests.bash b/cmake_targets/autotests/run_exec_autotests.bash
index fd5cc45e77..b894cf3288 100755
--- a/cmake_targets/autotests/run_exec_autotests.bash
+++ b/cmake_targets/autotests/run_exec_autotests.bash
@@ -107,12 +107,16 @@ function test_run() {
         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 " >> "$temp_exec_log"
         uname -a >> "$temp_exec_log"
-        "$main_exec" $main_exec_args_array_index >> "$temp_exec_log"  2>&1
+        "$main_exec" $main_exec_args_array_index >> "$temp_exec_log"  2>&1 &
+     done
 
+     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=PASS
         for search_expr in "${search_expr_array[@]}"
         do

From 1336a41024821b5081001c9fda4f10f7c3d2823b Mon Sep 17 00:00:00 2001
From: laurent <laurent Thomas>
Date: Sat, 5 Nov 2022 20:53:27 +0100
Subject: [PATCH 06/31] add time measurement in phy sim CI test

---
 cmake_targets/autotests/run_exec_autotests.bash | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/cmake_targets/autotests/run_exec_autotests.bash b/cmake_targets/autotests/run_exec_autotests.bash
index b894cf3288..2bb42f3d4d 100755
--- a/cmake_targets/autotests/run_exec_autotests.bash
+++ b/cmake_targets/autotests/run_exec_autotests.bash
@@ -69,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"
@@ -105,9 +105,9 @@ function test_run() {
 
         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 " >> "$temp_exec_log"
+        echo "Executing $main_exec $main_exec_args_array_index at $(date)" >> "$temp_exec_log"
         uname -a >> "$temp_exec_log"
-        "$main_exec" $main_exec_args_array_index >> "$temp_exec_log"  2>&1 &
+        time "$main_exec" $main_exec_args_array_index >> "$temp_exec_log"  2>&1 &
      done
 
      wait
@@ -115,7 +115,7 @@ function test_run() {
      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
+        cat "$temp_exec_log" >> "$log_file"  2>&1
 
         result=PASS
         for search_expr in "${search_expr_array[@]}"
@@ -134,10 +134,12 @@ function test_run() {
 
         result_string=$result_string" Run_$run_index =$result"
         if [ $result != PASS ] ; then 
-          global_result = FAIL
+          global_result=FAIL
         fi
 
-      done #End of for loop (nindex)
+     done #End of for loop (nindex)
+
+     echo "END at $(date)" >> "$log_file"
 
       if [ "$global_result" != PASS ]; then
          echo_error "execution $test_case_name.${tags_array[$tags_array_index]} {$PROPER_DESC} Run_Result = \"$result_string\" Result =  FAIL"

From ff738b7bf9085437a2f9f94a13e944d83e5b7e43 Mon Sep 17 00:00:00 2001
From: Sagar Arora <sagar.arora@eurecom.fr>
Date: Thu, 10 Nov 2022 11:20:54 +0100
Subject: [PATCH 07/31] (fix): Remove sudo privilege from helm-charts

- Change security context to anyuid
- Changed from deployment to job, now the pods will be in completed
---
 charts/physims/Chart.yaml                     |  2 +-
 .../templates/{deployment.yaml => job.yaml}   | 21 +----
 .../charts/dlsim.100rb+tm2/values.yaml        |  8 +-
 .../templates/{deployment.yaml => job.yaml}   | 30 +++----
 charts/physims/charts/dlsim.basic/values.yaml | 28 +++---
 .../templates/{deployment.yaml => job.yaml}   | 21 +----
 charts/physims/charts/ldpctest/values.yaml    |  8 +-
 .../templates/{deployment.yaml => job.yaml}   | 21 +----
 charts/physims/charts/nr-dlschsim/values.yaml |  8 +-
 .../templates/{deployment.yaml => job.yaml}   | 21 +----
 .../physims/charts/nr-dlsim.basic/values.yaml |  8 +-
 .../templates/{deployment.yaml => job.yaml}   | 21 +----
 .../charts/nr-dlsim.dmrs+ptrs/values.yaml     |  8 +-
 .../templates/{deployment.yaml => job.yaml}   | 21 +----
 .../charts/nr-dlsim.mcs+mimo/values.yaml      |  8 +-
 .../templates/{deployment.yaml => job.yaml}   | 21 +----
 .../charts/nr-dlsim.offset/values.yaml        |  8 +-
 .../templates/{deployment.yaml => job.yaml}   | 18 +---
 .../charts/nr-pbchsim.106rb/values.yaml       |  8 +-
 .../templates/{deployment.yaml => job.yaml}   | 21 +----
 .../charts/nr-pbchsim.217rb/values.yaml       |  8 +-
 .../templates/{deployment.yaml => job.yaml}   | 21 +----
 .../charts/nr-pbchsim.273rb/values.yaml       |  8 +-
 .../templates/{deployment.yaml => job.yaml}   | 21 +----
 charts/physims/charts/nr-prachsim/values.yaml |  8 +-
 .../templates/{deployment.yaml => job.yaml}   | 21 +----
 charts/physims/charts/nr-pucchsim/values.yaml |  8 +-
 .../templates/{deployment.yaml => job.yaml}   | 21 +----
 charts/physims/charts/nr-ulschsim/values.yaml |  8 +-
 .../templates/{deployment.yaml => job.yaml}   | 21 +----
 .../physims/charts/nr-ulsim.3gpp/values.yaml  |  8 +-
 .../templates/{deployment.yaml => job.yaml}   | 21 +----
 .../physims/charts/nr-ulsim.mimo/values.yaml  |  8 +-
 .../templates/{deployment.yaml => job.yaml}   | 21 +----
 .../physims/charts/nr-ulsim.misc/values.yaml  |  8 +-
 .../templates/{deployment.yaml => job.yaml}   | 19 +---
 .../charts/nr-ulsim.sc-fdma/values.yaml       |  8 +-
 .../templates/{deployment.yaml => job.yaml}   | 21 +----
 charts/physims/charts/polartest/values.yaml   |  8 +-
 .../templates/{deployment.yaml => job.yaml}   | 21 +----
 .../physims/charts/smallblocktest/values.yaml |  8 +-
 .../templates/{deployment.yaml => job.yaml}   | 21 +----
 charts/physims/charts/ulsim/values.yaml       |  8 +-
 charts/physims/templates/rbac.yaml            |  2 +-
 charts/physims/templates/serviceaccount.yaml  |  2 +-
 charts/physims/values.yaml                    | 88 +------------------
 46 files changed, 189 insertions(+), 538 deletions(-)
 rename charts/physims/charts/dlsim.100rb+tm2/templates/{deployment.yaml => job.yaml} (65%)
 rename charts/physims/charts/dlsim.basic/templates/{deployment.yaml => job.yaml} (61%)
 rename charts/physims/charts/ldpctest/templates/{deployment.yaml => job.yaml} (66%)
 rename charts/physims/charts/nr-dlschsim/templates/{deployment.yaml => job.yaml} (65%)
 rename charts/physims/charts/nr-dlsim.basic/templates/{deployment.yaml => job.yaml} (65%)
 rename charts/physims/charts/nr-dlsim.dmrs+ptrs/templates/{deployment.yaml => job.yaml} (64%)
 rename charts/physims/charts/nr-dlsim.mcs+mimo/templates/{deployment.yaml => job.yaml} (65%)
 rename charts/physims/charts/nr-dlsim.offset/templates/{deployment.yaml => job.yaml} (65%)
 rename charts/physims/charts/nr-pbchsim.106rb/templates/{deployment.yaml => job.yaml} (72%)
 rename charts/physims/charts/nr-pbchsim.217rb/templates/{deployment.yaml => job.yaml} (65%)
 rename charts/physims/charts/nr-pbchsim.273rb/templates/{deployment.yaml => job.yaml} (65%)
 rename charts/physims/charts/nr-prachsim/templates/{deployment.yaml => job.yaml} (65%)
 rename charts/physims/charts/nr-pucchsim/templates/{deployment.yaml => job.yaml} (65%)
 rename charts/physims/charts/nr-ulschsim/templates/{deployment.yaml => job.yaml} (65%)
 rename charts/physims/charts/nr-ulsim.3gpp/templates/{deployment.yaml => job.yaml} (65%)
 rename charts/physims/charts/nr-ulsim.mimo/templates/{deployment.yaml => job.yaml} (65%)
 rename charts/physims/charts/nr-ulsim.misc/templates/{deployment.yaml => job.yaml} (65%)
 rename charts/physims/charts/nr-ulsim.sc-fdma/templates/{deployment.yaml => job.yaml} (68%)
 rename charts/physims/charts/polartest/templates/{deployment.yaml => job.yaml} (65%)
 rename charts/physims/charts/smallblocktest/templates/{deployment.yaml => job.yaml} (65%)
 rename charts/physims/charts/ulsim/templates/{deployment.yaml => job.yaml} (66%)

diff --git a/charts/physims/Chart.yaml b/charts/physims/Chart.yaml
index bef28aac27..0a6abe4caa 100644
--- a/charts/physims/Chart.yaml
+++ b/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.
diff --git a/charts/physims/charts/dlsim.100rb+tm2/templates/deployment.yaml b/charts/physims/charts/dlsim.100rb+tm2/templates/job.yaml
similarity index 65%
rename from charts/physims/charts/dlsim.100rb+tm2/templates/deployment.yaml
rename to charts/physims/charts/dlsim.100rb+tm2/templates/job.yaml
index 88bf277a03..03a0813d79 100644
--- a/charts/physims/charts/dlsim.100rb+tm2/templates/deployment.yaml
+++ b/charts/physims/charts/dlsim.100rb+tm2/templates/job.yaml
@@ -1,20 +1,9 @@
-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 }}
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
@@ -28,8 +17,6 @@ spec:
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
-        ports:
-        - containerPort: 80
         env:
         - name: OPENAIR_DIR
           value: /opt/oai-physim
@@ -37,9 +24,9 @@ spec:
         args:
         - >
           cmake_targets/autotests/run_exec_autotests.bash -g "dlsim.100rb+tm2" -d bin/ &&
-          echo "FINISHED" && sleep infinity
+          echo "FINISHED"
       dnsPolicy: ClusterFirst
-      restartPolicy: Always
+      restartPolicy: Never
       schedulerName: default-scheduler
       serviceAccountName: {{ .Values.global.serviceAccountName }}
       terminationGracePeriodSeconds: 30
diff --git a/charts/physims/charts/dlsim.100rb+tm2/values.yaml b/charts/physims/charts/dlsim.100rb+tm2/values.yaml
index f3d1aa3d74..35614bc844 100644
--- a/charts/physims/charts/dlsim.100rb+tm2/values.yaml
+++ b/charts/physims/charts/dlsim.100rb+tm2/values.yaml
@@ -27,10 +27,10 @@ podSecurityContext:
   runAsGroup: 0
 
 securityContext:
-  privileged: true
-  capabilities:
-    add:
-      - SYS_CAP_PTRACE
+  privileged: false
+#  capabilities:
+#    add:
+#      - SYS_CAP_PTRACE
   #   drop:
   #   - ALL
   # readOnlyRootFilesystem: true
diff --git a/charts/physims/charts/dlsim.basic/templates/deployment.yaml b/charts/physims/charts/dlsim.basic/templates/job.yaml
similarity index 61%
rename from charts/physims/charts/dlsim.basic/templates/deployment.yaml
rename to charts/physims/charts/dlsim.basic/templates/job.yaml
index f74f504727..4edd9a5f2f 100644
--- a/charts/physims/charts/dlsim.basic/templates/deployment.yaml
+++ b/charts/physims/charts/dlsim.basic/templates/job.yaml
@@ -1,20 +1,9 @@
-apiVersion: apps/v1
-kind: Deployment
+apiVersion: batch/v1
+kind: Job
 metadata:
   name: {{ .Chart.Name }}
-  labels:
-    {{- include "oai-dlsim-basic.labels" . | nindent 4 }}
 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 }}
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
@@ -26,10 +15,15 @@ spec:
       - name: physim
         image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
+#        resources:
+#          requests:
+#            memory: "4096Mi"
+#            cpu: "4000m"
+#          limits:
+#            memory: "4096Mi"
+#            cpu: "4000m"
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
-        ports:
-        - containerPort: 80
         env:
         - name: OPENAIR_DIR
           value: /opt/oai-physim
@@ -37,9 +31,9 @@ spec:
         args:
         - >
           cmake_targets/autotests/run_exec_autotests.bash -g "dlsim.basic" -d bin/ &&
-          echo "FINISHED" && sleep infinity
+          echo "FINISHED"
       dnsPolicy: ClusterFirst
-      restartPolicy: Always
+      restartPolicy: Never
       schedulerName: default-scheduler
-      serviceAccountName: {{ .Values.global.serviceAccountName }}
+      serviceAccountName: oai-physim-sa 
       terminationGracePeriodSeconds: 30
diff --git a/charts/physims/charts/dlsim.basic/values.yaml b/charts/physims/charts/dlsim.basic/values.yaml
index e36679ec2b..91b9eed407 100644
--- a/charts/physims/charts/dlsim.basic/values.yaml
+++ b/charts/physims/charts/dlsim.basic/values.yaml
@@ -20,17 +20,17 @@ serviceAccount:
   annotations: {}
   # The name of the service account to use.
   # If not set and create is true, a name is generated using the fullname template
-  name: "oai-dlsim-basic"
+  name: "oai-physim-sa" #"oai-dlsim-basic"
 
 podSecurityContext:
   runAsUser: 0
   runAsGroup: 0
 
 securityContext:
-  privileged: true
-  capabilities:
-    add:
-      - SYS_CAP_PTRACE
+  privileged: false
+  #capabilities:
+  #  add:
+  #    - SYS_CAP_PTRACE
   #   drop:
   #   - ALL
   # readOnlyRootFilesystem: true
@@ -41,17 +41,13 @@ 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
+resources:
+   limits:
+     cpu: 100m
+     memory: 128Mi
+   requests:
+     cpu: 100m
+     memory: 128Mi
 
 nodeSelector: {}
 
diff --git a/charts/physims/charts/ldpctest/templates/deployment.yaml b/charts/physims/charts/ldpctest/templates/job.yaml
similarity index 66%
rename from charts/physims/charts/ldpctest/templates/deployment.yaml
rename to charts/physims/charts/ldpctest/templates/job.yaml
index 8df3df5c46..1d1dc2c886 100644
--- a/charts/physims/charts/ldpctest/templates/deployment.yaml
+++ b/charts/physims/charts/ldpctest/templates/job.yaml
@@ -1,20 +1,9 @@
-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 }}
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
@@ -28,8 +17,6 @@ spec:
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
-        ports:
-        - containerPort: 80
         env:
         - name: OPENAIR_DIR
           value: /opt/oai-physim
@@ -37,9 +24,9 @@ spec:
         args:
         - >  
           cmake_targets/autotests/run_exec_autotests.bash -g "ldpctest" -d bin/ &&
-          echo "FINISHED" && sleep infinity
+          echo "FINISHED"
       dnsPolicy: ClusterFirst
-      restartPolicy: Always
+      restartPolicy: Never
       schedulerName: default-scheduler
       serviceAccountName: {{ .Values.global.serviceAccountName }}
       terminationGracePeriodSeconds: 30
diff --git a/charts/physims/charts/ldpctest/values.yaml b/charts/physims/charts/ldpctest/values.yaml
index 0ac20e6dd3..964878baad 100644
--- a/charts/physims/charts/ldpctest/values.yaml
+++ b/charts/physims/charts/ldpctest/values.yaml
@@ -27,10 +27,10 @@ podSecurityContext:
   runAsGroup: 0
 
 securityContext:
-  privileged: true
-  capabilities:
-    add:
-      - SYS_CAP_PTRACE
+  privileged: false
+#  capabilities:
+#    add:
+#      - SYS_CAP_PTRACE
   #   drop:
   #   - ALL
   # readOnlyRootFilesystem: true
diff --git a/charts/physims/charts/nr-dlschsim/templates/deployment.yaml b/charts/physims/charts/nr-dlschsim/templates/job.yaml
similarity index 65%
rename from charts/physims/charts/nr-dlschsim/templates/deployment.yaml
rename to charts/physims/charts/nr-dlschsim/templates/job.yaml
index 1016dbef56..9141c93644 100644
--- a/charts/physims/charts/nr-dlschsim/templates/deployment.yaml
+++ b/charts/physims/charts/nr-dlschsim/templates/job.yaml
@@ -1,20 +1,9 @@
-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 }}
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
@@ -28,8 +17,6 @@ spec:
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
-        ports:
-        - containerPort: 80
         env:
         - name: OPENAIR_DIR
           value: /opt/oai-physim
@@ -37,9 +24,9 @@ spec:
         args:
         - >  
           cmake_targets/autotests/run_exec_autotests.bash -g "nr_dlschsim" -d bin/ &&
-          echo "FINISHED" && sleep infinity
+          echo "FINISHED"
       dnsPolicy: ClusterFirst
-      restartPolicy: Always
+      restartPolicy: Never
       schedulerName: default-scheduler
       serviceAccountName: {{ .Values.global.serviceAccountName }}
       terminationGracePeriodSeconds: 30
diff --git a/charts/physims/charts/nr-dlschsim/values.yaml b/charts/physims/charts/nr-dlschsim/values.yaml
index cb32095f76..05b775444a 100644
--- a/charts/physims/charts/nr-dlschsim/values.yaml
+++ b/charts/physims/charts/nr-dlschsim/values.yaml
@@ -27,10 +27,10 @@ podSecurityContext:
   runAsGroup: 0
 
 securityContext:
-  privileged: true
-  capabilities:
-    add:
-      - SYS_CAP_PTRACE
+  privileged: false
+#  capabilities:
+#    add:
+#      - SYS_CAP_PTRACE
   #   drop:
   #   - ALL
   # readOnlyRootFilesystem: true
diff --git a/charts/physims/charts/nr-dlsim.basic/templates/deployment.yaml b/charts/physims/charts/nr-dlsim.basic/templates/job.yaml
similarity index 65%
rename from charts/physims/charts/nr-dlsim.basic/templates/deployment.yaml
rename to charts/physims/charts/nr-dlsim.basic/templates/job.yaml
index 72ae0406d0..b998f6f184 100644
--- a/charts/physims/charts/nr-dlsim.basic/templates/deployment.yaml
+++ b/charts/physims/charts/nr-dlsim.basic/templates/job.yaml
@@ -1,20 +1,9 @@
-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 }}
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
@@ -28,8 +17,6 @@ spec:
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
-        ports:
-        - containerPort: 80
         env:
         - name: OPENAIR_DIR
           value: /opt/oai-physim
@@ -37,9 +24,9 @@ spec:
         args:
         - >
           cmake_targets/autotests/run_exec_autotests.bash -g "nr_dlsim.basic" -d bin/ &&
-          echo "FINISHED" && sleep infinity
+          echo "FINISHED"
       dnsPolicy: ClusterFirst
-      restartPolicy: Always
+      restartPolicy: Never
       schedulerName: default-scheduler
       serviceAccountName: {{ .Values.global.serviceAccountName }}
       terminationGracePeriodSeconds: 30
diff --git a/charts/physims/charts/nr-dlsim.basic/values.yaml b/charts/physims/charts/nr-dlsim.basic/values.yaml
index 4b9db13d7e..4bd0f82294 100644
--- a/charts/physims/charts/nr-dlsim.basic/values.yaml
+++ b/charts/physims/charts/nr-dlsim.basic/values.yaml
@@ -27,10 +27,10 @@ podSecurityContext:
   runAsGroup: 0
 
 securityContext:
-  privileged: true
-  capabilities:
-    add:
-      - SYS_CAP_PTRACE
+  privileged: false
+#  capabilities:
+#    add:
+#      - SYS_CAP_PTRACE
   #   drop:
   #   - ALL
   # readOnlyRootFilesystem: true
diff --git a/charts/physims/charts/nr-dlsim.dmrs+ptrs/templates/deployment.yaml b/charts/physims/charts/nr-dlsim.dmrs+ptrs/templates/job.yaml
similarity index 64%
rename from charts/physims/charts/nr-dlsim.dmrs+ptrs/templates/deployment.yaml
rename to charts/physims/charts/nr-dlsim.dmrs+ptrs/templates/job.yaml
index 847a1e1aee..4e4948c7c9 100644
--- a/charts/physims/charts/nr-dlsim.dmrs+ptrs/templates/deployment.yaml
+++ b/charts/physims/charts/nr-dlsim.dmrs+ptrs/templates/job.yaml
@@ -1,20 +1,9 @@
-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 }}
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
@@ -28,8 +17,6 @@ spec:
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
-        ports:
-        - containerPort: 80
         env:
         - name: OPENAIR_DIR
           value: /opt/oai-physim
@@ -37,9 +24,9 @@ spec:
         args:
         - >
           cmake_targets/autotests/run_exec_autotests.bash -g "nr_dlsim.dmrs+ptrs" -d bin/ &&
-          echo "FINISHED" && sleep infinity
+          echo "FINISHED"
       dnsPolicy: ClusterFirst
-      restartPolicy: Always
+      restartPolicy: Never
       schedulerName: default-scheduler
       serviceAccountName: {{ .Values.global.serviceAccountName }}
       terminationGracePeriodSeconds: 30
diff --git a/charts/physims/charts/nr-dlsim.dmrs+ptrs/values.yaml b/charts/physims/charts/nr-dlsim.dmrs+ptrs/values.yaml
index 8c1814f19d..dffc443398 100644
--- a/charts/physims/charts/nr-dlsim.dmrs+ptrs/values.yaml
+++ b/charts/physims/charts/nr-dlsim.dmrs+ptrs/values.yaml
@@ -27,10 +27,10 @@ podSecurityContext:
   runAsGroup: 0
 
 securityContext:
-  privileged: true
-  capabilities:
-    add:
-      - SYS_CAP_PTRACE
+  privileged: false
+#  capabilities:
+#    add:
+#      - SYS_CAP_PTRACE
   #   drop:
   #   - ALL
   # readOnlyRootFilesystem: true
diff --git a/charts/physims/charts/nr-dlsim.mcs+mimo/templates/deployment.yaml b/charts/physims/charts/nr-dlsim.mcs+mimo/templates/job.yaml
similarity index 65%
rename from charts/physims/charts/nr-dlsim.mcs+mimo/templates/deployment.yaml
rename to charts/physims/charts/nr-dlsim.mcs+mimo/templates/job.yaml
index c79eaf01a2..ff8ec59352 100644
--- a/charts/physims/charts/nr-dlsim.mcs+mimo/templates/deployment.yaml
+++ b/charts/physims/charts/nr-dlsim.mcs+mimo/templates/job.yaml
@@ -1,20 +1,9 @@
-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 }}
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
@@ -28,8 +17,6 @@ spec:
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
-        ports:
-        - containerPort: 80
         env:
         - name: OPENAIR_DIR
           value: /opt/oai-physim
@@ -37,9 +24,9 @@ spec:
         args:
         - >
           cmake_targets/autotests/run_exec_autotests.bash -g "nr_dlsim.mcs+mimo" -d bin/ &&
-          echo "FINISHED" && sleep infinity
+          echo "FINISHED"
       dnsPolicy: ClusterFirst
-      restartPolicy: Always
+      restartPolicy: Never
       schedulerName: default-scheduler
       serviceAccountName: {{ .Values.global.serviceAccountName }}
       terminationGracePeriodSeconds: 30
diff --git a/charts/physims/charts/nr-dlsim.mcs+mimo/values.yaml b/charts/physims/charts/nr-dlsim.mcs+mimo/values.yaml
index 5bb48ad15d..8c56f219b4 100644
--- a/charts/physims/charts/nr-dlsim.mcs+mimo/values.yaml
+++ b/charts/physims/charts/nr-dlsim.mcs+mimo/values.yaml
@@ -27,10 +27,10 @@ podSecurityContext:
   runAsGroup: 0
 
 securityContext:
-  privileged: true
-  capabilities:
-    add:
-      - SYS_CAP_PTRACE
+  privileged: false
+#  capabilities:
+#    add:
+#      - SYS_CAP_PTRACE
   #   drop:
   #   - ALL
   # readOnlyRootFilesystem: true
diff --git a/charts/physims/charts/nr-dlsim.offset/templates/deployment.yaml b/charts/physims/charts/nr-dlsim.offset/templates/job.yaml
similarity index 65%
rename from charts/physims/charts/nr-dlsim.offset/templates/deployment.yaml
rename to charts/physims/charts/nr-dlsim.offset/templates/job.yaml
index b952654c93..71a5f88542 100644
--- a/charts/physims/charts/nr-dlsim.offset/templates/deployment.yaml
+++ b/charts/physims/charts/nr-dlsim.offset/templates/job.yaml
@@ -1,20 +1,9 @@
-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 }}
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
@@ -28,8 +17,6 @@ spec:
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
-        ports:
-        - containerPort: 80
         env:
         - name: OPENAIR_DIR
           value: /opt/oai-physim
@@ -37,9 +24,9 @@ spec:
         args:
         - >
           cmake_targets/autotests/run_exec_autotests.bash -g "nr_dlsim.offset" -d bin/ &&
-          echo "FINISHED" && sleep infinity
+          echo "FINISHED"
       dnsPolicy: ClusterFirst
-      restartPolicy: Always
+      restartPolicy: Never
       schedulerName: default-scheduler
       serviceAccountName: {{ .Values.global.serviceAccountName }}
       terminationGracePeriodSeconds: 30
diff --git a/charts/physims/charts/nr-dlsim.offset/values.yaml b/charts/physims/charts/nr-dlsim.offset/values.yaml
index 40c1a94efe..8de40ffcaa 100644
--- a/charts/physims/charts/nr-dlsim.offset/values.yaml
+++ b/charts/physims/charts/nr-dlsim.offset/values.yaml
@@ -27,10 +27,10 @@ podSecurityContext:
   runAsGroup: 0
 
 securityContext:
-  privileged: true
-  capabilities:
-    add:
-      - SYS_CAP_PTRACE
+  privileged: false
+#  capabilities:
+#    add:
+#      - SYS_CAP_PTRACE
   #   drop:
   #   - ALL
   # readOnlyRootFilesystem: true
diff --git a/charts/physims/charts/nr-pbchsim.106rb/templates/deployment.yaml b/charts/physims/charts/nr-pbchsim.106rb/templates/job.yaml
similarity index 72%
rename from charts/physims/charts/nr-pbchsim.106rb/templates/deployment.yaml
rename to charts/physims/charts/nr-pbchsim.106rb/templates/job.yaml
index ed0f8f1570..6b560eded2 100644
--- a/charts/physims/charts/nr-pbchsim.106rb/templates/deployment.yaml
+++ b/charts/physims/charts/nr-pbchsim.106rb/templates/job.yaml
@@ -1,16 +1,8 @@
-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:
@@ -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
@@ -37,9 +27,9 @@ spec:
         args:
         - >
           cmake_targets/autotests/run_exec_autotests.bash -g "nr_pbchsim.106rb" -d bin/ &&
-          echo "FINISHED" && sleep infinity
+          echo "FINISHED"
       dnsPolicy: ClusterFirst
-      restartPolicy: Always
+      restartPolicy: Never
       schedulerName: default-scheduler
       serviceAccountName: {{ .Values.global.serviceAccountName }}
       terminationGracePeriodSeconds: 30
diff --git a/charts/physims/charts/nr-pbchsim.106rb/values.yaml b/charts/physims/charts/nr-pbchsim.106rb/values.yaml
index 5632762245..fdeacbc96e 100644
--- a/charts/physims/charts/nr-pbchsim.106rb/values.yaml
+++ b/charts/physims/charts/nr-pbchsim.106rb/values.yaml
@@ -27,10 +27,10 @@ podSecurityContext:
   runAsGroup: 0
 
 securityContext:
-  privileged: true
-  capabilities:
-    add:
-      - SYS_CAP_PTRACE
+  privileged: false
+#  capabilities:
+#    add:
+#      - SYS_CAP_PTRACE
   #   drop:
   #   - ALL
   # readOnlyRootFilesystem: true
diff --git a/charts/physims/charts/nr-pbchsim.217rb/templates/deployment.yaml b/charts/physims/charts/nr-pbchsim.217rb/templates/job.yaml
similarity index 65%
rename from charts/physims/charts/nr-pbchsim.217rb/templates/deployment.yaml
rename to charts/physims/charts/nr-pbchsim.217rb/templates/job.yaml
index 513443deaa..7f6c11dd43 100644
--- a/charts/physims/charts/nr-pbchsim.217rb/templates/deployment.yaml
+++ b/charts/physims/charts/nr-pbchsim.217rb/templates/job.yaml
@@ -1,20 +1,9 @@
-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 }}
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
@@ -28,8 +17,6 @@ spec:
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
-        ports:
-        - containerPort: 80
         env:
         - name: OPENAIR_DIR
           value: /opt/oai-physim
@@ -37,9 +24,9 @@ spec:
         args:
         - >
           cmake_targets/autotests/run_exec_autotests.bash -g "nr_pbchsim.217rb" -d bin/ &&
-          echo "FINISHED" && sleep infinity
+          echo "FINISHED"
       dnsPolicy: ClusterFirst
-      restartPolicy: Always
+      restartPolicy: Never
       schedulerName: default-scheduler
       serviceAccountName: {{ .Values.global.serviceAccountName }}
       terminationGracePeriodSeconds: 30
diff --git a/charts/physims/charts/nr-pbchsim.217rb/values.yaml b/charts/physims/charts/nr-pbchsim.217rb/values.yaml
index 7b44b982de..325703f53d 100644
--- a/charts/physims/charts/nr-pbchsim.217rb/values.yaml
+++ b/charts/physims/charts/nr-pbchsim.217rb/values.yaml
@@ -27,10 +27,10 @@ podSecurityContext:
   runAsGroup: 0
 
 securityContext:
-  privileged: true
-  capabilities:
-    add:
-      - SYS_CAP_PTRACE
+  privileged: false
+#  capabilities:
+#    add:
+#      - SYS_CAP_PTRACE
   #   drop:
   #   - ALL
   # readOnlyRootFilesystem: true
diff --git a/charts/physims/charts/nr-pbchsim.273rb/templates/deployment.yaml b/charts/physims/charts/nr-pbchsim.273rb/templates/job.yaml
similarity index 65%
rename from charts/physims/charts/nr-pbchsim.273rb/templates/deployment.yaml
rename to charts/physims/charts/nr-pbchsim.273rb/templates/job.yaml
index 512e212c07..5f16b06c1d 100644
--- a/charts/physims/charts/nr-pbchsim.273rb/templates/deployment.yaml
+++ b/charts/physims/charts/nr-pbchsim.273rb/templates/job.yaml
@@ -1,20 +1,9 @@
-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 }}
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
@@ -28,8 +17,6 @@ spec:
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
-        ports:
-        - containerPort: 80
         env:
         - name: OPENAIR_DIR
           value: /opt/oai-physim
@@ -37,9 +24,9 @@ spec:
         args:
         - >
           cmake_targets/autotests/run_exec_autotests.bash -g "nr_pbchsim.273rb" -d bin/ &&
-          echo "FINISHED" && sleep infinity
+          echo "FINISHED"
       dnsPolicy: ClusterFirst
-      restartPolicy: Always
+      restartPolicy: Never
       schedulerName: default-scheduler
       serviceAccountName: {{ .Values.global.serviceAccountName }}
       terminationGracePeriodSeconds: 30
diff --git a/charts/physims/charts/nr-pbchsim.273rb/values.yaml b/charts/physims/charts/nr-pbchsim.273rb/values.yaml
index 9cb5f6ebb5..529cedd5dc 100644
--- a/charts/physims/charts/nr-pbchsim.273rb/values.yaml
+++ b/charts/physims/charts/nr-pbchsim.273rb/values.yaml
@@ -27,10 +27,10 @@ podSecurityContext:
   runAsGroup: 0
 
 securityContext:
-  privileged: true
-  capabilities:
-    add:
-      - SYS_CAP_PTRACE
+  privileged: false
+#  capabilities:
+#    add:
+#      - SYS_CAP_PTRACE
   #   drop:
   #   - ALL
   # readOnlyRootFilesystem: true
diff --git a/charts/physims/charts/nr-prachsim/templates/deployment.yaml b/charts/physims/charts/nr-prachsim/templates/job.yaml
similarity index 65%
rename from charts/physims/charts/nr-prachsim/templates/deployment.yaml
rename to charts/physims/charts/nr-prachsim/templates/job.yaml
index 6bea044b86..2b366e3655 100644
--- a/charts/physims/charts/nr-prachsim/templates/deployment.yaml
+++ b/charts/physims/charts/nr-prachsim/templates/job.yaml
@@ -1,20 +1,9 @@
-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 }}
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
@@ -28,8 +17,6 @@ spec:
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
-        ports:
-        - containerPort: 80
         env:
         - name: OPENAIR_DIR
           value: /opt/oai-physim
@@ -37,9 +24,9 @@ spec:
         args:
         - >  
           cmake_targets/autotests/run_exec_autotests.bash -g "nr_prachsim" -d bin/ &&
-          echo "FINISHED" && sleep infinity
+          echo "FINISHED" 
       dnsPolicy: ClusterFirst
-      restartPolicy: Always
+      restartPolicy: Never
       schedulerName: default-scheduler
       serviceAccountName: {{ .Values.global.serviceAccountName }}
       terminationGracePeriodSeconds: 30
diff --git a/charts/physims/charts/nr-prachsim/values.yaml b/charts/physims/charts/nr-prachsim/values.yaml
index 93789de637..99b4f70f28 100644
--- a/charts/physims/charts/nr-prachsim/values.yaml
+++ b/charts/physims/charts/nr-prachsim/values.yaml
@@ -27,10 +27,10 @@ podSecurityContext:
   runAsGroup: 0
 
 securityContext:
-  privileged: true
-  capabilities:
-    add:
-      - SYS_CAP_PTRACE
+  privileged: false
+#  capabilities:
+#    add:
+#      - SYS_CAP_PTRACE
   #   drop:
   #   - ALL
   # readOnlyRootFilesystem: true
diff --git a/charts/physims/charts/nr-pucchsim/templates/deployment.yaml b/charts/physims/charts/nr-pucchsim/templates/job.yaml
similarity index 65%
rename from charts/physims/charts/nr-pucchsim/templates/deployment.yaml
rename to charts/physims/charts/nr-pucchsim/templates/job.yaml
index fce72ebc35..2b1d7b016b 100644
--- a/charts/physims/charts/nr-pucchsim/templates/deployment.yaml
+++ b/charts/physims/charts/nr-pucchsim/templates/job.yaml
@@ -1,20 +1,9 @@
-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 }}
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
@@ -28,8 +17,6 @@ spec:
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
-        ports:
-        - containerPort: 80
         env:
         - name: OPENAIR_DIR
           value: /opt/oai-physim
@@ -37,9 +24,9 @@ spec:
         args:
         - >  
           cmake_targets/autotests/run_exec_autotests.bash -g "nr_pucchsim" -d bin/ &&
-          echo "FINISHED" && sleep infinity
+          echo "FINISHED"
       dnsPolicy: ClusterFirst
-      restartPolicy: Always
+      restartPolicy: Never
       schedulerName: default-scheduler
       serviceAccountName: {{ .Values.global.serviceAccountName }}
       terminationGracePeriodSeconds: 30
diff --git a/charts/physims/charts/nr-pucchsim/values.yaml b/charts/physims/charts/nr-pucchsim/values.yaml
index d4c869278b..4d7a4b8750 100644
--- a/charts/physims/charts/nr-pucchsim/values.yaml
+++ b/charts/physims/charts/nr-pucchsim/values.yaml
@@ -27,10 +27,10 @@ podSecurityContext:
   runAsGroup: 0
 
 securityContext:
-  privileged: true
-  capabilities:
-    add:
-      - SYS_CAP_PTRACE
+  privileged: false
+#  capabilities:
+#    add:
+#      - SYS_CAP_PTRACE
   #   drop:
   #   - ALL
   # readOnlyRootFilesystem: true
diff --git a/charts/physims/charts/nr-ulschsim/templates/deployment.yaml b/charts/physims/charts/nr-ulschsim/templates/job.yaml
similarity index 65%
rename from charts/physims/charts/nr-ulschsim/templates/deployment.yaml
rename to charts/physims/charts/nr-ulschsim/templates/job.yaml
index d44b2b6463..e54f2095a6 100644
--- a/charts/physims/charts/nr-ulschsim/templates/deployment.yaml
+++ b/charts/physims/charts/nr-ulschsim/templates/job.yaml
@@ -1,20 +1,9 @@
-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 }}
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
@@ -28,8 +17,6 @@ spec:
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
-        ports:
-        - containerPort: 80
         env:
         - name: OPENAIR_DIR
           value: /opt/oai-physim
@@ -37,9 +24,9 @@ spec:
         args:
         - >  
           cmake_targets/autotests/run_exec_autotests.bash -g "nr_ulschsim" -d bin/ &&
-          echo "FINISHED" && sleep infinity
+          echo "FINISHED"
       dnsPolicy: ClusterFirst
-      restartPolicy: Always
+      restartPolicy: Never
       schedulerName: default-scheduler
       serviceAccountName: {{ .Values.global.serviceAccountName }}
       terminationGracePeriodSeconds: 30
diff --git a/charts/physims/charts/nr-ulschsim/values.yaml b/charts/physims/charts/nr-ulschsim/values.yaml
index b0529c818d..083f4b43f1 100644
--- a/charts/physims/charts/nr-ulschsim/values.yaml
+++ b/charts/physims/charts/nr-ulschsim/values.yaml
@@ -27,10 +27,10 @@ podSecurityContext:
   runAsGroup: 0
 
 securityContext:
-  privileged: true
-  capabilities:
-    add:
-      - SYS_CAP_PTRACE
+  privileged: false
+#  capabilities:
+#    add:
+#      - SYS_CAP_PTRACE
   #   drop:
   #   - ALL
   # readOnlyRootFilesystem: true
diff --git a/charts/physims/charts/nr-ulsim.3gpp/templates/deployment.yaml b/charts/physims/charts/nr-ulsim.3gpp/templates/job.yaml
similarity index 65%
rename from charts/physims/charts/nr-ulsim.3gpp/templates/deployment.yaml
rename to charts/physims/charts/nr-ulsim.3gpp/templates/job.yaml
index 7bf59eed4f..2c92769c4d 100644
--- a/charts/physims/charts/nr-ulsim.3gpp/templates/deployment.yaml
+++ b/charts/physims/charts/nr-ulsim.3gpp/templates/job.yaml
@@ -1,20 +1,9 @@
-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 }}
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
@@ -28,8 +17,6 @@ spec:
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
-        ports:
-        - containerPort: 80
         env:
         - name: OPENAIR_DIR
           value: /opt/oai-physim
@@ -37,9 +24,9 @@ spec:
         args:
         - >
           cmake_targets/autotests/run_exec_autotests.bash -g "nr_ulsim.3gpp" -d bin/ &&
-          echo "FINISHED" && sleep infinity
+          echo "FINISHED" 
       dnsPolicy: ClusterFirst
-      restartPolicy: Always
+      restartPolicy: Never
       schedulerName: default-scheduler
       serviceAccountName: {{ .Values.global.serviceAccountName }}
       terminationGracePeriodSeconds: 30
diff --git a/charts/physims/charts/nr-ulsim.3gpp/values.yaml b/charts/physims/charts/nr-ulsim.3gpp/values.yaml
index 3d44bda9b8..adbe124197 100644
--- a/charts/physims/charts/nr-ulsim.3gpp/values.yaml
+++ b/charts/physims/charts/nr-ulsim.3gpp/values.yaml
@@ -27,10 +27,10 @@ podSecurityContext:
   runAsGroup: 0
 
 securityContext:
-  privileged: true
-  capabilities:
-    add:
-      - SYS_CAP_PTRACE
+  privileged: false
+#  capabilities:
+#    add:
+#      - SYS_CAP_PTRACE
   #   drop:
   #   - ALL
   # readOnlyRootFilesystem: true
diff --git a/charts/physims/charts/nr-ulsim.mimo/templates/deployment.yaml b/charts/physims/charts/nr-ulsim.mimo/templates/job.yaml
similarity index 65%
rename from charts/physims/charts/nr-ulsim.mimo/templates/deployment.yaml
rename to charts/physims/charts/nr-ulsim.mimo/templates/job.yaml
index e8d6ecf7ce..9d6c284b91 100644
--- a/charts/physims/charts/nr-ulsim.mimo/templates/deployment.yaml
+++ b/charts/physims/charts/nr-ulsim.mimo/templates/job.yaml
@@ -1,20 +1,9 @@
-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 }}
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
@@ -28,8 +17,6 @@ spec:
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
-        ports:
-        - containerPort: 80
         env:
         - name: OPENAIR_DIR
           value: /opt/oai-physim
@@ -37,9 +24,9 @@ spec:
         args:
         - >
           cmake_targets/autotests/run_exec_autotests.bash -g "nr_ulsim.mimo" -d bin/ &&
-          echo "FINISHED" && sleep infinity
+          echo "FINISHED"
       dnsPolicy: ClusterFirst
-      restartPolicy: Always
+      restartPolicy: Never
       schedulerName: default-scheduler
       serviceAccountName: {{ .Values.global.serviceAccountName }}
       terminationGracePeriodSeconds: 30
diff --git a/charts/physims/charts/nr-ulsim.mimo/values.yaml b/charts/physims/charts/nr-ulsim.mimo/values.yaml
index 55bdcd6158..1b527ee5fa 100644
--- a/charts/physims/charts/nr-ulsim.mimo/values.yaml
+++ b/charts/physims/charts/nr-ulsim.mimo/values.yaml
@@ -27,10 +27,10 @@ podSecurityContext:
   runAsGroup: 0
 
 securityContext:
-  privileged: true
-  capabilities:
-    add:
-      - SYS_CAP_PTRACE
+  privileged: false
+#  capabilities:
+#    add:
+#      - SYS_CAP_PTRACE
   #   drop:
   #   - ALL
   # readOnlyRootFilesystem: true
diff --git a/charts/physims/charts/nr-ulsim.misc/templates/deployment.yaml b/charts/physims/charts/nr-ulsim.misc/templates/job.yaml
similarity index 65%
rename from charts/physims/charts/nr-ulsim.misc/templates/deployment.yaml
rename to charts/physims/charts/nr-ulsim.misc/templates/job.yaml
index 56c25fbbc3..72ca08712b 100644
--- a/charts/physims/charts/nr-ulsim.misc/templates/deployment.yaml
+++ b/charts/physims/charts/nr-ulsim.misc/templates/job.yaml
@@ -1,20 +1,9 @@
-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 }}
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
@@ -28,8 +17,6 @@ spec:
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
-        ports:
-        - containerPort: 80
         env:
         - name: OPENAIR_DIR
           value: /opt/oai-physim
@@ -37,9 +24,9 @@ spec:
         args:
         - >
           cmake_targets/autotests/run_exec_autotests.bash -g "nr_ulsim.misc" -d bin/ &&
-          echo "FINISHED" && sleep infinity
+          echo "FINISHED"
       dnsPolicy: ClusterFirst
-      restartPolicy: Always
+      restartPolicy: Never
       schedulerName: default-scheduler
       serviceAccountName: {{ .Values.global.serviceAccountName }}
       terminationGracePeriodSeconds: 30
diff --git a/charts/physims/charts/nr-ulsim.misc/values.yaml b/charts/physims/charts/nr-ulsim.misc/values.yaml
index dcae7a2b66..c3e265bf69 100644
--- a/charts/physims/charts/nr-ulsim.misc/values.yaml
+++ b/charts/physims/charts/nr-ulsim.misc/values.yaml
@@ -27,10 +27,10 @@ podSecurityContext:
   runAsGroup: 0
 
 securityContext:
-  privileged: true
-  capabilities:
-    add:
-      - SYS_CAP_PTRACE
+  privileged: false
+#  capabilities:
+#    add:
+#      - SYS_CAP_PTRACE
   #   drop:
   #   - ALL
   # readOnlyRootFilesystem: true
diff --git a/charts/physims/charts/nr-ulsim.sc-fdma/templates/deployment.yaml b/charts/physims/charts/nr-ulsim.sc-fdma/templates/job.yaml
similarity index 68%
rename from charts/physims/charts/nr-ulsim.sc-fdma/templates/deployment.yaml
rename to charts/physims/charts/nr-ulsim.sc-fdma/templates/job.yaml
index 3119950e20..05dccbf705 100644
--- a/charts/physims/charts/nr-ulsim.sc-fdma/templates/deployment.yaml
+++ b/charts/physims/charts/nr-ulsim.sc-fdma/templates/job.yaml
@@ -1,20 +1,9 @@
-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 }}
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
@@ -37,9 +26,9 @@ spec:
         args:
         - >
           cmake_targets/autotests/run_exec_autotests.bash -g "nr_ulsim.sc-fdma" -d bin/ &&
-          echo "FINISHED" && sleep infinity
+          echo "FINISHED" 
       dnsPolicy: ClusterFirst
-      restartPolicy: Always
+      restartPolicy: Never
       schedulerName: default-scheduler
       serviceAccountName: {{ .Values.global.serviceAccountName }}
       terminationGracePeriodSeconds: 30
diff --git a/charts/physims/charts/nr-ulsim.sc-fdma/values.yaml b/charts/physims/charts/nr-ulsim.sc-fdma/values.yaml
index 0536fb03b6..05a952a1ac 100644
--- a/charts/physims/charts/nr-ulsim.sc-fdma/values.yaml
+++ b/charts/physims/charts/nr-ulsim.sc-fdma/values.yaml
@@ -27,10 +27,10 @@ podSecurityContext:
   runAsGroup: 0
 
 securityContext:
-  privileged: true
-  capabilities:
-    add:
-      - SYS_CAP_PTRACE
+  privileged: false
+#  capabilities:
+#    add:
+#      - SYS_CAP_PTRACE
   #   drop:
   #   - ALL
   # readOnlyRootFilesystem: true
diff --git a/charts/physims/charts/polartest/templates/deployment.yaml b/charts/physims/charts/polartest/templates/job.yaml
similarity index 65%
rename from charts/physims/charts/polartest/templates/deployment.yaml
rename to charts/physims/charts/polartest/templates/job.yaml
index 20dac8ebf7..8f0998d9f3 100644
--- a/charts/physims/charts/polartest/templates/deployment.yaml
+++ b/charts/physims/charts/polartest/templates/job.yaml
@@ -1,20 +1,9 @@
-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 }}
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
@@ -28,8 +17,6 @@ spec:
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
-        ports:
-        - containerPort: 80
         env:
         - name: OPENAIR_DIR
           value: /opt/oai-physim
@@ -37,9 +24,9 @@ spec:
         args:
         - >  
           cmake_targets/autotests/run_exec_autotests.bash -g "polartest" -d bin/ &&
-          echo "FINISHED" && sleep infinity
+          echo "FINISHED"
       dnsPolicy: ClusterFirst
-      restartPolicy: Always
+      restartPolicy: Never
       schedulerName: default-scheduler
       serviceAccountName: {{ .Values.global.serviceAccountName }}
       terminationGracePeriodSeconds: 30
diff --git a/charts/physims/charts/polartest/values.yaml b/charts/physims/charts/polartest/values.yaml
index f7195dd572..c91ee2bf5b 100644
--- a/charts/physims/charts/polartest/values.yaml
+++ b/charts/physims/charts/polartest/values.yaml
@@ -27,10 +27,10 @@ podSecurityContext:
   runAsGroup: 0
 
 securityContext:
-  privileged: true
-  capabilities:
-    add:
-      - SYS_CAP_PTRACE
+  privileged: false
+#  capabilities:
+#    add:
+#      - SYS_CAP_PTRACE
   #   drop:
   #   - ALL
   # readOnlyRootFilesystem: true
diff --git a/charts/physims/charts/smallblocktest/templates/deployment.yaml b/charts/physims/charts/smallblocktest/templates/job.yaml
similarity index 65%
rename from charts/physims/charts/smallblocktest/templates/deployment.yaml
rename to charts/physims/charts/smallblocktest/templates/job.yaml
index aafb16e054..d136a1fcf3 100644
--- a/charts/physims/charts/smallblocktest/templates/deployment.yaml
+++ b/charts/physims/charts/smallblocktest/templates/job.yaml
@@ -1,20 +1,9 @@
-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 }}
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
@@ -28,8 +17,6 @@ spec:
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
-        ports:
-        - containerPort: 80
         env:
         - name: OPENAIR_DIR
           value: /opt/oai-physim
@@ -37,9 +24,9 @@ spec:
         args:
         - >  
           cmake_targets/autotests/run_exec_autotests.bash -g "smallblocktest" -d bin/ &&
-          echo "FINISHED" && sleep infinity
+          echo "FINISHED"
       dnsPolicy: ClusterFirst
-      restartPolicy: Always
+      restartPolicy: Never
       schedulerName: default-scheduler
       serviceAccountName: {{ .Values.global.serviceAccountName }}
       terminationGracePeriodSeconds: 30
diff --git a/charts/physims/charts/smallblocktest/values.yaml b/charts/physims/charts/smallblocktest/values.yaml
index f08db5501a..f4d8a31fd9 100644
--- a/charts/physims/charts/smallblocktest/values.yaml
+++ b/charts/physims/charts/smallblocktest/values.yaml
@@ -27,10 +27,10 @@ podSecurityContext:
   runAsGroup: 0
 
 securityContext:
-  privileged: true
-  capabilities:
-    add:
-      - SYS_CAP_PTRACE
+  privileged: false
+#  capabilities:
+#    add:
+#      - SYS_CAP_PTRACE
   #   drop:
   #   - ALL
   # readOnlyRootFilesystem: true
diff --git a/charts/physims/charts/ulsim/templates/deployment.yaml b/charts/physims/charts/ulsim/templates/job.yaml
similarity index 66%
rename from charts/physims/charts/ulsim/templates/deployment.yaml
rename to charts/physims/charts/ulsim/templates/job.yaml
index 3185b074b2..f2e904edb8 100644
--- a/charts/physims/charts/ulsim/templates/deployment.yaml
+++ b/charts/physims/charts/ulsim/templates/job.yaml
@@ -1,20 +1,9 @@
-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 }}
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
@@ -28,8 +17,6 @@ spec:
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
-        ports:
-        - containerPort: 80
         env:
         - name: OPENAIR_DIR
           value: /opt/oai-physim
@@ -37,9 +24,9 @@ spec:
         args:
         - >  
           cmake_targets/autotests/run_exec_autotests.bash -g "ulsim" -d bin/ &&
-          echo "FINISHED" && sleep infinity
+          echo "FINISHED"
       dnsPolicy: ClusterFirst
-      restartPolicy: Always
+      restartPolicy: Never
       schedulerName: default-scheduler
       serviceAccountName: {{ .Values.global.serviceAccountName }}
       terminationGracePeriodSeconds: 30
diff --git a/charts/physims/charts/ulsim/values.yaml b/charts/physims/charts/ulsim/values.yaml
index 3e625f02c6..7ed2c6bed0 100644
--- a/charts/physims/charts/ulsim/values.yaml
+++ b/charts/physims/charts/ulsim/values.yaml
@@ -27,10 +27,10 @@ podSecurityContext:
   runAsGroup: 0
 
 securityContext:
-  privileged: true
-  capabilities:
-    add:
-      - SYS_CAP_PTRACE
+  privileged: false
+#  capabilities:
+#    add:
+#      - SYS_CAP_PTRACE
   #   drop:
   #   - ALL
   # readOnlyRootFilesystem: true
diff --git a/charts/physims/templates/rbac.yaml b/charts/physims/templates/rbac.yaml
index b341744796..989988baca 100644
--- a/charts/physims/templates/rbac.yaml
+++ b/charts/physims/templates/rbac.yaml
@@ -6,7 +6,7 @@ rules:
 - apiGroups:
   - security.openshift.io
   resourceNames:
-  - privileged
+  - anyuid
   resources:
   - securitycontextconstraints
   verbs:
diff --git a/charts/physims/templates/serviceaccount.yaml b/charts/physims/templates/serviceaccount.yaml
index 21d094ad38..0810702f4f 100644
--- a/charts/physims/templates/serviceaccount.yaml
+++ b/charts/physims/templates/serviceaccount.yaml
@@ -1,4 +1,4 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{ .Values.global.serviceAccountName }}
+  name: oai-physim-sa #{{ .Values.global.serviceAccountName }}
diff --git a/charts/physims/values.yaml b/charts/physims/values.yaml
index 7d0faa33ce..53190daff7 100644
--- a/charts/physims/values.yaml
+++ b/charts/physims/values.yaml
@@ -5,137 +5,53 @@
 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
 
-## Declaring values specific to coressponding physim to overwrite
+## Declaring values specific to coressponding physim to overwrite (At the moment unused)
 
 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

From 7a664c00fda1f87200374158929e801a43c324b5 Mon Sep 17 00:00:00 2001
From: luis_pereira87 <lpereira@allbesmart.pt>
Date: Mon, 31 Oct 2022 13:40:13 +0000
Subject: [PATCH 08/31] Tutorials: improvements on "Advanced configurations"
 section

---
 doc/NR_SA_CN5G_gNB_USRP_COTS_UE_Tutorial.md | 44 ++++++++++-----------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/doc/NR_SA_CN5G_gNB_USRP_COTS_UE_Tutorial.md b/doc/NR_SA_CN5G_gNB_USRP_COTS_UE_Tutorial.md
index d0eab6c53a..e04b7a660c 100644
--- a/doc/NR_SA_CN5G_gNB_USRP_COTS_UE_Tutorial.md
+++ b/doc/NR_SA_CN5G_gNB_USRP_COTS_UE_Tutorial.md
@@ -147,28 +147,6 @@ cd cmake_targets
 ./build_oai -w USRP --ninja --nrUE --gNB --build-lib all -c
 ```
 
-## 3.3 USRP N300 and X300 Ethernet Tuning
-
-Please also refer to the official [USRP Host Performance Tuning Tips and Tricks](https://kb.ettus.com/USRP_Host_Performance_Tuning_Tips_and_Tricks) tuning guide.
-
-The following steps are recommended. Please change the network interface(s) as required. Also, you should have 10Gbps interface(s): if you use two cables, you should have the XG interface. Refer to the [N300 Getting Started Guide](https://kb.ettus.com/USRP_N300/N310/N320/N321_Getting_Started_Guide) for more information.
-
-* Use an MTU of 9000: how to change this depends on the network management tool. In the case of Network Manager, this can be done from the GUI.
-* Increase the kernel socket buffer (also done by the USRP driver in OAI)
-* Increase Ethernet Ring Buffers: `sudo ethtool -G <ifname> rx 4096 tx 4096`
-* Disable hyper-threading in the BIOS (This step is optional)
-* Optional: Disable KPTI Protections for Spectre/Meltdown for more performance. **This is a security risk.** Add `mitigations=off nosmt` in your grub config and update grub. (This step is optional)
-
-Example code to run:
-```
-for ((i=0;i<$(nproc);i++)); do sudo cpufreq-set -c $i -r -g performance; done
-sudo sysctl -w net.core.wmem_max=62500000
-sudo sysctl -w net.core.rmem_max=62500000
-sudo sysctl -w net.core.wmem_default=62500000
-sudo sysctl -w net.core.rmem_default=62500000
-sudo ethtool -G enp1s0f0 tx 4096 rx 4096
-```
-
 # 4. Run OAI CN5G and OAI gNB
 
 ## 4.1 Run OAI CN5G
@@ -248,6 +226,28 @@ docker exec -it oai-ext-dn iperf -u -t 86400 -i 1 -fk -B 192.168.70.135 -b 100M
 
 # 6. Advanced configuration (optional)
 
+Please also refer to the official [USRP Host Performance Tuning Tips and Tricks](https://kb.ettus.com/USRP_Host_Performance_Tuning_Tips_and_Tricks) tuning guide.
+
+The following steps are recommended. Please change the network interface(s) as required. Also, you should have 10Gbps interface(s): if you use two cables, you should have the XG interface. Refer to the [N300 Getting Started Guide](https://kb.ettus.com/USRP_N300/N310/N320/N321_Getting_Started_Guide) for more information.
+
+* Use an MTU of 9000: how to change this depends on the network management tool. In the case of Network Manager, this can be done from the GUI.
+* Increase the kernel socket buffer (also done by the USRP driver in OAI)
+* Increase Ethernet Ring Buffers: `sudo ethtool -G <ifname> rx 4096 tx 4096`
+* Disable hyper-threading in the BIOS (This step is optional)
+* Optional: Disable KPTI Protections for Spectre/Meltdown for more performance. **This is a security risk.** Add `mitigations=off nosmt` in your grub config and update grub. (This step is optional)
+
+Example code to run:
+```
+for ((i=0;i<$(nproc);i++)); do sudo cpufreq-set -c $i -r -g performance; done
+sudo sysctl -w net.core.wmem_max=62500000
+sudo sysctl -w net.core.rmem_max=62500000
+sudo sysctl -w net.core.wmem_default=62500000
+sudo sysctl -w net.core.rmem_default=62500000
+sudo ethtool -G enp1s0f0 tx 4096 rx 4096
+```
+
+## 6.2 Real-time performance workarounds
 - If you get real-time problems on heavy UL traffic, reduce the maximum UL MCS using an additional command-line switch: `--MACRLCs.[0].ul_max_mcs 14`.
 
+## 6.3 Uplink issues related with noise on the DC carriers
 - There is noise on the DC carriers on N300 and especially the X300 in UL. To avoid their use or shift them away from the center to use more UL spectrum, use the `--tune-offset <Hz>` command line switch, where `<Hz>` is ideally half the bandwidth, or possibly less.

From a398c5a9f416fe920613c0f5eb189b639e7deaa3 Mon Sep 17 00:00:00 2001
From: luis_pereira87 <lpereira@allbesmart.pt>
Date: Mon, 31 Oct 2022 13:59:12 +0000
Subject: [PATCH 09/31] Tutorials: add instructions to run OAI UE with B210 and
 RFsimulator

---
 doc/NR_SA_CN5G_gNB_USRP_COTS_UE_Tutorial.md | 56 ++++++++++++++++++---
 1 file changed, 50 insertions(+), 6 deletions(-)

diff --git a/doc/NR_SA_CN5G_gNB_USRP_COTS_UE_Tutorial.md b/doc/NR_SA_CN5G_gNB_USRP_COTS_UE_Tutorial.md
index e04b7a660c..0db8b585d8 100644
--- a/doc/NR_SA_CN5G_gNB_USRP_COTS_UE_Tutorial.md
+++ b/doc/NR_SA_CN5G_gNB_USRP_COTS_UE_Tutorial.md
@@ -17,7 +17,7 @@
 [[_TOC_]]
 
 #  1. Scenario
-In this tutorial we describe how to configure and run a 5G end-to-end setup with OAI CN5G, OAI gNB and COTS UE.
+In this tutorial we describe how to configure and run a 5G end-to-end setup with OAI CN5G, OAI gNB, OAI UE and COTS UE.
 
 Minimum hardware requirements:
 - Laptop/Desktop/Server for OAI CN5G and OAI gNB
@@ -181,9 +181,18 @@ cd cmake_targets/ran_build/build
 sudo ./nr-softmodem -O ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.fr1.273PRB.2x2.usrpn300.conf --sa --usrp-tx-thread-config 1 -E --continuous-tx
 ```
 
-# 5. Testing with Quectel RM500Q
+### RFsimulator
+```bash
+cd ~/openairinterface5g
+source oaienv
+cd cmake_targets/ran_build/build
+sudo ./nr-softmodem -O ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf --gNBs.[0].min_rxtxtime 6 --rfsim --sa
+```
 
-## 5.1 Setup Quectel
+# 5. Run UE
+## 5.1 Testing with Quectel RM500Q
+
+### 5.1.1 Setup Quectel
 With [PuTTY](https://the.earth.li/~sgtatham/putty/latest/w64/putty.exe), send the following AT commands to the module using a serial interface (ex: COM2) at 115200 bps:
 ```bash
 # MUST be sent at least once everytime there is a firmware upgrade!
@@ -200,7 +209,7 @@ AT+CGPADDR=1
 AT+QPING=1,"openairinterface.org"
 ```
 
-## 5.2 Ping test
+### 5.1.2 Ping test
 - UE host
 ```bash
 ping 192.168.70.135 -t -S 12.1.1.2
@@ -210,7 +219,7 @@ ping 192.168.70.135 -t -S 12.1.1.2
 docker exec -it oai-ext-dn ping 12.1.1.2
 ```
 
-## 5.3 Downlink iPerf test
+### 5.1.3 Downlink iPerf test
 - UE host
     - Download iPerf for Microsoft Windows from [here](https://iperf.fr/download/windows/iperf-2.0.9-win64.zip).
     - Extract to Desktop and run with Command Prompt:
@@ -224,7 +233,42 @@ iperf -s -u -i 1 -B 12.1.1.2
 docker exec -it oai-ext-dn iperf -u -t 86400 -i 1 -fk -B 192.168.70.135 -b 100M -c 12.1.1.2
 ```
 
-# 6. Advanced configuration (optional)
+## 5.2 Testing with OAI UE
+### 5.2.1 Testing with OAI UE with USRP B210
+Important notes:
+- This should be run in a second Ubuntu 20.04 host, other than gNB
+- It only applies when running OAI gNB with USRP B210
+
+Run OAI UE
+```bash
+cd ~/openairinterface5g
+source oaienv
+cd cmake_targets/ran_build/build
+sudo ./nr-uesoftmodem -r 106 --numerology 1 --band 78 -C 3619200000 --nokrnmod --ue-fo-compensation --sa -E --uicc0.nssai_sd 1
+```
+
+### 5.2.2 Testing with OAI UE with RFsimulator
+Important notes:
+- This should be run on the same host as the OAI gNB
+- It only applies when running OAI gNB with RFsimulator
+
+Run OAI UE with RFsimulator
+```bash
+cd ~/openairinterface5g
+source oaienv
+cd cmake_targets/ran_build/build
+sudo RFSIMULATOR=127.0.0.1 ./nr-uesoftmodem -r 106 --numerology 1 --band 78 -C 3619200000 --nokrnmod --rfsim --sa --uicc0.nssai_sd 1
+```
+
+### 5.2.3 Ping test
+- UE host
+```bash
+ping 192.168.70.135 -I oaitun_ue1
+```
+
+# 6. Advanced configurations (optional)
+
+## 6.1 USRP N300 and X300 Ethernet Tuning
 
 Please also refer to the official [USRP Host Performance Tuning Tips and Tricks](https://kb.ettus.com/USRP_Host_Performance_Tuning_Tips_and_Tricks) tuning guide.
 

From 991de3623a3773de8b4711c8032be3526cd128fa Mon Sep 17 00:00:00 2001
From: luis_pereira87 <lpereira@allbesmart.pt>
Date: Mon, 14 Nov 2022 11:06:02 +0000
Subject: [PATCH 10/31] Tutorials: Change PLMN to the 3GPP Test Network

---
 doc/NR_SA_CN5G_gNB_USRP_COTS_UE_Tutorial.md   |  6 ++---
 .../docker-compose-basic-nrf.yaml             | 26 +++++++++----------
 doc/tutorial_resources/oai_db.sql             | 16 +++++-------
 ...gnb.sa.band77.fr1.273PRB.2x2.usrpn300.conf |  2 +-
 .../gnb.sa.band78.fr1.106PRB.usrpb210.conf    |  2 +-
 ...gnb.sa.band78.fr1.162PRB.2x2.usrpn300.conf |  2 +-
 6 files changed, 25 insertions(+), 29 deletions(-)

diff --git a/doc/NR_SA_CN5G_gNB_USRP_COTS_UE_Tutorial.md b/doc/NR_SA_CN5G_gNB_USRP_COTS_UE_Tutorial.md
index 0db8b585d8..bc6c56834a 100644
--- a/doc/NR_SA_CN5G_gNB_USRP_COTS_UE_Tutorial.md
+++ b/doc/NR_SA_CN5G_gNB_USRP_COTS_UE_Tutorial.md
@@ -100,7 +100,7 @@ wget -O ~/oai-cn5g-fed/docker-compose/database/oai_db.sql https://gitlab.eurecom
 Program SIM Card with [Open Cells Project](https://open-cells.com/) application [uicc-v2.6](https://open-cells.com/d5138782a8739209ec5760865b1e53b0/uicc-v2.6.tgz).
 
 ```bash
-sudo ./program_uicc --adm 12345678 --imsi 208990000000001 --isdn 00000001 --acc 0001 --key fec86ba6eb707ed08905757b1bb44b8f --opc C42449363BBAD02B66D16BC975D77CC1 -spn "OpenAirInterface" --authenticate
+sudo ./program_uicc --adm 12345678 --imsi 001010000000001 --isdn 00000001 --acc 0001 --key fec86ba6eb707ed08905757b1bb44b8f --opc C42449363BBAD02B66D16BC975D77CC1 -spn "OpenAirInterface" --authenticate
 ```
 
 
@@ -244,7 +244,7 @@ Run OAI UE
 cd ~/openairinterface5g
 source oaienv
 cd cmake_targets/ran_build/build
-sudo ./nr-uesoftmodem -r 106 --numerology 1 --band 78 -C 3619200000 --nokrnmod --ue-fo-compensation --sa -E --uicc0.nssai_sd 1
+sudo ./nr-uesoftmodem -r 106 --numerology 1 --band 78 -C 3619200000 --nokrnmod --ue-fo-compensation --sa -E --uicc0.imsi 001010000000001 --uicc0.nssai_sd 1
 ```
 
 ### 5.2.2 Testing with OAI UE with RFsimulator
@@ -257,7 +257,7 @@ Run OAI UE with RFsimulator
 cd ~/openairinterface5g
 source oaienv
 cd cmake_targets/ran_build/build
-sudo RFSIMULATOR=127.0.0.1 ./nr-uesoftmodem -r 106 --numerology 1 --band 78 -C 3619200000 --nokrnmod --rfsim --sa --uicc0.nssai_sd 1
+sudo RFSIMULATOR=127.0.0.1 ./nr-uesoftmodem -r 106 --numerology 1 --band 78 -C 3619200000 --nokrnmod --rfsim --sa --uicc0.imsi 001010000000001 --uicc0.nssai_sd 1
 ```
 
 ### 5.2.3 Ping test
diff --git a/doc/tutorial_resources/docker-compose-basic-nrf.yaml b/doc/tutorial_resources/docker-compose-basic-nrf.yaml
index dd441010c0..bd037f23e0 100644
--- a/doc/tutorial_resources/docker-compose-basic-nrf.yaml
+++ b/doc/tutorial_resources/docker-compose-basic-nrf.yaml
@@ -89,8 +89,8 @@ services:
             - AUSF_NAME=OAI_AUSF
             - SBI_IF_NAME=eth0
             - SBI_PORT=80
-            - USE_HTTP2
-            - SBI_HTTP2_PORT
+            - USE_HTTP2=no
+            - SBI_HTTP2_PORT=8080
             - USE_FQDN_DNS=yes
             - UDM_IP_ADDRESS=192.168.70.137
             - UDM_PORT=80
@@ -127,20 +127,20 @@ services:
             - TZ=Europe/paris
             - INSTANCE=0
             - PID_DIRECTORY=/var/run
-            - MCC=208
-            - MNC=99
+            - MCC=001
+            - MNC=01
             - REGION_ID=128
             - AMF_SET_ID=1
-            - SERVED_GUAMI_MCC_0=208
-            - SERVED_GUAMI_MNC_0=99
+            - SERVED_GUAMI_MCC_0=001
+            - SERVED_GUAMI_MNC_0=01
             - SERVED_GUAMI_REGION_ID_0=128
             - SERVED_GUAMI_AMF_SET_ID_0=1
             - SERVED_GUAMI_MCC_1=460
             - SERVED_GUAMI_MNC_1=11
             - SERVED_GUAMI_REGION_ID_1=10
             - SERVED_GUAMI_AMF_SET_ID_1=1
-            - PLMN_SUPPORT_MCC=208
-            - PLMN_SUPPORT_MNC=99
+            - PLMN_SUPPORT_MCC=001
+            - PLMN_SUPPORT_MNC=01
             - PLMN_SUPPORT_TAC=0x0001
             - SST_0=1
             - SD_0=0x1
@@ -230,8 +230,8 @@ services:
             - DNN_RANGE0=12.1.1.2 - 12.1.1.253
             - NSSAI_SST0=1
             - NSSAI_SD0=0x1
-            - SESSION_AMBR_UL0=1000Mbps
-            - SESSION_AMBR_DL0=1000Mbps
+            - SESSION_AMBR_UL0=10000Mbps
+            - SESSION_AMBR_DL0=10000Mbps
             - DEFAULT_CSCF_IPV4_ADDRESS=127.0.0.1  # only needed when ims is being used
             - ENABLE_USAGE_REPORTING=no # Set yes if UE USAGE REPORTING is to be done at UPF
         depends_on:
@@ -253,9 +253,9 @@ services:
             - NETWORK_UE_IP=12.1.1.0/24
             - SPGWC0_IP_ADDRESS=192.168.70.133
             - BYPASS_UL_PFCP_RULES=no
-            - MCC=208
-            - MNC=99
-            - MNC03=099
+            - MCC=001
+            - MNC=01
+            - MNC03=001
             - TAC=1
             - GW_ID=1
             - THREAD_S1U_PRIO=80
diff --git a/doc/tutorial_resources/oai_db.sql b/doc/tutorial_resources/oai_db.sql
index fb8f4b20ed..0f6d5ae01c 100644
--- a/doc/tutorial_resources/oai_db.sql
+++ b/doc/tutorial_resources/oai_db.sql
@@ -151,13 +151,11 @@ CREATE TABLE `AuthenticationSubscription` (
 --
 
 INSERT INTO `AuthenticationSubscription` (`ueid`, `authenticationMethod`, `encPermanentKey`, `protectionParameterId`, `sequenceNumber`, `authenticationManagementField`, `algorithmId`, `encOpcKey`, `encTopcKey`, `vectorGenerationInHss`, `n5gcAuthMethod`, `rgAuthenticationInd`, `supi`) VALUES
-    ('2089900007487', '5G_AKA', 'fec86ba6eb707ed08905757b1bb44b8f', 'fec86ba6eb707ed08905757b1bb44b8f', '{\"sqn\": \"000000000000\", \"sqnScheme\": \"NON_TIME_BASED\", \"lastIndexes\": {\"ausf\": 0}}', '8000', 'milenage', 'C42449363BBAD02B66D16BC975D77CC1', NULL, NULL, NULL, NULL, '2089900007487');
+    ('001010000000001', '5G_AKA', 'fec86ba6eb707ed08905757b1bb44b8f', 'fec86ba6eb707ed08905757b1bb44b8f', '{\"sqn\": \"000000000000\", \"sqnScheme\": \"NON_TIME_BASED\", \"lastIndexes\": {\"ausf\": 0}}', '8000', 'milenage', 'C42449363BBAD02B66D16BC975D77CC1', NULL, NULL, NULL, NULL, '001010000000001');
 INSERT INTO `AuthenticationSubscription` (`ueid`, `authenticationMethod`, `encPermanentKey`, `protectionParameterId`, `sequenceNumber`, `authenticationManagementField`, `algorithmId`, `encOpcKey`, `encTopcKey`, `vectorGenerationInHss`, `n5gcAuthMethod`, `rgAuthenticationInd`, `supi`) VALUES
-    ('208990000000001', '5G_AKA', 'fec86ba6eb707ed08905757b1bb44b8f', 'fec86ba6eb707ed08905757b1bb44b8f', '{\"sqn\": \"000000000000\", \"sqnScheme\": \"NON_TIME_BASED\", \"lastIndexes\": {\"ausf\": 0}}', '8000', 'milenage', 'C42449363BBAD02B66D16BC975D77CC1', NULL, NULL, NULL, NULL, '208990000000001');
+    ('001010000000002', '5G_AKA', 'fec86ba6eb707ed08905757b1bb44b8f', 'fec86ba6eb707ed08905757b1bb44b8f', '{\"sqn\": \"000000000000\", \"sqnScheme\": \"NON_TIME_BASED\", \"lastIndexes\": {\"ausf\": 0}}', '8000', 'milenage', 'C42449363BBAD02B66D16BC975D77CC1', NULL, NULL, NULL, NULL, '001010000000002');
 INSERT INTO `AuthenticationSubscription` (`ueid`, `authenticationMethod`, `encPermanentKey`, `protectionParameterId`, `sequenceNumber`, `authenticationManagementField`, `algorithmId`, `encOpcKey`, `encTopcKey`, `vectorGenerationInHss`, `n5gcAuthMethod`, `rgAuthenticationInd`, `supi`) VALUES
-    ('208990000000002', '5G_AKA', 'fec86ba6eb707ed08905757b1bb44b8f', 'fec86ba6eb707ed08905757b1bb44b8f', '{\"sqn\": \"000000000000\", \"sqnScheme\": \"NON_TIME_BASED\", \"lastIndexes\": {\"ausf\": 0}}', '8000', 'milenage', 'C42449363BBAD02B66D16BC975D77CC1', NULL, NULL, NULL, NULL, '208990000000002');
-INSERT INTO `AuthenticationSubscription` (`ueid`, `authenticationMethod`, `encPermanentKey`, `protectionParameterId`, `sequenceNumber`, `authenticationManagementField`, `algorithmId`, `encOpcKey`, `encTopcKey`, `vectorGenerationInHss`, `n5gcAuthMethod`, `rgAuthenticationInd`, `supi`) VALUES
-    ('208990000000003', '5G_AKA', 'fec86ba6eb707ed08905757b1bb44b8f', 'fec86ba6eb707ed08905757b1bb44b8f', '{\"sqn\": \"000000000000\", \"sqnScheme\": \"NON_TIME_BASED\", \"lastIndexes\": {\"ausf\": 0}}', '8000', 'milenage', 'C42449363BBAD02B66D16BC975D77CC1', NULL, NULL, NULL, NULL, '208990000000003');
+    ('001010000000003', '5G_AKA', 'fec86ba6eb707ed08905757b1bb44b8f', 'fec86ba6eb707ed08905757b1bb44b8f', '{\"sqn\": \"000000000000\", \"sqnScheme\": \"NON_TIME_BASED\", \"lastIndexes\": {\"ausf\": 0}}', '8000', 'milenage', 'C42449363BBAD02B66D16BC975D77CC1', NULL, NULL, NULL, NULL, '001010000000003');
 
 -- --------------------------------------------------------
 
@@ -211,13 +209,11 @@ CREATE TABLE `SessionManagementSubscriptionData` (
 --
 
 INSERT INTO `SessionManagementSubscriptionData` (`ueid`, `servingPlmnid`, `singleNssai`, `dnnConfigurations`) VALUES
-    ('2089900007487', '20899', '{\"sst\": 1, \"sd\": \"1\"}','{\"oai\":{\"pduSessionTypes\":{ \"defaultSessionType\": \"IPV4\"},\"sscModes\": {\"defaultSscMode\": \"SSC_MODE_1\"},\"5gQosProfile\": {\"5qi\": 6,\"arp\":{\"priorityLevel\": 1,\"preemptCap\": \"NOT_PREEMPT\",\"preemptVuln\":\"NOT_PREEMPTABLE\"},\"priorityLevel\":1},\"sessionAmbr\":{\"uplink\":\"1000Mbps\", \"downlink\":\"1000Mbps\"},\"staticIpAddress\":[{\"ipv4Addr\": \"12.1.1.2\"}]}}');
+    ('001010000000001', '00101', '{\"sst\": 1, \"sd\": \"1\"}','{\"oai\":{\"pduSessionTypes\":{ \"defaultSessionType\": \"IPV4\"},\"sscModes\": {\"defaultSscMode\": \"SSC_MODE_1\"},\"5gQosProfile\": {\"5qi\": 6,\"arp\":{\"priorityLevel\": 1,\"preemptCap\": \"NOT_PREEMPT\",\"preemptVuln\":\"NOT_PREEMPTABLE\"},\"priorityLevel\":1},\"sessionAmbr\":{\"uplink\":\"10000Mbps\", \"downlink\":\"10000Mbps\"},\"staticIpAddress\":[{\"ipv4Addr\": \"12.1.1.2\"}]}}');
 INSERT INTO `SessionManagementSubscriptionData` (`ueid`, `servingPlmnid`, `singleNssai`, `dnnConfigurations`) VALUES
-    ('208990000000001', '20899', '{\"sst\": 1, \"sd\": \"1\"}','{\"oai\":{\"pduSessionTypes\":{ \"defaultSessionType\": \"IPV4\"},\"sscModes\": {\"defaultSscMode\": \"SSC_MODE_1\"},\"5gQosProfile\": {\"5qi\": 6,\"arp\":{\"priorityLevel\": 1,\"preemptCap\": \"NOT_PREEMPT\",\"preemptVuln\":\"NOT_PREEMPTABLE\"},\"priorityLevel\":1},\"sessionAmbr\":{\"uplink\":\"1000Mbps\", \"downlink\":\"1000Mbps\"},\"staticIpAddress\":[{\"ipv4Addr\": \"12.1.1.2\"}]}}');
+    ('001010000000002', '00101', '{\"sst\": 1, \"sd\": \"1\"}','{\"oai\":{\"pduSessionTypes\":{ \"defaultSessionType\": \"IPV4\"},\"sscModes\": {\"defaultSscMode\": \"SSC_MODE_1\"},\"5gQosProfile\": {\"5qi\": 6,\"arp\":{\"priorityLevel\": 1,\"preemptCap\": \"NOT_PREEMPT\",\"preemptVuln\":\"NOT_PREEMPTABLE\"},\"priorityLevel\":1},\"sessionAmbr\":{\"uplink\":\"10000Mbps\", \"downlink\":\"10000Mbps\"},\"staticIpAddress\":[{\"ipv4Addr\": \"12.1.1.3\"}]}}');
 INSERT INTO `SessionManagementSubscriptionData` (`ueid`, `servingPlmnid`, `singleNssai`, `dnnConfigurations`) VALUES
-    ('208990000000002', '20899', '{\"sst\": 1, \"sd\": \"1\"}','{\"oai\":{\"pduSessionTypes\":{ \"defaultSessionType\": \"IPV4\"},\"sscModes\": {\"defaultSscMode\": \"SSC_MODE_1\"},\"5gQosProfile\": {\"5qi\": 6,\"arp\":{\"priorityLevel\": 1,\"preemptCap\": \"NOT_PREEMPT\",\"preemptVuln\":\"NOT_PREEMPTABLE\"},\"priorityLevel\":1},\"sessionAmbr\":{\"uplink\":\"1000Mbps\", \"downlink\":\"1000Mbps\"},\"staticIpAddress\":[{\"ipv4Addr\": \"12.1.1.3\"}]}}');
-INSERT INTO `SessionManagementSubscriptionData` (`ueid`, `servingPlmnid`, `singleNssai`, `dnnConfigurations`) VALUES
-    ('208990000000003', '20899', '{\"sst\": 1, \"sd\": \"1\"}','{\"oai\":{\"pduSessionTypes\":{ \"defaultSessionType\": \"IPV4\"},\"sscModes\": {\"defaultSscMode\": \"SSC_MODE_1\"},\"5gQosProfile\": {\"5qi\": 6,\"arp\":{\"priorityLevel\": 1,\"preemptCap\": \"NOT_PREEMPT\",\"preemptVuln\":\"NOT_PREEMPTABLE\"},\"priorityLevel\":1},\"sessionAmbr\":{\"uplink\":\"1000Mbps\", \"downlink\":\"1000Mbps\"},\"staticIpAddress\":[{\"ipv4Addr\": \"12.1.1.4\"}]}}');
+    ('001010000000003', '00101', '{\"sst\": 1, \"sd\": \"1\"}','{\"oai\":{\"pduSessionTypes\":{ \"defaultSessionType\": \"IPV4\"},\"sscModes\": {\"defaultSscMode\": \"SSC_MODE_1\"},\"5gQosProfile\": {\"5qi\": 6,\"arp\":{\"priorityLevel\": 1,\"preemptCap\": \"NOT_PREEMPT\",\"preemptVuln\":\"NOT_PREEMPTABLE\"},\"priorityLevel\":1},\"sessionAmbr\":{\"uplink\":\"10000Mbps\", \"downlink\":\"10000Mbps\"},\"staticIpAddress\":[{\"ipv4Addr\": \"12.1.1.4\"}]}}');
 
 -- --------------------------------------------------------
 
diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.fr1.273PRB.2x2.usrpn300.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.fr1.273PRB.2x2.usrpn300.conf
index 0b9464a99c..f73a060b01 100644
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.fr1.273PRB.2x2.usrpn300.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.fr1.273PRB.2x2.usrpn300.conf
@@ -10,7 +10,7 @@ gNBs = (
 
   // Tracking area code, 0x0000 and 0xfffe are reserved values
   tracking_area_code = 1;
-  plmn_list = ({ mcc = 208; mnc = 99; mnc_length = 2; snssaiList = ({ sst = 1; sd = 0x1; }); });
+  plmn_list = ({ mcc = 001; mnc = 01; mnc_length = 2; snssaiList = ({ sst = 1; sd = 0x1; }); });
 
   nr_cellid = 12345678L;
 
diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf
index 02418f9883..ccfd5ea56c 100644
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf
@@ -11,7 +11,7 @@ gNBs =
 
     // Tracking area code, 0x0000 and 0xfffe are reserved values
     tracking_area_code  =  1;
-    plmn_list = ({ mcc = 208; mnc = 99; mnc_length = 2; snssaiList = ({ sst = 1; sd = 0x1; }) });
+    plmn_list = ({ mcc = 001; mnc = 01; mnc_length = 2; snssaiList = ({ sst = 1; sd = 0x1; }) });
 
     nr_cellid = 12345678L;
 
diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.162PRB.2x2.usrpn300.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.162PRB.2x2.usrpn300.conf
index d7d6b9ca5a..7f052820c2 100644
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.162PRB.2x2.usrpn300.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.162PRB.2x2.usrpn300.conf
@@ -11,7 +11,7 @@ gNBs =
 
     // Tracking area code, 0x0000 and 0xfffe are reserved values
     tracking_area_code  =  1;
-    plmn_list = ({ mcc = 208; mnc = 99; mnc_length = 2; snssaiList = ({ sst = 1 }) });
+    plmn_list = ({ mcc = 001; mnc = 01; mnc_length = 2; snssaiList = ({ sst = 1; sd = 1; }) });
 
     nr_cellid = 12345678L;
 

From f44a210d8a097b3ad1c10197eef880484bfe7c27 Mon Sep 17 00:00:00 2001
From: Sagar Arora <sagar.arora@eurecom.fr>
Date: Thu, 17 Nov 2022 14:26:46 +0100
Subject: [PATCH 11/31] Clean the helm-charts and fix cls_physim

- added right pod selector in cls_physim
---
 .../charts/dlsim.100rb+tm2/templates/job.yaml |  3 ++
 .../charts/dlsim.100rb+tm2/values.yaml        | 12 ------
 .../charts/dlsim.basic/templates/job.yaml     | 14 +++---
 charts/physims/charts/dlsim.basic/values.yaml | 28 ++++--------
 .../charts/ldpctest/templates/job.yaml        |  3 ++
 charts/physims/charts/ldpctest/values.yaml    | 12 ------
 .../charts/nr-dlschsim/templates/job.yaml     |  3 ++
 charts/physims/charts/nr-dlschsim/values.yaml | 12 ------
 .../charts/nr-dlsim.basic/templates/job.yaml  |  3 ++
 .../physims/charts/nr-dlsim.basic/values.yaml | 12 ------
 .../nr-dlsim.dmrs+ptrs/templates/job.yaml     |  3 ++
 .../charts/nr-dlsim.dmrs+ptrs/values.yaml     | 12 ------
 .../nr-dlsim.mcs+mimo/templates/job.yaml      |  3 ++
 .../charts/nr-dlsim.mcs+mimo/values.yaml      | 12 ------
 .../charts/nr-dlsim.offset/templates/job.yaml |  3 ++
 .../charts/nr-dlsim.offset/values.yaml        | 12 ------
 .../nr-pbchsim.106rb/templates/job.yaml       |  2 +-
 .../charts/nr-pbchsim.106rb/values.yaml       | 12 ------
 .../nr-pbchsim.217rb/templates/job.yaml       |  3 ++
 .../charts/nr-pbchsim.217rb/values.yaml       | 12 ------
 .../nr-pbchsim.273rb/templates/job.yaml       |  3 ++
 .../charts/nr-pbchsim.273rb/values.yaml       | 12 ------
 .../charts/nr-prachsim/templates/job.yaml     |  3 ++
 charts/physims/charts/nr-prachsim/values.yaml | 12 ------
 .../charts/nr-pucchsim/templates/job.yaml     |  3 ++
 charts/physims/charts/nr-pucchsim/values.yaml |  8 ----
 .../charts/nr-ulschsim/templates/job.yaml     |  3 ++
 charts/physims/charts/nr-ulschsim/values.yaml | 12 ------
 .../charts/nr-ulsim.3gpp/templates/job.yaml   |  3 ++
 .../physims/charts/nr-ulsim.3gpp/values.yaml  | 12 ------
 .../charts/nr-ulsim.mimo/templates/job.yaml   |  3 ++
 .../physims/charts/nr-ulsim.mimo/values.yaml  | 12 ------
 .../charts/nr-ulsim.misc/templates/job.yaml   |  3 ++
 .../physims/charts/nr-ulsim.misc/values.yaml  | 12 ------
 .../nr-ulsim.sc-fdma/templates/job.yaml       |  3 ++
 .../charts/nr-ulsim.sc-fdma/values.yaml       | 12 ------
 .../charts/polartest/templates/job.yaml       |  3 ++
 charts/physims/charts/polartest/values.yaml   | 12 ------
 .../charts/smallblocktest/templates/job.yaml  |  3 ++
 .../physims/charts/smallblocktest/values.yaml | 12 ------
 .../physims/charts/ulsim/templates/job.yaml   |  3 ++
 charts/physims/charts/ulsim/values.yaml       | 12 ------
 charts/physims/values.yaml                    | 43 -------------------
 ci-scripts/cls_physim1.py                     |  9 ++--
 44 files changed, 76 insertions(+), 313 deletions(-)

diff --git a/charts/physims/charts/dlsim.100rb+tm2/templates/job.yaml b/charts/physims/charts/dlsim.100rb+tm2/templates/job.yaml
index 03a0813d79..28d34037e6 100644
--- a/charts/physims/charts/dlsim.100rb+tm2/templates/job.yaml
+++ b/charts/physims/charts/dlsim.100rb+tm2/templates/job.yaml
@@ -4,6 +4,9 @@ metadata:
   name: {{ .Chart.Name }}
 spec:
   template:
+    metadata:
+      labels:
+        app: physim
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
diff --git a/charts/physims/charts/dlsim.100rb+tm2/values.yaml b/charts/physims/charts/dlsim.100rb+tm2/values.yaml
index 35614bc844..aae621bd84 100644
--- a/charts/physims/charts/dlsim.100rb+tm2/values.yaml
+++ b/charts/physims/charts/dlsim.100rb+tm2/values.yaml
@@ -28,18 +28,6 @@ podSecurityContext:
 
 securityContext:
   privileged: false
-#  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
diff --git a/charts/physims/charts/dlsim.basic/templates/job.yaml b/charts/physims/charts/dlsim.basic/templates/job.yaml
index 4edd9a5f2f..405f20e7ff 100644
--- a/charts/physims/charts/dlsim.basic/templates/job.yaml
+++ b/charts/physims/charts/dlsim.basic/templates/job.yaml
@@ -1,9 +1,12 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: {{ .Chart.Name }}
+  name: {{ .Chart.Name }}    
 spec:
   template:
+    metadata:
+      labels:
+         app: physim
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
@@ -15,13 +18,6 @@ spec:
       - name: physim
         image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
-#        resources:
-#          requests:
-#            memory: "4096Mi"
-#            cpu: "4000m"
-#          limits:
-#            memory: "4096Mi"
-#            cpu: "4000m"
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
         env:
@@ -35,5 +31,5 @@ spec:
       dnsPolicy: ClusterFirst
       restartPolicy: Never
       schedulerName: default-scheduler
-      serviceAccountName: oai-physim-sa 
+      serviceAccountName: {{ .Values.global.serviceAccountName }} 
       terminationGracePeriodSeconds: 30
diff --git a/charts/physims/charts/dlsim.basic/values.yaml b/charts/physims/charts/dlsim.basic/values.yaml
index 91b9eed407..2150e27daf 100644
--- a/charts/physims/charts/dlsim.basic/values.yaml
+++ b/charts/physims/charts/dlsim.basic/values.yaml
@@ -20,7 +20,7 @@ serviceAccount:
   annotations: {}
   # The name of the service account to use.
   # If not set and create is true, a name is generated using the fullname template
-  name: "oai-physim-sa" #"oai-dlsim-basic"
+  name: "oai-dlsim-basic"
 
 podSecurityContext:
   runAsUser: 0
@@ -28,26 +28,14 @@ podSecurityContext:
 
 securityContext:
   privileged: false
-  #capabilities:
-  #  add:
-  #    - SYS_CAP_PTRACE
-  #   drop:
-  #   - ALL
-  # readOnlyRootFilesystem: true
-  # runAsNonRoot: true
-  # runAsUser: 1000
 
-service:
-  type: ClusterIP
-  port: 80
-
-resources:
-   limits:
-     cpu: 100m
-     memory: 128Mi
-   requests:
-     cpu: 100m
-     memory: 128Mi
+resources: {}
+   # limits:
+   #   cpu: 100m
+   #   memory: 128Mi
+   # requests:
+   #   cpu: 100m
+   #   memory: 128Mi
 
 nodeSelector: {}
 
diff --git a/charts/physims/charts/ldpctest/templates/job.yaml b/charts/physims/charts/ldpctest/templates/job.yaml
index 1d1dc2c886..0bb60fd2ce 100644
--- a/charts/physims/charts/ldpctest/templates/job.yaml
+++ b/charts/physims/charts/ldpctest/templates/job.yaml
@@ -4,6 +4,9 @@ metadata:
   name: {{ .Chart.Name }}
 spec:
   template:
+    metadata:
+      labels:
+        app: physim
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
diff --git a/charts/physims/charts/ldpctest/values.yaml b/charts/physims/charts/ldpctest/values.yaml
index 964878baad..0ff1153a2c 100644
--- a/charts/physims/charts/ldpctest/values.yaml
+++ b/charts/physims/charts/ldpctest/values.yaml
@@ -28,18 +28,6 @@ podSecurityContext:
 
 securityContext:
   privileged: false
-#  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
diff --git a/charts/physims/charts/nr-dlschsim/templates/job.yaml b/charts/physims/charts/nr-dlschsim/templates/job.yaml
index 9141c93644..47d152193e 100644
--- a/charts/physims/charts/nr-dlschsim/templates/job.yaml
+++ b/charts/physims/charts/nr-dlschsim/templates/job.yaml
@@ -4,6 +4,9 @@ metadata:
   name: {{ .Chart.Name }}
 spec:
   template:
+    metadata:
+      labels:
+        app: physim
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
diff --git a/charts/physims/charts/nr-dlschsim/values.yaml b/charts/physims/charts/nr-dlschsim/values.yaml
index 05b775444a..a75437a0d6 100644
--- a/charts/physims/charts/nr-dlschsim/values.yaml
+++ b/charts/physims/charts/nr-dlschsim/values.yaml
@@ -28,18 +28,6 @@ podSecurityContext:
 
 securityContext:
   privileged: false
-#  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
diff --git a/charts/physims/charts/nr-dlsim.basic/templates/job.yaml b/charts/physims/charts/nr-dlsim.basic/templates/job.yaml
index b998f6f184..0688c27864 100644
--- a/charts/physims/charts/nr-dlsim.basic/templates/job.yaml
+++ b/charts/physims/charts/nr-dlsim.basic/templates/job.yaml
@@ -4,6 +4,9 @@ metadata:
   name: {{ .Chart.Name }}
 spec:
   template:
+    metadata:
+      labels:
+        app: physim
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
diff --git a/charts/physims/charts/nr-dlsim.basic/values.yaml b/charts/physims/charts/nr-dlsim.basic/values.yaml
index 4bd0f82294..88e5a2caaa 100644
--- a/charts/physims/charts/nr-dlsim.basic/values.yaml
+++ b/charts/physims/charts/nr-dlsim.basic/values.yaml
@@ -28,18 +28,6 @@ podSecurityContext:
 
 securityContext:
   privileged: false
-#  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
diff --git a/charts/physims/charts/nr-dlsim.dmrs+ptrs/templates/job.yaml b/charts/physims/charts/nr-dlsim.dmrs+ptrs/templates/job.yaml
index 4e4948c7c9..edc248eb24 100644
--- a/charts/physims/charts/nr-dlsim.dmrs+ptrs/templates/job.yaml
+++ b/charts/physims/charts/nr-dlsim.dmrs+ptrs/templates/job.yaml
@@ -4,6 +4,9 @@ metadata:
   name: {{ .Chart.Name }}
 spec:
   template:
+    metadata:
+      labels:
+        app: physim
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
diff --git a/charts/physims/charts/nr-dlsim.dmrs+ptrs/values.yaml b/charts/physims/charts/nr-dlsim.dmrs+ptrs/values.yaml
index dffc443398..357e6c2861 100644
--- a/charts/physims/charts/nr-dlsim.dmrs+ptrs/values.yaml
+++ b/charts/physims/charts/nr-dlsim.dmrs+ptrs/values.yaml
@@ -28,18 +28,6 @@ podSecurityContext:
 
 securityContext:
   privileged: false
-#  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
diff --git a/charts/physims/charts/nr-dlsim.mcs+mimo/templates/job.yaml b/charts/physims/charts/nr-dlsim.mcs+mimo/templates/job.yaml
index ff8ec59352..9a70a2d3ce 100644
--- a/charts/physims/charts/nr-dlsim.mcs+mimo/templates/job.yaml
+++ b/charts/physims/charts/nr-dlsim.mcs+mimo/templates/job.yaml
@@ -4,6 +4,9 @@ metadata:
   name: {{ .Chart.Name }}
 spec:
   template:
+    metadata:
+      labels:
+        app: physim
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
diff --git a/charts/physims/charts/nr-dlsim.mcs+mimo/values.yaml b/charts/physims/charts/nr-dlsim.mcs+mimo/values.yaml
index 8c56f219b4..5ef75a1672 100644
--- a/charts/physims/charts/nr-dlsim.mcs+mimo/values.yaml
+++ b/charts/physims/charts/nr-dlsim.mcs+mimo/values.yaml
@@ -28,18 +28,6 @@ podSecurityContext:
 
 securityContext:
   privileged: false
-#  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
diff --git a/charts/physims/charts/nr-dlsim.offset/templates/job.yaml b/charts/physims/charts/nr-dlsim.offset/templates/job.yaml
index 71a5f88542..e5c0d65703 100644
--- a/charts/physims/charts/nr-dlsim.offset/templates/job.yaml
+++ b/charts/physims/charts/nr-dlsim.offset/templates/job.yaml
@@ -4,6 +4,9 @@ metadata:
   name: {{ .Chart.Name }}
 spec:
   template:
+    metadata:
+      labels:
+        app: physim
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
diff --git a/charts/physims/charts/nr-dlsim.offset/values.yaml b/charts/physims/charts/nr-dlsim.offset/values.yaml
index 8de40ffcaa..efef89ce4a 100644
--- a/charts/physims/charts/nr-dlsim.offset/values.yaml
+++ b/charts/physims/charts/nr-dlsim.offset/values.yaml
@@ -28,18 +28,6 @@ podSecurityContext:
 
 securityContext:
   privileged: false
-#  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
diff --git a/charts/physims/charts/nr-pbchsim.106rb/templates/job.yaml b/charts/physims/charts/nr-pbchsim.106rb/templates/job.yaml
index 6b560eded2..9f974cc0f0 100644
--- a/charts/physims/charts/nr-pbchsim.106rb/templates/job.yaml
+++ b/charts/physims/charts/nr-pbchsim.106rb/templates/job.yaml
@@ -6,7 +6,7 @@ spec:
   template:
     metadata:
       labels:
-        {{- include "oai-nr-pbchsim-106rb.selectorLabels" . | nindent 8 }}
+        app: physim
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
diff --git a/charts/physims/charts/nr-pbchsim.106rb/values.yaml b/charts/physims/charts/nr-pbchsim.106rb/values.yaml
index fdeacbc96e..8f8104146a 100644
--- a/charts/physims/charts/nr-pbchsim.106rb/values.yaml
+++ b/charts/physims/charts/nr-pbchsim.106rb/values.yaml
@@ -28,18 +28,6 @@ podSecurityContext:
 
 securityContext:
   privileged: false
-#  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
diff --git a/charts/physims/charts/nr-pbchsim.217rb/templates/job.yaml b/charts/physims/charts/nr-pbchsim.217rb/templates/job.yaml
index 7f6c11dd43..bc3770e70f 100644
--- a/charts/physims/charts/nr-pbchsim.217rb/templates/job.yaml
+++ b/charts/physims/charts/nr-pbchsim.217rb/templates/job.yaml
@@ -4,6 +4,9 @@ metadata:
   name: {{ .Chart.Name }}
 spec:
   template:
+    metadata:
+      labels:
+        app: physim
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
diff --git a/charts/physims/charts/nr-pbchsim.217rb/values.yaml b/charts/physims/charts/nr-pbchsim.217rb/values.yaml
index 325703f53d..96b3f860df 100644
--- a/charts/physims/charts/nr-pbchsim.217rb/values.yaml
+++ b/charts/physims/charts/nr-pbchsim.217rb/values.yaml
@@ -28,18 +28,6 @@ podSecurityContext:
 
 securityContext:
   privileged: false
-#  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
diff --git a/charts/physims/charts/nr-pbchsim.273rb/templates/job.yaml b/charts/physims/charts/nr-pbchsim.273rb/templates/job.yaml
index 5f16b06c1d..e4e8dddcd0 100644
--- a/charts/physims/charts/nr-pbchsim.273rb/templates/job.yaml
+++ b/charts/physims/charts/nr-pbchsim.273rb/templates/job.yaml
@@ -4,6 +4,9 @@ metadata:
   name: {{ .Chart.Name }}
 spec:
   template:
+    metadata:
+      labels:
+        app: physim
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
diff --git a/charts/physims/charts/nr-pbchsim.273rb/values.yaml b/charts/physims/charts/nr-pbchsim.273rb/values.yaml
index 529cedd5dc..36b62e0146 100644
--- a/charts/physims/charts/nr-pbchsim.273rb/values.yaml
+++ b/charts/physims/charts/nr-pbchsim.273rb/values.yaml
@@ -28,18 +28,6 @@ podSecurityContext:
 
 securityContext:
   privileged: false
-#  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
diff --git a/charts/physims/charts/nr-prachsim/templates/job.yaml b/charts/physims/charts/nr-prachsim/templates/job.yaml
index 2b366e3655..bfd5024ca6 100644
--- a/charts/physims/charts/nr-prachsim/templates/job.yaml
+++ b/charts/physims/charts/nr-prachsim/templates/job.yaml
@@ -4,6 +4,9 @@ metadata:
   name: {{ .Chart.Name }}
 spec:
   template:
+    metadata:
+      labels:
+        app: physim
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
diff --git a/charts/physims/charts/nr-prachsim/values.yaml b/charts/physims/charts/nr-prachsim/values.yaml
index 99b4f70f28..8404ea4192 100644
--- a/charts/physims/charts/nr-prachsim/values.yaml
+++ b/charts/physims/charts/nr-prachsim/values.yaml
@@ -28,18 +28,6 @@ podSecurityContext:
 
 securityContext:
   privileged: false
-#  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
diff --git a/charts/physims/charts/nr-pucchsim/templates/job.yaml b/charts/physims/charts/nr-pucchsim/templates/job.yaml
index 2b1d7b016b..849aa1fe46 100644
--- a/charts/physims/charts/nr-pucchsim/templates/job.yaml
+++ b/charts/physims/charts/nr-pucchsim/templates/job.yaml
@@ -4,6 +4,9 @@ metadata:
   name: {{ .Chart.Name }}
 spec:
   template:
+    metadata:
+      labels:
+        app: physim
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
diff --git a/charts/physims/charts/nr-pucchsim/values.yaml b/charts/physims/charts/nr-pucchsim/values.yaml
index 4d7a4b8750..1c2c822088 100644
--- a/charts/physims/charts/nr-pucchsim/values.yaml
+++ b/charts/physims/charts/nr-pucchsim/values.yaml
@@ -28,14 +28,6 @@ podSecurityContext:
 
 securityContext:
   privileged: false
-#  capabilities:
-#    add:
-#      - SYS_CAP_PTRACE
-  #   drop:
-  #   - ALL
-  # readOnlyRootFilesystem: true
-  # runAsNonRoot: true
-  # runAsUser: 1000
 
 service:
   type: ClusterIP
diff --git a/charts/physims/charts/nr-ulschsim/templates/job.yaml b/charts/physims/charts/nr-ulschsim/templates/job.yaml
index e54f2095a6..8096181405 100644
--- a/charts/physims/charts/nr-ulschsim/templates/job.yaml
+++ b/charts/physims/charts/nr-ulschsim/templates/job.yaml
@@ -4,6 +4,9 @@ metadata:
   name: {{ .Chart.Name }}
 spec:
   template:
+    metadata:
+      labels:
+        app: physim
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
diff --git a/charts/physims/charts/nr-ulschsim/values.yaml b/charts/physims/charts/nr-ulschsim/values.yaml
index 083f4b43f1..770cb43bb1 100644
--- a/charts/physims/charts/nr-ulschsim/values.yaml
+++ b/charts/physims/charts/nr-ulschsim/values.yaml
@@ -28,18 +28,6 @@ podSecurityContext:
 
 securityContext:
   privileged: false
-#  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
diff --git a/charts/physims/charts/nr-ulsim.3gpp/templates/job.yaml b/charts/physims/charts/nr-ulsim.3gpp/templates/job.yaml
index 2c92769c4d..740c5818da 100644
--- a/charts/physims/charts/nr-ulsim.3gpp/templates/job.yaml
+++ b/charts/physims/charts/nr-ulsim.3gpp/templates/job.yaml
@@ -4,6 +4,9 @@ metadata:
   name: {{ .Chart.Name }}
 spec:
   template:
+    metadata:
+      labels:
+        app: physim
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
diff --git a/charts/physims/charts/nr-ulsim.3gpp/values.yaml b/charts/physims/charts/nr-ulsim.3gpp/values.yaml
index adbe124197..b2aedcba03 100644
--- a/charts/physims/charts/nr-ulsim.3gpp/values.yaml
+++ b/charts/physims/charts/nr-ulsim.3gpp/values.yaml
@@ -28,18 +28,6 @@ podSecurityContext:
 
 securityContext:
   privileged: false
-#  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
diff --git a/charts/physims/charts/nr-ulsim.mimo/templates/job.yaml b/charts/physims/charts/nr-ulsim.mimo/templates/job.yaml
index 9d6c284b91..74200d4614 100644
--- a/charts/physims/charts/nr-ulsim.mimo/templates/job.yaml
+++ b/charts/physims/charts/nr-ulsim.mimo/templates/job.yaml
@@ -4,6 +4,9 @@ metadata:
   name: {{ .Chart.Name }}
 spec:
   template:
+    metadata:
+      labels:
+        app: physim
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
diff --git a/charts/physims/charts/nr-ulsim.mimo/values.yaml b/charts/physims/charts/nr-ulsim.mimo/values.yaml
index 1b527ee5fa..b2dd42d3be 100644
--- a/charts/physims/charts/nr-ulsim.mimo/values.yaml
+++ b/charts/physims/charts/nr-ulsim.mimo/values.yaml
@@ -28,18 +28,6 @@ podSecurityContext:
 
 securityContext:
   privileged: false
-#  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
diff --git a/charts/physims/charts/nr-ulsim.misc/templates/job.yaml b/charts/physims/charts/nr-ulsim.misc/templates/job.yaml
index 72ca08712b..19c4b7f42b 100644
--- a/charts/physims/charts/nr-ulsim.misc/templates/job.yaml
+++ b/charts/physims/charts/nr-ulsim.misc/templates/job.yaml
@@ -4,6 +4,9 @@ metadata:
   name: {{ .Chart.Name }}
 spec:
   template:
+    metadata:
+      labels:
+        app: physim
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
diff --git a/charts/physims/charts/nr-ulsim.misc/values.yaml b/charts/physims/charts/nr-ulsim.misc/values.yaml
index c3e265bf69..8d15fca39e 100644
--- a/charts/physims/charts/nr-ulsim.misc/values.yaml
+++ b/charts/physims/charts/nr-ulsim.misc/values.yaml
@@ -28,18 +28,6 @@ podSecurityContext:
 
 securityContext:
   privileged: false
-#  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
diff --git a/charts/physims/charts/nr-ulsim.sc-fdma/templates/job.yaml b/charts/physims/charts/nr-ulsim.sc-fdma/templates/job.yaml
index 05dccbf705..c487d44598 100644
--- a/charts/physims/charts/nr-ulsim.sc-fdma/templates/job.yaml
+++ b/charts/physims/charts/nr-ulsim.sc-fdma/templates/job.yaml
@@ -4,6 +4,9 @@ metadata:
   name: {{ .Chart.Name }}
 spec:
   template:
+    metadata:
+      labels:
+        app: physim
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
diff --git a/charts/physims/charts/nr-ulsim.sc-fdma/values.yaml b/charts/physims/charts/nr-ulsim.sc-fdma/values.yaml
index 05a952a1ac..c617eeafec 100644
--- a/charts/physims/charts/nr-ulsim.sc-fdma/values.yaml
+++ b/charts/physims/charts/nr-ulsim.sc-fdma/values.yaml
@@ -28,18 +28,6 @@ podSecurityContext:
 
 securityContext:
   privileged: false
-#  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
diff --git a/charts/physims/charts/polartest/templates/job.yaml b/charts/physims/charts/polartest/templates/job.yaml
index 8f0998d9f3..9abb161e24 100644
--- a/charts/physims/charts/polartest/templates/job.yaml
+++ b/charts/physims/charts/polartest/templates/job.yaml
@@ -4,6 +4,9 @@ metadata:
   name: {{ .Chart.Name }}
 spec:
   template:
+    metadata:
+      labels:
+        app: physim
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
diff --git a/charts/physims/charts/polartest/values.yaml b/charts/physims/charts/polartest/values.yaml
index c91ee2bf5b..12386f02bc 100644
--- a/charts/physims/charts/polartest/values.yaml
+++ b/charts/physims/charts/polartest/values.yaml
@@ -28,18 +28,6 @@ podSecurityContext:
 
 securityContext:
   privileged: false
-#  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
diff --git a/charts/physims/charts/smallblocktest/templates/job.yaml b/charts/physims/charts/smallblocktest/templates/job.yaml
index d136a1fcf3..365e1215d9 100644
--- a/charts/physims/charts/smallblocktest/templates/job.yaml
+++ b/charts/physims/charts/smallblocktest/templates/job.yaml
@@ -4,6 +4,9 @@ metadata:
   name: {{ .Chart.Name }}
 spec:
   template:
+    metadata:
+      labels:
+        app: physim
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
diff --git a/charts/physims/charts/smallblocktest/values.yaml b/charts/physims/charts/smallblocktest/values.yaml
index f4d8a31fd9..7f116091ac 100644
--- a/charts/physims/charts/smallblocktest/values.yaml
+++ b/charts/physims/charts/smallblocktest/values.yaml
@@ -28,18 +28,6 @@ podSecurityContext:
 
 securityContext:
   privileged: false
-#  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
diff --git a/charts/physims/charts/ulsim/templates/job.yaml b/charts/physims/charts/ulsim/templates/job.yaml
index f2e904edb8..d7a820f0ca 100644
--- a/charts/physims/charts/ulsim/templates/job.yaml
+++ b/charts/physims/charts/ulsim/templates/job.yaml
@@ -4,6 +4,9 @@ metadata:
   name: {{ .Chart.Name }}
 spec:
   template:
+    metadata:
+      labels:
+        app: physim
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
diff --git a/charts/physims/charts/ulsim/values.yaml b/charts/physims/charts/ulsim/values.yaml
index 7ed2c6bed0..94038fa6df 100644
--- a/charts/physims/charts/ulsim/values.yaml
+++ b/charts/physims/charts/ulsim/values.yaml
@@ -28,18 +28,6 @@ podSecurityContext:
 
 securityContext:
   privileged: false
-#  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
diff --git a/charts/physims/values.yaml b/charts/physims/values.yaml
index 53190daff7..e333ad1fa3 100644
--- a/charts/physims/values.yaml
+++ b/charts/physims/values.yaml
@@ -12,46 +12,3 @@ global:
     # pullPolicy: IfNotPresent or Never or Always
     pullPolicy: Always
 
-## Declaring values specific to coressponding physim to overwrite (At the moment unused)
-
-dlsim.basic:
-
-dlsim.100rb+tm2:
-
-ulsim:
-
-ldpctest:
-
-polartest:
-
-nr-pbchsim.106rb:
-
-nr-pbchsim.217rb:
-
-nr-pbchsim.273rb:
-
-nr-dlsim.basic:
-
-nr-dlsim.dmrs+ptrs:
-
-nr-dlsim.mcs+mimo:
-
-nr-dlsim.offset:
-
-nr-dlschsim:
-
-smallblocktest:
-
-nr-ulschsim:
-
-nr-pucchsim:
-
-nr-ulsim.3gpp:
-
-nr-ulsim.mimo:
-
-nr-ulsim.misc:
-
-nr-ulsim.sc-fdma:
-
-nr-prachsim:
diff --git a/ci-scripts/cls_physim1.py b/ci-scripts/cls_physim1.py
index 1cef2270c3..9be0293cfc 100644
--- a/ci-scripts/cls_physim1.py
+++ b/ci-scripts/cls_physim1.py
@@ -158,9 +158,10 @@ class PhySim:
 			logging.debug('\u001B[1m   Deployed PhySim Successfully using helm chart\u001B[0m')
 		isRunning = False
 		count = 0
+		# Below while sections means there is 2 mins for pods to be in running if not they will be removed
 		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)
+			mySSH.command('oc get pods -o wide -l app=physim | tee -a cmake_targets/log/physim_pods_summary.txt', '\$', 30, resync=True)
 			if mySSH.getBefore().count('Running') == 21:
 				logging.debug('\u001B[1m Running the physim test Scenarios\u001B[0m')
 				isRunning = True
@@ -168,14 +169,14 @@ class PhySim:
 			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)
+			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)
 			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 +189,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)

From c1f685dc46fb039d3724d2a49f7f79c6cf62d810 Mon Sep 17 00:00:00 2001
From: Sagar Arora <sagar.arora@eurecom.fr>
Date: Thu, 17 Nov 2022 16:39:30 +0100
Subject: [PATCH 12/31] remove unused files and fix typos

---
 .../{ => charts}/dlsim.100rb+tm2/Chart.yaml   |  0
 .../dlsim.100rb+tm2/templates/_helpers.tpl    |  0
 .../dlsim.100rb+tm2/templates/job.yaml        |  0
 .../{ => charts}/dlsim.100rb+tm2/values.yaml  |  0
 .../{ => charts}/dlsim.basic/Chart.yaml       |  0
 .../dlsim.basic/templates/_helpers.tpl        |  0
 .../dlsim.basic/templates/job.yaml            |  0
 .../{ => charts}/dlsim.basic/values.yaml      | 14 ++++++-------
 .../charts/{ => charts}/ldpctest/Chart.yaml   |  0
 .../ldpctest/templates/_helpers.tpl           |  0
 .../{ => charts}/ldpctest/templates/job.yaml  |  0
 .../charts/{ => charts}/ldpctest/values.yaml  |  0
 .../{ => charts}/nr-dlschsim/Chart.yaml       |  0
 .../nr-dlschsim/templates/_helpers.tpl        |  0
 .../nr-dlschsim/templates/job.yaml            |  0
 .../{ => charts}/nr-dlschsim/values.yaml      |  0
 .../{ => charts}/nr-dlsim.basic/Chart.yaml    |  0
 .../nr-dlsim.basic/templates/_helpers.tpl     |  0
 .../nr-dlsim.basic/templates/job.yaml         |  0
 .../{ => charts}/nr-dlsim.basic/values.yaml   |  0
 .../nr-dlsim.dmrs+ptrs/Chart.yaml             |  0
 .../nr-dlsim.dmrs+ptrs/templates/_helpers.tpl |  0
 .../nr-dlsim.dmrs+ptrs/templates/job.yaml     |  0
 .../nr-dlsim.dmrs+ptrs/values.yaml            |  0
 .../{ => charts}/nr-dlsim.mcs+mimo/Chart.yaml |  0
 .../nr-dlsim.mcs+mimo/templates/_helpers.tpl  |  0
 .../nr-dlsim.mcs+mimo/templates/job.yaml      |  0
 .../nr-dlsim.mcs+mimo/values.yaml             |  0
 .../{ => charts}/nr-dlsim.offset/Chart.yaml   |  0
 .../nr-dlsim.offset/templates/_helpers.tpl    |  0
 .../nr-dlsim.offset/templates/job.yaml        |  0
 .../{ => charts}/nr-dlsim.offset/values.yaml  |  0
 .../{ => charts}/nr-pbchsim.106rb/Chart.yaml  |  0
 .../nr-pbchsim.106rb/templates/_helpers.tpl   |  0
 .../nr-pbchsim.106rb/templates/job.yaml       |  0
 .../{ => charts}/nr-pbchsim.106rb/values.yaml |  0
 .../{ => charts}/nr-pbchsim.217rb/Chart.yaml  |  0
 .../nr-pbchsim.217rb/templates/_helpers.tpl   |  0
 .../nr-pbchsim.217rb/templates/job.yaml       |  0
 .../{ => charts}/nr-pbchsim.217rb/values.yaml |  0
 .../{ => charts}/nr-pbchsim.273rb/Chart.yaml  |  0
 .../nr-pbchsim.273rb/templates/_helpers.tpl   |  0
 .../nr-pbchsim.273rb/templates/job.yaml       |  0
 .../{ => charts}/nr-pbchsim.273rb/values.yaml |  0
 .../{ => charts}/nr-prachsim/Chart.yaml       |  0
 .../nr-prachsim/templates/_helpers.tpl        |  0
 .../nr-prachsim/templates/job.yaml            |  0
 .../{ => charts}/nr-prachsim/values.yaml      |  0
 .../{ => charts}/nr-pucchsim/Chart.yaml       |  0
 .../nr-pucchsim/templates/_helpers.tpl        |  0
 .../nr-pucchsim/templates/job.yaml            |  0
 .../{ => charts}/nr-pucchsim/values.yaml      |  0
 .../{ => charts}/nr-ulschsim/Chart.yaml       |  0
 .../nr-ulschsim/templates/_helpers.tpl        |  0
 .../nr-ulschsim/templates/job.yaml            |  0
 .../{ => charts}/nr-ulschsim/values.yaml      |  0
 .../{ => charts}/nr-ulsim.3gpp/Chart.yaml     |  0
 .../nr-ulsim.3gpp/templates/_helpers.tpl      |  0
 .../nr-ulsim.3gpp/templates/job.yaml          |  0
 .../{ => charts}/nr-ulsim.3gpp/values.yaml    |  0
 .../{ => charts}/nr-ulsim.mimo/Chart.yaml     |  0
 .../nr-ulsim.mimo/templates/_helpers.tpl      |  0
 .../nr-ulsim.mimo/templates/job.yaml          |  0
 .../{ => charts}/nr-ulsim.mimo/values.yaml    |  0
 .../{ => charts}/nr-ulsim.misc/Chart.yaml     |  0
 .../nr-ulsim.misc/templates/_helpers.tpl      |  0
 .../nr-ulsim.misc/templates/job.yaml          |  0
 .../{ => charts}/nr-ulsim.misc/values.yaml    |  0
 .../{ => charts}/nr-ulsim.sc-fdma/Chart.yaml  |  0
 .../nr-ulsim.sc-fdma/templates/_helpers.tpl   |  0
 .../nr-ulsim.sc-fdma/templates/job.yaml       |  0
 .../{ => charts}/nr-ulsim.sc-fdma/values.yaml |  0
 .../charts/{ => charts}/polartest/Chart.yaml  |  0
 .../polartest/templates/_helpers.tpl          |  0
 .../{ => charts}/polartest/templates/job.yaml |  0
 .../charts/{ => charts}/polartest/values.yaml |  0
 .../{ => charts}/smallblocktest/Chart.yaml    |  0
 .../smallblocktest/templates/_helpers.tpl     |  0
 .../smallblocktest/templates/job.yaml         |  0
 .../{ => charts}/smallblocktest/values.yaml   |  0
 .../charts/{ => charts}/ulsim/Chart.yaml      |  0
 .../{ => charts}/ulsim/templates/_helpers.tpl |  0
 .../{ => charts}/ulsim/templates/job.yaml     |  0
 .../charts/{ => charts}/ulsim/values.yaml     |  0
 .../dlsim.100rb+tm2/templates/NOTES.txt       | 15 --------------
 .../dlsim.100rb+tm2/templates/service.yaml    | 20 -------------------
 .../charts/dlsim.basic/templates/NOTES.txt    | 15 --------------
 .../charts/dlsim.basic/templates/service.yaml | 20 -------------------
 .../charts/ldpctest/templates/NOTES.txt       | 15 --------------
 .../charts/ldpctest/templates/service.yaml    | 20 -------------------
 .../charts/nr-dlschsim/templates/NOTES.txt    | 15 --------------
 .../charts/nr-dlschsim/templates/service.yaml | 20 -------------------
 .../charts/nr-dlsim.basic/templates/NOTES.txt | 15 --------------
 .../nr-dlsim.basic/templates/service.yaml     | 20 -------------------
 .../nr-dlsim.dmrs+ptrs/templates/NOTES.txt    | 15 --------------
 .../nr-dlsim.dmrs+ptrs/templates/service.yaml | 20 -------------------
 .../nr-dlsim.mcs+mimo/templates/NOTES.txt     | 15 --------------
 .../nr-dlsim.mcs+mimo/templates/service.yaml  | 20 -------------------
 .../nr-dlsim.offset/templates/NOTES.txt       | 15 --------------
 .../nr-dlsim.offset/templates/service.yaml    | 20 -------------------
 .../nr-pbchsim.106rb/templates/NOTES.txt      | 15 --------------
 .../nr-pbchsim.106rb/templates/service.yaml   | 20 -------------------
 .../nr-pbchsim.217rb/templates/NOTES.txt      | 15 --------------
 .../nr-pbchsim.217rb/templates/service.yaml   | 20 -------------------
 .../nr-pbchsim.273rb/templates/NOTES.txt      | 15 --------------
 .../nr-pbchsim.273rb/templates/service.yaml   | 20 -------------------
 .../charts/nr-prachsim/templates/NOTES.txt    | 15 --------------
 .../charts/nr-prachsim/templates/service.yaml | 20 -------------------
 .../charts/nr-pucchsim/templates/NOTES.txt    | 15 --------------
 .../charts/nr-pucchsim/templates/service.yaml | 20 -------------------
 .../charts/nr-ulschsim/templates/NOTES.txt    | 15 --------------
 .../charts/nr-ulschsim/templates/service.yaml | 20 -------------------
 .../charts/nr-ulsim.3gpp/templates/NOTES.txt  | 15 --------------
 .../nr-ulsim.3gpp/templates/service.yaml      | 20 -------------------
 .../charts/nr-ulsim.mimo/templates/NOTES.txt  | 15 --------------
 .../nr-ulsim.mimo/templates/service.yaml      | 20 -------------------
 .../charts/nr-ulsim.misc/templates/NOTES.txt  | 15 --------------
 .../nr-ulsim.misc/templates/service.yaml      | 20 -------------------
 .../nr-ulsim.sc-fdma/templates/NOTES.txt      | 15 --------------
 .../nr-ulsim.sc-fdma/templates/service.yaml   | 20 -------------------
 .../charts/polartest/templates/NOTES.txt      | 15 --------------
 .../charts/polartest/templates/service.yaml   | 20 -------------------
 .../charts/smallblocktest/templates/NOTES.txt | 15 --------------
 .../smallblocktest/templates/service.yaml     | 20 -------------------
 .../physims/charts/ulsim/templates/NOTES.txt  | 15 --------------
 .../charts/ulsim/templates/service.yaml       | 20 -------------------
 charts/physims/values.yaml                    |  1 -
 ci-scripts/cls_physim1.py                     |  4 ++--
 128 files changed, 9 insertions(+), 745 deletions(-)
 rename charts/physims/charts/{ => charts}/dlsim.100rb+tm2/Chart.yaml (100%)
 rename charts/physims/charts/{ => charts}/dlsim.100rb+tm2/templates/_helpers.tpl (100%)
 rename charts/physims/charts/{ => charts}/dlsim.100rb+tm2/templates/job.yaml (100%)
 rename charts/physims/charts/{ => charts}/dlsim.100rb+tm2/values.yaml (100%)
 rename charts/physims/charts/{ => charts}/dlsim.basic/Chart.yaml (100%)
 rename charts/physims/charts/{ => charts}/dlsim.basic/templates/_helpers.tpl (100%)
 rename charts/physims/charts/{ => charts}/dlsim.basic/templates/job.yaml (100%)
 rename charts/physims/charts/{ => charts}/dlsim.basic/values.yaml (86%)
 rename charts/physims/charts/{ => charts}/ldpctest/Chart.yaml (100%)
 rename charts/physims/charts/{ => charts}/ldpctest/templates/_helpers.tpl (100%)
 rename charts/physims/charts/{ => charts}/ldpctest/templates/job.yaml (100%)
 rename charts/physims/charts/{ => charts}/ldpctest/values.yaml (100%)
 rename charts/physims/charts/{ => charts}/nr-dlschsim/Chart.yaml (100%)
 rename charts/physims/charts/{ => charts}/nr-dlschsim/templates/_helpers.tpl (100%)
 rename charts/physims/charts/{ => charts}/nr-dlschsim/templates/job.yaml (100%)
 rename charts/physims/charts/{ => charts}/nr-dlschsim/values.yaml (100%)
 rename charts/physims/charts/{ => charts}/nr-dlsim.basic/Chart.yaml (100%)
 rename charts/physims/charts/{ => charts}/nr-dlsim.basic/templates/_helpers.tpl (100%)
 rename charts/physims/charts/{ => charts}/nr-dlsim.basic/templates/job.yaml (100%)
 rename charts/physims/charts/{ => charts}/nr-dlsim.basic/values.yaml (100%)
 rename charts/physims/charts/{ => charts}/nr-dlsim.dmrs+ptrs/Chart.yaml (100%)
 rename charts/physims/charts/{ => charts}/nr-dlsim.dmrs+ptrs/templates/_helpers.tpl (100%)
 rename charts/physims/charts/{ => charts}/nr-dlsim.dmrs+ptrs/templates/job.yaml (100%)
 rename charts/physims/charts/{ => charts}/nr-dlsim.dmrs+ptrs/values.yaml (100%)
 rename charts/physims/charts/{ => charts}/nr-dlsim.mcs+mimo/Chart.yaml (100%)
 rename charts/physims/charts/{ => charts}/nr-dlsim.mcs+mimo/templates/_helpers.tpl (100%)
 rename charts/physims/charts/{ => charts}/nr-dlsim.mcs+mimo/templates/job.yaml (100%)
 rename charts/physims/charts/{ => charts}/nr-dlsim.mcs+mimo/values.yaml (100%)
 rename charts/physims/charts/{ => charts}/nr-dlsim.offset/Chart.yaml (100%)
 rename charts/physims/charts/{ => charts}/nr-dlsim.offset/templates/_helpers.tpl (100%)
 rename charts/physims/charts/{ => charts}/nr-dlsim.offset/templates/job.yaml (100%)
 rename charts/physims/charts/{ => charts}/nr-dlsim.offset/values.yaml (100%)
 rename charts/physims/charts/{ => charts}/nr-pbchsim.106rb/Chart.yaml (100%)
 rename charts/physims/charts/{ => charts}/nr-pbchsim.106rb/templates/_helpers.tpl (100%)
 rename charts/physims/charts/{ => charts}/nr-pbchsim.106rb/templates/job.yaml (100%)
 rename charts/physims/charts/{ => charts}/nr-pbchsim.106rb/values.yaml (100%)
 rename charts/physims/charts/{ => charts}/nr-pbchsim.217rb/Chart.yaml (100%)
 rename charts/physims/charts/{ => charts}/nr-pbchsim.217rb/templates/_helpers.tpl (100%)
 rename charts/physims/charts/{ => charts}/nr-pbchsim.217rb/templates/job.yaml (100%)
 rename charts/physims/charts/{ => charts}/nr-pbchsim.217rb/values.yaml (100%)
 rename charts/physims/charts/{ => charts}/nr-pbchsim.273rb/Chart.yaml (100%)
 rename charts/physims/charts/{ => charts}/nr-pbchsim.273rb/templates/_helpers.tpl (100%)
 rename charts/physims/charts/{ => charts}/nr-pbchsim.273rb/templates/job.yaml (100%)
 rename charts/physims/charts/{ => charts}/nr-pbchsim.273rb/values.yaml (100%)
 rename charts/physims/charts/{ => charts}/nr-prachsim/Chart.yaml (100%)
 rename charts/physims/charts/{ => charts}/nr-prachsim/templates/_helpers.tpl (100%)
 rename charts/physims/charts/{ => charts}/nr-prachsim/templates/job.yaml (100%)
 rename charts/physims/charts/{ => charts}/nr-prachsim/values.yaml (100%)
 rename charts/physims/charts/{ => charts}/nr-pucchsim/Chart.yaml (100%)
 rename charts/physims/charts/{ => charts}/nr-pucchsim/templates/_helpers.tpl (100%)
 rename charts/physims/charts/{ => charts}/nr-pucchsim/templates/job.yaml (100%)
 rename charts/physims/charts/{ => charts}/nr-pucchsim/values.yaml (100%)
 rename charts/physims/charts/{ => charts}/nr-ulschsim/Chart.yaml (100%)
 rename charts/physims/charts/{ => charts}/nr-ulschsim/templates/_helpers.tpl (100%)
 rename charts/physims/charts/{ => charts}/nr-ulschsim/templates/job.yaml (100%)
 rename charts/physims/charts/{ => charts}/nr-ulschsim/values.yaml (100%)
 rename charts/physims/charts/{ => charts}/nr-ulsim.3gpp/Chart.yaml (100%)
 rename charts/physims/charts/{ => charts}/nr-ulsim.3gpp/templates/_helpers.tpl (100%)
 rename charts/physims/charts/{ => charts}/nr-ulsim.3gpp/templates/job.yaml (100%)
 rename charts/physims/charts/{ => charts}/nr-ulsim.3gpp/values.yaml (100%)
 rename charts/physims/charts/{ => charts}/nr-ulsim.mimo/Chart.yaml (100%)
 rename charts/physims/charts/{ => charts}/nr-ulsim.mimo/templates/_helpers.tpl (100%)
 rename charts/physims/charts/{ => charts}/nr-ulsim.mimo/templates/job.yaml (100%)
 rename charts/physims/charts/{ => charts}/nr-ulsim.mimo/values.yaml (100%)
 rename charts/physims/charts/{ => charts}/nr-ulsim.misc/Chart.yaml (100%)
 rename charts/physims/charts/{ => charts}/nr-ulsim.misc/templates/_helpers.tpl (100%)
 rename charts/physims/charts/{ => charts}/nr-ulsim.misc/templates/job.yaml (100%)
 rename charts/physims/charts/{ => charts}/nr-ulsim.misc/values.yaml (100%)
 rename charts/physims/charts/{ => charts}/nr-ulsim.sc-fdma/Chart.yaml (100%)
 rename charts/physims/charts/{ => charts}/nr-ulsim.sc-fdma/templates/_helpers.tpl (100%)
 rename charts/physims/charts/{ => charts}/nr-ulsim.sc-fdma/templates/job.yaml (100%)
 rename charts/physims/charts/{ => charts}/nr-ulsim.sc-fdma/values.yaml (100%)
 rename charts/physims/charts/{ => charts}/polartest/Chart.yaml (100%)
 rename charts/physims/charts/{ => charts}/polartest/templates/_helpers.tpl (100%)
 rename charts/physims/charts/{ => charts}/polartest/templates/job.yaml (100%)
 rename charts/physims/charts/{ => charts}/polartest/values.yaml (100%)
 rename charts/physims/charts/{ => charts}/smallblocktest/Chart.yaml (100%)
 rename charts/physims/charts/{ => charts}/smallblocktest/templates/_helpers.tpl (100%)
 rename charts/physims/charts/{ => charts}/smallblocktest/templates/job.yaml (100%)
 rename charts/physims/charts/{ => charts}/smallblocktest/values.yaml (100%)
 rename charts/physims/charts/{ => charts}/ulsim/Chart.yaml (100%)
 rename charts/physims/charts/{ => charts}/ulsim/templates/_helpers.tpl (100%)
 rename charts/physims/charts/{ => charts}/ulsim/templates/job.yaml (100%)
 rename charts/physims/charts/{ => charts}/ulsim/values.yaml (100%)
 delete mode 100644 charts/physims/charts/dlsim.100rb+tm2/templates/NOTES.txt
 delete mode 100644 charts/physims/charts/dlsim.100rb+tm2/templates/service.yaml
 delete mode 100644 charts/physims/charts/dlsim.basic/templates/NOTES.txt
 delete mode 100644 charts/physims/charts/dlsim.basic/templates/service.yaml
 delete mode 100644 charts/physims/charts/ldpctest/templates/NOTES.txt
 delete mode 100644 charts/physims/charts/ldpctest/templates/service.yaml
 delete mode 100644 charts/physims/charts/nr-dlschsim/templates/NOTES.txt
 delete mode 100644 charts/physims/charts/nr-dlschsim/templates/service.yaml
 delete mode 100644 charts/physims/charts/nr-dlsim.basic/templates/NOTES.txt
 delete mode 100644 charts/physims/charts/nr-dlsim.basic/templates/service.yaml
 delete mode 100644 charts/physims/charts/nr-dlsim.dmrs+ptrs/templates/NOTES.txt
 delete mode 100644 charts/physims/charts/nr-dlsim.dmrs+ptrs/templates/service.yaml
 delete mode 100644 charts/physims/charts/nr-dlsim.mcs+mimo/templates/NOTES.txt
 delete mode 100644 charts/physims/charts/nr-dlsim.mcs+mimo/templates/service.yaml
 delete mode 100644 charts/physims/charts/nr-dlsim.offset/templates/NOTES.txt
 delete mode 100644 charts/physims/charts/nr-dlsim.offset/templates/service.yaml
 delete mode 100644 charts/physims/charts/nr-pbchsim.106rb/templates/NOTES.txt
 delete mode 100644 charts/physims/charts/nr-pbchsim.106rb/templates/service.yaml
 delete mode 100644 charts/physims/charts/nr-pbchsim.217rb/templates/NOTES.txt
 delete mode 100644 charts/physims/charts/nr-pbchsim.217rb/templates/service.yaml
 delete mode 100644 charts/physims/charts/nr-pbchsim.273rb/templates/NOTES.txt
 delete mode 100644 charts/physims/charts/nr-pbchsim.273rb/templates/service.yaml
 delete mode 100644 charts/physims/charts/nr-prachsim/templates/NOTES.txt
 delete mode 100644 charts/physims/charts/nr-prachsim/templates/service.yaml
 delete mode 100644 charts/physims/charts/nr-pucchsim/templates/NOTES.txt
 delete mode 100644 charts/physims/charts/nr-pucchsim/templates/service.yaml
 delete mode 100644 charts/physims/charts/nr-ulschsim/templates/NOTES.txt
 delete mode 100644 charts/physims/charts/nr-ulschsim/templates/service.yaml
 delete mode 100644 charts/physims/charts/nr-ulsim.3gpp/templates/NOTES.txt
 delete mode 100644 charts/physims/charts/nr-ulsim.3gpp/templates/service.yaml
 delete mode 100644 charts/physims/charts/nr-ulsim.mimo/templates/NOTES.txt
 delete mode 100644 charts/physims/charts/nr-ulsim.mimo/templates/service.yaml
 delete mode 100644 charts/physims/charts/nr-ulsim.misc/templates/NOTES.txt
 delete mode 100644 charts/physims/charts/nr-ulsim.misc/templates/service.yaml
 delete mode 100644 charts/physims/charts/nr-ulsim.sc-fdma/templates/NOTES.txt
 delete mode 100644 charts/physims/charts/nr-ulsim.sc-fdma/templates/service.yaml
 delete mode 100644 charts/physims/charts/polartest/templates/NOTES.txt
 delete mode 100644 charts/physims/charts/polartest/templates/service.yaml
 delete mode 100644 charts/physims/charts/smallblocktest/templates/NOTES.txt
 delete mode 100644 charts/physims/charts/smallblocktest/templates/service.yaml
 delete mode 100644 charts/physims/charts/ulsim/templates/NOTES.txt
 delete mode 100644 charts/physims/charts/ulsim/templates/service.yaml

diff --git a/charts/physims/charts/dlsim.100rb+tm2/Chart.yaml b/charts/physims/charts/charts/dlsim.100rb+tm2/Chart.yaml
similarity index 100%
rename from charts/physims/charts/dlsim.100rb+tm2/Chart.yaml
rename to charts/physims/charts/charts/dlsim.100rb+tm2/Chart.yaml
diff --git a/charts/physims/charts/dlsim.100rb+tm2/templates/_helpers.tpl b/charts/physims/charts/charts/dlsim.100rb+tm2/templates/_helpers.tpl
similarity index 100%
rename from charts/physims/charts/dlsim.100rb+tm2/templates/_helpers.tpl
rename to charts/physims/charts/charts/dlsim.100rb+tm2/templates/_helpers.tpl
diff --git a/charts/physims/charts/dlsim.100rb+tm2/templates/job.yaml b/charts/physims/charts/charts/dlsim.100rb+tm2/templates/job.yaml
similarity index 100%
rename from charts/physims/charts/dlsim.100rb+tm2/templates/job.yaml
rename to charts/physims/charts/charts/dlsim.100rb+tm2/templates/job.yaml
diff --git a/charts/physims/charts/dlsim.100rb+tm2/values.yaml b/charts/physims/charts/charts/dlsim.100rb+tm2/values.yaml
similarity index 100%
rename from charts/physims/charts/dlsim.100rb+tm2/values.yaml
rename to charts/physims/charts/charts/dlsim.100rb+tm2/values.yaml
diff --git a/charts/physims/charts/dlsim.basic/Chart.yaml b/charts/physims/charts/charts/dlsim.basic/Chart.yaml
similarity index 100%
rename from charts/physims/charts/dlsim.basic/Chart.yaml
rename to charts/physims/charts/charts/dlsim.basic/Chart.yaml
diff --git a/charts/physims/charts/dlsim.basic/templates/_helpers.tpl b/charts/physims/charts/charts/dlsim.basic/templates/_helpers.tpl
similarity index 100%
rename from charts/physims/charts/dlsim.basic/templates/_helpers.tpl
rename to charts/physims/charts/charts/dlsim.basic/templates/_helpers.tpl
diff --git a/charts/physims/charts/dlsim.basic/templates/job.yaml b/charts/physims/charts/charts/dlsim.basic/templates/job.yaml
similarity index 100%
rename from charts/physims/charts/dlsim.basic/templates/job.yaml
rename to charts/physims/charts/charts/dlsim.basic/templates/job.yaml
diff --git a/charts/physims/charts/dlsim.basic/values.yaml b/charts/physims/charts/charts/dlsim.basic/values.yaml
similarity index 86%
rename from charts/physims/charts/dlsim.basic/values.yaml
rename to charts/physims/charts/charts/dlsim.basic/values.yaml
index 2150e27daf..ae197e12ea 100644
--- a/charts/physims/charts/dlsim.basic/values.yaml
+++ b/charts/physims/charts/charts/dlsim.basic/values.yaml
@@ -29,13 +29,13 @@ podSecurityContext:
 securityContext:
   privileged: false
 
-resources: {}
-   # limits:
-   #   cpu: 100m
-   #   memory: 128Mi
-   # requests:
-   #   cpu: 100m
-   #   memory: 128Mi
+resources:
+   limits:
+     cpu: 100m
+     memory: 128Mi
+   requests:
+     cpu: 100m
+     memory: 128Mi
 
 nodeSelector: {}
 
diff --git a/charts/physims/charts/ldpctest/Chart.yaml b/charts/physims/charts/charts/ldpctest/Chart.yaml
similarity index 100%
rename from charts/physims/charts/ldpctest/Chart.yaml
rename to charts/physims/charts/charts/ldpctest/Chart.yaml
diff --git a/charts/physims/charts/ldpctest/templates/_helpers.tpl b/charts/physims/charts/charts/ldpctest/templates/_helpers.tpl
similarity index 100%
rename from charts/physims/charts/ldpctest/templates/_helpers.tpl
rename to charts/physims/charts/charts/ldpctest/templates/_helpers.tpl
diff --git a/charts/physims/charts/ldpctest/templates/job.yaml b/charts/physims/charts/charts/ldpctest/templates/job.yaml
similarity index 100%
rename from charts/physims/charts/ldpctest/templates/job.yaml
rename to charts/physims/charts/charts/ldpctest/templates/job.yaml
diff --git a/charts/physims/charts/ldpctest/values.yaml b/charts/physims/charts/charts/ldpctest/values.yaml
similarity index 100%
rename from charts/physims/charts/ldpctest/values.yaml
rename to charts/physims/charts/charts/ldpctest/values.yaml
diff --git a/charts/physims/charts/nr-dlschsim/Chart.yaml b/charts/physims/charts/charts/nr-dlschsim/Chart.yaml
similarity index 100%
rename from charts/physims/charts/nr-dlschsim/Chart.yaml
rename to charts/physims/charts/charts/nr-dlschsim/Chart.yaml
diff --git a/charts/physims/charts/nr-dlschsim/templates/_helpers.tpl b/charts/physims/charts/charts/nr-dlschsim/templates/_helpers.tpl
similarity index 100%
rename from charts/physims/charts/nr-dlschsim/templates/_helpers.tpl
rename to charts/physims/charts/charts/nr-dlschsim/templates/_helpers.tpl
diff --git a/charts/physims/charts/nr-dlschsim/templates/job.yaml b/charts/physims/charts/charts/nr-dlschsim/templates/job.yaml
similarity index 100%
rename from charts/physims/charts/nr-dlschsim/templates/job.yaml
rename to charts/physims/charts/charts/nr-dlschsim/templates/job.yaml
diff --git a/charts/physims/charts/nr-dlschsim/values.yaml b/charts/physims/charts/charts/nr-dlschsim/values.yaml
similarity index 100%
rename from charts/physims/charts/nr-dlschsim/values.yaml
rename to charts/physims/charts/charts/nr-dlschsim/values.yaml
diff --git a/charts/physims/charts/nr-dlsim.basic/Chart.yaml b/charts/physims/charts/charts/nr-dlsim.basic/Chart.yaml
similarity index 100%
rename from charts/physims/charts/nr-dlsim.basic/Chart.yaml
rename to charts/physims/charts/charts/nr-dlsim.basic/Chart.yaml
diff --git a/charts/physims/charts/nr-dlsim.basic/templates/_helpers.tpl b/charts/physims/charts/charts/nr-dlsim.basic/templates/_helpers.tpl
similarity index 100%
rename from charts/physims/charts/nr-dlsim.basic/templates/_helpers.tpl
rename to charts/physims/charts/charts/nr-dlsim.basic/templates/_helpers.tpl
diff --git a/charts/physims/charts/nr-dlsim.basic/templates/job.yaml b/charts/physims/charts/charts/nr-dlsim.basic/templates/job.yaml
similarity index 100%
rename from charts/physims/charts/nr-dlsim.basic/templates/job.yaml
rename to charts/physims/charts/charts/nr-dlsim.basic/templates/job.yaml
diff --git a/charts/physims/charts/nr-dlsim.basic/values.yaml b/charts/physims/charts/charts/nr-dlsim.basic/values.yaml
similarity index 100%
rename from charts/physims/charts/nr-dlsim.basic/values.yaml
rename to charts/physims/charts/charts/nr-dlsim.basic/values.yaml
diff --git a/charts/physims/charts/nr-dlsim.dmrs+ptrs/Chart.yaml b/charts/physims/charts/charts/nr-dlsim.dmrs+ptrs/Chart.yaml
similarity index 100%
rename from charts/physims/charts/nr-dlsim.dmrs+ptrs/Chart.yaml
rename to charts/physims/charts/charts/nr-dlsim.dmrs+ptrs/Chart.yaml
diff --git a/charts/physims/charts/nr-dlsim.dmrs+ptrs/templates/_helpers.tpl b/charts/physims/charts/charts/nr-dlsim.dmrs+ptrs/templates/_helpers.tpl
similarity index 100%
rename from charts/physims/charts/nr-dlsim.dmrs+ptrs/templates/_helpers.tpl
rename to charts/physims/charts/charts/nr-dlsim.dmrs+ptrs/templates/_helpers.tpl
diff --git a/charts/physims/charts/nr-dlsim.dmrs+ptrs/templates/job.yaml b/charts/physims/charts/charts/nr-dlsim.dmrs+ptrs/templates/job.yaml
similarity index 100%
rename from charts/physims/charts/nr-dlsim.dmrs+ptrs/templates/job.yaml
rename to charts/physims/charts/charts/nr-dlsim.dmrs+ptrs/templates/job.yaml
diff --git a/charts/physims/charts/nr-dlsim.dmrs+ptrs/values.yaml b/charts/physims/charts/charts/nr-dlsim.dmrs+ptrs/values.yaml
similarity index 100%
rename from charts/physims/charts/nr-dlsim.dmrs+ptrs/values.yaml
rename to charts/physims/charts/charts/nr-dlsim.dmrs+ptrs/values.yaml
diff --git a/charts/physims/charts/nr-dlsim.mcs+mimo/Chart.yaml b/charts/physims/charts/charts/nr-dlsim.mcs+mimo/Chart.yaml
similarity index 100%
rename from charts/physims/charts/nr-dlsim.mcs+mimo/Chart.yaml
rename to charts/physims/charts/charts/nr-dlsim.mcs+mimo/Chart.yaml
diff --git a/charts/physims/charts/nr-dlsim.mcs+mimo/templates/_helpers.tpl b/charts/physims/charts/charts/nr-dlsim.mcs+mimo/templates/_helpers.tpl
similarity index 100%
rename from charts/physims/charts/nr-dlsim.mcs+mimo/templates/_helpers.tpl
rename to charts/physims/charts/charts/nr-dlsim.mcs+mimo/templates/_helpers.tpl
diff --git a/charts/physims/charts/nr-dlsim.mcs+mimo/templates/job.yaml b/charts/physims/charts/charts/nr-dlsim.mcs+mimo/templates/job.yaml
similarity index 100%
rename from charts/physims/charts/nr-dlsim.mcs+mimo/templates/job.yaml
rename to charts/physims/charts/charts/nr-dlsim.mcs+mimo/templates/job.yaml
diff --git a/charts/physims/charts/nr-dlsim.mcs+mimo/values.yaml b/charts/physims/charts/charts/nr-dlsim.mcs+mimo/values.yaml
similarity index 100%
rename from charts/physims/charts/nr-dlsim.mcs+mimo/values.yaml
rename to charts/physims/charts/charts/nr-dlsim.mcs+mimo/values.yaml
diff --git a/charts/physims/charts/nr-dlsim.offset/Chart.yaml b/charts/physims/charts/charts/nr-dlsim.offset/Chart.yaml
similarity index 100%
rename from charts/physims/charts/nr-dlsim.offset/Chart.yaml
rename to charts/physims/charts/charts/nr-dlsim.offset/Chart.yaml
diff --git a/charts/physims/charts/nr-dlsim.offset/templates/_helpers.tpl b/charts/physims/charts/charts/nr-dlsim.offset/templates/_helpers.tpl
similarity index 100%
rename from charts/physims/charts/nr-dlsim.offset/templates/_helpers.tpl
rename to charts/physims/charts/charts/nr-dlsim.offset/templates/_helpers.tpl
diff --git a/charts/physims/charts/nr-dlsim.offset/templates/job.yaml b/charts/physims/charts/charts/nr-dlsim.offset/templates/job.yaml
similarity index 100%
rename from charts/physims/charts/nr-dlsim.offset/templates/job.yaml
rename to charts/physims/charts/charts/nr-dlsim.offset/templates/job.yaml
diff --git a/charts/physims/charts/nr-dlsim.offset/values.yaml b/charts/physims/charts/charts/nr-dlsim.offset/values.yaml
similarity index 100%
rename from charts/physims/charts/nr-dlsim.offset/values.yaml
rename to charts/physims/charts/charts/nr-dlsim.offset/values.yaml
diff --git a/charts/physims/charts/nr-pbchsim.106rb/Chart.yaml b/charts/physims/charts/charts/nr-pbchsim.106rb/Chart.yaml
similarity index 100%
rename from charts/physims/charts/nr-pbchsim.106rb/Chart.yaml
rename to charts/physims/charts/charts/nr-pbchsim.106rb/Chart.yaml
diff --git a/charts/physims/charts/nr-pbchsim.106rb/templates/_helpers.tpl b/charts/physims/charts/charts/nr-pbchsim.106rb/templates/_helpers.tpl
similarity index 100%
rename from charts/physims/charts/nr-pbchsim.106rb/templates/_helpers.tpl
rename to charts/physims/charts/charts/nr-pbchsim.106rb/templates/_helpers.tpl
diff --git a/charts/physims/charts/nr-pbchsim.106rb/templates/job.yaml b/charts/physims/charts/charts/nr-pbchsim.106rb/templates/job.yaml
similarity index 100%
rename from charts/physims/charts/nr-pbchsim.106rb/templates/job.yaml
rename to charts/physims/charts/charts/nr-pbchsim.106rb/templates/job.yaml
diff --git a/charts/physims/charts/nr-pbchsim.106rb/values.yaml b/charts/physims/charts/charts/nr-pbchsim.106rb/values.yaml
similarity index 100%
rename from charts/physims/charts/nr-pbchsim.106rb/values.yaml
rename to charts/physims/charts/charts/nr-pbchsim.106rb/values.yaml
diff --git a/charts/physims/charts/nr-pbchsim.217rb/Chart.yaml b/charts/physims/charts/charts/nr-pbchsim.217rb/Chart.yaml
similarity index 100%
rename from charts/physims/charts/nr-pbchsim.217rb/Chart.yaml
rename to charts/physims/charts/charts/nr-pbchsim.217rb/Chart.yaml
diff --git a/charts/physims/charts/nr-pbchsim.217rb/templates/_helpers.tpl b/charts/physims/charts/charts/nr-pbchsim.217rb/templates/_helpers.tpl
similarity index 100%
rename from charts/physims/charts/nr-pbchsim.217rb/templates/_helpers.tpl
rename to charts/physims/charts/charts/nr-pbchsim.217rb/templates/_helpers.tpl
diff --git a/charts/physims/charts/nr-pbchsim.217rb/templates/job.yaml b/charts/physims/charts/charts/nr-pbchsim.217rb/templates/job.yaml
similarity index 100%
rename from charts/physims/charts/nr-pbchsim.217rb/templates/job.yaml
rename to charts/physims/charts/charts/nr-pbchsim.217rb/templates/job.yaml
diff --git a/charts/physims/charts/nr-pbchsim.217rb/values.yaml b/charts/physims/charts/charts/nr-pbchsim.217rb/values.yaml
similarity index 100%
rename from charts/physims/charts/nr-pbchsim.217rb/values.yaml
rename to charts/physims/charts/charts/nr-pbchsim.217rb/values.yaml
diff --git a/charts/physims/charts/nr-pbchsim.273rb/Chart.yaml b/charts/physims/charts/charts/nr-pbchsim.273rb/Chart.yaml
similarity index 100%
rename from charts/physims/charts/nr-pbchsim.273rb/Chart.yaml
rename to charts/physims/charts/charts/nr-pbchsim.273rb/Chart.yaml
diff --git a/charts/physims/charts/nr-pbchsim.273rb/templates/_helpers.tpl b/charts/physims/charts/charts/nr-pbchsim.273rb/templates/_helpers.tpl
similarity index 100%
rename from charts/physims/charts/nr-pbchsim.273rb/templates/_helpers.tpl
rename to charts/physims/charts/charts/nr-pbchsim.273rb/templates/_helpers.tpl
diff --git a/charts/physims/charts/nr-pbchsim.273rb/templates/job.yaml b/charts/physims/charts/charts/nr-pbchsim.273rb/templates/job.yaml
similarity index 100%
rename from charts/physims/charts/nr-pbchsim.273rb/templates/job.yaml
rename to charts/physims/charts/charts/nr-pbchsim.273rb/templates/job.yaml
diff --git a/charts/physims/charts/nr-pbchsim.273rb/values.yaml b/charts/physims/charts/charts/nr-pbchsim.273rb/values.yaml
similarity index 100%
rename from charts/physims/charts/nr-pbchsim.273rb/values.yaml
rename to charts/physims/charts/charts/nr-pbchsim.273rb/values.yaml
diff --git a/charts/physims/charts/nr-prachsim/Chart.yaml b/charts/physims/charts/charts/nr-prachsim/Chart.yaml
similarity index 100%
rename from charts/physims/charts/nr-prachsim/Chart.yaml
rename to charts/physims/charts/charts/nr-prachsim/Chart.yaml
diff --git a/charts/physims/charts/nr-prachsim/templates/_helpers.tpl b/charts/physims/charts/charts/nr-prachsim/templates/_helpers.tpl
similarity index 100%
rename from charts/physims/charts/nr-prachsim/templates/_helpers.tpl
rename to charts/physims/charts/charts/nr-prachsim/templates/_helpers.tpl
diff --git a/charts/physims/charts/nr-prachsim/templates/job.yaml b/charts/physims/charts/charts/nr-prachsim/templates/job.yaml
similarity index 100%
rename from charts/physims/charts/nr-prachsim/templates/job.yaml
rename to charts/physims/charts/charts/nr-prachsim/templates/job.yaml
diff --git a/charts/physims/charts/nr-prachsim/values.yaml b/charts/physims/charts/charts/nr-prachsim/values.yaml
similarity index 100%
rename from charts/physims/charts/nr-prachsim/values.yaml
rename to charts/physims/charts/charts/nr-prachsim/values.yaml
diff --git a/charts/physims/charts/nr-pucchsim/Chart.yaml b/charts/physims/charts/charts/nr-pucchsim/Chart.yaml
similarity index 100%
rename from charts/physims/charts/nr-pucchsim/Chart.yaml
rename to charts/physims/charts/charts/nr-pucchsim/Chart.yaml
diff --git a/charts/physims/charts/nr-pucchsim/templates/_helpers.tpl b/charts/physims/charts/charts/nr-pucchsim/templates/_helpers.tpl
similarity index 100%
rename from charts/physims/charts/nr-pucchsim/templates/_helpers.tpl
rename to charts/physims/charts/charts/nr-pucchsim/templates/_helpers.tpl
diff --git a/charts/physims/charts/nr-pucchsim/templates/job.yaml b/charts/physims/charts/charts/nr-pucchsim/templates/job.yaml
similarity index 100%
rename from charts/physims/charts/nr-pucchsim/templates/job.yaml
rename to charts/physims/charts/charts/nr-pucchsim/templates/job.yaml
diff --git a/charts/physims/charts/nr-pucchsim/values.yaml b/charts/physims/charts/charts/nr-pucchsim/values.yaml
similarity index 100%
rename from charts/physims/charts/nr-pucchsim/values.yaml
rename to charts/physims/charts/charts/nr-pucchsim/values.yaml
diff --git a/charts/physims/charts/nr-ulschsim/Chart.yaml b/charts/physims/charts/charts/nr-ulschsim/Chart.yaml
similarity index 100%
rename from charts/physims/charts/nr-ulschsim/Chart.yaml
rename to charts/physims/charts/charts/nr-ulschsim/Chart.yaml
diff --git a/charts/physims/charts/nr-ulschsim/templates/_helpers.tpl b/charts/physims/charts/charts/nr-ulschsim/templates/_helpers.tpl
similarity index 100%
rename from charts/physims/charts/nr-ulschsim/templates/_helpers.tpl
rename to charts/physims/charts/charts/nr-ulschsim/templates/_helpers.tpl
diff --git a/charts/physims/charts/nr-ulschsim/templates/job.yaml b/charts/physims/charts/charts/nr-ulschsim/templates/job.yaml
similarity index 100%
rename from charts/physims/charts/nr-ulschsim/templates/job.yaml
rename to charts/physims/charts/charts/nr-ulschsim/templates/job.yaml
diff --git a/charts/physims/charts/nr-ulschsim/values.yaml b/charts/physims/charts/charts/nr-ulschsim/values.yaml
similarity index 100%
rename from charts/physims/charts/nr-ulschsim/values.yaml
rename to charts/physims/charts/charts/nr-ulschsim/values.yaml
diff --git a/charts/physims/charts/nr-ulsim.3gpp/Chart.yaml b/charts/physims/charts/charts/nr-ulsim.3gpp/Chart.yaml
similarity index 100%
rename from charts/physims/charts/nr-ulsim.3gpp/Chart.yaml
rename to charts/physims/charts/charts/nr-ulsim.3gpp/Chart.yaml
diff --git a/charts/physims/charts/nr-ulsim.3gpp/templates/_helpers.tpl b/charts/physims/charts/charts/nr-ulsim.3gpp/templates/_helpers.tpl
similarity index 100%
rename from charts/physims/charts/nr-ulsim.3gpp/templates/_helpers.tpl
rename to charts/physims/charts/charts/nr-ulsim.3gpp/templates/_helpers.tpl
diff --git a/charts/physims/charts/nr-ulsim.3gpp/templates/job.yaml b/charts/physims/charts/charts/nr-ulsim.3gpp/templates/job.yaml
similarity index 100%
rename from charts/physims/charts/nr-ulsim.3gpp/templates/job.yaml
rename to charts/physims/charts/charts/nr-ulsim.3gpp/templates/job.yaml
diff --git a/charts/physims/charts/nr-ulsim.3gpp/values.yaml b/charts/physims/charts/charts/nr-ulsim.3gpp/values.yaml
similarity index 100%
rename from charts/physims/charts/nr-ulsim.3gpp/values.yaml
rename to charts/physims/charts/charts/nr-ulsim.3gpp/values.yaml
diff --git a/charts/physims/charts/nr-ulsim.mimo/Chart.yaml b/charts/physims/charts/charts/nr-ulsim.mimo/Chart.yaml
similarity index 100%
rename from charts/physims/charts/nr-ulsim.mimo/Chart.yaml
rename to charts/physims/charts/charts/nr-ulsim.mimo/Chart.yaml
diff --git a/charts/physims/charts/nr-ulsim.mimo/templates/_helpers.tpl b/charts/physims/charts/charts/nr-ulsim.mimo/templates/_helpers.tpl
similarity index 100%
rename from charts/physims/charts/nr-ulsim.mimo/templates/_helpers.tpl
rename to charts/physims/charts/charts/nr-ulsim.mimo/templates/_helpers.tpl
diff --git a/charts/physims/charts/nr-ulsim.mimo/templates/job.yaml b/charts/physims/charts/charts/nr-ulsim.mimo/templates/job.yaml
similarity index 100%
rename from charts/physims/charts/nr-ulsim.mimo/templates/job.yaml
rename to charts/physims/charts/charts/nr-ulsim.mimo/templates/job.yaml
diff --git a/charts/physims/charts/nr-ulsim.mimo/values.yaml b/charts/physims/charts/charts/nr-ulsim.mimo/values.yaml
similarity index 100%
rename from charts/physims/charts/nr-ulsim.mimo/values.yaml
rename to charts/physims/charts/charts/nr-ulsim.mimo/values.yaml
diff --git a/charts/physims/charts/nr-ulsim.misc/Chart.yaml b/charts/physims/charts/charts/nr-ulsim.misc/Chart.yaml
similarity index 100%
rename from charts/physims/charts/nr-ulsim.misc/Chart.yaml
rename to charts/physims/charts/charts/nr-ulsim.misc/Chart.yaml
diff --git a/charts/physims/charts/nr-ulsim.misc/templates/_helpers.tpl b/charts/physims/charts/charts/nr-ulsim.misc/templates/_helpers.tpl
similarity index 100%
rename from charts/physims/charts/nr-ulsim.misc/templates/_helpers.tpl
rename to charts/physims/charts/charts/nr-ulsim.misc/templates/_helpers.tpl
diff --git a/charts/physims/charts/nr-ulsim.misc/templates/job.yaml b/charts/physims/charts/charts/nr-ulsim.misc/templates/job.yaml
similarity index 100%
rename from charts/physims/charts/nr-ulsim.misc/templates/job.yaml
rename to charts/physims/charts/charts/nr-ulsim.misc/templates/job.yaml
diff --git a/charts/physims/charts/nr-ulsim.misc/values.yaml b/charts/physims/charts/charts/nr-ulsim.misc/values.yaml
similarity index 100%
rename from charts/physims/charts/nr-ulsim.misc/values.yaml
rename to charts/physims/charts/charts/nr-ulsim.misc/values.yaml
diff --git a/charts/physims/charts/nr-ulsim.sc-fdma/Chart.yaml b/charts/physims/charts/charts/nr-ulsim.sc-fdma/Chart.yaml
similarity index 100%
rename from charts/physims/charts/nr-ulsim.sc-fdma/Chart.yaml
rename to charts/physims/charts/charts/nr-ulsim.sc-fdma/Chart.yaml
diff --git a/charts/physims/charts/nr-ulsim.sc-fdma/templates/_helpers.tpl b/charts/physims/charts/charts/nr-ulsim.sc-fdma/templates/_helpers.tpl
similarity index 100%
rename from charts/physims/charts/nr-ulsim.sc-fdma/templates/_helpers.tpl
rename to charts/physims/charts/charts/nr-ulsim.sc-fdma/templates/_helpers.tpl
diff --git a/charts/physims/charts/nr-ulsim.sc-fdma/templates/job.yaml b/charts/physims/charts/charts/nr-ulsim.sc-fdma/templates/job.yaml
similarity index 100%
rename from charts/physims/charts/nr-ulsim.sc-fdma/templates/job.yaml
rename to charts/physims/charts/charts/nr-ulsim.sc-fdma/templates/job.yaml
diff --git a/charts/physims/charts/nr-ulsim.sc-fdma/values.yaml b/charts/physims/charts/charts/nr-ulsim.sc-fdma/values.yaml
similarity index 100%
rename from charts/physims/charts/nr-ulsim.sc-fdma/values.yaml
rename to charts/physims/charts/charts/nr-ulsim.sc-fdma/values.yaml
diff --git a/charts/physims/charts/polartest/Chart.yaml b/charts/physims/charts/charts/polartest/Chart.yaml
similarity index 100%
rename from charts/physims/charts/polartest/Chart.yaml
rename to charts/physims/charts/charts/polartest/Chart.yaml
diff --git a/charts/physims/charts/polartest/templates/_helpers.tpl b/charts/physims/charts/charts/polartest/templates/_helpers.tpl
similarity index 100%
rename from charts/physims/charts/polartest/templates/_helpers.tpl
rename to charts/physims/charts/charts/polartest/templates/_helpers.tpl
diff --git a/charts/physims/charts/polartest/templates/job.yaml b/charts/physims/charts/charts/polartest/templates/job.yaml
similarity index 100%
rename from charts/physims/charts/polartest/templates/job.yaml
rename to charts/physims/charts/charts/polartest/templates/job.yaml
diff --git a/charts/physims/charts/polartest/values.yaml b/charts/physims/charts/charts/polartest/values.yaml
similarity index 100%
rename from charts/physims/charts/polartest/values.yaml
rename to charts/physims/charts/charts/polartest/values.yaml
diff --git a/charts/physims/charts/smallblocktest/Chart.yaml b/charts/physims/charts/charts/smallblocktest/Chart.yaml
similarity index 100%
rename from charts/physims/charts/smallblocktest/Chart.yaml
rename to charts/physims/charts/charts/smallblocktest/Chart.yaml
diff --git a/charts/physims/charts/smallblocktest/templates/_helpers.tpl b/charts/physims/charts/charts/smallblocktest/templates/_helpers.tpl
similarity index 100%
rename from charts/physims/charts/smallblocktest/templates/_helpers.tpl
rename to charts/physims/charts/charts/smallblocktest/templates/_helpers.tpl
diff --git a/charts/physims/charts/smallblocktest/templates/job.yaml b/charts/physims/charts/charts/smallblocktest/templates/job.yaml
similarity index 100%
rename from charts/physims/charts/smallblocktest/templates/job.yaml
rename to charts/physims/charts/charts/smallblocktest/templates/job.yaml
diff --git a/charts/physims/charts/smallblocktest/values.yaml b/charts/physims/charts/charts/smallblocktest/values.yaml
similarity index 100%
rename from charts/physims/charts/smallblocktest/values.yaml
rename to charts/physims/charts/charts/smallblocktest/values.yaml
diff --git a/charts/physims/charts/ulsim/Chart.yaml b/charts/physims/charts/charts/ulsim/Chart.yaml
similarity index 100%
rename from charts/physims/charts/ulsim/Chart.yaml
rename to charts/physims/charts/charts/ulsim/Chart.yaml
diff --git a/charts/physims/charts/ulsim/templates/_helpers.tpl b/charts/physims/charts/charts/ulsim/templates/_helpers.tpl
similarity index 100%
rename from charts/physims/charts/ulsim/templates/_helpers.tpl
rename to charts/physims/charts/charts/ulsim/templates/_helpers.tpl
diff --git a/charts/physims/charts/ulsim/templates/job.yaml b/charts/physims/charts/charts/ulsim/templates/job.yaml
similarity index 100%
rename from charts/physims/charts/ulsim/templates/job.yaml
rename to charts/physims/charts/charts/ulsim/templates/job.yaml
diff --git a/charts/physims/charts/ulsim/values.yaml b/charts/physims/charts/charts/ulsim/values.yaml
similarity index 100%
rename from charts/physims/charts/ulsim/values.yaml
rename to charts/physims/charts/charts/ulsim/values.yaml
diff --git a/charts/physims/charts/dlsim.100rb+tm2/templates/NOTES.txt b/charts/physims/charts/dlsim.100rb+tm2/templates/NOTES.txt
deleted file mode 100644
index 89f5185499..0000000000
--- a/charts/physims/charts/dlsim.100rb+tm2/templates/NOTES.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-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 }}
diff --git a/charts/physims/charts/dlsim.100rb+tm2/templates/service.yaml b/charts/physims/charts/dlsim.100rb+tm2/templates/service.yaml
deleted file mode 100644
index 377e567c9a..0000000000
--- a/charts/physims/charts/dlsim.100rb+tm2/templates/service.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-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 }}
diff --git a/charts/physims/charts/dlsim.basic/templates/NOTES.txt b/charts/physims/charts/dlsim.basic/templates/NOTES.txt
deleted file mode 100644
index 1111598300..0000000000
--- a/charts/physims/charts/dlsim.basic/templates/NOTES.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-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 }}
diff --git a/charts/physims/charts/dlsim.basic/templates/service.yaml b/charts/physims/charts/dlsim.basic/templates/service.yaml
deleted file mode 100644
index 27e22a31d9..0000000000
--- a/charts/physims/charts/dlsim.basic/templates/service.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-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 }}
diff --git a/charts/physims/charts/ldpctest/templates/NOTES.txt b/charts/physims/charts/ldpctest/templates/NOTES.txt
deleted file mode 100644
index bda83c2f9e..0000000000
--- a/charts/physims/charts/ldpctest/templates/NOTES.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-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 }}
diff --git a/charts/physims/charts/ldpctest/templates/service.yaml b/charts/physims/charts/ldpctest/templates/service.yaml
deleted file mode 100644
index eb0db8ce00..0000000000
--- a/charts/physims/charts/ldpctest/templates/service.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-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 }}
diff --git a/charts/physims/charts/nr-dlschsim/templates/NOTES.txt b/charts/physims/charts/nr-dlschsim/templates/NOTES.txt
deleted file mode 100644
index 1f88d64976..0000000000
--- a/charts/physims/charts/nr-dlschsim/templates/NOTES.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-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 }}
diff --git a/charts/physims/charts/nr-dlschsim/templates/service.yaml b/charts/physims/charts/nr-dlschsim/templates/service.yaml
deleted file mode 100644
index 0dd065c9e0..0000000000
--- a/charts/physims/charts/nr-dlschsim/templates/service.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-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 }}
diff --git a/charts/physims/charts/nr-dlsim.basic/templates/NOTES.txt b/charts/physims/charts/nr-dlsim.basic/templates/NOTES.txt
deleted file mode 100644
index c8a7bbfd1b..0000000000
--- a/charts/physims/charts/nr-dlsim.basic/templates/NOTES.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-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 }}
diff --git a/charts/physims/charts/nr-dlsim.basic/templates/service.yaml b/charts/physims/charts/nr-dlsim.basic/templates/service.yaml
deleted file mode 100644
index 5bf3baf772..0000000000
--- a/charts/physims/charts/nr-dlsim.basic/templates/service.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-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 }}
diff --git a/charts/physims/charts/nr-dlsim.dmrs+ptrs/templates/NOTES.txt b/charts/physims/charts/nr-dlsim.dmrs+ptrs/templates/NOTES.txt
deleted file mode 100644
index 5e8f9ba046..0000000000
--- a/charts/physims/charts/nr-dlsim.dmrs+ptrs/templates/NOTES.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-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 }}
diff --git a/charts/physims/charts/nr-dlsim.dmrs+ptrs/templates/service.yaml b/charts/physims/charts/nr-dlsim.dmrs+ptrs/templates/service.yaml
deleted file mode 100644
index b2c3a43b55..0000000000
--- a/charts/physims/charts/nr-dlsim.dmrs+ptrs/templates/service.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-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 }}
diff --git a/charts/physims/charts/nr-dlsim.mcs+mimo/templates/NOTES.txt b/charts/physims/charts/nr-dlsim.mcs+mimo/templates/NOTES.txt
deleted file mode 100644
index 34e88d2136..0000000000
--- a/charts/physims/charts/nr-dlsim.mcs+mimo/templates/NOTES.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-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 }}
diff --git a/charts/physims/charts/nr-dlsim.mcs+mimo/templates/service.yaml b/charts/physims/charts/nr-dlsim.mcs+mimo/templates/service.yaml
deleted file mode 100644
index c1552fc314..0000000000
--- a/charts/physims/charts/nr-dlsim.mcs+mimo/templates/service.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-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 }}
diff --git a/charts/physims/charts/nr-dlsim.offset/templates/NOTES.txt b/charts/physims/charts/nr-dlsim.offset/templates/NOTES.txt
deleted file mode 100644
index 9a7d8f6013..0000000000
--- a/charts/physims/charts/nr-dlsim.offset/templates/NOTES.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-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 }}
diff --git a/charts/physims/charts/nr-dlsim.offset/templates/service.yaml b/charts/physims/charts/nr-dlsim.offset/templates/service.yaml
deleted file mode 100644
index dfcbc675a9..0000000000
--- a/charts/physims/charts/nr-dlsim.offset/templates/service.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-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 }}
diff --git a/charts/physims/charts/nr-pbchsim.106rb/templates/NOTES.txt b/charts/physims/charts/nr-pbchsim.106rb/templates/NOTES.txt
deleted file mode 100644
index 2e0d2ef627..0000000000
--- a/charts/physims/charts/nr-pbchsim.106rb/templates/NOTES.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-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 }}
diff --git a/charts/physims/charts/nr-pbchsim.106rb/templates/service.yaml b/charts/physims/charts/nr-pbchsim.106rb/templates/service.yaml
deleted file mode 100644
index da62687827..0000000000
--- a/charts/physims/charts/nr-pbchsim.106rb/templates/service.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-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 }}
diff --git a/charts/physims/charts/nr-pbchsim.217rb/templates/NOTES.txt b/charts/physims/charts/nr-pbchsim.217rb/templates/NOTES.txt
deleted file mode 100644
index 3e9e91db9b..0000000000
--- a/charts/physims/charts/nr-pbchsim.217rb/templates/NOTES.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-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 }}
diff --git a/charts/physims/charts/nr-pbchsim.217rb/templates/service.yaml b/charts/physims/charts/nr-pbchsim.217rb/templates/service.yaml
deleted file mode 100644
index 696c889d15..0000000000
--- a/charts/physims/charts/nr-pbchsim.217rb/templates/service.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-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 }}
diff --git a/charts/physims/charts/nr-pbchsim.273rb/templates/NOTES.txt b/charts/physims/charts/nr-pbchsim.273rb/templates/NOTES.txt
deleted file mode 100644
index 999186deb2..0000000000
--- a/charts/physims/charts/nr-pbchsim.273rb/templates/NOTES.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-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 }}
diff --git a/charts/physims/charts/nr-pbchsim.273rb/templates/service.yaml b/charts/physims/charts/nr-pbchsim.273rb/templates/service.yaml
deleted file mode 100644
index 4106d1a12f..0000000000
--- a/charts/physims/charts/nr-pbchsim.273rb/templates/service.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-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 }}
diff --git a/charts/physims/charts/nr-prachsim/templates/NOTES.txt b/charts/physims/charts/nr-prachsim/templates/NOTES.txt
deleted file mode 100644
index 376694e7e4..0000000000
--- a/charts/physims/charts/nr-prachsim/templates/NOTES.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-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 }}
diff --git a/charts/physims/charts/nr-prachsim/templates/service.yaml b/charts/physims/charts/nr-prachsim/templates/service.yaml
deleted file mode 100644
index 71bfe7b9fe..0000000000
--- a/charts/physims/charts/nr-prachsim/templates/service.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-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 }}
diff --git a/charts/physims/charts/nr-pucchsim/templates/NOTES.txt b/charts/physims/charts/nr-pucchsim/templates/NOTES.txt
deleted file mode 100644
index 7c2cfa9155..0000000000
--- a/charts/physims/charts/nr-pucchsim/templates/NOTES.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-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 }}
diff --git a/charts/physims/charts/nr-pucchsim/templates/service.yaml b/charts/physims/charts/nr-pucchsim/templates/service.yaml
deleted file mode 100644
index 9e8760e76b..0000000000
--- a/charts/physims/charts/nr-pucchsim/templates/service.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-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 }}
diff --git a/charts/physims/charts/nr-ulschsim/templates/NOTES.txt b/charts/physims/charts/nr-ulschsim/templates/NOTES.txt
deleted file mode 100644
index 65566932cd..0000000000
--- a/charts/physims/charts/nr-ulschsim/templates/NOTES.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-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 }}
diff --git a/charts/physims/charts/nr-ulschsim/templates/service.yaml b/charts/physims/charts/nr-ulschsim/templates/service.yaml
deleted file mode 100644
index d34882700e..0000000000
--- a/charts/physims/charts/nr-ulschsim/templates/service.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-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 }}
diff --git a/charts/physims/charts/nr-ulsim.3gpp/templates/NOTES.txt b/charts/physims/charts/nr-ulsim.3gpp/templates/NOTES.txt
deleted file mode 100644
index aea103922e..0000000000
--- a/charts/physims/charts/nr-ulsim.3gpp/templates/NOTES.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-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 }}
diff --git a/charts/physims/charts/nr-ulsim.3gpp/templates/service.yaml b/charts/physims/charts/nr-ulsim.3gpp/templates/service.yaml
deleted file mode 100644
index fc5ce516ad..0000000000
--- a/charts/physims/charts/nr-ulsim.3gpp/templates/service.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-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 }}
diff --git a/charts/physims/charts/nr-ulsim.mimo/templates/NOTES.txt b/charts/physims/charts/nr-ulsim.mimo/templates/NOTES.txt
deleted file mode 100644
index 46436c61f0..0000000000
--- a/charts/physims/charts/nr-ulsim.mimo/templates/NOTES.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-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 }}
diff --git a/charts/physims/charts/nr-ulsim.mimo/templates/service.yaml b/charts/physims/charts/nr-ulsim.mimo/templates/service.yaml
deleted file mode 100644
index 6a2465cbbe..0000000000
--- a/charts/physims/charts/nr-ulsim.mimo/templates/service.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-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 }}
diff --git a/charts/physims/charts/nr-ulsim.misc/templates/NOTES.txt b/charts/physims/charts/nr-ulsim.misc/templates/NOTES.txt
deleted file mode 100644
index 8f882b73a3..0000000000
--- a/charts/physims/charts/nr-ulsim.misc/templates/NOTES.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-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 }}
diff --git a/charts/physims/charts/nr-ulsim.misc/templates/service.yaml b/charts/physims/charts/nr-ulsim.misc/templates/service.yaml
deleted file mode 100644
index d7e93fba72..0000000000
--- a/charts/physims/charts/nr-ulsim.misc/templates/service.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-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 }}
diff --git a/charts/physims/charts/nr-ulsim.sc-fdma/templates/NOTES.txt b/charts/physims/charts/nr-ulsim.sc-fdma/templates/NOTES.txt
deleted file mode 100644
index 1874b502a2..0000000000
--- a/charts/physims/charts/nr-ulsim.sc-fdma/templates/NOTES.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-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 }}
diff --git a/charts/physims/charts/nr-ulsim.sc-fdma/templates/service.yaml b/charts/physims/charts/nr-ulsim.sc-fdma/templates/service.yaml
deleted file mode 100644
index 5653ae5ad2..0000000000
--- a/charts/physims/charts/nr-ulsim.sc-fdma/templates/service.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-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 }}
diff --git a/charts/physims/charts/polartest/templates/NOTES.txt b/charts/physims/charts/polartest/templates/NOTES.txt
deleted file mode 100644
index 9c2c978de0..0000000000
--- a/charts/physims/charts/polartest/templates/NOTES.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-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 }}
diff --git a/charts/physims/charts/polartest/templates/service.yaml b/charts/physims/charts/polartest/templates/service.yaml
deleted file mode 100644
index 40abb6769e..0000000000
--- a/charts/physims/charts/polartest/templates/service.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-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 }}
diff --git a/charts/physims/charts/smallblocktest/templates/NOTES.txt b/charts/physims/charts/smallblocktest/templates/NOTES.txt
deleted file mode 100644
index c593dbfe22..0000000000
--- a/charts/physims/charts/smallblocktest/templates/NOTES.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-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 }}
diff --git a/charts/physims/charts/smallblocktest/templates/service.yaml b/charts/physims/charts/smallblocktest/templates/service.yaml
deleted file mode 100644
index d51bf21ce4..0000000000
--- a/charts/physims/charts/smallblocktest/templates/service.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-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 }}
diff --git a/charts/physims/charts/ulsim/templates/NOTES.txt b/charts/physims/charts/ulsim/templates/NOTES.txt
deleted file mode 100644
index 91ab3ce0b7..0000000000
--- a/charts/physims/charts/ulsim/templates/NOTES.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-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 }}
diff --git a/charts/physims/charts/ulsim/templates/service.yaml b/charts/physims/charts/ulsim/templates/service.yaml
deleted file mode 100644
index dcc37d6299..0000000000
--- a/charts/physims/charts/ulsim/templates/service.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-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 }}
diff --git a/charts/physims/values.yaml b/charts/physims/values.yaml
index e333ad1fa3..dd0710dec6 100644
--- a/charts/physims/values.yaml
+++ b/charts/physims/values.yaml
@@ -11,4 +11,3 @@ global:
     version: TAG
     # pullPolicy: IfNotPresent or Never or Always
     pullPolicy: Always
-
diff --git a/ci-scripts/cls_physim1.py b/ci-scripts/cls_physim1.py
index 9be0293cfc..e562a69153 100644
--- a/ci-scripts/cls_physim1.py
+++ b/ci-scripts/cls_physim1.py
@@ -146,7 +146,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
 			mySSH.command('oc logout', '\$', 30)
@@ -231,7 +231,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:

From 8a37a2dadb53c7db3990ffc16970550b565b7d36 Mon Sep 17 00:00:00 2001
From: luis_pereira87 <lpereira@allbesmart.pt>
Date: Thu, 17 Nov 2022 15:42:56 +0000
Subject: [PATCH 13/31] Send RRCReconfiguration when RA with Msg3 through DCCH
 also when the UE is in the InitialBWP

This commit re-enables SRS when Msg3 through DCCH in InitialBWP that seems to be disabled after the RA (the same behaviour for other configurations may happen, so it is safer to send always the RRCReconfiguration when we have this RA).
---
 .../NR_MAC_gNB/gNB_scheduler_primitives.c     | 33 ++++++++-----------
 openair2/RRC/NR/rrc_gNB.c                     |  4 +--
 2 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
index ccdc8aca59..376baa908d 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
@@ -2280,9 +2280,13 @@ void configure_UE_BWP(gNB_MAC_INST *nr_mac,
       // Schedule BWP switching to the first active BWP (previous active BWP before RA with Msg3 carrying DCCH or DTCH message)
       if (servingCellConfig->firstActiveDownlinkBWP_Id) {
         sched_ctrl->next_dl_bwp_id = *servingCellConfig->firstActiveDownlinkBWP_Id;
+      } else {
+        sched_ctrl->next_dl_bwp_id = 0;
       }
       if (servingCellConfig->uplinkConfig->firstActiveUplinkBWP_Id) {
         sched_ctrl->next_ul_bwp_id = *servingCellConfig->uplinkConfig->firstActiveUplinkBWP_Id;
+      } else {
+        sched_ctrl->next_ul_bwp_id = 0;
       }
     }
     else {
@@ -3041,26 +3045,17 @@ void schedule_nr_bwp_switch(module_id_t module_id,
     NR_UE_DL_BWP_t *dl_bwp = &UE->current_DL_BWP;
     NR_UE_UL_BWP_t *ul_bwp = &UE->current_UL_BWP;
     if (sched_ctrl->rrc_processing_timer == 0 && UE->Msg4_ACKed && sched_ctrl->next_dl_bwp_id >= 0) {
+      LOG_W(NR_MAC,
+            "%4d.%2d UE %04x Scheduling BWP switch from DL_BWP %ld to %ld and from UL_BWP %ld to %ld\n",
+            frame,
+            slot,
+            UE->rnti,
+            dl_bwp->bwp_id,
+            sched_ctrl->next_dl_bwp_id,
+            ul_bwp->bwp_id,
+            sched_ctrl->next_ul_bwp_id);
 
-      int schedule_bwp_switching = false;
-      if (dl_bwp->bwp_id == 0) {
-        // Switching from Initial BWP to Dedicated BWP
-        if (sched_ctrl->next_dl_bwp_id > 0 && sched_ctrl->next_ul_bwp_id > 0) {
-          schedule_bwp_switching = true;
-          LOG_W(NR_MAC,"%4d.%2d UE %04x Schedule BWP switch from Initial DL BWP to %ld and from Initial UL BWP to %ld\n",
-                frame, slot, UE->rnti, sched_ctrl->next_dl_bwp_id, sched_ctrl->next_ul_bwp_id);
-        }
-      } else if (dl_bwp->bwp_id != sched_ctrl->next_dl_bwp_id && ul_bwp->bwp_id != sched_ctrl->next_ul_bwp_id) {
-        // Switching between Dedicated BWPs
-        schedule_bwp_switching = true;
-        LOG_W(NR_MAC,"%4d.%2d UE %04x Schedule BWP switch from dl_bwp_id %ld to %ld and from ul_bwp_id %ld to %ld\n",
-              frame, slot, UE->rnti, dl_bwp->bwp_id, sched_ctrl->next_dl_bwp_id, ul_bwp->bwp_id, sched_ctrl->next_ul_bwp_id);
-      }
-
-      if (schedule_bwp_switching) {
-        AssertFatal(sched_ctrl->next_dl_bwp_id > 0 && sched_ctrl->next_ul_bwp_id > 0, "BWP switching from a Dedicated BWP to the Initial BWP not handled yet!");
-        nr_mac_rrc_bwp_switch_req(module_id, frame, slot, UE->rnti, sched_ctrl->next_dl_bwp_id, sched_ctrl->next_ul_bwp_id);
-      }
+      nr_mac_rrc_bwp_switch_req(module_id, frame, slot, UE->rnti, sched_ctrl->next_dl_bwp_id, sched_ctrl->next_ul_bwp_id);
     }
   }
 }
diff --git a/openair2/RRC/NR/rrc_gNB.c b/openair2/RRC/NR/rrc_gNB.c
index fdd6fb9544..fa4a29754f 100755
--- a/openair2/RRC/NR/rrc_gNB.c
+++ b/openair2/RRC/NR/rrc_gNB.c
@@ -1787,11 +1787,11 @@ int nr_rrc_reconfiguration_req(rrc_gNB_ue_context_t         *const ue_context_pP
   uint8_t xid = rrc_gNB_get_next_transaction_identifier(ctxt_pP->module_id);
 
   NR_CellGroupConfig_t *masterCellGroup = ue_context_pP->ue_context.masterCellGroup;
-  if (dl_bwp_id >= 0) {
+  if (dl_bwp_id > 0) {
     *masterCellGroup->spCellConfig->spCellConfigDedicated->firstActiveDownlinkBWP_Id = dl_bwp_id;
     *masterCellGroup->spCellConfig->spCellConfigDedicated->defaultDownlinkBWP_Id = dl_bwp_id;
   }
-  if (ul_bwp_id >= 0) {
+  if (ul_bwp_id > 0) {
     *masterCellGroup->spCellConfig->spCellConfigDedicated->uplinkConfig->firstActiveUplinkBWP_Id = ul_bwp_id;
   }
 

From f8d56cb42859ff5cf0686b1fcd587451849f96be Mon Sep 17 00:00:00 2001
From: Sagar Arora <sagar.arora@eurecom.fr>
Date: Thu, 17 Nov 2022 18:14:43 +0100
Subject: [PATCH 14/31] Fixing the chart repository

---
 charts/physims/charts/{charts => }/dlsim.100rb+tm2/Chart.yaml     | 0
 .../charts/{charts => }/dlsim.100rb+tm2/templates/_helpers.tpl    | 0
 .../charts/{charts => }/dlsim.100rb+tm2/templates/job.yaml        | 0
 charts/physims/charts/{charts => }/dlsim.100rb+tm2/values.yaml    | 0
 charts/physims/charts/{charts => }/dlsim.basic/Chart.yaml         | 0
 .../charts/{charts => }/dlsim.basic/templates/_helpers.tpl        | 0
 charts/physims/charts/{charts => }/dlsim.basic/templates/job.yaml | 0
 charts/physims/charts/{charts => }/dlsim.basic/values.yaml        | 0
 charts/physims/charts/{charts => }/ldpctest/Chart.yaml            | 0
 .../physims/charts/{charts => }/ldpctest/templates/_helpers.tpl   | 0
 charts/physims/charts/{charts => }/ldpctest/templates/job.yaml    | 0
 charts/physims/charts/{charts => }/ldpctest/values.yaml           | 0
 charts/physims/charts/{charts => }/nr-dlschsim/Chart.yaml         | 0
 .../charts/{charts => }/nr-dlschsim/templates/_helpers.tpl        | 0
 charts/physims/charts/{charts => }/nr-dlschsim/templates/job.yaml | 0
 charts/physims/charts/{charts => }/nr-dlschsim/values.yaml        | 0
 charts/physims/charts/{charts => }/nr-dlsim.basic/Chart.yaml      | 0
 .../charts/{charts => }/nr-dlsim.basic/templates/_helpers.tpl     | 0
 .../physims/charts/{charts => }/nr-dlsim.basic/templates/job.yaml | 0
 charts/physims/charts/{charts => }/nr-dlsim.basic/values.yaml     | 0
 charts/physims/charts/{charts => }/nr-dlsim.dmrs+ptrs/Chart.yaml  | 0
 .../charts/{charts => }/nr-dlsim.dmrs+ptrs/templates/_helpers.tpl | 0
 .../charts/{charts => }/nr-dlsim.dmrs+ptrs/templates/job.yaml     | 0
 charts/physims/charts/{charts => }/nr-dlsim.dmrs+ptrs/values.yaml | 0
 charts/physims/charts/{charts => }/nr-dlsim.mcs+mimo/Chart.yaml   | 0
 .../charts/{charts => }/nr-dlsim.mcs+mimo/templates/_helpers.tpl  | 0
 .../charts/{charts => }/nr-dlsim.mcs+mimo/templates/job.yaml      | 0
 charts/physims/charts/{charts => }/nr-dlsim.mcs+mimo/values.yaml  | 0
 charts/physims/charts/{charts => }/nr-dlsim.offset/Chart.yaml     | 0
 .../charts/{charts => }/nr-dlsim.offset/templates/_helpers.tpl    | 0
 .../charts/{charts => }/nr-dlsim.offset/templates/job.yaml        | 0
 charts/physims/charts/{charts => }/nr-dlsim.offset/values.yaml    | 0
 charts/physims/charts/{charts => }/nr-pbchsim.106rb/Chart.yaml    | 0
 .../charts/{charts => }/nr-pbchsim.106rb/templates/_helpers.tpl   | 0
 .../charts/{charts => }/nr-pbchsim.106rb/templates/job.yaml       | 0
 charts/physims/charts/{charts => }/nr-pbchsim.106rb/values.yaml   | 0
 charts/physims/charts/{charts => }/nr-pbchsim.217rb/Chart.yaml    | 0
 .../charts/{charts => }/nr-pbchsim.217rb/templates/_helpers.tpl   | 0
 .../charts/{charts => }/nr-pbchsim.217rb/templates/job.yaml       | 0
 charts/physims/charts/{charts => }/nr-pbchsim.217rb/values.yaml   | 0
 charts/physims/charts/{charts => }/nr-pbchsim.273rb/Chart.yaml    | 0
 .../charts/{charts => }/nr-pbchsim.273rb/templates/_helpers.tpl   | 0
 .../charts/{charts => }/nr-pbchsim.273rb/templates/job.yaml       | 0
 charts/physims/charts/{charts => }/nr-pbchsim.273rb/values.yaml   | 0
 charts/physims/charts/{charts => }/nr-prachsim/Chart.yaml         | 0
 .../charts/{charts => }/nr-prachsim/templates/_helpers.tpl        | 0
 charts/physims/charts/{charts => }/nr-prachsim/templates/job.yaml | 0
 charts/physims/charts/{charts => }/nr-prachsim/values.yaml        | 0
 charts/physims/charts/{charts => }/nr-pucchsim/Chart.yaml         | 0
 .../charts/{charts => }/nr-pucchsim/templates/_helpers.tpl        | 0
 charts/physims/charts/{charts => }/nr-pucchsim/templates/job.yaml | 0
 charts/physims/charts/{charts => }/nr-pucchsim/values.yaml        | 0
 charts/physims/charts/{charts => }/nr-ulschsim/Chart.yaml         | 0
 .../charts/{charts => }/nr-ulschsim/templates/_helpers.tpl        | 0
 charts/physims/charts/{charts => }/nr-ulschsim/templates/job.yaml | 0
 charts/physims/charts/{charts => }/nr-ulschsim/values.yaml        | 0
 charts/physims/charts/{charts => }/nr-ulsim.3gpp/Chart.yaml       | 0
 .../charts/{charts => }/nr-ulsim.3gpp/templates/_helpers.tpl      | 0
 .../physims/charts/{charts => }/nr-ulsim.3gpp/templates/job.yaml  | 0
 charts/physims/charts/{charts => }/nr-ulsim.3gpp/values.yaml      | 0
 charts/physims/charts/{charts => }/nr-ulsim.mimo/Chart.yaml       | 0
 .../charts/{charts => }/nr-ulsim.mimo/templates/_helpers.tpl      | 0
 .../physims/charts/{charts => }/nr-ulsim.mimo/templates/job.yaml  | 0
 charts/physims/charts/{charts => }/nr-ulsim.mimo/values.yaml      | 0
 charts/physims/charts/{charts => }/nr-ulsim.misc/Chart.yaml       | 0
 .../charts/{charts => }/nr-ulsim.misc/templates/_helpers.tpl      | 0
 .../physims/charts/{charts => }/nr-ulsim.misc/templates/job.yaml  | 0
 charts/physims/charts/{charts => }/nr-ulsim.misc/values.yaml      | 0
 charts/physims/charts/{charts => }/nr-ulsim.sc-fdma/Chart.yaml    | 0
 .../charts/{charts => }/nr-ulsim.sc-fdma/templates/_helpers.tpl   | 0
 .../charts/{charts => }/nr-ulsim.sc-fdma/templates/job.yaml       | 0
 charts/physims/charts/{charts => }/nr-ulsim.sc-fdma/values.yaml   | 0
 charts/physims/charts/{charts => }/polartest/Chart.yaml           | 0
 .../physims/charts/{charts => }/polartest/templates/_helpers.tpl  | 0
 charts/physims/charts/{charts => }/polartest/templates/job.yaml   | 0
 charts/physims/charts/{charts => }/polartest/values.yaml          | 0
 charts/physims/charts/{charts => }/smallblocktest/Chart.yaml      | 0
 .../charts/{charts => }/smallblocktest/templates/_helpers.tpl     | 0
 .../physims/charts/{charts => }/smallblocktest/templates/job.yaml | 0
 charts/physims/charts/{charts => }/smallblocktest/values.yaml     | 0
 charts/physims/charts/{charts => }/ulsim/Chart.yaml               | 0
 charts/physims/charts/{charts => }/ulsim/templates/_helpers.tpl   | 0
 charts/physims/charts/{charts => }/ulsim/templates/job.yaml       | 0
 charts/physims/charts/{charts => }/ulsim/values.yaml              | 0
 84 files changed, 0 insertions(+), 0 deletions(-)
 rename charts/physims/charts/{charts => }/dlsim.100rb+tm2/Chart.yaml (100%)
 rename charts/physims/charts/{charts => }/dlsim.100rb+tm2/templates/_helpers.tpl (100%)
 rename charts/physims/charts/{charts => }/dlsim.100rb+tm2/templates/job.yaml (100%)
 rename charts/physims/charts/{charts => }/dlsim.100rb+tm2/values.yaml (100%)
 rename charts/physims/charts/{charts => }/dlsim.basic/Chart.yaml (100%)
 rename charts/physims/charts/{charts => }/dlsim.basic/templates/_helpers.tpl (100%)
 rename charts/physims/charts/{charts => }/dlsim.basic/templates/job.yaml (100%)
 rename charts/physims/charts/{charts => }/dlsim.basic/values.yaml (100%)
 rename charts/physims/charts/{charts => }/ldpctest/Chart.yaml (100%)
 rename charts/physims/charts/{charts => }/ldpctest/templates/_helpers.tpl (100%)
 rename charts/physims/charts/{charts => }/ldpctest/templates/job.yaml (100%)
 rename charts/physims/charts/{charts => }/ldpctest/values.yaml (100%)
 rename charts/physims/charts/{charts => }/nr-dlschsim/Chart.yaml (100%)
 rename charts/physims/charts/{charts => }/nr-dlschsim/templates/_helpers.tpl (100%)
 rename charts/physims/charts/{charts => }/nr-dlschsim/templates/job.yaml (100%)
 rename charts/physims/charts/{charts => }/nr-dlschsim/values.yaml (100%)
 rename charts/physims/charts/{charts => }/nr-dlsim.basic/Chart.yaml (100%)
 rename charts/physims/charts/{charts => }/nr-dlsim.basic/templates/_helpers.tpl (100%)
 rename charts/physims/charts/{charts => }/nr-dlsim.basic/templates/job.yaml (100%)
 rename charts/physims/charts/{charts => }/nr-dlsim.basic/values.yaml (100%)
 rename charts/physims/charts/{charts => }/nr-dlsim.dmrs+ptrs/Chart.yaml (100%)
 rename charts/physims/charts/{charts => }/nr-dlsim.dmrs+ptrs/templates/_helpers.tpl (100%)
 rename charts/physims/charts/{charts => }/nr-dlsim.dmrs+ptrs/templates/job.yaml (100%)
 rename charts/physims/charts/{charts => }/nr-dlsim.dmrs+ptrs/values.yaml (100%)
 rename charts/physims/charts/{charts => }/nr-dlsim.mcs+mimo/Chart.yaml (100%)
 rename charts/physims/charts/{charts => }/nr-dlsim.mcs+mimo/templates/_helpers.tpl (100%)
 rename charts/physims/charts/{charts => }/nr-dlsim.mcs+mimo/templates/job.yaml (100%)
 rename charts/physims/charts/{charts => }/nr-dlsim.mcs+mimo/values.yaml (100%)
 rename charts/physims/charts/{charts => }/nr-dlsim.offset/Chart.yaml (100%)
 rename charts/physims/charts/{charts => }/nr-dlsim.offset/templates/_helpers.tpl (100%)
 rename charts/physims/charts/{charts => }/nr-dlsim.offset/templates/job.yaml (100%)
 rename charts/physims/charts/{charts => }/nr-dlsim.offset/values.yaml (100%)
 rename charts/physims/charts/{charts => }/nr-pbchsim.106rb/Chart.yaml (100%)
 rename charts/physims/charts/{charts => }/nr-pbchsim.106rb/templates/_helpers.tpl (100%)
 rename charts/physims/charts/{charts => }/nr-pbchsim.106rb/templates/job.yaml (100%)
 rename charts/physims/charts/{charts => }/nr-pbchsim.106rb/values.yaml (100%)
 rename charts/physims/charts/{charts => }/nr-pbchsim.217rb/Chart.yaml (100%)
 rename charts/physims/charts/{charts => }/nr-pbchsim.217rb/templates/_helpers.tpl (100%)
 rename charts/physims/charts/{charts => }/nr-pbchsim.217rb/templates/job.yaml (100%)
 rename charts/physims/charts/{charts => }/nr-pbchsim.217rb/values.yaml (100%)
 rename charts/physims/charts/{charts => }/nr-pbchsim.273rb/Chart.yaml (100%)
 rename charts/physims/charts/{charts => }/nr-pbchsim.273rb/templates/_helpers.tpl (100%)
 rename charts/physims/charts/{charts => }/nr-pbchsim.273rb/templates/job.yaml (100%)
 rename charts/physims/charts/{charts => }/nr-pbchsim.273rb/values.yaml (100%)
 rename charts/physims/charts/{charts => }/nr-prachsim/Chart.yaml (100%)
 rename charts/physims/charts/{charts => }/nr-prachsim/templates/_helpers.tpl (100%)
 rename charts/physims/charts/{charts => }/nr-prachsim/templates/job.yaml (100%)
 rename charts/physims/charts/{charts => }/nr-prachsim/values.yaml (100%)
 rename charts/physims/charts/{charts => }/nr-pucchsim/Chart.yaml (100%)
 rename charts/physims/charts/{charts => }/nr-pucchsim/templates/_helpers.tpl (100%)
 rename charts/physims/charts/{charts => }/nr-pucchsim/templates/job.yaml (100%)
 rename charts/physims/charts/{charts => }/nr-pucchsim/values.yaml (100%)
 rename charts/physims/charts/{charts => }/nr-ulschsim/Chart.yaml (100%)
 rename charts/physims/charts/{charts => }/nr-ulschsim/templates/_helpers.tpl (100%)
 rename charts/physims/charts/{charts => }/nr-ulschsim/templates/job.yaml (100%)
 rename charts/physims/charts/{charts => }/nr-ulschsim/values.yaml (100%)
 rename charts/physims/charts/{charts => }/nr-ulsim.3gpp/Chart.yaml (100%)
 rename charts/physims/charts/{charts => }/nr-ulsim.3gpp/templates/_helpers.tpl (100%)
 rename charts/physims/charts/{charts => }/nr-ulsim.3gpp/templates/job.yaml (100%)
 rename charts/physims/charts/{charts => }/nr-ulsim.3gpp/values.yaml (100%)
 rename charts/physims/charts/{charts => }/nr-ulsim.mimo/Chart.yaml (100%)
 rename charts/physims/charts/{charts => }/nr-ulsim.mimo/templates/_helpers.tpl (100%)
 rename charts/physims/charts/{charts => }/nr-ulsim.mimo/templates/job.yaml (100%)
 rename charts/physims/charts/{charts => }/nr-ulsim.mimo/values.yaml (100%)
 rename charts/physims/charts/{charts => }/nr-ulsim.misc/Chart.yaml (100%)
 rename charts/physims/charts/{charts => }/nr-ulsim.misc/templates/_helpers.tpl (100%)
 rename charts/physims/charts/{charts => }/nr-ulsim.misc/templates/job.yaml (100%)
 rename charts/physims/charts/{charts => }/nr-ulsim.misc/values.yaml (100%)
 rename charts/physims/charts/{charts => }/nr-ulsim.sc-fdma/Chart.yaml (100%)
 rename charts/physims/charts/{charts => }/nr-ulsim.sc-fdma/templates/_helpers.tpl (100%)
 rename charts/physims/charts/{charts => }/nr-ulsim.sc-fdma/templates/job.yaml (100%)
 rename charts/physims/charts/{charts => }/nr-ulsim.sc-fdma/values.yaml (100%)
 rename charts/physims/charts/{charts => }/polartest/Chart.yaml (100%)
 rename charts/physims/charts/{charts => }/polartest/templates/_helpers.tpl (100%)
 rename charts/physims/charts/{charts => }/polartest/templates/job.yaml (100%)
 rename charts/physims/charts/{charts => }/polartest/values.yaml (100%)
 rename charts/physims/charts/{charts => }/smallblocktest/Chart.yaml (100%)
 rename charts/physims/charts/{charts => }/smallblocktest/templates/_helpers.tpl (100%)
 rename charts/physims/charts/{charts => }/smallblocktest/templates/job.yaml (100%)
 rename charts/physims/charts/{charts => }/smallblocktest/values.yaml (100%)
 rename charts/physims/charts/{charts => }/ulsim/Chart.yaml (100%)
 rename charts/physims/charts/{charts => }/ulsim/templates/_helpers.tpl (100%)
 rename charts/physims/charts/{charts => }/ulsim/templates/job.yaml (100%)
 rename charts/physims/charts/{charts => }/ulsim/values.yaml (100%)

diff --git a/charts/physims/charts/charts/dlsim.100rb+tm2/Chart.yaml b/charts/physims/charts/dlsim.100rb+tm2/Chart.yaml
similarity index 100%
rename from charts/physims/charts/charts/dlsim.100rb+tm2/Chart.yaml
rename to charts/physims/charts/dlsim.100rb+tm2/Chart.yaml
diff --git a/charts/physims/charts/charts/dlsim.100rb+tm2/templates/_helpers.tpl b/charts/physims/charts/dlsim.100rb+tm2/templates/_helpers.tpl
similarity index 100%
rename from charts/physims/charts/charts/dlsim.100rb+tm2/templates/_helpers.tpl
rename to charts/physims/charts/dlsim.100rb+tm2/templates/_helpers.tpl
diff --git a/charts/physims/charts/charts/dlsim.100rb+tm2/templates/job.yaml b/charts/physims/charts/dlsim.100rb+tm2/templates/job.yaml
similarity index 100%
rename from charts/physims/charts/charts/dlsim.100rb+tm2/templates/job.yaml
rename to charts/physims/charts/dlsim.100rb+tm2/templates/job.yaml
diff --git a/charts/physims/charts/charts/dlsim.100rb+tm2/values.yaml b/charts/physims/charts/dlsim.100rb+tm2/values.yaml
similarity index 100%
rename from charts/physims/charts/charts/dlsim.100rb+tm2/values.yaml
rename to charts/physims/charts/dlsim.100rb+tm2/values.yaml
diff --git a/charts/physims/charts/charts/dlsim.basic/Chart.yaml b/charts/physims/charts/dlsim.basic/Chart.yaml
similarity index 100%
rename from charts/physims/charts/charts/dlsim.basic/Chart.yaml
rename to charts/physims/charts/dlsim.basic/Chart.yaml
diff --git a/charts/physims/charts/charts/dlsim.basic/templates/_helpers.tpl b/charts/physims/charts/dlsim.basic/templates/_helpers.tpl
similarity index 100%
rename from charts/physims/charts/charts/dlsim.basic/templates/_helpers.tpl
rename to charts/physims/charts/dlsim.basic/templates/_helpers.tpl
diff --git a/charts/physims/charts/charts/dlsim.basic/templates/job.yaml b/charts/physims/charts/dlsim.basic/templates/job.yaml
similarity index 100%
rename from charts/physims/charts/charts/dlsim.basic/templates/job.yaml
rename to charts/physims/charts/dlsim.basic/templates/job.yaml
diff --git a/charts/physims/charts/charts/dlsim.basic/values.yaml b/charts/physims/charts/dlsim.basic/values.yaml
similarity index 100%
rename from charts/physims/charts/charts/dlsim.basic/values.yaml
rename to charts/physims/charts/dlsim.basic/values.yaml
diff --git a/charts/physims/charts/charts/ldpctest/Chart.yaml b/charts/physims/charts/ldpctest/Chart.yaml
similarity index 100%
rename from charts/physims/charts/charts/ldpctest/Chart.yaml
rename to charts/physims/charts/ldpctest/Chart.yaml
diff --git a/charts/physims/charts/charts/ldpctest/templates/_helpers.tpl b/charts/physims/charts/ldpctest/templates/_helpers.tpl
similarity index 100%
rename from charts/physims/charts/charts/ldpctest/templates/_helpers.tpl
rename to charts/physims/charts/ldpctest/templates/_helpers.tpl
diff --git a/charts/physims/charts/charts/ldpctest/templates/job.yaml b/charts/physims/charts/ldpctest/templates/job.yaml
similarity index 100%
rename from charts/physims/charts/charts/ldpctest/templates/job.yaml
rename to charts/physims/charts/ldpctest/templates/job.yaml
diff --git a/charts/physims/charts/charts/ldpctest/values.yaml b/charts/physims/charts/ldpctest/values.yaml
similarity index 100%
rename from charts/physims/charts/charts/ldpctest/values.yaml
rename to charts/physims/charts/ldpctest/values.yaml
diff --git a/charts/physims/charts/charts/nr-dlschsim/Chart.yaml b/charts/physims/charts/nr-dlschsim/Chart.yaml
similarity index 100%
rename from charts/physims/charts/charts/nr-dlschsim/Chart.yaml
rename to charts/physims/charts/nr-dlschsim/Chart.yaml
diff --git a/charts/physims/charts/charts/nr-dlschsim/templates/_helpers.tpl b/charts/physims/charts/nr-dlschsim/templates/_helpers.tpl
similarity index 100%
rename from charts/physims/charts/charts/nr-dlschsim/templates/_helpers.tpl
rename to charts/physims/charts/nr-dlschsim/templates/_helpers.tpl
diff --git a/charts/physims/charts/charts/nr-dlschsim/templates/job.yaml b/charts/physims/charts/nr-dlschsim/templates/job.yaml
similarity index 100%
rename from charts/physims/charts/charts/nr-dlschsim/templates/job.yaml
rename to charts/physims/charts/nr-dlschsim/templates/job.yaml
diff --git a/charts/physims/charts/charts/nr-dlschsim/values.yaml b/charts/physims/charts/nr-dlschsim/values.yaml
similarity index 100%
rename from charts/physims/charts/charts/nr-dlschsim/values.yaml
rename to charts/physims/charts/nr-dlschsim/values.yaml
diff --git a/charts/physims/charts/charts/nr-dlsim.basic/Chart.yaml b/charts/physims/charts/nr-dlsim.basic/Chart.yaml
similarity index 100%
rename from charts/physims/charts/charts/nr-dlsim.basic/Chart.yaml
rename to charts/physims/charts/nr-dlsim.basic/Chart.yaml
diff --git a/charts/physims/charts/charts/nr-dlsim.basic/templates/_helpers.tpl b/charts/physims/charts/nr-dlsim.basic/templates/_helpers.tpl
similarity index 100%
rename from charts/physims/charts/charts/nr-dlsim.basic/templates/_helpers.tpl
rename to charts/physims/charts/nr-dlsim.basic/templates/_helpers.tpl
diff --git a/charts/physims/charts/charts/nr-dlsim.basic/templates/job.yaml b/charts/physims/charts/nr-dlsim.basic/templates/job.yaml
similarity index 100%
rename from charts/physims/charts/charts/nr-dlsim.basic/templates/job.yaml
rename to charts/physims/charts/nr-dlsim.basic/templates/job.yaml
diff --git a/charts/physims/charts/charts/nr-dlsim.basic/values.yaml b/charts/physims/charts/nr-dlsim.basic/values.yaml
similarity index 100%
rename from charts/physims/charts/charts/nr-dlsim.basic/values.yaml
rename to charts/physims/charts/nr-dlsim.basic/values.yaml
diff --git a/charts/physims/charts/charts/nr-dlsim.dmrs+ptrs/Chart.yaml b/charts/physims/charts/nr-dlsim.dmrs+ptrs/Chart.yaml
similarity index 100%
rename from charts/physims/charts/charts/nr-dlsim.dmrs+ptrs/Chart.yaml
rename to charts/physims/charts/nr-dlsim.dmrs+ptrs/Chart.yaml
diff --git a/charts/physims/charts/charts/nr-dlsim.dmrs+ptrs/templates/_helpers.tpl b/charts/physims/charts/nr-dlsim.dmrs+ptrs/templates/_helpers.tpl
similarity index 100%
rename from charts/physims/charts/charts/nr-dlsim.dmrs+ptrs/templates/_helpers.tpl
rename to charts/physims/charts/nr-dlsim.dmrs+ptrs/templates/_helpers.tpl
diff --git a/charts/physims/charts/charts/nr-dlsim.dmrs+ptrs/templates/job.yaml b/charts/physims/charts/nr-dlsim.dmrs+ptrs/templates/job.yaml
similarity index 100%
rename from charts/physims/charts/charts/nr-dlsim.dmrs+ptrs/templates/job.yaml
rename to charts/physims/charts/nr-dlsim.dmrs+ptrs/templates/job.yaml
diff --git a/charts/physims/charts/charts/nr-dlsim.dmrs+ptrs/values.yaml b/charts/physims/charts/nr-dlsim.dmrs+ptrs/values.yaml
similarity index 100%
rename from charts/physims/charts/charts/nr-dlsim.dmrs+ptrs/values.yaml
rename to charts/physims/charts/nr-dlsim.dmrs+ptrs/values.yaml
diff --git a/charts/physims/charts/charts/nr-dlsim.mcs+mimo/Chart.yaml b/charts/physims/charts/nr-dlsim.mcs+mimo/Chart.yaml
similarity index 100%
rename from charts/physims/charts/charts/nr-dlsim.mcs+mimo/Chart.yaml
rename to charts/physims/charts/nr-dlsim.mcs+mimo/Chart.yaml
diff --git a/charts/physims/charts/charts/nr-dlsim.mcs+mimo/templates/_helpers.tpl b/charts/physims/charts/nr-dlsim.mcs+mimo/templates/_helpers.tpl
similarity index 100%
rename from charts/physims/charts/charts/nr-dlsim.mcs+mimo/templates/_helpers.tpl
rename to charts/physims/charts/nr-dlsim.mcs+mimo/templates/_helpers.tpl
diff --git a/charts/physims/charts/charts/nr-dlsim.mcs+mimo/templates/job.yaml b/charts/physims/charts/nr-dlsim.mcs+mimo/templates/job.yaml
similarity index 100%
rename from charts/physims/charts/charts/nr-dlsim.mcs+mimo/templates/job.yaml
rename to charts/physims/charts/nr-dlsim.mcs+mimo/templates/job.yaml
diff --git a/charts/physims/charts/charts/nr-dlsim.mcs+mimo/values.yaml b/charts/physims/charts/nr-dlsim.mcs+mimo/values.yaml
similarity index 100%
rename from charts/physims/charts/charts/nr-dlsim.mcs+mimo/values.yaml
rename to charts/physims/charts/nr-dlsim.mcs+mimo/values.yaml
diff --git a/charts/physims/charts/charts/nr-dlsim.offset/Chart.yaml b/charts/physims/charts/nr-dlsim.offset/Chart.yaml
similarity index 100%
rename from charts/physims/charts/charts/nr-dlsim.offset/Chart.yaml
rename to charts/physims/charts/nr-dlsim.offset/Chart.yaml
diff --git a/charts/physims/charts/charts/nr-dlsim.offset/templates/_helpers.tpl b/charts/physims/charts/nr-dlsim.offset/templates/_helpers.tpl
similarity index 100%
rename from charts/physims/charts/charts/nr-dlsim.offset/templates/_helpers.tpl
rename to charts/physims/charts/nr-dlsim.offset/templates/_helpers.tpl
diff --git a/charts/physims/charts/charts/nr-dlsim.offset/templates/job.yaml b/charts/physims/charts/nr-dlsim.offset/templates/job.yaml
similarity index 100%
rename from charts/physims/charts/charts/nr-dlsim.offset/templates/job.yaml
rename to charts/physims/charts/nr-dlsim.offset/templates/job.yaml
diff --git a/charts/physims/charts/charts/nr-dlsim.offset/values.yaml b/charts/physims/charts/nr-dlsim.offset/values.yaml
similarity index 100%
rename from charts/physims/charts/charts/nr-dlsim.offset/values.yaml
rename to charts/physims/charts/nr-dlsim.offset/values.yaml
diff --git a/charts/physims/charts/charts/nr-pbchsim.106rb/Chart.yaml b/charts/physims/charts/nr-pbchsim.106rb/Chart.yaml
similarity index 100%
rename from charts/physims/charts/charts/nr-pbchsim.106rb/Chart.yaml
rename to charts/physims/charts/nr-pbchsim.106rb/Chart.yaml
diff --git a/charts/physims/charts/charts/nr-pbchsim.106rb/templates/_helpers.tpl b/charts/physims/charts/nr-pbchsim.106rb/templates/_helpers.tpl
similarity index 100%
rename from charts/physims/charts/charts/nr-pbchsim.106rb/templates/_helpers.tpl
rename to charts/physims/charts/nr-pbchsim.106rb/templates/_helpers.tpl
diff --git a/charts/physims/charts/charts/nr-pbchsim.106rb/templates/job.yaml b/charts/physims/charts/nr-pbchsim.106rb/templates/job.yaml
similarity index 100%
rename from charts/physims/charts/charts/nr-pbchsim.106rb/templates/job.yaml
rename to charts/physims/charts/nr-pbchsim.106rb/templates/job.yaml
diff --git a/charts/physims/charts/charts/nr-pbchsim.106rb/values.yaml b/charts/physims/charts/nr-pbchsim.106rb/values.yaml
similarity index 100%
rename from charts/physims/charts/charts/nr-pbchsim.106rb/values.yaml
rename to charts/physims/charts/nr-pbchsim.106rb/values.yaml
diff --git a/charts/physims/charts/charts/nr-pbchsim.217rb/Chart.yaml b/charts/physims/charts/nr-pbchsim.217rb/Chart.yaml
similarity index 100%
rename from charts/physims/charts/charts/nr-pbchsim.217rb/Chart.yaml
rename to charts/physims/charts/nr-pbchsim.217rb/Chart.yaml
diff --git a/charts/physims/charts/charts/nr-pbchsim.217rb/templates/_helpers.tpl b/charts/physims/charts/nr-pbchsim.217rb/templates/_helpers.tpl
similarity index 100%
rename from charts/physims/charts/charts/nr-pbchsim.217rb/templates/_helpers.tpl
rename to charts/physims/charts/nr-pbchsim.217rb/templates/_helpers.tpl
diff --git a/charts/physims/charts/charts/nr-pbchsim.217rb/templates/job.yaml b/charts/physims/charts/nr-pbchsim.217rb/templates/job.yaml
similarity index 100%
rename from charts/physims/charts/charts/nr-pbchsim.217rb/templates/job.yaml
rename to charts/physims/charts/nr-pbchsim.217rb/templates/job.yaml
diff --git a/charts/physims/charts/charts/nr-pbchsim.217rb/values.yaml b/charts/physims/charts/nr-pbchsim.217rb/values.yaml
similarity index 100%
rename from charts/physims/charts/charts/nr-pbchsim.217rb/values.yaml
rename to charts/physims/charts/nr-pbchsim.217rb/values.yaml
diff --git a/charts/physims/charts/charts/nr-pbchsim.273rb/Chart.yaml b/charts/physims/charts/nr-pbchsim.273rb/Chart.yaml
similarity index 100%
rename from charts/physims/charts/charts/nr-pbchsim.273rb/Chart.yaml
rename to charts/physims/charts/nr-pbchsim.273rb/Chart.yaml
diff --git a/charts/physims/charts/charts/nr-pbchsim.273rb/templates/_helpers.tpl b/charts/physims/charts/nr-pbchsim.273rb/templates/_helpers.tpl
similarity index 100%
rename from charts/physims/charts/charts/nr-pbchsim.273rb/templates/_helpers.tpl
rename to charts/physims/charts/nr-pbchsim.273rb/templates/_helpers.tpl
diff --git a/charts/physims/charts/charts/nr-pbchsim.273rb/templates/job.yaml b/charts/physims/charts/nr-pbchsim.273rb/templates/job.yaml
similarity index 100%
rename from charts/physims/charts/charts/nr-pbchsim.273rb/templates/job.yaml
rename to charts/physims/charts/nr-pbchsim.273rb/templates/job.yaml
diff --git a/charts/physims/charts/charts/nr-pbchsim.273rb/values.yaml b/charts/physims/charts/nr-pbchsim.273rb/values.yaml
similarity index 100%
rename from charts/physims/charts/charts/nr-pbchsim.273rb/values.yaml
rename to charts/physims/charts/nr-pbchsim.273rb/values.yaml
diff --git a/charts/physims/charts/charts/nr-prachsim/Chart.yaml b/charts/physims/charts/nr-prachsim/Chart.yaml
similarity index 100%
rename from charts/physims/charts/charts/nr-prachsim/Chart.yaml
rename to charts/physims/charts/nr-prachsim/Chart.yaml
diff --git a/charts/physims/charts/charts/nr-prachsim/templates/_helpers.tpl b/charts/physims/charts/nr-prachsim/templates/_helpers.tpl
similarity index 100%
rename from charts/physims/charts/charts/nr-prachsim/templates/_helpers.tpl
rename to charts/physims/charts/nr-prachsim/templates/_helpers.tpl
diff --git a/charts/physims/charts/charts/nr-prachsim/templates/job.yaml b/charts/physims/charts/nr-prachsim/templates/job.yaml
similarity index 100%
rename from charts/physims/charts/charts/nr-prachsim/templates/job.yaml
rename to charts/physims/charts/nr-prachsim/templates/job.yaml
diff --git a/charts/physims/charts/charts/nr-prachsim/values.yaml b/charts/physims/charts/nr-prachsim/values.yaml
similarity index 100%
rename from charts/physims/charts/charts/nr-prachsim/values.yaml
rename to charts/physims/charts/nr-prachsim/values.yaml
diff --git a/charts/physims/charts/charts/nr-pucchsim/Chart.yaml b/charts/physims/charts/nr-pucchsim/Chart.yaml
similarity index 100%
rename from charts/physims/charts/charts/nr-pucchsim/Chart.yaml
rename to charts/physims/charts/nr-pucchsim/Chart.yaml
diff --git a/charts/physims/charts/charts/nr-pucchsim/templates/_helpers.tpl b/charts/physims/charts/nr-pucchsim/templates/_helpers.tpl
similarity index 100%
rename from charts/physims/charts/charts/nr-pucchsim/templates/_helpers.tpl
rename to charts/physims/charts/nr-pucchsim/templates/_helpers.tpl
diff --git a/charts/physims/charts/charts/nr-pucchsim/templates/job.yaml b/charts/physims/charts/nr-pucchsim/templates/job.yaml
similarity index 100%
rename from charts/physims/charts/charts/nr-pucchsim/templates/job.yaml
rename to charts/physims/charts/nr-pucchsim/templates/job.yaml
diff --git a/charts/physims/charts/charts/nr-pucchsim/values.yaml b/charts/physims/charts/nr-pucchsim/values.yaml
similarity index 100%
rename from charts/physims/charts/charts/nr-pucchsim/values.yaml
rename to charts/physims/charts/nr-pucchsim/values.yaml
diff --git a/charts/physims/charts/charts/nr-ulschsim/Chart.yaml b/charts/physims/charts/nr-ulschsim/Chart.yaml
similarity index 100%
rename from charts/physims/charts/charts/nr-ulschsim/Chart.yaml
rename to charts/physims/charts/nr-ulschsim/Chart.yaml
diff --git a/charts/physims/charts/charts/nr-ulschsim/templates/_helpers.tpl b/charts/physims/charts/nr-ulschsim/templates/_helpers.tpl
similarity index 100%
rename from charts/physims/charts/charts/nr-ulschsim/templates/_helpers.tpl
rename to charts/physims/charts/nr-ulschsim/templates/_helpers.tpl
diff --git a/charts/physims/charts/charts/nr-ulschsim/templates/job.yaml b/charts/physims/charts/nr-ulschsim/templates/job.yaml
similarity index 100%
rename from charts/physims/charts/charts/nr-ulschsim/templates/job.yaml
rename to charts/physims/charts/nr-ulschsim/templates/job.yaml
diff --git a/charts/physims/charts/charts/nr-ulschsim/values.yaml b/charts/physims/charts/nr-ulschsim/values.yaml
similarity index 100%
rename from charts/physims/charts/charts/nr-ulschsim/values.yaml
rename to charts/physims/charts/nr-ulschsim/values.yaml
diff --git a/charts/physims/charts/charts/nr-ulsim.3gpp/Chart.yaml b/charts/physims/charts/nr-ulsim.3gpp/Chart.yaml
similarity index 100%
rename from charts/physims/charts/charts/nr-ulsim.3gpp/Chart.yaml
rename to charts/physims/charts/nr-ulsim.3gpp/Chart.yaml
diff --git a/charts/physims/charts/charts/nr-ulsim.3gpp/templates/_helpers.tpl b/charts/physims/charts/nr-ulsim.3gpp/templates/_helpers.tpl
similarity index 100%
rename from charts/physims/charts/charts/nr-ulsim.3gpp/templates/_helpers.tpl
rename to charts/physims/charts/nr-ulsim.3gpp/templates/_helpers.tpl
diff --git a/charts/physims/charts/charts/nr-ulsim.3gpp/templates/job.yaml b/charts/physims/charts/nr-ulsim.3gpp/templates/job.yaml
similarity index 100%
rename from charts/physims/charts/charts/nr-ulsim.3gpp/templates/job.yaml
rename to charts/physims/charts/nr-ulsim.3gpp/templates/job.yaml
diff --git a/charts/physims/charts/charts/nr-ulsim.3gpp/values.yaml b/charts/physims/charts/nr-ulsim.3gpp/values.yaml
similarity index 100%
rename from charts/physims/charts/charts/nr-ulsim.3gpp/values.yaml
rename to charts/physims/charts/nr-ulsim.3gpp/values.yaml
diff --git a/charts/physims/charts/charts/nr-ulsim.mimo/Chart.yaml b/charts/physims/charts/nr-ulsim.mimo/Chart.yaml
similarity index 100%
rename from charts/physims/charts/charts/nr-ulsim.mimo/Chart.yaml
rename to charts/physims/charts/nr-ulsim.mimo/Chart.yaml
diff --git a/charts/physims/charts/charts/nr-ulsim.mimo/templates/_helpers.tpl b/charts/physims/charts/nr-ulsim.mimo/templates/_helpers.tpl
similarity index 100%
rename from charts/physims/charts/charts/nr-ulsim.mimo/templates/_helpers.tpl
rename to charts/physims/charts/nr-ulsim.mimo/templates/_helpers.tpl
diff --git a/charts/physims/charts/charts/nr-ulsim.mimo/templates/job.yaml b/charts/physims/charts/nr-ulsim.mimo/templates/job.yaml
similarity index 100%
rename from charts/physims/charts/charts/nr-ulsim.mimo/templates/job.yaml
rename to charts/physims/charts/nr-ulsim.mimo/templates/job.yaml
diff --git a/charts/physims/charts/charts/nr-ulsim.mimo/values.yaml b/charts/physims/charts/nr-ulsim.mimo/values.yaml
similarity index 100%
rename from charts/physims/charts/charts/nr-ulsim.mimo/values.yaml
rename to charts/physims/charts/nr-ulsim.mimo/values.yaml
diff --git a/charts/physims/charts/charts/nr-ulsim.misc/Chart.yaml b/charts/physims/charts/nr-ulsim.misc/Chart.yaml
similarity index 100%
rename from charts/physims/charts/charts/nr-ulsim.misc/Chart.yaml
rename to charts/physims/charts/nr-ulsim.misc/Chart.yaml
diff --git a/charts/physims/charts/charts/nr-ulsim.misc/templates/_helpers.tpl b/charts/physims/charts/nr-ulsim.misc/templates/_helpers.tpl
similarity index 100%
rename from charts/physims/charts/charts/nr-ulsim.misc/templates/_helpers.tpl
rename to charts/physims/charts/nr-ulsim.misc/templates/_helpers.tpl
diff --git a/charts/physims/charts/charts/nr-ulsim.misc/templates/job.yaml b/charts/physims/charts/nr-ulsim.misc/templates/job.yaml
similarity index 100%
rename from charts/physims/charts/charts/nr-ulsim.misc/templates/job.yaml
rename to charts/physims/charts/nr-ulsim.misc/templates/job.yaml
diff --git a/charts/physims/charts/charts/nr-ulsim.misc/values.yaml b/charts/physims/charts/nr-ulsim.misc/values.yaml
similarity index 100%
rename from charts/physims/charts/charts/nr-ulsim.misc/values.yaml
rename to charts/physims/charts/nr-ulsim.misc/values.yaml
diff --git a/charts/physims/charts/charts/nr-ulsim.sc-fdma/Chart.yaml b/charts/physims/charts/nr-ulsim.sc-fdma/Chart.yaml
similarity index 100%
rename from charts/physims/charts/charts/nr-ulsim.sc-fdma/Chart.yaml
rename to charts/physims/charts/nr-ulsim.sc-fdma/Chart.yaml
diff --git a/charts/physims/charts/charts/nr-ulsim.sc-fdma/templates/_helpers.tpl b/charts/physims/charts/nr-ulsim.sc-fdma/templates/_helpers.tpl
similarity index 100%
rename from charts/physims/charts/charts/nr-ulsim.sc-fdma/templates/_helpers.tpl
rename to charts/physims/charts/nr-ulsim.sc-fdma/templates/_helpers.tpl
diff --git a/charts/physims/charts/charts/nr-ulsim.sc-fdma/templates/job.yaml b/charts/physims/charts/nr-ulsim.sc-fdma/templates/job.yaml
similarity index 100%
rename from charts/physims/charts/charts/nr-ulsim.sc-fdma/templates/job.yaml
rename to charts/physims/charts/nr-ulsim.sc-fdma/templates/job.yaml
diff --git a/charts/physims/charts/charts/nr-ulsim.sc-fdma/values.yaml b/charts/physims/charts/nr-ulsim.sc-fdma/values.yaml
similarity index 100%
rename from charts/physims/charts/charts/nr-ulsim.sc-fdma/values.yaml
rename to charts/physims/charts/nr-ulsim.sc-fdma/values.yaml
diff --git a/charts/physims/charts/charts/polartest/Chart.yaml b/charts/physims/charts/polartest/Chart.yaml
similarity index 100%
rename from charts/physims/charts/charts/polartest/Chart.yaml
rename to charts/physims/charts/polartest/Chart.yaml
diff --git a/charts/physims/charts/charts/polartest/templates/_helpers.tpl b/charts/physims/charts/polartest/templates/_helpers.tpl
similarity index 100%
rename from charts/physims/charts/charts/polartest/templates/_helpers.tpl
rename to charts/physims/charts/polartest/templates/_helpers.tpl
diff --git a/charts/physims/charts/charts/polartest/templates/job.yaml b/charts/physims/charts/polartest/templates/job.yaml
similarity index 100%
rename from charts/physims/charts/charts/polartest/templates/job.yaml
rename to charts/physims/charts/polartest/templates/job.yaml
diff --git a/charts/physims/charts/charts/polartest/values.yaml b/charts/physims/charts/polartest/values.yaml
similarity index 100%
rename from charts/physims/charts/charts/polartest/values.yaml
rename to charts/physims/charts/polartest/values.yaml
diff --git a/charts/physims/charts/charts/smallblocktest/Chart.yaml b/charts/physims/charts/smallblocktest/Chart.yaml
similarity index 100%
rename from charts/physims/charts/charts/smallblocktest/Chart.yaml
rename to charts/physims/charts/smallblocktest/Chart.yaml
diff --git a/charts/physims/charts/charts/smallblocktest/templates/_helpers.tpl b/charts/physims/charts/smallblocktest/templates/_helpers.tpl
similarity index 100%
rename from charts/physims/charts/charts/smallblocktest/templates/_helpers.tpl
rename to charts/physims/charts/smallblocktest/templates/_helpers.tpl
diff --git a/charts/physims/charts/charts/smallblocktest/templates/job.yaml b/charts/physims/charts/smallblocktest/templates/job.yaml
similarity index 100%
rename from charts/physims/charts/charts/smallblocktest/templates/job.yaml
rename to charts/physims/charts/smallblocktest/templates/job.yaml
diff --git a/charts/physims/charts/charts/smallblocktest/values.yaml b/charts/physims/charts/smallblocktest/values.yaml
similarity index 100%
rename from charts/physims/charts/charts/smallblocktest/values.yaml
rename to charts/physims/charts/smallblocktest/values.yaml
diff --git a/charts/physims/charts/charts/ulsim/Chart.yaml b/charts/physims/charts/ulsim/Chart.yaml
similarity index 100%
rename from charts/physims/charts/charts/ulsim/Chart.yaml
rename to charts/physims/charts/ulsim/Chart.yaml
diff --git a/charts/physims/charts/charts/ulsim/templates/_helpers.tpl b/charts/physims/charts/ulsim/templates/_helpers.tpl
similarity index 100%
rename from charts/physims/charts/charts/ulsim/templates/_helpers.tpl
rename to charts/physims/charts/ulsim/templates/_helpers.tpl
diff --git a/charts/physims/charts/charts/ulsim/templates/job.yaml b/charts/physims/charts/ulsim/templates/job.yaml
similarity index 100%
rename from charts/physims/charts/charts/ulsim/templates/job.yaml
rename to charts/physims/charts/ulsim/templates/job.yaml
diff --git a/charts/physims/charts/charts/ulsim/values.yaml b/charts/physims/charts/ulsim/values.yaml
similarity index 100%
rename from charts/physims/charts/charts/ulsim/values.yaml
rename to charts/physims/charts/ulsim/values.yaml

From 818ca5cfaa58082ecf5464287bbc35bd6eb21506 Mon Sep 17 00:00:00 2001
From: luis_pereira87 <lpereira@allbesmart.pt>
Date: Tue, 15 Nov 2022 08:32:55 +0000
Subject: [PATCH 15/31] Tutorials: upgrade to Ubuntu 22.04, UHD 4.3.0.0,
 docker-compose v2.12.2 and add more DNNs to docker-compose to avoid
 duplicated (default) values when parsing the file

---
 doc/NR_SA_CN5G_gNB_USRP_COTS_UE_Tutorial.md   |  8 +++---
 .../docker-compose-basic-nrf.yaml             | 27 +++++++++++++++++++
 2 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/doc/NR_SA_CN5G_gNB_USRP_COTS_UE_Tutorial.md b/doc/NR_SA_CN5G_gNB_USRP_COTS_UE_Tutorial.md
index bc6c56834a..fccab23cf8 100644
--- a/doc/NR_SA_CN5G_gNB_USRP_COTS_UE_Tutorial.md
+++ b/doc/NR_SA_CN5G_gNB_USRP_COTS_UE_Tutorial.md
@@ -21,7 +21,7 @@ In this tutorial we describe how to configure and run a 5G end-to-end setup with
 
 Minimum hardware requirements:
 - Laptop/Desktop/Server for OAI CN5G and OAI gNB
-    - Operating System: [Ubuntu 20.04.5 LTS](https://releases.ubuntu.com/20.04/ubuntu-20.04.5-desktop-amd64.iso)
+    - Operating System: [Ubuntu 22.04.1 LTS](https://releases.ubuntu.com/22.04.1/ubuntu-22.04.1-desktop-amd64.iso)
     - CPU: 8 cores x86_64 @ 3.5 GHz
     - RAM: 32 GB
 - Laptop for UE
@@ -54,7 +54,7 @@ sudo usermod -a -G docker $(whoami)
 reboot
 
 # https://docs.docker.com/compose/install/
-sudo curl -L "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
+sudo curl -L "https://github.com/docker/compose/releases/download/v2.12.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
 sudo chmod +x /usr/local/bin/docker-compose
 ```
 
@@ -114,7 +114,7 @@ sudo apt install -y libboost-all-dev libusb-1.0-0-dev doxygen python3-docutils p
 
 git clone https://github.com/EttusResearch/uhd.git ~/uhd
 cd ~/uhd
-git checkout v4.0.0.0
+git checkout v4.3.0.0
 cd host
 mkdir build
 cd build
@@ -134,7 +134,7 @@ git clone https://gitlab.eurecom.fr/oai/openairinterface5g.git ~/openairinterfac
 cd ~/openairinterface5g
 git checkout develop
 
-# Install dependencies in Ubuntu 20.04
+# Install OAI dependencies
 cd ~/openairinterface5g
 source oaienv
 cd cmake_targets
diff --git a/doc/tutorial_resources/docker-compose-basic-nrf.yaml b/doc/tutorial_resources/docker-compose-basic-nrf.yaml
index bd037f23e0..7c2287a3c4 100644
--- a/doc/tutorial_resources/docker-compose-basic-nrf.yaml
+++ b/doc/tutorial_resources/docker-compose-basic-nrf.yaml
@@ -144,6 +144,10 @@ services:
             - PLMN_SUPPORT_TAC=0x0001
             - SST_0=1
             - SD_0=0x1
+            - SST_1=1
+            - SD_1=0x2
+            - SST_2=1
+            - SD_2=0x3
             - AMF_INTERFACE_NAME_FOR_NGAP=eth0
             - AMF_INTERFACE_NAME_FOR_N11=eth0
             - SMF_INSTANCE_ID_0=1
@@ -232,6 +236,23 @@ services:
             - NSSAI_SD0=0x1
             - SESSION_AMBR_UL0=10000Mbps
             - SESSION_AMBR_DL0=10000Mbps
+            - DNN_NI1=oai2
+            - TYPE1=IPv4
+            - DNN_RANGE1=12.1.2.2 - 12.1.2.253
+            - NSSAI_SST1=1
+            - NSSAI_SD1=0x2
+            - SESSION_AMBR_UL1=10000Mbps
+            - SESSION_AMBR_DL1=10000Mbps
+            - DNN_NI2=oai3
+            - TYPE2=IPv4
+            - DNN_RANGE2=12.1.3.2 - 12.1.3.253
+            - NSSAI_SST2=1
+            - NSSAI_SD2=0x3
+            - SESSION_AMBR_UL2=10000Mbps
+            - SESSION_AMBR_DL2=10000Mbps
+            - DNN_NI3=ims
+            - TYPE3=IPv4v6
+            - DNN_RANGE3=14.1.1.2 - 14.1.1.253
             - DEFAULT_CSCF_IPV4_ADDRESS=127.0.0.1  # only needed when ims is being used
             - ENABLE_USAGE_REPORTING=no # Set yes if UE USAGE REPORTING is to be done at UPF
         depends_on:
@@ -276,6 +297,12 @@ services:
             - NSSAI_SST_0=1
             - NSSAI_SD_0=0x1
             - DNN_0=oai
+            - NSSAI_SST_1=1
+            - NSSAI_SD_1=0x2
+            - DNN_1=oai2
+            - NSSAI_SST_2=1
+            - NSSAI_SD_2=0x3
+            - DNN_2=oai3
         depends_on:
             - oai-nrf
             - oai-smf

From d363a3fb1df4735a5e954f3a7f4304dcc128185b Mon Sep 17 00:00:00 2001
From: Sagar Arora <sagar.arora@eurecom.fr>
Date: Fri, 18 Nov 2022 10:47:24 +0100
Subject: [PATCH 16/31] Fixing cls_physim

- Un deployment of helm charts at some places
- Added check for completed pods
---
 ci-scripts/cls_physim1.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/ci-scripts/cls_physim1.py b/ci-scripts/cls_physim1.py
index e562a69153..5bb64d250c 100644
--- a/ci-scripts/cls_physim1.py
+++ b/ci-scripts/cls_physim1.py
@@ -139,10 +139,10 @@ 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)
@@ -158,20 +158,22 @@ class PhySim:
 			logging.debug('\u001B[1m   Deployed PhySim Successfully using helm chart\u001B[0m')
 		isRunning = False
 		count = 0
-		# Below while sections means there is 2 mins for pods to be in running if not they will be removed
+		# 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=physim | tee -a cmake_targets/log/physim_pods_summary.txt', '\$', 30, resync=True)
-			if mySSH.getBefore().count('Running') == 21:
+			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')
+			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):

From 8e1498252585db79e5e4aa3d81615d9d865ae9ed Mon Sep 17 00:00:00 2001
From: Sagar Arora <sagar.arora@eurecom.fr>
Date: Fri, 18 Nov 2022 16:35:24 +0100
Subject: [PATCH 17/31] Containers should keep running to copy autotests logs

---
 charts/physims/charts/dlsim.100rb+tm2/templates/job.yaml    | 2 +-
 charts/physims/charts/dlsim.basic/templates/job.yaml        | 2 +-
 charts/physims/charts/ldpctest/templates/job.yaml           | 4 ++--
 charts/physims/charts/nr-dlschsim/templates/job.yaml        | 4 ++--
 charts/physims/charts/nr-dlsim.basic/templates/job.yaml     | 2 +-
 charts/physims/charts/nr-dlsim.dmrs+ptrs/templates/job.yaml | 2 +-
 charts/physims/charts/nr-dlsim.mcs+mimo/templates/job.yaml  | 2 +-
 charts/physims/charts/nr-dlsim.offset/templates/job.yaml    | 2 +-
 charts/physims/charts/nr-pbchsim.106rb/templates/job.yaml   | 2 +-
 charts/physims/charts/nr-pbchsim.217rb/templates/job.yaml   | 2 +-
 charts/physims/charts/nr-pbchsim.273rb/templates/job.yaml   | 2 +-
 charts/physims/charts/nr-prachsim/templates/job.yaml        | 4 ++--
 charts/physims/charts/nr-pucchsim/templates/job.yaml        | 4 ++--
 charts/physims/charts/nr-ulschsim/templates/job.yaml        | 4 ++--
 charts/physims/charts/nr-ulsim.3gpp/templates/job.yaml      | 2 +-
 charts/physims/charts/nr-ulsim.mimo/templates/job.yaml      | 2 +-
 charts/physims/charts/nr-ulsim.misc/templates/job.yaml      | 2 +-
 charts/physims/charts/nr-ulsim.sc-fdma/templates/job.yaml   | 2 +-
 charts/physims/charts/polartest/templates/job.yaml          | 4 ++--
 charts/physims/charts/smallblocktest/templates/job.yaml     | 4 ++--
 charts/physims/charts/ulsim/templates/job.yaml              | 4 ++--
 21 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/charts/physims/charts/dlsim.100rb+tm2/templates/job.yaml b/charts/physims/charts/dlsim.100rb+tm2/templates/job.yaml
index 28d34037e6..048f7106d8 100644
--- a/charts/physims/charts/dlsim.100rb+tm2/templates/job.yaml
+++ b/charts/physims/charts/dlsim.100rb+tm2/templates/job.yaml
@@ -27,7 +27,7 @@ spec:
         args:
         - >
           cmake_targets/autotests/run_exec_autotests.bash -g "dlsim.100rb+tm2" -d bin/ &&
-          echo "FINISHED"
+          echo "FINISHED" && sleep infinity
       dnsPolicy: ClusterFirst
       restartPolicy: Never
       schedulerName: default-scheduler
diff --git a/charts/physims/charts/dlsim.basic/templates/job.yaml b/charts/physims/charts/dlsim.basic/templates/job.yaml
index 405f20e7ff..c5f2cb18c8 100644
--- a/charts/physims/charts/dlsim.basic/templates/job.yaml
+++ b/charts/physims/charts/dlsim.basic/templates/job.yaml
@@ -27,7 +27,7 @@ spec:
         args:
         - >
           cmake_targets/autotests/run_exec_autotests.bash -g "dlsim.basic" -d bin/ &&
-          echo "FINISHED"
+          echo "FINISHED" && sleep infinity
       dnsPolicy: ClusterFirst
       restartPolicy: Never
       schedulerName: default-scheduler
diff --git a/charts/physims/charts/ldpctest/templates/job.yaml b/charts/physims/charts/ldpctest/templates/job.yaml
index 0bb60fd2ce..e4d41ddc36 100644
--- a/charts/physims/charts/ldpctest/templates/job.yaml
+++ b/charts/physims/charts/ldpctest/templates/job.yaml
@@ -25,9 +25,9 @@ spec:
           value: /opt/oai-physim
         command: ["/bin/sh", "-c"]
         args:
-        - >  
+        - >
           cmake_targets/autotests/run_exec_autotests.bash -g "ldpctest" -d bin/ &&
-          echo "FINISHED"
+          echo "FINISHED" && sleep infinity
       dnsPolicy: ClusterFirst
       restartPolicy: Never
       schedulerName: default-scheduler
diff --git a/charts/physims/charts/nr-dlschsim/templates/job.yaml b/charts/physims/charts/nr-dlschsim/templates/job.yaml
index 47d152193e..6ddeb58252 100644
--- a/charts/physims/charts/nr-dlschsim/templates/job.yaml
+++ b/charts/physims/charts/nr-dlschsim/templates/job.yaml
@@ -25,9 +25,9 @@ spec:
           value: /opt/oai-physim
         command: ["/bin/sh", "-c"]
         args:
-        - >  
+        - >
           cmake_targets/autotests/run_exec_autotests.bash -g "nr_dlschsim" -d bin/ &&
-          echo "FINISHED"
+          echo "FINISHED" && sleep infinity
       dnsPolicy: ClusterFirst
       restartPolicy: Never
       schedulerName: default-scheduler
diff --git a/charts/physims/charts/nr-dlsim.basic/templates/job.yaml b/charts/physims/charts/nr-dlsim.basic/templates/job.yaml
index 0688c27864..6dd5fe2990 100644
--- a/charts/physims/charts/nr-dlsim.basic/templates/job.yaml
+++ b/charts/physims/charts/nr-dlsim.basic/templates/job.yaml
@@ -27,7 +27,7 @@ spec:
         args:
         - >
           cmake_targets/autotests/run_exec_autotests.bash -g "nr_dlsim.basic" -d bin/ &&
-          echo "FINISHED"
+          echo "FINISHED" && sleep infinity
       dnsPolicy: ClusterFirst
       restartPolicy: Never
       schedulerName: default-scheduler
diff --git a/charts/physims/charts/nr-dlsim.dmrs+ptrs/templates/job.yaml b/charts/physims/charts/nr-dlsim.dmrs+ptrs/templates/job.yaml
index edc248eb24..7717152ec1 100644
--- a/charts/physims/charts/nr-dlsim.dmrs+ptrs/templates/job.yaml
+++ b/charts/physims/charts/nr-dlsim.dmrs+ptrs/templates/job.yaml
@@ -27,7 +27,7 @@ spec:
         args:
         - >
           cmake_targets/autotests/run_exec_autotests.bash -g "nr_dlsim.dmrs+ptrs" -d bin/ &&
-          echo "FINISHED"
+          echo "FINISHED" && sleep infinity
       dnsPolicy: ClusterFirst
       restartPolicy: Never
       schedulerName: default-scheduler
diff --git a/charts/physims/charts/nr-dlsim.mcs+mimo/templates/job.yaml b/charts/physims/charts/nr-dlsim.mcs+mimo/templates/job.yaml
index 9a70a2d3ce..3f273dfd36 100644
--- a/charts/physims/charts/nr-dlsim.mcs+mimo/templates/job.yaml
+++ b/charts/physims/charts/nr-dlsim.mcs+mimo/templates/job.yaml
@@ -27,7 +27,7 @@ spec:
         args:
         - >
           cmake_targets/autotests/run_exec_autotests.bash -g "nr_dlsim.mcs+mimo" -d bin/ &&
-          echo "FINISHED"
+          echo "FINISHED" && sleep infinity
       dnsPolicy: ClusterFirst
       restartPolicy: Never
       schedulerName: default-scheduler
diff --git a/charts/physims/charts/nr-dlsim.offset/templates/job.yaml b/charts/physims/charts/nr-dlsim.offset/templates/job.yaml
index e5c0d65703..45976568e7 100644
--- a/charts/physims/charts/nr-dlsim.offset/templates/job.yaml
+++ b/charts/physims/charts/nr-dlsim.offset/templates/job.yaml
@@ -27,7 +27,7 @@ spec:
         args:
         - >
           cmake_targets/autotests/run_exec_autotests.bash -g "nr_dlsim.offset" -d bin/ &&
-          echo "FINISHED"
+          echo "FINISHED" && sleep infinity
       dnsPolicy: ClusterFirst
       restartPolicy: Never
       schedulerName: default-scheduler
diff --git a/charts/physims/charts/nr-pbchsim.106rb/templates/job.yaml b/charts/physims/charts/nr-pbchsim.106rb/templates/job.yaml
index 9f974cc0f0..beb857b358 100644
--- a/charts/physims/charts/nr-pbchsim.106rb/templates/job.yaml
+++ b/charts/physims/charts/nr-pbchsim.106rb/templates/job.yaml
@@ -27,7 +27,7 @@ spec:
         args:
         - >
           cmake_targets/autotests/run_exec_autotests.bash -g "nr_pbchsim.106rb" -d bin/ &&
-          echo "FINISHED"
+          echo "FINISHED" && sleep infinity
       dnsPolicy: ClusterFirst
       restartPolicy: Never
       schedulerName: default-scheduler
diff --git a/charts/physims/charts/nr-pbchsim.217rb/templates/job.yaml b/charts/physims/charts/nr-pbchsim.217rb/templates/job.yaml
index bc3770e70f..c3e0865d50 100644
--- a/charts/physims/charts/nr-pbchsim.217rb/templates/job.yaml
+++ b/charts/physims/charts/nr-pbchsim.217rb/templates/job.yaml
@@ -27,7 +27,7 @@ spec:
         args:
         - >
           cmake_targets/autotests/run_exec_autotests.bash -g "nr_pbchsim.217rb" -d bin/ &&
-          echo "FINISHED"
+          echo "FINISHED" && sleep infinity
       dnsPolicy: ClusterFirst
       restartPolicy: Never
       schedulerName: default-scheduler
diff --git a/charts/physims/charts/nr-pbchsim.273rb/templates/job.yaml b/charts/physims/charts/nr-pbchsim.273rb/templates/job.yaml
index e4e8dddcd0..b5174271d6 100644
--- a/charts/physims/charts/nr-pbchsim.273rb/templates/job.yaml
+++ b/charts/physims/charts/nr-pbchsim.273rb/templates/job.yaml
@@ -27,7 +27,7 @@ spec:
         args:
         - >
           cmake_targets/autotests/run_exec_autotests.bash -g "nr_pbchsim.273rb" -d bin/ &&
-          echo "FINISHED"
+          echo "FINISHED" && sleep infinity
       dnsPolicy: ClusterFirst
       restartPolicy: Never
       schedulerName: default-scheduler
diff --git a/charts/physims/charts/nr-prachsim/templates/job.yaml b/charts/physims/charts/nr-prachsim/templates/job.yaml
index bfd5024ca6..a5de457082 100644
--- a/charts/physims/charts/nr-prachsim/templates/job.yaml
+++ b/charts/physims/charts/nr-prachsim/templates/job.yaml
@@ -25,9 +25,9 @@ spec:
           value: /opt/oai-physim
         command: ["/bin/sh", "-c"]
         args:
-        - >  
+        - >
           cmake_targets/autotests/run_exec_autotests.bash -g "nr_prachsim" -d bin/ &&
-          echo "FINISHED" 
+          echo "FINISHED" && sleep infinity
       dnsPolicy: ClusterFirst
       restartPolicy: Never
       schedulerName: default-scheduler
diff --git a/charts/physims/charts/nr-pucchsim/templates/job.yaml b/charts/physims/charts/nr-pucchsim/templates/job.yaml
index 849aa1fe46..3146bb5605 100644
--- a/charts/physims/charts/nr-pucchsim/templates/job.yaml
+++ b/charts/physims/charts/nr-pucchsim/templates/job.yaml
@@ -25,9 +25,9 @@ spec:
           value: /opt/oai-physim
         command: ["/bin/sh", "-c"]
         args:
-        - >  
+        - >
           cmake_targets/autotests/run_exec_autotests.bash -g "nr_pucchsim" -d bin/ &&
-          echo "FINISHED"
+          echo "FINISHED" && sleep infinity
       dnsPolicy: ClusterFirst
       restartPolicy: Never
       schedulerName: default-scheduler
diff --git a/charts/physims/charts/nr-ulschsim/templates/job.yaml b/charts/physims/charts/nr-ulschsim/templates/job.yaml
index 8096181405..5e0e28db0b 100644
--- a/charts/physims/charts/nr-ulschsim/templates/job.yaml
+++ b/charts/physims/charts/nr-ulschsim/templates/job.yaml
@@ -25,9 +25,9 @@ spec:
           value: /opt/oai-physim
         command: ["/bin/sh", "-c"]
         args:
-        - >  
+        - >
           cmake_targets/autotests/run_exec_autotests.bash -g "nr_ulschsim" -d bin/ &&
-          echo "FINISHED"
+          echo "FINISHED" && sleep infinity
       dnsPolicy: ClusterFirst
       restartPolicy: Never
       schedulerName: default-scheduler
diff --git a/charts/physims/charts/nr-ulsim.3gpp/templates/job.yaml b/charts/physims/charts/nr-ulsim.3gpp/templates/job.yaml
index 740c5818da..8f352db84c 100644
--- a/charts/physims/charts/nr-ulsim.3gpp/templates/job.yaml
+++ b/charts/physims/charts/nr-ulsim.3gpp/templates/job.yaml
@@ -27,7 +27,7 @@ spec:
         args:
         - >
           cmake_targets/autotests/run_exec_autotests.bash -g "nr_ulsim.3gpp" -d bin/ &&
-          echo "FINISHED" 
+          echo "FINISHED" && sleep infinity
       dnsPolicy: ClusterFirst
       restartPolicy: Never
       schedulerName: default-scheduler
diff --git a/charts/physims/charts/nr-ulsim.mimo/templates/job.yaml b/charts/physims/charts/nr-ulsim.mimo/templates/job.yaml
index 74200d4614..143a1f98b0 100644
--- a/charts/physims/charts/nr-ulsim.mimo/templates/job.yaml
+++ b/charts/physims/charts/nr-ulsim.mimo/templates/job.yaml
@@ -27,7 +27,7 @@ spec:
         args:
         - >
           cmake_targets/autotests/run_exec_autotests.bash -g "nr_ulsim.mimo" -d bin/ &&
-          echo "FINISHED"
+          echo "FINISHED" && sleep infinity
       dnsPolicy: ClusterFirst
       restartPolicy: Never
       schedulerName: default-scheduler
diff --git a/charts/physims/charts/nr-ulsim.misc/templates/job.yaml b/charts/physims/charts/nr-ulsim.misc/templates/job.yaml
index 19c4b7f42b..161a388361 100644
--- a/charts/physims/charts/nr-ulsim.misc/templates/job.yaml
+++ b/charts/physims/charts/nr-ulsim.misc/templates/job.yaml
@@ -27,7 +27,7 @@ spec:
         args:
         - >
           cmake_targets/autotests/run_exec_autotests.bash -g "nr_ulsim.misc" -d bin/ &&
-          echo "FINISHED"
+          echo "FINISHED" && sleep infinity
       dnsPolicy: ClusterFirst
       restartPolicy: Never
       schedulerName: default-scheduler
diff --git a/charts/physims/charts/nr-ulsim.sc-fdma/templates/job.yaml b/charts/physims/charts/nr-ulsim.sc-fdma/templates/job.yaml
index c487d44598..515484e03a 100644
--- a/charts/physims/charts/nr-ulsim.sc-fdma/templates/job.yaml
+++ b/charts/physims/charts/nr-ulsim.sc-fdma/templates/job.yaml
@@ -29,7 +29,7 @@ spec:
         args:
         - >
           cmake_targets/autotests/run_exec_autotests.bash -g "nr_ulsim.sc-fdma" -d bin/ &&
-          echo "FINISHED" 
+          echo "FINISHED" && sleep infinity
       dnsPolicy: ClusterFirst
       restartPolicy: Never
       schedulerName: default-scheduler
diff --git a/charts/physims/charts/polartest/templates/job.yaml b/charts/physims/charts/polartest/templates/job.yaml
index 9abb161e24..c9e23dff34 100644
--- a/charts/physims/charts/polartest/templates/job.yaml
+++ b/charts/physims/charts/polartest/templates/job.yaml
@@ -25,9 +25,9 @@ spec:
           value: /opt/oai-physim
         command: ["/bin/sh", "-c"]
         args:
-        - >  
+        - >
           cmake_targets/autotests/run_exec_autotests.bash -g "polartest" -d bin/ &&
-          echo "FINISHED"
+          echo "FINISHED" && sleep infinity
       dnsPolicy: ClusterFirst
       restartPolicy: Never
       schedulerName: default-scheduler
diff --git a/charts/physims/charts/smallblocktest/templates/job.yaml b/charts/physims/charts/smallblocktest/templates/job.yaml
index 365e1215d9..99896d5472 100644
--- a/charts/physims/charts/smallblocktest/templates/job.yaml
+++ b/charts/physims/charts/smallblocktest/templates/job.yaml
@@ -25,9 +25,9 @@ spec:
           value: /opt/oai-physim
         command: ["/bin/sh", "-c"]
         args:
-        - >  
+        - >
           cmake_targets/autotests/run_exec_autotests.bash -g "smallblocktest" -d bin/ &&
-          echo "FINISHED"
+          echo "FINISHED" && sleep infinity
       dnsPolicy: ClusterFirst
       restartPolicy: Never
       schedulerName: default-scheduler
diff --git a/charts/physims/charts/ulsim/templates/job.yaml b/charts/physims/charts/ulsim/templates/job.yaml
index d7a820f0ca..24c35468a0 100644
--- a/charts/physims/charts/ulsim/templates/job.yaml
+++ b/charts/physims/charts/ulsim/templates/job.yaml
@@ -25,9 +25,9 @@ spec:
           value: /opt/oai-physim
         command: ["/bin/sh", "-c"]
         args:
-        - >  
+        - >
           cmake_targets/autotests/run_exec_autotests.bash -g "ulsim" -d bin/ &&
-          echo "FINISHED"
+          echo "FINISHED" && sleep infinity
       dnsPolicy: ClusterFirst
       restartPolicy: Never
       schedulerName: default-scheduler

From daf890932c64751855100f5417c4dbab8a10aedd Mon Sep 17 00:00:00 2001
From: francescomani <email@francescomani.it>
Date: Mon, 21 Nov 2022 11:11:49 +0100
Subject: [PATCH 18/31] avoid gnb stalling on retransmissions

---
 openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
index d61adf5d3d..b73f82ad6c 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
@@ -1401,14 +1401,10 @@ void nr_generate_Msg4(module_id_t module_idP, int CC_id, frame_t frameP, sub_fra
 
     uint16_t mac_sdu_length = 0;
 
-    rnti_t tc_rnti = ra->rnti;
     // If UE is known by the network, C-RNTI to be used instead of TC-RNTI
+    rnti_t tc_rnti = ra->rnti;
     if (ra->msg3_dcch_dtch) {
       ra->rnti = ra->crnti;
-    } else {
-      mac_sdu_length = mac_rrc_nr_data_req(module_idP, CC_id, frameP, CCCH, ra->rnti, 1, NULL);
-      if (mac_sdu_length <= 0)
-        return; // need to wait until RRCSetup is encoded
     }
 
     NR_UE_info_t * UE = find_nr_UE(&nr_mac->UE_info, ra->rnti);
@@ -1417,6 +1413,16 @@ void nr_generate_Msg4(module_id_t module_idP, int CC_id, frame_t frameP, sub_fra
       return;
     }
 
+    NR_UE_sched_ctrl_t *sched_ctrl = &UE->UE_sched_ctrl;
+    /* get the PID of a HARQ process awaiting retrnasmission, or -1 otherwise */
+    int current_harq_pid = sched_ctrl->retrans_dl_harq.head;
+
+    if (ra->msg3_dcch_dtch == false && current_harq_pid < 0) {
+      mac_sdu_length = mac_rrc_nr_data_req(module_idP, CC_id, frameP, CCCH, ra->rnti, 1, NULL);
+      if (mac_sdu_length <= 0)
+        return; // need to wait until RRCSetup is encoded
+    }
+
     long BWPStart = 0;
     long BWPSize = 0;
     NR_Type0_PDCCH_CSS_config_t *type0_PDCCH_CSS_config = NULL;
@@ -1509,9 +1515,6 @@ void nr_generate_Msg4(module_id_t module_idP, int CC_id, frame_t frameP, sub_fra
 
     LOG_I(NR_MAC,"Generate msg4, rnti: %04x\n", ra->rnti);
 
-    NR_UE_sched_ctrl_t *sched_ctrl = &UE->UE_sched_ctrl;
-    /* get the PID of a HARQ process awaiting retrnasmission, or -1 otherwise */
-    int current_harq_pid = sched_ctrl->retrans_dl_harq.head;
     // HARQ management
     if (current_harq_pid < 0) {
       AssertFatal(sched_ctrl->available_dl_harq.head >= 0,

From e487c76260e47bd6ceb285b928245796786a3107 Mon Sep 17 00:00:00 2001
From: francescomani <email@francescomani.it>
Date: Mon, 21 Nov 2022 11:48:46 +0100
Subject: [PATCH 19/31] fix msg4 failing retransmissions

---
 openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
index b73f82ad6c..277632528f 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
@@ -1470,9 +1470,17 @@ void nr_generate_Msg4(module_id_t module_idP, int CC_id, frame_t frameP, sub_fra
     int rbSize = 0;
     uint8_t tb_scaling = 0;
     uint32_t tb_size = 0;
-    uint8_t subheader_len = (mac_sdu_length < 256) ? sizeof(NR_MAC_SUBHEADER_SHORT) : sizeof(NR_MAC_SUBHEADER_LONG);
-    uint16_t pdu_length = mac_sdu_length + subheader_len + 7; //7 is contetion resolution length
-    uint16_t *vrb_map = cc[CC_id].vrb_map;
+    uint16_t pdu_length;
+    if(current_harq_pid >= 0) { // in case of retransmission
+      NR_UE_harq_t *harq = &sched_ctrl->harq_processes[current_harq_pid];
+      DevAssert(!harq->is_waiting);
+      pdu_length = harq->tb_size;
+    }
+    else {
+      uint8_t subheader_len = (mac_sdu_length < 256) ? sizeof(NR_MAC_SUBHEADER_SHORT) : sizeof(NR_MAC_SUBHEADER_LONG);
+      pdu_length = mac_sdu_length + subheader_len + 7; //7 is contetion resolution length
+    }
+
     // increase PRBs until we get to BWPSize or TBS is bigger than MAC PDU size
     do {
       if(rbSize < BWPSize)
@@ -1488,6 +1496,7 @@ void nr_generate_Msg4(module_id_t module_idP, int CC_id, frame_t frameP, sub_fra
     AssertFatal(tb_size >= pdu_length,"Cannot allocate Msg4\n");
 
     int i = 0;
+    uint16_t *vrb_map = cc[CC_id].vrb_map;
     while ((i < rbSize) && (rbStart + rbSize <= BWPSize)) {
       if (vrb_map[BWPStart + rbStart + i]&SL_to_bitmap(msg4_tda.startSymbolIndex, msg4_tda.nrOfSymbols)) {
         rbStart += i+1;

From bfcf1152981750241178be7bc8baab1e9f14c0a9 Mon Sep 17 00:00:00 2001
From: Robert Schmidt <robert.schmidt@openairinterface.org>
Date: Mon, 21 Nov 2022 13:47:41 +0100
Subject: [PATCH 20/31] Tpool: use condbroadcast() in case multiple waits on
 the same signal

---
 common/utils/threadPool/thread-pool.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/utils/threadPool/thread-pool.h b/common/utils/threadPool/thread-pool.h
index 81eef5d7e7..b356599546 100644
--- a/common/utils/threadPool/thread-pool.h
+++ b/common/utils/threadPool/thread-pool.h
@@ -237,7 +237,7 @@ static inline void abortNotifiedFIFO(notifiedFIFO_t *nf) {
   if (nf->outF == NULL)
     nf->inF = NULL;
   mutexunlock(nf->lockF);
-  condsignal(nf->notifF);
+  condbroadcast(nf->notifF);
 }
 
 struct one_thread {

From 9604d54edfee0c6129811d7b0143a380f340662a Mon Sep 17 00:00:00 2001
From: Robert Schmidt <robert.schmidt@openairinterface.org>
Date: Mon, 21 Nov 2022 14:30:25 +0100
Subject: [PATCH 21/31] Increase precoding timing measure for N310-based gNB SA
 test

---
 ci-scripts/datalog_rt_stats.2x2.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci-scripts/datalog_rt_stats.2x2.yaml b/ci-scripts/datalog_rt_stats.2x2.yaml
index 8caf0201aa..1805d8ab2f 100644
--- a/ci-scripts/datalog_rt_stats.2x2.yaml
+++ b/ci-scripts/datalog_rt_stats.2x2.yaml
@@ -8,7 +8,7 @@ ColNames :
   - Average vs Reference Deviation (Reference Value; Acceptability Threshold)
 Ref : 
   feprx : 120.0
-  feptx_prec : 16.0
+  feptx_prec : 30.0
   feptx_ofdm : 50.0
   feptx_total : 120.0
   L1 Tx processing : 300.0

From 24d42aacd616520c8de254c88615867019ddc509 Mon Sep 17 00:00:00 2001
From: Robert Schmidt <robert.schmidt@openairinterface.org>
Date: Mon, 21 Nov 2022 15:45:14 +0100
Subject: [PATCH 22/31] Tune configs for N310-based SA test

---
 .../gnb.band78.sa.fr1.106PRB.2x2.usrpn310.conf           | 9 ++++-----
 .../gnb.band78.sa.fr1.106PRB.ddsuu.2x2.usrpn310.conf     | 8 ++++----
 ci-scripts/xml_files/fr1_sa_quectel.xml                  | 4 ++--
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.conf b/ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.conf
index d9e4ed0f3a..bb9c525772 100644
--- a/ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.conf
+++ b/ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.conf
@@ -25,7 +25,6 @@ gNBs =
 
     pdsch_AntennaPorts_XP                                     = 2;
     pusch_AntennaPorts                                        = 2;
-    ul_prbblacklist                                           = "51,52,53,54"
     do_SRS                                                    = 1;
 
     pdcch_ConfigSIB1 = (
@@ -210,8 +209,8 @@ MACRLCs = (
     num_cc           = 1;
     tr_s_preference  = "local_L1";
     tr_n_preference  = "local_RRC";
-#    pusch_TargetSNRx10 = 200;
-#    pucch_TargetSNRx10 = 150;
+    pusch_TargetSNRx10 = 220;
+    pucch_TargetSNRx10 = 200;
      ulsch_max_frame_inactivity = 0;
   }
 );
@@ -220,7 +219,7 @@ L1s = (
 {
   num_cc = 1;
   tr_n_preference = "local_mac";
-  prach_dtx_threshold = 120;
+  prach_dtx_threshold = 150;
 #  pucch0_dtx_threshold = 150;
 }
 );
@@ -234,7 +233,7 @@ RUs = (
          att_rx         = 0;
          bands          = [78];
          max_pdschReferenceSignalPower = -27;
-         max_rxgain                    = 75;
+         max_rxgain                    = 68;
          eNB_instances  = [0];
          ##beamforming 1x2 matrix: 1 layer x 2 antennas
          bf_weights = [0x00007fff, 0x0000];
diff --git a/ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.ddsuu.2x2.usrpn310.conf b/ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.ddsuu.2x2.usrpn310.conf
index b34dc2fbe5..a7c1679593 100644
--- a/ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.ddsuu.2x2.usrpn310.conf
+++ b/ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.ddsuu.2x2.usrpn310.conf
@@ -209,8 +209,8 @@ MACRLCs = (
     num_cc           = 1;
     tr_s_preference  = "local_L1";
     tr_n_preference  = "local_RRC";
-#    pusch_TargetSNRx10 = 200;
-#    pucch_TargetSNRx10 = 150;
+    pusch_TargetSNRx10 = 220;
+    pucch_TargetSNRx10 = 200;
      ulsch_max_frame_inactivity = 0;
   }
 );
@@ -219,7 +219,7 @@ L1s = (
 {
   num_cc = 1;
   tr_n_preference = "local_mac";
-  prach_dtx_threshold = 120;
+  prach_dtx_threshold = 150;
 #  pucch0_dtx_threshold = 150;
 }
 );
@@ -233,7 +233,7 @@ RUs = (
          att_rx         = 0;
          bands          = [78];
          max_pdschReferenceSignalPower = -27;
-         max_rxgain                    = 75;
+         max_rxgain                    = 68;
          eNB_instances  = [0];
          ##beamforming 1x2 matrix: 1 layer x 2 antennas
          bf_weights = [0x00007fff, 0x0000];
diff --git a/ci-scripts/xml_files/fr1_sa_quectel.xml b/ci-scripts/xml_files/fr1_sa_quectel.xml
index cdae3678f9..0a9d17b63d 100644
--- a/ci-scripts/xml_files/fr1_sa_quectel.xml
+++ b/ci-scripts/xml_files/fr1_sa_quectel.xml
@@ -119,8 +119,8 @@
 
 	<testCase id="070001">
 		<class>Iperf</class>
-		<desc>iperf (UL/3Mbps/UDP)(60 sec)(single-ue profile)</desc>
-		<iperf_args>-u -b 3M -t 60</iperf_args>
+		<desc>iperf (UL/7Mbps/UDP)(60 sec)(single-ue profile)</desc>
+		<iperf_args>-u -b 7M -t 60</iperf_args>
 		<direction>UL</direction>
 		<id>nrmodule2_quectel</id>
 		<iperf_packetloss_threshold>5</iperf_packetloss_threshold>

From 1dc4542349d07d07cdb80fc8eb242ef9ab7a8acb Mon Sep 17 00:00:00 2001
From: Robert Schmidt <robert.schmidt@openairinterface.org>
Date: Mon, 21 Nov 2022 16:25:00 +0100
Subject: [PATCH 23/31] CI: Improve ASUE test gNB configuration

---
 .../gnb.band78.sa.fr1.106PRB.2x2.usrpn310.asue.conf           | 4 ++--
 ci-scripts/xml_files/fr1_sa_amarisoft_ue_1x.xml               | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.asue.conf b/ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.asue.conf
index 78b5d56b73..907b89a274 100644
--- a/ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.asue.conf
+++ b/ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.asue.conf
@@ -211,8 +211,8 @@ MACRLCs = (
     num_cc           = 1;
     tr_s_preference  = "local_L1";
     tr_n_preference  = "local_RRC";
-    pusch_TargetSNRx10 = 250;
-    pucch_TargetSNRx10 = 250;
+    pusch_TargetSNRx10 = 220;
+    pucch_TargetSNRx10 = 220;
     ulsch_max_frame_inactivity = 10;
   }
 );
diff --git a/ci-scripts/xml_files/fr1_sa_amarisoft_ue_1x.xml b/ci-scripts/xml_files/fr1_sa_amarisoft_ue_1x.xml
index c5bbf97a1e..4933e63199 100644
--- a/ci-scripts/xml_files/fr1_sa_amarisoft_ue_1x.xml
+++ b/ci-scripts/xml_files/fr1_sa_amarisoft_ue_1x.xml
@@ -45,7 +45,7 @@
 	<testCase id="040000">
 		<class>Initialize_eNB</class>
 		<desc>Initialize gNB</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.asue.conf --sa -q --usrp-tx-thread-config 1 --T_stdout 2 --tune-offset 30000000 --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>
+		<Initialize_eNB_args>-O ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.asue.conf --sa -q --usrp-tx-thread-config 1 --T_stdout 2 --tune-offset 30000000 --thread-pool 1,3,5,7,9,11,13,15 --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>
 		<eNB_instance>0</eNB_instance>
 		<eNB_serverId>0</eNB_serverId>
 		<air_interface>nr</air_interface>
@@ -53,6 +53,7 @@
 		<eNB_Stats>yes</eNB_Stats>
 		<rt_stats_cfg>datalog_rt_stats.2x2.yaml</rt_stats_cfg>
 		<USRP_IPAddress>172.21.19.14</USRP_IPAddress>
+		<cmd_prefix>numactl --cpunodebind=netdev:ens2f0np0 --membind=netdev:ens2f0np0</cmd_prefix>
 	</testCase>
 
 	<testCase id="050000">

From 0a40945ae0af912a290525c814f111cef4563ce2 Mon Sep 17 00:00:00 2001
From: luis_pereira87 <lpereira@allbesmart.pt>
Date: Mon, 21 Nov 2022 18:14:29 +0000
Subject: [PATCH 24/31] Print ASN1 messages to console only if DEBUG_ASN1 flag
 is enabled

---
 openair2/RRC/NR/rrc_gNB.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/openair2/RRC/NR/rrc_gNB.c b/openair2/RRC/NR/rrc_gNB.c
index bf84cf0c2e..c46386acd0 100755
--- a/openair2/RRC/NR/rrc_gNB.c
+++ b/openair2/RRC/NR/rrc_gNB.c
@@ -672,7 +672,9 @@ rrc_gNB_generate_defaultRRCReconfiguration(
   AssertFatal(size > 0, "cannot encode RRCReconfiguration in %s()\n", __func__);
   LOG_W(RRC, "do_RRCReconfiguration(): size %d\n", size);
 
-  xer_fprint(stdout,&asn_DEF_NR_CellGroupConfig, ue_p->masterCellGroup);
+  if (LOG_DEBUGFLAG(DEBUG_ASN1)) {
+    xer_fprint(stdout, &asn_DEF_NR_CellGroupConfig, ue_p->masterCellGroup);
+  }
 
   free(ue_context_pP->ue_context.nas_pdu.buffer);
 
@@ -3567,7 +3569,9 @@ static void rrc_CU_process_ue_context_setup_response(MessageDef *msg_p, const ch
         sizeof(*cellGroupConfig->rlc_BearerToAddModList));
     }
   }
-  xer_fprint(stdout,&asn_DEF_NR_CellGroupConfig, ue_context_p->ue_context.masterCellGroup);
+  if (LOG_DEBUGFLAG(DEBUG_ASN1)) {
+    xer_fprint(stdout, &asn_DEF_NR_CellGroupConfig, ue_context_p->ue_context.masterCellGroup);
+  }
 
   if (ue_context_p->ue_context.established_pdu_sessions_flag == 1) {
     rrc_gNB_generate_dedicatedRRCReconfiguration(&ctxt, ue_context_p, cellGroupConfig);
@@ -3629,7 +3633,9 @@ static void rrc_CU_process_ue_context_modification_response(MessageDef *msg_p, c
       }
     }
     LOG_I(NR_RRC, "Updated master cell group configuration stored at the UE context of the CU:\n");
-    xer_fprint(stdout,&asn_DEF_NR_CellGroupConfig, ue_context_p->ue_context.masterCellGroup);
+    if (LOG_DEBUGFLAG(DEBUG_ASN1)) {
+      xer_fprint(stdout, &asn_DEF_NR_CellGroupConfig, ue_context_p->ue_context.masterCellGroup);
+    }
 
     rrc_gNB_generate_dedicatedRRCReconfiguration(&ctxt, ue_context_p, cellGroupConfig);
 

From 9bd08a1ddd90ae1fa6e3542faf022e01d9e980e5 Mon Sep 17 00:00:00 2001
From: francescomani <email@francescomani.it>
Date: Tue, 22 Nov 2022 13:54:20 +0100
Subject: [PATCH 25/31] bugfix in SRS configuration

---
 openair2/RRC/NR/nr_rrc_config.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openair2/RRC/NR/nr_rrc_config.c b/openair2/RRC/NR/nr_rrc_config.c
index af12637ae9..114b0f7610 100644
--- a/openair2/RRC/NR/nr_rrc_config.c
+++ b/openair2/RRC/NR/nr_rrc_config.c
@@ -477,7 +477,7 @@ void config_srs(NR_SetupRelease_SRS_Config_t *setup_release_srs_Config,
     srs_res0->resourceType.present = NR_SRS_Resource__resourceType_PR_periodic;
     srs_res0->resourceType.choice.periodic = calloc(1,sizeof(*srs_res0->resourceType.choice.periodic));
     srs_res0->resourceType.choice.periodic->periodicityAndOffset_p.present = NR_SRS_PeriodicityAndOffset_PR_sl160;
-    srs_res0->resourceType.choice.periodic->periodicityAndOffset_p.choice.sl160 = 17 + (uid>1)*10; // 17/17/.../147/157 are mixed slots
+    srs_res0->resourceType.choice.periodic->periodicityAndOffset_p.choice.sl160 = 17 + (uid >> 1) * 10; // 17/17/.../147/157 are mixed slots
   } else {
     srs_res0->resourceType.present = NR_SRS_Resource__resourceType_PR_aperiodic;
     srs_res0->resourceType.choice.aperiodic = calloc(1,sizeof(*srs_res0->resourceType.choice.aperiodic));

From 3c8478f7851d1716b7c4da7b1a26518e37a306ab Mon Sep 17 00:00:00 2001
From: Sakthivel Velumani <velumani@eurecom.fr>
Date: Thu, 27 Oct 2022 12:28:45 -0400
Subject: [PATCH 26/31] Moved PHY ULSCH struct to stack

---
 executables/nr-ue.c                           |   6 +-
 openair1/PHY/INIT/nr_init_ue.c                | 101 +++++++++--
 openair1/PHY/INIT/phy_init.h                  |   4 +-
 .../NR_UE_TRANSPORT/nr_transport_proto_ue.h   |  10 +-
 .../PHY/NR_UE_TRANSPORT/nr_transport_ue.h     |   7 +-
 .../PHY/NR_UE_TRANSPORT/nr_ulsch_coding.c     | 163 ++----------------
 openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c    |  17 +-
 openair1/PHY/defs_nr_UE.h                     |   8 +-
 openair1/SCHED_NR_UE/defs.h                   |   2 +-
 openair1/SCHED_NR_UE/fapi_nr_ue_l1.c          |  31 ++--
 openair1/SCHED_NR_UE/harq_nr.c                | 144 ++--------------
 openair1/SCHED_NR_UE/harq_nr.h                |  40 +----
 openair1/SCHED_NR_UE/phy_procedures_nr_ue.c   |  21 +--
 openair1/SCHED_NR_UE/pucch_uci_ue_nr.c        |   2 +-
 openair1/SCHED_NR_UE/pucch_uci_ue_nr.h        |   2 +-
 openair1/SIMULATION/NR_PHY/dlschsim.c         |   2 +-
 openair1/SIMULATION/NR_PHY/ulschsim.c         |  35 ++--
 openair1/SIMULATION/NR_PHY/ulsim.c            |  25 +--
 openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c   |   2 +-
 openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c   |   1 -
 20 files changed, 195 insertions(+), 428 deletions(-)

diff --git a/executables/nr-ue.c b/executables/nr-ue.c
index 3fdb18eaae..189ae4d8e6 100644
--- a/executables/nr-ue.c
+++ b/executables/nr-ue.c
@@ -613,6 +613,7 @@ void processSlotTX(void *arg) {
   nr_rxtx_thread_data_t *rxtxD = (nr_rxtx_thread_data_t *) arg;
   UE_nr_rxtx_proc_t *proc = &rxtxD->proc;
   PHY_VARS_NR_UE    *UE   = rxtxD->UE;
+  nr_phy_data_tx_t phy_data = {0};
 
   LOG_D(PHY,"%d.%d => slot type %d\n", proc->frame_tx, proc->nr_slot_tx, proc->tx_slot_type);
   if (proc->tx_slot_type == NR_UPLINK_SLOT || proc->tx_slot_type == NR_MIXED_SLOT){
@@ -632,12 +633,13 @@ void processSlotTX(void *arg) {
       ul_indication.frame_tx  = proc->frame_tx;
       ul_indication.slot_tx   = proc->nr_slot_tx;
       ul_indication.ue_sched_mode = rxtxD->ue_sched_mode;
+      ul_indication.phy_data      = &phy_data;
 
       UE->if_inst->ul_indication(&ul_indication);
       stop_meas(&UE->ue_ul_indication_stats);
     }
 
-    phy_procedures_nrUE_TX(UE,proc,proc->gNB_id);
+    phy_procedures_nrUE_TX(UE, proc, proc->gNB_id, &phy_data);
   }
 }
 
@@ -691,7 +693,7 @@ void UE_processing(nr_rxtx_thread_data_t *rxtxD) {
   }
 
   if (proc->tx_slot_type == NR_UPLINK_SLOT || proc->tx_slot_type == NR_MIXED_SLOT) {
-    nr_phy_data_t phy_data = {0};
+    nr_phy_data_tx_t phy_data = {0};
     if (UE->if_inst != NULL && UE->if_inst->ul_indication != NULL) {
       nr_uplink_indication_t ul_indication;
       memset((void*)&ul_indication, 0, sizeof(ul_indication));
diff --git a/openair1/PHY/INIT/nr_init_ue.c b/openair1/PHY/INIT/nr_init_ue.c
index a27a4abe17..1c3aaf432e 100644
--- a/openair1/PHY/INIT/nr_init_ue.c
+++ b/openair1/PHY/INIT/nr_init_ue.c
@@ -648,19 +648,42 @@ void free_nr_ue_dl_harq(NR_DL_UE_HARQ_t* harq_list, int number_of_processes, int
   }
 }
 
-void term_nr_ue_transport(PHY_VARS_NR_UE *ue)
-{
-  const int N_RB_DL = ue->frame_parms.N_RB_DL;
-  int num_cw = NR_MAX_NB_LAYERS > 4? 2:1;
-  for (int i = 0; i < NUMBER_OF_CONNECTED_gNB_MAX; i++) {
-    for (int j = 0; j < num_cw; j++) {
-      free_nr_ue_dl_harq(ue->dl_harq_processes[j], NR_MAX_DLSCH_HARQ_PROCESSES, N_RB_DL);
-      free_nr_ue_ulsch(&ue->ulsch[i], N_RB_DL, &ue->frame_parms);
+void free_nr_ue_ul_harq(NR_UL_UE_HARQ_t *harq_list, int number_of_processes, int num_rb, int num_ant_tx) {
+
+  int max_layers = (num_ant_tx < NR_MAX_NB_LAYERS) ? num_ant_tx : NR_MAX_NB_LAYERS;
+  uint16_t a_segments = MAX_NUM_NR_ULSCH_SEGMENTS_PER_LAYER*max_layers;  //number of segments to be allocated
+
+  if (num_rb != 273) {
+    a_segments = a_segments*num_rb;
+    a_segments = a_segments/273 +1;
+  }
+
+  for (int i = 0; i < number_of_processes; i++) {
+    free_and_zero(harq_list[i].a);
+    free_and_zero(harq_list[i].b);
+    for (int r = 0; r < a_segments; r++) {
+      free_and_zero(harq_list[i].c[r]);
+      free_and_zero(harq_list[i].d[r]);
     }
+    free_and_zero(harq_list[i].c);
+    free_and_zero(harq_list[i].d);
+    free_and_zero(harq_list[i].e);
+    free_and_zero(harq_list[i].f);
   }
 }
 
-void nr_init_harq_processes(NR_DL_UE_HARQ_t* harq_list, int number_of_processes, int num_rb) {
+void term_nr_ue_transport(PHY_VARS_NR_UE *ue)
+{
+  const int N_RB_DL = ue->frame_parms.N_RB_DL;
+  const int N_RB_UL = ue->frame_parms.N_RB_UL;
+  int num_cw = NR_MAX_NB_LAYERS > 4? 2:1;
+  for (int j = 0; j < num_cw; j++) {
+    free_nr_ue_dl_harq(ue->dl_harq_processes[j], NR_MAX_DLSCH_HARQ_PROCESSES, N_RB_DL);
+  }
+  free_nr_ue_ul_harq(ue->ul_harq_processes, NR_MAX_ULSCH_HARQ_PROCESSES, N_RB_UL, ue->frame_parms.nb_antennas_tx);
+}
+
+void nr_init_dl_harq_processes(NR_DL_UE_HARQ_t* harq_list, int number_of_processes, int num_rb) {
 
   int a_segments = MAX_NUM_NR_DLSCH_SEGMENTS_PER_LAYER*NR_MAX_NB_LAYERS;  //number of segments to be allocated
   if (num_rb != 273) {
@@ -698,19 +721,63 @@ void nr_init_harq_processes(NR_DL_UE_HARQ_t* harq_list, int number_of_processes,
   }
 }
 
+void nr_init_ul_harq_processes(NR_UL_UE_HARQ_t *harq_list, int number_of_processes, int num_rb, int num_ant_tx) {
+
+  int max_layers = (num_ant_tx < NR_MAX_NB_LAYERS) ? num_ant_tx : NR_MAX_NB_LAYERS;
+  uint16_t a_segments = MAX_NUM_NR_ULSCH_SEGMENTS_PER_LAYER*max_layers;  //number of segments to be allocated
+
+  if (num_rb != 273) {
+    a_segments = a_segments*num_rb;
+    a_segments = a_segments/273 +1;
+  }
+
+  uint32_t ulsch_bytes = a_segments*1056;  // allocated bytes per segment
+
+  for (int i = 0; i < number_of_processes; i++) {
+
+    memset(harq_list + i, 0, sizeof(NR_UL_UE_HARQ_t));
+
+    harq_list[i].a = malloc16(ulsch_bytes);
+    DevAssert(harq_list[i].a);
+    bzero(harq_list[i].a, ulsch_bytes);
+
+    harq_list[i].b = malloc16(ulsch_bytes);
+    DevAssert(harq_list[i].b);
+    bzero(harq_list[i].b, ulsch_bytes);
+
+    harq_list[i].c = malloc16(a_segments*sizeof(uint8_t *));
+    harq_list[i].d = malloc16(a_segments*sizeof(uint16_t *));
+    for (int r = 0; r < a_segments; r++) {
+      harq_list[i].c[r] = malloc16(8448);
+      DevAssert(harq_list[i].c[r]);
+      bzero(harq_list[i].c[r],8448);
+
+      harq_list[i].d[r] = malloc16(68*384); //max size for coded output
+      DevAssert(harq_list[i].d[r]);
+      bzero(harq_list[i].d[r],(68*384));
+    }
+
+    harq_list[i].e = malloc16(14*num_rb*12*8);
+    DevAssert(harq_list[i].e);
+    bzero(harq_list[i].e,14*num_rb*12*8);
+
+    harq_list[i].f = malloc16(14*num_rb*12*8);
+    DevAssert(harq_list[i].f);
+    bzero(harq_list[i].f,14*num_rb*12*8);
+
+    harq_list[i].first_tx = 1;
+    harq_list[i].round = 0;
+  }
+}
+
 void init_nr_ue_transport(PHY_VARS_NR_UE *ue) {
 
   int num_codeword = NR_MAX_NB_LAYERS > 4? 2:1;
 
-  for (int i = 0; i < NUMBER_OF_CONNECTED_gNB_MAX; i++) {
-    for (int j=0; j<num_codeword; j++) {
-      nr_init_harq_processes(ue->dl_harq_processes[j], NR_MAX_DLSCH_HARQ_PROCESSES, ue->frame_parms.N_RB_DL);
-      if (j==0) {
-        AssertFatal((ue->ulsch[i] = new_nr_ue_ulsch(ue->frame_parms.N_RB_UL, NR_MAX_ULSCH_HARQ_PROCESSES,&ue->frame_parms))!=NULL,"Can't get ue ulsch structures\n");
-        LOG_D(PHY,"ulsch[%d] => %p\n",i,ue->ulsch[i]);
-      }
-    }
+  for (int j=0; j<num_codeword; j++) {
+    nr_init_dl_harq_processes(ue->dl_harq_processes[j], NR_MAX_DLSCH_HARQ_PROCESSES, ue->frame_parms.N_RB_DL);
   }
+  nr_init_ul_harq_processes(ue->ul_harq_processes, NR_MAX_ULSCH_HARQ_PROCESSES, ue->frame_parms.N_RB_UL, ue->frame_parms.nb_antennas_tx);
 
   for(int i=0; i<5; i++)
     ue->dl_stats[i] = 0;
diff --git a/openair1/PHY/INIT/phy_init.h b/openair1/PHY/INIT/phy_init.h
index 40d9d12d3c..22f41ba492 100644
--- a/openair1/PHY/INIT/phy_init.h
+++ b/openair1/PHY/INIT/phy_init.h
@@ -418,8 +418,10 @@ void reset_DLSCH_struct(const PHY_VARS_gNB *gNB, processingData_L1tx_t *msg);
 
 void RCconfig_nrUE_prs(void *cfg);
 void init_nr_prs_ue_vars(PHY_VARS_NR_UE *ue);
-void nr_init_harq_processes(NR_DL_UE_HARQ_t* harq_list, int number_of_processes, int num_rb);
+void nr_init_dl_harq_processes(NR_DL_UE_HARQ_t* harq_list, int number_of_processes, int num_rb);
+void nr_init_ul_harq_processes(NR_UL_UE_HARQ_t *harq_list, int number_of_processes, int num_rb, int num_ant_tx);
 void free_nr_ue_dl_harq(NR_DL_UE_HARQ_t* harq_list, int number_of_processes, int num_rb);
+void free_nr_ue_ul_harq(NR_UL_UE_HARQ_t *harq_list, int number_of_processes, int num_rb, int num_ant_tx);
 
 /** @} */
 #endif
diff --git a/openair1/PHY/NR_UE_TRANSPORT/nr_transport_proto_ue.h b/openair1/PHY/NR_UE_TRANSPORT/nr_transport_proto_ue.h
index 8e9bfd6201..efdcd51e64 100644
--- a/openair1/PHY/NR_UE_TRANSPORT/nr_transport_proto_ue.h
+++ b/openair1/PHY/NR_UE_TRANSPORT/nr_transport_proto_ue.h
@@ -52,13 +52,6 @@
 */
 void nr_ue_dlsch_init(NR_UE_DLSCH_t *dlsch_list, int num_dlsch, uint8_t max_ldpc_iterations);
 
-void free_nr_ue_ulsch(NR_UE_ULSCH_t **ulschptr,
-                      uint16_t N_RB_UL,
-                      NR_DL_FRAME_PARMS* frame_parms);
-
-
-NR_UE_ULSCH_t *new_nr_ue_ulsch(uint16_t N_RB_UL, int number_of_harq_pids, NR_DL_FRAME_PARMS* frame_parms);
-
 /** \brief This function computes the LLRs for ML (max-logsum approximation) dual-stream QPSK/QPSK reception.
     @param stream0_in Input from channel compensated (MR combined) stream 0
     @param stream1_in Input from channel compensated (MR combined) stream 1
@@ -735,7 +728,8 @@ void nr_ue_ulsch_procedures(PHY_VARS_NR_UE *UE,
                                unsigned char harq_pid,
                                uint32_t frame,
                                uint8_t slot,
-                               int gNB_id);
+                               int gNB_id,
+                               nr_phy_data_tx_t *phy_data);
 
 
 /** \brief This function does IFFT for PUSCH
diff --git a/openair1/PHY/NR_UE_TRANSPORT/nr_transport_ue.h b/openair1/PHY/NR_UE_TRANSPORT/nr_transport_ue.h
index b91ad2b9cd..5c8506e4f7 100644
--- a/openair1/PHY/NR_UE_TRANSPORT/nr_transport_ue.h
+++ b/openair1/PHY/NR_UE_TRANSPORT/nr_transport_ue.h
@@ -57,8 +57,6 @@ typedef enum {
 } harq_result_t;
 
 typedef struct {
-  /// NDAPI struct for UE
-  nfapi_nr_ue_pusch_pdu_t pusch_pdu;
   /// Indicator of first transmission
   uint8_t first_tx;
   /// HARQ tx status
@@ -120,11 +118,10 @@ typedef struct {
 } NR_UL_UE_HARQ_t;
 
 typedef struct {
+  /// NDAPI struct for UE
+  nfapi_nr_ue_pusch_pdu_t pusch_pdu;
   /// SRS active flag
   uint8_t srs_active; 
-  // Pointers to HARQ processes for the ULSCH
-  NR_UL_UE_HARQ_t *harq_processes[NR_MAX_ULSCH_HARQ_PROCESSES];
-  int harq_process_id[NR_MAX_SLOTS_PER_FRAME];
   // UL number of harq processes
   uint8_t number_harq_processes_for_pusch;
   /// Minimum number of CQI bits for PUSCH (36-212 r8.6, Sec 5.2.4.1 p. 37)
diff --git a/openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_coding.c b/openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_coding.c
index 0ff5d0a2eb..1973d617f7 100644
--- a/openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_coding.c
+++ b/openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_coding.c
@@ -43,137 +43,6 @@
 
 //#define DEBUG_ULSCH_CODING
 
-void free_nr_ue_ulsch(NR_UE_ULSCH_t **ulschptr,
-                      uint16_t N_RB_UL,
-                      NR_DL_FRAME_PARMS* frame_parms) {
-
-  NR_UE_ULSCH_t *ulsch = *ulschptr;
-
-  if (ulsch) {
-#ifdef DEBUG_ULSCH_FREE
-    printf("Freeing ulsch %p\n",ulsch);
-#endif
-
-    int max_layers = (frame_parms->nb_antennas_tx<NR_MAX_NB_LAYERS) ? frame_parms->nb_antennas_tx : NR_MAX_NB_LAYERS;
-    uint16_t a_segments = MAX_NUM_NR_ULSCH_SEGMENTS_PER_LAYER*max_layers;  //number of segments to be allocated
-
-    if (N_RB_UL != 273) {
-      a_segments = a_segments*N_RB_UL;
-      a_segments = a_segments/273 +1;
-    }
-
-    for (int i=0; i<NR_MAX_ULSCH_HARQ_PROCESSES; i++) {
-      if (ulsch->harq_processes[i]) {
-
-        if (ulsch->harq_processes[i]->a) {
-          free16(ulsch->harq_processes[i]->a,a_segments*1056);
-          ulsch->harq_processes[i]->a = NULL;
-        }
-        if (ulsch->harq_processes[i]->b) {
-          free16(ulsch->harq_processes[i]->b,a_segments*1056);
-          ulsch->harq_processes[i]->b = NULL;
-        }
-        if (ulsch->harq_processes[i]->e) {
-          free16(ulsch->harq_processes[i]->e,14*N_RB_UL*12*8);
-          ulsch->harq_processes[i]->e = NULL;
-        }
-        if (ulsch->harq_processes[i]->f) {
-          free16(ulsch->harq_processes[i]->f,14*N_RB_UL*12*8);
-          ulsch->harq_processes[i]->f = NULL;
-        }
-        for (int r=0; r<a_segments; r++) {
-          if (ulsch->harq_processes[i]->c[r]) {
-            free16(ulsch->harq_processes[i]->c[r],((r==0)?8:0) + 3+768);
-            ulsch->harq_processes[i]->c[r] = NULL;
-          }
-
-          if (ulsch->harq_processes[i]->d[r]) {
-            free16(ulsch->harq_processes[i]->d[r],68*384);
-            ulsch->harq_processes[i]->d[r] = NULL;
-          }
-
-        }
-
-        if (ulsch->harq_processes[i]->c) {
-          free16(ulsch->harq_processes[i]->c,a_segments);
-          ulsch->harq_processes[i]->c = NULL;
-        }
-        if (ulsch->harq_processes[i]->d) {
-          free16(ulsch->harq_processes[i]->d,a_segments);
-          ulsch->harq_processes[i]->d = NULL;
-        }
-
-        free16(ulsch->harq_processes[i],sizeof(NR_UL_UE_HARQ_t));
-        ulsch->harq_processes[i] = NULL;
-      }
-    }
-    free16(ulsch,sizeof(NR_UE_ULSCH_t));
-    *ulschptr = NULL;
-  }
-}
-
-
-NR_UE_ULSCH_t *new_nr_ue_ulsch(uint16_t N_RB_UL, int number_of_harq_pids, NR_DL_FRAME_PARMS* frame_parms) {
-
-  int max_layers = (frame_parms->nb_antennas_tx<NR_MAX_NB_LAYERS) ? frame_parms->nb_antennas_tx : NR_MAX_NB_LAYERS;
-  uint16_t a_segments = MAX_NUM_NR_ULSCH_SEGMENTS_PER_LAYER*max_layers;  //number of segments to be allocated
-
-  if (N_RB_UL != 273) {
-    a_segments = a_segments*N_RB_UL;
-    a_segments = a_segments/273 +1;
-  }  
-
-  uint32_t ulsch_bytes = a_segments*1056;  // allocated bytes per segment
-
-  NR_UE_ULSCH_t *ulsch = malloc16(sizeof(NR_UE_ULSCH_t));
-  DevAssert(ulsch);
-  memset(ulsch, 0, sizeof(*ulsch));
-
-  ulsch->number_harq_processes_for_pusch = NR_MAX_ULSCH_HARQ_PROCESSES;
-
-  for (int i = 0; i < number_of_harq_pids; i++) {
-
-    ulsch->harq_processes[i] = malloc16(sizeof(NR_UL_UE_HARQ_t));
-    DevAssert(ulsch->harq_processes[i]);
-    memset(ulsch->harq_processes[i], 0, sizeof(NR_UL_UE_HARQ_t));
-
-    ulsch->harq_processes[i]->a = malloc16(ulsch_bytes);
-    DevAssert(ulsch->harq_processes[i]->a);
-    bzero(ulsch->harq_processes[i]->a,ulsch_bytes);
-
-    ulsch->harq_processes[i]->b = malloc16(ulsch_bytes);
-    DevAssert(ulsch->harq_processes[i]->b);
-    bzero(ulsch->harq_processes[i]->b,ulsch_bytes);
-
-    ulsch->harq_processes[i]->c = malloc16(a_segments*sizeof(uint8_t *));
-    ulsch->harq_processes[i]->d = malloc16(a_segments*sizeof(uint16_t *));
-    for (int r = 0; r < a_segments; r++) {
-      // account for filler in first segment and CRCs for multiple segment case
-      ulsch->harq_processes[i]->c[r] = malloc16(8448);
-      DevAssert(ulsch->harq_processes[i]->c[r]);
-      bzero(ulsch->harq_processes[i]->c[r],8448);
-
-      ulsch->harq_processes[i]->d[r] = malloc16(68*384); //max size for coded output
-      DevAssert(ulsch->harq_processes[i]->d[r]);
-      bzero(ulsch->harq_processes[i]->d[r],(68*384));
-    }
-
-    ulsch->harq_processes[i]->e = malloc16(14*N_RB_UL*12*8);
-    DevAssert(ulsch->harq_processes[i]->e);
-    bzero(ulsch->harq_processes[i]->e,14*N_RB_UL*12*8);
-
-    ulsch->harq_processes[i]->f = malloc16(14*N_RB_UL*12*8);
-    DevAssert(ulsch->harq_processes[i]->f);
-    bzero(ulsch->harq_processes[i]->f,14*N_RB_UL*12*8);
-
-    ulsch->harq_processes[i]->subframe_scheduling_flag = 0;
-    ulsch->harq_processes[i]->first_tx = 1;
-  }
-
-  return(ulsch);
-}
-
-
 int nr_ulsch_encoding(PHY_VARS_NR_UE *ue,
                       NR_UE_ULSCH_t *ulsch,
                       NR_DL_FRAME_PARMS* frame_parms,
@@ -186,29 +55,29 @@ int nr_ulsch_encoding(PHY_VARS_NR_UE *ue,
 ///////////
 
   unsigned int crc = 1;
-  NR_UL_UE_HARQ_t *harq_process = ulsch->harq_processes[harq_pid];
-  uint16_t nb_rb = harq_process->pusch_pdu.rb_size;
-  uint32_t A = harq_process->pusch_pdu.pusch_data.tb_size<<3;
+  NR_UL_UE_HARQ_t *harq_process = &ue->ul_harq_processes[harq_pid];
+  uint16_t nb_rb = ulsch->pusch_pdu.rb_size;
+  uint32_t A = ulsch->pusch_pdu.pusch_data.tb_size<<3;
   uint32_t *pz = &harq_process->Z;
-  uint8_t mod_order = harq_process->pusch_pdu.qam_mod_order;
+  uint8_t mod_order = ulsch->pusch_pdu.qam_mod_order;
   uint16_t Kr=0;
   uint32_t r_offset=0;
   uint32_t F=0;
   // target_code_rate is in 0.1 units
-  float Coderate = (float) harq_process->pusch_pdu.target_code_rate / 10240.0f;
+  float Coderate = (float) ulsch->pusch_pdu.target_code_rate / 10240.0f;
 
 ///////////
 /////////////////////////////////////////////////////////////////////////////////////////  
 
   VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_NR_UE_ULSCH_ENCODING, VCD_FUNCTION_IN);
 
-  LOG_D(NR_PHY, "ulsch coding nb_rb %d, Nl = %d\n", nb_rb, harq_process->pusch_pdu.nrOfLayers);
+  LOG_D(NR_PHY, "ulsch coding nb_rb %d, Nl = %d\n", nb_rb, ulsch->pusch_pdu.nrOfLayers);
   LOG_D(NR_PHY, "ulsch coding A %d G %d mod_order %d Coderate %f\n", A, G, mod_order, Coderate);
   LOG_D(NR_PHY, "harq_pid %d harq_process->ndi %d, pusch_data.new_data_indicator %d\n",
-        harq_pid,harq_process->ndi,harq_process->pusch_pdu.pusch_data.new_data_indicator);
+        harq_pid,harq_process->ndi,ulsch->pusch_pdu.pusch_data.new_data_indicator);
 
   if (harq_process->first_tx == 1 ||
-      harq_process->ndi != harq_process->pusch_pdu.pusch_data.new_data_indicator) {  // this is a new packet
+      harq_process->ndi != ulsch->pusch_pdu.pusch_data.new_data_indicator) {  // this is a new packet
 #ifdef DEBUG_ULSCH_CODING
   printf("encoding thinks this is a new packet \n");
 #endif
@@ -223,7 +92,7 @@ int nr_ulsch_encoding(PHY_VARS_NR_UE *ue,
     printf("\n");
    */ 
 
-    int max_payload_bytes = MAX_NUM_NR_ULSCH_SEGMENTS_PER_LAYER*harq_process->pusch_pdu.nrOfLayers*1056;
+    int max_payload_bytes = MAX_NUM_NR_ULSCH_SEGMENTS_PER_LAYER*ulsch->pusch_pdu.nrOfLayers*1056;
 
     if (A > 3824) {
       // Add 24-bit crc (polynomial A) to payload
@@ -278,7 +147,7 @@ int nr_ulsch_encoding(PHY_VARS_NR_UE *ue,
                                  &harq_process->F,
                                  harq_process->BG);
 
-    if (harq_process->C>MAX_NUM_NR_DLSCH_SEGMENTS_PER_LAYER*harq_process->pusch_pdu.nrOfLayers) {
+    if (harq_process->C>MAX_NUM_NR_DLSCH_SEGMENTS_PER_LAYER*ulsch->pusch_pdu.nrOfLayers) {
       LOG_E(PHY,"nr_segmentation.c: too many segments %d, B %d\n",harq_process->C,harq_process->B);
       return(-1);
     }
@@ -350,8 +219,8 @@ int nr_ulsch_encoding(PHY_VARS_NR_UE *ue,
 
 ///////////
 ///////////////////////////////////////////////////////////////////////////////
-    LOG_D(PHY,"setting ndi to %d from pusch_data\n", harq_process->pusch_pdu.pusch_data.new_data_indicator);
-    harq_process->ndi = harq_process->pusch_pdu.pusch_data.new_data_indicator;
+    LOG_D(PHY,"setting ndi to %d from pusch_data\n", ulsch->pusch_pdu.pusch_data.new_data_indicator);
+    harq_process->ndi = ulsch->pusch_pdu.pusch_data.new_data_indicator;
   }
   F = harq_process->F;
   Kr = harq_process->K;
@@ -371,17 +240,17 @@ int nr_ulsch_encoding(PHY_VARS_NR_UE *ue,
 	  G,
 	  Kr*3,
 	  mod_order,nb_rb,
-	  harq_process->pusch_pdu.pusch_data.rv_index);
+	  ulsch->pusch_pdu.pusch_data.rv_index);
 
     //start_meas(rm_stats);
 ///////////////////////// d---->| Rate matching bit selection |---->e /////////////////////////
 ///////////
 
-    uint32_t E = nr_get_E(G, harq_process->C, mod_order, harq_process->pusch_pdu.nrOfLayers, r);
+    uint32_t E = nr_get_E(G, harq_process->C, mod_order, ulsch->pusch_pdu.nrOfLayers, r);
 
     VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_NR_RATE_MATCHING_LDPC, VCD_FUNCTION_IN);
     start_meas(&ue->ulsch_rate_matching_stats);
-    if (nr_rate_matching_ldpc(harq_process->pusch_pdu.tbslbrm,
+    if (nr_rate_matching_ldpc(ulsch->pusch_pdu.tbslbrm,
                               harq_process->BG,
                               *pz,
                               harq_process->d[r],
@@ -389,7 +258,7 @@ int nr_ulsch_encoding(PHY_VARS_NR_UE *ue,
                               harq_process->C,
                               F,
                               Kr-F-2*(*pz),
-                              harq_process->pusch_pdu.pusch_data.rv_index,
+                              ulsch->pusch_pdu.pusch_data.rv_index,
                               E) == -1)
       return -1;
 
diff --git a/openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c b/openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c
index ae4ac7046e..6b62fe4f84 100644
--- a/openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c
+++ b/openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c
@@ -110,7 +110,8 @@ void nr_ue_ulsch_procedures(PHY_VARS_NR_UE *UE,
                             unsigned char harq_pid,
                             uint32_t frame,
                             uint8_t slot,
-                            int gNB_id) {
+                            int gNB_id,
+                            nr_phy_data_tx_t *phy_data) {
 
   LOG_D(PHY,"nr_ue_ulsch_procedures hard_id %d %d.%d\n",harq_pid,frame,slot);
 
@@ -126,9 +127,9 @@ void nr_ue_ulsch_procedures(PHY_VARS_NR_UE *UE,
   int      N_PRB_oh = 0; // higher layer (RRC) parameter xOverhead in PUSCH-ServingCellConfig
   uint16_t number_dmrs_symbols = 0;
 
-  NR_UE_ULSCH_t *ulsch_ue = UE->ulsch[gNB_id];
-  NR_UL_UE_HARQ_t *harq_process_ul_ue = ulsch_ue->harq_processes[harq_pid];
-  nfapi_nr_ue_pusch_pdu_t *pusch_pdu = &harq_process_ul_ue->pusch_pdu;
+  NR_UE_ULSCH_t *ulsch_ue = &phy_data->ulsch;
+  NR_UL_UE_HARQ_t *harq_process_ul_ue = &UE->ul_harq_processes[harq_pid];
+  nfapi_nr_ue_pusch_pdu_t *pusch_pdu = &ulsch_ue->pusch_pdu;
 
   int start_symbol          = pusch_pdu->start_symbol_index;
   uint16_t ul_dmrs_symb_pos = pusch_pdu->ul_dmrs_symb_pos;
@@ -169,7 +170,7 @@ void nr_ue_ulsch_procedures(PHY_VARS_NR_UE *UE,
 
   trace_NRpdu(DIRECTION_UPLINK,
               harq_process_ul_ue->a,
-              harq_process_ul_ue->pusch_pdu.pusch_data.tb_size,
+              pusch_pdu->pusch_data.tb_size,
               WS_C_RNTI, rnti, frame, slot, 0, 0);
 
   if (nr_ulsch_encoding(UE, ulsch_ue, frame_parms, harq_pid, G) == -1)
@@ -236,8 +237,8 @@ void nr_ue_ulsch_procedures(PHY_VARS_NR_UE *UE,
 
   if (pusch_pdu->pdu_bit_map & PUSCH_PDU_BITMAP_PUSCH_PTRS) {
 
-    K_ptrs = harq_process_ul_ue->pusch_pdu.pusch_ptrs.ptrs_freq_density;
-    L_ptrs = 1<<harq_process_ul_ue->pusch_pdu.pusch_ptrs.ptrs_time_density;
+    K_ptrs = pusch_pdu->pusch_ptrs.ptrs_freq_density;
+    L_ptrs = 1<<pusch_pdu->pusch_ptrs.ptrs_time_density;
 
     beta_ptrs = 1; // temp value until power control is implemented
 
@@ -572,7 +573,7 @@ void nr_ue_ulsch_procedures(PHY_VARS_NR_UE *UE,
   }// port loop
 
   NR_UL_UE_HARQ_t *harq_process_ulsch=NULL;
-  harq_process_ulsch = UE->ulsch[gNB_id]->harq_processes[harq_pid];
+  harq_process_ulsch = &UE->ul_harq_processes[harq_pid];
   harq_process_ulsch->status = SCH_IDLE;
 
   for (int nl = 0; nl < Nl; nl++) {
diff --git a/openair1/PHY/defs_nr_UE.h b/openair1/PHY/defs_nr_UE.h
index 8a73a4fb86..f78a2f2057 100644
--- a/openair1/PHY/defs_nr_UE.h
+++ b/openair1/PHY/defs_nr_UE.h
@@ -538,10 +538,10 @@ typedef struct {
   NR_UE_CSI_IM    *csiim_vars[NUMBER_OF_CONNECTED_gNB_MAX];
   NR_UE_CSI_RS    *csirs_vars[NUMBER_OF_CONNECTED_gNB_MAX];
   NR_UE_SRS       *srs_vars[NUMBER_OF_CONNECTED_gNB_MAX];
-  NR_UE_ULSCH_t   *ulsch[NUMBER_OF_CONNECTED_gNB_MAX];
   NR_UE_PRS       *prs_vars[NR_MAX_PRS_COMB_SIZE];
   uint8_t          prs_active_gNBs;
   NR_DL_UE_HARQ_t  dl_harq_processes[NR_MAX_NB_LAYERS>4 ? 2:1][NR_MAX_DLSCH_HARQ_PROCESSES];
+  NR_UL_UE_HARQ_t  ul_harq_processes[NR_MAX_ULSCH_HARQ_PROCESSES];
   
   //Paging parameters
   uint32_t              IMSImod1024;
@@ -754,8 +754,12 @@ typedef struct {
   void* scopeData;
 } PHY_VARS_NR_UE;
 
-typedef struct nr_phy_data_s {
+typedef struct nr_phy_data_tx_s {
+  NR_UE_ULSCH_t ulsch;
   NR_UE_PUCCH pucch_vars;
+} nr_phy_data_tx_t;
+
+typedef struct nr_phy_data_s {
   NR_UE_PDCCH_CONFIG phy_pdcch_config;
   NR_UE_DLSCH_t dlsch[NR_MAX_NB_LAYERS>4 ? 2:1];
 } nr_phy_data_t;
diff --git a/openair1/SCHED_NR_UE/defs.h b/openair1/SCHED_NR_UE/defs.h
index 51749889c9..4e65074c43 100644
--- a/openair1/SCHED_NR_UE/defs.h
+++ b/openair1/SCHED_NR_UE/defs.h
@@ -96,7 +96,7 @@ typedef struct {
   @param proc Pointer to RXn-TXnp4 proc information
   @param eNB_id Local id of eNB on which to act
 */
-void phy_procedures_nrUE_TX(PHY_VARS_NR_UE *ue, UE_nr_rxtx_proc_t *proc, uint8_t gNB_id);
+void phy_procedures_nrUE_TX(PHY_VARS_NR_UE *ue, UE_nr_rxtx_proc_t *proc, uint8_t gNB_id, nr_phy_data_tx_t *phy_data);
 
 /*! \brief Scheduling for UE RX procedures in normal subframes.
   @param ue                     Pointer to UE variables on which to act
diff --git a/openair1/SCHED_NR_UE/fapi_nr_ue_l1.c b/openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
index 54ad012718..12c91a6667 100644
--- a/openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
+++ b/openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
@@ -329,8 +329,8 @@ int8_t nr_ue_scheduled_response(nr_scheduled_response_t *scheduled_response){
 
     // Note: we have to handle the thread IDs for this. To be revisited completely.
     NR_UE_DLSCH_t *dlsch0 = &((nr_phy_data_t *)scheduled_response->phy_data)->dlsch[0];
-    NR_UE_ULSCH_t *ulsch = PHY_vars_UE_g[module_id][cc_id]->ulsch[0];
-    NR_UE_PUCCH *pucch_vars = &((nr_phy_data_t *)scheduled_response->phy_data)->pucch_vars;
+    NR_UE_ULSCH_t *ulsch = &((nr_phy_data_tx_t *)scheduled_response->phy_data)->ulsch;
+    NR_UE_PUCCH *pucch_vars = &((nr_phy_data_tx_t *)scheduled_response->phy_data)->pucch_vars;
     NR_UE_CSI_IM *csiim_vars = PHY_vars_UE_g[module_id][cc_id]->csiim_vars[0];
     NR_UE_CSI_RS *csirs_vars = PHY_vars_UE_g[module_id][cc_id]->csirs_vars[0];
     NR_UE_PDCCH_CONFIG *phy_pdcch_config = NULL;
@@ -427,26 +427,21 @@ int8_t nr_ue_scheduled_response(nr_scheduled_response_t *scheduled_response){
           // pusch config pdu
           pusch_config_pdu = &ul_config->ul_config_list[i].pusch_config_pdu;
           current_harq_pid = pusch_config_pdu->pusch_data.harq_process_id;
-          NR_UL_UE_HARQ_t *harq_process_ul_ue = ulsch->harq_processes[current_harq_pid];
+          NR_UL_UE_HARQ_t *harq_process_ul_ue = &PHY_vars_UE_g[module_id][cc_id]->ul_harq_processes[current_harq_pid];
 
-          if (harq_process_ul_ue){
+          nfapi_nr_ue_pusch_pdu_t *pusch_pdu = &ulsch->pusch_pdu;
 
-            nfapi_nr_ue_pusch_pdu_t *pusch_pdu = &harq_process_ul_ue->pusch_pdu;
-            
-            LOG_D(PHY, "In %s i %d: copy pusch_config_pdu nrOfLayers:%d, num_dmrs_cdm_grps_no_data:%d \n", __FUNCTION__, i, pusch_config_pdu->nrOfLayers,pusch_config_pdu->num_dmrs_cdm_grps_no_data);
+          LOG_D(PHY, "In %s i %d: copy pusch_config_pdu nrOfLayers:%d, num_dmrs_cdm_grps_no_data:%d \n", __FUNCTION__, i, pusch_config_pdu->nrOfLayers,pusch_config_pdu->num_dmrs_cdm_grps_no_data);
 
-            memcpy(pusch_pdu, pusch_config_pdu, sizeof(nfapi_nr_ue_pusch_pdu_t));
+          memcpy(pusch_pdu, pusch_config_pdu, sizeof(nfapi_nr_ue_pusch_pdu_t));
 
-            ulsch->f_pusch = pusch_config_pdu->absolute_delta_PUSCH;
-
-            if (scheduled_response->tx_request) {
-              for (int j=0; j<scheduled_response->tx_request->number_of_pdus; j++) {
-                fapi_nr_tx_request_body_t *tx_req_body = &scheduled_response->tx_request->tx_request_body[j];
-                if ((tx_req_body->pdu_index == i) && (tx_req_body->pdu_length > 0)) {
-                  LOG_D(PHY,"%d.%d Copying %d bytes to harq_process_ul_ue->a (harq_pid %d)\n",scheduled_response->frame,slot,tx_req_body->pdu_length,current_harq_pid);
-                  memcpy(harq_process_ul_ue->a, tx_req_body->pdu, tx_req_body->pdu_length);
-                  break;
-                }
+          if (scheduled_response->tx_request) {
+            for (int j=0; j<scheduled_response->tx_request->number_of_pdus; j++) {
+              fapi_nr_tx_request_body_t *tx_req_body = &scheduled_response->tx_request->tx_request_body[j];
+              if ((tx_req_body->pdu_index == i) && (tx_req_body->pdu_length > 0)) {
+                LOG_D(PHY,"%d.%d Copying %d bytes to harq_process_ul_ue->a (harq_pid %d)\n",scheduled_response->frame,slot,tx_req_body->pdu_length,current_harq_pid);
+                memcpy(harq_process_ul_ue->a, tx_req_body->pdu, tx_req_body->pdu_length);
+                break;
               }
             }
 
diff --git a/openair1/SCHED_NR_UE/harq_nr.c b/openair1/SCHED_NR_UE/harq_nr.c
index 25e23551e0..2cffd3f484 100644
--- a/openair1/SCHED_NR_UE/harq_nr.c
+++ b/openair1/SCHED_NR_UE/harq_nr.c
@@ -98,128 +98,6 @@
 #define DL_DCI              (1)
 #define UL_DCI              (0)
 
-
-/*******************************************************************
-*
-* NAME :         config_uplink_harq_process
-*
-* PARAMETERS :   pointer to ue context
-*                id of current gNB
-*                number of uplink processes
-*                maximum number of uplink retransmissions
-* RETURN :       none
-*
-* DESCRIPTION :  configuration of uplink HARQ entity
-*
-*********************************************************************/
-
-void config_uplink_harq_process(PHY_VARS_NR_UE *ue, int gNB_id, int code_word_idx, uint8_t number_harq_processes_pusch)
-{
-  NR_UE_ULSCH_t *ulsch;
-
-  ulsch = (NR_UE_ULSCH_t *)malloc16(sizeof(NR_UE_ULSCH_t));
-
-  if (ulsch != NULL) {
-
-    memset(ulsch,0,sizeof(NR_UE_ULSCH_t));
-
-    ue->ulsch[gNB_id] = ulsch;
-  }
-  else {
-    LOG_E(PHY, "Fatal memory allocation problem at line %d in function %s of file %s \n", __LINE__ , __func__, __FILE__);
-    assert(0);
-  }
-
-  ulsch->number_harq_processes_for_pusch = number_harq_processes_pusch;
-
-  /* allocation of HARQ process context */
-  for (int harq_pid = 0; harq_pid < number_harq_processes_pusch; harq_pid++) {
-
-    ulsch->harq_processes[harq_pid] = (NR_UL_UE_HARQ_t *)malloc16(sizeof(NR_UL_UE_HARQ_t));
-
-    if (ulsch->harq_processes[harq_pid] == NULL) {
-      LOG_E(PHY, "Fatal memory allocation problem at line %d in function %s of file %s \n", __LINE__ , __func__, __FILE__);
-      assert(0);
-    }
-
-    ulsch->harq_processes[harq_pid]->subframe_scheduling_flag = 0;
-    ulsch->harq_processes[harq_pid]->first_tx = 1;
-    ulsch->harq_processes[harq_pid]->round  = 0;
-  }
-
-  for (int slot_tx = 0; slot_tx < NR_MAX_SLOTS_PER_FRAME; slot_tx++) {
-    ue->ulsch[gNB_id]->harq_process_id[slot_tx] = NR_MAX_HARQ_PROCESSES;
-  }
-}
-
-/*******************************************************************
-*
-* NAME :         release_uplink_harq_process
-*
-* PARAMETERS :   pointer to ue context
-*                id of current gNB
-*
-* RETURN :       none
-*
-* DESCRIPTION :  release of HARQ uplink entity
-*
-*********************************************************************/
-
-void release_uplink_harq_process(PHY_VARS_NR_UE *ue, int gNB_id, int code_word_idx)
-{
-  NR_UE_ULSCH_t *ulsch = ue->ulsch[gNB_id];
-
-  for (int process_id = 0; process_id < ulsch->number_harq_processes_for_pusch; process_id++) {
-
-    free16(ulsch->harq_processes[process_id],sizeof(NR_UL_UE_HARQ_t));
-
-    ulsch->harq_processes[process_id] = NULL;
-  }
-
-  free16(ulsch, sizeof(NR_UE_ULSCH_t));
-
-  ue->ulsch[gNB_id] = NULL;
-}
-
-/*******************************************************************
-*
-* NAME :         set_tx_harq_id
-*
-* PARAMETERS :   ue context
-*                slot_tx slot for transmission
-*                gNB_id identifier
-*
-* RETURN :       none
-*
-* DESCRIPTION :  store tx harq process identifier for given transmission slot
-*
-*********************************************************************/
-
-void set_tx_harq_id(NR_UE_ULSCH_t *ulsch, int harq_pid, int slot_tx)
-{
-  ulsch->harq_process_id[slot_tx] = harq_pid;
-}
-
-/*******************************************************************
-*
-* NAME :         get_tx_harq_id
-*
-* PARAMETERS :   ue context
-*                slot_tx slot for transmission
-*                gNB_id identifier
-*
-* RETURN :       harq process identifier
-*
-* DESCRIPTION :  return tx harq process identifier for given slot transmission
-*
-*********************************************************************/
-
-int get_tx_harq_id(NR_UE_ULSCH_t *ulsch, int slot_tx)
-{
-
-  return (ulsch->harq_process_id[slot_tx]);
-}
-
 /*******************************************************************
 *
 * NAME :         uplink_harq_process
@@ -239,7 +117,7 @@ int get_tx_harq_id(NR_UE_ULSCH_t *ulsch, int slot_tx)
 *
 *********************************************************************/
 
-harq_result_t uplink_harq_process(NR_UE_ULSCH_t *ulsch, int harq_pid, int ndi, uint8_t rnti_type)
+harq_result_t uplink_harq_process(NR_UE_ULSCH_t *ulsch, int harq_pid, NR_UL_UE_HARQ_t harq_processes[NR_MAX_ULSCH_HARQ_PROCESSES], int ndi, uint8_t rnti_type)
 {
   harq_result_t result_harq = RETRANSMISSION_HARQ;
 
@@ -257,11 +135,10 @@ harq_result_t uplink_harq_process(NR_UE_ULSCH_t *ulsch, int harq_pid, int ndi, u
   }
 
   /* 38.321 5.4.2.1  2>  if the uplink grant was received on PDCCH for the C-RNTI and the HARQ buffer of the identified process is empty */
-  if ((ulsch->harq_processes[harq_pid]->first_tx == 1) && (rnti_type == _C_RNTI_)) {  /* no transmission yet on this process so consider its harq buffer as empty */
-   ulsch->harq_processes[harq_pid]->first_tx = 0;
-    ulsch->harq_processes[harq_pid]->pusch_pdu.pusch_data.new_data_indicator = ndi;             /* store first value of ndi */
-    ulsch->harq_processes[harq_pid]->round = 0;
-    ulsch->harq_processes[harq_pid]->subframe_scheduling_flag = 1;
+  if ((harq_processes[harq_pid].first_tx == 1) && (rnti_type == _C_RNTI_)) {  /* no transmission yet on this process so consider its harq buffer as empty */
+   harq_processes[harq_pid].first_tx = 0;
+    harq_processes[harq_pid].ndi = ndi;             /* store first value of ndi */
+    harq_processes[harq_pid].round = 0;
 
     result_harq = NEW_TRANSMISSION_HARQ;
 
@@ -269,10 +146,9 @@ harq_result_t uplink_harq_process(NR_UE_ULSCH_t *ulsch, int harq_pid, int ndi, u
   }
   /* 38.321 5.4.2.1  2> if the received grant was not addressed to a Temporary C-RNTI on PDCCH, and the NDI provided in the associated HARQ */
   /* information has been toggled compared to the value in the previous transmission of this TB of this HARQ process */
-  else if ((ulsch->harq_processes[harq_pid]->pusch_pdu.pusch_data.new_data_indicator != ndi) && (rnti_type != _TC_RNTI_)) {   /* is ndi toogled so this is a new grant ? */
-    ulsch->harq_processes[harq_pid]->pusch_pdu.pusch_data.new_data_indicator = ndi;             /* store first value of ndi */
-    ulsch->harq_processes[harq_pid]->round = 0;
-    ulsch->harq_processes[harq_pid]->subframe_scheduling_flag = 1;
+  else if ((harq_processes[harq_pid].ndi != ndi) && (rnti_type != _TC_RNTI_)) {   /* is ndi toogled so this is a new grant ? */
+    harq_processes[harq_pid].ndi = ndi;             /* store first value of ndi */
+    harq_processes[harq_pid].round = 0;
 
     result_harq = NEW_TRANSMISSION_HARQ;
 
@@ -280,8 +156,8 @@ harq_result_t uplink_harq_process(NR_UE_ULSCH_t *ulsch, int harq_pid, int ndi, u
    }
    /* 38.321 5.4.2.1 2> else (i.e. retransmission): */
    else {
-     ulsch->harq_processes[harq_pid]->pusch_pdu.pusch_data.new_data_indicator = ndi;             /* ndi has not toggled si this is a retransmission */
-     ulsch->harq_processes[harq_pid]->round++;                  /* increment number of retransmission */
+     harq_processes[harq_pid].ndi = ndi;             /* ndi has not toggled si this is a retransmission */
+     harq_processes[harq_pid].round++;                  /* increment number of retransmission */
 
      result_harq = RETRANSMISSION_HARQ;
 
diff --git a/openair1/SCHED_NR_UE/harq_nr.h b/openair1/SCHED_NR_UE/harq_nr.h
index b707e2d983..e511e6f1c6 100644
--- a/openair1/SCHED_NR_UE/harq_nr.h
+++ b/openair1/SCHED_NR_UE/harq_nr.h
@@ -65,45 +65,7 @@
 
 /*************** FUNCTIONS ****************************************/
 
-
-/** \brief This function configures uplink HARQ context
-    @param PHY_VARS_NR_UE ue context
-    @param gNB_id gNodeB identifier
-    @param code_word_idx code word index
-    @param number_harq_processes_pusch maximum number of uplink HARQ processes
-    @returns none */
-
-void config_uplink_harq_process(PHY_VARS_NR_UE *ue, int gNB_id, int code_word_idx, uint8_t number_harq_processes_pusch);
-
-/** \brief This function releases uplink HARQ context
-    @param PHY_VARS_NR_UE ue context
-    @param gNB_id gNodeB identifier
-    @param code_word_idx code word index
-    @returns none */
-
-void release_uplink_harq_process(PHY_VARS_NR_UE *ue, int gNB_id, int code_word_idx);
-
-/** \brief This function stores slot for transmission in HARQ context
-    @param ulsch uplink context
-    @param harq process identifier harq_pid
-    @param slot_tx slot for transmission related to current downlink PDCCH
-    @returns 0 none */
-
-void set_tx_harq_id(NR_UE_ULSCH_t *ulsch, int harq_pid, int slot_tx);
-
-/** \brief This function initialises context of an uplink HARQ process
-    @param ulsch uplink context
-    @param harq process identifier harq_pid
-    @returns harq number for tx slot */
-
-int get_tx_harq_id(NR_UE_ULSCH_t *ulsch, int slot_tx);
-
-/** \brief This function update uplink harq context and return transmission type (new transmission or retransmission)
-    @param ulsch uplink harq context
-    @param harq process identifier harq_pid
-    @returns retransmission or new transmission */
-
-harq_result_t uplink_harq_process(NR_UE_ULSCH_t *ulsch, int harq_pid, int ndi, uint8_t rnti_type);
+harq_result_t uplink_harq_process(NR_UE_ULSCH_t *ulsch, int harq_pid, NR_UL_UE_HARQ_t harq_processes[NR_MAX_ULSCH_HARQ_PROCESSES], int ndi, uint8_t rnti_type);
 
 /** \brief This function initialises downlink HARQ status
     @param pointer to downlink harq status
diff --git a/openair1/SCHED_NR_UE/phy_procedures_nr_ue.c b/openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
index fb4a737da1..8b641cf2bd 100644
--- a/openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
+++ b/openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
@@ -270,7 +270,8 @@ void ue_ta_procedures(PHY_VARS_NR_UE *ue, int slot_tx, int frame_tx){
 
 void phy_procedures_nrUE_TX(PHY_VARS_NR_UE *ue,
                             UE_nr_rxtx_proc_t *proc,
-                            uint8_t gNB_id) {
+                            uint8_t gNB_id,
+                            nr_phy_data_tx_t *phy_data) {
 
   int slot_tx = proc->nr_slot_tx;
   int frame_tx = proc->frame_tx;
@@ -288,9 +289,9 @@ void phy_procedures_nrUE_TX(PHY_VARS_NR_UE *ue,
 
   if (ue->UE_mode[gNB_id] <= PUSCH){
 
-    for (uint8_t harq_pid = 0; harq_pid < ue->ulsch[gNB_id]->number_harq_processes_for_pusch; harq_pid++) {
-      if (ue->ulsch[gNB_id]->harq_processes[harq_pid]->status == ACTIVE)
-        nr_ue_ulsch_procedures(ue, harq_pid, frame_tx, slot_tx, gNB_id);
+    for (uint8_t harq_pid = 0; harq_pid < NR_MAX_ULSCH_HARQ_PROCESSES; harq_pid++) {
+      if (ue->ul_harq_processes[harq_pid].status == ACTIVE)
+        nr_ue_ulsch_procedures(ue, harq_pid, frame_tx, slot_tx, gNB_id, phy_data);
     }
   }
 
@@ -495,7 +496,7 @@ int nr_ue_pdcch_procedures(uint8_t gNB_id,
   int frame_rx = proc->frame_rx;
   int nr_slot_rx = proc->nr_slot_rx;
   unsigned int dci_cnt=0;
-  fapi_nr_dci_indication_t *dci_ind = calloc(1, sizeof(*dci_ind));
+  fapi_nr_dci_indication_t dci_ind = {0};
   nr_downlink_indication_t dl_indication;
   NR_UE_PDCCH_CONFIG *phy_pdcch_config = &phy_data->phy_pdcch_config;
 
@@ -519,7 +520,7 @@ int nr_ue_pdcch_procedures(uint8_t gNB_id,
 	 n_ss);
 #endif
 
-  dci_cnt = nr_dci_decoding_procedure(ue, proc, pdcch_e_rx, dci_ind, rel15);
+  dci_cnt = nr_dci_decoding_procedure(ue, proc, pdcch_e_rx, &dci_ind, rel15);
 
 #ifdef NR_PDCCH_SCHED_DEBUG
   LOG_I(PHY,"<-NR_PDCCH_PHY_PROCEDURES_LTE_UE (nr_ue_pdcch_procedures)-> Ending function nr_dci_decoding_procedure() -> dci_cnt=%u\n",dci_cnt);
@@ -533,14 +534,14 @@ int nr_ue_pdcch_procedures(uint8_t gNB_id,
       ue->Mod_id,frame_rx%1024,nr_slot_rx,nr_mode_string[ue->UE_mode[gNB_id]],
       i + 1,
       dci_cnt,
-      dci_ind->dci_list[i].rnti,
-      dci_ind->dci_list[i].dci_format);
+      dci_ind.dci_list[i].rnti,
+      dci_ind.dci_list[i].dci_format);
   }
 
-  dci_ind->number_of_dcis = dci_cnt;
+  dci_ind.number_of_dcis = dci_cnt;
 
   // fill dl_indication message
-  nr_fill_dl_indication(&dl_indication, dci_ind, NULL, proc, ue, gNB_id, phy_data);
+  nr_fill_dl_indication(&dl_indication, &dci_ind, NULL, proc, ue, gNB_id, phy_data);
   //  send to mac
   ue->if_inst->dl_indication(&dl_indication, NULL);
 
diff --git a/openair1/SCHED_NR_UE/pucch_uci_ue_nr.c b/openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
index 163a828003..fb8c4e84b0 100644
--- a/openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
+++ b/openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
@@ -201,7 +201,7 @@ void nr_generate_pucch3_4(int32_t **txdataF,
 void pucch_procedures_ue_nr(PHY_VARS_NR_UE *ue, 
                             uint8_t gNB_id,
                             UE_nr_rxtx_proc_t *proc,
-                            nr_phy_data_t *phy_data) {
+                            nr_phy_data_tx_t *phy_data) {
 
   int       nr_slot_tx = proc->nr_slot_tx;
   fapi_nr_ul_config_pucch_pdu *pucch_pdu;
diff --git a/openair1/SCHED_NR_UE/pucch_uci_ue_nr.h b/openair1/SCHED_NR_UE/pucch_uci_ue_nr.h
index 1ff1b7cc5c..7f8bf13da3 100644
--- a/openair1/SCHED_NR_UE/pucch_uci_ue_nr.h
+++ b/openair1/SCHED_NR_UE/pucch_uci_ue_nr.h
@@ -62,7 +62,7 @@
 void pucch_procedures_ue_nr(PHY_VARS_NR_UE *ue, 
                             uint8_t gNB_id,
                             UE_nr_rxtx_proc_t *proc,
-                            nr_phy_data_t *phy_data);
+                            nr_phy_data_tx_t *phy_data);
 
 
 void set_csi_nr(int csi_status, uint32_t csi_payload);
diff --git a/openair1/SIMULATION/NR_PHY/dlschsim.c b/openair1/SIMULATION/NR_PHY/dlschsim.c
index 706e64bfd1..04c203b594 100644
--- a/openair1/SIMULATION/NR_PHY/dlschsim.c
+++ b/openair1/SIMULATION/NR_PHY/dlschsim.c
@@ -406,7 +406,7 @@ int main(int argc, char **argv)
   nr_ue_dlsch_init(dlsch_ue, num_codeword, 5);
   for (int i=0; i < num_codeword; i++)
     dlsch_ue[0].rnti = n_rnti;
-  nr_init_harq_processes(UE->dl_harq_processes[0], 8, nb_rb);
+  nr_init_dl_harq_processes(UE->dl_harq_processes[0], 8, nb_rb);
 
 	unsigned char harq_pid = 0; //dlsch->harq_ids[subframe];
   processingData_L1tx_t msgDataTx;
diff --git a/openair1/SIMULATION/NR_PHY/ulschsim.c b/openair1/SIMULATION/NR_PHY/ulschsim.c
index 7d9b465d37..ac7b9b5c48 100644
--- a/openair1/SIMULATION/NR_PHY/ulschsim.c
+++ b/openair1/SIMULATION/NR_PHY/ulschsim.c
@@ -432,11 +432,7 @@ int main(int argc, char **argv)
     exit(-1);
   }
 
-  UE->ulsch[0] = new_nr_ue_ulsch(N_RB_UL, 8, frame_parms);
-  if (!UE->ulsch[0]) {
-    printf("Can't get ue ulsch structures.\n");
-    exit(-1);
-  }
+  nr_init_ul_harq_processes(UE->ul_harq_processes, NR_MAX_ULSCH_HARQ_PROCESSES, UE->frame_parms.N_RB_UL, UE->frame_parms.nb_antennas_tx);
 
   unsigned char harq_pid = 0;
   unsigned int TBS = 8424;
@@ -453,7 +449,8 @@ int main(int argc, char **argv)
   NR_UL_gNB_HARQ_t *harq_process_gNB = ulsch_gNB->harq_processes[harq_pid];
   nfapi_nr_pusch_pdu_t *rel15_ul = &harq_process_gNB->ulsch_pdu;
 
-  NR_UE_ULSCH_t *ulsch_ue = UE->ulsch[0];
+  nr_phy_data_tx_t phy_data = {0};
+  NR_UE_ULSCH_t *ulsch_ue = &phy_data.ulsch;
 
   if ((Nl==4)||(Nl==3))
     nb_re_dmrs = nb_re_dmrs*2;
@@ -488,22 +485,22 @@ int main(int argc, char **argv)
 
   /////////////////////////[adk] preparing UL harq_process parameters/////////////////////////
   ///////////
-  NR_UL_UE_HARQ_t *harq_process_ul_ue = ulsch_ue->harq_processes[harq_pid];
+  NR_UL_UE_HARQ_t *harq_process_ul_ue = &UE->ul_harq_processes[harq_pid];
   DevAssert(harq_process_ul_ue);
 
   N_PRB_oh   = 0; // higher layer (RRC) parameter xOverhead in PUSCH-ServingCellConfig
   N_RE_prime = NR_NB_SC_PER_RB*nb_symb_sch - nb_re_dmrs - N_PRB_oh;
 
-  harq_process_ul_ue->pusch_pdu.rnti = n_rnti;
-  harq_process_ul_ue->pusch_pdu.mcs_index = Imcs;
-  harq_process_ul_ue->pusch_pdu.nrOfLayers = Nl;
-  harq_process_ul_ue->pusch_pdu.rb_size = nb_rb;
-  harq_process_ul_ue->pusch_pdu.nr_of_symbols = nb_symb_sch;
+  ulsch_ue->pusch_pdu.rnti = n_rnti;
+  ulsch_ue->pusch_pdu.mcs_index = Imcs;
+  ulsch_ue->pusch_pdu.nrOfLayers = Nl;
+  ulsch_ue->pusch_pdu.rb_size = nb_rb;
+  ulsch_ue->pusch_pdu.nr_of_symbols = nb_symb_sch;
   harq_process_ul_ue->num_of_mod_symbols = N_RE_prime*nb_rb*nb_codewords;
-  harq_process_ul_ue->pusch_pdu.pusch_data.rv_index = rvidx;
-  harq_process_ul_ue->pusch_pdu.pusch_data.tb_size  = TBS>>3;
-  harq_process_ul_ue->pusch_pdu.target_code_rate = code_rate;
-  harq_process_ul_ue->pusch_pdu.qam_mod_order = mod_order;
+  ulsch_ue->pusch_pdu.pusch_data.rv_index = rvidx;
+  ulsch_ue->pusch_pdu.pusch_data.tb_size  = TBS>>3;
+  ulsch_ue->pusch_pdu.target_code_rate = code_rate;
+  ulsch_ue->pusch_pdu.qam_mod_order = mod_order;
   unsigned char *test_input = harq_process_ul_ue->a;
 
   ///////////
@@ -549,7 +546,7 @@ int main(int argc, char **argv)
             }
         */
 
-        if (ulsch_ue->harq_processes[harq_pid]->f[i] == 0)
+        if (harq_process_ul_ue->f[i] == 0)
           modulated_input[i] = 1.0;        ///sqrt(2);  //QPSK
         else
           modulated_input[i] = -1.0;        ///sqrt(2);
@@ -573,7 +570,7 @@ int main(int argc, char **argv)
         else
           channel_output_uncoded[i] = 0;
 
-        if (channel_output_uncoded[i] != ulsch_ue->harq_processes[harq_pid]->f[i])
+        if (channel_output_uncoded[i] != harq_process_ul_ue->f[i])
           errors_bit_uncoded = errors_bit_uncoded + 1;
       }
 /*
@@ -638,7 +635,7 @@ int main(int argc, char **argv)
     printf("\n");
   }
 
-  free_nr_ue_ulsch(&UE->ulsch[0], N_RB_UL, frame_parms);
+  free_nr_ue_ul_harq(UE->ul_harq_processes, NR_MAX_ULSCH_HARQ_PROCESSES, UE->frame_parms.N_RB_UL, UE->frame_parms.nb_antennas_tx);
 
   term_nr_ue_signal(UE, 1);
   free(UE);
diff --git a/openair1/SIMULATION/NR_PHY/ulsim.c b/openair1/SIMULATION/NR_PHY/ulsim.c
index 52b17fa92b..5355f34d65 100644
--- a/openair1/SIMULATION/NR_PHY/ulsim.c
+++ b/openair1/SIMULATION/NR_PHY/ulsim.c
@@ -868,7 +868,7 @@ int main(int argc, char **argv)
 
   nfapi_nr_pusch_pdu_t  *pusch_pdu = &UL_tti_req->pdus_list[0].pusch_pdu;
 
-  NR_UE_ULSCH_t *ulsch_ue = UE->ulsch[0];
+  nr_phy_data_tx_t phy_data = {0};
 
   unsigned char *estimated_output_bit;
   unsigned char *test_input_bit;
@@ -1093,7 +1093,7 @@ int main(int argc, char **argv)
       errors_decoding = 0;
       while (round < max_rounds && crc_status) {
         round_trials[round]++;
-        ulsch_ue->harq_processes[harq_pid]->round = round;
+        UE->ul_harq_processes[harq_pid].round = round;
         rv_index = nr_rv_round_map[round % 4];
 
         UE_proc.nr_slot_tx = slot;
@@ -1178,6 +1178,7 @@ int main(int argc, char **argv)
         scheduled_response.dl_config = NULL;
         scheduled_response.ul_config = &ul_config;
         scheduled_response.tx_request = &tx_req;
+        scheduled_response.phy_data = (void *)&phy_data;
 
         // Config UL TX PDU
         tx_req.slot = slot;
@@ -1232,7 +1233,7 @@ int main(int argc, char **argv)
         // nr_fill_ulsch(gNB,frame,slot,pusch_pdu); // Not needed as its its already filled as apart of "nr_schedule_response(Sched_INFO);"
 
         for (int i = 0; i < (TBS / 8); i++)
-          ulsch_ue->harq_processes[harq_pid]->a[i] = i & 0xff;
+          UE->ul_harq_processes[harq_pid].a[i] = i & 0xff;
         if (input_fd == NULL) {
           // set FAPI parameters for UE, put them in the scheduled response and call
           nr_ue_scheduled_response(&scheduled_response);
@@ -1240,7 +1241,7 @@ int main(int argc, char **argv)
           /////////////////////////phy_procedures_nr_ue_TX///////////////////////
           ///////////
 
-          phy_procedures_nrUE_TX(UE, &UE_proc, gNB_id);
+          phy_procedures_nrUE_TX(UE, &UE_proc, gNB_id, &phy_data);
 
           /* We need to call common sending function to send signal */
           LOG_D(PHY, "Sending Uplink data \n");
@@ -1507,8 +1508,8 @@ int main(int argc, char **argv)
         }
 
         for (i = 0; i < available_bits; i++) {
-          if (((ulsch_ue->harq_processes[harq_pid]->f[i] == 0) && (gNB->pusch_vars[UE_id]->llr[i] <= 0))
-              || ((ulsch_ue->harq_processes[harq_pid]->f[i] == 1) && (gNB->pusch_vars[UE_id]->llr[i] >= 0))) {
+          if (((UE->ul_harq_processes[harq_pid].f[i] == 0) && (gNB->pusch_vars[UE_id]->llr[i] <= 0))
+              || ((UE->ul_harq_processes[harq_pid].f[i] == 1) && (gNB->pusch_vars[UE_id]->llr[i] >= 0))) {
             /*if(errors_scrambling == 0)
               printf("\x1B[34m" "[frame %d][trial %d]\t1st bit in error in unscrambling = %d\n" "\x1B[0m", frame, trial, i);*/
             errors_scrambling[round]++;
@@ -1524,7 +1525,7 @@ int main(int argc, char **argv)
       for (i = 0; i < TBS; i++) {
       
         estimated_output_bit[i] = (ulsch_gNB->harq_processes[harq_pid]->b[i / 8] & (1 << (i & 7))) >> (i & 7);
-        test_input_bit[i] = (ulsch_ue->harq_processes[harq_pid]->b[i / 8] & (1 << (i & 7))) >> (i & 7);
+        test_input_bit[i] = (UE->ul_harq_processes[harq_pid].b[i / 8] & (1 << (i & 7))) >> (i & 7);
       
         if (estimated_output_bit[i] != test_input_bit[i]) {
           /*if(errors_decoding == 0)
@@ -1533,14 +1534,14 @@ int main(int argc, char **argv)
         }
       }
       if (n_trials == 1) {
-        for (int r = 0; r < ulsch_ue->harq_processes[harq_pid]->C; r++)
-          for (int i = 0; i < ulsch_ue->harq_processes[harq_pid]->K >> 3; i++) {
-            if ((ulsch_ue->harq_processes[harq_pid]->c[r][i] ^ ulsch_gNB->harq_processes[harq_pid]->c[r][i]) != 0)
+        for (int r = 0; r < UE->ul_harq_processes[harq_pid].C; r++)
+          for (int i = 0; i < UE->ul_harq_processes[harq_pid].K >> 3; i++) {
+            if ((UE->ul_harq_processes[harq_pid].c[r][i] ^ ulsch_gNB->harq_processes[harq_pid]->c[r][i]) != 0)
               printf("************");
             /*printf("r %d: in[%d] %x, out[%d] %x (%x)\n",r,
-              i,ulsch_ue->harq_processes[harq_pid]->c[r][i],
+              i,UE->ul_harq_processes[harq_pid].c[r][i],
               i,ulsch_gNB->harq_processes[harq_pid]->c[r][i],
-              ulsch_ue->harq_processes[harq_pid]->c[r][i]^ulsch_gNB->harq_processes[harq_pid]->c[r][i]);*/
+              UE->ul_harq_processes[harq_pid].c[r][i]^ulsch_gNB->harq_processes[harq_pid]->c[r][i]);*/
           }
       }
       if (errors_decoding > 0 && error_flag == 0) {
diff --git a/openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c b/openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
index 7f6da1b915..fd90d95191 100644
--- a/openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
+++ b/openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
@@ -1251,7 +1251,7 @@ NR_UE_L2_STATE_t nr_ue_scheduler(nr_downlink_indication_t *dl_info, nr_uplink_in
         }
         pthread_mutex_unlock(&ul_config->mutex_ul_config); // avoid double lock
 
-        fill_scheduled_response(&scheduled_response, NULL, ul_config, &tx_req, mod_id, cc_id, frame_tx, slot_tx, NULL);
+        fill_scheduled_response(&scheduled_response, NULL, ul_config, &tx_req, mod_id, cc_id, frame_tx, slot_tx, ul_info->phy_data);
         if(mac->if_module != NULL && mac->if_module->scheduled_response != NULL){
           LOG_D(NR_MAC,"3# scheduled_response transmitted,%d, %d\n", frame_tx, slot_tx);
           mac->if_module->scheduled_response(&scheduled_response);
diff --git a/openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c b/openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c
index 1559f55a43..b11f751703 100644
--- a/openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c
+++ b/openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c
@@ -1208,7 +1208,6 @@ int nr_ue_dl_indication(nr_downlink_indication_t *dl_info, NR_UL_TIME_ALIGNMENT_
         }
         memset(def_dci_pdu_rel15, 0, sizeof(*def_dci_pdu_rel15));
       }
-      free(dl_info->dci_ind);
       dl_info->dci_ind = NULL;
     }
 

From aebe83e45b5626e1c5a5905ab73b8c329c76b559 Mon Sep 17 00:00:00 2001
From: luis_pereira87 <lpereira@allbesmart.pt>
Date: Tue, 22 Nov 2022 14:08:25 +0000
Subject: [PATCH 27/31] Fix infinite loop in ULSCH scheduler when scheduling
 for multiple UEs

---
 openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
index 38da157a28..f3e1c3d85c 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
@@ -1712,13 +1712,12 @@ void pf_ul(module_id_t module_id,
     while (rbStart + max_rbSize < bwpSize && (rballoc_mask[rbStart + max_rbSize] & slbitmap) == slbitmap)
       max_rbSize++;
 
-    if (rbStart + min_rb >= bwpSize) {
-      LOG_W(NR_MAC, "cannot allocate UL data for RNTI %04x: no resources (rbStart %d, min_rb %d, bwpSize %d)\n",
-	    iterator->UE->rnti,rbStart,min_rb,bwpSize);
+    if (rbStart + min_rb >= bwpSize || max_rbSize < min_rb) {
+      LOG_D(NR_MAC, "cannot allocate UL data for RNTI %04x: no resources (rbStart %d, min_rb %d, bwpSize %d)\n", iterator->UE->rnti, rbStart, min_rb, bwpSize);
+      iterator++;
       continue;
-    }
-    else
-      LOG_D(NR_MAC,"allocating UL data for RNTI %04x (rbStsart %d, min_rb %d, bwpSize %d)\n", iterator->UE->rnti,rbStart,min_rb,bwpSize);
+    } else
+      LOG_D(NR_MAC, "allocating UL data for RNTI %04x (rbStart %d, min_rb %d, max_rbSize %d, bwpSize %d)\n", iterator->UE->rnti, rbStart, min_rb, max_rbSize, bwpSize);
 
     /* Calculate the current scheduling bytes */
     const int B = cmax(sched_ctrl->estimated_ul_buffer - sched_ctrl->sched_ul_bytes, 0);

From 1201364490eee9656dea96500e5bc0f0df673ef4 Mon Sep 17 00:00:00 2001
From: Sagar Arora <sagar.arora@eurecom.fr>
Date: Wed, 23 Nov 2022 13:15:14 +0100
Subject: [PATCH 28/31] Adding node selector for jobs

---
 charts/physims/charts/dlsim.100rb+tm2/templates/job.yaml    | 2 ++
 charts/physims/charts/dlsim.basic/templates/job.yaml        | 2 ++
 charts/physims/charts/ldpctest/templates/job.yaml           | 2 ++
 charts/physims/charts/nr-dlschsim/templates/job.yaml        | 2 ++
 charts/physims/charts/nr-dlsim.basic/templates/job.yaml     | 2 ++
 charts/physims/charts/nr-dlsim.dmrs+ptrs/templates/job.yaml | 2 ++
 charts/physims/charts/nr-dlsim.mcs+mimo/templates/job.yaml  | 2 ++
 charts/physims/charts/nr-dlsim.offset/templates/job.yaml    | 2 ++
 charts/physims/charts/nr-pbchsim.106rb/templates/job.yaml   | 2 ++
 charts/physims/charts/nr-pbchsim.217rb/templates/job.yaml   | 2 ++
 charts/physims/charts/nr-pbchsim.273rb/templates/job.yaml   | 2 ++
 charts/physims/charts/nr-prachsim/templates/job.yaml        | 2 ++
 charts/physims/charts/nr-pucchsim/templates/job.yaml        | 2 ++
 charts/physims/charts/nr-ulschsim/templates/job.yaml        | 2 ++
 charts/physims/charts/nr-ulsim.3gpp/templates/job.yaml      | 2 ++
 charts/physims/charts/nr-ulsim.mimo/templates/job.yaml      | 2 ++
 charts/physims/charts/nr-ulsim.misc/templates/job.yaml      | 2 ++
 charts/physims/charts/nr-ulsim.sc-fdma/templates/job.yaml   | 2 ++
 charts/physims/charts/polartest/templates/job.yaml          | 2 ++
 charts/physims/charts/smallblocktest/templates/job.yaml     | 2 ++
 charts/physims/charts/ulsim/templates/job.yaml              | 2 ++
 charts/physims/values.yaml                                  | 3 +++
 22 files changed, 45 insertions(+)

diff --git a/charts/physims/charts/dlsim.100rb+tm2/templates/job.yaml b/charts/physims/charts/dlsim.100rb+tm2/templates/job.yaml
index 048f7106d8..d42742ffb8 100644
--- a/charts/physims/charts/dlsim.100rb+tm2/templates/job.yaml
+++ b/charts/physims/charts/dlsim.100rb+tm2/templates/job.yaml
@@ -33,3 +33,5 @@ spec:
       schedulerName: default-scheduler
       serviceAccountName: {{ .Values.global.serviceAccountName }}
       terminationGracePeriodSeconds: 30
+      nodeSelector:
+         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
diff --git a/charts/physims/charts/dlsim.basic/templates/job.yaml b/charts/physims/charts/dlsim.basic/templates/job.yaml
index c5f2cb18c8..35e386b890 100644
--- a/charts/physims/charts/dlsim.basic/templates/job.yaml
+++ b/charts/physims/charts/dlsim.basic/templates/job.yaml
@@ -33,3 +33,5 @@ spec:
       schedulerName: default-scheduler
       serviceAccountName: {{ .Values.global.serviceAccountName }} 
       terminationGracePeriodSeconds: 30
+      nodeSelector:
+         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
\ No newline at end of file
diff --git a/charts/physims/charts/ldpctest/templates/job.yaml b/charts/physims/charts/ldpctest/templates/job.yaml
index e4d41ddc36..097c021626 100644
--- a/charts/physims/charts/ldpctest/templates/job.yaml
+++ b/charts/physims/charts/ldpctest/templates/job.yaml
@@ -33,3 +33,5 @@ spec:
       schedulerName: default-scheduler
       serviceAccountName: {{ .Values.global.serviceAccountName }}
       terminationGracePeriodSeconds: 30
+      nodeSelector:
+         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
\ No newline at end of file
diff --git a/charts/physims/charts/nr-dlschsim/templates/job.yaml b/charts/physims/charts/nr-dlschsim/templates/job.yaml
index 6ddeb58252..c696eb906c 100644
--- a/charts/physims/charts/nr-dlschsim/templates/job.yaml
+++ b/charts/physims/charts/nr-dlschsim/templates/job.yaml
@@ -33,3 +33,5 @@ spec:
       schedulerName: default-scheduler
       serviceAccountName: {{ .Values.global.serviceAccountName }}
       terminationGracePeriodSeconds: 30
+      nodeSelector:
+         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
\ No newline at end of file
diff --git a/charts/physims/charts/nr-dlsim.basic/templates/job.yaml b/charts/physims/charts/nr-dlsim.basic/templates/job.yaml
index 6dd5fe2990..46dbbff0fa 100644
--- a/charts/physims/charts/nr-dlsim.basic/templates/job.yaml
+++ b/charts/physims/charts/nr-dlsim.basic/templates/job.yaml
@@ -33,3 +33,5 @@ spec:
       schedulerName: default-scheduler
       serviceAccountName: {{ .Values.global.serviceAccountName }}
       terminationGracePeriodSeconds: 30
+      nodeSelector:
+         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
\ No newline at end of file
diff --git a/charts/physims/charts/nr-dlsim.dmrs+ptrs/templates/job.yaml b/charts/physims/charts/nr-dlsim.dmrs+ptrs/templates/job.yaml
index 7717152ec1..e319ae7b53 100644
--- a/charts/physims/charts/nr-dlsim.dmrs+ptrs/templates/job.yaml
+++ b/charts/physims/charts/nr-dlsim.dmrs+ptrs/templates/job.yaml
@@ -33,3 +33,5 @@ spec:
       schedulerName: default-scheduler
       serviceAccountName: {{ .Values.global.serviceAccountName }}
       terminationGracePeriodSeconds: 30
+      nodeSelector:
+         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
\ No newline at end of file
diff --git a/charts/physims/charts/nr-dlsim.mcs+mimo/templates/job.yaml b/charts/physims/charts/nr-dlsim.mcs+mimo/templates/job.yaml
index 3f273dfd36..0649dc67b3 100644
--- a/charts/physims/charts/nr-dlsim.mcs+mimo/templates/job.yaml
+++ b/charts/physims/charts/nr-dlsim.mcs+mimo/templates/job.yaml
@@ -33,3 +33,5 @@ spec:
       schedulerName: default-scheduler
       serviceAccountName: {{ .Values.global.serviceAccountName }}
       terminationGracePeriodSeconds: 30
+      nodeSelector:
+         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
\ No newline at end of file
diff --git a/charts/physims/charts/nr-dlsim.offset/templates/job.yaml b/charts/physims/charts/nr-dlsim.offset/templates/job.yaml
index 45976568e7..5a88c43ec2 100644
--- a/charts/physims/charts/nr-dlsim.offset/templates/job.yaml
+++ b/charts/physims/charts/nr-dlsim.offset/templates/job.yaml
@@ -33,3 +33,5 @@ spec:
       schedulerName: default-scheduler
       serviceAccountName: {{ .Values.global.serviceAccountName }}
       terminationGracePeriodSeconds: 30
+      nodeSelector:
+         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
\ No newline at end of file
diff --git a/charts/physims/charts/nr-pbchsim.106rb/templates/job.yaml b/charts/physims/charts/nr-pbchsim.106rb/templates/job.yaml
index beb857b358..1af0be82e5 100644
--- a/charts/physims/charts/nr-pbchsim.106rb/templates/job.yaml
+++ b/charts/physims/charts/nr-pbchsim.106rb/templates/job.yaml
@@ -33,3 +33,5 @@ spec:
       schedulerName: default-scheduler
       serviceAccountName: {{ .Values.global.serviceAccountName }}
       terminationGracePeriodSeconds: 30
+      nodeSelector:
+         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
\ No newline at end of file
diff --git a/charts/physims/charts/nr-pbchsim.217rb/templates/job.yaml b/charts/physims/charts/nr-pbchsim.217rb/templates/job.yaml
index c3e0865d50..cad15d1491 100644
--- a/charts/physims/charts/nr-pbchsim.217rb/templates/job.yaml
+++ b/charts/physims/charts/nr-pbchsim.217rb/templates/job.yaml
@@ -33,3 +33,5 @@ spec:
       schedulerName: default-scheduler
       serviceAccountName: {{ .Values.global.serviceAccountName }}
       terminationGracePeriodSeconds: 30
+      nodeSelector:
+         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
\ No newline at end of file
diff --git a/charts/physims/charts/nr-pbchsim.273rb/templates/job.yaml b/charts/physims/charts/nr-pbchsim.273rb/templates/job.yaml
index b5174271d6..65be9e4caa 100644
--- a/charts/physims/charts/nr-pbchsim.273rb/templates/job.yaml
+++ b/charts/physims/charts/nr-pbchsim.273rb/templates/job.yaml
@@ -33,3 +33,5 @@ spec:
       schedulerName: default-scheduler
       serviceAccountName: {{ .Values.global.serviceAccountName }}
       terminationGracePeriodSeconds: 30
+      nodeSelector:
+         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
\ No newline at end of file
diff --git a/charts/physims/charts/nr-prachsim/templates/job.yaml b/charts/physims/charts/nr-prachsim/templates/job.yaml
index a5de457082..872729550a 100644
--- a/charts/physims/charts/nr-prachsim/templates/job.yaml
+++ b/charts/physims/charts/nr-prachsim/templates/job.yaml
@@ -33,3 +33,5 @@ spec:
       schedulerName: default-scheduler
       serviceAccountName: {{ .Values.global.serviceAccountName }}
       terminationGracePeriodSeconds: 30
+      nodeSelector:
+         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
\ No newline at end of file
diff --git a/charts/physims/charts/nr-pucchsim/templates/job.yaml b/charts/physims/charts/nr-pucchsim/templates/job.yaml
index 3146bb5605..a845215eeb 100644
--- a/charts/physims/charts/nr-pucchsim/templates/job.yaml
+++ b/charts/physims/charts/nr-pucchsim/templates/job.yaml
@@ -33,3 +33,5 @@ spec:
       schedulerName: default-scheduler
       serviceAccountName: {{ .Values.global.serviceAccountName }}
       terminationGracePeriodSeconds: 30
+      nodeSelector:
+         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
\ No newline at end of file
diff --git a/charts/physims/charts/nr-ulschsim/templates/job.yaml b/charts/physims/charts/nr-ulschsim/templates/job.yaml
index 5e0e28db0b..2916f0fc12 100644
--- a/charts/physims/charts/nr-ulschsim/templates/job.yaml
+++ b/charts/physims/charts/nr-ulschsim/templates/job.yaml
@@ -33,3 +33,5 @@ spec:
       schedulerName: default-scheduler
       serviceAccountName: {{ .Values.global.serviceAccountName }}
       terminationGracePeriodSeconds: 30
+      nodeSelector:
+         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
\ No newline at end of file
diff --git a/charts/physims/charts/nr-ulsim.3gpp/templates/job.yaml b/charts/physims/charts/nr-ulsim.3gpp/templates/job.yaml
index 8f352db84c..2f8a445589 100644
--- a/charts/physims/charts/nr-ulsim.3gpp/templates/job.yaml
+++ b/charts/physims/charts/nr-ulsim.3gpp/templates/job.yaml
@@ -33,3 +33,5 @@ spec:
       schedulerName: default-scheduler
       serviceAccountName: {{ .Values.global.serviceAccountName }}
       terminationGracePeriodSeconds: 30
+      nodeSelector:
+         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
\ No newline at end of file
diff --git a/charts/physims/charts/nr-ulsim.mimo/templates/job.yaml b/charts/physims/charts/nr-ulsim.mimo/templates/job.yaml
index 143a1f98b0..d385551fcb 100644
--- a/charts/physims/charts/nr-ulsim.mimo/templates/job.yaml
+++ b/charts/physims/charts/nr-ulsim.mimo/templates/job.yaml
@@ -33,3 +33,5 @@ spec:
       schedulerName: default-scheduler
       serviceAccountName: {{ .Values.global.serviceAccountName }}
       terminationGracePeriodSeconds: 30
+      nodeSelector:
+         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
\ No newline at end of file
diff --git a/charts/physims/charts/nr-ulsim.misc/templates/job.yaml b/charts/physims/charts/nr-ulsim.misc/templates/job.yaml
index 161a388361..492baab464 100644
--- a/charts/physims/charts/nr-ulsim.misc/templates/job.yaml
+++ b/charts/physims/charts/nr-ulsim.misc/templates/job.yaml
@@ -33,3 +33,5 @@ spec:
       schedulerName: default-scheduler
       serviceAccountName: {{ .Values.global.serviceAccountName }}
       terminationGracePeriodSeconds: 30
+      nodeSelector:
+         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
\ No newline at end of file
diff --git a/charts/physims/charts/nr-ulsim.sc-fdma/templates/job.yaml b/charts/physims/charts/nr-ulsim.sc-fdma/templates/job.yaml
index 515484e03a..8283c65f5e 100644
--- a/charts/physims/charts/nr-ulsim.sc-fdma/templates/job.yaml
+++ b/charts/physims/charts/nr-ulsim.sc-fdma/templates/job.yaml
@@ -35,3 +35,5 @@ spec:
       schedulerName: default-scheduler
       serviceAccountName: {{ .Values.global.serviceAccountName }}
       terminationGracePeriodSeconds: 30
+      nodeSelector:
+         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
\ No newline at end of file
diff --git a/charts/physims/charts/polartest/templates/job.yaml b/charts/physims/charts/polartest/templates/job.yaml
index c9e23dff34..61e82957ce 100644
--- a/charts/physims/charts/polartest/templates/job.yaml
+++ b/charts/physims/charts/polartest/templates/job.yaml
@@ -33,3 +33,5 @@ spec:
       schedulerName: default-scheduler
       serviceAccountName: {{ .Values.global.serviceAccountName }}
       terminationGracePeriodSeconds: 30
+      nodeSelector:
+         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
\ No newline at end of file
diff --git a/charts/physims/charts/smallblocktest/templates/job.yaml b/charts/physims/charts/smallblocktest/templates/job.yaml
index 99896d5472..f034db3e69 100644
--- a/charts/physims/charts/smallblocktest/templates/job.yaml
+++ b/charts/physims/charts/smallblocktest/templates/job.yaml
@@ -33,3 +33,5 @@ spec:
       schedulerName: default-scheduler
       serviceAccountName: {{ .Values.global.serviceAccountName }}
       terminationGracePeriodSeconds: 30
+      nodeSelector:
+         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
\ No newline at end of file
diff --git a/charts/physims/charts/ulsim/templates/job.yaml b/charts/physims/charts/ulsim/templates/job.yaml
index 24c35468a0..d61d793c3b 100644
--- a/charts/physims/charts/ulsim/templates/job.yaml
+++ b/charts/physims/charts/ulsim/templates/job.yaml
@@ -33,3 +33,5 @@ spec:
       schedulerName: default-scheduler
       serviceAccountName: {{ .Values.global.serviceAccountName }}
       terminationGracePeriodSeconds: 30
+      nodeSelector:
+         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
\ No newline at end of file
diff --git a/charts/physims/values.yaml b/charts/physims/values.yaml
index dd0710dec6..462f8ff59b 100644
--- a/charts/physims/values.yaml
+++ b/charts/physims/values.yaml
@@ -11,3 +11,6 @@ global:
     version: TAG
     # pullPolicy: IfNotPresent or Never or Always
     pullPolicy: Always
+  nodeSelector:
+    worker: "telco"
+

From 8835296fc61b0d4ce13c24101730921b46dd96ac Mon Sep 17 00:00:00 2001
From: Robert Schmidt <robert.schmidt@openairinterface.org>
Date: Mon, 21 Nov 2022 17:25:25 +0100
Subject: [PATCH 29/31] Update README in top-level and docker folder

---
 README.md        | 14 +++++++--
 docker/README.md | 75 ++++++++++++++++++++++++------------------------
 2 files changed, 50 insertions(+), 39 deletions(-)

diff --git a/README.md b/README.md
index 2077b3d20b..c82eff8f36 100644
--- a/README.md
+++ b/README.md
@@ -36,11 +36,20 @@ Please see [NOTICE](NOTICE.md) file for third party software that is included in
  *  [How to build](./doc/BUILD.md)
  *  [How to run the modems](./doc/RUNMODEM.md)
 
+More information and documentation can be found in the [doc folder](./doc).
+Unfortunately, not all information is available there, and information for
+specific sub-systems might be available in the corresponding sub-directories.
+To find all READMEs, this command might be handy:
+
+```
+find . -iname "readme*"
+```
+
 # RAN repository structure #
 
 The OpenAirInterface (OAI) software is composed of the following parts: 
 
-<pre>
+```
 openairinterface5g
 ├── ci-scripts        : Meta-scripts used by the OSA CI process. Contains also configuration files used day-to-day by CI.
 ├── cmake_targets     : Build utilities to compile (simulation, emulation and real-time platforms), and generated build files.
@@ -88,5 +97,6 @@ openairinterface5g
 │   ├── TEST
 │   ├── UDP
 │   └── UTILS
+├── radio             : drivers for various radios such as USRP, AW2S, RFsim, ...
 └── targets           : Top-level wrappers for unitary simulation for PHY channels, system-level emulation (eNB-UE with and without S1), and realtime eNB and UE and RRH GW.
-</pre>
+```
diff --git a/docker/README.md b/docker/README.md
index ace75161df..f3e5be168c 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -30,52 +30,54 @@ For all platforms, the strategy for building docker/podman images is the same:
       *  all packages, compilers, ...
       *  especially UHD is installed 
 *  Then, from the `ran-base` shared image, we create a shared image `ran-build`
-   in which all targets are compiled:
+   into which all targets are compiled.
+*  Then from the `ran-build` shared image, we can build target images for:
    -  eNB
-   -  gNB
+   -  gNB (with UHD)
+   -  gNB (with AW2S), only on RHEL8
    -  lte-UE
    -  nr-UE
-*  Then from the `ran-build` shared image we can build target images for:
-   -  eNB
-   -  gNB
-   -  lte-UE
-   -  nr-UE
-*  These target images will only contain:
+
+   These target images will only contain:
    -  the generated executable (for example `lte-softmodem`)
    -  the generated shared libraries (for example `liboai_usrpdevif.so`)
    -  the needed libraries and packages to run these generated binaries
    -  Some configuration file templates
    -  Some tools (such as `ping`, `ifconfig`)
 
-TO DO:
-
--  Proper entrypoints
--  Proper port exposure
--  ...
+Note that on every push to develop (i.e., typically after integrating merge
+requests), we build all images and push them to [Docker
+Hub](https://hub.docker.com/u/oaisoftwarealliance). To pull them, do
+```
+docker pull oaisoftwarealliance/oai-gnb:develop
+docker pull oaisoftwarealliance/oai-nr-ue:develop
+docker pull oaisoftwarealliance/oai-enb:develop
+docker pull oaisoftwarealliance/oai-lte-ue:develop
+```
+Have a look at [this
+README](../ci-scripts/yaml_files/5g_rfsimulator/README.md) to get some
+information on how to use the images.
 
 # 2. File organization #
 
-Dockerfiles are named with the following naming convention: `Dockerfile.${target}.${OS-version}.${cluster-version}`
+Dockerfiles are named with the following naming convention: `Dockerfile.${target}.${OS-version}`
 
 Targets can be:
 
 -  `base` for an image named `ran-base` (shared image)
--  `ran` for an image named `ran-build` (shared image)
+-  `build` for an image named `ran-build` (shared image)
 -  `eNB` for an image named `oai-enb`
 -  `gNB` for an image named `oai-gnb`
+-  `gNB.aw2s` for an image named `oai-gnb-aw2s`
 -  `lteUE` for an image named `oai-lte-ue`
 -  `nrUE` for an image named `oai-nr-ue`
 
 The currently-supported OS are:
 
-- `rhel8.2` for Red Hat Entreprise Linux
+- `rhel8.2` for Red Hat Entreprise Linux (including images for an OpenShift cluster)
 - `ubuntu18` for Ubuntu 18.04 LTS
 
-The currently-supported cluster version is:
-
-- `rhel8.2.oc4-9`
-
-For more details in build within a Openshift Cluster, see [OpenShift README](../openshift/README.md) for more details.
+For more details regarding the build on an Openshift Cluster, see [OpenShift README](../openshift/README.md).
 
 # 3. Building using `docker` under Ubuntu 18.04 #
 
@@ -87,26 +89,12 @@ For more details in build within a Openshift Cluster, see [OpenShift README](../
 
 ## 3.2. Building the shared images ##
 
-Note: This can be done starting `2020.XX` tag on the `develop` branch, or any branch that includes that tag.
-
 There are two shared images: one that has all dependencies, and a second that compiles all targets (eNB, gNB, [nr]UE).
 
 ```bash
 git clone https://gitlab.eurecom.fr/oai/openairinterface5g.git
 cd openairinterface5g
 git checkout develop
-```
-
-In our Eurecom/OSA environment we need to pass a GIT proxy.
-
-```bash
-docker build --target ran-base --tag ran-base:latest --file docker/Dockerfile.base.ubuntu18 --build-arg NEEDED_GIT_PROXY="http://proxy.eurecom.fr:8080" .
-docker build --target ran-build --tag ran-build:latest --file docker/Dockerfile.build.ubuntu18 --build-arg NEEDED_GIT_PROXY="http://proxy.eurecom.fr:8080" .
-```
-
-if you don't need it, do NOT pass any value:
-
-```bash
 docker build --target ran-base --tag ran-base:latest --file docker/Dockerfile.base.ubuntu18 .
 docker build --target ran-build --tag ran-build:latest --file docker/Dockerfile.build.ubuntu18 .
 ```
@@ -149,11 +137,24 @@ docker image prune --force
 
 # 4. Building using `podman` under Red Hat Entreprise Linux 8.2 #
 
-TODO.
+Analogous to the above steps:
+```
+sudo podman build --target ran-base --tag ran-base:latest --file docker/Dockerfile.base.rhel8.2 .
+sudo podman build --target ran-build --tag ran-build:latest --file docker/Dockerfile.build.rhel8.2 .
+sudo podman build --target oai-enb --tag oai-enb:latest --file docker/Dockerfile.eNB.rhel8.2 .
+```
 
 # 5. Running modems using `docker` under Ubuntu 18.04 #
 
-TODO.
+The easiest is to run them from a `docker-compose` file, which is used by the
+CI to test OAI. Some folders under `ci-scripts/yaml_files` have a README that
+you can follow. For 5G, the easiest is to start with the RFsimulator, as
+described in [this README](../ci-scripts/yaml_files/5g_rfsimulator/README.md)
+(you would of course use your own images instead of downloading them from
+Docker hub).
+
+For an example using a B210, please refer to [this `docker-compose`
+file](../ci-scripts/yaml_files/sa_b200_gnb/docker-compose.yml).
 
 # 6. Running modems using `podman` under Red Hat Entreprise Linux 8.2 #
 

From 7b4021cc12aa19e3ad31d3d1d6fafb52637c1abe Mon Sep 17 00:00:00 2001
From: Robert Schmidt <robert.schmidt@openairinterface.org>
Date: Thu, 24 Nov 2022 10:15:31 +0100
Subject: [PATCH 30/31] Add instructions to run container with custom config

---
 docker/README.md | 53 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/docker/README.md b/docker/README.md
index f3e5be168c..c591ee3d75 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -156,6 +156,59 @@ Docker hub).
 For an example using a B210, please refer to [this `docker-compose`
 file](../ci-scripts/yaml_files/sa_b200_gnb/docker-compose.yml).
 
+It is also possible to mount your own configuration file. The following
+docker-compose file can be used to start a gNB using a B210 and your own
+config, located at `/tmp/gnb.conf`:
+```
+version: '3.8'
+
+services:
+    gnb_mono_tdd:
+        image: oai-gnb:latest
+        privileged: true
+        container_name: sa-b200-gnb
+        environment:
+            USE_VOLUMED_CONF: 'yes'
+            USE_B2XX: 'yes'
+            USE_ADDITIONAL_OPTIONS: --sa -E --continuous-tx
+        volumes:
+            - /dev:/dev
+            - /tmp/gnb.conf:/opt/oai-gnb/etc/mounted.conf
+        networks:
+            public_net:
+                ipv4_address: 192.168.68.194
+        healthcheck:
+            # pgrep does NOT work
+            test: /bin/bash -c "ps aux | grep -v grep | grep -c softmodem"
+            interval: 10s
+            timeout: 5s
+            retries: 5
+
+networks:
+    public_net:
+        name: sa-b200-gnb-net
+        ipam:
+            config:
+                - subnet: 192.168.68.192/26
+        driver_opts:
+            com.docker.network.bridge.name: "sa-gnb-net"
+```
+
+You should also change the `image` to the right image name and tag of the gNB
+you are using. Start like this:
+```
+docker-compose up    # gNB in foreground
+docker-compose up -d # gNB in background
+```
+Stop it like this (in both cases):
+```
+docker-compose down
+```
+
+Note that in the above case, ALL devices are passed into the container (by
+mounting `/dev`), which allows the container to access all devices connected to
+the host!
+
 # 6. Running modems using `podman` under Red Hat Entreprise Linux 8.2 #
 
 TODO.

From 68de3b712a889686ee92ad3952d004759378fdac Mon Sep 17 00:00:00 2001
From: Robert Schmidt <robert.schmidt@openairinterface.org>
Date: Fri, 25 Nov 2022 07:42:16 +0100
Subject: [PATCH 31/31] Check for 5G results in Jenkinsfile of legacy pipeline

---
 ci-scripts/Jenkinsfile-gitlab | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci-scripts/Jenkinsfile-gitlab b/ci-scripts/Jenkinsfile-gitlab
index cc35cb4625..9d95049afb 100644
--- a/ci-scripts/Jenkinsfile-gitlab
+++ b/ci-scripts/Jenkinsfile-gitlab
@@ -332,7 +332,7 @@ pipeline {
                     script {
                       if (doMandatoryTests) {
                         dir ('archives') {
-                            sh "if [ -d rf_sim/test ] || [ -d l2_sim/test ]; then zip -r -qq vm_tests_logs.zip */test ; fi"
+                            sh "if [ -d rf_sim/test ] || [ -d rf5g_sim/test ] || [ -d l2_sim/test ]; then zip -r -qq vm_tests_logs.zip */test ; fi"
                         }
                         if(fileExists('archives/vm_tests_logs.zip')) {
                             archiveArtifacts artifacts: 'archives/vm_tests_logs.zip'