app_units: pass the application name in construction to set the PCAPS paths

AlaiaL · AlaiaL · commit 749e4f6eb17f · 2024-10-01T12:14:14.000+02:00
diff --git a/apps/cu/cu.cpp b/apps/cu/cu.cpp
@@ -184,12 +184,10 @@ int main(int argc, char** argv)
   cu_appconfig cu_cfg;
   configure_cli11_with_cu_appconfig_schema(app, cu_cfg);
 
-  auto cu_cp_app_unit = create_cu_cp_application_unit();
-  cu_cp_app_unit->get_cu_cp_unit_config().pcap_cfg.set_default_filename("/tmp/cu");
+  auto cu_cp_app_unit = create_cu_cp_application_unit("cu");
   cu_cp_app_unit->on_parsing_configuration_registration(app);
 
-  auto cu_up_app_unit = create_cu_up_application_unit();
-  cu_up_app_unit->get_cu_up_unit_config().pcap_cfg.set_default_filename("/tmp/cu");
+  auto cu_up_app_unit = create_cu_up_application_unit("cu");
   cu_up_app_unit->on_parsing_configuration_registration(app);
 
   // Set the callback for the app calling all the autoderivation functions.
diff --git a/apps/du/du.cpp b/apps/du/du.cpp
@@ -165,8 +165,7 @@ int main(int argc, char** argv)
   // Configure CLI11 with the DU application configuration schema.
   configure_cli11_with_du_appconfig_schema(app, du_cfg);
 
-  auto du_app_unit = create_flexible_du_application_unit();
-  du_app_unit->get_du_high_unit_config().pcaps.set_default_filename("/tmp/du");
+  auto du_app_unit = create_flexible_du_application_unit("du");
   du_app_unit->on_parsing_configuration_registration(app);
 
   // Set the callback for the app calling all the autoderivation functions.
diff --git a/apps/gnb/gnb.cpp b/apps/gnb/gnb.cpp
@@ -209,16 +209,13 @@ int main(int argc, char** argv)
   // Configure CLI11 with the gNB application configuration schema.
   configure_cli11_with_gnb_appconfig_schema(app, gnb_cfg);
 
-  auto cu_cp_app_unit = create_cu_cp_application_unit();
-  cu_cp_app_unit->get_cu_cp_unit_config().pcap_cfg.set_default_filename("/tmp/gnb");
+  auto cu_cp_app_unit = create_cu_cp_application_unit("gnb");
   cu_cp_app_unit->on_parsing_configuration_registration(app);
 
-  auto cu_up_app_unit = create_cu_up_application_unit();
-  cu_up_app_unit->get_cu_up_unit_config().pcap_cfg.set_default_filename("/tmp/gnb");
+  auto cu_up_app_unit = create_cu_up_application_unit("gnb");
   cu_up_app_unit->on_parsing_configuration_registration(app);
 
-  auto du_app_unit = create_flexible_du_application_unit();
-  du_app_unit->get_du_high_unit_config().pcaps.set_default_filename("/tmp/gnb");
+  auto du_app_unit = create_flexible_du_application_unit("gnb");
   du_app_unit->on_parsing_configuration_registration(app);
 
   // Set the callback for the app calling all the autoderivation functions.
diff --git a/apps/units/cu_cp/cu_cp_application_unit.h b/apps/units/cu_cp/cu_cp_application_unit.h
@@ -38,6 +38,6 @@ class cu_cp_application_unit : public application_unit
 };
 
 /// Creates a CU-CP application unit.
-std::unique_ptr<cu_cp_application_unit> create_cu_cp_application_unit();
+std::unique_ptr<cu_cp_application_unit> create_cu_cp_application_unit(std::string_view app_name);
 
 } // namespace srsran
diff --git a/apps/units/cu_cp/cu_cp_application_unit_impl.cpp b/apps/units/cu_cp/cu_cp_application_unit_impl.cpp
@@ -18,6 +18,13 @@
 
 using namespace srsran;
 
+cu_cp_application_unit_impl::cu_cp_application_unit_impl(std::string_view app_name)
+{
+  unit_cfg.pcap_cfg.ngap.filename = fmt::format("/tmp/{}_ngap.pcap", app_name);
+  unit_cfg.pcap_cfg.e1ap.filename = fmt::format("/tmp/{}_e1ap.pcap", app_name);
+  unit_cfg.pcap_cfg.f1ap.filename = fmt::format("/tmp/{}_f1ap.pcap", app_name);
+}
+
 void cu_cp_application_unit_impl::on_parsing_configuration_registration(CLI::App& app)
 {
   configure_cli11_with_cu_cp_unit_config_schema(app, unit_cfg);
@@ -53,7 +60,7 @@ void cu_cp_application_unit_impl::fill_worker_manager_config(worker_manager_conf
   fill_cu_cp_worker_manager_config(config, unit_cfg);
 }
 
-std::unique_ptr<cu_cp_application_unit> srsran::create_cu_cp_application_unit()
+std::unique_ptr<cu_cp_application_unit> srsran::create_cu_cp_application_unit(std::string_view app_name)
 {
-  return std::make_unique<cu_cp_application_unit_impl>();
+  return std::make_unique<cu_cp_application_unit_impl>(app_name);
 }
diff --git a/apps/units/cu_cp/cu_cp_application_unit_impl.h b/apps/units/cu_cp/cu_cp_application_unit_impl.h
@@ -19,6 +19,8 @@ namespace srsran {
 class cu_cp_application_unit_impl : public cu_cp_application_unit
 {
 public:
+  explicit cu_cp_application_unit_impl(std::string_view app_name);
+
   // See interface for documentation.
   void on_parsing_configuration_registration(CLI::App& app) override;
 
diff --git a/apps/units/cu_cp/cu_cp_unit_pcap_config.h b/apps/units/cu_cp/cu_cp_unit_pcap_config.h
@@ -10,7 +10,6 @@
 
 #pragma once
 
-#include "fmt/core.h"
 #include <string>
 
 namespace srsran {
@@ -29,15 +28,6 @@ struct cu_cp_unit_pcap_config {
     std::string filename = "/tmp/cu_f1ap.pcap";
     bool        enabled  = false;
   } f1ap;
-
-  /// helper method to set the filename prefix for different apps.
-  /// This is used to provide different defaults depending on the app,
-  /// e.g.: "/tmp/gnb_e1ap.pcap" or "/tmp/cu_e1ap.pcap"
-  void set_default_filename(std::string prefix)
-  {
-    ngap.filename = fmt::format("{}_ngap.pcap", prefix);
-    e1ap.filename = fmt::format("{}_e1ap.pcap", prefix);
-    f1ap.filename = fmt::format("{}_f1ap.pcap", prefix);
-  }
 };
+
 } // namespace srsran
diff --git a/apps/units/cu_up/cu_up_application_unit.h b/apps/units/cu_up/cu_up_application_unit.h
@@ -39,6 +39,6 @@ class cu_up_application_unit : public application_unit
 };
 
 /// Creates a CU-UP application unit.
-std::unique_ptr<cu_up_application_unit> create_cu_up_application_unit();
+std::unique_ptr<cu_up_application_unit> create_cu_up_application_unit(std::string_view app_name);
 
 } // namespace srsran
diff --git a/apps/units/cu_up/cu_up_application_unit_impl.cpp b/apps/units/cu_up/cu_up_application_unit_impl.cpp
@@ -18,6 +18,13 @@
 
 using namespace srsran;
 
+cu_up_application_unit_impl::cu_up_application_unit_impl(std::string_view app_name)
+{
+  unit_cfg.pcap_cfg.n3.filename   = fmt::format("/tmp/{}_n3.pcap", app_name);
+  unit_cfg.pcap_cfg.f1u.filename  = fmt::format("/tmp/{}_f1u.pcap", app_name);
+  unit_cfg.pcap_cfg.e1ap.filename = fmt::format("/tmp/{}_e1ap.pcap", app_name);
+}
+
 void cu_up_application_unit_impl::on_parsing_configuration_registration(CLI::App& app)
 {
   configure_cli11_with_cu_up_unit_config_schema(app, unit_cfg);
@@ -49,7 +56,7 @@ void cu_up_application_unit_impl::fill_worker_manager_config(worker_manager_conf
   fill_cu_up_worker_manager_config(config, unit_cfg);
 }
 
-std::unique_ptr<cu_up_application_unit> srsran::create_cu_up_application_unit()
+std::unique_ptr<cu_up_application_unit> srsran::create_cu_up_application_unit(std::string_view app_name)
 {
-  return std::make_unique<cu_up_application_unit_impl>();
+  return std::make_unique<cu_up_application_unit_impl>(app_name);
 }
diff --git a/apps/units/cu_up/cu_up_application_unit_impl.h b/apps/units/cu_up/cu_up_application_unit_impl.h
@@ -19,6 +19,8 @@ namespace srsran {
 class cu_up_application_unit_impl : public cu_up_application_unit
 {
 public:
+  explicit cu_up_application_unit_impl(std::string_view app_name);
+
   // See interface for documentation.
   void on_parsing_configuration_registration(CLI::App& app) override;
 
diff --git a/apps/units/cu_up/cu_up_unit_pcap_config.h b/apps/units/cu_up/cu_up_unit_pcap_config.h
@@ -10,7 +10,6 @@
 
 #pragma once
 
-#include "fmt/core.h"
 #include <string>
 
 namespace srsran {
@@ -30,15 +29,6 @@ struct cu_up_unit_pcap_config {
     bool        enabled = false;
   } e1ap;
 
-  /// helper method to set the filename prefix for different apps.
-  /// This is used to provide different defaults depending on the app,
-  /// e.g.: "/tmp/gnb_e1ap.pcap" or "/tmp/cu_e1ap.pcap"
-  void set_default_filename(std::string prefix)
-  {
-    n3.filename   = fmt::format("{}_n3.pcap", prefix);
-    f1u.filename  = fmt::format("{}_f1u.pcap", prefix);
-    e1ap.filename = fmt::format("{}_e1ap.pcap", prefix);
-  }
   /// When using the gNB app, there is no point in instantiating
   /// E1 pcaps twice. This function force disables them in the CU-UP.
   /// TODO: revisit
diff --git a/apps/units/flexible_du/du_high/du_high_config.h b/apps/units/flexible_du/du_high/du_high_config.h
@@ -672,17 +672,7 @@ struct du_high_unit_pcap_config {
     std::string type    = "udp";
     bool        enabled = false;
   } mac;
-  /// helper method to set the filename prefix for different apps.
-  /// This is used to provide different defaults depending on the app,
-  /// e.g.: "/tmp/gnb_f1ap.pcap", "/tmp/cu_f1ap.pcap" or "/tmp/du_f1ap.pcap"
-  void set_default_filename(std::string prefix)
-  {
-    e2ap.filename = fmt::format("{}_e2ap.pcap", prefix);
-    f1ap.filename = fmt::format("{}_f1ap.pcap", prefix);
-    f1u.filename  = fmt::format("{}_f1u.pcap", prefix);
-    rlc.filename  = fmt::format("{}_rlc.pcap", prefix);
-    mac.filename  = fmt::format("{}_mac.pcap", prefix);
-  }
+
   /// When using the gNB app, there is no point in instantiating
   /// F1 pcaps twice. This function force disables them.
   /// TODO: revisit
diff --git a/apps/units/flexible_du/flexible_du_application_unit.h b/apps/units/flexible_du/flexible_du_application_unit.h
@@ -43,6 +43,6 @@ class flexible_du_application_unit : public application_unit
 /// Different splits must provide an implementation of this free function so the applications can instantiate a flexible
 /// DU application unit. Only one of these implementations should be compiled, based on the DU_SPLIT_TYPE cmake
 /// definition.
-std::unique_ptr<flexible_du_application_unit> create_flexible_du_application_unit();
+std::unique_ptr<flexible_du_application_unit> create_flexible_du_application_unit(std::string_view app_name);
 
 } // namespace srsran
diff --git a/apps/units/flexible_du/split_6/split6_du_application_unit_impl.cpp b/apps/units/flexible_du/split_6/split6_du_application_unit_impl.cpp
@@ -20,6 +20,15 @@
 
 using namespace srsran;
 
+split6_du_application_unit_impl::split6_du_application_unit_impl(std::string_view app_name)
+{
+  unit_cfg.du_high_cfg.config.pcaps.e2ap.filename = fmt::format("/tmp/{}_e2ap.pcap", app_name);
+  unit_cfg.du_high_cfg.config.pcaps.f1ap.filename = fmt::format("/tmp/{}_f1ap.pcap", app_name);
+  unit_cfg.du_high_cfg.config.pcaps.f1u.filename  = fmt::format("/tmp/{}_f1u.pcap", app_name);
+  unit_cfg.du_high_cfg.config.pcaps.rlc.filename  = fmt::format("/tmp/{}_rlc.pcap", app_name);
+  unit_cfg.du_high_cfg.config.pcaps.mac.filename  = fmt::format("/tmp/{}_mac.pcap", app_name);
+}
+
 void split6_du_application_unit_impl::on_loggers_registration()
 {
   register_split6_du_loggers(unit_cfg);
diff --git a/apps/units/flexible_du/split_6/split6_du_application_unit_impl.h b/apps/units/flexible_du/split_6/split6_du_application_unit_impl.h
@@ -20,6 +20,8 @@ namespace srsran {
 class split6_du_application_unit_impl : public flexible_du_application_unit
 {
 public:
+  explicit split6_du_application_unit_impl(std::string_view app_name);
+
   // See interface for documentation.
   void on_parsing_configuration_registration(CLI::App& app) override;
 
diff --git a/apps/units/flexible_du/split_7_2/split_7_2_du_application_unit_impl.cpp b/apps/units/flexible_du/split_7_2/split_7_2_du_application_unit_impl.cpp
@@ -37,6 +37,15 @@ bool split_7_2_du_application_unit_impl::on_configuration_validation(
   return validate_split_7_2_du_unit_config(unit_cfg, available_cpus);
 }
 
+split_7_2_du_application_unit_impl::split_7_2_du_application_unit_impl(std::string_view app_name)
+{
+  unit_cfg.du_high_cfg.config.pcaps.e2ap.filename = fmt::format("/tmp/{}_e2ap.pcap", app_name);
+  unit_cfg.du_high_cfg.config.pcaps.f1ap.filename = fmt::format("/tmp/{}_f1ap.pcap", app_name);
+  unit_cfg.du_high_cfg.config.pcaps.f1u.filename  = fmt::format("/tmp/{}_f1u.pcap", app_name);
+  unit_cfg.du_high_cfg.config.pcaps.rlc.filename  = fmt::format("/tmp/{}_rlc.pcap", app_name);
+  unit_cfg.du_high_cfg.config.pcaps.mac.filename  = fmt::format("/tmp/{}_mac.pcap", app_name);
+}
+
 void split_7_2_du_application_unit_impl::on_parsing_configuration_registration(CLI::App& app)
 {
   configure_cli11_with_split_7_2_du_unit_config_schema(app, unit_cfg);
@@ -47,9 +56,9 @@ du_unit split_7_2_du_application_unit_impl::create_flexible_du_unit(const du_uni
   return create_split_7_2_du(unit_cfg, dependencies);
 }
 
-std::unique_ptr<flexible_du_application_unit> srsran::create_flexible_du_application_unit()
+std::unique_ptr<flexible_du_application_unit> srsran::create_flexible_du_application_unit(std::string_view app_name)
 {
-  return std::make_unique<split_7_2_du_application_unit_impl>();
+  return std::make_unique<split_7_2_du_application_unit_impl>(app_name);
 }
 
 void split_7_2_du_application_unit_impl::dump_config(YAML::Node& node) const
diff --git a/apps/units/flexible_du/split_7_2/split_7_2_du_application_unit_impl.h b/apps/units/flexible_du/split_7_2/split_7_2_du_application_unit_impl.h
@@ -19,6 +19,8 @@ namespace srsran {
 class split_7_2_du_application_unit_impl : public flexible_du_application_unit
 {
 public:
+  explicit split_7_2_du_application_unit_impl(std::string_view app_name);
+
   // See interface for documentation.
   void on_parsing_configuration_registration(CLI::App& app) override;
 
diff --git a/apps/units/flexible_du/split_8/split_8_du_application_unit_impl.cpp b/apps/units/flexible_du/split_8/split_8_du_application_unit_impl.cpp
@@ -37,6 +37,15 @@ bool split_8_du_application_unit_impl::on_configuration_validation(
   return validate_split_8_du_unit_config(unit_cfg, available_cpus);
 }
 
+split_8_du_application_unit_impl::split_8_du_application_unit_impl(std::string_view app_name)
+{
+  unit_cfg.du_high_cfg.config.pcaps.e2ap.filename = fmt::format("/tmp/{}_e2ap.pcap", app_name);
+  unit_cfg.du_high_cfg.config.pcaps.f1ap.filename = fmt::format("/tmp/{}_f1ap.pcap", app_name);
+  unit_cfg.du_high_cfg.config.pcaps.f1u.filename  = fmt::format("/tmp/{}_f1u.pcap", app_name);
+  unit_cfg.du_high_cfg.config.pcaps.rlc.filename  = fmt::format("/tmp/{}_rlc.pcap", app_name);
+  unit_cfg.du_high_cfg.config.pcaps.mac.filename  = fmt::format("/tmp/{}_mac.pcap", app_name);
+}
+
 void split_8_du_application_unit_impl::on_parsing_configuration_registration(CLI::App& app)
 {
   configure_cli11_with_split_8_du_unit_config_schema(app, unit_cfg);
@@ -47,9 +56,9 @@ du_unit split_8_du_application_unit_impl::create_flexible_du_unit(const du_unit_
   return create_split_8_du(unit_cfg, dependencies);
 }
 
-std::unique_ptr<flexible_du_application_unit> srsran::create_flexible_du_application_unit()
+std::unique_ptr<flexible_du_application_unit> srsran::create_flexible_du_application_unit(std::string_view app_name)
 {
-  return std::make_unique<split_8_du_application_unit_impl>();
+  return std::make_unique<split_8_du_application_unit_impl>(app_name);
 }
 
 void split_8_du_application_unit_impl::dump_config(YAML::Node& node) const
diff --git a/apps/units/flexible_du/split_8/split_8_du_application_unit_impl.h b/apps/units/flexible_du/split_8/split_8_du_application_unit_impl.h
@@ -19,6 +19,8 @@ namespace srsran {
 class split_8_du_application_unit_impl : public flexible_du_application_unit
 {
 public:
+  explicit split_8_du_application_unit_impl(std::string_view app_name);
+
   // See interface for documentation.
   void on_parsing_configuration_registration(CLI::App& app) override;
 
diff --git a/apps/units/flexible_du/split_dynamic/dynamic_du_application_unit_impl.cpp b/apps/units/flexible_du/split_dynamic/dynamic_du_application_unit_impl.cpp
@@ -34,6 +34,15 @@ bool dynamic_du_application_unit_impl::on_configuration_validation(
   return validate_dynamic_du_unit_config(unit_cfg, available_cpus);
 }
 
+dynamic_du_application_unit_impl::dynamic_du_application_unit_impl(std::string_view app_name)
+{
+  unit_cfg.du_high_cfg.config.pcaps.e2ap.filename = fmt::format("/tmp/{}_e2ap.pcap", app_name);
+  unit_cfg.du_high_cfg.config.pcaps.f1ap.filename = fmt::format("/tmp/{}_f1ap.pcap", app_name);
+  unit_cfg.du_high_cfg.config.pcaps.f1u.filename  = fmt::format("/tmp/{}_f1u.pcap", app_name);
+  unit_cfg.du_high_cfg.config.pcaps.rlc.filename  = fmt::format("/tmp/{}_rlc.pcap", app_name);
+  unit_cfg.du_high_cfg.config.pcaps.mac.filename  = fmt::format("/tmp/{}_mac.pcap", app_name);
+}
+
 void dynamic_du_application_unit_impl::on_parsing_configuration_registration(CLI::App& app)
 {
   configure_cli11_with_dynamic_du_unit_config_schema(app, unit_cfg);
@@ -44,9 +53,9 @@ du_unit dynamic_du_application_unit_impl::create_flexible_du_unit(const du_unit_
   return create_dynamic_du(unit_cfg, dependencies);
 }
 
-std::unique_ptr<flexible_du_application_unit> srsran::create_flexible_du_application_unit()
+std::unique_ptr<flexible_du_application_unit> srsran::create_flexible_du_application_unit(std::string_view app_name)
 {
-  return std::make_unique<dynamic_du_application_unit_impl>();
+  return std::make_unique<dynamic_du_application_unit_impl>(app_name);
 }
 
 void dynamic_du_application_unit_impl::dump_config(YAML::Node& node) const
diff --git a/apps/units/flexible_du/split_dynamic/dynamic_du_application_unit_impl.h b/apps/units/flexible_du/split_dynamic/dynamic_du_application_unit_impl.h
@@ -21,6 +21,8 @@ namespace srsran {
 class dynamic_du_application_unit_impl : public flexible_du_application_unit
 {
 public:
+  explicit dynamic_du_application_unit_impl(std::string_view app_name);
+
   // See interface for documentation.
   void on_parsing_configuration_registration(CLI::App& app) override;
 

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,13 @@`
`18`	`18`
`19`	`19`	`using namespace srsran;`
`20`	`20`
	`21`	`+cu_cp_application_unit_impl::cu_cp_application_unit_impl(std::string_view app_name)`
	`22`	`+{`
	`23`	`+ unit_cfg.pcap_cfg.ngap.filename = fmt::format("/tmp/{}_ngap.pcap", app_name);`
	`24`	`+ unit_cfg.pcap_cfg.e1ap.filename = fmt::format("/tmp/{}_e1ap.pcap", app_name);`
	`25`	`+ unit_cfg.pcap_cfg.f1ap.filename = fmt::format("/tmp/{}_f1ap.pcap", app_name);`
	`26`	`+}`
	`27`	`+`
`21`	`28`	`void cu_cp_application_unit_impl::on_parsing_configuration_registration(CLI::App& app)`
`22`	`29`	`{`
`23`	`30`	`configure_cli11_with_cu_cp_unit_config_schema(app, unit_cfg);`
`@@ -53,7 +60,7 @@ void cu_cp_application_unit_impl::fill_worker_manager_config(worker_manager_conf`
`53`	`60`	`fill_cu_cp_worker_manager_config(config, unit_cfg);`
`54`	`61`	`}`
`55`	`62`
`56`		`-std::unique_ptr<cu_cp_application_unit> srsran::create_cu_cp_application_unit()`
	`63`	`+std::unique_ptr<cu_cp_application_unit> srsran::create_cu_cp_application_unit(std::string_view app_name)`
`57`	`64`	`{`
`58`		`- return std::make_unique<cu_cp_application_unit_impl>();`
	`65`	`+ return std::make_unique<cu_cp_application_unit_impl>(app_name);`
`59`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,8 @@ namespace srsran {`
`19`	`19`	`class cu_cp_application_unit_impl : public cu_cp_application_unit`
`20`	`20`	`{`
`21`	`21`	`public:`
	`22`	`+ explicit cu_cp_application_unit_impl(std::string_view app_name);`
	`23`	`+`
`22`	`24`	`// See interface for documentation.`
`23`	`25`	`void on_parsing_configuration_registration(CLI::App& app) override;`
`24`	`26`