vrr/open5gs
2
0
Fork 0
mirror of https://github.com/open5gs/open5gs.git synced 2026-05-04 14:20:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

arch: DB schema Changes (#796)

Browse source 
- New function : NSSF
- New feature : SMF selection
This commit is contained in:
Sukchan Lee 2021-03-08 21:25:09 +09:00
parent c6bfbed922
commit 9af4268bab
691 changed files with 40727 additions and 18985 deletions
Download patch file Download diff file Expand all files Collapse all files

147
lib/sbi/openapi/model/nef_info.c
View file

@ -7,7 +7,10 @@
OpenAPI_nef_info_t *OpenAPI_nef_info_create(
char *nef_id,
OpenAPI_pfd_data_t *pfd_data,
OpenAPI_af_event_exposure_data_t *af_ee_data
OpenAPI_af_event_exposure_data_t *af_ee_data,
OpenAPI_list_t *gpsi_ranges,
OpenAPI_list_t *external_group_identifiers_ranges,
OpenAPI_list_t *served_fqdn_list
)
{
OpenAPI_nef_info_t *nef_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_nef_info_t));
@ -17,6 +20,9 @@ OpenAPI_nef_info_t *OpenAPI_nef_info_create(
nef_info_local_var->nef_id = nef_id;
nef_info_local_var->pfd_data = pfd_data;
nef_info_local_var->af_ee_data = af_ee_data;
nef_info_local_var->gpsi_ranges = gpsi_ranges;
nef_info_local_var->external_group_identifiers_ranges = external_group_identifiers_ranges;
nef_info_local_var->served_fqdn_list = served_fqdn_list;
return nef_info_local_var;
}
@ -30,6 +36,18 @@ void OpenAPI_nef_info_free(OpenAPI_nef_info_t *nef_info)
ogs_free(nef_info->nef_id);
OpenAPI_pfd_data_free(nef_info->pfd_data);
OpenAPI_af_event_exposure_data_free(nef_info->af_ee_data);
OpenAPI_list_for_each(nef_info->gpsi_ranges, node) {
OpenAPI_identity_range_free(node->data);
}
OpenAPI_list_free(nef_info->gpsi_ranges);
OpenAPI_list_for_each(nef_info->external_group_identifiers_ranges, node) {
OpenAPI_identity_range_free(node->data);
}
OpenAPI_list_free(nef_info->external_group_identifiers_ranges);
OpenAPI_list_for_each(nef_info->served_fqdn_list, node) {
ogs_free(node->data);
}
OpenAPI_list_free(nef_info->served_fqdn_list);
ogs_free(nef_info);
}
@ -76,6 +94,62 @@ cJSON *OpenAPI_nef_info_convertToJSON(OpenAPI_nef_info_t *nef_info)
}
}
if (nef_info->gpsi_ranges) {
cJSON *gpsi_rangesList = cJSON_AddArrayToObject(item, "gpsiRanges");
if (gpsi_rangesList == NULL) {
ogs_error("OpenAPI_nef_info_convertToJSON() failed [gpsi_ranges]");
goto end;
}
OpenAPI_lnode_t *gpsi_ranges_node;
if (nef_info->gpsi_ranges) {
OpenAPI_list_for_each(nef_info->gpsi_ranges, gpsi_ranges_node) {
cJSON *itemLocal = OpenAPI_identity_range_convertToJSON(gpsi_ranges_node->data);
if (itemLocal == NULL) {
ogs_error("OpenAPI_nef_info_convertToJSON() failed [gpsi_ranges]");
goto end;
}
cJSON_AddItemToArray(gpsi_rangesList, itemLocal);
}
}
}
if (nef_info->external_group_identifiers_ranges) {
cJSON *external_group_identifiers_rangesList = cJSON_AddArrayToObject(item, "externalGroupIdentifiersRanges");
if (external_group_identifiers_rangesList == NULL) {
ogs_error("OpenAPI_nef_info_convertToJSON() failed [external_group_identifiers_ranges]");
goto end;
}
OpenAPI_lnode_t *external_group_identifiers_ranges_node;
if (nef_info->external_group_identifiers_ranges) {
OpenAPI_list_for_each(nef_info->external_group_identifiers_ranges, external_group_identifiers_ranges_node) {
cJSON *itemLocal = OpenAPI_identity_range_convertToJSON(external_group_identifiers_ranges_node->data);
if (itemLocal == NULL) {
ogs_error("OpenAPI_nef_info_convertToJSON() failed [external_group_identifiers_ranges]");
goto end;
}
cJSON_AddItemToArray(external_group_identifiers_rangesList, itemLocal);
}
}
}
if (nef_info->served_fqdn_list) {
cJSON *served_fqdn_list = cJSON_AddArrayToObject(item, "servedFqdnList");
if (served_fqdn_list == NULL) {
ogs_error("OpenAPI_nef_info_convertToJSON() failed [served_fqdn_list]");
goto end;
}
OpenAPI_lnode_t *served_fqdn_list_node;
OpenAPI_list_for_each(nef_info->served_fqdn_list, served_fqdn_list_node) {
if (cJSON_AddStringToObject(served_fqdn_list, "", (char*)served_fqdn_list_node->data) == NULL) {
ogs_error("OpenAPI_nef_info_convertToJSON() failed [served_fqdn_list]");
goto end;
}
}
}
end:
return item;
}
@ -106,10 +180,79 @@ OpenAPI_nef_info_t *OpenAPI_nef_info_parseFromJSON(cJSON *nef_infoJSON)
af_ee_data_local_nonprim = OpenAPI_af_event_exposure_data_parseFromJSON(af_ee_data);
}
cJSON *gpsi_ranges = cJSON_GetObjectItemCaseSensitive(nef_infoJSON, "gpsiRanges");
OpenAPI_list_t *gpsi_rangesList;
if (gpsi_ranges) {
cJSON *gpsi_ranges_local_nonprimitive;
if (!cJSON_IsArray(gpsi_ranges)) {
ogs_error("OpenAPI_nef_info_parseFromJSON() failed [gpsi_ranges]");
goto end;
}
gpsi_rangesList = OpenAPI_list_create();
cJSON_ArrayForEach(gpsi_ranges_local_nonprimitive, gpsi_ranges ) {
if (!cJSON_IsObject(gpsi_ranges_local_nonprimitive)) {
ogs_error("OpenAPI_nef_info_parseFromJSON() failed [gpsi_ranges]");
goto end;
}
OpenAPI_identity_range_t *gpsi_rangesItem = OpenAPI_identity_range_parseFromJSON(gpsi_ranges_local_nonprimitive);
OpenAPI_list_add(gpsi_rangesList, gpsi_rangesItem);
}
}
cJSON *external_group_identifiers_ranges = cJSON_GetObjectItemCaseSensitive(nef_infoJSON, "externalGroupIdentifiersRanges");
OpenAPI_list_t *external_group_identifiers_rangesList;
if (external_group_identifiers_ranges) {
cJSON *external_group_identifiers_ranges_local_nonprimitive;
if (!cJSON_IsArray(external_group_identifiers_ranges)) {
ogs_error("OpenAPI_nef_info_parseFromJSON() failed [external_group_identifiers_ranges]");
goto end;
}
external_group_identifiers_rangesList = OpenAPI_list_create();
cJSON_ArrayForEach(external_group_identifiers_ranges_local_nonprimitive, external_group_identifiers_ranges ) {
if (!cJSON_IsObject(external_group_identifiers_ranges_local_nonprimitive)) {
ogs_error("OpenAPI_nef_info_parseFromJSON() failed [external_group_identifiers_ranges]");
goto end;
}
OpenAPI_identity_range_t *external_group_identifiers_rangesItem = OpenAPI_identity_range_parseFromJSON(external_group_identifiers_ranges_local_nonprimitive);
OpenAPI_list_add(external_group_identifiers_rangesList, external_group_identifiers_rangesItem);
}
}
cJSON *served_fqdn_list = cJSON_GetObjectItemCaseSensitive(nef_infoJSON, "servedFqdnList");
OpenAPI_list_t *served_fqdn_listList;
if (served_fqdn_list) {
cJSON *served_fqdn_list_local;
if (!cJSON_IsArray(served_fqdn_list)) {
ogs_error("OpenAPI_nef_info_parseFromJSON() failed [served_fqdn_list]");
goto end;
}
served_fqdn_listList = OpenAPI_list_create();
cJSON_ArrayForEach(served_fqdn_list_local, served_fqdn_list) {
if (!cJSON_IsString(served_fqdn_list_local)) {
ogs_error("OpenAPI_nef_info_parseFromJSON() failed [served_fqdn_list]");
goto end;
}
OpenAPI_list_add(served_fqdn_listList, ogs_strdup(served_fqdn_list_local->valuestring));
}
}
nef_info_local_var = OpenAPI_nef_info_create (
nef_id ? ogs_strdup(nef_id->valuestring) : NULL,
pfd_data ? pfd_data_local_nonprim : NULL,
af_ee_data ? af_ee_data_local_nonprim : NULL
af_ee_data ? af_ee_data_local_nonprim : NULL,
gpsi_ranges ? gpsi_rangesList : NULL,
external_group_identifiers_ranges ? external_group_identifiers_rangesList : NULL,
served_fqdn_list ? served_fqdn_listList : NULL
);
return nef_info_local_var;