[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

@ -40,10 +40,13 @@ OpenAPI_access_token_req_t *OpenAPI_access_token_req_create(
char *requester_fqdn,
OpenAPI_list_t *requester_snpn_list,
OpenAPI_plmn_id_t *target_plmn,
OpenAPI_plmn_id_nid_t *target_snpn,
OpenAPI_list_t *target_snssai_list,
OpenAPI_list_t *target_nsi_list,
char *target_nf_set_id,
char *target_nf_service_set_id
char *target_nf_service_set_id,
char *hnrf_access_token_uri,
char *source_nf_instance_id
)
{
OpenAPI_access_token_req_t *access_token_req_local_var = ogs_malloc(sizeof(OpenAPI_access_token_req_t));
@ -61,10 +64,13 @@ OpenAPI_access_token_req_t *OpenAPI_access_token_req_create(
access_token_req_local_var->requester_fqdn = requester_fqdn;
access_token_req_local_var->requester_snpn_list = requester_snpn_list;
access_token_req_local_var->target_plmn = target_plmn;
access_token_req_local_var->target_snpn = target_snpn;
access_token_req_local_var->target_snssai_list = target_snssai_list;
access_token_req_local_var->target_nsi_list = target_nsi_list;
access_token_req_local_var->target_nf_set_id = target_nf_set_id;
access_token_req_local_var->target_nf_service_set_id = target_nf_service_set_id;
access_token_req_local_var->hnrf_access_token_uri = hnrf_access_token_uri;
access_token_req_local_var->source_nf_instance_id = source_nf_instance_id;
return access_token_req_local_var;
}
@ -121,6 +127,10 @@ void OpenAPI_access_token_req_free(OpenAPI_access_token_req_t *access_token_req)
OpenAPI_plmn_id_free(access_token_req->target_plmn);
access_token_req->target_plmn = NULL;
}
if (access_token_req->target_snpn) {
OpenAPI_plmn_id_nid_free(access_token_req->target_snpn);
access_token_req->target_snpn = NULL;
}
if (access_token_req->target_snssai_list) {
OpenAPI_list_for_each(access_token_req->target_snssai_list, node) {
OpenAPI_snssai_free(node->data);
@ -143,6 +153,14 @@ void OpenAPI_access_token_req_free(OpenAPI_access_token_req_t *access_token_req)
ogs_free(access_token_req->target_nf_service_set_id);
access_token_req->target_nf_service_set_id = NULL;
}
if (access_token_req->hnrf_access_token_uri) {
ogs_free(access_token_req->hnrf_access_token_uri);
access_token_req->hnrf_access_token_uri = NULL;
}
if (access_token_req->source_nf_instance_id) {
ogs_free(access_token_req->source_nf_instance_id);
access_token_req->source_nf_instance_id = NULL;
}
ogs_free(access_token_req);
}
@ -286,6 +304,19 @@ cJSON *OpenAPI_access_token_req_convertToJSON(OpenAPI_access_token_req_t *access
}
}
if (access_token_req->target_snpn) {
cJSON *target_snpn_local_JSON = OpenAPI_plmn_id_nid_convertToJSON(access_token_req->target_snpn);
if (target_snpn_local_JSON == NULL) {
ogs_error("OpenAPI_access_token_req_convertToJSON() failed [target_snpn]");
goto end;
}
cJSON_AddItemToObject(item, "targetSnpn", target_snpn_local_JSON);
if (item->child == NULL) {
ogs_error("OpenAPI_access_token_req_convertToJSON() failed [target_snpn]");
goto end;
}
}
if (access_token_req->target_snssai_list) {
cJSON *target_snssai_listList = cJSON_AddArrayToObject(item, "targetSnssaiList");
if (target_snssai_listList == NULL) {
@ -330,6 +361,20 @@ cJSON *OpenAPI_access_token_req_convertToJSON(OpenAPI_access_token_req_t *access
}
}
if (access_token_req->hnrf_access_token_uri) {
if (cJSON_AddStringToObject(item, "hnrfAccessTokenUri", access_token_req->hnrf_access_token_uri) == NULL) {
ogs_error("OpenAPI_access_token_req_convertToJSON() failed [hnrf_access_token_uri]");
goto end;
}
}
if (access_token_req->source_nf_instance_id) {
if (cJSON_AddStringToObject(item, "sourceNfInstanceId", access_token_req->source_nf_instance_id) == NULL) {
ogs_error("OpenAPI_access_token_req_convertToJSON() failed [source_nf_instance_id]");
goto end;
}
}
end:
return item;
}
@ -358,12 +403,16 @@ OpenAPI_access_token_req_t *OpenAPI_access_token_req_parseFromJSON(cJSON *access
OpenAPI_list_t *requester_snpn_listList = NULL;
cJSON *target_plmn = NULL;
OpenAPI_plmn_id_t *target_plmn_local_nonprim = NULL;
cJSON *target_snpn = NULL;
OpenAPI_plmn_id_nid_t *target_snpn_local_nonprim = NULL;
cJSON *target_snssai_list = NULL;
OpenAPI_list_t *target_snssai_listList = NULL;
cJSON *target_nsi_list = NULL;
OpenAPI_list_t *target_nsi_listList = NULL;
cJSON *target_nf_set_id = NULL;
cJSON *target_nf_service_set_id = NULL;
cJSON *hnrf_access_token_uri = NULL;
cJSON *source_nf_instance_id = NULL;
grant_type = cJSON_GetObjectItemCaseSensitive(access_token_reqJSON, "grant_type");
if (!grant_type) {
ogs_error("OpenAPI_access_token_req_parseFromJSON() failed [grant_type]");
@ -514,6 +563,11 @@ OpenAPI_access_token_req_t *OpenAPI_access_token_req_parseFromJSON(cJSON *access
target_plmn_local_nonprim = OpenAPI_plmn_id_parseFromJSON(target_plmn);
}
target_snpn = cJSON_GetObjectItemCaseSensitive(access_token_reqJSON, "targetSnpn");
if (target_snpn) {
target_snpn_local_nonprim = OpenAPI_plmn_id_nid_parseFromJSON(target_snpn);
}
target_snssai_list = cJSON_GetObjectItemCaseSensitive(access_token_reqJSON, "targetSnssaiList");
if (target_snssai_list) {
cJSON *target_snssai_list_local = NULL;
@ -576,6 +630,22 @@ OpenAPI_access_token_req_t *OpenAPI_access_token_req_parseFromJSON(cJSON *access
}
}
hnrf_access_token_uri = cJSON_GetObjectItemCaseSensitive(access_token_reqJSON, "hnrfAccessTokenUri");
if (hnrf_access_token_uri) {
if (!cJSON_IsString(hnrf_access_token_uri) && !cJSON_IsNull(hnrf_access_token_uri)) {
ogs_error("OpenAPI_access_token_req_parseFromJSON() failed [hnrf_access_token_uri]");
goto end;
}
}
source_nf_instance_id = cJSON_GetObjectItemCaseSensitive(access_token_reqJSON, "sourceNfInstanceId");
if (source_nf_instance_id) {
if (!cJSON_IsString(source_nf_instance_id) && !cJSON_IsNull(source_nf_instance_id)) {
ogs_error("OpenAPI_access_token_req_parseFromJSON() failed [source_nf_instance_id]");
goto end;
}
}
access_token_req_local_var = OpenAPI_access_token_req_create (
grant_typeVariable,
ogs_strdup(nf_instance_id->valuestring),
@ -589,10 +659,13 @@ OpenAPI_access_token_req_t *OpenAPI_access_token_req_parseFromJSON(cJSON *access
requester_fqdn && !cJSON_IsNull(requester_fqdn) ? ogs_strdup(requester_fqdn->valuestring) : NULL,
requester_snpn_list ? requester_snpn_listList : NULL,
target_plmn ? target_plmn_local_nonprim : NULL,
target_snpn ? target_snpn_local_nonprim : NULL,
target_snssai_list ? target_snssai_listList : NULL,
target_nsi_list ? target_nsi_listList : NULL,
target_nf_set_id && !cJSON_IsNull(target_nf_set_id) ? ogs_strdup(target_nf_set_id->valuestring) : NULL,
target_nf_service_set_id && !cJSON_IsNull(target_nf_service_set_id) ? ogs_strdup(target_nf_service_set_id->valuestring) : NULL
target_nf_service_set_id && !cJSON_IsNull(target_nf_service_set_id) ? ogs_strdup(target_nf_service_set_id->valuestring) : NULL,
hnrf_access_token_uri && !cJSON_IsNull(hnrf_access_token_uri) ? ogs_strdup(hnrf_access_token_uri->valuestring) : NULL,
source_nf_instance_id && !cJSON_IsNull(source_nf_instance_id) ? ogs_strdup(source_nf_instance_id->valuestring) : NULL
);
return access_token_req_local_var;
@ -626,6 +699,10 @@ end:
OpenAPI_plmn_id_free(target_plmn_local_nonprim);
target_plmn_local_nonprim = NULL;
}
if (target_snpn_local_nonprim) {
OpenAPI_plmn_id_nid_free(target_snpn_local_nonprim);
target_snpn_local_nonprim = NULL;
}
if (target_snssai_listList) {
OpenAPI_list_for_each(target_snssai_listList, node) {
OpenAPI_snssai_free(node->data);