gnb: test mode now operates in two modes: with and without ul phy

Author: frankist

apps/gnb/gnb_appconfig.h

@@ -863,6 +863,10 @@ struct test_mode_ue_appconfig {
   rnti_t rnti = rnti_t::INVALID_RNTI;
   /// Number of test UE(s) to create.
   uint16_t nof_ues = 1;
+  /// \brief Delay, in slots, before the MAC test mode auto-generates the UCI/CRC indication to pass to the scheduler.
+  /// This feature should be avoided if the OFH/UL PHY are operational, otherwise the auto-generated indications
+  /// may interfere with the UL PHY HARQ handling.
+  optional<unsigned> auto_ack_indication_delay;
   /// Whether PDSCH grants are automatically assigned to the test UE.
   bool pdsch_active = true;
   /// Whether PUSCH grants are automatically assigned to the test UE.

apps/gnb/gnb_appconfig_cli11_schema.cpp

@@ -1603,6 +1603,11 @@ static void configure_cli11_test_ue_mode_args(CLI::App& app, test_mode_ue_appcon
   app.add_option("--nof_ues", test_params.nof_ues, "Number of test UE(s) to create.")
       ->capture_default_str()
       ->check(CLI::Range((uint16_t)1, (uint16_t)MAX_NOF_DU_UES));
+  app.add_option("--auto_ack_indication_delay",
+                 test_params.auto_ack_indication_delay,
+                 "Delay before the UL and DL HARQs are automatically ACKed. This feature should only be used if the UL "
+                 "PHY is not operational")
+      ->capture_default_str();
   app.add_option("--pdsch_active", test_params.pdsch_active, "PDSCH enabled")->capture_default_str();
   app.add_option("--pusch_active", test_params.pusch_active, "PUSCH enabled")->capture_default_str();
   app.add_option("--cqi", test_params.cqi, "Channel Quality Information (CQI) to be forwarded to test UE.")

apps/gnb/gnb_du_factory.cpp

@@ -183,16 +183,18 @@ std::vector<std::unique_ptr<du>> srsran::make_gnb_dus(const gnb_appconfig&
 
     // Configure test mode
     if (gnb_cfg.test_mode_cfg.test_ue.rnti != rnti_t::INVALID_RNTI) {
-      du_hi_cfg.test_cfg.test_ue = srs_du::du_test_config::test_ue_config{gnb_cfg.test_mode_cfg.test_ue.rnti,
-                                                                          gnb_cfg.test_mode_cfg.test_ue.nof_ues,
-                                                                          gnb_cfg.test_mode_cfg.test_ue.pdsch_active,
-                                                                          gnb_cfg.test_mode_cfg.test_ue.pusch_active,
-                                                                          gnb_cfg.test_mode_cfg.test_ue.cqi,
-                                                                          gnb_cfg.test_mode_cfg.test_ue.ri,
-                                                                          gnb_cfg.test_mode_cfg.test_ue.pmi,
-                                                                          gnb_cfg.test_mode_cfg.test_ue.i_1_1,
-                                                                          gnb_cfg.test_mode_cfg.test_ue.i_1_3,
-                                                                          gnb_cfg.test_mode_cfg.test_ue.i_2};
+      du_hi_cfg.test_cfg.test_ue =
+          srs_du::du_test_config::test_ue_config{gnb_cfg.test_mode_cfg.test_ue.rnti,
+                                                 gnb_cfg.test_mode_cfg.test_ue.nof_ues,
+                                                 gnb_cfg.test_mode_cfg.test_ue.auto_ack_indication_delay,
+                                                 gnb_cfg.test_mode_cfg.test_ue.pdsch_active,
+                                                 gnb_cfg.test_mode_cfg.test_ue.pusch_active,
+                                                 gnb_cfg.test_mode_cfg.test_ue.cqi,
+                                                 gnb_cfg.test_mode_cfg.test_ue.ri,
+                                                 gnb_cfg.test_mode_cfg.test_ue.pmi,
+                                                 gnb_cfg.test_mode_cfg.test_ue.i_1_1,
+                                                 gnb_cfg.test_mode_cfg.test_ue.i_1_3,
+                                                 gnb_cfg.test_mode_cfg.test_ue.i_2};
     }
     // FAPI configuration.
     du_cfg.fapi.log_level   = gnb_cfg.log_cfg.fapi_level;

include/srsran/du/du_test_config.h

@@ -20,6 +20,7 @@ struct du_test_config {
   struct test_ue_config {
     rnti_t             rnti;
     uint16_t           nof_ues;
+    optional<unsigned> auto_ack_indication_delay;
     bool               pdsch_active;
     bool               pusch_active;
     unsigned           cqi;