5g-team
/
srsRAN_4G
mirror of https://github.com/pvnis/srsRAN_4G.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

e2sm_kpm: save measurements to support the case when measurement period < reporting period

Browse Source
master
Piotr Gawlowicz 2 years ago committed by Justin Tallon
parent bace9a2b5b
commit 81f28a4d45
3 changed files with 164 additions and 57 deletions
Show Stats Download Patch File Download Diff File

36
srsgnb/hdr/stack/ric/e2sm_kpm.h
Unescape Escape View File

@ -35,6 +35,7 @@ typedef struct {
meas_data_l meas_data;
meas_info_list_l meas_info_list;
uint64_t granul_period;
// TODO: add fields needef in format2 and format3
} E2SM_KPM_RIC_ind_message_t;
enum e2_metric_data_type_t { INTEGER, REAL };
@ -76,6 +77,7 @@ enum e2sm_kpm_metric_scope_enum {
};
typedef struct {
uint32_t action_id;
std::string name;
e2sm_kpm_label_enum label;
e2sm_kpm_metric_scope_enum scope;
@ -111,19 +113,34 @@ private:
bool _process_ric_action_definition_format4(e2_sm_kpm_action_definition_format4_s& action_definition_format4);
bool _process_ric_action_definition_format5(e2_sm_kpm_action_definition_format5_s& action_definition_format5);
bool _fill_ric_ind_msg_format1(e2_sm_kpm_action_definition_format1_s& action, E2SM_KPM_RIC_ind_message_t& r_ind_msg);
bool _fill_ric_ind_msg_format1(e2_sm_kpm_action_definition_format2_s& action, E2SM_KPM_RIC_ind_message_t& r_ind_msg);
bool _fill_ric_ind_msg_format2(e2_sm_kpm_action_definition_format3_s& action, E2SM_KPM_RIC_ind_message_t& r_ind_msg);
bool _fill_ric_ind_msg_format3(e2_sm_kpm_action_definition_format4_s& action, E2SM_KPM_RIC_ind_message_t& r_ind_msg);
bool _fill_ric_ind_msg_format3(e2_sm_kpm_action_definition_format5_s& action, E2SM_KPM_RIC_ind_message_t& r_ind_msg);
void _add_measurement_records(std::string meas_name, e2sm_kpm_label_enum label, meas_record_l& meas_record_list);
bool _fill_ric_ind_msg_format1(uint32_t action_id,
e2_sm_kpm_action_definition_format1_s& action,
E2SM_KPM_RIC_ind_message_t& r_ind_msg);
bool _fill_ric_ind_msg_format1(uint32_t action_id,
e2_sm_kpm_action_definition_format2_s& action,
E2SM_KPM_RIC_ind_message_t& r_ind_msg);
bool _fill_ric_ind_msg_format2(uint32_t action_id,
e2_sm_kpm_action_definition_format3_s& action,
E2SM_KPM_RIC_ind_message_t& r_ind_msg);
bool _fill_ric_ind_msg_format3(uint32_t action_id,
e2_sm_kpm_action_definition_format4_s& action,
E2SM_KPM_RIC_ind_message_t& r_ind_msg);
bool _fill_ric_ind_msg_format3(uint32_t action_id,
e2_sm_kpm_action_definition_format5_s& action,
E2SM_KPM_RIC_ind_message_t& r_ind_msg);
void _add_measurement_records(uint32_t action_id,
std::string meas_name,
e2sm_kpm_label_enum label,
meas_record_l& meas_record_list);
bool _generate_indication_header(E2SM_KPM_RIC_ind_header_t hdr, srsran::unique_byte_buffer_t& buf);
bool _generate_indication_message(E2SM_KPM_RIC_ind_message_t msg, srsran::unique_byte_buffer_t& buf);
bool _get_meas_definition(std::string meas_name, E2SM_KPM_metric_t& def);
bool _get_last_meas_value(E2SM_KPM_meas_values_t& meas_values);
bool _get_last_N_meas_values(uint32_t N, E2SM_KPM_meas_values_t& meas_values);
E2SM_KPM_meas_values_t& _get_collected_meas_values(uint32_t act_id, std::string meas_name, e2sm_kpm_label_enum label);
bool _save_last_meas_value(E2SM_KPM_meas_values_t& meas_values);
std::vector<e2sm_kpm_label_enum> _get_present_labels(const meas_info_item_s& action_meas_info_item);
bool _extract_last_integer_type_meas_value(E2SM_KPM_meas_values_t& meas_values,
const enb_metrics_t& enb_metrics,
@ -135,6 +152,7 @@ private:
srslog::basic_logger& logger;
std::vector<E2SM_KPM_metric_t> supported_meas_types;
std::map<uint32_t, e2_sm_kpm_action_definition_s> registered_actions;
std::vector<E2SM_KPM_meas_values_t> collected_meas_data;
srsran_random_t random_gen;

167
srsgnb/src/stack/ric/e2sm_kpm.cc
Unescape Escape View File

@ -47,6 +47,30 @@ e2sm_kpm::e2sm_kpm(srslog::basic_logger& logger_) : e2sm(short_name, oid, func_d
}
}
std::vector<e2sm_kpm_label_enum> e2sm_kpm::_get_present_labels(const meas_info_item_s& action_meas_info_item)
{
std::vector<e2sm_kpm_label_enum> labels;
// TODO: add all labels defined in e2sm_kpm doc
for (uint32_t l = 0; l < action_meas_info_item.label_info_list.size(); l++) {
if (action_meas_info_item.label_info_list[l].meas_label.no_label_present) {
labels.push_back(NO_LABEL);
}
if (action_meas_info_item.label_info_list[l].meas_label.min_present) {
labels.push_back(MIN_LABEL);
}
if (action_meas_info_item.label_info_list[l].meas_label.max_present) {
labels.push_back(MAX_LABEL);
}
if (action_meas_info_item.label_info_list[l].meas_label.avg_present) {
labels.push_back(AVG_LABEL);
}
if (action_meas_info_item.label_info_list[l].meas_label.sum_present) {
labels.push_back(SUM_LABEL);
}
}
return labels;
}
void e2sm_kpm::receive_e2_metrics_callback(const enb_metrics_t& m)
{
last_enb_metrics = m;
@ -54,6 +78,45 @@ void e2sm_kpm::receive_e2_metrics_callback(const enb_metrics_t& m)
// TODO: for INSERT type of reporting check if a specified metrics exceeds predefined thresholds,
// if so then send RIC indication throught proper subscription
for (auto const& it : registered_actions) {
uint32_t action_id = it.first;
e2_sm_kpm_action_definition_s action = it.second;
meas_info_list_l action_meas_info_list;
switch (action.ric_style_type) {
case 1:
action_meas_info_list = action.action_definition_formats.action_definition_format1().meas_info_list;
for (uint32_t i = 0; i < action_meas_info_list.size(); i++) {
meas_info_item_s meas_def_item = action_meas_info_list[i];
std::string meas_name = meas_def_item.meas_type.meas_name().to_string();
std::vector<e2sm_kpm_label_enum> labels = _get_present_labels(meas_def_item);
for (const auto& label : labels) {
// TODO: probably some labels need a special processing (e.g., use bin width that needs to be stored)
E2SM_KPM_meas_values_t& meas_values = _get_collected_meas_values(action_id, meas_name, label);
// extract a needed value from enb metrics and save to the value vector
_save_last_meas_value(meas_values);
}
}
break;
case 2:
// TODO: add
break;
case 3:
// TODO: add
break;
case 4:
// TODO: add
break;
case 5:
// TODO: add
break;
default:
logger.info("Unknown RIC style type %i -> do not admit action %i (type %i)", action.ric_style_type);
return;
}
}
}
bool e2sm_kpm::generate_ran_function_description(RANfunction_description& desc, ra_nfunction_item_s& ran_func)
@ -292,14 +355,15 @@ bool e2sm_kpm::remove_ric_action_definition(E2AP_RIC_action_t& action_entry)
bool e2sm_kpm::execute_action_fill_ric_indication(E2AP_RIC_action_t& action_entry, ric_indication_t& ric_indication)
{
if (!registered_actions.count(action_entry.sm_local_ric_action_id)) {
uint32_t action_id = action_entry.sm_local_ric_action_id;
if (!registered_actions.count(action_id)) {
logger.info("Unknown RIC action ID: %i (type %i) (SM local RIC action ID: %i)",
action_entry.ric_action_id,
action_entry.ric_action_type,
action_entry.sm_local_ric_action_id);
return false;
}
e2_sm_kpm_action_definition_s action = registered_actions.at(action_id);
E2SM_KPM_RIC_ind_header_t ric_ind_header;
E2SM_KPM_RIC_ind_message_t ric_ind_message;
@ -310,28 +374,31 @@ bool e2sm_kpm::execute_action_fill_ric_indication(E2AP_RIC_action_t& action_entr
ric_indication.ri_cind_hdr = srsran::make_byte_buffer();
this->_generate_indication_header(ric_ind_header, ric_indication.ri_cind_hdr);
e2_sm_kpm_action_definition_s action = registered_actions.at(action_entry.sm_local_ric_action_id);
switch (action.ric_style_type) {
case 1:
ric_ind_message.ind_msg_format = e2_sm_kpm_ind_msg_s::ind_msg_formats_c_::types_opts::ind_msg_format1;
_fill_ric_ind_msg_format1(action.action_definition_formats.action_definition_format1(), ric_ind_message);
_fill_ric_ind_msg_format1(
action_id, action.action_definition_formats.action_definition_format1(), ric_ind_message);
break;
case 2:
ric_ind_message.ind_msg_format = e2_sm_kpm_ind_msg_s::ind_msg_formats_c_::types_opts::ind_msg_format1;
_fill_ric_ind_msg_format1(action.action_definition_formats.action_definition_format2(), ric_ind_message);
_fill_ric_ind_msg_format1(
action_id, action.action_definition_formats.action_definition_format2(), ric_ind_message);
break;
case 3:
ric_ind_message.ind_msg_format = e2_sm_kpm_ind_msg_s::ind_msg_formats_c_::types_opts::ind_msg_format2;
_fill_ric_ind_msg_format2(action.action_definition_formats.action_definition_format3(), ric_ind_message);
_fill_ric_ind_msg_format2(
action_id, action.action_definition_formats.action_definition_format3(), ric_ind_message);
break;
case 4:
ric_ind_message.ind_msg_format = e2_sm_kpm_ind_msg_s::ind_msg_formats_c_::types_opts::ind_msg_format3;
_fill_ric_ind_msg_format3(action.action_definition_formats.action_definition_format4(), ric_ind_message);
_fill_ric_ind_msg_format3(
action_id, action.action_definition_formats.action_definition_format4(), ric_ind_message);
break;
case 5:
ric_ind_message.ind_msg_format = e2_sm_kpm_ind_msg_s::ind_msg_formats_c_::types_opts::ind_msg_format3;
_fill_ric_ind_msg_format3(action.action_definition_formats.action_definition_format5(), ric_ind_message);
_fill_ric_ind_msg_format3(
action_id, action.action_definition_formats.action_definition_format5(), ric_ind_message);
break;
default:
logger.info("Unknown RIC style type %i -> do not admit action %i (type %i)", action.ric_style_type);
@ -343,7 +410,8 @@ bool e2sm_kpm::execute_action_fill_ric_indication(E2AP_RIC_action_t& action_entr
return true;
}
bool e2sm_kpm::_fill_ric_ind_msg_format1(e2_sm_kpm_action_definition_format1_s& action,
bool e2sm_kpm::_fill_ric_ind_msg_format1(uint32_t action_id,
e2_sm_kpm_action_definition_format1_s& action,
E2SM_KPM_RIC_ind_message_t& ric_ind_msg)
{
meas_info_list_l action_meas_info_list = action.meas_info_list;
@ -370,27 +438,27 @@ bool e2sm_kpm::_fill_ric_ind_msg_format1(e2_sm_kpm_action_definition_format1_s&
if (meas_def_item.label_info_list[l].meas_label.no_label_present) {
meas_info_item.label_info_list[l].meas_label.no_label_present = true;
meas_info_item.label_info_list[l].meas_label.no_label = meas_label_s::no_label_opts::true_value;
this->_add_measurement_records(meas_name, NO_LABEL, meas_data.meas_record);
this->_add_measurement_records(action_id, meas_name, NO_LABEL, meas_data.meas_record);
}
if (meas_def_item.label_info_list[l].meas_label.min_present) {
meas_info_item.label_info_list[l].meas_label.min_present = true;
meas_info_item.label_info_list[l].meas_label.min = meas_label_s::min_opts::true_value;
this->_add_measurement_records(meas_name, MIN_LABEL, meas_data.meas_record);
this->_add_measurement_records(action_id, meas_name, MIN_LABEL, meas_data.meas_record);
}
if (meas_def_item.label_info_list[l].meas_label.max_present) {
meas_info_item.label_info_list[l].meas_label.max_present = true;
meas_info_item.label_info_list[l].meas_label.max = meas_label_s::max_opts::true_value;
this->_add_measurement_records(meas_name, MAX_LABEL, meas_data.meas_record);
this->_add_measurement_records(action_id, meas_name, MAX_LABEL, meas_data.meas_record);
}
if (meas_def_item.label_info_list[l].meas_label.avg_present) {
meas_info_item.label_info_list[l].meas_label.avg_present = true;
meas_info_item.label_info_list[l].meas_label.avg = meas_label_s::avg_opts::true_value;
this->_add_measurement_records(meas_name, AVG_LABEL, meas_data.meas_record);
this->_add_measurement_records(action_id, meas_name, AVG_LABEL, meas_data.meas_record);
}
if (meas_def_item.label_info_list[l].meas_label.sum_present) {
meas_info_item.label_info_list[l].meas_label.sum_present = true;
meas_info_item.label_info_list[l].meas_label.sum = meas_label_s::sum_opts::true_value;
this->_add_measurement_records(meas_name, SUM_LABEL, meas_data.meas_record);
this->_add_measurement_records(action_id, meas_name, SUM_LABEL, meas_data.meas_record);
}
}
}
@ -398,25 +466,29 @@ bool e2sm_kpm::_fill_ric_ind_msg_format1(e2_sm_kpm_action_definition_format1_s&
return true;
}
bool e2sm_kpm::_fill_ric_ind_msg_format1(e2_sm_kpm_action_definition_format2_s& action,
bool e2sm_kpm::_fill_ric_ind_msg_format1(uint32_t action_id,
e2_sm_kpm_action_definition_format2_s& action,
E2SM_KPM_RIC_ind_message_t& ric_ind_msg)
{
return false;
}
bool e2sm_kpm::_fill_ric_ind_msg_format2(e2_sm_kpm_action_definition_format3_s& action,
bool e2sm_kpm::_fill_ric_ind_msg_format2(uint32_t action_id,
e2_sm_kpm_action_definition_format3_s& action,
E2SM_KPM_RIC_ind_message_t& ric_ind_msg)
{
return false;
}
bool e2sm_kpm::_fill_ric_ind_msg_format3(e2_sm_kpm_action_definition_format4_s& action,
bool e2sm_kpm::_fill_ric_ind_msg_format3(uint32_t action_id,
e2_sm_kpm_action_definition_format4_s& action,
E2SM_KPM_RIC_ind_message_t& ric_ind_msg)
{
return false;
}
bool e2sm_kpm::_fill_ric_ind_msg_format3(e2_sm_kpm_action_definition_format5_s& action,
bool e2sm_kpm::_fill_ric_ind_msg_format3(uint32_t action_id,
e2_sm_kpm_action_definition_format5_s& action,
E2SM_KPM_RIC_ind_message_t& ric_ind_msg)
{
return false;
@ -434,13 +506,10 @@ bool e2sm_kpm::_get_meas_definition(std::string meas_name, E2SM_KPM_metric_t& de
return true;
}
bool e2sm_kpm::_get_last_N_meas_values(uint32_t N, E2SM_KPM_meas_values_t& meas_values)
{
// TODO: currently only N=1 supported
return _get_last_meas_value(meas_values);
}
void e2sm_kpm::_add_measurement_records(std::string meas_name, e2sm_kpm_label_enum label, meas_record_l& meas_record_list)
void e2sm_kpm::_add_measurement_records(uint32_t action_id,
std::string meas_name,
e2sm_kpm_label_enum label,
meas_record_l& meas_record_list)
{
E2SM_KPM_metric_t metric_definition;
if (not _get_meas_definition(meas_name, metric_definition)) {
@ -448,16 +517,7 @@ void e2sm_kpm::_add_measurement_records(std::string meas_name, e2sm_kpm_label_en
return;
}
E2SM_KPM_meas_values_t meas_values;
meas_values.name = metric_definition.name;
// TODO: check if label supported
meas_values.label = label;
meas_values.data_type = metric_definition.data_type;
if (not _get_last_N_meas_values(1, meas_values)) {
logger.debug("No measurement values for type \"%s\" \n", metric_definition.name.c_str());
return;
}
E2SM_KPM_meas_values_t& meas_values = _get_collected_meas_values(action_id, meas_name, label);
if ((meas_values.integer_values.size() + meas_values.real_values.size()) == 0) {
logger.debug("No measurement values for type \"%s\" \n", metric_definition.name.c_str());
meas_record_list.resize(1);
@ -482,6 +542,10 @@ void e2sm_kpm::_add_measurement_records(std::string meas_name, e2sm_kpm_label_en
meas_record_list.push_back(item);
}
}
// clear reported values
meas_values.integer_values.clear();
meas_values.real_values.clear();
}
bool e2sm_kpm::_generate_indication_header(E2SM_KPM_RIC_ind_header_t hdr, srsran::unique_byte_buffer_t& buf)
@ -544,7 +608,32 @@ bool e2sm_kpm::_generate_indication_message(E2SM_KPM_RIC_ind_message_t msg, srsr
return true;
}
bool e2sm_kpm::_get_last_meas_value(E2SM_KPM_meas_values_t& meas_values)
E2SM_KPM_meas_values_t&
e2sm_kpm::_get_collected_meas_values(uint32_t action_id, std::string meas_name, e2sm_kpm_label_enum label)
{
auto name_label_match = [&action_id, &meas_name, &label](const E2SM_KPM_meas_values_t& x) {
return ((x.action_id == action_id) and (x.name == meas_name or x.name == meas_name.c_str()) and (x.label == label));
};
auto it = std::find_if(collected_meas_data.begin(), collected_meas_data.end(), name_label_match);
if (it == collected_meas_data.end()) {
E2SM_KPM_metric_t metric_definition;
if (not _get_meas_definition(meas_name, metric_definition)) {
logger.debug("No definition for measurement type \"%s\"", metric_definition.name);
}
E2SM_KPM_meas_values_t new_item;
new_item.action_id = action_id;
new_item.name = meas_name;
new_item.label = label;
new_item.data_type = metric_definition.data_type;
new_item.data_type = INTEGER; // TODO: overwrite with INTEGER as REAL is not supported yet
collected_meas_data.push_back(new_item);
return collected_meas_data.back();
}
return *it;
}
bool e2sm_kpm::_save_last_meas_value(E2SM_KPM_meas_values_t& meas_values)
{
meas_values.data_type =
e2_metric_data_type_t::INTEGER; // TODO: overwrite as REAL seems to be not supported by asn1 now
@ -577,7 +666,7 @@ bool e2sm_kpm::_extract_last_integer_type_meas_value(E2SM_KPM_meas_values_t& mea
switch (meas_values.label) {
case NO_LABEL:
value = (int32_t)enb_metrics.sys.cpu_load[0];
printf("report last \"test\" value as int, (filled with CPU0_load) value %i \n", value);
printf("extract last \"test\" value as int, (filled with CPU0_load) value %i \n", value);
return true;
default:
return false;
@ -589,7 +678,7 @@ bool e2sm_kpm::_extract_last_integer_type_meas_value(E2SM_KPM_meas_values_t& mea
switch (meas_values.label) {
case NO_LABEL:
value = srsran_random_uniform_int_dist(random_gen, 0, 100);
printf("report last \"random_int\" value as int, random value %i \n", value);
printf("extract last \"random_int\" value as int, random value %i \n", value);
return true;
default:
return false;

2
srsgnb/src/stack/ric/ric_subscription.cc
Unescape Escape View File

@ -42,7 +42,7 @@ ric_client::ric_subscription::ric_subscription(ric_client* ric_cli
if (sm_ptr->process_ric_event_trigger_definition(ric_subscription_request, event_trigger)) {
if (event_trigger.type == RIC_event_trigger_definition_t::e2sm_event_trigger_type_t::E2SM_REPORT) {
reporting_period = event_trigger.report_period;
reporting_period = 1000; // TODO: to remove, keep it 1s for testing
reporting_period = 3000; // TODO: to remove, keep it 3s for testing
}
}

Write Preview
Loading…
Cancel
Save