Merge branch 'test_aperiodic_srs' into 'develop'

Activate aperiodic SRS in CI tests

See merge request oai/openairinterface5g!4156

ci-scripts/conf_files/gnb-vnf.sa.band77.162prb.nfapi.4x4.conf

@@ -24,7 +24,7 @@ gNBs =
     pdsch_AntennaPorts_N1 = 2;
     maxMIMO_layers        = 4;
     do_CSIRS              = 1;
-    do_SRS                = "periodic";
+    do_SRS                = "aperiodic";
 
     servingCellConfigCommon = (
     {

ci-scripts/conf_files/gnb-vnf.sa.band78.273prb.aerial.conf

@@ -25,7 +25,7 @@ gNBs =
     pdsch_AntennaPorts_N1 = 2;
     pusch_AntennaPorts    = 2;
     do_CSIRS              = 1;
-    do_SRS                = "periodic";
+    do_SRS                = "aperiodic";
     min_rxtxtime          = 2;
     uess_agg_levels       = [0, 4, 2, 1, 0];
 

ci-scripts/conf_files/gnb-vnf.sa.band78.273prb.aerial.ul-heavy.conf

@@ -26,7 +26,7 @@ gNBs =
     pdsch_AntennaPorts_N1 = 2;
     pusch_AntennaPorts    = 2;
     do_CSIRS              = 1;
-    do_SRS                = "periodic";
+    do_SRS                = "aperiodic";
     min_rxtxtime          = 2;
     force_UL256qam_off    = 1;
     servingCellConfigCommon = (

ci-scripts/conf_files/gnb.sa.band257.u3.66prb.rfsim.conf

@@ -20,7 +20,8 @@ gNBs =
     tr_s_preference     = "local_mac"
 
     ////////// Physical parameters:
-    min_rxtxtime                                              = 6;
+    min_rxtxtime = 6;
+    do_SRS = "aperiodic";
 
     servingCellConfigCommon = (
     {

ci-scripts/conf_files/gnb.sa.band77.162prb.usrpn310.2x2.conf

@@ -25,7 +25,7 @@ gNBs =
     pdsch_AntennaPorts_XP = 2;
     pusch_AntennaPorts    = 2;
     do_CSIRS              = 1;
-    do_SRS                = "periodic";
+    do_SRS                = "aperiodic";
     uess_agg_levels = [4,2,0,0,0];
 
     servingCellConfigCommon = (

executables/nr-oru.c

@@ -1,23 +1,7 @@
 /*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.1  (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- *      contact@openairinterface.org
+ * SPDX-License-Identifier: LicenseRef-CSSL-1.0
  */
+
 #include "common/config/config_userapi.h"
 #include "common/utils/system.h"
 #include "nr-oru.h"

executables/nr-oru.h

@@ -1,23 +1,7 @@
 /*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.1  (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- *      contact@openairinterface.org
+ * SPDX-License-Identifier: LicenseRef-CSSL-1.0
  */
+
 #ifndef __NR_ORU_H__
 #define __NR_ORU_H__
 #include "openair1/PHY/defs_RU.h"

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c

@@ -2367,6 +2367,7 @@ static int collect_ul_candidates(gNB_MAC_INST *mac,
                                  int sched_slot)
 {
   int numUE = 0;
+  bool aperiodic_srs = false;
 
   UE_iterator (UE_list, UE) {
     if (numUE >= max_candidates)
@@ -2456,7 +2457,9 @@ static int collect_ul_candidates(gNB_MAC_INST *mac,
     bool bler_updated = update_bler_stats(&mac->ul_bler, stats, &sched_ctrl->ul_bler_stats, frame);
 
     cand.is_retx = false;
-    cand.sched_srs = verify_aperiodic_srs(mac, sched_slot, k2, &sched_ctrl->aperiodic_srs_trigger, current_BWP);
+    if (!aperiodic_srs)
+      aperiodic_srs = verify_aperiodic_srs(mac, sched_slot, k2, &sched_ctrl->aperiodic_srs_trigger, current_BWP);
+    cand.sched_srs = aperiodic_srs;
     cand.retx_harq_pid = -1;
     cand.sched_inactive = (B == 0 && do_sched);
     cand.pending_bytes = B;