[Release-17] Upgrade SBI to v17.x.0

This commit is contained in:
Sukchan Lee 2023-03-01 19:56:49 +09:00
parent 969c116e77
commit 4d44b1843e
1687 changed files with 121604 additions and 9310 deletions

View file

@ -18,10 +18,15 @@ OpenAPI_monitoring_configuration_t *OpenAPI_monitoring_configuration_create(
int maximum_response_time,
bool is_suggested_packet_num_dl,
int suggested_packet_num_dl,
char *dnn,
OpenAPI_snssai_t *single_nssai,
OpenAPI_pdu_session_status_cfg_t *pdu_session_status_cfg,
OpenAPI_reachability_for_sms_configuration_t *reachability_for_sms_cfg,
char *mtc_provider_information,
char *af_id
char *af_id,
OpenAPI_reachability_for_data_configuration_t *reachability_for_data_cfg,
bool is_idle_status_ind,
int idle_status_ind
)
{
OpenAPI_monitoring_configuration_t *monitoring_configuration_local_var = ogs_malloc(sizeof(OpenAPI_monitoring_configuration_t));
@ -40,10 +45,15 @@ OpenAPI_monitoring_configuration_t *OpenAPI_monitoring_configuration_create(
monitoring_configuration_local_var->maximum_response_time = maximum_response_time;
monitoring_configuration_local_var->is_suggested_packet_num_dl = is_suggested_packet_num_dl;
monitoring_configuration_local_var->suggested_packet_num_dl = suggested_packet_num_dl;
monitoring_configuration_local_var->dnn = dnn;
monitoring_configuration_local_var->single_nssai = single_nssai;
monitoring_configuration_local_var->pdu_session_status_cfg = pdu_session_status_cfg;
monitoring_configuration_local_var->reachability_for_sms_cfg = reachability_for_sms_cfg;
monitoring_configuration_local_var->mtc_provider_information = mtc_provider_information;
monitoring_configuration_local_var->af_id = af_id;
monitoring_configuration_local_var->reachability_for_data_cfg = reachability_for_data_cfg;
monitoring_configuration_local_var->is_idle_status_ind = is_idle_status_ind;
monitoring_configuration_local_var->idle_status_ind = idle_status_ind;
return monitoring_configuration_local_var;
}
@ -75,6 +85,14 @@ void OpenAPI_monitoring_configuration_free(OpenAPI_monitoring_configuration_t *m
OpenAPI_loss_connectivity_cfg_free(monitoring_configuration->loss_connectivity_cfg);
monitoring_configuration->loss_connectivity_cfg = NULL;
}
if (monitoring_configuration->dnn) {
ogs_free(monitoring_configuration->dnn);
monitoring_configuration->dnn = NULL;
}
if (monitoring_configuration->single_nssai) {
OpenAPI_snssai_free(monitoring_configuration->single_nssai);
monitoring_configuration->single_nssai = NULL;
}
if (monitoring_configuration->pdu_session_status_cfg) {
OpenAPI_pdu_session_status_cfg_free(monitoring_configuration->pdu_session_status_cfg);
monitoring_configuration->pdu_session_status_cfg = NULL;
@ -91,6 +109,10 @@ void OpenAPI_monitoring_configuration_free(OpenAPI_monitoring_configuration_t *m
ogs_free(monitoring_configuration->af_id);
monitoring_configuration->af_id = NULL;
}
if (monitoring_configuration->reachability_for_data_cfg) {
OpenAPI_reachability_for_data_configuration_free(monitoring_configuration->reachability_for_data_cfg);
monitoring_configuration->reachability_for_data_cfg = NULL;
}
ogs_free(monitoring_configuration);
}
@ -200,6 +222,26 @@ cJSON *OpenAPI_monitoring_configuration_convertToJSON(OpenAPI_monitoring_configu
}
}
if (monitoring_configuration->dnn) {
if (cJSON_AddStringToObject(item, "dnn", monitoring_configuration->dnn) == NULL) {
ogs_error("OpenAPI_monitoring_configuration_convertToJSON() failed [dnn]");
goto end;
}
}
if (monitoring_configuration->single_nssai) {
cJSON *single_nssai_local_JSON = OpenAPI_snssai_convertToJSON(monitoring_configuration->single_nssai);
if (single_nssai_local_JSON == NULL) {
ogs_error("OpenAPI_monitoring_configuration_convertToJSON() failed [single_nssai]");
goto end;
}
cJSON_AddItemToObject(item, "singleNssai", single_nssai_local_JSON);
if (item->child == NULL) {
ogs_error("OpenAPI_monitoring_configuration_convertToJSON() failed [single_nssai]");
goto end;
}
}
if (monitoring_configuration->pdu_session_status_cfg) {
cJSON *pdu_session_status_cfg_local_JSON = OpenAPI_pdu_session_status_cfg_convertToJSON(monitoring_configuration->pdu_session_status_cfg);
if (pdu_session_status_cfg_local_JSON == NULL) {
@ -240,6 +282,26 @@ cJSON *OpenAPI_monitoring_configuration_convertToJSON(OpenAPI_monitoring_configu
}
}
if (monitoring_configuration->reachability_for_data_cfg) {
cJSON *reachability_for_data_cfg_local_JSON = OpenAPI_reachability_for_data_configuration_convertToJSON(monitoring_configuration->reachability_for_data_cfg);
if (reachability_for_data_cfg_local_JSON == NULL) {
ogs_error("OpenAPI_monitoring_configuration_convertToJSON() failed [reachability_for_data_cfg]");
goto end;
}
cJSON_AddItemToObject(item, "reachabilityForDataCfg", reachability_for_data_cfg_local_JSON);
if (item->child == NULL) {
ogs_error("OpenAPI_monitoring_configuration_convertToJSON() failed [reachability_for_data_cfg]");
goto end;
}
}
if (monitoring_configuration->is_idle_status_ind) {
if (cJSON_AddBoolToObject(item, "idleStatusInd", monitoring_configuration->idle_status_ind) == NULL) {
ogs_error("OpenAPI_monitoring_configuration_convertToJSON() failed [idle_status_ind]");
goto end;
}
}
end:
return item;
}
@ -262,12 +324,18 @@ OpenAPI_monitoring_configuration_t *OpenAPI_monitoring_configuration_parseFromJS
cJSON *maximum_latency = NULL;
cJSON *maximum_response_time = NULL;
cJSON *suggested_packet_num_dl = NULL;
cJSON *dnn = NULL;
cJSON *single_nssai = NULL;
OpenAPI_snssai_t *single_nssai_local_nonprim = NULL;
cJSON *pdu_session_status_cfg = NULL;
OpenAPI_pdu_session_status_cfg_t *pdu_session_status_cfg_local_nonprim = NULL;
cJSON *reachability_for_sms_cfg = NULL;
OpenAPI_reachability_for_sms_configuration_t *reachability_for_sms_cfg_local_nonprim = NULL;
cJSON *mtc_provider_information = NULL;
cJSON *af_id = NULL;
cJSON *reachability_for_data_cfg = NULL;
OpenAPI_reachability_for_data_configuration_t *reachability_for_data_cfg_local_nonprim = NULL;
cJSON *idle_status_ind = NULL;
event_type = cJSON_GetObjectItemCaseSensitive(monitoring_configurationJSON, "eventType");
if (!event_type) {
ogs_error("OpenAPI_monitoring_configuration_parseFromJSON() failed [event_type]");
@ -327,6 +395,19 @@ OpenAPI_monitoring_configuration_t *OpenAPI_monitoring_configuration_parseFromJS
}
}
dnn = cJSON_GetObjectItemCaseSensitive(monitoring_configurationJSON, "dnn");
if (dnn) {
if (!cJSON_IsString(dnn) && !cJSON_IsNull(dnn)) {
ogs_error("OpenAPI_monitoring_configuration_parseFromJSON() failed [dnn]");
goto end;
}
}
single_nssai = cJSON_GetObjectItemCaseSensitive(monitoring_configurationJSON, "singleNssai");
if (single_nssai) {
single_nssai_local_nonprim = OpenAPI_snssai_parseFromJSON(single_nssai);
}
pdu_session_status_cfg = cJSON_GetObjectItemCaseSensitive(monitoring_configurationJSON, "pduSessionStatusCfg");
if (pdu_session_status_cfg) {
pdu_session_status_cfg_local_nonprim = OpenAPI_pdu_session_status_cfg_parseFromJSON(pdu_session_status_cfg);
@ -353,6 +434,19 @@ OpenAPI_monitoring_configuration_t *OpenAPI_monitoring_configuration_parseFromJS
}
}
reachability_for_data_cfg = cJSON_GetObjectItemCaseSensitive(monitoring_configurationJSON, "reachabilityForDataCfg");
if (reachability_for_data_cfg) {
reachability_for_data_cfg_local_nonprim = OpenAPI_reachability_for_data_configuration_parseFromJSON(reachability_for_data_cfg);
}
idle_status_ind = cJSON_GetObjectItemCaseSensitive(monitoring_configurationJSON, "idleStatusInd");
if (idle_status_ind) {
if (!cJSON_IsBool(idle_status_ind)) {
ogs_error("OpenAPI_monitoring_configuration_parseFromJSON() failed [idle_status_ind]");
goto end;
}
}
monitoring_configuration_local_var = OpenAPI_monitoring_configuration_create (
event_type_local_nonprim,
immediate_flag ? true : false,
@ -367,10 +461,15 @@ OpenAPI_monitoring_configuration_t *OpenAPI_monitoring_configuration_parseFromJS
maximum_response_time ? maximum_response_time->valuedouble : 0,
suggested_packet_num_dl ? true : false,
suggested_packet_num_dl ? suggested_packet_num_dl->valuedouble : 0,
dnn && !cJSON_IsNull(dnn) ? ogs_strdup(dnn->valuestring) : NULL,
single_nssai ? single_nssai_local_nonprim : NULL,
pdu_session_status_cfg ? pdu_session_status_cfg_local_nonprim : NULL,
reachability_for_sms_cfg ? reachability_for_sms_cfg_local_nonprim : NULL,
mtc_provider_information && !cJSON_IsNull(mtc_provider_information) ? ogs_strdup(mtc_provider_information->valuestring) : NULL,
af_id && !cJSON_IsNull(af_id) ? ogs_strdup(af_id->valuestring) : NULL
af_id && !cJSON_IsNull(af_id) ? ogs_strdup(af_id->valuestring) : NULL,
reachability_for_data_cfg ? reachability_for_data_cfg_local_nonprim : NULL,
idle_status_ind ? true : false,
idle_status_ind ? idle_status_ind->valueint : 0
);
return monitoring_configuration_local_var;
@ -395,6 +494,10 @@ end:
OpenAPI_loss_connectivity_cfg_free(loss_connectivity_cfg_local_nonprim);
loss_connectivity_cfg_local_nonprim = NULL;
}
if (single_nssai_local_nonprim) {
OpenAPI_snssai_free(single_nssai_local_nonprim);
single_nssai_local_nonprim = NULL;
}
if (pdu_session_status_cfg_local_nonprim) {
OpenAPI_pdu_session_status_cfg_free(pdu_session_status_cfg_local_nonprim);
pdu_session_status_cfg_local_nonprim = NULL;
@ -403,6 +506,10 @@ end:
OpenAPI_reachability_for_sms_configuration_free(reachability_for_sms_cfg_local_nonprim);
reachability_for_sms_cfg_local_nonprim = NULL;
}
if (reachability_for_data_cfg_local_nonprim) {
OpenAPI_reachability_for_data_configuration_free(reachability_for_data_cfg_local_nonprim);
reachability_for_data_cfg_local_nonprim = NULL;
}
return NULL;
}