[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

@ -7,7 +7,8 @@
OpenAPI_amf_subscription_info_t *OpenAPI_amf_subscription_info_create(
char *amf_instance_id,
char *subscription_id,
char *subs_change_notify_correlation_id
char *subs_change_notify_correlation_id,
OpenAPI_context_info_t *context_info
)
{
OpenAPI_amf_subscription_info_t *amf_subscription_info_local_var = ogs_malloc(sizeof(OpenAPI_amf_subscription_info_t));
@ -16,6 +17,7 @@ OpenAPI_amf_subscription_info_t *OpenAPI_amf_subscription_info_create(
amf_subscription_info_local_var->amf_instance_id = amf_instance_id;
amf_subscription_info_local_var->subscription_id = subscription_id;
amf_subscription_info_local_var->subs_change_notify_correlation_id = subs_change_notify_correlation_id;
amf_subscription_info_local_var->context_info = context_info;
return amf_subscription_info_local_var;
}
@ -39,6 +41,10 @@ void OpenAPI_amf_subscription_info_free(OpenAPI_amf_subscription_info_t *amf_sub
ogs_free(amf_subscription_info->subs_change_notify_correlation_id);
amf_subscription_info->subs_change_notify_correlation_id = NULL;
}
if (amf_subscription_info->context_info) {
OpenAPI_context_info_free(amf_subscription_info->context_info);
amf_subscription_info->context_info = NULL;
}
ogs_free(amf_subscription_info);
}
@ -78,6 +84,19 @@ cJSON *OpenAPI_amf_subscription_info_convertToJSON(OpenAPI_amf_subscription_info
}
}
if (amf_subscription_info->context_info) {
cJSON *context_info_local_JSON = OpenAPI_context_info_convertToJSON(amf_subscription_info->context_info);
if (context_info_local_JSON == NULL) {
ogs_error("OpenAPI_amf_subscription_info_convertToJSON() failed [context_info]");
goto end;
}
cJSON_AddItemToObject(item, "contextInfo", context_info_local_JSON);
if (item->child == NULL) {
ogs_error("OpenAPI_amf_subscription_info_convertToJSON() failed [context_info]");
goto end;
}
}
end:
return item;
}
@ -89,6 +108,8 @@ OpenAPI_amf_subscription_info_t *OpenAPI_amf_subscription_info_parseFromJSON(cJS
cJSON *amf_instance_id = NULL;
cJSON *subscription_id = NULL;
cJSON *subs_change_notify_correlation_id = NULL;
cJSON *context_info = NULL;
OpenAPI_context_info_t *context_info_local_nonprim = NULL;
amf_instance_id = cJSON_GetObjectItemCaseSensitive(amf_subscription_infoJSON, "amfInstanceId");
if (!amf_instance_id) {
ogs_error("OpenAPI_amf_subscription_info_parseFromJSON() failed [amf_instance_id]");
@ -117,14 +138,24 @@ OpenAPI_amf_subscription_info_t *OpenAPI_amf_subscription_info_parseFromJSON(cJS
}
}
context_info = cJSON_GetObjectItemCaseSensitive(amf_subscription_infoJSON, "contextInfo");
if (context_info) {
context_info_local_nonprim = OpenAPI_context_info_parseFromJSON(context_info);
}
amf_subscription_info_local_var = OpenAPI_amf_subscription_info_create (
ogs_strdup(amf_instance_id->valuestring),
ogs_strdup(subscription_id->valuestring),
subs_change_notify_correlation_id && !cJSON_IsNull(subs_change_notify_correlation_id) ? ogs_strdup(subs_change_notify_correlation_id->valuestring) : NULL
subs_change_notify_correlation_id && !cJSON_IsNull(subs_change_notify_correlation_id) ? ogs_strdup(subs_change_notify_correlation_id->valuestring) : NULL,
context_info ? context_info_local_nonprim : NULL
);
return amf_subscription_info_local_var;
end:
if (context_info_local_nonprim) {
OpenAPI_context_info_free(context_info_local_nonprim);
context_info_local_nonprim = NULL;
}
return NULL;
}