From 2fd3ed789a6f84498593a9849e3c8ba432fc2f21 Mon Sep 17 00:00:00 2001 From: faluco Date: Tue, 7 Sep 2021 10:32:38 +0200 Subject: [PATCH] Rename sector_id to carrier_id JSON key in enb metrics and events. --- lib/src/common/enb_events.cc | 38 ++++++++++++++++++------------------ srsenb/src/metrics_json.cc | 6 +++--- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/lib/src/common/enb_events.cc b/lib/src/common/enb_events.cc index 642ea906f..cfbe25697 100644 --- a/lib/src/common/enb_events.cc +++ b/lib/src/common/enb_events.cc @@ -69,7 +69,7 @@ namespace { /// Common metrics to all events. DECLARE_METRIC("type", metric_type_tag, std::string, ""); DECLARE_METRIC("timestamp", metric_timestamp_tag, double, ""); -DECLARE_METRIC("sector_id", metric_sector_id, uint32_t, ""); +DECLARE_METRIC("carrier_id", metric_carrier_id, uint32_t, ""); DECLARE_METRIC("cell_id", metric_cell_id, uint32_t, ""); DECLARE_METRIC("event_name", metric_event_name, std::string, ""); @@ -86,7 +86,7 @@ DECLARE_METRIC("sib9_home_enb_name", metric_sib9_home_enb_name, std::string, "") DECLARE_METRIC_SET("event_data", mset_sector_event, metric_pci, metric_cell_identity, metric_sib9_home_enb_name); using sector_event_t = srslog::build_context_type; @@ -103,7 +103,7 @@ DECLARE_METRIC_SET("event_data", metric_additional); using rrc_event_t = srslog::build_context_type; @@ -114,7 +114,7 @@ DECLARE_METRIC("enb_ue_s1ap_id", metric_ue_enb_id, uint32_t, ""); DECLARE_METRIC_SET("event_data", mset_s1apctx_event, metric_ue_mme_id, metric_ue_enb_id, metric_rnti); using s1apctx_event_t = srslog::build_context_type; @@ -123,7 +123,7 @@ using s1apctx_event_t = srslog::build_context_type; @@ -132,7 +132,7 @@ using rlf_report_event_t = srslog::build_context_type; @@ -149,7 +149,7 @@ DECLARE_METRIC_SET("event_data", metric_new_ue_rnti); using ho_cmd_t = srslog::build_context_type; @@ -159,7 +159,7 @@ DECLARE_METRIC("resume_rnti", metric_resume_rnti, uint32_t, ""); DECLARE_METRIC_SET("event_data", mset_conn_resume_event, metric_rnti, metric_resume_rnti); using conn_resume_t = srslog::build_context_type; @@ -169,7 +169,7 @@ DECLARE_METRIC("type", metric_rlf_type, std::string, ""); DECLARE_METRIC_SET("event_data", mset_rlf_detected_event, metric_rnti, metric_rlf_type); using rlf_detected_t = srslog::build_context_type; @@ -195,7 +195,7 @@ public: ctx.write("event"); ctx.write(get_time_stamp()); - ctx.write(enb_cc_idx); + ctx.write(enb_cc_idx); ctx.write(get_pci(enb_cc_idx)); ctx.write("rrc_log"); ctx.get().write(rnti); @@ -212,7 +212,7 @@ public: ctx.write("event"); ctx.write(get_time_stamp()); - ctx.write(enb_cc_idx); + ctx.write(enb_cc_idx); ctx.write(get_pci(enb_cc_idx)); ctx.write("s1_context_create"); ctx.get().write(mme_id); @@ -227,7 +227,7 @@ public: ctx.write("event"); ctx.write(get_time_stamp()); - ctx.write(enb_cc_idx); + ctx.write(enb_cc_idx); ctx.write(get_pci(enb_cc_idx)); ctx.write("s1_context_delete"); ctx.get().write(mme_id); @@ -244,7 +244,7 @@ public: ctx.write("event"); ctx.write(get_time_stamp()); - ctx.write(cc_idx); + ctx.write(cc_idx); ctx.write(pci); ctx.write("sector_start"); ctx.get().write(pci); @@ -259,7 +259,7 @@ public: ctx.write("event"); ctx.write(get_time_stamp()); - ctx.write(cc_idx); + ctx.write(cc_idx); ctx.write(get_pci(cc_idx)); ctx.write("sector_stop"); ctx.get().write(pci); @@ -279,7 +279,7 @@ public: ctx.write("event"); ctx.write(get_time_stamp()); - ctx.write(enb_cc_idx); + ctx.write(enb_cc_idx); ctx.write(get_pci(enb_cc_idx)); ctx.write("measurement_report"); ctx.get().write(asn1.size()); @@ -299,7 +299,7 @@ public: ctx.write("event"); ctx.write(get_time_stamp()); - ctx.write(enb_cc_idx); + ctx.write(enb_cc_idx); ctx.write(get_pci(enb_cc_idx)); ctx.write("rlf_report"); ctx.get().write(asn1.size()); @@ -314,7 +314,7 @@ public: ctx.write("event"); ctx.write(get_time_stamp()); - ctx.write(enb_cc_idx); + ctx.write(enb_cc_idx); ctx.write(get_pci(enb_cc_idx)); ctx.write("rlf_detected"); ctx.get().write(rnti); @@ -332,7 +332,7 @@ public: ctx.write("event"); ctx.write(get_time_stamp()); - ctx.write(enb_cc_idx); + ctx.write(enb_cc_idx); ctx.write(get_pci(enb_cc_idx)); ctx.write("ho_command"); ctx.get().write(rnti); @@ -348,7 +348,7 @@ public: ctx.write("event"); ctx.write(get_time_stamp()); - ctx.write(enb_cc_idx); + ctx.write(enb_cc_idx); ctx.write(get_pci(enb_cc_idx)); ctx.write("connection_resume"); ctx.get().write(rnti); diff --git a/srsenb/src/metrics_json.cc b/srsenb/src/metrics_json.cc index 3b955be9b..b706836d6 100644 --- a/srsenb/src/metrics_json.cc +++ b/srsenb/src/metrics_json.cc @@ -71,11 +71,11 @@ DECLARE_METRIC_SET("ue_container", mlist_bearers); /// Cell container metrics. -DECLARE_METRIC("sector_id", metric_sector_id, uint32_t, ""); +DECLARE_METRIC("carrier_id", metric_carrier_id, uint32_t, ""); DECLARE_METRIC("pci", metric_pci, uint32_t, ""); DECLARE_METRIC("nof_rach", metric_nof_rach, uint32_t, ""); DECLARE_METRIC_LIST("ue_list", mlist_ues, std::vector); -DECLARE_METRIC_SET("cell_container", mset_cell_container, metric_sector_id, metric_pci, metric_nof_rach, mlist_ues); +DECLARE_METRIC_SET("cell_container", mset_cell_container, metric_carrier_id, metric_pci, metric_nof_rach, mlist_ues); /// Metrics root object. DECLARE_METRIC("type", metric_type_tag, std::string, ""); @@ -185,7 +185,7 @@ void metrics_json::set_metrics(const enb_metrics_t& m, const uint32_t period_use // For each cell... for (unsigned cc_idx = 0, e = cell_list.size(); cc_idx != e; ++cc_idx) { auto& cell = cell_list[cc_idx]; - cell.write(cc_idx); + cell.write(cc_idx); cell.write(m.stack.mac.cc_info[cc_idx].cc_rach_counter); cell.write(m.stack.mac.cc_info[cc_idx].pci);