e2sm_kpm: change function names

srsgnb/hdr/stack/ric/e2sm_kpm.h

@@ -46,8 +46,8 @@ public:
   virtual void receive_e2_metrics_callback(const enb_metrics_t& m);
 
   bool _get_meas_definition(std::string meas_name, E2SM_KPM_metric_t& def);
-  bool _extract_last_integer_type_meas_value(E2SM_KPM_meas_value_t& meas_value, const enb_metrics_t& enb_metrics);
+  bool _extract_integer_type_meas_value(E2SM_KPM_meas_value_t& meas_value, const enb_metrics_t& enb_metrics);
-  bool _extract_last_real_type_meas_value(E2SM_KPM_meas_value_t& meas_value, const enb_metrics_t& enb_metrics);
+  bool _extract_real_type_meas_value(E2SM_KPM_meas_value_t& meas_value, const enb_metrics_t& enb_metrics);
   srslog::basic_logger& logger;
 
 private:

srsgnb/src/stack/ric/e2sm_kpm.cc

@@ -299,7 +299,7 @@ void e2sm_kpm::receive_e2_metrics_callback(const enb_metrics_t& m)
   }
 }
 
-bool e2sm_kpm::_extract_last_integer_type_meas_value(E2SM_KPM_meas_value_t& meas_value,
+bool e2sm_kpm::_extract_integer_type_meas_value(E2SM_KPM_meas_value_t& meas_value,
                                                      const enb_metrics_t&   enb_metrics)
 {
   // TODO: maybe add ID to metric types in e2sm_kpm_metrics definitions, so we do not have to compare strings?
@@ -332,7 +332,7 @@ bool e2sm_kpm::_extract_last_integer_type_meas_value(E2SM_KPM_meas_value_t& meas
   return false;
 }
 
-bool e2sm_kpm::_extract_last_real_type_meas_value(E2SM_KPM_meas_value_t& meas_value, const enb_metrics_t& enb_metrics)
+bool e2sm_kpm::_extract_real_type_meas_value(E2SM_KPM_meas_value_t& meas_value, const enb_metrics_t& enb_metrics)
 {
   // all real type measurements
   // cpu0_load: no_label

srsgnb/src/stack/ric/e2sm_kpm_report_service.cc

@@ -310,13 +310,13 @@ bool e2sm_kpm_report_service_style1::collect_data(const enb_metrics_t& enb_metri
       meas_value.data_type = data_type;
 
       if (meas_value.data_type == meas_record_item_c::types::options::integer) {
-        if (not parent->_extract_last_integer_type_meas_value(meas_value, enb_metrics)) {
+        if (not parent->_extract_integer_type_meas_value(meas_value, enb_metrics)) {
           parent->logger.info("Cannot extract value \"%s\" label: %i", meas_name.c_str(), label);
           return false;
         }
       } else {
         // data_type == meas_record_item_c::types::options::real;
-        if (not parent->_extract_last_real_type_meas_value(meas_value, enb_metrics)) {
+        if (not parent->_extract_real_type_meas_value(meas_value, enb_metrics)) {
           parent->logger.info("Cannot extract value \"%s\" label %i", meas_name.c_str(), label);
           return false;
         }