Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

M1 Bugfix | Parameters checking of Metrics Reporting Configurations #147

Closed
wants to merge 1 commit into from
Closed

M1 Bugfix | Parameters checking of Metrics Reporting Configurations #147

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions src/5gmsaf/msaf-m1-sm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -575,6 +575,23 @@ void msaf_m1_state_functional(ogs_fsm_t *s, msaf_event_t *e)
ogs_assert(true == nf_server_send_error(stream, 400, 2, message, "Bad request.", err, NULL, api,app_meta));
ogs_free(err);
} else {

if (metrics_config->reporting_interval <= 0) {
char *err;
err = ogs_msprintf("Invalid Reporting Interval value %d. Positive value is required.", metrics_config->reporting_interval);
ogs_error("%s", err);
ogs_assert(true == nf_server_send_error(stream, 422, 1, message, "Unprocessable Entity.", err, NULL, api, app_meta));
ogs_free(err);
return;
}
if (metrics_config->sampling_period < 0) {
char *err;
err = ogs_msprintf("Invalid Sampling Period value %d. Positive or zero values are required.", metrics_config->sampling_period);
ogs_error("%s", err);
ogs_assert(true == nf_server_send_error(stream, 422, 1, message, "Unprocessable Entity.", err, NULL, api, app_meta));
ogs_free(err);
return;
}
msaf_metrics_reporting_configuration_t *msaf_new_metrics_config;
msaf_new_metrics_config = process_and_map_metrics_reporting_configuration(msaf_provisioning_session,metrics_config);

Expand Down Expand Up @@ -1195,6 +1212,21 @@ void msaf_m1_state_functional(ogs_fsm_t *s, msaf_event_t *e)
ogs_assert(true == nf_server_send_error(stream, 400, 2, message, "Bad request.", err, NULL, api, app_meta));
ogs_free(err);
} else {

if (updated_config->reporting_interval <= 0) {
char *err = ogs_msprintf("Invalid Reporting Interval value %d. Positive value is required.", updated_config->reporting_interval);
ogs_error("%s", err);
rjb1000 marked this conversation as resolved.
Show resolved Hide resolved
ogs_assert(true == nf_server_send_error(stream, 422, 1, message, "Unprocessable Entity.", err, NULL, api, app_meta));
ogs_free(err);
return;
}
if (updated_config->sampling_period < 0) {
char *err = ogs_msprintf("Invalid Sampling Period value %d. Positive or zero values are required.", updated_config->sampling_period);
ogs_error("%s", err);
ogs_assert(true == nf_server_send_error(stream, 422, 1, message, "Unprocessable Entity.", err, NULL, api, app_meta));
ogs_free(err);
return;
}
int result = update_metrics_configuration(metrics_configuration, updated_config);
if (result == 0) {
ogs_sbi_response_t *response = nf_server_new_response(NULL, NULL, 0, NULL, 0, NULL, api, app_meta);
Expand Down