[openapi] Add support for nullable fields

Depending on the OpenAPI yaml files, fields can be marked as "nullable".
Which means that the field can be either present, not present, or null.

This feature is important for example in SmContextUpdateData structure,
where many fields are described similar as the following:
This IE shall be included for the modification .... For deleting the
field, it shall contain the Null value.
This commit is contained in:
Bostjan Meglic 2023-10-05 13:39:14 +02:00 committed by Sukchan Lee
parent 7ea37ef618
commit 50464d174e
154 changed files with 2773 additions and 0 deletions

View file

@ -8,29 +8,39 @@ OpenAPI_qos_data_t *OpenAPI_qos_data_create(
char *qos_id,
bool is__5qi,
int _5qi,
bool is_maxbr_ul_null,
char *maxbr_ul,
bool is_maxbr_dl_null,
char *maxbr_dl,
bool is_gbr_ul_null,
char *gbr_ul,
bool is_gbr_dl_null,
char *gbr_dl,
OpenAPI_arp_t *arp,
bool is_qnc,
int qnc,
bool is_priority_level_null,
bool is_priority_level,
int priority_level,
bool is_aver_window_null,
bool is_aver_window,
int aver_window,
bool is_max_data_burst_vol_null,
bool is_max_data_burst_vol,
int max_data_burst_vol,
bool is_reflective_qos,
int reflective_qos,
char *sharing_key_dl,
char *sharing_key_ul,
bool is_max_packet_loss_rate_dl_null,
bool is_max_packet_loss_rate_dl,
int max_packet_loss_rate_dl,
bool is_max_packet_loss_rate_ul_null,
bool is_max_packet_loss_rate_ul,
int max_packet_loss_rate_ul,
bool is_def_qos_flow_indication,
int def_qos_flow_indication,
bool is_ext_max_data_burst_vol_null,
bool is_ext_max_data_burst_vol,
int ext_max_data_burst_vol,
bool is_packet_delay_budget,
@ -44,29 +54,39 @@ OpenAPI_qos_data_t *OpenAPI_qos_data_create(
qos_data_local_var->qos_id = qos_id;
qos_data_local_var->is__5qi = is__5qi;
qos_data_local_var->_5qi = _5qi;
qos_data_local_var->is_maxbr_ul_null = is_maxbr_ul_null;
qos_data_local_var->maxbr_ul = maxbr_ul;
qos_data_local_var->is_maxbr_dl_null = is_maxbr_dl_null;
qos_data_local_var->maxbr_dl = maxbr_dl;
qos_data_local_var->is_gbr_ul_null = is_gbr_ul_null;
qos_data_local_var->gbr_ul = gbr_ul;
qos_data_local_var->is_gbr_dl_null = is_gbr_dl_null;
qos_data_local_var->gbr_dl = gbr_dl;
qos_data_local_var->arp = arp;
qos_data_local_var->is_qnc = is_qnc;
qos_data_local_var->qnc = qnc;
qos_data_local_var->is_priority_level_null = is_priority_level_null;
qos_data_local_var->is_priority_level = is_priority_level;
qos_data_local_var->priority_level = priority_level;
qos_data_local_var->is_aver_window_null = is_aver_window_null;
qos_data_local_var->is_aver_window = is_aver_window;
qos_data_local_var->aver_window = aver_window;
qos_data_local_var->is_max_data_burst_vol_null = is_max_data_burst_vol_null;
qos_data_local_var->is_max_data_burst_vol = is_max_data_burst_vol;
qos_data_local_var->max_data_burst_vol = max_data_burst_vol;
qos_data_local_var->is_reflective_qos = is_reflective_qos;
qos_data_local_var->reflective_qos = reflective_qos;
qos_data_local_var->sharing_key_dl = sharing_key_dl;
qos_data_local_var->sharing_key_ul = sharing_key_ul;
qos_data_local_var->is_max_packet_loss_rate_dl_null = is_max_packet_loss_rate_dl_null;
qos_data_local_var->is_max_packet_loss_rate_dl = is_max_packet_loss_rate_dl;
qos_data_local_var->max_packet_loss_rate_dl = max_packet_loss_rate_dl;
qos_data_local_var->is_max_packet_loss_rate_ul_null = is_max_packet_loss_rate_ul_null;
qos_data_local_var->is_max_packet_loss_rate_ul = is_max_packet_loss_rate_ul;
qos_data_local_var->max_packet_loss_rate_ul = max_packet_loss_rate_ul;
qos_data_local_var->is_def_qos_flow_indication = is_def_qos_flow_indication;
qos_data_local_var->def_qos_flow_indication = def_qos_flow_indication;
qos_data_local_var->is_ext_max_data_burst_vol_null = is_ext_max_data_burst_vol_null;
qos_data_local_var->is_ext_max_data_burst_vol = is_ext_max_data_burst_vol;
qos_data_local_var->ext_max_data_burst_vol = ext_max_data_burst_vol;
qos_data_local_var->is_packet_delay_budget = is_packet_delay_budget;
@ -154,6 +174,11 @@ cJSON *OpenAPI_qos_data_convertToJSON(OpenAPI_qos_data_t *qos_data)
ogs_error("OpenAPI_qos_data_convertToJSON() failed [maxbr_ul]");
goto end;
}
} else if (qos_data->is_maxbr_ul_null) {
if (cJSON_AddNullToObject(item, "maxbrUl") == NULL) {
ogs_error("OpenAPI_qos_data_convertToJSON() failed [maxbr_ul]");
goto end;
}
}
if (qos_data->maxbr_dl) {
@ -161,6 +186,11 @@ cJSON *OpenAPI_qos_data_convertToJSON(OpenAPI_qos_data_t *qos_data)
ogs_error("OpenAPI_qos_data_convertToJSON() failed [maxbr_dl]");
goto end;
}
} else if (qos_data->is_maxbr_dl_null) {
if (cJSON_AddNullToObject(item, "maxbrDl") == NULL) {
ogs_error("OpenAPI_qos_data_convertToJSON() failed [maxbr_dl]");
goto end;
}
}
if (qos_data->gbr_ul) {
@ -168,6 +198,11 @@ cJSON *OpenAPI_qos_data_convertToJSON(OpenAPI_qos_data_t *qos_data)
ogs_error("OpenAPI_qos_data_convertToJSON() failed [gbr_ul]");
goto end;
}
} else if (qos_data->is_gbr_ul_null) {
if (cJSON_AddNullToObject(item, "gbrUl") == NULL) {
ogs_error("OpenAPI_qos_data_convertToJSON() failed [gbr_ul]");
goto end;
}
}
if (qos_data->gbr_dl) {
@ -175,6 +210,11 @@ cJSON *OpenAPI_qos_data_convertToJSON(OpenAPI_qos_data_t *qos_data)
ogs_error("OpenAPI_qos_data_convertToJSON() failed [gbr_dl]");
goto end;
}
} else if (qos_data->is_gbr_dl_null) {
if (cJSON_AddNullToObject(item, "gbrDl") == NULL) {
ogs_error("OpenAPI_qos_data_convertToJSON() failed [gbr_dl]");
goto end;
}
}
if (qos_data->arp) {
@ -202,6 +242,11 @@ cJSON *OpenAPI_qos_data_convertToJSON(OpenAPI_qos_data_t *qos_data)
ogs_error("OpenAPI_qos_data_convertToJSON() failed [priority_level]");
goto end;
}
} else if (qos_data->is_priority_level_null) {
if (cJSON_AddNullToObject(item, "priorityLevel") == NULL) {
ogs_error("OpenAPI_qos_data_convertToJSON() failed [priority_level]");
goto end;
}
}
if (qos_data->is_aver_window) {
@ -209,6 +254,11 @@ cJSON *OpenAPI_qos_data_convertToJSON(OpenAPI_qos_data_t *qos_data)
ogs_error("OpenAPI_qos_data_convertToJSON() failed [aver_window]");
goto end;
}
} else if (qos_data->is_aver_window_null) {
if (cJSON_AddNullToObject(item, "averWindow") == NULL) {
ogs_error("OpenAPI_qos_data_convertToJSON() failed [aver_window]");
goto end;
}
}
if (qos_data->is_max_data_burst_vol) {
@ -216,6 +266,11 @@ cJSON *OpenAPI_qos_data_convertToJSON(OpenAPI_qos_data_t *qos_data)
ogs_error("OpenAPI_qos_data_convertToJSON() failed [max_data_burst_vol]");
goto end;
}
} else if (qos_data->is_max_data_burst_vol_null) {
if (cJSON_AddNullToObject(item, "maxDataBurstVol") == NULL) {
ogs_error("OpenAPI_qos_data_convertToJSON() failed [max_data_burst_vol]");
goto end;
}
}
if (qos_data->is_reflective_qos) {
@ -244,6 +299,11 @@ cJSON *OpenAPI_qos_data_convertToJSON(OpenAPI_qos_data_t *qos_data)
ogs_error("OpenAPI_qos_data_convertToJSON() failed [max_packet_loss_rate_dl]");
goto end;
}
} else if (qos_data->is_max_packet_loss_rate_dl_null) {
if (cJSON_AddNullToObject(item, "maxPacketLossRateDl") == NULL) {
ogs_error("OpenAPI_qos_data_convertToJSON() failed [max_packet_loss_rate_dl]");
goto end;
}
}
if (qos_data->is_max_packet_loss_rate_ul) {
@ -251,6 +311,11 @@ cJSON *OpenAPI_qos_data_convertToJSON(OpenAPI_qos_data_t *qos_data)
ogs_error("OpenAPI_qos_data_convertToJSON() failed [max_packet_loss_rate_ul]");
goto end;
}
} else if (qos_data->is_max_packet_loss_rate_ul_null) {
if (cJSON_AddNullToObject(item, "maxPacketLossRateUl") == NULL) {
ogs_error("OpenAPI_qos_data_convertToJSON() failed [max_packet_loss_rate_ul]");
goto end;
}
}
if (qos_data->is_def_qos_flow_indication) {
@ -265,6 +330,11 @@ cJSON *OpenAPI_qos_data_convertToJSON(OpenAPI_qos_data_t *qos_data)
ogs_error("OpenAPI_qos_data_convertToJSON() failed [ext_max_data_burst_vol]");
goto end;
}
} else if (qos_data->is_ext_max_data_burst_vol_null) {
if (cJSON_AddNullToObject(item, "extMaxDataBurstVol") == NULL) {
ogs_error("OpenAPI_qos_data_convertToJSON() failed [ext_max_data_burst_vol]");
goto end;
}
}
if (qos_data->is_packet_delay_budget) {
@ -330,35 +400,43 @@ OpenAPI_qos_data_t *OpenAPI_qos_data_parseFromJSON(cJSON *qos_dataJSON)
maxbr_ul = cJSON_GetObjectItemCaseSensitive(qos_dataJSON, "maxbrUl");
if (maxbr_ul) {
if (!cJSON_IsNull(maxbr_ul)) {
if (!cJSON_IsString(maxbr_ul) && !cJSON_IsNull(maxbr_ul)) {
ogs_error("OpenAPI_qos_data_parseFromJSON() failed [maxbr_ul]");
goto end;
}
}
}
maxbr_dl = cJSON_GetObjectItemCaseSensitive(qos_dataJSON, "maxbrDl");
if (maxbr_dl) {
if (!cJSON_IsNull(maxbr_dl)) {
if (!cJSON_IsString(maxbr_dl) && !cJSON_IsNull(maxbr_dl)) {
ogs_error("OpenAPI_qos_data_parseFromJSON() failed [maxbr_dl]");
goto end;
}
}
}
gbr_ul = cJSON_GetObjectItemCaseSensitive(qos_dataJSON, "gbrUl");
if (gbr_ul) {
if (!cJSON_IsNull(gbr_ul)) {
if (!cJSON_IsString(gbr_ul) && !cJSON_IsNull(gbr_ul)) {
ogs_error("OpenAPI_qos_data_parseFromJSON() failed [gbr_ul]");
goto end;
}
}
}
gbr_dl = cJSON_GetObjectItemCaseSensitive(qos_dataJSON, "gbrDl");
if (gbr_dl) {
if (!cJSON_IsNull(gbr_dl)) {
if (!cJSON_IsString(gbr_dl) && !cJSON_IsNull(gbr_dl)) {
ogs_error("OpenAPI_qos_data_parseFromJSON() failed [gbr_dl]");
goto end;
}
}
}
arp = cJSON_GetObjectItemCaseSensitive(qos_dataJSON, "arp");
if (arp) {
@ -379,27 +457,33 @@ OpenAPI_qos_data_t *OpenAPI_qos_data_parseFromJSON(cJSON *qos_dataJSON)
priority_level = cJSON_GetObjectItemCaseSensitive(qos_dataJSON, "priorityLevel");
if (priority_level) {
if (!cJSON_IsNull(priority_level)) {
if (!cJSON_IsNumber(priority_level)) {
ogs_error("OpenAPI_qos_data_parseFromJSON() failed [priority_level]");
goto end;
}
}
}
aver_window = cJSON_GetObjectItemCaseSensitive(qos_dataJSON, "averWindow");
if (aver_window) {
if (!cJSON_IsNull(aver_window)) {
if (!cJSON_IsNumber(aver_window)) {
ogs_error("OpenAPI_qos_data_parseFromJSON() failed [aver_window]");
goto end;
}
}
}
max_data_burst_vol = cJSON_GetObjectItemCaseSensitive(qos_dataJSON, "maxDataBurstVol");
if (max_data_burst_vol) {
if (!cJSON_IsNull(max_data_burst_vol)) {
if (!cJSON_IsNumber(max_data_burst_vol)) {
ogs_error("OpenAPI_qos_data_parseFromJSON() failed [max_data_burst_vol]");
goto end;
}
}
}
reflective_qos = cJSON_GetObjectItemCaseSensitive(qos_dataJSON, "reflectiveQos");
if (reflective_qos) {
@ -427,19 +511,23 @@ OpenAPI_qos_data_t *OpenAPI_qos_data_parseFromJSON(cJSON *qos_dataJSON)
max_packet_loss_rate_dl = cJSON_GetObjectItemCaseSensitive(qos_dataJSON, "maxPacketLossRateDl");
if (max_packet_loss_rate_dl) {
if (!cJSON_IsNull(max_packet_loss_rate_dl)) {
if (!cJSON_IsNumber(max_packet_loss_rate_dl)) {
ogs_error("OpenAPI_qos_data_parseFromJSON() failed [max_packet_loss_rate_dl]");
goto end;
}
}
}
max_packet_loss_rate_ul = cJSON_GetObjectItemCaseSensitive(qos_dataJSON, "maxPacketLossRateUl");
if (max_packet_loss_rate_ul) {
if (!cJSON_IsNull(max_packet_loss_rate_ul)) {
if (!cJSON_IsNumber(max_packet_loss_rate_ul)) {
ogs_error("OpenAPI_qos_data_parseFromJSON() failed [max_packet_loss_rate_ul]");
goto end;
}
}
}
def_qos_flow_indication = cJSON_GetObjectItemCaseSensitive(qos_dataJSON, "defQosFlowIndication");
if (def_qos_flow_indication) {
@ -451,11 +539,13 @@ OpenAPI_qos_data_t *OpenAPI_qos_data_parseFromJSON(cJSON *qos_dataJSON)
ext_max_data_burst_vol = cJSON_GetObjectItemCaseSensitive(qos_dataJSON, "extMaxDataBurstVol");
if (ext_max_data_burst_vol) {
if (!cJSON_IsNull(ext_max_data_burst_vol)) {
if (!cJSON_IsNumber(ext_max_data_burst_vol)) {
ogs_error("OpenAPI_qos_data_parseFromJSON() failed [ext_max_data_burst_vol]");
goto end;
}
}
}
packet_delay_budget = cJSON_GetObjectItemCaseSensitive(qos_dataJSON, "packetDelayBudget");
if (packet_delay_budget) {
@ -477,29 +567,39 @@ OpenAPI_qos_data_t *OpenAPI_qos_data_parseFromJSON(cJSON *qos_dataJSON)
ogs_strdup(qos_id->valuestring),
_5qi ? true : false,
_5qi ? _5qi->valuedouble : 0,
maxbr_ul && cJSON_IsNull(maxbr_ul) ? true : false,
maxbr_ul && !cJSON_IsNull(maxbr_ul) ? ogs_strdup(maxbr_ul->valuestring) : NULL,
maxbr_dl && cJSON_IsNull(maxbr_dl) ? true : false,
maxbr_dl && !cJSON_IsNull(maxbr_dl) ? ogs_strdup(maxbr_dl->valuestring) : NULL,
gbr_ul && cJSON_IsNull(gbr_ul) ? true : false,
gbr_ul && !cJSON_IsNull(gbr_ul) ? ogs_strdup(gbr_ul->valuestring) : NULL,
gbr_dl && cJSON_IsNull(gbr_dl) ? true : false,
gbr_dl && !cJSON_IsNull(gbr_dl) ? ogs_strdup(gbr_dl->valuestring) : NULL,
arp ? arp_local_nonprim : NULL,
qnc ? true : false,
qnc ? qnc->valueint : 0,
priority_level && cJSON_IsNull(priority_level) ? true : false,
priority_level ? true : false,
priority_level ? priority_level->valuedouble : 0,
aver_window && cJSON_IsNull(aver_window) ? true : false,
aver_window ? true : false,
aver_window ? aver_window->valuedouble : 0,
max_data_burst_vol && cJSON_IsNull(max_data_burst_vol) ? true : false,
max_data_burst_vol ? true : false,
max_data_burst_vol ? max_data_burst_vol->valuedouble : 0,
reflective_qos ? true : false,
reflective_qos ? reflective_qos->valueint : 0,
sharing_key_dl && !cJSON_IsNull(sharing_key_dl) ? ogs_strdup(sharing_key_dl->valuestring) : NULL,
sharing_key_ul && !cJSON_IsNull(sharing_key_ul) ? ogs_strdup(sharing_key_ul->valuestring) : NULL,
max_packet_loss_rate_dl && cJSON_IsNull(max_packet_loss_rate_dl) ? true : false,
max_packet_loss_rate_dl ? true : false,
max_packet_loss_rate_dl ? max_packet_loss_rate_dl->valuedouble : 0,
max_packet_loss_rate_ul && cJSON_IsNull(max_packet_loss_rate_ul) ? true : false,
max_packet_loss_rate_ul ? true : false,
max_packet_loss_rate_ul ? max_packet_loss_rate_ul->valuedouble : 0,
def_qos_flow_indication ? true : false,
def_qos_flow_indication ? def_qos_flow_indication->valueint : 0,
ext_max_data_burst_vol && cJSON_IsNull(ext_max_data_burst_vol) ? true : false,
ext_max_data_burst_vol ? true : false,
ext_max_data_burst_vol ? ext_max_data_burst_vol->valuedouble : 0,
packet_delay_budget ? true : false,