e2ap,du: resolving minor error with use of e2 logic in the split_7_2, split_6 and split_8 factories

yagoda · codebot · commit 2f722418f90e · 2024-10-10T14:05:34.000Z
diff --git a/apps/services/e2/e2_metric_connector_manager.h b/apps/services/e2/e2_metric_connector_manager.h
@@ -28,6 +28,8 @@ class e2_metric_connector_manager
     }
   }
 
+  ~e2_metric_connector_manager() = default;
+
   e2_metric_connector_manager(e2_metric_connector_manager&& other) noexcept :
     e2_metric_connectors(std::move(other.e2_metric_connectors))
   {
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
@@ -9,6 +9,7 @@
  */
 
 #include "split6_du_application_unit_impl.h"
+#include "apps/services/e2/e2_metric_connector_manager.h"
 #include "apps/units/flexible_du/du_high/du_high_config_translators.h"
 #include "apps/units/flexible_du/du_high/du_high_config_yaml_writer.h"
 #include "apps/units/flexible_du/fapi/fapi_config_translator.h"
diff --git a/apps/units/flexible_du/split_6/split6_du_factory.cpp b/apps/units/flexible_du/split_6/split6_du_factory.cpp
@@ -9,7 +9,7 @@
  */
 
 #include "split6_du_factory.h"
-#include "apps/services/e2_metric_connector_manager.h"
+#include "apps/services/e2/e2_metric_connector_manager.h"
 #include "apps/services/worker_manager.h"
 #include "apps/units/flexible_du/du_high/du_high_commands.h"
 #include "apps/units/flexible_du/du_high/du_high_config_translators.h"
@@ -19,6 +19,7 @@
 #include "split6_du_unit_config.h"
 #include "srsran/du/du_high_wrapper.h"
 #include "srsran/du/du_high_wrapper_factory.h"
+#include "srsran/e2/e2_du_metrics_connector.h"
 
 using namespace srsran;
 
@@ -60,6 +61,9 @@ du_unit srsran::create_du_split6(const split6_du_unit_config&
                                  std::vector<std::unique_ptr<fapi::fapi_adaptor>> fapi_adaptors)
 {
   du_unit du_cmd_wrapper;
+  du_cmd_wrapper.e2_metric_connectors = std::make_unique<
+      e2_metric_connector_manager<e2_du_metrics_connector, e2_du_metrics_notifier, e2_du_metrics_interface>>(
+      du_unit_cfg.du_high_cfg.config.cells_cfg.size());
 
   const du_high_unit_config& du_hi    = du_unit_cfg.du_high_cfg.config;
   const fapi_unit_config&    fapi_cfg = du_unit_cfg.fapi_cfg;
@@ -88,7 +92,7 @@ du_unit srsran::create_du_split6(const split6_du_unit_config&
                                                          *du_dependencies.json_sink,
                                                          *du_dependencies.metrics_notifier);
 
-    update_du_metrics(du_cmd_wrapper.metrics, std::move(cell_services_cfg.first), tmp_cfg.e2_cfg.enable_du_e2);
+    update_du_metrics(du_cmd_wrapper.metrics, std::move(cell_services_cfg.first), tmp_cfg.e2_cfg.enable_unit_e2);
 
     // Use the commands of the first cell.
     if (i == 0) {
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
@@ -9,6 +9,7 @@
  */
 
 #include "split_7_2_du_application_unit_impl.h"
+#include "apps/services/e2/e2_metric_connector_manager.h"
 #include "apps/units/flexible_du/du_high/du_high_config_translators.h"
 #include "apps/units/flexible_du/du_low/du_low_config_translator.h"
 #include "apps/units/flexible_du/fapi/fapi_config_translator.h"
diff --git a/apps/units/flexible_du/split_7_2/split_7_2_du_factory.cpp b/apps/units/flexible_du/split_7_2/split_7_2_du_factory.cpp
@@ -9,7 +9,7 @@
  */
 
 #include "split_7_2_du_factory.h"
-#include "apps/services/e2_metric_connector_manager.h"
+#include "apps/services/e2/e2_metric_connector_manager.h"
 #include "apps/services/worker_manager.h"
 #include "apps/units/flexible_du/du_high/du_high_commands.h"
 #include "apps/units/flexible_du/du_high/du_high_config_translators.h"
@@ -21,6 +21,7 @@
 #include "split_7_2_du_impl.h"
 #include "srsran/du/du_wrapper.h"
 #include "srsran/du/du_wrapper_factory.h"
+#include "srsran/e2/e2_du_metrics_connector.h"
 #include "srsran/pcap/rlc_pcap.h"
 #include "srsran/ru/ru_dummy_factory.h"
 
@@ -84,6 +85,9 @@ static void update_du_metrics(std::vector<app_services::metrics_config>& flexibl
 du_unit srsran::create_split_7_2_du(const split_7_2_du_unit_config& du_72_cfg, const du_unit_dependencies& dependencies)
 {
   du_unit du_cmd_wrapper;
+  du_cmd_wrapper.e2_metric_connectors = std::make_unique<
+      e2_metric_connector_manager<e2_du_metrics_connector, e2_du_metrics_notifier, e2_du_metrics_interface>>(
+      du_72_cfg.du_high_cfg.config.cells_cfg.size());
 
   const du_high_unit_config& du_hi    = du_72_cfg.du_high_cfg.config;
   const du_low_unit_config&  du_lo    = du_72_cfg.du_low_cfg;
@@ -132,11 +136,11 @@ du_unit srsran::create_split_7_2_du(const split_7_2_du_unit_config& du_72_cfg, c
                                                          *dependencies.mac_p,
                                                          *dependencies.rlc_p,
                                                          *dependencies.e2_client_handler,
-                                                         *dependencies.e2_metric_connectors,
+                                                         *du_cmd_wrapper.e2_metric_connectors,
                                                          *dependencies.json_sink,
                                                          *dependencies.metrics_notifier);
 
-    update_du_metrics(du_cmd_wrapper.metrics, std::move(cell_services_cfg.first), tmp_cfg.e2_cfg.enable_du_e2);
+    update_du_metrics(du_cmd_wrapper.metrics, std::move(cell_services_cfg.first), tmp_cfg.e2_cfg.enable_unit_e2);
 
     // Use the commands of the first cell.
     if (i == 0) {
diff --git a/apps/units/flexible_du/split_7_2/split_7_2_du_factory.h b/apps/units/flexible_du/split_7_2/split_7_2_du_factory.h
@@ -20,7 +20,6 @@ class metrics_notifier;
 }
 
 class e2_connection_client;
-class e2_metric_connector_manager;
 class f1ap_message_notifier;
 class console_helper;
 class metrics_log_helper;
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
@@ -9,6 +9,7 @@
  */
 
 #include "split_8_du_application_unit_impl.h"
+#include "apps/services/e2/e2_metric_connector_manager.h"
 #include "apps/units/flexible_du/du_high/du_high_config_translators.h"
 #include "apps/units/flexible_du/du_low/du_low_config_translator.h"
 #include "apps/units/flexible_du/fapi/fapi_config_translator.h"
diff --git a/apps/units/flexible_du/split_8/split_8_du_factory.cpp b/apps/units/flexible_du/split_8/split_8_du_factory.cpp
@@ -9,7 +9,7 @@
  */
 
 #include "split_8_du_factory.h"
-#include "apps/services/e2_metric_connector_manager.h"
+#include "apps/services/e2/e2_metric_connector_manager.h"
 #include "apps/services/worker_manager.h"
 #include "apps/units/flexible_du/du_high/du_high_commands.h"
 #include "apps/units/flexible_du/du_high/du_high_config_translators.h"
@@ -21,6 +21,7 @@
 #include "split_8_du_impl.h"
 #include "srsran/du/du_wrapper.h"
 #include "srsran/du/du_wrapper_factory.h"
+#include "srsran/e2/e2_du_metrics_connector.h"
 #include "srsran/pcap/rlc_pcap.h"
 #include "srsran/ru/ru_dummy_factory.h"
 
@@ -84,6 +85,9 @@ static void update_du_metrics(std::vector<app_services::metrics_config>& flexibl
 du_unit srsran::create_split_8_du(const split_8_du_unit_config& du_8_cfg, const du_unit_dependencies& dependencies)
 {
   du_unit du_cmd_wrapper;
+  du_cmd_wrapper.e2_metric_connectors = std::make_unique<
+      e2_metric_connector_manager<e2_du_metrics_connector, e2_du_metrics_notifier, e2_du_metrics_interface>>(
+      du_8_cfg.du_high_cfg.config.cells_cfg.size());
 
   const du_high_unit_config& du_hi    = du_8_cfg.du_high_cfg.config;
   const du_low_unit_config&  du_lo    = du_8_cfg.du_low_cfg;
@@ -132,11 +136,11 @@ du_unit srsran::create_split_8_du(const split_8_du_unit_config& du_8_cfg, const
                                                          *dependencies.mac_p,
                                                          *dependencies.rlc_p,
                                                          *dependencies.e2_client_handler,
-                                                         *dependencies.e2_metric_connectors,
+                                                         *du_cmd_wrapper.e2_metric_connectors,
                                                          *dependencies.json_sink,
                                                          *dependencies.metrics_notifier);
 
-    update_du_metrics(du_cmd_wrapper.metrics, std::move(cell_services_cfg.first), tmp_cfg.e2_cfg.enable_du_e2);
+    update_du_metrics(du_cmd_wrapper.metrics, std::move(cell_services_cfg.first), tmp_cfg.e2_cfg.enable_unit_e2);
 
     // Use the commands of the first cell.
     if (i == 0) {
diff --git a/apps/units/flexible_du/split_8/split_8_du_factory.h b/apps/units/flexible_du/split_8/split_8_du_factory.h
@@ -20,7 +20,6 @@ class metrics_notifier;
 }
 
 class e2_connection_client;
-class e2_metric_connector_manager;
 class f1ap_message_notifier;
 class console_helper;
 class metrics_log_helper;

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,8 @@ class e2_metric_connector_manager`
`28`	`28`	`}`
`29`	`29`	`}`
`30`	`30`
	`31`	`+ ~e2_metric_connector_manager() = default;`
	`32`	`+`
`31`	`33`	`e2_metric_connector_manager(e2_metric_connector_manager&& other) noexcept :`
`32`	`34`	`e2_metric_connectors(std::move(other.e2_metric_connectors))`
`33`	`35`	`{`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,6 @@ class metrics_notifier;`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`class e2_connection_client;`
`23`		`-class e2_metric_connector_manager;`
`24`	`23`	`class f1ap_message_notifier;`
`25`	`24`	`class console_helper;`
`26`	`25`	`class metrics_log_helper;`