acouzens
/
open5gs
1
0
Fork 1
Code Issues Pull Requests 1 Projects Releases Wiki Activity

SBI updated 

- openapi-generator version 5.2.0
- add priority/capacity/load in NFProfile/NFService
- add AllowedNfTypes in NFProfile/NFService
This commit is contained in:
Sukchan Lee 2021-07-16 17:02:33 +09:00
parent 1326fc85dc
commit 039b9d0aaa
930 changed files with 7387 additions and 5434 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
lib/sbi/context.c
View File

@ -514,11 +514,28 @@ ogs_sbi_nf_instance_t *ogs_sbi_nf_instance_add(char *id)
ogs_app()->timer_mgr, NULL, nf_instance);
ogs_assert(nf_instance->t_validity);
nf_instance->priority = OGS_SBI_DEFAULT_PRIORITY;
nf_instance->capacity = OGS_SBI_DEFAULT_CAPACITY;
nf_instance->load = OGS_SBI_DEFAULT_LOAD;
ogs_list_add(&ogs_sbi_self()->nf_instance_list, nf_instance);
return nf_instance;
}
void ogs_sbi_nf_instance_add_allowed_nf_type(
ogs_sbi_nf_instance_t *nf_instance, OpenAPI_nf_type_e allowed_nf_type)
{
ogs_assert(nf_instance);
ogs_assert(allowed_nf_type);
if (nf_instance->num_of_allowed_nf_type < OGS_SBI_MAX_NUM_OF_NF_TYPE) {
nf_instance->allowed_nf_types[nf_instance->num_of_allowed_nf_type] =
allowed_nf_type;
nf_instance->num_of_allowed_nf_type++;
}
}
void ogs_sbi_nf_instance_clear(ogs_sbi_nf_instance_t *nf_instance)
{
int i;
@ -536,6 +553,8 @@ void ogs_sbi_nf_instance_clear(ogs_sbi_nf_instance_t *nf_instance)
ogs_freeaddrinfo(nf_instance->ipv6[i]);
}
nf_instance->num_of_ipv6 = 0;
nf_instance->num_of_allowed_nf_type = 0;
}
void ogs_sbi_nf_instance_remove(ogs_sbi_nf_instance_t *nf_instance)
@ -620,6 +639,10 @@ ogs_sbi_nf_service_t *ogs_sbi_nf_service_add(ogs_sbi_nf_instance_t *nf_instance,
nf_service->status = OpenAPI_nf_service_status_REGISTERED;
nf_service->priority = OGS_SBI_DEFAULT_PRIORITY;
nf_service->capacity = OGS_SBI_DEFAULT_CAPACITY;
nf_service->load = OGS_SBI_DEFAULT_LOAD;
nf_service->nf_instance = nf_instance;
ogs_list_add(&nf_instance->nf_service_list, nf_service);
@ -653,6 +676,19 @@ void ogs_sbi_nf_service_add_version(ogs_sbi_nf_service_t *nf_service,
}
}
void ogs_sbi_nf_service_add_allowed_nf_type(
ogs_sbi_nf_service_t *nf_service, OpenAPI_nf_type_e allowed_nf_type)
{
ogs_assert(nf_service);
ogs_assert(allowed_nf_type);
if (nf_service->num_of_allowed_nf_type < OGS_SBI_MAX_NUM_OF_NF_TYPE) {
nf_service->allowed_nf_types[nf_service->num_of_allowed_nf_type] =
allowed_nf_type;
nf_service->num_of_allowed_nf_type++;
}
}
void ogs_sbi_nf_service_clear(ogs_sbi_nf_service_t *nf_service)
{
ogs_sbi_nf_instance_t *nf_instance = NULL;
@ -679,6 +715,8 @@ void ogs_sbi_nf_service_clear(ogs_sbi_nf_service_t *nf_service)
ogs_freeaddrinfo(nf_service->addr[i].ipv6);
}
nf_service->num_of_addr = 0;
nf_service->num_of_allowed_nf_type = 0;
}
void ogs_sbi_nf_service_remove(ogs_sbi_nf_service_t *nf_service)

22
lib/sbi/context.h
View File

@ -94,6 +94,17 @@ typedef struct ogs_sbi_nf_instance_s {
int num_of_ipv6;
ogs_sockaddr_t *ipv6[OGS_SBI_MAX_NUM_OF_IP_ADDRESS];
#define OGS_SBI_MAX_NUM_OF_NF_TYPE 16
int num_of_allowed_nf_type;
OpenAPI_nf_type_e allowed_nf_types[OGS_SBI_MAX_NUM_OF_NF_TYPE];
#define OGS_SBI_DEFAULT_PRIORITY 0
#define OGS_SBI_DEFAULT_CAPACITY 100
#define OGS_SBI_DEFAULT_LOAD 0
int priority;
int capacity;
int load;
ogs_list_t nf_service_list;
void *client; /* only used in CLIENT */
@ -170,6 +181,13 @@ typedef struct ogs_sbi_nf_service_s {
int port;
} addr[OGS_SBI_MAX_NUM_OF_IP_ADDRESS];
int num_of_allowed_nf_type;
OpenAPI_nf_type_e allowed_nf_types[OGS_SBI_MAX_NUM_OF_NF_TYPE];
int priority;
int capacity;
int load;
/* Related Context */
ogs_sbi_nf_instance_t *nf_instance;
void *client;
@ -238,6 +256,8 @@ ogs_sbi_context_t *ogs_sbi_self(void);
int ogs_sbi_context_parse_config(const char *local, const char *remote);
ogs_sbi_nf_instance_t *ogs_sbi_nf_instance_add(char *id);
void ogs_sbi_nf_instance_add_allowed_nf_type(
ogs_sbi_nf_instance_t *nf_instance, OpenAPI_nf_type_e allowed_nf_type);
void ogs_sbi_nf_instance_clear(ogs_sbi_nf_instance_t *nf_instance);
void ogs_sbi_nf_instance_remove(ogs_sbi_nf_instance_t *nf_instance);
void ogs_sbi_nf_instance_remove_all(void);
@ -247,6 +267,8 @@ ogs_sbi_nf_service_t *ogs_sbi_nf_service_add(ogs_sbi_nf_instance_t *nf_instance,
char *id, char *name, OpenAPI_uri_scheme_e scheme);
void ogs_sbi_nf_service_add_version(ogs_sbi_nf_service_t *nf_service,
char *in_uri, char *full, char *expiry);
void ogs_sbi_nf_service_add_allowed_nf_type(
ogs_sbi_nf_service_t *nf_service, OpenAPI_nf_type_e allowed_nf_type);
void ogs_sbi_nf_service_clear(ogs_sbi_nf_service_t *nf_service);
void ogs_sbi_nf_service_remove(ogs_sbi_nf_service_t *nf_service);
void ogs_sbi_nf_service_remove_all(ogs_sbi_nf_instance_t *nf_instance);

51
lib/sbi/nnrf-build.c
View File

@ -28,6 +28,7 @@ OpenAPI_nf_profile_t *ogs_nnrf_nfm_build_nf_profile(
OpenAPI_nf_profile_t *NFProfile = NULL;
OpenAPI_list_t *Ipv4AddrList = NULL;
OpenAPI_list_t *Ipv6AddrList = NULL;
OpenAPI_list_t *AllowedNfTypeList = NULL;
OpenAPI_list_t *NFServiceList = NULL;
int i = 0;
@ -52,7 +53,11 @@ OpenAPI_nf_profile_t *ogs_nnrf_nfm_build_nf_profile(
OpenAPI_nf_status_ToString(nf_instance->nf_status),
nf_instance->num_of_ipv4, nf_instance->num_of_ipv6);
if (nf_instance->time.heartbeat_interval) {
NFProfile->is_heart_beat_timer = true;
NFProfile->heart_beat_timer = nf_instance->time.heartbeat_interval;
}
NFProfile->is_nf_profile_changes_support_ind = true;
NFProfile->nf_profile_changes_support_ind = true;
if (strlen(nf_instance->fqdn)) {
@ -65,6 +70,13 @@ OpenAPI_nf_profile_t *ogs_nnrf_nfm_build_nf_profile(
ogs_trace("FQDN[%s]", nf_instance->fqdn);
}
NFProfile->is_priority = true;
NFProfile->priority = nf_instance->priority;
NFProfile->is_capacity = true;
NFProfile->capacity = nf_instance->capacity;
NFProfile->is_load = true;
NFProfile->load = nf_instance->load;
Ipv4AddrList = OpenAPI_list_create();
ogs_assert(Ipv4AddrList);
Ipv6AddrList = OpenAPI_list_create();
@ -103,6 +115,19 @@ OpenAPI_nf_profile_t *ogs_nnrf_nfm_build_nf_profile(
else
OpenAPI_list_free(Ipv6AddrList);
AllowedNfTypeList = OpenAPI_list_create();
ogs_assert(AllowedNfTypeList);
for (i = 0; i < nf_instance->num_of_allowed_nf_type; i++) {
OpenAPI_list_add(AllowedNfTypeList,
(void *)(uintptr_t)nf_instance->allowed_nf_types[i]);
}
if (AllowedNfTypeList->count)
NFProfile->allowed_nf_types = AllowedNfTypeList;
else
OpenAPI_list_free(AllowedNfTypeList);
NFServiceList = OpenAPI_list_create();
ogs_assert(NFServiceList);
@ -110,6 +135,7 @@ OpenAPI_nf_profile_t *ogs_nnrf_nfm_build_nf_profile(
OpenAPI_nf_service_t *NFService = NULL;
OpenAPI_list_t *VersionList = NULL;
OpenAPI_list_t *IpEndPointList = NULL;
OpenAPI_list_t *AllowedNfTypeList = NULL;
NFService = ogs_calloc(1, sizeof(*NFService));
ogs_expect_or_return_val(NFService, NULL);
@ -185,6 +211,7 @@ OpenAPI_nf_profile_t *ogs_nnrf_nfm_build_nf_profile(
IpEndPoint->ipv6_address = ogs_ipstrdup(ipv6);
ogs_expect_or_return_val(IpEndPoint->ipv6_address, NULL);
}
IpEndPoint->is_port = true;
IpEndPoint->port = nf_service->addr[i].port;
OpenAPI_list_add(IpEndPointList, IpEndPoint);
}
@ -195,6 +222,26 @@ OpenAPI_nf_profile_t *ogs_nnrf_nfm_build_nf_profile(
else
OpenAPI_list_free(IpEndPointList);
AllowedNfTypeList = OpenAPI_list_create();
ogs_assert(AllowedNfTypeList);
for (i = 0; i < nf_service->num_of_allowed_nf_type; i++) {
OpenAPI_list_add(AllowedNfTypeList,
(void *)(uintptr_t)nf_service->allowed_nf_types[i]);
}
if (AllowedNfTypeList->count)
NFService->allowed_nf_types = AllowedNfTypeList;
else
OpenAPI_list_free(AllowedNfTypeList);
NFService->is_priority = true;
NFService->priority = nf_service->priority;
NFService->is_capacity = true;
NFService->capacity = nf_service->capacity;
NFService->is_load = true;
NFService->load = nf_service->load;
OpenAPI_list_add(NFServiceList, NFService);
}
@ -219,6 +266,8 @@ void ogs_sbi_nnrf_free_nf_profile(OpenAPI_nf_profile_t *NFProfile)
ogs_free(node->data);
OpenAPI_list_free(NFProfile->ipv6_addresses);
OpenAPI_list_free(NFProfile->allowed_nf_types);
OpenAPI_list_for_each(NFProfile->nf_services, node) {
OpenAPI_lnode_t *node2;
OpenAPI_nf_service_t *NFService = node->data;
@ -249,6 +298,8 @@ void ogs_sbi_nnrf_free_nf_profile(OpenAPI_nf_profile_t *NFProfile)
}
OpenAPI_list_free(NFService->ip_end_points);
OpenAPI_list_free(NFService->allowed_nf_types);
if (NFService->fqdn)
ogs_free(NFService->fqdn);

35
lib/sbi/nnrf-handler.c
View File

@ -244,12 +244,20 @@ bool ogs_sbi_nnrf_handle_nf_profile(ogs_sbi_nf_instance_t *nf_instance,
nf_instance->nf_type = NFProfile->nf_type;
nf_instance->nf_status = NFProfile->nf_status;
if (NFProfile->is_heart_beat_timer == true)
nf_instance->time.heartbeat_interval = NFProfile->heart_beat_timer;
if (NFProfile->fqdn)
ogs_fqdn_parse(nf_instance->fqdn,
NFProfile->fqdn, strlen(NFProfile->fqdn));
if (NFProfile->is_priority == true)
nf_instance->priority = NFProfile->priority;
if (NFProfile->is_capacity == true)
nf_instance->capacity = NFProfile->capacity;
if (NFProfile->is_load == true)
nf_instance->load = NFProfile->load;
/* Only one time handles RegisterNFInstance operation */
OpenAPI_list_for_each(NFProfile->ipv4_addresses, node) {
ogs_sockaddr_t *addr = NULL;
@ -286,6 +294,7 @@ bool ogs_sbi_nnrf_handle_nf_profile(ogs_sbi_nf_instance_t *nf_instance,
OpenAPI_nf_service_t *NFService = node->data;
OpenAPI_list_t *VersionList = NULL;
OpenAPI_list_t *IpEndPointList = NULL;
OpenAPI_list_t *AllowedNfTypeList = NULL;
OpenAPI_lnode_t *node2 = NULL;
if (!NFService) continue;
@ -294,6 +303,7 @@ bool ogs_sbi_nnrf_handle_nf_profile(ogs_sbi_nf_instance_t *nf_instance,
VersionList = NFService->versions;
IpEndPointList = NFService->ip_end_points;
AllowedNfTypeList = NFService->allowed_nf_types;
nf_service = ogs_sbi_nf_service_find_by_id(nf_instance,
NFService->service_instance_id);
@ -329,14 +339,15 @@ bool ogs_sbi_nnrf_handle_nf_profile(ogs_sbi_nf_instance_t *nf_instance,
if (!IpEndPoint) continue;
if (nf_service->num_of_addr < OGS_SBI_MAX_NUM_OF_IP_ADDRESS) {
port = IpEndPoint->port;
if (!port) {
if (!IpEndPoint->is_port) {
if (nf_service->scheme == OpenAPI_uri_scheme_http)
port = OGS_SBI_HTTP_PORT;
else if (nf_service->scheme == OpenAPI_uri_scheme_https)
port = OGS_SBI_HTTPS_PORT;
else
continue;
} else {
port = IpEndPoint->port;
}
if (IpEndPoint->ipv4_address) {
@ -361,6 +372,26 @@ bool ogs_sbi_nnrf_handle_nf_profile(ogs_sbi_nf_instance_t *nf_instance,
}
}
}
OpenAPI_list_for_each(AllowedNfTypeList, node2) {
OpenAPI_nf_type_e AllowedNfType = (OpenAPI_nf_type_e)node2->data;
if (!AllowedNfType) continue;
if (nf_service->num_of_allowed_nf_type <
OGS_SBI_MAX_NUM_OF_NF_TYPE) {
nf_service->allowed_nf_types[
nf_service->num_of_allowed_nf_type] = AllowedNfType;
nf_service->num_of_allowed_nf_type++;
}
}
if (NFService->is_priority == true)
nf_service->priority = NFService->priority;
if (NFService->is_capacity == true)
nf_service->capacity = NFService->capacity;
if (NFService->is_load == true)
nf_service->load = NFService->load;
}
ogs_sbi_nf_info_remove_all(&nf_instance->nf_info_list);

101
lib/sbi/openapi/.openapi-generator/FILES
View File

@ -594,104 +594,3 @@ src/apiKey.c
src/binary.c
src/list.c
uncrustify-rules.cfg
unit-test/test_amf_event.c
unit-test/test_amf_event_area.c
unit-test/test_amf_event_mode.c
unit-test/test_amf_event_subscription.c
unit-test/test_amf_event_subscription_add_info.c
unit-test/test_amf_event_trigger.c
unit-test/test_amf_event_trigger_any_of.c
unit-test/test_amf_event_type.c
unit-test/test_amf_event_type_any_of.c
unit-test/test_amf_status_change_notification.c
unit-test/test_amf_status_change_subscription_data.c
unit-test/test_amf_status_info.c
unit-test/test_area_of_validity.c
unit-test/test_assign_ebi_data.c
unit-test/test_assign_ebi_error.c
unit-test/test_assign_ebi_failed.c
unit-test/test_assigned_ebi_data.c
unit-test/test_auth_status.c
unit-test/test_ce_mode_b_ind.c
unit-test/test_ciphering_algorithm.c
unit-test/test_eps_nas_ciphering_algorithm.c
unit-test/test_eps_nas_integrity_algorithm.c
unit-test/test_eps_nas_security_mode.c
unit-test/test_expected_ue_behavior.c
unit-test/test_ext_amf_event_subscription.c
unit-test/test_immediate_mdt_conf.c
unit-test/test_integrity_algorithm.c
unit-test/test_key_amf.c
unit-test/test_key_amf_type.c
unit-test/test_ladn_info.c
unit-test/test_location_filter.c
unit-test/test_location_filter_any_of.c
unit-test/test_lte_m_ind.c
unit-test/test_mm_context.c
unit-test/test_n1_message_container.c
unit-test/test_n1_message_notification.c
unit-test/test_n1_n2_message_transfer_cause.c
unit-test/test_n1_n2_message_transfer_error.c
unit-test/test_n1_n2_message_transfer_req_data.c
unit-test/test_n1_n2_message_transfer_rsp_data.c
unit-test/test_n1_n2_msg_txfr_err_detail.c
unit-test/test_n1_n2_msg_txfr_failure_notification.c
unit-test/test_n2_info_container.c
unit-test/test_n2_info_content.c
unit-test/test_n2_info_notification_rsp_data.c
unit-test/test_n2_info_notify_reason.c
unit-test/test_n2_information_notification.c
unit-test/test_n2_information_transfer_error.c
unit-test/test_n2_information_transfer_req_data.c
unit-test/test_n2_information_transfer_result.c
unit-test/test_n2_information_transfer_rsp_data.c
unit-test/test_n2_ran_information.c
unit-test/test_n2_sm_information.c
unit-test/test_nas_security_mode.c
unit-test/test_ng_ksi.c
unit-test/test_ngap_ie_type.c
unit-test/test_non_ue_n2_info_subscription_create_data.c
unit-test/test_non_ue_n2_info_subscription_created_data.c
unit-test/test_npn_access_info.c
unit-test/test_nrppa_information.c
unit-test/test_nssaa_status.c
unit-test/test_nssai_mapping.c
unit-test/test_pc5_flow_bit_rates.c
unit-test/test_pc5_qo_s_para.c
unit-test/test_pc5_qos_flow_item.c
unit-test/test_pdu_session_context.c
unit-test/test_periodic_communication_indicator.c
unit-test/test_policy_req_trigger.c
unit-test/test_pws_error_data.c
unit-test/test_pws_information.c
unit-test/test_pws_response_data.c
unit-test/test_rat_selector.c
unit-test/test_reachability_filter.c
unit-test/test_reachability_filter_any_of.c
unit-test/test_registration_context_container.c
unit-test/test_sc_type.c
unit-test/test_seaf_data.c
unit-test/test_small_data_rate_status_info.c
unit-test/test_smf_change_indication.c
unit-test/test_smf_change_info.c
unit-test/test_status_change.c
unit-test/test_traffic_descriptor.c
unit-test/test_transfer_reason.c
unit-test/test_ue_context.c
unit-test/test_ue_context_cancel_relocate_data.c
unit-test/test_ue_context_create_data.c
unit-test/test_ue_context_create_error.c
unit-test/test_ue_context_created_data.c
unit-test/test_ue_context_release.c
unit-test/test_ue_context_relocate_data.c
unit-test/test_ue_context_relocated_data.c
unit-test/test_ue_context_transfer_req_data.c
unit-test/test_ue_context_transfer_rsp_data.c
unit-test/test_ue_context_transfer_status.c
unit-test/test_ue_differentiation_info.c
unit-test/test_ue_n1_n2_info_subscription_create_data.c
unit-test/test_ue_n1_n2_info_subscription_created_data.c
unit-test/test_ue_reg_status_update_req_data.c
unit-test/test_ue_reg_status_update_rsp_data.c
unit-test/test_v2x_context.c
unit-test/test_v2x_information.c

2
lib/sbi/openapi/.openapi-generator/VERSION
View File

@ -1 +1 @@
5.1.1
5.2.0

1
lib/sbi/openapi/meson.build
View File

@ -593,7 +593,6 @@ libsbi_openapi_sources = files('''
model/priority_sharing_indicator.c
model/privacy_check_related_action.c
model/problem_details_1.c
model/problem_details_2.c
model/problem_details_add_info.c
model/problem_details.c
model/protection_result.c

7
lib/sbi/openapi/model/acc_net_ch_id.c
View File

@ -7,6 +7,7 @@
OpenAPI_acc_net_ch_id_t *OpenAPI_acc_net_ch_id_create(
int acc_net_cha_id_value,
OpenAPI_list_t *ref_pcc_rule_ids,
bool is_session_ch_scope,
int session_ch_scope
)
{
@ -16,6 +17,7 @@ OpenAPI_acc_net_ch_id_t *OpenAPI_acc_net_ch_id_create(
}
acc_net_ch_id_local_var->acc_net_cha_id_value = acc_net_cha_id_value;
acc_net_ch_id_local_var->ref_pcc_rule_ids = ref_pcc_rule_ids;
acc_net_ch_id_local_var->is_session_ch_scope = is_session_ch_scope;
acc_net_ch_id_local_var->session_ch_scope = session_ch_scope;
return acc_net_ch_id_local_var;
@ -65,7 +67,7 @@ cJSON *OpenAPI_acc_net_ch_id_convertToJSON(OpenAPI_acc_net_ch_id_t *acc_net_ch_i
}
}
if (acc_net_ch_id->session_ch_scope) {
if (acc_net_ch_id->is_session_ch_scope) {
if (cJSON_AddBoolToObject(item, "sessionChScope", acc_net_ch_id->session_ch_scope) == NULL) {
ogs_error("OpenAPI_acc_net_ch_id_convertToJSON() failed [session_ch_scope]");
goto end;
@ -85,7 +87,6 @@ OpenAPI_acc_net_ch_id_t *OpenAPI_acc_net_ch_id_parseFromJSON(cJSON *acc_net_ch_i
goto end;
}
if (!cJSON_IsNumber(acc_net_cha_id_value)) {
ogs_error("OpenAPI_acc_net_ch_id_parseFromJSON() failed [acc_net_cha_id_value]");
goto end;
@ -121,8 +122,10 @@ OpenAPI_acc_net_ch_id_t *OpenAPI_acc_net_ch_id_parseFromJSON(cJSON *acc_net_ch_i
}
acc_net_ch_id_local_var = OpenAPI_acc_net_ch_id_create (
acc_net_cha_id_value->valuedouble,
ref_pcc_rule_ids ? ref_pcc_rule_idsList : NULL,
session_ch_scope ? true : false,
session_ch_scope ? session_ch_scope->valueint : 0
);

2
lib/sbi/openapi/model/acc_net_ch_id.h
View File

@ -21,12 +21,14 @@ typedef struct OpenAPI_acc_net_ch_id_s OpenAPI_acc_net_ch_id_t;
typedef struct OpenAPI_acc_net_ch_id_s {
int acc_net_cha_id_value;
OpenAPI_list_t *ref_pcc_rule_ids;
bool is_session_ch_scope;
int session_ch_scope;
} OpenAPI_acc_net_ch_id_t;
OpenAPI_acc_net_ch_id_t *OpenAPI_acc_net_ch_id_create(
int acc_net_cha_id_value,
OpenAPI_list_t *ref_pcc_rule_ids,
bool is_session_ch_scope,
int session_ch_scope
);
void OpenAPI_acc_net_ch_id_free(OpenAPI_acc_net_ch_id_t *acc_net_ch_id);

5
lib/sbi/openapi/model/access_and_mobility_data.c
View File

@ -18,6 +18,7 @@ OpenAPI_access_and_mobility_data_t *OpenAPI_access_and_mobility_data_create(
char *reachability_status_ts,
OpenAPI_sms_support_e sms_over_nas_status,
char *sms_over_nas_status_ts,
bool is_roaming_status,
int roaming_status,
char *roaming_status_ts,
OpenAPI_plmn_id_1_t *current_plmn,
@ -44,6 +45,7 @@ OpenAPI_access_and_mobility_data_t *OpenAPI_access_and_mobility_data_create(
access_and_mobility_data_local_var->reachability_status_ts = reachability_status_ts;
access_and_mobility_data_local_var->sms_over_nas_status = sms_over_nas_status;
access_and_mobility_data_local_var->sms_over_nas_status_ts = sms_over_nas_status_ts;
access_and_mobility_data_local_var->is_roaming_status = is_roaming_status;
access_and_mobility_data_local_var->roaming_status = roaming_status;
access_and_mobility_data_local_var->roaming_status_ts = roaming_status_ts;
access_and_mobility_data_local_var->current_plmn = current_plmn;
@ -226,7 +228,7 @@ cJSON *OpenAPI_access_and_mobility_data_convertToJSON(OpenAPI_access_and_mobilit
}
}
if (access_and_mobility_data->roaming_status) {
if (access_and_mobility_data->is_roaming_status) {
if (cJSON_AddBoolToObject(item, "roamingStatus", access_and_mobility_data->roaming_status) == NULL) {
ogs_error("OpenAPI_access_and_mobility_data_convertToJSON() failed [roaming_status]");
goto end;
@ -529,6 +531,7 @@ OpenAPI_access_and_mobility_data_t *OpenAPI_access_and_mobility_data_parseFromJS
reachability_status_ts ? ogs_strdup_or_assert(reachability_status_ts->valuestring) : NULL,
sms_over_nas_status ? sms_over_nas_statusVariable : 0,
sms_over_nas_status_ts ? ogs_strdup_or_assert(sms_over_nas_status_ts->valuestring) : NULL,
roaming_status ? true : false,
roaming_status ? roaming_status->valueint : 0,
roaming_status_ts ? ogs_strdup_or_assert(roaming_status_ts->valuestring) : NULL,
current_plmn ? current_plmn_local_nonprim : NULL,

2
lib/sbi/openapi/model/access_and_mobility_data.h
View File

@ -40,6 +40,7 @@ typedef struct OpenAPI_access_and_mobility_data_s {
char *reachability_status_ts;
OpenAPI_sms_support_e sms_over_nas_status;
char *sms_over_nas_status_ts;
bool is_roaming_status;
int roaming_status;
char *roaming_status_ts;
struct OpenAPI_plmn_id_1_s *current_plmn;
@ -63,6 +64,7 @@ OpenAPI_access_and_mobility_data_t *OpenAPI_access_and_mobility_data_create(
char *reachability_status_ts,
OpenAPI_sms_support_e sms_over_nas_status,
char *sms_over_nas_status_ts,
bool is_roaming_status,
int roaming_status,
char *roaming_status_ts,
OpenAPI_plmn_id_1_t *current_plmn,

70
lib/sbi/openapi/model/access_and_mobility_subscription_data.c
View File

@ -15,21 +15,31 @@ OpenAPI_access_and_mobility_subscription_data_t *OpenAPI_access_and_mobility_sub
OpenAPI_list_t *forbidden_areas,
OpenAPI_service_area_restriction_t *service_area_restriction,
OpenAPI_list_t *core_network_type_restrictions,
bool is_rfsp_index,
int rfsp_index,
bool is_subs_reg_timer,
int subs_reg_timer,
bool is_ue_usage_type,
int ue_usage_type,
bool is_mps_priority,
int mps_priority,
bool is_mcs_priority,
int mcs_priority,
bool is_active_time,
int active_time,
OpenAPI_sor_info_t *sor_info,
bool is_sor_info_expect_ind,
int sor_info_expect_ind,
bool is_soraf_retrieval,
int soraf_retrieval,
OpenAPI_list_t *sor_update_indicator_list,
OpenAPI_upu_info_t *upu_info,
bool is_mico_allowed,
int mico_allowed,
OpenAPI_list_t *shared_am_data_ids,
OpenAPI_odb_packet_services_e odb_packet_services,
OpenAPI_list_t *subscribed_dnn_list,
bool is_service_gap_time,
int service_gap_time,
OpenAPI_mdt_user_consent_e mdt_user_consent,
OpenAPI_mdt_configuration_t *mdt_configuration,
@ -37,16 +47,20 @@ OpenAPI_access_and_mobility_subscription_data_t *OpenAPI_access_and_mobility_sub
OpenAPI_cag_data_t *cag_data,
char *stn_sr,
char *c_msisdn,
bool is_nb_io_tue_priority,
int nb_io_tue_priority,
bool is_nssai_inclusion_allowed,
int nssai_inclusion_allowed,
char *rg_wireline_characteristics,
OpenAPI_ec_restriction_data_wb_t *ec_restriction_data_wb,
bool is_ec_restriction_data_nb,
int ec_restriction_data_nb,
OpenAPI_expected_ue_behaviour_data_t *expected_ue_behaviour_list,
OpenAPI_list_t *primary_rat_restrictions,
OpenAPI_list_t *secondary_rat_restrictions,
OpenAPI_list_t *edrx_parameters_list,
OpenAPI_list_t *ptw_parameters_list,
bool is_iab_operation_allowed,
int iab_operation_allowed,
OpenAPI_list_t *wireline_forbidden_areas,
OpenAPI_wireline_service_area_restriction_t *wireline_service_area_restriction
@ -66,21 +80,31 @@ OpenAPI_access_and_mobility_subscription_data_t *OpenAPI_access_and_mobility_sub
access_and_mobility_subscription_data_local_var->forbidden_areas = forbidden_areas;
access_and_mobility_subscription_data_local_var->service_area_restriction = service_area_restriction;
access_and_mobility_subscription_data_local_var->core_network_type_restrictions = core_network_type_restrictions;
access_and_mobility_subscription_data_local_var->is_rfsp_index = is_rfsp_index;
access_and_mobility_subscription_data_local_var->rfsp_index = rfsp_index;
access_and_mobility_subscription_data_local_var->is_subs_reg_timer = is_subs_reg_timer;
access_and_mobility_subscription_data_local_var->subs_reg_timer = subs_reg_timer;
access_and_mobility_subscription_data_local_var->is_ue_usage_type = is_ue_usage_type;
access_and_mobility_subscription_data_local_var->ue_usage_type = ue_usage_type;
access_and_mobility_subscription_data_local_var->is_mps_priority = is_mps_priority;
access_and_mobility_subscription_data_local_var->mps_priority = mps_priority;
access_and_mobility_subscription_data_local_var->is_mcs_priority = is_mcs_priority;
access_and_mobility_subscription_data_local_var->mcs_priority = mcs_priority;
access_and_mobility_subscription_data_local_var->is_active_time = is_active_time;
access_and_mobility_subscription_data_local_var->active_time = active_time;
access_and_mobility_subscription_data_local_var->sor_info = sor_info;
access_and_mobility_subscription_data_local_var->is_sor_info_expect_ind = is_sor_info_expect_ind;
access_and_mobility_subscription_data_local_var->sor_info_expect_ind = sor_info_expect_ind;
access_and_mobility_subscription_data_local_var->is_soraf_retrieval = is_soraf_retrieval;
access_and_mobility_subscription_data_local_var->soraf_retrieval = soraf_retrieval;
access_and_mobility_subscription_data_local_var->sor_update_indicator_list = sor_update_indicator_list;
access_and_mobility_subscription_data_local_var->upu_info = upu_info;
access_and_mobility_subscription_data_local_var->is_mico_allowed = is_mico_allowed;
access_and_mobility_subscription_data_local_var->mico_allowed = mico_allowed;
access_and_mobility_subscription_data_local_var->shared_am_data_ids = shared_am_data_ids;
access_and_mobility_subscription_data_local_var->odb_packet_services = odb_packet_services;
access_and_mobility_subscription_data_local_var->subscribed_dnn_list = subscribed_dnn_list;
access_and_mobility_subscription_data_local_var->is_service_gap_time = is_service_gap_time;
access_and_mobility_subscription_data_local_var->service_gap_time = service_gap_time;
access_and_mobility_subscription_data_local_var->mdt_user_consent = mdt_user_consent;
access_and_mobility_subscription_data_local_var->mdt_configuration = mdt_configuration;
@ -88,16 +112,20 @@ OpenAPI_access_and_mobility_subscription_data_t *OpenAPI_access_and_mobility_sub
access_and_mobility_subscription_data_local_var->cag_data = cag_data;
access_and_mobility_subscription_data_local_var->stn_sr = stn_sr;
access_and_mobility_subscription_data_local_var->c_msisdn = c_msisdn;
access_and_mobility_subscription_data_local_var->is_nb_io_tue_priority = is_nb_io_tue_priority;
access_and_mobility_subscription_data_local_var->nb_io_tue_priority = nb_io_tue_priority;
access_and_mobility_subscription_data_local_var->is_nssai_inclusion_allowed = is_nssai_inclusion_allowed;
access_and_mobility_subscription_data_local_var->nssai_inclusion_allowed = nssai_inclusion_allowed;
access_and_mobility_subscription_data_local_var->rg_wireline_characteristics = rg_wireline_characteristics;
access_and_mobility_subscription_data_local_var->ec_restriction_data_wb = ec_restriction_data_wb;
access_and_mobility_subscription_data_local_var->is_ec_restriction_data_nb = is_ec_restriction_data_nb;
access_and_mobility_subscription_data_local_var->ec_restriction_data_nb = ec_restriction_data_nb;
access_and_mobility_subscription_data_local_var->expected_ue_behaviour_list = expected_ue_behaviour_list;
access_and_mobility_subscription_data_local_var->primary_rat_restrictions = primary_rat_restrictions;
access_and_mobility_subscription_data_local_var->secondary_rat_restrictions = secondary_rat_restrictions;
access_and_mobility_subscription_data_local_var->edrx_parameters_list = edrx_parameters_list;
access_and_mobility_subscription_data_local_var->ptw_parameters_list = ptw_parameters_list;
access_and_mobility_subscription_data_local_var->is_iab_operation_allowed = is_iab_operation_allowed;
access_and_mobility_subscription_data_local_var->iab_operation_allowed = iab_operation_allowed;
access_and_mobility_subscription_data_local_var->wireline_forbidden_areas = wireline_forbidden_areas;
access_and_mobility_subscription_data_local_var->wireline_service_area_restriction = wireline_service_area_restriction;
@ -325,42 +353,42 @@ cJSON *OpenAPI_access_and_mobility_subscription_data_convertToJSON(OpenAPI_acces
}
}
if (access_and_mobility_subscription_data->rfsp_index) {
if (access_and_mobility_subscription_data->is_rfsp_index) {
if (cJSON_AddNumberToObject(item, "rfspIndex", access_and_mobility_subscription_data->rfsp_index) == NULL) {
ogs_error("OpenAPI_access_and_mobility_subscription_data_convertToJSON() failed [rfsp_index]");
goto end;
}
}
if (access_and_mobility_subscription_data->subs_reg_timer) {
if (access_and_mobility_subscription_data->is_subs_reg_timer) {
if (cJSON_AddNumberToObject(item, "subsRegTimer", access_and_mobility_subscription_data->subs_reg_timer) == NULL) {
ogs_error("OpenAPI_access_and_mobility_subscription_data_convertToJSON() failed [subs_reg_timer]");
goto end;
}
}
if (access_and_mobility_subscription_data->ue_usage_type) {
if (access_and_mobility_subscription_data->is_ue_usage_type) {
if (cJSON_AddNumberToObject(item, "ueUsageType", access_and_mobility_subscription_data->ue_usage_type) == NULL) {
ogs_error("OpenAPI_access_and_mobility_subscription_data_convertToJSON() failed [ue_usage_type]");
goto end;
}
}
if (access_and_mobility_subscription_data->mps_priority) {
if (access_and_mobility_subscription_data->is_mps_priority) {
if (cJSON_AddBoolToObject(item, "mpsPriority", access_and_mobility_subscription_data->mps_priority) == NULL) {
ogs_error("OpenAPI_access_and_mobility_subscription_data_convertToJSON() failed [mps_priority]");
goto end;
}
}
if (access_and_mobility_subscription_data->mcs_priority) {
if (access_and_mobility_subscription_data->is_mcs_priority) {
if (cJSON_AddBoolToObject(item, "mcsPriority", access_and_mobility_subscription_data->mcs_priority) == NULL) {
ogs_error("OpenAPI_access_and_mobility_subscription_data_convertToJSON() failed [mcs_priority]");
goto end;
}
}
if (access_and_mobility_subscription_data->active_time) {
if (access_and_mobility_subscription_data->is_active_time) {
if (cJSON_AddNumberToObject(item, "activeTime", access_and_mobility_subscription_data->active_time) == NULL) {
ogs_error("OpenAPI_access_and_mobility_subscription_data_convertToJSON() failed [active_time]");
goto end;
@ -380,14 +408,14 @@ cJSON *OpenAPI_access_and_mobility_subscription_data_convertToJSON(OpenAPI_acces
}
}
if (access_and_mobility_subscription_data->sor_info_expect_ind) {
if (access_and_mobility_subscription_data->is_sor_info_expect_ind) {
if (cJSON_AddBoolToObject(item, "sorInfoExpectInd", access_and_mobility_subscription_data->sor_info_expect_ind) == NULL) {
ogs_error("OpenAPI_access_and_mobility_subscription_data_convertToJSON() failed [sor_info_expect_ind]");
goto end;
}
}
if (access_and_mobility_subscription_data->soraf_retrieval) {
if (access_and_mobility_subscription_data->is_soraf_retrieval) {
if (cJSON_AddBoolToObject(item, "sorafRetrieval", access_and_mobility_subscription_data->soraf_retrieval) == NULL) {
ogs_error("OpenAPI_access_and_mobility_subscription_data_convertToJSON() failed [soraf_retrieval]");
goto end;
@ -422,7 +450,7 @@ cJSON *OpenAPI_access_and_mobility_subscription_data_convertToJSON(OpenAPI_acces
}
}
if (access_and_mobility_subscription_data->mico_allowed) {
if (access_and_mobility_subscription_data->is_mico_allowed) {
if (cJSON_AddBoolToObject(item, "micoAllowed", access_and_mobility_subscription_data->mico_allowed) == NULL) {
ogs_error("OpenAPI_access_and_mobility_subscription_data_convertToJSON() failed [mico_allowed]");
goto end;
@ -468,7 +496,7 @@ cJSON *OpenAPI_access_and_mobility_subscription_data_convertToJSON(OpenAPI_acces
}
}
if (access_and_mobility_subscription_data->service_gap_time) {
if (access_and_mobility_subscription_data->is_service_gap_time) {
if (cJSON_AddNumberToObject(item, "serviceGapTime", access_and_mobility_subscription_data->service_gap_time) == NULL) {
ogs_error("OpenAPI_access_and_mobility_subscription_data_convertToJSON() failed [service_gap_time]");
goto end;
@ -535,14 +563,14 @@ cJSON *OpenAPI_access_and_mobility_subscription_data_convertToJSON(OpenAPI_acces
}
}
if (access_and_mobility_subscription_data->nb_io_tue_priority) {
if (access_and_mobility_subscription_data->is_nb_io_tue_priority) {
if (cJSON_AddNumberToObject(item, "nbIoTUePriority", access_and_mobility_subscription_data->nb_io_tue_priority) == NULL) {
ogs_error("OpenAPI_access_and_mobility_subscription_data_convertToJSON() failed [nb_io_tue_priority]");
goto end;
}
}
if (access_and_mobility_subscription_data->nssai_inclusion_allowed) {
if (access_and_mobility_subscription_data->is_nssai_inclusion_allowed) {
if (cJSON_AddBoolToObject(item, "nssaiInclusionAllowed", access_and_mobility_subscription_data->nssai_inclusion_allowed) == NULL) {
ogs_error("OpenAPI_access_and_mobility_subscription_data_convertToJSON() failed [nssai_inclusion_allowed]");
goto end;
@ -569,7 +597,7 @@ cJSON *OpenAPI_access_and_mobility_subscription_data_convertToJSON(OpenAPI_acces
}
}
if (access_and_mobility_subscription_data->ec_restriction_data_nb) {
if (access_and_mobility_subscription_data->is_ec_restriction_data_nb) {
if (cJSON_AddBoolToObject(item, "ecRestrictionDataNb", access_and_mobility_subscription_data->ec_restriction_data_nb) == NULL) {
ogs_error("OpenAPI_access_and_mobility_subscription_data_convertToJSON() failed [ec_restriction_data_nb]");
goto end;
@ -659,7 +687,7 @@ cJSON *OpenAPI_access_and_mobility_subscription_data_convertToJSON(OpenAPI_acces
}
}
if (access_and_mobility_subscription_data->iab_operation_allowed) {
if (access_and_mobility_subscription_data->is_iab_operation_allowed) {
if (cJSON_AddBoolToObject(item, "iabOperationAllowed", access_and_mobility_subscription_data->iab_operation_allowed) == NULL) {
ogs_error("OpenAPI_access_and_mobility_subscription_data_convertToJSON() failed [iab_operation_allowed]");
goto end;
@ -1277,21 +1305,31 @@ OpenAPI_access_and_mobility_subscription_data_t *OpenAPI_access_and_mobility_sub
forbidden_areas ? forbidden_areasList : NULL,
service_area_restriction ? service_area_restriction_local_nonprim : NULL,
core_network_type_restrictions ? core_network_type_restrictionsList : NULL,
rfsp_index ? true : false,
rfsp_index ? rfsp_index->valuedouble : 0,
subs_reg_timer ? true : false,
subs_reg_timer ? subs_reg_timer->valuedouble : 0,
ue_usage_type ? true : false,
ue_usage_type ? ue_usage_type->valuedouble : 0,
mps_priority ? true : false,
mps_priority ? mps_priority->valueint : 0,
mcs_priority ? true : false,
mcs_priority ? mcs_priority->valueint : 0,
active_time ? true : false,
active_time ? active_time->valuedouble : 0,
sor_info ? sor_info_local_nonprim : NULL,
sor_info_expect_ind ? true : false,
sor_info_expect_ind ? sor_info_expect_ind->valueint : 0,
soraf_retrieval ? true : false,
soraf_retrieval ? soraf_retrieval->valueint : 0,
sor_update_indicator_list ? sor_update_indicator_listList : NULL,
upu_info ? upu_info_local_nonprim : NULL,
mico_allowed ? true : false,
mico_allowed ? mico_allowed->valueint : 0,
shared_am_data_ids ? shared_am_data_idsList : NULL,
odb_packet_services ? odb_packet_servicesVariable : 0,
subscribed_dnn_list ? subscribed_dnn_listList : NULL,
service_gap_time ? true : false,
service_gap_time ? service_gap_time->valuedouble : 0,
mdt_user_consent ? mdt_user_consentVariable : 0,
mdt_configuration ? mdt_configuration_local_nonprim : NULL,
@ -1299,16 +1337,20 @@ OpenAPI_access_and_mobility_subscription_data_t *OpenAPI_access_and_mobility_sub
cag_data ? cag_data_local_nonprim : NULL,
stn_sr ? ogs_strdup_or_assert(stn_sr->valuestring) : NULL,
c_msisdn ? ogs_strdup_or_assert(c_msisdn->valuestring) : NULL,
nb_io_tue_priority ? true : false,
nb_io_tue_priority ? nb_io_tue_priority->valuedouble : 0,
nssai_inclusion_allowed ? true : false,
nssai_inclusion_allowed ? nssai_inclusion_allowed->valueint : 0,
rg_wireline_characteristics ? ogs_strdup_or_assert(rg_wireline_characteristics->valuestring) : NULL,
ec_restriction_data_wb ? ec_restriction_data_wb_local_nonprim : NULL,
ec_restriction_data_nb ? true : false,
ec_restriction_data_nb ? ec_restriction_data_nb->valueint : 0,
expected_ue_behaviour_list ? expected_ue_behaviour_list_local_nonprim : NULL,
primary_rat_restrictions ? primary_rat_restrictionsList : NULL,
secondary_rat_restrictions ? secondary_rat_restrictionsList : NULL,
edrx_parameters_list ? edrx_parameters_listList : NULL,
ptw_parameters_list ? ptw_parameters_listList : NULL,
iab_operation_allowed ? true : false,
iab_operation_allowed ? iab_operation_allowed->valueint : 0,
wireline_forbidden_areas ? wireline_forbidden_areasList : NULL,
wireline_service_area_restriction ? wireline_service_area_restriction_local_nonprim : NULL

28
lib/sbi/openapi/model/access_and_mobility_subscription_data.h
View File

@ -49,21 +49,31 @@ typedef struct OpenAPI_access_and_mobility_subscription_data_s {
OpenAPI_list_t *forbidden_areas;
struct OpenAPI_service_area_restriction_s *service_area_restriction;
OpenAPI_list_t *core_network_type_restrictions;
bool is_rfsp_index;
int rfsp_index;
bool is_subs_reg_timer;
int subs_reg_timer;
bool is_ue_usage_type;
int ue_usage_type;
bool is_mps_priority;
int mps_priority;
bool is_mcs_priority;
int mcs_priority;
bool is_active_time;
int active_time;
struct OpenAPI_sor_info_s *sor_info;
bool is_sor_info_expect_ind;
int sor_info_expect_ind;
bool is_soraf_retrieval;
int soraf_retrieval;
OpenAPI_list_t *sor_update_indicator_list;
struct OpenAPI_upu_info_s *upu_info;
bool is_mico_allowed;
int mico_allowed;
OpenAPI_list_t *shared_am_data_ids;
OpenAPI_odb_packet_services_e odb_packet_services;
OpenAPI_list_t *subscribed_dnn_list;
bool is_service_gap_time;
int service_gap_time;
OpenAPI_mdt_user_consent_e mdt_user_consent;
struct OpenAPI_mdt_configuration_s *mdt_configuration;
@ -71,16 +81,20 @@ typedef struct OpenAPI_access_and_mobility_subscription_data_s {
struct OpenAPI_cag_data_s *cag_data;
char *stn_sr;
char *c_msisdn;
bool is_nb_io_tue_priority;
int nb_io_tue_priority;
bool is_nssai_inclusion_allowed;
int nssai_inclusion_allowed;
char *rg_wireline_characteristics;
struct OpenAPI_ec_restriction_data_wb_s *ec_restriction_data_wb;
bool is_ec_restriction_data_nb;
int ec_restriction_data_nb;
struct OpenAPI_expected_ue_behaviour_data_s *expected_ue_behaviour_list;
OpenAPI_list_t *primary_rat_restrictions;
OpenAPI_list_t *secondary_rat_restrictions;
OpenAPI_list_t *edrx_parameters_list;
OpenAPI_list_t *ptw_parameters_list;
bool is_iab_operation_allowed;
int iab_operation_allowed;
OpenAPI_list_t *wireline_forbidden_areas;
struct OpenAPI_wireline_service_area_restriction_s *wireline_service_area_restriction;
@ -97,21 +111,31 @@ OpenAPI_access_and_mobility_subscription_data_t *OpenAPI_access_and_mobility_sub
OpenAPI_list_t *forbidden_areas,
OpenAPI_service_area_restriction_t *service_area_restriction,
OpenAPI_list_t *core_network_type_restrictions,
bool is_rfsp_index,
int rfsp_index,
bool is_subs_reg_timer,
int subs_reg_timer,
bool is_ue_usage_type,
int ue_usage_type,
bool is_mps_priority,
int mps_priority,
bool is_mcs_priority,
int mcs_priority,
bool is_active_time,
int active_time,
OpenAPI_sor_info_t *sor_info,
bool is_sor_info_expect_ind,
int sor_info_expect_ind,
bool is_soraf_retrieval,
int soraf_retrieval,
OpenAPI_list_t *sor_update_indicator_list,
OpenAPI_upu_info_t *upu_info,
bool is_mico_allowed,
int mico_allowed,
OpenAPI_list_t *shared_am_data_ids,
OpenAPI_odb_packet_services_e odb_packet_services,
OpenAPI_list_t *subscribed_dnn_list,
bool is_service_gap_time,
int service_gap_time,
OpenAPI_mdt_user_consent_e mdt_user_consent,
OpenAPI_mdt_configuration_t *mdt_configuration,
@ -119,16 +143,20 @@ OpenAPI_access_and_mobility_subscription_data_t *OpenAPI_access_and_mobility_sub
OpenAPI_cag_data_t *cag_data,
char *stn_sr,
char *c_msisdn,
bool is_nb_io_tue_priority,
int nb_io_tue_priority,
bool is_nssai_inclusion_allowed,
int nssai_inclusion_allowed,
char *rg_wireline_characteristics,
OpenAPI_ec_restriction_data_wb_t *ec_restriction_data_wb,
bool is_ec_restriction_data_nb,
int ec_restriction_data_nb,
OpenAPI_expected_ue_behaviour_data_t *expected_ue_behaviour_list,
OpenAPI_list_t *primary_rat_restrictions,
OpenAPI_list_t *secondary_rat_restrictions,
OpenAPI_list_t *edrx_parameters_list,
OpenAPI_list_t *ptw_parameters_list,
bool is_iab_operation_allowed,
int iab_operation_allowed,
OpenAPI_list_t *wireline_forbidden_areas,
OpenAPI_wireline_service_area_restriction_t *wireline_service_area_restriction

70
lib/sbi/openapi/model/access_and_mobility_subscription_data_1.c
View File

@ -15,21 +15,31 @@ OpenAPI_access_and_mobility_subscription_data_1_t *OpenAPI_access_and_mobility_s
OpenAPI_list_t *forbidden_areas,
OpenAPI_service_area_restriction_1_t *service_area_restriction,
OpenAPI_list_t *core_network_type_restrictions,
bool is_rfsp_index,
int rfsp_index,
bool is_subs_reg_timer,
int subs_reg_timer,
bool is_ue_usage_type,
int ue_usage_type,
bool is_mps_priority,
int mps_priority,
bool is_mcs_priority,
int mcs_priority,
bool is_active_time,
int active_time,
OpenAPI_sor_info_1_t *sor_info,
bool is_sor_info_expect_ind,
int sor_info_expect_ind,
bool is_soraf_retrieval,
int soraf_retrieval,
OpenAPI_list_t *sor_update_indicator_list,
OpenAPI_upu_info_1_t *upu_info,
bool is_mico_allowed,
int mico_allowed,
OpenAPI_list_t *shared_am_data_ids,
OpenAPI_odb_packet_services_e odb_packet_services,
OpenAPI_list_t *subscribed_dnn_list,
bool is_service_gap_time,
int service_gap_time,
OpenAPI_mdt_user_consent_e mdt_user_consent,
OpenAPI_mdt_configuration_1_t *mdt_configuration,
@ -37,16 +47,20 @@ OpenAPI_access_and_mobility_subscription_data_1_t *OpenAPI_access_and_mobility_s
OpenAPI_cag_data_1_t *cag_data,
char *stn_sr,
char *c_msisdn,
bool is_nb_io_tue_priority,
int nb_io_tue_priority,
bool is_nssai_inclusion_allowed,
int nssai_inclusion_allowed,
char *rg_wireline_characteristics,
OpenAPI_ec_restriction_data_wb_t *ec_restriction_data_wb,
bool is_ec_restriction_data_nb,
int ec_restriction_data_nb,
OpenAPI_expected_ue_behaviour_data_1_t *expected_ue_behaviour_list,
OpenAPI_list_t *primary_rat_restrictions,
OpenAPI_list_t *secondary_rat_restrictions,
OpenAPI_list_t *edrx_parameters_list,
OpenAPI_list_t *ptw_parameters_list,
bool is_iab_operation_allowed,
int iab_operation_allowed,
OpenAPI_list_t *wireline_forbidden_areas,
OpenAPI_wireline_service_area_restriction_1_t *wireline_service_area_restriction
@ -66,21 +80,31 @@ OpenAPI_access_and_mobility_subscription_data_1_t *OpenAPI_access_and_mobility_s
access_and_mobility_subscription_data_1_local_var->forbidden_areas = forbidden_areas;
access_and_mobility_subscription_data_1_local_var->service_area_restriction = service_area_restriction;
access_and_mobility_subscription_data_1_local_var->core_network_type_restrictions = core_network_type_restrictions;
access_and_mobility_subscription_data_1_local_var->is_rfsp_index = is_rfsp_index;
access_and_mobility_subscription_data_1_local_var->rfsp_index = rfsp_index;
access_and_mobility_subscription_data_1_local_var->is_subs_reg_timer = is_subs_reg_timer;
access_and_mobility_subscription_data_1_local_var->subs_reg_timer = subs_reg_timer;
access_and_mobility_subscription_data_1_local_var->is_ue_usage_type = is_ue_usage_type;
access_and_mobility_subscription_data_1_local_var->ue_usage_type = ue_usage_type;
access_and_mobility_subscription_data_1_local_var->is_mps_priority = is_mps_priority;
access_and_mobility_subscription_data_1_local_var->mps_priority = mps_priority;
access_and_mobility_subscription_data_1_local_var->is_mcs_priority = is_mcs_priority;
access_and_mobility_subscription_data_1_local_var->mcs_priority = mcs_priority;
access_and_mobility_subscription_data_1_local_var->is_active_time = is_active_time;
access_and_mobility_subscription_data_1_local_var->active_time = active_time;
access_and_mobility_subscription_data_1_local_var->sor_info = sor_info;
access_and_mobility_subscription_data_1_local_var->is_sor_info_expect_ind = is_sor_info_expect_ind;
access_and_mobility_subscription_data_1_local_var->sor_info_expect_ind = sor_info_expect_ind;
access_and_mobility_subscription_data_1_local_var->is_soraf_retrieval = is_soraf_retrieval;
access_and_mobility_subscription_data_1_local_var->soraf_retrieval = soraf_retrieval;
access_and_mobility_subscription_data_1_local_var->sor_update_indicator_list = sor_update_indicator_list;
access_and_mobility_subscription_data_1_local_var->upu_info = upu_info;
access_and_mobility_subscription_data_1_local_var->is_mico_allowed = is_mico_allowed;
access_and_mobility_subscription_data_1_local_var->mico_allowed = mico_allowed;
access_and_mobility_subscription_data_1_local_var->shared_am_data_ids = shared_am_data_ids;
access_and_mobility_subscription_data_1_local_var->odb_packet_services = odb_packet_services;
access_and_mobility_subscription_data_1_local_var->subscribed_dnn_list = subscribed_dnn_list;
access_and_mobility_subscription_data_1_local_var->is_service_gap_time = is_service_gap_time;
access_and_mobility_subscription_data_1_local_var->service_gap_time = service_gap_time;
access_and_mobility_subscription_data_1_local_var->mdt_user_consent = mdt_user_consent;
access_and_mobility_subscription_data_1_local_var->mdt_configuration = mdt_configuration;
@ -88,16 +112,20 @@ OpenAPI_access_and_mobility_subscription_data_1_t *OpenAPI_access_and_mobility_s
access_and_mobility_subscription_data_1_local_var->cag_data = cag_data;
access_and_mobility_subscription_data_1_local_var->stn_sr = stn_sr;
access_and_mobility_subscription_data_1_local_var->c_msisdn = c_msisdn;
access_and_mobility_subscription_data_1_local_var->is_nb_io_tue_priority = is_nb_io_tue_priority;
access_and_mobility_subscription_data_1_local_var->nb_io_tue_priority = nb_io_tue_priority;
access_and_mobility_subscription_data_1_local_var->is_nssai_inclusion_allowed = is_nssai_inclusion_allowed;
access_and_mobility_subscription_data_1_local_var->nssai_inclusion_allowed = nssai_inclusion_allowed;
access_and_mobility_subscription_data_1_local_var->rg_wireline_characteristics = rg_wireline_characteristics;
access_and_mobility_subscription_data_1_local_var->ec_restriction_data_wb = ec_restriction_data_wb;
access_and_mobility_subscription_data_1_local_var->is_ec_restriction_data_nb = is_ec_restriction_data_nb;
access_and_mobility_subscription_data_1_local_var->ec_restriction_data_nb = ec_restriction_data_nb;
access_and_mobility_subscription_data_1_local_var->expected_ue_behaviour_list = expected_ue_behaviour_list;
access_and_mobility_subscription_data_1_local_var->primary_rat_restrictions = primary_rat_restrictions;
access_and_mobility_subscription_data_1_local_var->secondary_rat_restrictions = secondary_rat_restrictions;
access_and_mobility_subscription_data_1_local_var->edrx_parameters_list = edrx_parameters_list;
access_and_mobility_subscription_data_1_local_var->ptw_parameters_list = ptw_parameters_list;
access_and_mobility_subscription_data_1_local_var->is_iab_operation_allowed = is_iab_operation_allowed;
access_and_mobility_subscription_data_1_local_var->iab_operation_allowed = iab_operation_allowed;
access_and_mobility_subscription_data_1_local_var->wireline_forbidden_areas = wireline_forbidden_areas;
access_and_mobility_subscription_data_1_local_var->wireline_service_area_restriction = wireline_service_area_restriction;
@ -325,42 +353,42 @@ cJSON *OpenAPI_access_and_mobility_subscription_data_1_convertToJSON(OpenAPI_acc
}
}
if (access_and_mobility_subscription_data_1->rfsp_index) {
if (access_and_mobility_subscription_data_1->is_rfsp_index) {
if (cJSON_AddNumberToObject(item, "rfspIndex", access_and_mobility_subscription_data_1->rfsp_index) == NULL) {
ogs_error("OpenAPI_access_and_mobility_subscription_data_1_convertToJSON() failed [rfsp_index]");
goto end;
}
}
if (access_and_mobility_subscription_data_1->subs_reg_timer) {
if (access_and_mobility_subscription_data_1->is_subs_reg_timer) {
if (cJSON_AddNumberToObject(item, "subsRegTimer", access_and_mobility_subscription_data_1->subs_reg_timer) == NULL) {
ogs_error("OpenAPI_access_and_mobility_subscription_data_1_convertToJSON() failed [subs_reg_timer]");
goto end;
}
}
if (access_and_mobility_subscription_data_1->ue_usage_type) {
if (access_and_mobility_subscription_data_1->is_ue_usage_type) {
if (cJSON_AddNumberToObject(item, "ueUsageType", access_and_mobility_subscription_data_1->ue_usage_type) == NULL) {
ogs_error("OpenAPI_access_and_mobility_subscription_data_1_convertToJSON() failed [ue_usage_type]");
goto end;
}
}
if (access_and_mobility_subscription_data_1->mps_priority) {
if (access_and_mobility_subscription_data_1->is_mps_priority) {
if (cJSON_AddBoolToObject(item, "mpsPriority", access_and_mobility_subscription_data_1->mps_priority) == NULL) {
ogs_error("OpenAPI_access_and_mobility_subscription_data_1_convertToJSON() failed [mps_priority]");
goto end;
}
}
if (access_and_mobility_subscription_data_1->mcs_priority) {
if (access_and_mobility_subscription_data_1->is_mcs_priority) {
if (cJSON_AddBoolToObject(item, "mcsPriority", access_and_mobility_subscription_data_1->mcs_priority) == NULL) {
ogs_error("OpenAPI_access_and_mobility_subscription_data_1_convertToJSON() failed [mcs_priority]");
goto end;
}
}
if (access_and_mobility_subscription_data_1->active_time) {
if (access_and_mobility_subscription_data_1->is_active_time) {
if (cJSON_AddNumberToObject(item, "activeTime", access_and_mobility_subscription_data_1->active_time) == NULL) {
ogs_error("OpenAPI_access_and_mobility_subscription_data_1_convertToJSON() failed [active_time]");
goto end;
@ -380,14 +408,14 @@ cJSON *OpenAPI_access_and_mobility_subscription_data_1_convertToJSON(OpenAPI_acc
}
}
if (access_and_mobility_subscription_data_1->sor_info_expect_ind) {
if (access_and_mobility_subscription_data_1->is_sor_info_expect_ind) {
if (cJSON_AddBoolToObject(item, "sorInfoExpectInd", access_and_mobility_subscription_data_1->sor_info_expect_ind) == NULL) {
ogs_error("OpenAPI_access_and_mobility_subscription_data_1_convertToJSON() failed [sor_info_expect_ind]");
goto end;
}
}
if (access_and_mobility_subscription_data_1->soraf_retrieval) {
if (access_and_mobility_subscription_data_1->is_soraf_retrieval) {
if (cJSON_AddBoolToObject(item, "sorafRetrieval", access_and_mobility_subscription_data_1->soraf_retrieval) == NULL) {
ogs_error("OpenAPI_access_and_mobility_subscription_data_1_convertToJSON() failed [soraf_retrieval]");
goto end;
@ -422,7 +450,7 @@ cJSON *OpenAPI_access_and_mobility_subscription_data_1_convertToJSON(OpenAPI_acc
}
}
if (access_and_mobility_subscription_data_1->mico_allowed) {
if (access_and_mobility_subscription_data_1->is_mico_allowed) {
if (cJSON_AddBoolToObject(item, "micoAllowed", access_and_mobility_subscription_data_1->mico_allowed) == NULL) {
ogs_error("OpenAPI_access_and_mobility_subscription_data_1_convertToJSON() failed [mico_allowed]");
goto end;
@ -468,7 +496,7 @@ cJSON *OpenAPI_access_and_mobility_subscription_data_1_convertToJSON(OpenAPI_acc
}
}
if (access_and_mobility_subscription_data_1->service_gap_time) {
if (access_and_mobility_subscription_data_1->is_service_gap_time) {
if (cJSON_AddNumberToObject(item, "serviceGapTime", access_and_mobility_subscription_data_1->service_gap_time) == NULL) {
ogs_error("OpenAPI_access_and_mobility_subscription_data_1_convertToJSON() failed [service_gap_time]");
goto end;
@ -535,14 +563,14 @@ cJSON *OpenAPI_access_and_mobility_subscription_data_1_convertToJSON(OpenAPI_acc
}
}
if (access_and_mobility_subscription_data_1->nb_io_tue_priority) {
if (access_and_mobility_subscription_data_1->is_nb_io_tue_priority) {
if (cJSON_AddNumberToObject(item, "nbIoTUePriority", access_and_mobility_subscription_data_1->nb_io_tue_priority) == NULL) {
ogs_error("OpenAPI_access_and_mobility_subscription_data_1_convertToJSON() failed [nb_io_tue_priority]");
goto end;
}
}
if (access_and_mobility_subscription_data_1->nssai_inclusion_allowed) {
if (access_and_mobility_subscription_data_1->is_nssai_inclusion_allowed) {
if (cJSON_AddBoolToObject(item, "nssaiInclusionAllowed", access_and_mobility_subscription_data_1->nssai_inclusion_allowed) == NULL) {
ogs_error("OpenAPI_access_and_mobility_subscription_data_1_convertToJSON() failed [nssai_inclusion_allowed]");
goto end;
@ -569,7 +597,7 @@ cJSON *OpenAPI_access_and_mobility_subscription_data_1_convertToJSON(OpenAPI_acc
}
}
if (access_and_mobility_subscription_data_1->ec_restriction_data_nb) {
if (access_and_mobility_subscription_data_1->is_ec_restriction_data_nb) {
if (cJSON_AddBoolToObject(item, "ecRestrictionDataNb", access_and_mobility_subscription_data_1->ec_restriction_data_nb) == NULL) {
ogs_error("OpenAPI_access_and_mobility_subscription_data_1_convertToJSON() failed [ec_restriction_data_nb]");
goto end;
@ -659,7 +687,7 @@ cJSON *OpenAPI_access_and_mobility_subscription_data_1_convertToJSON(OpenAPI_acc
}
}
if (access_and_mobility_subscription_data_1->iab_operation_allowed) {
if (access_and_mobility_subscription_data_1->is_iab_operation_allowed) {
if (cJSON_AddBoolToObject(item, "iabOperationAllowed", access_and_mobility_subscription_data_1->iab_operation_allowed) == NULL) {
ogs_error("OpenAPI_access_and_mobility_subscription_data_1_convertToJSON() failed [iab_operation_allowed]");
goto end;
@ -1277,21 +1305,31 @@ OpenAPI_access_and_mobility_subscription_data_1_t *OpenAPI_access_and_mobility_s
forbidden_areas ? forbidden_areasList : NULL,
service_area_restriction ? service_area_restriction_local_nonprim : NULL,
core_network_type_restrictions ? core_network_type_restrictionsList : NULL,
rfsp_index ? true : false,
rfsp_index ? rfsp_index->valuedouble : 0,
subs_reg_timer ? true : false,
subs_reg_timer ? subs_reg_timer->valuedouble : 0,
ue_usage_type ? true : false,
ue_usage_type ? ue_usage_type->valuedouble : 0,
mps_priority ? true : false,
mps_priority ? mps_priority->valueint : 0,
mcs_priority ? true : false,
mcs_priority ? mcs_priority->valueint : 0,
active_time ? true : false,
active_time ? active_time->valuedouble : 0,
sor_info ? sor_info_local_nonprim : NULL,
sor_info_expect_ind ? true : false,
sor_info_expect_ind ? sor_info_expect_ind->valueint : 0,
soraf_retrieval ? true : false,
soraf_retrieval ? soraf_retrieval->valueint : 0,
sor_update_indicator_list ? sor_update_indicator_listList : NULL,
upu_info ? upu_info_local_nonprim : NULL,
mico_allowed ? true : false,
mico_allowed ? mico_allowed->valueint : 0,
shared_am_data_ids ? shared_am_data_idsList : NULL,
odb_packet_services ? odb_packet_servicesVariable : 0,
subscribed_dnn_list ? subscribed_dnn_listList : NULL,
service_gap_time ? true : false,
service_gap_time ? service_gap_time->valuedouble : 0,
mdt_user_consent ? mdt_user_consentVariable : 0,
mdt_configuration ? mdt_configuration_local_nonprim : NULL,
@ -1299,16 +1337,20 @@ OpenAPI_access_and_mobility_subscription_data_1_t *OpenAPI_access_and_mobility_s
cag_data ? cag_data_local_nonprim : NULL,
stn_sr ? ogs_strdup_or_assert(stn_sr->valuestring) : NULL,
c_msisdn ? ogs_strdup_or_assert(c_msisdn->valuestring) : NULL,
nb_io_tue_priority ? true : false,
nb_io_tue_priority ? nb_io_tue_priority->valuedouble : 0,
nssai_inclusion_allowed ? true : false,
nssai_inclusion_allowed ? nssai_inclusion_allowed->valueint : 0,
rg_wireline_characteristics ? ogs_strdup_or_assert(rg_wireline_characteristics->valuestring) : NULL,
ec_restriction_data_wb ? ec_restriction_data_wb_local_nonprim : NULL,
ec_restriction_data_nb ? true : false,
ec_restriction_data_nb ? ec_restriction_data_nb->valueint : 0,
expected_ue_behaviour_list ? expected_ue_behaviour_list_local_nonprim : NULL,
primary_rat_restrictions ? primary_rat_restrictionsList : NULL,
secondary_rat_restrictions ? secondary_rat_restrictionsList : NULL,
edrx_parameters_list ? edrx_parameters_listList : NULL,
ptw_parameters_list ? ptw_parameters_listList : NULL,
iab_operation_allowed ? true : false,
iab_operation_allowed ? iab_operation_allowed->valueint : 0,
wireline_forbidden_areas ? wireline_forbidden_areasList : NULL,
wireline_service_area_restriction ? wireline_service_area_restriction_local_nonprim : NULL

28
lib/sbi/openapi/model/access_and_mobility_subscription_data_1.h
View File

@ -49,21 +49,31 @@ typedef struct OpenAPI_access_and_mobility_subscription_data_1_s {
OpenAPI_list_t *forbidden_areas;
struct OpenAPI_service_area_restriction_1_s *service_area_restriction;
OpenAPI_list_t *core_network_type_restrictions;
bool is_rfsp_index;
int rfsp_index;
bool is_subs_reg_timer;
int subs_reg_timer;
bool is_ue_usage_type;
int ue_usage_type;
bool is_mps_priority;
int mps_priority;
bool is_mcs_priority;
int mcs_priority;
bool is_active_time;
int active_time;
struct OpenAPI_sor_info_1_s *sor_info;
bool is_sor_info_expect_ind;
int sor_info_expect_ind;
bool is_soraf_retrieval;
int soraf_retrieval;
OpenAPI_list_t *sor_update_indicator_list;
struct OpenAPI_upu_info_1_s *upu_info;
bool is_mico_allowed;
int mico_allowed;
OpenAPI_list_t *shared_am_data_ids;
OpenAPI_odb_packet_services_e odb_packet_services;
OpenAPI_list_t *subscribed_dnn_list;
bool is_service_gap_time;
int service_gap_time;
OpenAPI_mdt_user_consent_e mdt_user_consent;
struct OpenAPI_mdt_configuration_1_s *mdt_configuration;
@ -71,16 +81,20 @@ typedef struct OpenAPI_access_and_mobility_subscription_data_1_s {
struct OpenAPI_cag_data_1_s *cag_data;
char *stn_sr;
char *c_msisdn;
bool is_nb_io_tue_priority;
int nb_io_tue_priority;
bool is_nssai_inclusion_allowed;
int nssai_inclusion_allowed;
char *rg_wireline_characteristics;
struct OpenAPI_ec_restriction_data_wb_s *ec_restriction_data_wb;
bool is_ec_restriction_data_nb;
int ec_restriction_data_nb;
struct OpenAPI_expected_ue_behaviour_data_1_s *expected_ue_behaviour_list;
OpenAPI_list_t *primary_rat_restrictions;
OpenAPI_list_t *secondary_rat_restrictions;
OpenAPI_list_t *edrx_parameters_list;
OpenAPI_list_t *ptw_parameters_list;
bool is_iab_operation_allowed;
int iab_operation_allowed;
OpenAPI_list_t *wireline_forbidden_areas;
struct OpenAPI_wireline_service_area_restriction_1_s *wireline_service_area_restriction;
@ -97,21 +111,31 @@ OpenAPI_access_and_mobility_subscription_data_1_t *OpenAPI_access_and_mobility_s
OpenAPI_list_t *forbidden_areas,
OpenAPI_service_area_restriction_1_t *service_area_restriction,
OpenAPI_list_t *core_network_type_restrictions,
bool is_rfsp_index,
int rfsp_index,
bool is_subs_reg_timer,
int subs_reg_timer,
bool is_ue_usage_type,
int ue_usage_type,
bool is_mps_priority,
int mps_priority,
bool is_mcs_priority,
int mcs_priority,
bool is_active_time,
int active_time,
OpenAPI_sor_info_1_t *sor_info,
bool is_sor_info_expect_ind,
int sor_info_expect_ind,
bool is_soraf_retrieval,
int soraf_retrieval,
OpenAPI_list_t *sor_update_indicator_list,
OpenAPI_upu_info_1_t *upu_info,
bool is_mico_allowed,
int mico_allowed,
OpenAPI_list_t *shared_am_data_ids,
OpenAPI_odb_packet_services_e odb_packet_services,
OpenAPI_list_t *subscribed_dnn_list,
bool is_service_gap_time,
int service_gap_time,
OpenAPI_mdt_user_consent_e mdt_user_consent,
OpenAPI_mdt_configuration_1_t *mdt_configuration,
@ -119,16 +143,20 @@ OpenAPI_access_and_mobility_subscription_data_1_t *OpenAPI_access_and_mobility_s
OpenAPI_cag_data_1_t *cag_data,
char *stn_sr,
char *c_msisdn,
bool is_nb_io_tue_priority,
int nb_io_tue_priority,
bool is_nssai_inclusion_allowed,
int nssai_inclusion_allowed,
char *rg_wireline_characteristics,
OpenAPI_ec_restriction_data_wb_t *ec_restriction_data_wb,
bool is_ec_restriction_data_nb,
int ec_restriction_data_nb,
OpenAPI_expected_ue_behaviour_data_1_t *expected_ue_behaviour_list,
OpenAPI_list_t *primary_rat_restrictions,
OpenAPI_list_t *secondary_rat_restrictions,
OpenAPI_list_t *edrx_parameters_list,
OpenAPI_list_t *ptw_parameters_list,
bool is_iab_operation_allowed,
int iab_operation_allowed,
OpenAPI_list_t *wireline_forbidden_areas,
OpenAPI_wireline_service_area_restriction_1_t *wireline_service_area_restriction

2
lib/sbi/openapi/model/access_net_charging_identifier.c
View File

@ -80,7 +80,6 @@ OpenAPI_access_net_charging_identifier_t *OpenAPI_access_net_charging_identifier
goto end;
}
if (!cJSON_IsNumber(acc_net_cha_id_value)) {
ogs_error("OpenAPI_access_net_charging_identifier_parseFromJSON() failed [acc_net_cha_id_value]");
goto end;
@ -110,6 +109,7 @@ OpenAPI_access_net_charging_identifier_t *OpenAPI_access_net_charging_identifier
}
access_net_charging_identifier_local_var = OpenAPI_access_net_charging_identifier_create (
acc_net_cha_id_value->valuedouble,
flows ? flowsList : NULL
);

1
lib/sbi/openapi/model/access_token_err.c
View File

@ -98,7 +98,6 @@ OpenAPI_access_token_err_t *OpenAPI_access_token_err_parseFromJSON(cJSON *access
}
OpenAPI_access_token_err_error_e errorVariable;
if (!cJSON_IsString(error)) {
ogs_error("OpenAPI_access_token_err_parseFromJSON() failed [error]");
goto end;

3
lib/sbi/openapi/model/access_token_req.c
View File

@ -310,7 +310,6 @@ OpenAPI_access_token_req_t *OpenAPI_access_token_req_parseFromJSON(cJSON *access
}
OpenAPI_access_token_req_grant_type_e grant_typeVariable;
if (!cJSON_IsString(grant_type)) {
ogs_error("OpenAPI_access_token_req_parseFromJSON() failed [grant_type]");
goto end;
@ -323,7 +322,6 @@ OpenAPI_access_token_req_t *OpenAPI_access_token_req_parseFromJSON(cJSON *access
goto end;
}
if (!cJSON_IsString(nf_instance_id)) {
ogs_error("OpenAPI_access_token_req_parseFromJSON() failed [nf_instance_id]");
goto end;
@ -357,7 +355,6 @@ OpenAPI_access_token_req_t *OpenAPI_access_token_req_parseFromJSON(cJSON *access
goto end;
}
if (!cJSON_IsString(scope)) {
ogs_error("OpenAPI_access_token_req_parseFromJSON() failed [scope]");
goto end;

41
lib/sbi/openapi/model/accu_usage_report.c
View File

@ -6,13 +6,21 @@
OpenAPI_accu_usage_report_t *OpenAPI_accu_usage_report_create(
char *ref_um_ids,
bool is_vol_usage,
long vol_usage,
bool is_vol_usage_uplink,
long vol_usage_uplink,
bool is_vol_usage_downlink,
long vol_usage_downlink,
bool is_time_usage,
int time_usage,
bool is_next_vol_usage,
long next_vol_usage,
bool is_next_vol_usage_uplink,
long next_vol_usage_uplink,
bool is_next_vol_usage_downlink,
long next_vol_usage_downlink,
bool is_next_time_usage,
int next_time_usage
)
{
@ -21,13 +29,21 @@ OpenAPI_accu_usage_report_t *OpenAPI_accu_usage_report_create(
return NULL;
}
accu_usage_report_local_var->ref_um_ids = ref_um_ids;
accu_usage_report_local_var->is_vol_usage = is_vol_usage;
accu_usage_report_local_var->vol_usage = vol_usage;
accu_usage_report_local_var->is_vol_usage_uplink = is_vol_usage_uplink;
accu_usage_report_local_var->vol_usage_uplink = vol_usage_uplink;
accu_usage_report_local_var->is_vol_usage_downlink = is_vol_usage_downlink;
accu_usage_report_local_var->vol_usage_downlink = vol_usage_downlink;
accu_usage_report_local_var->is_time_usage = is_time_usage;
accu_usage_report_local_var->time_usage = time_usage;
accu_usage_report_local_var->is_next_vol_usage = is_next_vol_usage;
accu_usage_report_local_var->next_vol_usage = next_vol_usage;
accu_usage_report_local_var->is_next_vol_usage_uplink = is_next_vol_usage_uplink;
accu_usage_report_local_var->next_vol_usage_uplink = next_vol_usage_uplink;
accu_usage_report_local_var->is_next_vol_usage_downlink = is_next_vol_usage_downlink;
accu_usage_report_local_var->next_vol_usage_downlink = next_vol_usage_downlink;
accu_usage_report_local_var->is_next_time_usage = is_next_time_usage;
accu_usage_report_local_var->next_time_usage = next_time_usage;
return accu_usage_report_local_var;
@ -58,56 +74,56 @@ cJSON *OpenAPI_accu_usage_report_convertToJSON(OpenAPI_accu_usage_report_t *accu
goto end;
}
if (accu_usage_report->vol_usage) {
if (accu_usage_report->is_vol_usage) {
if (cJSON_AddNumberToObject(item, "volUsage", accu_usage_report->vol_usage) == NULL) {
ogs_error("OpenAPI_accu_usage_report_convertToJSON() failed [vol_usage]");
goto end;
}
}
if (accu_usage_report->vol_usage_uplink) {
if (accu_usage_report->is_vol_usage_uplink) {
if (cJSON_AddNumberToObject(item, "volUsageUplink", accu_usage_report->vol_usage_uplink) == NULL) {
ogs_error("OpenAPI_accu_usage_report_convertToJSON() failed [vol_usage_uplink]");
goto end;
}
}
if (accu_usage_report->vol_usage_downlink) {
if (accu_usage_report->is_vol_usage_downlink) {
if (cJSON_AddNumberToObject(item, "volUsageDownlink", accu_usage_report->vol_usage_downlink) == NULL) {
ogs_error("OpenAPI_accu_usage_report_convertToJSON() failed [vol_usage_downlink]");
goto end;
}
}
if (accu_usage_report->time_usage) {
if (accu_usage_report->is_time_usage) {
if (cJSON_AddNumberToObject(item, "timeUsage", accu_usage_report->time_usage) == NULL) {
ogs_error("OpenAPI_accu_usage_report_convertToJSON() failed [time_usage]");
goto end;
}
}
if (accu_usage_report->next_vol_usage) {
if (accu_usage_report->is_next_vol_usage) {
if (cJSON_AddNumberToObject(item, "nextVolUsage", accu_usage_report->next_vol_usage) == NULL) {
ogs_error("OpenAPI_accu_usage_report_convertToJSON() failed [next_vol_usage]");
goto end;
}
}
if (accu_usage_report->next_vol_usage_uplink) {
if (accu_usage_report->is_next_vol_usage_uplink) {
if (cJSON_AddNumberToObject(item, "nextVolUsageUplink", accu_usage_report->next_vol_usage_uplink) == NULL) {
ogs_error("OpenAPI_accu_usage_report_convertToJSON() failed [next_vol_usage_uplink]");
goto end;
}
}
if (accu_usage_report->next_vol_usage_downlink) {
if (accu_usage_report->is_next_vol_usage_downlink) {
if (cJSON_AddNumberToObject(item, "nextVolUsageDownlink", accu_usage_report->next_vol_usage_downlink) == NULL) {
ogs_error("OpenAPI_accu_usage_report_convertToJSON() failed [next_vol_usage_downlink]");
goto end;
}
}
if (accu_usage_report->next_time_usage) {
if (accu_usage_report->is_next_time_usage) {
if (cJSON_AddNumberToObject(item, "nextTimeUsage", accu_usage_report->next_time_usage) == NULL) {
ogs_error("OpenAPI_accu_usage_report_convertToJSON() failed [next_time_usage]");
goto end;
@ -127,7 +143,6 @@ OpenAPI_accu_usage_report_t *OpenAPI_accu_usage_report_parseFromJSON(cJSON *accu
goto end;
}
if (!cJSON_IsString(ref_um_ids)) {
ogs_error("OpenAPI_accu_usage_report_parseFromJSON() failed [ref_um_ids]");
goto end;
@ -207,13 +222,21 @@ OpenAPI_accu_usage_report_t *OpenAPI_accu_usage_report_parseFromJSON(cJSON *accu
accu_usage_report_local_var = OpenAPI_accu_usage_report_create (
ogs_strdup_or_assert(ref_um_ids->valuestring),
vol_usage ? true : false,
vol_usage ? vol_usage->valuedouble : 0,
vol_usage_uplink ? true : false,
vol_usage_uplink ? vol_usage_uplink->valuedouble : 0,
vol_usage_downlink ? true : false,
vol_usage_downlink ? vol_usage_downlink->valuedouble : 0,
time_usage ? true : false,
time_usage ? time_usage->valuedouble : 0,
next_vol_usage ? true : false,
next_vol_usage ? next_vol_usage->valuedouble : 0,
next_vol_usage_uplink ? true : false,
next_vol_usage_uplink ? next_vol_usage_uplink->valuedouble : 0,
next_vol_usage_downlink ? true : false,
next_vol_usage_downlink ? next_vol_usage_downlink->valuedouble : 0,
next_time_usage ? true : false,
next_time_usage ? next_time_usage->valuedouble : 0
);

16
lib/sbi/openapi/model/accu_usage_report.h
View File

@ -20,25 +20,41 @@ extern "C" {
typedef struct OpenAPI_accu_usage_report_s OpenAPI_accu_usage_report_t;
typedef struct OpenAPI_accu_usage_report_s {
char *ref_um_ids;
bool is_vol_usage;
long vol_usage;
bool is_vol_usage_uplink;
long vol_usage_uplink;
bool is_vol_usage_downlink;
long vol_usage_downlink;
bool is_time_usage;
int time_usage;
bool is_next_vol_usage;
long next_vol_usage;
bool is_next_vol_usage_uplink;
long next_vol_usage_uplink;
bool is_next_vol_usage_downlink;
long next_vol_usage_downlink;
bool is_next_time_usage;
int next_time_usage;
} OpenAPI_accu_usage_report_t;
OpenAPI_accu_usage_report_t *OpenAPI_accu_usage_report_create(
char *ref_um_ids,
bool is_vol_usage,
long vol_usage,
bool is_vol_usage_uplink,
long vol_usage_uplink,
bool is_vol_usage_downlink,
long vol_usage_downlink,
bool is_time_usage,
int time_usage,
bool is_next_vol_usage,
long next_vol_usage,
bool is_next_vol_usage_uplink,
long next_vol_usage_uplink,
bool is_next_vol_usage_downlink,
long next_vol_usage_downlink,
bool is_next_time_usage,
int next_time_usage
);
void OpenAPI_accu_usage_report_free(OpenAPI_accu_usage_report_t *accu_usage_report);

20
lib/sbi/openapi/model/accumulated_usage.c
View File

@ -5,9 +5,13 @@
#include "accumulated_usage.h"
OpenAPI_accumulated_usage_t *OpenAPI_accumulated_usage_create(
bool is_duration,
int duration,
bool is_total_volume,
long total_volume,
bool is_downlink_volume,
long downlink_volume,
bool is_uplink_volume,
long uplink_volume
)
{
@ -15,9 +19,13 @@ OpenAPI_accumulated_usage_t *OpenAPI_accumulated_usage_create(
if (!accumulated_usage_local_var) {
return NULL;
}
accumulated_usage_local_var->is_duration = is_duration;
accumulated_usage_local_var->duration = duration;
accumulated_usage_local_var->is_total_volume = is_total_volume;
accumulated_usage_local_var->total_volume = total_volume;
accumulated_usage_local_var->is_downlink_volume = is_downlink_volume;
accumulated_usage_local_var->downlink_volume = downlink_volume;
accumulated_usage_local_var->is_uplink_volume = is_uplink_volume;
accumulated_usage_local_var->uplink_volume = uplink_volume;
return accumulated_usage_local_var;
@ -42,28 +50,28 @@ cJSON *OpenAPI_accumulated_usage_convertToJSON(OpenAPI_accumulated_usage_t *accu
}
item = cJSON_CreateObject();
if (accumulated_usage->duration) {
if (accumulated_usage->is_duration) {
if (cJSON_AddNumberToObject(item, "duration", accumulated_usage->duration) == NULL) {
ogs_error("OpenAPI_accumulated_usage_convertToJSON() failed [duration]");
goto end;
}
}
if (accumulated_usage->total_volume) {
if (accumulated_usage->is_total_volume) {
if (cJSON_AddNumberToObject(item, "totalVolume", accumulated_usage->total_volume) == NULL) {
ogs_error("OpenAPI_accumulated_usage_convertToJSON() failed [total_volume]");
goto end;
}
}
if (accumulated_usage->downlink_volume) {
if (accumulated_usage->is_downlink_volume) {
if (cJSON_AddNumberToObject(item, "downlinkVolume", accumulated_usage->downlink_volume) == NULL) {
ogs_error("OpenAPI_accumulated_usage_convertToJSON() failed [downlink_volume]");
goto end;
}
}
if (accumulated_usage->uplink_volume) {
if (accumulated_usage->is_uplink_volume) {
if (cJSON_AddNumberToObject(item, "uplinkVolume", accumulated_usage->uplink_volume) == NULL) {
ogs_error("OpenAPI_accumulated_usage_convertToJSON() failed [uplink_volume]");
goto end;
@ -114,9 +122,13 @@ OpenAPI_accumulated_usage_t *OpenAPI_accumulated_usage_parseFromJSON(cJSON *accu
}
accumulated_usage_local_var = OpenAPI_accumulated_usage_create (
duration ? true : false,
duration ? duration->valuedouble : 0,
total_volume ? true : false,
total_volume ? total_volume->valuedouble : 0,
downlink_volume ? true : false,
downlink_volume ? downlink_volume->valuedouble : 0,
uplink_volume ? true : false,
uplink_volume ? uplink_volume->valuedouble : 0
);

8
lib/sbi/openapi/model/accumulated_usage.h
View File

@ -19,16 +19,24 @@ extern "C" {
typedef struct OpenAPI_accumulated_usage_s OpenAPI_accumulated_usage_t;
typedef struct OpenAPI_accumulated_usage_s {
bool is_duration;
int duration;
bool is_total_volume;
long total_volume;
bool is_downlink_volume;
long downlink_volume;
bool is_uplink_volume;
long uplink_volume;
} OpenAPI_accumulated_usage_t;
OpenAPI_accumulated_usage_t *OpenAPI_accumulated_usage_create(
bool is_duration,
int duration,
bool is_total_volume,
long total_volume,
bool is_downlink_volume,
long downlink_volume,
bool is_uplink_volume,
long uplink_volume
);
void OpenAPI_accumulated_usage_free(OpenAPI_accumulated_usage_t *accumulated_usage);

6
lib/sbi/openapi/model/acknowledge_info.c
View File

@ -9,6 +9,7 @@ OpenAPI_acknowledge_info_t *OpenAPI_acknowledge_info_create(
char *upu_mac_iue,
char *secured_packet,
char *provisioning_time,
bool is_ue_not_reachable,
int ue_not_reachable
)
{
@ -20,6 +21,7 @@ OpenAPI_acknowledge_info_t *OpenAPI_acknowledge_info_create(
acknowledge_info_local_var->upu_mac_iue = upu_mac_iue;
acknowledge_info_local_var->secured_packet = secured_packet;
acknowledge_info_local_var->provisioning_time = provisioning_time;
acknowledge_info_local_var->is_ue_not_reachable = is_ue_not_reachable;
acknowledge_info_local_var->ue_not_reachable = ue_not_reachable;
return acknowledge_info_local_var;
@ -74,7 +76,7 @@ cJSON *OpenAPI_acknowledge_info_convertToJSON(OpenAPI_acknowledge_info_t *acknow
goto end;
}
if (acknowledge_info->ue_not_reachable) {
if (acknowledge_info->is_ue_not_reachable) {
if (cJSON_AddBoolToObject(item, "ueNotReachable", acknowledge_info->ue_not_reachable) == NULL) {
ogs_error("OpenAPI_acknowledge_info_convertToJSON() failed [ue_not_reachable]");
goto end;
@ -121,7 +123,6 @@ OpenAPI_acknowledge_info_t *OpenAPI_acknowledge_info_parseFromJSON(cJSON *acknow
goto end;
}
if (!cJSON_IsString(provisioning_time)) {
ogs_error("OpenAPI_acknowledge_info_parseFromJSON() failed [provisioning_time]");
goto end;
@ -141,6 +142,7 @@ OpenAPI_acknowledge_info_t *OpenAPI_acknowledge_info_parseFromJSON(cJSON *acknow
upu_mac_iue ? ogs_strdup_or_assert(upu_mac_iue->valuestring) : NULL,
secured_packet ? ogs_strdup_or_assert(secured_packet->valuestring) : NULL,
ogs_strdup_or_assert(provisioning_time->valuestring),
ue_not_reachable ? true : false,
ue_not_reachable ? ue_not_reachable->valueint : 0
);

2
lib/sbi/openapi/model/acknowledge_info.h
View File

@ -23,6 +23,7 @@ typedef struct OpenAPI_acknowledge_info_s {
char *upu_mac_iue;
char *secured_packet;
char *provisioning_time;
bool is_ue_not_reachable;
int ue_not_reachable;
} OpenAPI_acknowledge_info_t;
@ -31,6 +32,7 @@ OpenAPI_acknowledge_info_t *OpenAPI_acknowledge_info_create(
char *upu_mac_iue,
char *secured_packet,
char *provisioning_time,
bool is_ue_not_reachable,
int ue_not_reachable
);
void OpenAPI_acknowledge_info_free(OpenAPI_acknowledge_info_t *acknowledge_info);

1
lib/sbi/openapi/model/additional_access_info.c
View File

@ -64,7 +64,6 @@ OpenAPI_additional_access_info_t *OpenAPI_additional_access_info_parseFromJSON(c
}
OpenAPI_access_type_e access_typeVariable;
if (!cJSON_IsString(access_type)) {
ogs_error("OpenAPI_additional_access_info_parseFromJSON() failed [access_type]");
goto end;

5
lib/sbi/openapi/model/additional_snssai_data.c
View File

@ -5,6 +5,7 @@
#include "additional_snssai_data.h"
OpenAPI_additional_snssai_data_t *OpenAPI_additional_snssai_data_create(
bool is_required_authn_authz,
int required_authn_authz
)
{
@ -12,6 +13,7 @@ OpenAPI_additional_snssai_data_t *OpenAPI_additional_snssai_data_create(
if (!additional_snssai_data_local_var) {
return NULL;
}
additional_snssai_data_local_var->is_required_authn_authz = is_required_authn_authz;
additional_snssai_data_local_var->required_authn_authz = required_authn_authz;
return additional_snssai_data_local_var;
@ -36,7 +38,7 @@ cJSON *OpenAPI_additional_snssai_data_convertToJSON(OpenAPI_additional_snssai_da
}
item = cJSON_CreateObject();
if (additional_snssai_data->required_authn_authz) {
if (additional_snssai_data->is_required_authn_authz) {
if (cJSON_AddBoolToObject(item, "requiredAuthnAuthz", additional_snssai_data->required_authn_authz) == NULL) {
ogs_error("OpenAPI_additional_snssai_data_convertToJSON() failed [required_authn_authz]");
goto end;
@ -60,6 +62,7 @@ OpenAPI_additional_snssai_data_t *OpenAPI_additional_snssai_data_parseFromJSON(c
}
additional_snssai_data_local_var = OpenAPI_additional_snssai_data_create (
required_authn_authz ? true : false,
required_authn_authz ? required_authn_authz->valueint : 0
);

2
lib/sbi/openapi/model/additional_snssai_data.h
View File

@ -19,10 +19,12 @@ extern "C" {
typedef struct OpenAPI_additional_snssai_data_s OpenAPI_additional_snssai_data_t;
typedef struct OpenAPI_additional_snssai_data_s {
bool is_required_authn_authz;
int required_authn_authz;
} OpenAPI_additional_snssai_data_t;
OpenAPI_additional_snssai_data_t *OpenAPI_additional_snssai_data_create(
bool is_required_authn_authz,
int required_authn_authz
);
void OpenAPI_additional_snssai_data_free(OpenAPI_additional_snssai_data_t *additional_snssai_data);

1
lib/sbi/openapi/model/af_event_exposure_data.c
View File

@ -108,7 +108,6 @@ OpenAPI_af_event_exposure_data_t *OpenAPI_af_event_exposure_data_parseFromJSON(c
}
OpenAPI_list_t *af_eventsList;
cJSON *af_events_local_nonprimitive;
if (!cJSON_IsArray(af_events)) {
ogs_error("OpenAPI_af_event_exposure_data_parseFromJSON() failed [af_events]");

1
lib/sbi/openapi/model/af_event_notification.c
View File

@ -81,7 +81,6 @@ OpenAPI_af_event_notification_t *OpenAPI_af_event_notification_parseFromJSON(cJS
}
OpenAPI_af_event_e eventVariable;
if (!cJSON_IsString(event)) {
ogs_error("OpenAPI_af_event_notification_parseFromJSON() failed [event]");
goto end;

11
lib/sbi/openapi/model/af_event_subscription.c
View File

@ -7,7 +7,9 @@
OpenAPI_af_event_subscription_t *OpenAPI_af_event_subscription_create(
OpenAPI_af_event_e event,
OpenAPI_af_notif_method_e notif_method,
bool is_rep_period,
int rep_period,
bool is_wait_time,
int wait_time
)
{
@ -17,7 +19,9 @@ OpenAPI_af_event_subscription_t *OpenAPI_af_event_subscription_create(
}
af_event_subscription_local_var->event = event;
af_event_subscription_local_var->notif_method = notif_method;
af_event_subscription_local_var->is_rep_period = is_rep_period;
af_event_subscription_local_var->rep_period = rep_period;
af_event_subscription_local_var->is_wait_time = is_wait_time;
af_event_subscription_local_var->wait_time = wait_time;
return af_event_subscription_local_var;
@ -54,14 +58,14 @@ cJSON *OpenAPI_af_event_subscription_convertToJSON(OpenAPI_af_event_subscription
}
}
if (af_event_subscription->rep_period) {
if (af_event_subscription->is_rep_period) {
if (cJSON_AddNumberToObject(item, "repPeriod", af_event_subscription->rep_period) == NULL) {
ogs_error("OpenAPI_af_event_subscription_convertToJSON() failed [rep_period]");
goto end;
}
}
if (af_event_subscription->wait_time) {
if (af_event_subscription->is_wait_time) {
if (cJSON_AddNumberToObject(item, "waitTime", af_event_subscription->wait_time) == NULL) {
ogs_error("OpenAPI_af_event_subscription_convertToJSON() failed [wait_time]");
goto end;
@ -82,7 +86,6 @@ OpenAPI_af_event_subscription_t *OpenAPI_af_event_subscription_parseFromJSON(cJS
}
OpenAPI_af_event_e eventVariable;
if (!cJSON_IsString(event)) {
ogs_error("OpenAPI_af_event_subscription_parseFromJSON() failed [event]");
goto end;
@ -121,7 +124,9 @@ OpenAPI_af_event_subscription_t *OpenAPI_af_event_subscription_parseFromJSON(cJS
af_event_subscription_local_var = OpenAPI_af_event_subscription_create (
eventVariable,
notif_method ? notif_methodVariable : 0,
rep_period ? true : false,
rep_period ? rep_period->valuedouble : 0,
wait_time ? true : false,
wait_time ? wait_time->valuedouble : 0
);

4
lib/sbi/openapi/model/af_event_subscription.h
View File

@ -23,14 +23,18 @@ typedef struct OpenAPI_af_event_subscription_s OpenAPI_af_event_subscription_t;
typedef struct OpenAPI_af_event_subscription_s {
OpenAPI_af_event_e event;
OpenAPI_af_notif_method_e notif_method;
bool is_rep_period;
int rep_period;
bool is_wait_time;
int wait_time;
} OpenAPI_af_event_subscription_t;
OpenAPI_af_event_subscription_t *OpenAPI_af_event_subscription_create(
OpenAPI_af_event_e event,
OpenAPI_af_notif_method_e notif_method,
bool is_rep_period,
int rep_period,
bool is_wait_time,
int wait_time
);
void OpenAPI_af_event_subscription_free(OpenAPI_af_event_subscription_t *af_event_subscription);

10
lib/sbi/openapi/model/af_routing_requirement.c
View File

@ -5,11 +5,13 @@
#include "af_routing_requirement.h"
OpenAPI_af_routing_requirement_t *OpenAPI_af_routing_requirement_create(
bool is_app_reloc,
int app_reloc,
OpenAPI_list_t *route_to_locs,
OpenAPI_spatial_validity_t *sp_val,
OpenAPI_list_t *temp_vals,
OpenAPI_up_path_chg_event_t *up_path_chg_sub,
bool is_addr_preser_ind,
int addr_preser_ind
)
{
@ -17,11 +19,13 @@ OpenAPI_af_routing_requirement_t *OpenAPI_af_routing_requirement_create(
if (!af_routing_requirement_local_var) {
return NULL;
}
af_routing_requirement_local_var->is_app_reloc = is_app_reloc;
af_routing_requirement_local_var->app_reloc = app_reloc;
af_routing_requirement_local_var->route_to_locs = route_to_locs;
af_routing_requirement_local_var->sp_val = sp_val;
af_routing_requirement_local_var->temp_vals = temp_vals;
af_routing_requirement_local_var->up_path_chg_sub = up_path_chg_sub;
af_routing_requirement_local_var->is_addr_preser_ind = is_addr_preser_ind;
af_routing_requirement_local_var->addr_preser_ind = addr_preser_ind;
return af_routing_requirement_local_var;
@ -56,7 +60,7 @@ cJSON *OpenAPI_af_routing_requirement_convertToJSON(OpenAPI_af_routing_requireme
}
item = cJSON_CreateObject();
if (af_routing_requirement->app_reloc) {
if (af_routing_requirement->is_app_reloc) {
if (cJSON_AddBoolToObject(item, "appReloc", af_routing_requirement->app_reloc) == NULL) {
ogs_error("OpenAPI_af_routing_requirement_convertToJSON() failed [app_reloc]");
goto end;
@ -129,7 +133,7 @@ cJSON *OpenAPI_af_routing_requirement_convertToJSON(OpenAPI_af_routing_requireme
}
}
if (af_routing_requirement->addr_preser_ind) {
if (af_routing_requirement->is_addr_preser_ind) {
if (cJSON_AddBoolToObject(item, "addrPreserInd", af_routing_requirement->addr_preser_ind) == NULL) {
ogs_error("OpenAPI_af_routing_requirement_convertToJSON() failed [addr_preser_ind]");
goto end;
@ -222,11 +226,13 @@ OpenAPI_af_routing_requirement_t *OpenAPI_af_routing_requirement_parseFromJSON(c
}
af_routing_requirement_local_var = OpenAPI_af_routing_requirement_create (
app_reloc ? true : false,
app_reloc ? app_reloc->valueint : 0,
route_to_locs ? route_to_locsList : NULL,
sp_val ? sp_val_local_nonprim : NULL,
temp_vals ? temp_valsList : NULL,
up_path_chg_sub ? up_path_chg_sub_local_nonprim : NULL,
addr_preser_ind ? true : false,
addr_preser_ind ? addr_preser_ind->valueint : 0
);

4
lib/sbi/openapi/model/af_routing_requirement.h
View File

@ -23,20 +23,24 @@ extern "C" {
typedef struct OpenAPI_af_routing_requirement_s OpenAPI_af_routing_requirement_t;
typedef struct OpenAPI_af_routing_requirement_s {
bool is_app_reloc;
int app_reloc;
OpenAPI_list_t *route_to_locs;
struct OpenAPI_spatial_validity_s *sp_val;
OpenAPI_list_t *temp_vals;
struct OpenAPI_up_path_chg_event_s *up_path_chg_sub;
bool is_addr_preser_ind;
int addr_preser_ind;
} OpenAPI_af_routing_requirement_t;
OpenAPI_af_routing_requirement_t *OpenAPI_af_routing_requirement_create(
bool is_app_reloc,
int app_reloc,
OpenAPI_list_t *route_to_locs,
OpenAPI_spatial_validity_t *sp_val,
OpenAPI_list_t *temp_vals,
OpenAPI_up_path_chg_event_t *up_path_chg_sub,
bool is_addr_preser_ind,
int addr_preser_ind
);
void OpenAPI_af_routing_requirement_free(OpenAPI_af_routing_requirement_t *af_routing_requirement);

10
lib/sbi/openapi/model/af_routing_requirement_rm.c
View File

@ -5,11 +5,13 @@
#include "af_routing_requirement_rm.h"
OpenAPI_af_routing_requirement_rm_t *OpenAPI_af_routing_requirement_rm_create(
bool is_app_reloc,
int app_reloc,
OpenAPI_list_t *route_to_locs,
OpenAPI_spatial_validity_rm_t *sp_val,
OpenAPI_list_t *temp_vals,
OpenAPI_up_path_chg_event_t *up_path_chg_sub,
bool is_addr_preser_ind,
int addr_preser_ind
)
{
@ -17,11 +19,13 @@ OpenAPI_af_routing_requirement_rm_t *OpenAPI_af_routing_requirement_rm_create(
if (!af_routing_requirement_rm_local_var) {
return NULL;
}
af_routing_requirement_rm_local_var->is_app_reloc = is_app_reloc;
af_routing_requirement_rm_local_var->app_reloc = app_reloc;
af_routing_requirement_rm_local_var->route_to_locs = route_to_locs;
af_routing_requirement_rm_local_var->sp_val = sp_val;
af_routing_requirement_rm_local_var->temp_vals = temp_vals;
af_routing_requirement_rm_local_var->up_path_chg_sub = up_path_chg_sub;
af_routing_requirement_rm_local_var->is_addr_preser_ind = is_addr_preser_ind;
af_routing_requirement_rm_local_var->addr_preser_ind = addr_preser_ind;
return af_routing_requirement_rm_local_var;
@ -56,7 +60,7 @@ cJSON *OpenAPI_af_routing_requirement_rm_convertToJSON(OpenAPI_af_routing_requir
}
item = cJSON_CreateObject();
if (af_routing_requirement_rm->app_reloc) {
if (af_routing_requirement_rm->is_app_reloc) {
if (cJSON_AddBoolToObject(item, "appReloc", af_routing_requirement_rm->app_reloc) == NULL) {
ogs_error("OpenAPI_af_routing_requirement_rm_convertToJSON() failed [app_reloc]");
goto end;
@ -129,7 +133,7 @@ cJSON *OpenAPI_af_routing_requirement_rm_convertToJSON(OpenAPI_af_routing_requir
}
}
if (af_routing_requirement_rm->addr_preser_ind) {
if (af_routing_requirement_rm->is_addr_preser_ind) {
if (cJSON_AddBoolToObject(item, "addrPreserInd", af_routing_requirement_rm->addr_preser_ind) == NULL) {
ogs_error("OpenAPI_af_routing_requirement_rm_convertToJSON() failed [addr_preser_ind]");
goto end;
@ -222,11 +226,13 @@ OpenAPI_af_routing_requirement_rm_t *OpenAPI_af_routing_requirement_rm_parseFrom
}
af_routing_requirement_rm_local_var = OpenAPI_af_routing_requirement_rm_create (
app_reloc ? true : false,
app_reloc ? app_reloc->valueint : 0,
route_to_locs ? route_to_locsList : NULL,
sp_val ? sp_val_local_nonprim : NULL,
temp_vals ? temp_valsList : NULL,
up_path_chg_sub ? up_path_chg_sub_local_nonprim : NULL,
addr_preser_ind ? true : false,
addr_preser_ind ? addr_preser_ind->valueint : 0
);

4
lib/sbi/openapi/model/af_routing_requirement_rm.h
View File

@ -23,20 +23,24 @@ extern "C" {
typedef struct OpenAPI_af_routing_requirement_rm_s OpenAPI_af_routing_requirement_rm_t;
typedef struct OpenAPI_af_routing_requirement_rm_s {
bool is_app_reloc;
int app_reloc;
OpenAPI_list_t *route_to_locs;
struct OpenAPI_spatial_validity_rm_s *sp_val;
OpenAPI_list_t *temp_vals;
struct OpenAPI_up_path_chg_event_s *up_path_chg_sub;
bool is_addr_preser_ind;
int addr_preser_ind;
} OpenAPI_af_routing_requirement_rm_t;
OpenAPI_af_routing_requirement_rm_t *OpenAPI_af_routing_requirement_rm_create(
bool is_app_reloc,
int app_reloc,
OpenAPI_list_t *route_to_locs,
OpenAPI_spatial_validity_rm_t *sp_val,
OpenAPI_list_t *temp_vals,
OpenAPI_up_path_chg_event_t *up_path_chg_sub,
bool is_addr_preser_ind,
int addr_preser_ind
);
void OpenAPI_af_routing_requirement_rm_free(OpenAPI_af_routing_requirement_rm_t *af_routing_requirement_rm);

2
lib/sbi/openapi/model/allowed_nssai.c
View File

@ -79,7 +79,6 @@ OpenAPI_allowed_nssai_t *OpenAPI_allowed_nssai_parseFromJSON(cJSON *allowed_nssa
}
OpenAPI_list_t *allowed_snssai_listList;
cJSON *allowed_snssai_list_local_nonprimitive;
if (!cJSON_IsArray(allowed_snssai_list)){
ogs_error("OpenAPI_allowed_nssai_parseFromJSON() failed [allowed_snssai_list]");
@ -105,7 +104,6 @@ OpenAPI_allowed_nssai_t *OpenAPI_allowed_nssai_parseFromJSON(cJSON *allowed_nssa
}
OpenAPI_access_type_e access_typeVariable;
if (!cJSON_IsString(access_type)) {
ogs_error("OpenAPI_allowed_nssai_parseFromJSON() failed [access_type]");
goto end;

1
lib/sbi/openapi/model/allowed_snssai.c
View File

@ -104,7 +104,6 @@ OpenAPI_allowed_snssai_t *OpenAPI_allowed_snssai_parseFromJSON(cJSON *allowed_sn
}
OpenAPI_snssai_t *allowed_snssai_local_nonprim = NULL;
allowed_snssai_local_nonprim = OpenAPI_snssai_parseFromJSON(allowed_snssai);
cJSON *nsi_information_list = cJSON_GetObjectItemCaseSensitive(allowed_snssaiJSON, "nsiInformationList");

7
lib/sbi/openapi/model/alternative_qos_profile.c
View File

@ -8,6 +8,7 @@ OpenAPI_alternative_qos_profile_t *OpenAPI_alternative_qos_profile_create(
int index,
char *gua_fbr_dl,
char *gua_fbr_ul,
bool is_packet_delay_budget,
int packet_delay_budget,
char *packet_err_rate
)
@ -19,6 +20,7 @@ OpenAPI_alternative_qos_profile_t *OpenAPI_alternative_qos_profile_create(
alternative_qos_profile_local_var->index = index;
alternative_qos_profile_local_var->gua_fbr_dl = gua_fbr_dl;
alternative_qos_profile_local_var->gua_fbr_ul = gua_fbr_ul;
alternative_qos_profile_local_var->is_packet_delay_budget = is_packet_delay_budget;
alternative_qos_profile_local_var->packet_delay_budget = packet_delay_budget;
alternative_qos_profile_local_var->packet_err_rate = packet_err_rate;
@ -66,7 +68,7 @@ cJSON *OpenAPI_alternative_qos_profile_convertToJSON(OpenAPI_alternative_qos_pro
}
}
if (alternative_qos_profile->packet_delay_budget) {
if (alternative_qos_profile->is_packet_delay_budget) {
if (cJSON_AddNumberToObject(item, "packetDelayBudget", alternative_qos_profile->packet_delay_budget) == NULL) {
ogs_error("OpenAPI_alternative_qos_profile_convertToJSON() failed [packet_delay_budget]");
goto end;
@ -93,7 +95,6 @@ OpenAPI_alternative_qos_profile_t *OpenAPI_alternative_qos_profile_parseFromJSON
goto end;
}
if (!cJSON_IsNumber(index)) {
ogs_error("OpenAPI_alternative_qos_profile_parseFromJSON() failed [index]");
goto end;
@ -136,9 +137,11 @@ OpenAPI_alternative_qos_profile_t *OpenAPI_alternative_qos_profile_parseFromJSON
}
alternative_qos_profile_local_var = OpenAPI_alternative_qos_profile_create (
index->valuedouble,
gua_fbr_dl ? ogs_strdup_or_assert(gua_fbr_dl->valuestring) : NULL,
gua_fbr_ul ? ogs_strdup_or_assert(gua_fbr_ul->valuestring) : NULL,
packet_delay_budget ? true : false,
packet_delay_budget ? packet_delay_budget->valuedouble : 0,
packet_err_rate ? ogs_strdup_or_assert(packet_err_rate->valuestring) : NULL
);

2
lib/sbi/openapi/model/alternative_qos_profile.h
View File

@ -22,6 +22,7 @@ typedef struct OpenAPI_alternative_qos_profile_s {
int index;
char *gua_fbr_dl;
char *gua_fbr_ul;
bool is_packet_delay_budget;
int packet_delay_budget;
char *packet_err_rate;
} OpenAPI_alternative_qos_profile_t;
@ -30,6 +31,7 @@ OpenAPI_alternative_qos_profile_t *OpenAPI_alternative_qos_profile_create(
int index,
char *gua_fbr_dl,
char *gua_fbr_ul,
bool is_packet_delay_budget,
int packet_delay_budget,
char *packet_err_rate
);

2
lib/sbi/openapi/model/ambr.c
View File

@ -63,7 +63,6 @@ OpenAPI_ambr_t *OpenAPI_ambr_parseFromJSON(cJSON *ambrJSON)
goto end;
}
if (!cJSON_IsString(uplink)) {
ogs_error("OpenAPI_ambr_parseFromJSON() failed [uplink]");
goto end;
@ -75,7 +74,6 @@ OpenAPI_ambr_t *OpenAPI_ambr_parseFromJSON(cJSON *ambrJSON)
goto end;
}
if (!cJSON_IsString(downlink)) {
ogs_error("OpenAPI_ambr_parseFromJSON() failed [downlink]");
goto end;

2
lib/sbi/openapi/model/ambr_1.c
View File

@ -63,7 +63,6 @@ OpenAPI_ambr_1_t *OpenAPI_ambr_1_parseFromJSON(cJSON *ambr_1JSON)
goto end;
}
if (!cJSON_IsString(uplink)) {
ogs_error("OpenAPI_ambr_1_parseFromJSON() failed [uplink]");
goto end;
@ -75,7 +74,6 @@ OpenAPI_ambr_1_t *OpenAPI_ambr_1_parseFromJSON(cJSON *ambr_1JSON)
goto end;
}
if (!cJSON_IsString(downlink)) {
ogs_error("OpenAPI_ambr_1_parseFromJSON() failed [downlink]");
goto end;

2
lib/sbi/openapi/model/ambr_rm.c
View File

@ -63,7 +63,6 @@ OpenAPI_ambr_rm_t *OpenAPI_ambr_rm_parseFromJSON(cJSON *ambr_rmJSON)
goto end;
}
if (!cJSON_IsString(uplink)) {
ogs_error("OpenAPI_ambr_rm_parseFromJSON() failed [uplink]");
goto end;
@ -75,7 +74,6 @@ OpenAPI_ambr_rm_t *OpenAPI_ambr_rm_parseFromJSON(cJSON *ambr_rmJSON)
goto end;
}
if (!cJSON_IsString(downlink)) {
ogs_error("OpenAPI_ambr_rm_parseFromJSON() failed [downlink]");
goto end;

34
lib/sbi/openapi/model/amf3_gpp_access_registration.c
View File

@ -7,6 +7,7 @@
OpenAPI_amf3_gpp_access_registration_t *OpenAPI_amf3_gpp_access_registration_create(
char *amf_instance_id,
char *supported_features,
bool is_purge_flag,
int purge_flag,
char *pei,
OpenAPI_ims_vo_ps_e ims_vo_ps,
@ -14,18 +15,23 @@ OpenAPI_amf3_gpp_access_registration_t *OpenAPI_amf3_gpp_access_registration_cre
char *amf_service_name_dereg,
char *pcscf_restoration_callback_uri,
char *amf_service_name_pcscf_rest,
bool is_initial_registration_ind,
int initial_registration_ind,
OpenAPI_guami_t *guami,
OpenAPI_list_t *backup_amf_info,
bool is_dr_flag,
int dr_flag,
OpenAPI_rat_type_e rat_type,
bool is_urrp_indicator,
int urrp_indicator,
char *amf_ee_subscription_id,
OpenAPI_eps_interworking_info_t *eps_interworking_info,
bool is_ue_srvcc_capability,
int ue_srvcc_capability,
char *registration_time,
OpenAPI_vgmlc_address_t *vgmlc_address,
OpenAPI_context_info_t *context_info,
bool is_no_ee_subscription_ind,
int no_ee_subscription_ind,
char *supi
)
@ -36,6 +42,7 @@ OpenAPI_amf3_gpp_access_registration_t *OpenAPI_amf3_gpp_access_registration_cre
}
amf3_gpp_access_registration_local_var->amf_instance_id = amf_instance_id;
amf3_gpp_access_registration_local_var->supported_features = supported_features;
amf3_gpp_access_registration_local_var->is_purge_flag = is_purge_flag;
amf3_gpp_access_registration_local_var->purge_flag = purge_flag;
amf3_gpp_access_registration_local_var->pei = pei;
amf3_gpp_access_registration_local_var->ims_vo_ps = ims_vo_ps;
@ -43,18 +50,23 @@ OpenAPI_amf3_gpp_access_registration_t *OpenAPI_amf3_gpp_access_registration_cre
amf3_gpp_access_registration_local_var->amf_service_name_dereg = amf_service_name_dereg;
amf3_gpp_access_registration_local_var->pcscf_restoration_callback_uri = pcscf_restoration_callback_uri;
amf3_gpp_access_registration_local_var->amf_service_name_pcscf_rest = amf_service_name_pcscf_rest;
amf3_gpp_access_registration_local_var->is_initial_registration_ind = is_initial_registration_ind;
amf3_gpp_access_registration_local_var->initial_registration_ind = initial_registration_ind;
amf3_gpp_access_registration_local_var->guami = guami;
amf3_gpp_access_registration_local_var->backup_amf_info = backup_amf_info;
amf3_gpp_access_registration_local_var->is_dr_flag = is_dr_flag;
amf3_gpp_access_registration_local_var->dr_flag = dr_flag;
amf3_gpp_access_registration_local_var->rat_type = rat_type;
amf3_gpp_access_registration_local_var->is_urrp_indicator = is_urrp_indicator;
amf3_gpp_access_registration_local_var->urrp_indicator = urrp_indicator;
amf3_gpp_access_registration_local_var->amf_ee_subscription_id = amf_ee_subscription_id;
amf3_gpp_access_registration_local_var->eps_interworking_info = eps_interworking_info;
amf3_gpp_access_registration_local_var->is_ue_srvcc_capability = is_ue_srvcc_capability;
amf3_gpp_access_registration_local_var->ue_srvcc_capability = ue_srvcc_capability;
amf3_gpp_access_registration_local_var->registration_time = registration_time;
amf3_gpp_access_registration_local_var->vgmlc_address = vgmlc_address;
amf3_gpp_access_registration_local_var->context_info = context_info;
amf3_gpp_access_registration_local_var->is_no_ee_subscription_ind = is_no_ee_subscription_ind;
amf3_gpp_access_registration_local_var->no_ee_subscription_ind = no_ee_subscription_ind;
amf3_gpp_access_registration_local_var->supi = supi;
@ -110,7 +122,7 @@ cJSON *OpenAPI_amf3_gpp_access_registration_convertToJSON(OpenAPI_amf3_gpp_acces
}
}
if (amf3_gpp_access_registration->purge_flag) {
if (amf3_gpp_access_registration->is_purge_flag) {
if (cJSON_AddBoolToObject(item, "purgeFlag", amf3_gpp_access_registration->purge_flag) == NULL) {
ogs_error("OpenAPI_amf3_gpp_access_registration_convertToJSON() failed [purge_flag]");
goto end;
@ -157,7 +169,7 @@ cJSON *OpenAPI_amf3_gpp_access_registration_convertToJSON(OpenAPI_amf3_gpp_acces
}
}
if (amf3_gpp_access_registration->initial_registration_ind) {
if (amf3_gpp_access_registration->is_initial_registration_ind) {
if (cJSON_AddBoolToObject(item, "initialRegistrationInd", amf3_gpp_access_registration->initial_registration_ind) == NULL) {
ogs_error("OpenAPI_amf3_gpp_access_registration_convertToJSON() failed [initial_registration_ind]");
goto end;
@ -195,7 +207,7 @@ cJSON *OpenAPI_amf3_gpp_access_registration_convertToJSON(OpenAPI_amf3_gpp_acces
}
}
if (amf3_gpp_access_registration->dr_flag) {
if (amf3_gpp_access_registration->is_dr_flag) {
if (cJSON_AddBoolToObject(item, "drFlag", amf3_gpp_access_registration->dr_flag) == NULL) {
ogs_error("OpenAPI_amf3_gpp_access_registration_convertToJSON() failed [dr_flag]");
goto end;
@ -207,7 +219,7 @@ cJSON *OpenAPI_amf3_gpp_access_registration_convertToJSON(OpenAPI_amf3_gpp_acces
goto end;
}
if (amf3_gpp_access_registration->urrp_indicator) {
if (amf3_gpp_access_registration->is_urrp_indicator) {
if (cJSON_AddBoolToObject(item, "urrpIndicator", amf3_gpp_access_registration->urrp_indicator) == NULL) {
ogs_error("OpenAPI_amf3_gpp_access_registration_convertToJSON() failed [urrp_indicator]");
goto end;
@ -234,7 +246,7 @@ cJSON *OpenAPI_amf3_gpp_access_registration_convertToJSON(OpenAPI_amf3_gpp_acces
}
}
if (amf3_gpp_access_registration->ue_srvcc_capability) {
if (amf3_gpp_access_registration->is_ue_srvcc_capability) {
if (cJSON_AddBoolToObject(item, "ueSrvccCapability", amf3_gpp_access_registration->ue_srvcc_capability) == NULL) {
ogs_error("OpenAPI_amf3_gpp_access_registration_convertToJSON() failed [ue_srvcc_capability]");
goto end;
@ -274,7 +286,7 @@ cJSON *OpenAPI_amf3_gpp_access_registration_convertToJSON(OpenAPI_amf3_gpp_acces
}
}
if (amf3_gpp_access_registration->no_ee_subscription_ind) {
if (amf3_gpp_access_registration->is_no_ee_subscription_ind) {
if (cJSON_AddBoolToObject(item, "noEeSubscriptionInd", amf3_gpp_access_registration->no_ee_subscription_ind) == NULL) {
ogs_error("OpenAPI_amf3_gpp_access_registration_convertToJSON() failed [no_ee_subscription_ind]");
goto end;
@ -301,7 +313,6 @@ OpenAPI_amf3_gpp_access_registration_t *OpenAPI_amf3_gpp_access_registration_par
goto end;
}
if (!cJSON_IsString(amf_instance_id)) {
ogs_error("OpenAPI_amf3_gpp_access_registration_parseFromJSON() failed [amf_instance_id]");
goto end;
@ -351,7 +362,6 @@ OpenAPI_amf3_gpp_access_registration_t *OpenAPI_amf3_gpp_access_registration_par
goto end;
}
if (!cJSON_IsString(dereg_callback_uri)) {
ogs_error("OpenAPI_amf3_gpp_access_registration_parseFromJSON() failed [dereg_callback_uri]");
goto end;
@ -400,7 +410,6 @@ OpenAPI_amf3_gpp_access_registration_t *OpenAPI_amf3_gpp_access_registration_par
}
OpenAPI_guami_t *guami_local_nonprim = NULL;
guami_local_nonprim = OpenAPI_guami_parseFromJSON(guami);
cJSON *backup_amf_info = cJSON_GetObjectItemCaseSensitive(amf3_gpp_access_registrationJSON, "backupAmfInfo");
@ -442,7 +451,6 @@ OpenAPI_amf3_gpp_access_registration_t *OpenAPI_amf3_gpp_access_registration_par
}
OpenAPI_rat_type_e rat_typeVariable;
if (!cJSON_IsString(rat_type)) {
ogs_error("OpenAPI_amf3_gpp_access_registration_parseFromJSON() failed [rat_type]");
goto end;
@ -527,6 +535,7 @@ OpenAPI_amf3_gpp_access_registration_t *OpenAPI_amf3_gpp_access_registration_par
amf3_gpp_access_registration_local_var = OpenAPI_amf3_gpp_access_registration_create (
ogs_strdup_or_assert(amf_instance_id->valuestring),
supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL,
purge_flag ? true : false,
purge_flag ? purge_flag->valueint : 0,
pei ? ogs_strdup_or_assert(pei->valuestring) : NULL,
ims_vo_ps ? ims_vo_psVariable : 0,
@ -534,18 +543,23 @@ OpenAPI_amf3_gpp_access_registration_t *OpenAPI_amf3_gpp_access_registration_par
amf_service_name_dereg ? ogs_strdup_or_assert(amf_service_name_dereg->valuestring) : NULL,
pcscf_restoration_callback_uri ? ogs_strdup_or_assert(pcscf_restoration_callback_uri->valuestring) : NULL,
amf_service_name_pcscf_rest ? ogs_strdup_or_assert(amf_service_name_pcscf_rest->valuestring) : NULL,
initial_registration_ind ? true : false,
initial_registration_ind ? initial_registration_ind->valueint : 0,
guami_local_nonprim,
backup_amf_info ? backup_amf_infoList : NULL,
dr_flag ? true : false,
dr_flag ? dr_flag->valueint : 0,
rat_typeVariable,
urrp_indicator ? true : false,
urrp_indicator ? urrp_indicator->valueint : 0,
amf_ee_subscription_id ? ogs_strdup_or_assert(amf_ee_subscription_id->valuestring) : NULL,
eps_interworking_info ? eps_interworking_info_local_nonprim : NULL,
ue_srvcc_capability ? true : false,
ue_srvcc_capability ? ue_srvcc_capability->valueint : 0,
registration_time ? ogs_strdup_or_assert(registration_time->valuestring) : NULL,
vgmlc_address ? vgmlc_address_local_nonprim : NULL,
context_info ? context_info_local_nonprim : NULL,
no_ee_subscription_ind ? true : false,
no_ee_subscription_ind ? no_ee_subscription_ind->valueint : 0,
supi ? ogs_strdup_or_assert(supi->valuestring) : NULL
);

12
lib/sbi/openapi/model/amf3_gpp_access_registration.h
View File

@ -28,6 +28,7 @@ typedef struct OpenAPI_amf3_gpp_access_registration_s OpenAPI_amf3_gpp_access_re
typedef struct OpenAPI_amf3_gpp_access_registration_s {
char *amf_instance_id;
char *supported_features;
bool is_purge_flag;
int purge_flag;
char *pei;
OpenAPI_ims_vo_ps_e ims_vo_ps;
@ -35,18 +36,23 @@ typedef struct OpenAPI_amf3_gpp_access_registration_s {
char *amf_service_name_dereg;
char *pcscf_restoration_callback_uri;
char *amf_service_name_pcscf_rest;
bool is_initial_registration_ind;
int initial_registration_ind;
struct OpenAPI_guami_s *guami;
OpenAPI_list_t *backup_amf_info;
bool is_dr_flag;
int dr_flag;
OpenAPI_rat_type_e rat_type;
bool is_urrp_indicator;
int urrp_indicator;
char *amf_ee_subscription_id;
struct OpenAPI_eps_interworking_info_s *eps_interworking_info;
bool is_ue_srvcc_capability;
int ue_srvcc_capability;
char *registration_time;
struct OpenAPI_vgmlc_address_s *vgmlc_address;
struct OpenAPI_context_info_s *context_info;
bool is_no_ee_subscription_ind;
int no_ee_subscription_ind;
char *supi;
} OpenAPI_amf3_gpp_access_registration_t;
@ -54,6 +60,7 @@ typedef struct OpenAPI_amf3_gpp_access_registration_s {
OpenAPI_amf3_gpp_access_registration_t *OpenAPI_amf3_gpp_access_registration_create(
char *amf_instance_id,
char *supported_features,
bool is_purge_flag,
int purge_flag,
char *pei,
OpenAPI_ims_vo_ps_e ims_vo_ps,
@ -61,18 +68,23 @@ OpenAPI_amf3_gpp_access_registration_t *OpenAPI_amf3_gpp_access_registration_cre
char *amf_service_name_dereg,
char *pcscf_restoration_callback_uri,
char *amf_service_name_pcscf_rest,
bool is_initial_registration_ind,
int initial_registration_ind,
OpenAPI_guami_t *guami,
OpenAPI_list_t *backup_amf_info,
bool is_dr_flag,
int dr_flag,
OpenAPI_rat_type_e rat_type,
bool is_urrp_indicator,
int urrp_indicator,
char *amf_ee_subscription_id,
OpenAPI_eps_interworking_info_t *eps_interworking_info,
bool is_ue_srvcc_capability,
int ue_srvcc_capability,
char *registration_time,
OpenAPI_vgmlc_address_t *vgmlc_address,
OpenAPI_context_info_t *context_info,
bool is_no_ee_subscription_ind,
int no_ee_subscription_ind,
char *supi
);

11
lib/sbi/openapi/model/amf3_gpp_access_registration_modification.c
View File

@ -6,11 +6,13 @@
OpenAPI_amf3_gpp_access_registration_modification_t *OpenAPI_amf3_gpp_access_registration_modification_create(
OpenAPI_guami_t *guami,
bool is_purge_flag,
int purge_flag,
char *pei,
OpenAPI_ims_vo_ps_e ims_vo_ps,
OpenAPI_list_t *backup_amf_info,
OpenAPI_eps_interworking_info_t *eps_interworking_info,
bool is_ue_srvcc_capability,
int ue_srvcc_capability
)
{
@ -19,11 +21,13 @@ OpenAPI_amf3_gpp_access_registration_modification_t *OpenAPI_amf3_gpp_access_reg
return NULL;
}
amf3_gpp_access_registration_modification_local_var->guami = guami;
amf3_gpp_access_registration_modification_local_var->is_purge_flag = is_purge_flag;
amf3_gpp_access_registration_modification_local_var->purge_flag = purge_flag;
amf3_gpp_access_registration_modification_local_var->pei = pei;
amf3_gpp_access_registration_modification_local_var->ims_vo_ps = ims_vo_ps;
amf3_gpp_access_registration_modification_local_var->backup_amf_info = backup_amf_info;
amf3_gpp_access_registration_modification_local_var->eps_interworking_info = eps_interworking_info;
amf3_gpp_access_registration_modification_local_var->is_ue_srvcc_capability = is_ue_srvcc_capability;
amf3_gpp_access_registration_modification_local_var->ue_srvcc_capability = ue_srvcc_capability;
return amf3_gpp_access_registration_modification_local_var;
@ -66,7 +70,7 @@ cJSON *OpenAPI_amf3_gpp_access_registration_modification_convertToJSON(OpenAPI_a
goto end;
}
if (amf3_gpp_access_registration_modification->purge_flag) {
if (amf3_gpp_access_registration_modification->is_purge_flag) {
if (cJSON_AddBoolToObject(item, "purgeFlag", amf3_gpp_access_registration_modification->purge_flag) == NULL) {
ogs_error("OpenAPI_amf3_gpp_access_registration_modification_convertToJSON() failed [purge_flag]");
goto end;
@ -120,7 +124,7 @@ cJSON *OpenAPI_amf3_gpp_access_registration_modification_convertToJSON(OpenAPI_a
}
}
if (amf3_gpp_access_registration_modification->ue_srvcc_capability) {
if (amf3_gpp_access_registration_modification->is_ue_srvcc_capability) {
if (cJSON_AddBoolToObject(item, "ueSrvccCapability", amf3_gpp_access_registration_modification->ue_srvcc_capability) == NULL) {
ogs_error("OpenAPI_amf3_gpp_access_registration_modification_convertToJSON() failed [ue_srvcc_capability]");
goto end;
@ -141,7 +145,6 @@ OpenAPI_amf3_gpp_access_registration_modification_t *OpenAPI_amf3_gpp_access_reg
}
OpenAPI_guami_t *guami_local_nonprim = NULL;
guami_local_nonprim = OpenAPI_guami_parseFromJSON(guami);
cJSON *purge_flag = cJSON_GetObjectItemCaseSensitive(amf3_gpp_access_registration_modificationJSON, "purgeFlag");
@ -214,11 +217,13 @@ OpenAPI_amf3_gpp_access_registration_modification_t *OpenAPI_amf3_gpp_access_reg
amf3_gpp_access_registration_modification_local_var = OpenAPI_amf3_gpp_access_registration_modification_create (
guami_local_nonprim,
purge_flag ? true : false,
purge_flag ? purge_flag->valueint : 0,
pei ? ogs_strdup_or_assert(pei->valuestring) : NULL,
ims_vo_ps ? ims_vo_psVariable : 0,
backup_amf_info ? backup_amf_infoList : NULL,
eps_interworking_info ? eps_interworking_info_local_nonprim : NULL,
ue_srvcc_capability ? true : false,
ue_srvcc_capability ? ue_srvcc_capability->valueint : 0
);

4
lib/sbi/openapi/model/amf3_gpp_access_registration_modification.h
View File

@ -24,21 +24,25 @@ extern "C" {
typedef struct OpenAPI_amf3_gpp_access_registration_modification_s OpenAPI_amf3_gpp_access_registration_modification_t;
typedef struct OpenAPI_amf3_gpp_access_registration_modification_s {
struct OpenAPI_guami_s *guami;
bool is_purge_flag;
int purge_flag;
char *pei;
OpenAPI_ims_vo_ps_e ims_vo_ps;
OpenAPI_list_t *backup_amf_info;
struct OpenAPI_eps_interworking_info_s *eps_interworking_info;
bool is_ue_srvcc_capability;
int ue_srvcc_capability;
} OpenAPI_amf3_gpp_access_registration_modification_t;
OpenAPI_amf3_gpp_access_registration_modification_t *OpenAPI_amf3_gpp_access_registration_modification_create(
OpenAPI_guami_t *guami,
bool is_purge_flag,
int purge_flag,
char *pei,
OpenAPI_ims_vo_ps_e ims_vo_ps,
OpenAPI_list_t *backup_amf_info,
OpenAPI_eps_interworking_info_t *eps_interworking_info,
bool is_ue_srvcc_capability,
int ue_srvcc_capability
);
void OpenAPI_amf3_gpp_access_registration_modification_free(OpenAPI_amf3_gpp_access_registration_modification_t *amf3_gpp_access_registration_modification);

1
lib/sbi/openapi/model/amf_dereg_info.c
View File

@ -55,7 +55,6 @@ OpenAPI_amf_dereg_info_t *OpenAPI_amf_dereg_info_parseFromJSON(cJSON *amf_dereg_
}
OpenAPI_deregistration_reason_e dereg_reasonVariable;
if (!cJSON_IsString(dereg_reason)) {
ogs_error("OpenAPI_amf_dereg_info_parseFromJSON() failed [dereg_reason]");
goto end;

26
lib/sbi/openapi/model/amf_event.c
View File

@ -6,14 +6,19 @@
OpenAPI_amf_event_t *OpenAPI_amf_event_create(
OpenAPI_amf_event_type_t *type,
bool is_immediate_flag,
int immediate_flag,
OpenAPI_list_t *area_list,
OpenAPI_list_t *location_filter_list,
bool is_ref_id,
int ref_id,
OpenAPI_list_t *traffic_descriptor_list,
bool is_report_ue_reachable,
int report_ue_reachable,
OpenAPI_reachability_filter_t *reachability_filter,
bool is_max_reports,
int max_reports,
bool is_max_response_time,
int max_response_time
)
{
@ -22,14 +27,19 @@ OpenAPI_amf_event_t *OpenAPI_amf_event_create(
return NULL;
}
amf_event_local_var->type = type;
amf_event_local_var->is_immediate_flag = is_immediate_flag;
amf_event_local_var->immediate_flag = immediate_flag;
amf_event_local_var->area_list = area_list;
amf_event_local_var->location_filter_list = location_filter_list;
amf_event_local_var->is_ref_id = is_ref_id;
amf_event_local_var->ref_id = ref_id;
amf_event_local_var->traffic_descriptor_list = traffic_descriptor_list;
amf_event_local_var->is_report_ue_reachable = is_report_ue_reachable;
amf_event_local_var->report_ue_reachable = report_ue_reachable;
amf_event_local_var->reachability_filter = reachability_filter;
amf_event_local_var->is_max_reports = is_max_reports;
amf_event_local_var->max_reports = max_reports;
amf_event_local_var->is_max_response_time = is_max_response_time;
amf_event_local_var->max_response_time = max_response_time;
return amf_event_local_var;
@ -79,7 +89,7 @@ cJSON *OpenAPI_amf_event_convertToJSON(OpenAPI_amf_event_t *amf_event)
goto end;
}
if (amf_event->immediate_flag) {
if (amf_event->is_immediate_flag) {
if (cJSON_AddBoolToObject(item, "immediateFlag", amf_event->immediate_flag) == NULL) {
ogs_error("OpenAPI_amf_event_convertToJSON() failed [immediate_flag]");
goto end;
@ -126,7 +136,7 @@ cJSON *OpenAPI_amf_event_convertToJSON(OpenAPI_amf_event_t *amf_event)
}
}
if (amf_event->ref_id) {
if (amf_event->is_ref_id) {
if (cJSON_AddNumberToObject(item, "refId", amf_event->ref_id) == NULL) {
ogs_error("OpenAPI_amf_event_convertToJSON() failed [ref_id]");
goto end;
@ -153,7 +163,7 @@ cJSON *OpenAPI_amf_event_convertToJSON(OpenAPI_amf_event_t *amf_event)
}
}
if (amf_event->report_ue_reachable) {
if (amf_event->is_report_ue_reachable) {
if (cJSON_AddBoolToObject(item, "reportUeReachable", amf_event->report_ue_reachable) == NULL) {
ogs_error("OpenAPI_amf_event_convertToJSON() failed [report_ue_reachable]");
goto end;
@ -173,14 +183,14 @@ cJSON *OpenAPI_amf_event_convertToJSON(OpenAPI_amf_event_t *amf_event)
}
}
if (amf_event->max_reports) {
if (amf_event->is_max_reports) {
if (cJSON_AddNumberToObject(item, "maxReports", amf_event->max_reports) == NULL) {
ogs_error("OpenAPI_amf_event_convertToJSON() failed [max_reports]");
goto end;
}
}
if (amf_event->max_response_time) {
if (amf_event->is_max_response_time) {
if (cJSON_AddNumberToObject(item, "maxResponseTime", amf_event->max_response_time) == NULL) {
ogs_error("OpenAPI_amf_event_convertToJSON() failed [max_response_time]");
goto end;
@ -201,7 +211,6 @@ OpenAPI_amf_event_t *OpenAPI_amf_event_parseFromJSON(cJSON *amf_eventJSON)
}
OpenAPI_amf_event_type_t *type_local_nonprim = NULL;
type_local_nonprim = OpenAPI_amf_event_type_parseFromJSON(type);
cJSON *immediate_flag = cJSON_GetObjectItemCaseSensitive(amf_eventJSON, "immediateFlag");
@ -327,14 +336,19 @@ OpenAPI_amf_event_t *OpenAPI_amf_event_parseFromJSON(cJSON *amf_eventJSON)
amf_event_local_var = OpenAPI_amf_event_create (
type_local_nonprim,
immediate_flag ? true : false,
immediate_flag ? immediate_flag->valueint : 0,
area_list ? area_listList : NULL,
location_filter_list ? location_filter_listList : NULL,
ref_id ? true : false,
ref_id ? ref_id->valuedouble : 0,
traffic_descriptor_list ? traffic_descriptor_listList : NULL,
report_ue_reachable ? true : false,
report_ue_reachable ? report_ue_reachable->valueint : 0,
reachability_filter ? reachability_filter_local_nonprim : NULL,
max_reports ? true : false,
max_reports ? max_reports->valuedouble : 0,
max_response_time ? true : false,
max_response_time ? max_response_time->valuedouble : 0
);

10
lib/sbi/openapi/model/amf_event.h
View File

@ -25,27 +25,37 @@ extern "C" {
typedef struct OpenAPI_amf_event_s OpenAPI_amf_event_t;
typedef struct OpenAPI_amf_event_s {
struct OpenAPI_amf_event_type_s *type;
bool is_immediate_flag;
int immediate_flag;
OpenAPI_list_t *area_list;
OpenAPI_list_t *location_filter_list;
bool is_ref_id;
int ref_id;
OpenAPI_list_t *traffic_descriptor_list;
bool is_report_ue_reachable;
int report_ue_reachable;
struct OpenAPI_reachability_filter_s *reachability_filter;
bool is_max_reports;
int max_reports;
bool is_max_response_time;
int max_response_time;
} OpenAPI_amf_event_t;
OpenAPI_amf_event_t *OpenAPI_amf_event_create(
OpenAPI_amf_event_type_t *type,
bool is_immediate_flag,
int immediate_flag,
OpenAPI_list_t *area_list,
OpenAPI_list_t *location_filter_list,
bool is_ref_id,
int ref_id,
OpenAPI_list_t *traffic_descriptor_list,
bool is_report_ue_reachable,
int report_ue_reachable,
OpenAPI_reachability_filter_t *reachability_filter,
bool is_max_reports,
int max_reports,
bool is_max_response_time,
int max_response_time
);
void OpenAPI_amf_event_free(OpenAPI_amf_event_t *amf_event);

16
lib/sbi/openapi/model/amf_event_mode.c
View File

@ -6,9 +6,12 @@
OpenAPI_amf_event_mode_t *OpenAPI_amf_event_mode_create(
OpenAPI_amf_event_trigger_t *trigger,
bool is_max_reports,
int max_reports,
char *expiry,
bool is_rep_period,
int rep_period,
bool is_samp_ratio,
int samp_ratio
)
{
@ -17,9 +20,12 @@ OpenAPI_amf_event_mode_t *OpenAPI_amf_event_mode_create(
return NULL;
}
amf_event_mode_local_var->trigger = trigger;
amf_event_mode_local_var->is_max_reports = is_max_reports;
amf_event_mode_local_var->max_reports = max_reports;
amf_event_mode_local_var->expiry = expiry;
amf_event_mode_local_var->is_rep_period = is_rep_period;
amf_event_mode_local_var->rep_period = rep_period;
amf_event_mode_local_var->is_samp_ratio = is_samp_ratio;
amf_event_mode_local_var->samp_ratio = samp_ratio;
return amf_event_mode_local_var;
@ -57,7 +63,7 @@ cJSON *OpenAPI_amf_event_mode_convertToJSON(OpenAPI_amf_event_mode_t *amf_event_
goto end;
}
if (amf_event_mode->max_reports) {
if (amf_event_mode->is_max_reports) {
if (cJSON_AddNumberToObject(item, "maxReports", amf_event_mode->max_reports) == NULL) {
ogs_error("OpenAPI_amf_event_mode_convertToJSON() failed [max_reports]");
goto end;
@ -71,14 +77,14 @@ cJSON *OpenAPI_amf_event_mode_convertToJSON(OpenAPI_amf_event_mode_t *amf_event_
}
}
if (amf_event_mode->rep_period) {
if (amf_event_mode->is_rep_period) {
if (cJSON_AddNumberToObject(item, "repPeriod", amf_event_mode->rep_period) == NULL) {
ogs_error("OpenAPI_amf_event_mode_convertToJSON() failed [rep_period]");
goto end;
}
}
if (amf_event_mode->samp_ratio) {
if (amf_event_mode->is_samp_ratio) {
if (cJSON_AddNumberToObject(item, "sampRatio", amf_event_mode->samp_ratio) == NULL) {
ogs_error("OpenAPI_amf_event_mode_convertToJSON() failed [samp_ratio]");
goto end;
@ -99,7 +105,6 @@ OpenAPI_amf_event_mode_t *OpenAPI_amf_event_mode_parseFromJSON(cJSON *amf_event_
}
OpenAPI_amf_event_trigger_t *trigger_local_nonprim = NULL;
trigger_local_nonprim = OpenAPI_amf_event_trigger_parseFromJSON(trigger);
cJSON *max_reports = cJSON_GetObjectItemCaseSensitive(amf_event_modeJSON, "maxReports");
@ -140,9 +145,12 @@ OpenAPI_amf_event_mode_t *OpenAPI_amf_event_mode_parseFromJSON(cJSON *amf_event_
amf_event_mode_local_var = OpenAPI_amf_event_mode_create (
trigger_local_nonprim,
max_reports ? true : false,
max_reports ? max_reports->valuedouble : 0,
expiry ? ogs_strdup_or_assert(expiry->valuestring) : NULL,
rep_period ? true : false,
rep_period ? rep_period->valuedouble : 0,
samp_ratio ? true : false,
samp_ratio ? samp_ratio->valuedouble : 0
);

6
lib/sbi/openapi/model/amf_event_mode.h
View File

@ -21,17 +21,23 @@ extern "C" {
typedef struct OpenAPI_amf_event_mode_s OpenAPI_amf_event_mode_t;
typedef struct OpenAPI_amf_event_mode_s {
struct OpenAPI_amf_event_trigger_s *trigger;
bool is_max_reports;
int max_reports;
char *expiry;
bool is_rep_period;
int rep_period;
bool is_samp_ratio;
int samp_ratio;
} OpenAPI_amf_event_mode_t;
OpenAPI_amf_event_mode_t *OpenAPI_amf_event_mode_create(
OpenAPI_amf_event_trigger_t *trigger,
bool is_max_reports,
int max_reports,
char *expiry,
bool is_rep_period,
int rep_period,
bool is_samp_ratio,
int samp_ratio
);
void OpenAPI_amf_event_mode_free(OpenAPI_amf_event_mode_t *amf_event_mode);

9
lib/sbi/openapi/model/amf_event_subscription.c
View File

@ -15,6 +15,7 @@ OpenAPI_amf_event_subscription_t *OpenAPI_amf_event_subscription_create(
char *group_id,
char *gpsi,
char *pei,
bool is_any_ue,
int any_ue,
OpenAPI_amf_event_mode_t *options,
OpenAPI_nf_type_e source_nf_type
@ -34,6 +35,7 @@ OpenAPI_amf_event_subscription_t *OpenAPI_amf_event_subscription_create(
amf_event_subscription_local_var->group_id = group_id;
amf_event_subscription_local_var->gpsi = gpsi;
amf_event_subscription_local_var->pei = pei;
amf_event_subscription_local_var->is_any_ue = is_any_ue;
amf_event_subscription_local_var->any_ue = any_ue;
amf_event_subscription_local_var->options = options;
amf_event_subscription_local_var->source_nf_type = source_nf_type;
@ -149,7 +151,7 @@ cJSON *OpenAPI_amf_event_subscription_convertToJSON(OpenAPI_amf_event_subscripti
}
}
if (amf_event_subscription->any_ue) {
if (amf_event_subscription->is_any_ue) {
if (cJSON_AddBoolToObject(item, "anyUE", amf_event_subscription->any_ue) == NULL) {
ogs_error("OpenAPI_amf_event_subscription_convertToJSON() failed [any_ue]");
goto end;
@ -190,7 +192,6 @@ OpenAPI_amf_event_subscription_t *OpenAPI_amf_event_subscription_parseFromJSON(c
}
OpenAPI_list_t *event_listList;
cJSON *event_list_local_nonprimitive;
if (!cJSON_IsArray(event_list)){
ogs_error("OpenAPI_amf_event_subscription_parseFromJSON() failed [event_list]");
@ -215,7 +216,6 @@ OpenAPI_amf_event_subscription_t *OpenAPI_amf_event_subscription_parseFromJSON(c
goto end;
}
if (!cJSON_IsString(event_notify_uri)) {
ogs_error("OpenAPI_amf_event_subscription_parseFromJSON() failed [event_notify_uri]");
goto end;
@ -227,7 +227,6 @@ OpenAPI_amf_event_subscription_t *OpenAPI_amf_event_subscription_parseFromJSON(c
goto end;
}
if (!cJSON_IsString(notify_correlation_id)) {
ogs_error("OpenAPI_amf_event_subscription_parseFromJSON() failed [notify_correlation_id]");
goto end;
@ -239,7 +238,6 @@ OpenAPI_amf_event_subscription_t *OpenAPI_amf_event_subscription_parseFromJSON(c
goto end;
}
if (!cJSON_IsString(nf_id)) {
ogs_error("OpenAPI_amf_event_subscription_parseFromJSON() failed [nf_id]");
goto end;
@ -337,6 +335,7 @@ OpenAPI_amf_event_subscription_t *OpenAPI_amf_event_subscription_parseFromJSON(c
group_id ? ogs_strdup_or_assert(group_id->valuestring) : NULL,
gpsi ? ogs_strdup_or_assert(gpsi->valuestring) : NULL,
pei ? ogs_strdup_or_assert(pei->valuestring) : NULL,
any_ue ? true : false,
any_ue ? any_ue->valueint : 0,
options ? options_local_nonprim : NULL,
source_nf_type ? source_nf_typeVariable : 0

2
lib/sbi/openapi/model/amf_event_subscription.h
View File

@ -32,6 +32,7 @@ typedef struct OpenAPI_amf_event_subscription_s {
char *group_id;
char *gpsi;
char *pei;
bool is_any_ue;
int any_ue;
struct OpenAPI_amf_event_mode_s *options;
OpenAPI_nf_type_e source_nf_type;
@ -48,6 +49,7 @@ OpenAPI_amf_event_subscription_t *OpenAPI_amf_event_subscription_create(
char *group_id,
char *gpsi,
char *pei,
bool is_any_ue,
int any_ue,
OpenAPI_amf_event_mode_t *options,
OpenAPI_nf_type_e source_nf_type

3
lib/sbi/openapi/model/amf_info.c
View File

@ -207,7 +207,6 @@ OpenAPI_amf_info_t *OpenAPI_amf_info_parseFromJSON(cJSON *amf_infoJSON)
goto end;
}
if (!cJSON_IsString(amf_set_id)) {
ogs_error("OpenAPI_amf_info_parseFromJSON() failed [amf_set_id]");
goto end;
@ -219,7 +218,6 @@ OpenAPI_amf_info_t *OpenAPI_amf_info_parseFromJSON(cJSON *amf_infoJSON)
goto end;
}
if (!cJSON_IsString(amf_region_id)) {
ogs_error("OpenAPI_amf_info_parseFromJSON() failed [amf_region_id]");
goto end;
@ -232,7 +230,6 @@ OpenAPI_amf_info_t *OpenAPI_amf_info_parseFromJSON(cJSON *amf_infoJSON)
}
OpenAPI_list_t *guami_listList;
cJSON *guami_list_local_nonprimitive;
if (!cJSON_IsArray(guami_list)){
ogs_error("OpenAPI_amf_info_parseFromJSON() failed [guami_list]");

20
lib/sbi/openapi/model/amf_non3_gpp_access_registration.c
View File

@ -7,6 +7,7 @@
OpenAPI_amf_non3_gpp_access_registration_t *OpenAPI_amf_non3_gpp_access_registration_create(
char *amf_instance_id,
char *supported_features,
bool is_purge_flag,
int purge_flag,
char *pei,
OpenAPI_ims_vo_ps_e ims_vo_ps,
@ -17,11 +18,13 @@ OpenAPI_amf_non3_gpp_access_registration_t *OpenAPI_amf_non3_gpp_access_registra
OpenAPI_guami_t *guami,
OpenAPI_list_t *backup_amf_info,
OpenAPI_rat_type_e rat_type,
bool is_urrp_indicator,
int urrp_indicator,
char *amf_ee_subscription_id,
char *registration_time,
OpenAPI_vgmlc_address_t *vgmlc_address,
OpenAPI_context_info_t *context_info,
bool is_no_ee_subscription_ind,
int no_ee_subscription_ind,
char *supi
)
@ -32,6 +35,7 @@ OpenAPI_amf_non3_gpp_access_registration_t *OpenAPI_amf_non3_gpp_access_registra
}
amf_non3_gpp_access_registration_local_var->amf_instance_id = amf_instance_id;
amf_non3_gpp_access_registration_local_var->supported_features = supported_features;
amf_non3_gpp_access_registration_local_var->is_purge_flag = is_purge_flag;
amf_non3_gpp_access_registration_local_var->purge_flag = purge_flag;
amf_non3_gpp_access_registration_local_var->pei = pei;
amf_non3_gpp_access_registration_local_var->ims_vo_ps = ims_vo_ps;
@ -42,11 +46,13 @@ OpenAPI_amf_non3_gpp_access_registration_t *OpenAPI_amf_non3_gpp_access_registra
amf_non3_gpp_access_registration_local_var->guami = guami;
amf_non3_gpp_access_registration_local_var->backup_amf_info = backup_amf_info;
amf_non3_gpp_access_registration_local_var->rat_type = rat_type;
amf_non3_gpp_access_registration_local_var->is_urrp_indicator = is_urrp_indicator;
amf_non3_gpp_access_registration_local_var->urrp_indicator = urrp_indicator;
amf_non3_gpp_access_registration_local_var->amf_ee_subscription_id = amf_ee_subscription_id;
amf_non3_gpp_access_registration_local_var->registration_time = registration_time;
amf_non3_gpp_access_registration_local_var->vgmlc_address = vgmlc_address;
amf_non3_gpp_access_registration_local_var->context_info = context_info;
amf_non3_gpp_access_registration_local_var->is_no_ee_subscription_ind = is_no_ee_subscription_ind;
amf_non3_gpp_access_registration_local_var->no_ee_subscription_ind = no_ee_subscription_ind;
amf_non3_gpp_access_registration_local_var->supi = supi;
@ -101,7 +107,7 @@ cJSON *OpenAPI_amf_non3_gpp_access_registration_convertToJSON(OpenAPI_amf_non3_g
}
}
if (amf_non3_gpp_access_registration->purge_flag) {
if (amf_non3_gpp_access_registration->is_purge_flag) {
if (cJSON_AddBoolToObject(item, "purgeFlag", amf_non3_gpp_access_registration->purge_flag) == NULL) {
ogs_error("OpenAPI_amf_non3_gpp_access_registration_convertToJSON() failed [purge_flag]");
goto end;
@ -182,7 +188,7 @@ cJSON *OpenAPI_amf_non3_gpp_access_registration_convertToJSON(OpenAPI_amf_non3_g
goto end;
}
if (amf_non3_gpp_access_registration->urrp_indicator) {
if (amf_non3_gpp_access_registration->is_urrp_indicator) {
if (cJSON_AddBoolToObject(item, "urrpIndicator", amf_non3_gpp_access_registration->urrp_indicator) == NULL) {
ogs_error("OpenAPI_amf_non3_gpp_access_registration_convertToJSON() failed [urrp_indicator]");
goto end;
@ -229,7 +235,7 @@ cJSON *OpenAPI_amf_non3_gpp_access_registration_convertToJSON(OpenAPI_amf_non3_g
}
}
if (amf_non3_gpp_access_registration->no_ee_subscription_ind) {
if (amf_non3_gpp_access_registration->is_no_ee_subscription_ind) {
if (cJSON_AddBoolToObject(item, "noEeSubscriptionInd", amf_non3_gpp_access_registration->no_ee_subscription_ind) == NULL) {
ogs_error("OpenAPI_amf_non3_gpp_access_registration_convertToJSON() failed [no_ee_subscription_ind]");
goto end;
@ -256,7 +262,6 @@ OpenAPI_amf_non3_gpp_access_registration_t *OpenAPI_amf_non3_gpp_access_registra
goto end;
}
if (!cJSON_IsString(amf_instance_id)) {
ogs_error("OpenAPI_amf_non3_gpp_access_registration_parseFromJSON() failed [amf_instance_id]");
goto end;
@ -296,7 +301,6 @@ OpenAPI_amf_non3_gpp_access_registration_t *OpenAPI_amf_non3_gpp_access_registra
}
OpenAPI_ims_vo_ps_e ims_vo_psVariable;
if (!cJSON_IsString(ims_vo_ps)) {
ogs_error("OpenAPI_amf_non3_gpp_access_registration_parseFromJSON() failed [ims_vo_ps]");
goto end;
@ -309,7 +313,6 @@ OpenAPI_amf_non3_gpp_access_registration_t *OpenAPI_amf_non3_gpp_access_registra
goto end;
}
if (!cJSON_IsString(dereg_callback_uri)) {
ogs_error("OpenAPI_amf_non3_gpp_access_registration_parseFromJSON() failed [dereg_callback_uri]");
goto end;
@ -349,7 +352,6 @@ OpenAPI_amf_non3_gpp_access_registration_t *OpenAPI_amf_non3_gpp_access_registra
}
OpenAPI_guami_t *guami_local_nonprim = NULL;
guami_local_nonprim = OpenAPI_guami_parseFromJSON(guami);
cJSON *backup_amf_info = cJSON_GetObjectItemCaseSensitive(amf_non3_gpp_access_registrationJSON, "backupAmfInfo");
@ -382,7 +384,6 @@ OpenAPI_amf_non3_gpp_access_registration_t *OpenAPI_amf_non3_gpp_access_registra
}
OpenAPI_rat_type_e rat_typeVariable;
if (!cJSON_IsString(rat_type)) {
ogs_error("OpenAPI_amf_non3_gpp_access_registration_parseFromJSON() failed [rat_type]");
goto end;
@ -451,6 +452,7 @@ OpenAPI_amf_non3_gpp_access_registration_t *OpenAPI_amf_non3_gpp_access_registra
amf_non3_gpp_access_registration_local_var = OpenAPI_amf_non3_gpp_access_registration_create (
ogs_strdup_or_assert(amf_instance_id->valuestring),
supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL,
purge_flag ? true : false,
purge_flag ? purge_flag->valueint : 0,
pei ? ogs_strdup_or_assert(pei->valuestring) : NULL,
ims_vo_psVariable,
@ -461,11 +463,13 @@ OpenAPI_amf_non3_gpp_access_registration_t *OpenAPI_amf_non3_gpp_access_registra
guami_local_nonprim,
backup_amf_info ? backup_amf_infoList : NULL,
rat_typeVariable,
urrp_indicator ? true : false,
urrp_indicator ? urrp_indicator->valueint : 0,
amf_ee_subscription_id ? ogs_strdup_or_assert(amf_ee_subscription_id->valuestring) : NULL,
registration_time ? ogs_strdup_or_assert(registration_time->valuestring) : NULL,
vgmlc_address ? vgmlc_address_local_nonprim : NULL,
context_info ? context_info_local_nonprim : NULL,
no_ee_subscription_ind ? true : false,
no_ee_subscription_ind ? no_ee_subscription_ind->valueint : 0,
supi ? ogs_strdup_or_assert(supi->valuestring) : NULL
);

6
lib/sbi/openapi/model/amf_non3_gpp_access_registration.h
View File

@ -27,6 +27,7 @@ typedef struct OpenAPI_amf_non3_gpp_access_registration_s OpenAPI_amf_non3_gpp_a
typedef struct OpenAPI_amf_non3_gpp_access_registration_s {
char *amf_instance_id;
char *supported_features;
bool is_purge_flag;
int purge_flag;
char *pei;
OpenAPI_ims_vo_ps_e ims_vo_ps;
@ -37,11 +38,13 @@ typedef struct OpenAPI_amf_non3_gpp_access_registration_s {
struct OpenAPI_guami_s *guami;
OpenAPI_list_t *backup_amf_info;
OpenAPI_rat_type_e rat_type;
bool is_urrp_indicator;
int urrp_indicator;
char *amf_ee_subscription_id;
char *registration_time;
struct OpenAPI_vgmlc_address_s *vgmlc_address;
struct OpenAPI_context_info_s *context_info;
bool is_no_ee_subscription_ind;
int no_ee_subscription_ind;
char *supi;
} OpenAPI_amf_non3_gpp_access_registration_t;
@ -49,6 +52,7 @@ typedef struct OpenAPI_amf_non3_gpp_access_registration_s {
OpenAPI_amf_non3_gpp_access_registration_t *OpenAPI_amf_non3_gpp_access_registration_create(
char *amf_instance_id,
char *supported_features,
bool is_purge_flag,
int purge_flag,
char *pei,
OpenAPI_ims_vo_ps_e ims_vo_ps,
@ -59,11 +63,13 @@ OpenAPI_amf_non3_gpp_access_registration_t *OpenAPI_amf_non3_gpp_access_registra
OpenAPI_guami_t *guami,
OpenAPI_list_t *backup_amf_info,
OpenAPI_rat_type_e rat_type,
bool is_urrp_indicator,
int urrp_indicator,
char *amf_ee_subscription_id,
char *registration_time,
OpenAPI_vgmlc_address_t *vgmlc_address,
OpenAPI_context_info_t *context_info,
bool is_no_ee_subscription_ind,
int no_ee_subscription_ind,
char *supi
);

6
lib/sbi/openapi/model/amf_non3_gpp_access_registration_modification.c
View File

@ -6,6 +6,7 @@
OpenAPI_amf_non3_gpp_access_registration_modification_t *OpenAPI_amf_non3_gpp_access_registration_modification_create(
OpenAPI_guami_t *guami,
bool is_purge_flag,
int purge_flag,
char *pei,
OpenAPI_ims_vo_ps_e ims_vo_ps,
@ -17,6 +18,7 @@ OpenAPI_amf_non3_gpp_access_registration_modification_t *OpenAPI_amf_non3_gpp_ac
return NULL;
}
amf_non3_gpp_access_registration_modification_local_var->guami = guami;
amf_non3_gpp_access_registration_modification_local_var->is_purge_flag = is_purge_flag;
amf_non3_gpp_access_registration_modification_local_var->purge_flag = purge_flag;
amf_non3_gpp_access_registration_modification_local_var->pei = pei;
amf_non3_gpp_access_registration_modification_local_var->ims_vo_ps = ims_vo_ps;
@ -61,7 +63,7 @@ cJSON *OpenAPI_amf_non3_gpp_access_registration_modification_convertToJSON(OpenA
goto end;
}
if (amf_non3_gpp_access_registration_modification->purge_flag) {
if (amf_non3_gpp_access_registration_modification->is_purge_flag) {
if (cJSON_AddBoolToObject(item, "purgeFlag", amf_non3_gpp_access_registration_modification->purge_flag) == NULL) {
ogs_error("OpenAPI_amf_non3_gpp_access_registration_modification_convertToJSON() failed [purge_flag]");
goto end;
@ -116,7 +118,6 @@ OpenAPI_amf_non3_gpp_access_registration_modification_t *OpenAPI_amf_non3_gpp_ac
}
OpenAPI_guami_t *guami_local_nonprim = NULL;
guami_local_nonprim = OpenAPI_guami_parseFromJSON(guami);
cJSON *purge_flag = cJSON_GetObjectItemCaseSensitive(amf_non3_gpp_access_registration_modificationJSON, "purgeFlag");
@ -173,6 +174,7 @@ OpenAPI_amf_non3_gpp_access_registration_modification_t *OpenAPI_amf_non3_gpp_ac
amf_non3_gpp_access_registration_modification_local_var = OpenAPI_amf_non3_gpp_access_registration_modification_create (
guami_local_nonprim,
purge_flag ? true : false,
purge_flag ? purge_flag->valueint : 0,
pei ? ogs_strdup_or_assert(pei->valuestring) : NULL,
ims_vo_ps ? ims_vo_psVariable : 0,

2
lib/sbi/openapi/model/amf_non3_gpp_access_registration_modification.h
View File

@ -23,6 +23,7 @@ extern "C" {
typedef struct OpenAPI_amf_non3_gpp_access_registration_modification_s OpenAPI_amf_non3_gpp_access_registration_modification_t;
typedef struct OpenAPI_amf_non3_gpp_access_registration_modification_s {
struct OpenAPI_guami_s *guami;
bool is_purge_flag;
int purge_flag;
char *pei;
OpenAPI_ims_vo_ps_e ims_vo_ps;
@ -31,6 +32,7 @@ typedef struct OpenAPI_amf_non3_gpp_access_registration_modification_s {
OpenAPI_amf_non3_gpp_access_registration_modification_t *OpenAPI_amf_non3_gpp_access_registration_modification_create(
OpenAPI_guami_t *guami,
bool is_purge_flag,
int purge_flag,
char *pei,
OpenAPI_ims_vo_ps_e ims_vo_ps,

1
lib/sbi/openapi/model/amf_status_change_notification.c
View File

@ -72,7 +72,6 @@ OpenAPI_amf_status_change_notification_t *OpenAPI_amf_status_change_notification
}
OpenAPI_list_t *amf_status_info_listList;
cJSON *amf_status_info_list_local_nonprimitive;
if (!cJSON_IsArray(amf_status_info_list)){
ogs_error("OpenAPI_amf_status_change_notification_parseFromJSON() failed [amf_status_info_list]");

1
lib/sbi/openapi/model/amf_status_change_subscription_data.c
View File

@ -81,7 +81,6 @@ OpenAPI_amf_status_change_subscription_data_t *OpenAPI_amf_status_change_subscri
goto end;
}
if (!cJSON_IsString(amf_status_uri)) {
ogs_error("OpenAPI_amf_status_change_subscription_data_parseFromJSON() failed [amf_status_uri]");
goto end;

2
lib/sbi/openapi/model/amf_status_info.c
View File

@ -99,7 +99,6 @@ OpenAPI_amf_status_info_t *OpenAPI_amf_status_info_parseFromJSON(cJSON *amf_stat
}
OpenAPI_list_t *guami_listList;
cJSON *guami_list_local_nonprimitive;
if (!cJSON_IsArray(guami_list)){
ogs_error("OpenAPI_amf_status_info_parseFromJSON() failed [guami_list]");
@ -125,7 +124,6 @@ OpenAPI_amf_status_info_t *OpenAPI_amf_status_info_parseFromJSON(cJSON *amf_stat
}
OpenAPI_status_change_e status_changeVariable;
if (!cJSON_IsString(status_change)) {
ogs_error("OpenAPI_amf_status_info_parseFromJSON() failed [status_change]");
goto end;

2
lib/sbi/openapi/model/amf_subscription_info.c
View File

@ -73,7 +73,6 @@ OpenAPI_amf_subscription_info_t *OpenAPI_amf_subscription_info_parseFromJSON(cJS
goto end;
}
if (!cJSON_IsString(amf_instance_id)) {
ogs_error("OpenAPI_amf_subscription_info_parseFromJSON() failed [amf_instance_id]");
goto end;
@ -85,7 +84,6 @@ OpenAPI_amf_subscription_info_t *OpenAPI_amf_subscription_info_parseFromJSON(cJS
goto end;
}
if (!cJSON_IsString(subscription_id)) {
ogs_error("OpenAPI_amf_subscription_info_parseFromJSON() failed [subscription_id]");
goto end;

20
lib/sbi/openapi/model/apn_rate_status.c
View File

@ -5,10 +5,14 @@
#include "apn_rate_status.h"
OpenAPI_apn_rate_status_t *OpenAPI_apn_rate_status_create(
bool is_remain_packets_ul,
int remain_packets_ul,
bool is_remain_packets_dl,
int remain_packets_dl,
char *validity_time,
bool is_remain_ex_reports_ul,
int remain_ex_reports_ul,
bool is_remain_ex_reports_dl,
int remain_ex_reports_dl
)
{
@ -16,10 +20,14 @@ OpenAPI_apn_rate_status_t *OpenAPI_apn_rate_status_create(
if (!apn_rate_status_local_var) {
return NULL;
}
apn_rate_status_local_var->is_remain_packets_ul = is_remain_packets_ul;
apn_rate_status_local_var->remain_packets_ul = remain_packets_ul;
apn_rate_status_local_var->is_remain_packets_dl = is_remain_packets_dl;
apn_rate_status_local_var->remain_packets_dl = remain_packets_dl;
apn_rate_status_local_var->validity_time = validity_time;
apn_rate_status_local_var->is_remain_ex_reports_ul = is_remain_ex_reports_ul;
apn_rate_status_local_var->remain_ex_reports_ul = remain_ex_reports_ul;
apn_rate_status_local_var->is_remain_ex_reports_dl = is_remain_ex_reports_dl;
apn_rate_status_local_var->remain_ex_reports_dl = remain_ex_reports_dl;
return apn_rate_status_local_var;
@ -45,14 +53,14 @@ cJSON *OpenAPI_apn_rate_status_convertToJSON(OpenAPI_apn_rate_status_t *apn_rate
}
item = cJSON_CreateObject();
if (apn_rate_status->remain_packets_ul) {
if (apn_rate_status->is_remain_packets_ul) {
if (cJSON_AddNumberToObject(item, "remainPacketsUl", apn_rate_status->remain_packets_ul) == NULL) {
ogs_error("OpenAPI_apn_rate_status_convertToJSON() failed [remain_packets_ul]");
goto end;
}
}
if (apn_rate_status->remain_packets_dl) {
if (apn_rate_status->is_remain_packets_dl) {
if (cJSON_AddNumberToObject(item, "remainPacketsDl", apn_rate_status->remain_packets_dl) == NULL) {
ogs_error("OpenAPI_apn_rate_status_convertToJSON() failed [remain_packets_dl]");
goto end;
@ -66,14 +74,14 @@ cJSON *OpenAPI_apn_rate_status_convertToJSON(OpenAPI_apn_rate_status_t *apn_rate
}
}
if (apn_rate_status->remain_ex_reports_ul) {
if (apn_rate_status->is_remain_ex_reports_ul) {
if (cJSON_AddNumberToObject(item, "remainExReportsUl", apn_rate_status->remain_ex_reports_ul) == NULL) {
ogs_error("OpenAPI_apn_rate_status_convertToJSON() failed [remain_ex_reports_ul]");
goto end;
}
}
if (apn_rate_status->remain_ex_reports_dl) {
if (apn_rate_status->is_remain_ex_reports_dl) {
if (cJSON_AddNumberToObject(item, "remainExReportsDl", apn_rate_status->remain_ex_reports_dl) == NULL) {
ogs_error("OpenAPI_apn_rate_status_convertToJSON() failed [remain_ex_reports_dl]");
goto end;
@ -133,10 +141,14 @@ OpenAPI_apn_rate_status_t *OpenAPI_apn_rate_status_parseFromJSON(cJSON *apn_rate
}
apn_rate_status_local_var = OpenAPI_apn_rate_status_create (
remain_packets_ul ? true : false,
remain_packets_ul ? remain_packets_ul->valuedouble : 0,
remain_packets_dl ? true : false,
remain_packets_dl ? remain_packets_dl->valuedouble : 0,
validity_time ? ogs_strdup_or_assert(validity_time->valuestring) : NULL,
remain_ex_reports_ul ? true : false,
remain_ex_reports_ul ? remain_ex_reports_ul->valuedouble : 0,
remain_ex_reports_dl ? true : false,
remain_ex_reports_dl ? remain_ex_reports_dl->valuedouble : 0
);

8
lib/sbi/openapi/model/apn_rate_status.h
View File

@ -19,18 +19,26 @@ extern "C" {
typedef struct OpenAPI_apn_rate_status_s OpenAPI_apn_rate_status_t;
typedef struct OpenAPI_apn_rate_status_s {
bool is_remain_packets_ul;
int remain_packets_ul;
bool is_remain_packets_dl;
int remain_packets_dl;
char *validity_time;
bool is_remain_ex_reports_ul;
int remain_ex_reports_ul;
bool is_remain_ex_reports_dl;
int remain_ex_reports_dl;
} OpenAPI_apn_rate_status_t;
OpenAPI_apn_rate_status_t *OpenAPI_apn_rate_status_create(
bool is_remain_packets_ul,
int remain_packets_ul,
bool is_remain_packets_dl,
int remain_packets_dl,
char *validity_time,
bool is_remain_ex_reports_ul,
int remain_ex_reports_ul,
bool is_remain_ex_reports_dl,
int remain_ex_reports_dl
);
void OpenAPI_apn_rate_status_free(OpenAPI_apn_rate_status_t *apn_rate_status);

1
lib/sbi/openapi/model/app_detection_info.c
View File

@ -91,7 +91,6 @@ OpenAPI_app_detection_info_t *OpenAPI_app_detection_info_parseFromJSON(cJSON *ap
goto end;
}
if (!cJSON_IsString(app_id)) {
ogs_error("OpenAPI_app_detection_info_parseFromJSON() failed [app_id]");
goto end;

10
lib/sbi/openapi/model/app_port_id.c
View File

@ -5,7 +5,9 @@
#include "app_port_id.h"
OpenAPI_app_port_id_t *OpenAPI_app_port_id_create(
bool is_destination_port,
int destination_port,
bool is_originator_port,
int originator_port
)
{
@ -13,7 +15,9 @@ OpenAPI_app_port_id_t *OpenAPI_app_port_id_create(
if (!app_port_id_local_var) {
return NULL;
}
app_port_id_local_var->is_destination_port = is_destination_port;
app_port_id_local_var->destination_port = destination_port;
app_port_id_local_var->is_originator_port = is_originator_port;
app_port_id_local_var->originator_port = originator_port;
return app_port_id_local_var;
@ -38,14 +42,14 @@ cJSON *OpenAPI_app_port_id_convertToJSON(OpenAPI_app_port_id_t *app_port_id)
}
item = cJSON_CreateObject();
if (app_port_id->destination_port) {
if (app_port_id->is_destination_port) {
if (cJSON_AddNumberToObject(item, "destinationPort", app_port_id->destination_port) == NULL) {
ogs_error("OpenAPI_app_port_id_convertToJSON() failed [destination_port]");
goto end;
}
}
if (app_port_id->originator_port) {
if (app_port_id->is_originator_port) {
if (cJSON_AddNumberToObject(item, "originatorPort", app_port_id->originator_port) == NULL) {
ogs_error("OpenAPI_app_port_id_convertToJSON() failed [originator_port]");
goto end;
@ -78,7 +82,9 @@ OpenAPI_app_port_id_t *OpenAPI_app_port_id_parseFromJSON(cJSON *app_port_idJSON)
}
app_port_id_local_var = OpenAPI_app_port_id_create (
destination_port ? true : false,
destination_port ? destination_port->valuedouble : 0,
originator_port ? true : false,
originator_port ? originator_port->valuedouble : 0
);

4
lib/sbi/openapi/model/app_port_id.h
View File

@ -19,12 +19,16 @@ extern "C" {
typedef struct OpenAPI_app_port_id_s OpenAPI_app_port_id_t;
typedef struct OpenAPI_app_port_id_s {
bool is_destination_port;
int destination_port;
bool is_originator_port;
int originator_port;
} OpenAPI_app_port_id_t;
OpenAPI_app_port_id_t *OpenAPI_app_port_id_create(
bool is_destination_port,
int destination_port,
bool is_originator_port,
int originator_port
);
void OpenAPI_app_port_id_free(OpenAPI_app_port_id_t *app_port_id);

2
lib/sbi/openapi/model/app_session_context_req_data.c
View File

@ -584,7 +584,6 @@ OpenAPI_app_session_context_req_data_t *OpenAPI_app_session_context_req_data_par
goto end;
}
if (!cJSON_IsString(notif_uri)) {
ogs_error("OpenAPI_app_session_context_req_data_parseFromJSON() failed [notif_uri]");
goto end;
@ -650,7 +649,6 @@ OpenAPI_app_session_context_req_data_t *OpenAPI_app_session_context_req_data_par
goto end;
}
if (!cJSON_IsString(supp_feat)) {
ogs_error("OpenAPI_app_session_context_req_data_parseFromJSON() failed [supp_feat]");
goto end;

1
lib/sbi/openapi/model/application_data_change_notif.c
View File

@ -140,7 +140,6 @@ OpenAPI_application_data_change_notif_t *OpenAPI_application_data_change_notif_p
goto end;
}
if (!cJSON_IsString(res_uri)) {
ogs_error("OpenAPI_application_data_change_notif_parseFromJSON() failed [res_uri]");
goto end;

1
lib/sbi/openapi/model/application_data_subs.c
View File

@ -101,7 +101,6 @@ OpenAPI_application_data_subs_t *OpenAPI_application_data_subs_parseFromJSON(cJS
goto end;
}
if (!cJSON_IsString(notification_uri)) {
ogs_error("OpenAPI_application_data_subs_parseFromJSON() failed [notification_uri]");
goto end;

1
lib/sbi/openapi/model/area_of_validity.c
View File

@ -72,7 +72,6 @@ OpenAPI_area_of_validity_t *OpenAPI_area_of_validity_parseFromJSON(cJSON *area_o
}
OpenAPI_list_t *tai_listList;
cJSON *tai_list_local_nonprimitive;
if (!cJSON_IsArray(tai_list)){
ogs_error("OpenAPI_area_of_validity_parseFromJSON() failed [tai_list]");

4
lib/sbi/openapi/model/arp.c
View File

@ -68,7 +68,6 @@ OpenAPI_arp_t *OpenAPI_arp_parseFromJSON(cJSON *arpJSON)
goto end;
}
if (!cJSON_IsNumber(priority_level)) {
ogs_error("OpenAPI_arp_parseFromJSON() failed [priority_level]");
goto end;
@ -81,7 +80,6 @@ OpenAPI_arp_t *OpenAPI_arp_parseFromJSON(cJSON *arpJSON)
}
OpenAPI_preemption_capability_e preempt_capVariable;
if (!cJSON_IsString(preempt_cap)) {
ogs_error("OpenAPI_arp_parseFromJSON() failed [preempt_cap]");
goto end;
@ -95,7 +93,6 @@ OpenAPI_arp_t *OpenAPI_arp_parseFromJSON(cJSON *arpJSON)
}
OpenAPI_preemption_vulnerability_e preempt_vulnVariable;
if (!cJSON_IsString(preempt_vuln)) {
ogs_error("OpenAPI_arp_parseFromJSON() failed [preempt_vuln]");
goto end;
@ -103,6 +100,7 @@ OpenAPI_arp_t *OpenAPI_arp_parseFromJSON(cJSON *arpJSON)
preempt_vulnVariable = OpenAPI_preemption_vulnerability_FromString(preempt_vuln->valuestring);
arp_local_var = OpenAPI_arp_create (
priority_level->valuedouble,
preempt_capVariable,
preempt_vulnVariable

4
lib/sbi/openapi/model/arp_1.c
View File

@ -68,7 +68,6 @@ OpenAPI_arp_1_t *OpenAPI_arp_1_parseFromJSON(cJSON *arp_1JSON)
goto end;
}
if (!cJSON_IsNumber(priority_level)) {
ogs_error("OpenAPI_arp_1_parseFromJSON() failed [priority_level]");
goto end;
@ -81,7 +80,6 @@ OpenAPI_arp_1_t *OpenAPI_arp_1_parseFromJSON(cJSON *arp_1JSON)
}
OpenAPI_preemption_capability_e preempt_capVariable;
if (!cJSON_IsString(preempt_cap)) {
ogs_error("OpenAPI_arp_1_parseFromJSON() failed [preempt_cap]");
goto end;
@ -95,7 +93,6 @@ OpenAPI_arp_1_t *OpenAPI_arp_1_parseFromJSON(cJSON *arp_1JSON)
}
OpenAPI_preemption_vulnerability_e preempt_vulnVariable;
if (!cJSON_IsString(preempt_vuln)) {
ogs_error("OpenAPI_arp_1_parseFromJSON() failed [preempt_vuln]");
goto end;
@ -103,6 +100,7 @@ OpenAPI_arp_1_t *OpenAPI_arp_1_parseFromJSON(cJSON *arp_1JSON)
preempt_vulnVariable = OpenAPI_preemption_vulnerability_FromString(preempt_vuln->valuestring);
arp_1_local_var = OpenAPI_arp_1_create (
priority_level->valuedouble,
preempt_capVariable,
preempt_vulnVariable

2
lib/sbi/openapi/model/assign_ebi_data.c
View File

@ -118,7 +118,6 @@ OpenAPI_assign_ebi_data_t *OpenAPI_assign_ebi_data_parseFromJSON(cJSON *assign_e
goto end;
}
if (!cJSON_IsNumber(pdu_session_id)) {
ogs_error("OpenAPI_assign_ebi_data_parseFromJSON() failed [pdu_session_id]");
goto end;
@ -175,6 +174,7 @@ OpenAPI_assign_ebi_data_t *OpenAPI_assign_ebi_data_parseFromJSON(cJSON *assign_e
}
assign_ebi_data_local_var = OpenAPI_assign_ebi_data_create (
pdu_session_id->valuedouble,
arp_list ? arp_listList : NULL,
released_ebi_list ? released_ebi_listList : NULL,

2
lib/sbi/openapi/model/assign_ebi_error.c
View File

@ -76,7 +76,6 @@ OpenAPI_assign_ebi_error_t *OpenAPI_assign_ebi_error_parseFromJSON(cJSON *assign
}
OpenAPI_problem_details_t *error_local_nonprim = NULL;
error_local_nonprim = OpenAPI_problem_details_parseFromJSON(error);
cJSON *failure_details = cJSON_GetObjectItemCaseSensitive(assign_ebi_errorJSON, "failureDetails");
@ -86,7 +85,6 @@ OpenAPI_assign_ebi_error_t *OpenAPI_assign_ebi_error_parseFromJSON(cJSON *assign
}
OpenAPI_assign_ebi_failed_t *failure_details_local_nonprim = NULL;
failure_details_local_nonprim = OpenAPI_assign_ebi_failed_parseFromJSON(failure_details);
assign_ebi_error_local_var = OpenAPI_assign_ebi_error_create (

2
lib/sbi/openapi/model/assign_ebi_failed.c
View File

@ -80,7 +80,6 @@ OpenAPI_assign_ebi_failed_t *OpenAPI_assign_ebi_failed_parseFromJSON(cJSON *assi
goto end;
}
if (!cJSON_IsNumber(pdu_session_id)) {
ogs_error("OpenAPI_assign_ebi_failed_parseFromJSON() failed [pdu_session_id]");
goto end;
@ -110,6 +109,7 @@ OpenAPI_assign_ebi_failed_t *OpenAPI_assign_ebi_failed_parseFromJSON(cJSON *assi
}
assign_ebi_failed_local_var = OpenAPI_assign_ebi_failed_create (
pdu_session_id->valuedouble,
failed_arp_list ? failed_arp_listList : NULL
);

3
lib/sbi/openapi/model/assigned_ebi_data.c
View File

@ -126,7 +126,6 @@ OpenAPI_assigned_ebi_data_t *OpenAPI_assigned_ebi_data_parseFromJSON(cJSON *assi
goto end;
}
if (!cJSON_IsNumber(pdu_session_id)) {
ogs_error("OpenAPI_assigned_ebi_data_parseFromJSON() failed [pdu_session_id]");
goto end;
@ -139,7 +138,6 @@ OpenAPI_assigned_ebi_data_t *OpenAPI_assigned_ebi_data_parseFromJSON(cJSON *assi
}
OpenAPI_list_t *assigned_ebi_listList;
cJSON *assigned_ebi_list_local_nonprimitive;
if (!cJSON_IsArray(assigned_ebi_list)){
ogs_error("OpenAPI_assigned_ebi_data_parseFromJSON() failed [assigned_ebi_list]");
@ -202,6 +200,7 @@ OpenAPI_assigned_ebi_data_t *OpenAPI_assigned_ebi_data_parseFromJSON(cJSON *assi
}
assigned_ebi_data_local_var = OpenAPI_assigned_ebi_data_create (
pdu_session_id->valuedouble,
assigned_ebi_listList,
failed_arp_list ? failed_arp_listList : NULL,

7
lib/sbi/openapi/model/atom.c
View File

@ -7,6 +7,7 @@
OpenAPI_atom_t *OpenAPI_atom_create(
char *attr,
char *value,
bool is_negative,
int negative
)
{
@ -16,6 +17,7 @@ OpenAPI_atom_t *OpenAPI_atom_create(
}
atom_local_var->attr = attr;
atom_local_var->value = value;
atom_local_var->is_negative = is_negative;
atom_local_var->negative = negative;
return atom_local_var;
@ -52,7 +54,7 @@ cJSON *OpenAPI_atom_convertToJSON(OpenAPI_atom_t *atom)
goto end;
}
if (atom->negative) {
if (atom->is_negative) {
if (cJSON_AddBoolToObject(item, "negative", atom->negative) == NULL) {
ogs_error("OpenAPI_atom_convertToJSON() failed [negative]");
goto end;
@ -72,7 +74,6 @@ OpenAPI_atom_t *OpenAPI_atom_parseFromJSON(cJSON *atomJSON)
goto end;
}
if (!cJSON_IsString(attr)) {
ogs_error("OpenAPI_atom_parseFromJSON() failed [attr]");
goto end;
@ -84,7 +85,6 @@ OpenAPI_atom_t *OpenAPI_atom_parseFromJSON(cJSON *atomJSON)
goto end;
}
if (!cJSON_IsString(value)) {
ogs_error("OpenAPI_atom_parseFromJSON() failed [value]");
goto end;
@ -102,6 +102,7 @@ OpenAPI_atom_t *OpenAPI_atom_parseFromJSON(cJSON *atomJSON)
atom_local_var = OpenAPI_atom_create (
ogs_strdup_or_assert(attr->valuestring),
ogs_strdup_or_assert(value->valuestring),
negative ? true : false,
negative ? negative->valueint : 0
);

2
lib/sbi/openapi/model/atom.h
View File

@ -21,12 +21,14 @@ typedef struct OpenAPI_atom_s OpenAPI_atom_t;
typedef struct OpenAPI_atom_s {
char *attr;
char *value;
bool is_negative;
int negative;
} OpenAPI_atom_t;
OpenAPI_atom_t *OpenAPI_atom_create(
char *attr,
char *value,
bool is_negative,
int negative
);
void OpenAPI_atom_free(OpenAPI_atom_t *atom);

15
lib/sbi/openapi/model/atsss_capability.c
View File

@ -5,8 +5,11 @@
#include "atsss_capability.h"
OpenAPI_atsss_capability_t *OpenAPI_atsss_capability_create(
bool is_atsss_ll,
int atsss_ll,
bool is_mptcp,
int mptcp,
bool is_rtt_without_pmf,
int rtt_without_pmf
)
{
@ -14,8 +17,11 @@ OpenAPI_atsss_capability_t *OpenAPI_atsss_capability_create(
if (!atsss_capability_local_var) {
return NULL;
}
atsss_capability_local_var->is_atsss_ll = is_atsss_ll;
atsss_capability_local_var->atsss_ll = atsss_ll;
atsss_capability_local_var->is_mptcp = is_mptcp;
atsss_capability_local_var->mptcp = mptcp;
atsss_capability_local_var->is_rtt_without_pmf = is_rtt_without_pmf;
atsss_capability_local_var->rtt_without_pmf = rtt_without_pmf;
return atsss_capability_local_var;
@ -40,21 +46,21 @@ cJSON *OpenAPI_atsss_capability_convertToJSON(OpenAPI_atsss_capability_t *atsss_
}
item = cJSON_CreateObject();
if (atsss_capability->atsss_ll) {
if (atsss_capability->is_atsss_ll) {
if (cJSON_AddBoolToObject(item, "atsssLL", atsss_capability->atsss_ll) == NULL) {
ogs_error("OpenAPI_atsss_capability_convertToJSON() failed [atsss_ll]");
goto end;
}
}
if (atsss_capability->mptcp) {
if (atsss_capability->is_mptcp) {
if (cJSON_AddBoolToObject(item, "mptcp", atsss_capability->mptcp) == NULL) {
ogs_error("OpenAPI_atsss_capability_convertToJSON() failed [mptcp]");
goto end;
}
}
if (atsss_capability->rtt_without_pmf) {
if (atsss_capability->is_rtt_without_pmf) {
if (cJSON_AddBoolToObject(item, "rttWithoutPmf", atsss_capability->rtt_without_pmf) == NULL) {
ogs_error("OpenAPI_atsss_capability_convertToJSON() failed [rtt_without_pmf]");
goto end;
@ -96,8 +102,11 @@ OpenAPI_atsss_capability_t *OpenAPI_atsss_capability_parseFromJSON(cJSON *atsss_
}
atsss_capability_local_var = OpenAPI_atsss_capability_create (
atsss_ll ? true : false,
atsss_ll ? atsss_ll->valueint : 0,
mptcp ? true : false,
mptcp ? mptcp->valueint : 0,
rtt_without_pmf ? true : false,
rtt_without_pmf ? rtt_without_pmf->valueint : 0
);

6
lib/sbi/openapi/model/atsss_capability.h
View File

@ -19,14 +19,20 @@ extern "C" {
typedef struct OpenAPI_atsss_capability_s OpenAPI_atsss_capability_t;
typedef struct OpenAPI_atsss_capability_s {
bool is_atsss_ll;
int atsss_ll;
bool is_mptcp;
int mptcp;
bool is_rtt_without_pmf;
int rtt_without_pmf;
} OpenAPI_atsss_capability_t;
OpenAPI_atsss_capability_t *OpenAPI_atsss_capability_create(
bool is_atsss_ll,
int atsss_ll,
bool is_mptcp,
int mptcp,
bool is_rtt_without_pmf,
int rtt_without_pmf
);
void OpenAPI_atsss_capability_free(OpenAPI_atsss_capability_t *atsss_capability);

11
lib/sbi/openapi/model/auth_event.c
View File

@ -10,6 +10,7 @@ OpenAPI_auth_event_t *OpenAPI_auth_event_create(
char *time_stamp,
OpenAPI_auth_type_e auth_type,
char *serving_network_name,
bool is_auth_removal_ind,
int auth_removal_ind
)
{
@ -22,6 +23,7 @@ OpenAPI_auth_event_t *OpenAPI_auth_event_create(
auth_event_local_var->time_stamp = time_stamp;
auth_event_local_var->auth_type = auth_type;
auth_event_local_var->serving_network_name = serving_network_name;
auth_event_local_var->is_auth_removal_ind = is_auth_removal_ind;
auth_event_local_var->auth_removal_ind = auth_removal_ind;
return auth_event_local_var;
@ -74,7 +76,7 @@ cJSON *OpenAPI_auth_event_convertToJSON(OpenAPI_auth_event_t *auth_event)
goto end;
}
if (auth_event->auth_removal_ind) {
if (auth_event->is_auth_removal_ind) {
if (cJSON_AddBoolToObject(item, "authRemovalInd", auth_event->auth_removal_ind) == NULL) {
ogs_error("OpenAPI_auth_event_convertToJSON() failed [auth_removal_ind]");
goto end;
@ -94,7 +96,6 @@ OpenAPI_auth_event_t *OpenAPI_auth_event_parseFromJSON(cJSON *auth_eventJSON)
goto end;
}
if (!cJSON_IsString(nf_instance_id)) {
ogs_error("OpenAPI_auth_event_parseFromJSON() failed [nf_instance_id]");
goto end;
@ -106,7 +107,6 @@ OpenAPI_auth_event_t *OpenAPI_auth_event_parseFromJSON(cJSON *auth_eventJSON)
goto end;
}
if (!cJSON_IsBool(success)) {
ogs_error("OpenAPI_auth_event_parseFromJSON() failed [success]");
goto end;
@ -118,7 +118,6 @@ OpenAPI_auth_event_t *OpenAPI_auth_event_parseFromJSON(cJSON *auth_eventJSON)
goto end;
}
if (!cJSON_IsString(time_stamp)) {
ogs_error("OpenAPI_auth_event_parseFromJSON() failed [time_stamp]");
goto end;
@ -131,7 +130,6 @@ OpenAPI_auth_event_t *OpenAPI_auth_event_parseFromJSON(cJSON *auth_eventJSON)
}
OpenAPI_auth_type_e auth_typeVariable;
if (!cJSON_IsString(auth_type)) {
ogs_error("OpenAPI_auth_event_parseFromJSON() failed [auth_type]");
goto end;
@ -144,7 +142,6 @@ OpenAPI_auth_event_t *OpenAPI_auth_event_parseFromJSON(cJSON *auth_eventJSON)
goto end;
}
if (!cJSON_IsString(serving_network_name)) {
ogs_error("OpenAPI_auth_event_parseFromJSON() failed [serving_network_name]");
goto end;
@ -161,10 +158,12 @@ OpenAPI_auth_event_t *OpenAPI_auth_event_parseFromJSON(cJSON *auth_eventJSON)
auth_event_local_var = OpenAPI_auth_event_create (
ogs_strdup_or_assert(nf_instance_id->valuestring),
success->valueint,
ogs_strdup_or_assert(time_stamp->valuestring),
auth_typeVariable,
ogs_strdup_or_assert(serving_network_name->valuestring),
auth_removal_ind ? true : false,
auth_removal_ind ? auth_removal_ind->valueint : 0
);

2
lib/sbi/openapi/model/auth_event.h
View File

@ -25,6 +25,7 @@ typedef struct OpenAPI_auth_event_s {
char *time_stamp;
OpenAPI_auth_type_e auth_type;
char *serving_network_name;
bool is_auth_removal_ind;
int auth_removal_ind;
} OpenAPI_auth_event_t;
@ -34,6 +35,7 @@ OpenAPI_auth_event_t *OpenAPI_auth_event_create(
char *time_stamp,
OpenAPI_auth_type_e auth_type,
char *serving_network_name,
bool is_auth_removal_ind,
int auth_removal_ind
);
void OpenAPI_auth_event_free(OpenAPI_auth_event_t *auth_event);

7
lib/sbi/openapi/model/authentication_info.c
View File

@ -13,6 +13,7 @@ OpenAPI_authentication_info_t *OpenAPI_authentication_info_create(
char *udm_group_id,
char *routing_indicator,
OpenAPI_list_t *cell_cag_info,
bool is_n5gc_ind,
int n5gc_ind,
char *supported_features
)
@ -29,6 +30,7 @@ OpenAPI_authentication_info_t *OpenAPI_authentication_info_create(
authentication_info_local_var->udm_group_id = udm_group_id;
authentication_info_local_var->routing_indicator = routing_indicator;
authentication_info_local_var->cell_cag_info = cell_cag_info;
authentication_info_local_var->is_n5gc_ind = is_n5gc_ind;
authentication_info_local_var->n5gc_ind = n5gc_ind;
authentication_info_local_var->supported_features = supported_features;
@ -139,7 +141,7 @@ cJSON *OpenAPI_authentication_info_convertToJSON(OpenAPI_authentication_info_t *
}
}
if (authentication_info->n5gc_ind) {
if (authentication_info->is_n5gc_ind) {
if (cJSON_AddBoolToObject(item, "n5gcInd", authentication_info->n5gc_ind) == NULL) {
ogs_error("OpenAPI_authentication_info_convertToJSON() failed [n5gc_ind]");
goto end;
@ -166,7 +168,6 @@ OpenAPI_authentication_info_t *OpenAPI_authentication_info_parseFromJSON(cJSON *
goto end;
}
if (!cJSON_IsString(supi_or_suci)) {
ogs_error("OpenAPI_authentication_info_parseFromJSON() failed [supi_or_suci]");
goto end;
@ -178,7 +179,6 @@ OpenAPI_authentication_info_t *OpenAPI_authentication_info_parseFromJSON(cJSON *
goto end;
}
if (!cJSON_IsString(serving_network_name)) {
ogs_error("OpenAPI_authentication_info_parseFromJSON() failed [serving_network_name]");
goto end;
@ -272,6 +272,7 @@ OpenAPI_authentication_info_t *OpenAPI_authentication_info_parseFromJSON(cJSON *
udm_group_id ? ogs_strdup_or_assert(udm_group_id->valuestring) : NULL,
routing_indicator ? ogs_strdup_or_assert(routing_indicator->valuestring) : NULL,
cell_cag_info ? cell_cag_infoList : NULL,
n5gc_ind ? true : false,
n5gc_ind ? n5gc_ind->valueint : 0,
supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL
);

2
lib/sbi/openapi/model/authentication_info.h
View File

@ -29,6 +29,7 @@ typedef struct OpenAPI_authentication_info_s {
char *udm_group_id;
char *routing_indicator;
OpenAPI_list_t *cell_cag_info;
bool is_n5gc_ind;
int n5gc_ind;
char *supported_features;
} OpenAPI_authentication_info_t;
@ -42,6 +43,7 @@ OpenAPI_authentication_info_t *OpenAPI_authentication_info_create(
char *udm_group_id,
char *routing_indicator,
OpenAPI_list_t *cell_cag_info,
bool is_n5gc_ind,
int n5gc_ind,
char *supported_features
);

7
lib/sbi/openapi/model/authentication_info_request.c
View File

@ -10,6 +10,7 @@ OpenAPI_authentication_info_request_t *OpenAPI_authentication_info_request_creat
OpenAPI_resynchronization_info_t *resynchronization_info,
char *ausf_instance_id,
OpenAPI_list_t *cell_cag_info,
bool is_n5gc_ind,
int n5gc_ind
)
{
@ -22,6 +23,7 @@ OpenAPI_authentication_info_request_t *OpenAPI_authentication_info_request_creat
authentication_info_request_local_var->resynchronization_info = resynchronization_info;
authentication_info_request_local_var->ausf_instance_id = ausf_instance_id;
authentication_info_request_local_var->cell_cag_info = cell_cag_info;
authentication_info_request_local_var->is_n5gc_ind = is_n5gc_ind;
authentication_info_request_local_var->n5gc_ind = n5gc_ind;
return authentication_info_request_local_var;
@ -100,7 +102,7 @@ cJSON *OpenAPI_authentication_info_request_convertToJSON(OpenAPI_authentication_
}
}
if (authentication_info_request->n5gc_ind) {
if (authentication_info_request->is_n5gc_ind) {
if (cJSON_AddBoolToObject(item, "n5gcInd", authentication_info_request->n5gc_ind) == NULL) {
ogs_error("OpenAPI_authentication_info_request_convertToJSON() failed [n5gc_ind]");
goto end;
@ -129,7 +131,6 @@ OpenAPI_authentication_info_request_t *OpenAPI_authentication_info_request_parse
goto end;
}
if (!cJSON_IsString(serving_network_name)) {
ogs_error("OpenAPI_authentication_info_request_parseFromJSON() failed [serving_network_name]");
goto end;
@ -148,7 +149,6 @@ OpenAPI_authentication_info_request_t *OpenAPI_authentication_info_request_parse
goto end;
}
if (!cJSON_IsString(ausf_instance_id)) {
ogs_error("OpenAPI_authentication_info_request_parseFromJSON() failed [ausf_instance_id]");
goto end;
@ -189,6 +189,7 @@ OpenAPI_authentication_info_request_t *OpenAPI_authentication_info_request_parse
resynchronization_info ? resynchronization_info_local_nonprim : NULL,
ogs_strdup_or_assert(ausf_instance_id->valuestring),
cell_cag_info ? cell_cag_infoList : NULL,
n5gc_ind ? true : false,
n5gc_ind ? n5gc_ind->valueint : 0
);

2
lib/sbi/openapi/model/authentication_info_request.h
View File

@ -25,6 +25,7 @@ typedef struct OpenAPI_authentication_info_request_s {
struct OpenAPI_resynchronization_info_s *resynchronization_info;
char *ausf_instance_id;
OpenAPI_list_t *cell_cag_info;
bool is_n5gc_ind;
int n5gc_ind;
} OpenAPI_authentication_info_request_t;
@ -34,6 +35,7 @@ OpenAPI_authentication_info_request_t *OpenAPI_authentication_info_request_creat
OpenAPI_resynchronization_info_t *resynchronization_info,
char *ausf_instance_id,
OpenAPI_list_t *cell_cag_info,
bool is_n5gc_ind,
int n5gc_ind
);
void OpenAPI_authentication_info_request_free(OpenAPI_authentication_info_request_t *authentication_info_request);

1
lib/sbi/openapi/model/authentication_info_result.c
View File

@ -91,7 +91,6 @@ OpenAPI_authentication_info_result_t *OpenAPI_authentication_info_result_parseFr
}
OpenAPI_auth_type_e auth_typeVariable;
if (!cJSON_IsString(auth_type)) {
ogs_error("OpenAPI_authentication_info_result_parseFromJSON() failed [auth_type]");
goto end;

11
lib/sbi/openapi/model/authentication_subscription.c
View File

@ -13,8 +13,10 @@ OpenAPI_authentication_subscription_t *OpenAPI_authentication_subscription_creat
char *algorithm_id,
char *enc_opc_key,
char *enc_topc_key,
bool is_vector_generation_in_hss,
int vector_generation_in_hss,
OpenAPI_auth_method_e n5gc_auth_method,
bool is_rg_authentication_ind,
int rg_authentication_ind,
char *supi
)
@ -31,8 +33,10 @@ OpenAPI_authentication_subscription_t *OpenAPI_authentication_subscription_creat
authentication_subscription_local_var->algorithm_id = algorithm_id;
authentication_subscription_local_var->enc_opc_key = enc_opc_key;
authentication_subscription_local_var->enc_topc_key = enc_topc_key;
authentication_subscription_local_var->is_vector_generation_in_hss = is_vector_generation_in_hss;
authentication_subscription_local_var->vector_generation_in_hss = vector_generation_in_hss;
authentication_subscription_local_var->n5gc_auth_method = n5gc_auth_method;
authentication_subscription_local_var->is_rg_authentication_ind = is_rg_authentication_ind;
authentication_subscription_local_var->rg_authentication_ind = rg_authentication_ind;
authentication_subscription_local_var->supi = supi;
@ -126,7 +130,7 @@ cJSON *OpenAPI_authentication_subscription_convertToJSON(OpenAPI_authentication_
}
}
if (authentication_subscription->vector_generation_in_hss) {
if (authentication_subscription->is_vector_generation_in_hss) {
if (cJSON_AddBoolToObject(item, "vectorGenerationInHss", authentication_subscription->vector_generation_in_hss) == NULL) {
ogs_error("OpenAPI_authentication_subscription_convertToJSON() failed [vector_generation_in_hss]");
goto end;
@ -140,7 +144,7 @@ cJSON *OpenAPI_authentication_subscription_convertToJSON(OpenAPI_authentication_
}
}
if (authentication_subscription->rg_authentication_ind) {
if (authentication_subscription->is_rg_authentication_ind) {
if (cJSON_AddBoolToObject(item, "rgAuthenticationInd", authentication_subscription->rg_authentication_ind) == NULL) {
ogs_error("OpenAPI_authentication_subscription_convertToJSON() failed [rg_authentication_ind]");
goto end;
@ -168,7 +172,6 @@ OpenAPI_authentication_subscription_t *OpenAPI_authentication_subscription_parse
}
OpenAPI_auth_method_e authentication_methodVariable;
if (!cJSON_IsString(authentication_method)) {
ogs_error("OpenAPI_authentication_subscription_parseFromJSON() failed [authentication_method]");
goto end;
@ -283,8 +286,10 @@ OpenAPI_authentication_subscription_t *OpenAPI_authentication_subscription_parse
algorithm_id ? ogs_strdup_or_assert(algorithm_id->valuestring) : NULL,
enc_opc_key ? ogs_strdup_or_assert(enc_opc_key->valuestring) : NULL,
enc_topc_key ? ogs_strdup_or_assert(enc_topc_key->valuestring) : NULL,
vector_generation_in_hss ? true : false,
vector_generation_in_hss ? vector_generation_in_hss->valueint : 0,
n5gc_auth_method ? n5gc_auth_methodVariable : 0,
rg_authentication_ind ? true : false,
rg_authentication_ind ? rg_authentication_ind->valueint : 0,
supi ? ogs_strdup_or_assert(supi->valuestring) : NULL
);

4
lib/sbi/openapi/model/authentication_subscription.h
View File

@ -29,8 +29,10 @@ typedef struct OpenAPI_authentication_subscription_s {
char *algorithm_id;
char *enc_opc_key;
char *enc_topc_key;
bool is_vector_generation_in_hss;
int vector_generation_in_hss;
OpenAPI_auth_method_e n5gc_auth_method;
bool is_rg_authentication_ind;
int rg_authentication_ind;
char *supi;
} OpenAPI_authentication_subscription_t;
@ -44,8 +46,10 @@ OpenAPI_authentication_subscription_t *OpenAPI_authentication_subscription_creat
char *algorithm_id,
char *enc_opc_key,
char *enc_topc_key,
bool is_vector_generation_in_hss,
int vector_generation_in_hss,
OpenAPI_auth_method_e n5gc_auth_method,
bool is_rg_authentication_ind,
int rg_authentication_ind,
char *supi
);

3
lib/sbi/openapi/model/authentication_vector.c
View File

@ -121,7 +121,6 @@ OpenAPI_authentication_vector_t *OpenAPI_authentication_vector_parseFromJSON(cJS
}
OpenAPI_av_type_e av_typeVariable;
if (!cJSON_IsString(av_type)) {
ogs_error("OpenAPI_authentication_vector_parseFromJSON() failed [av_type]");
goto end;
@ -134,7 +133,6 @@ OpenAPI_authentication_vector_t *OpenAPI_authentication_vector_parseFromJSON(cJS
goto end;
}
if (!cJSON_IsString(rand)) {
ogs_error("OpenAPI_authentication_vector_parseFromJSON() failed [rand]");
goto end;
@ -155,7 +153,6 @@ OpenAPI_authentication_vector_t *OpenAPI_authentication_vector_parseFromJSON(cJS
goto end;
}
if (!cJSON_IsString(autn)) {
ogs_error("OpenAPI_authentication_vector_parseFromJSON() failed [autn]");
goto end;

1
lib/sbi/openapi/model/authorization_data.c
View File

@ -82,7 +82,6 @@ OpenAPI_authorization_data_t *OpenAPI_authorization_data_parseFromJSON(cJSON *au
}
OpenAPI_list_t *authorization_dataList;
cJSON *authorization_data_local_nonprimitive;
if (!cJSON_IsArray(authorization_data)){
ogs_error("OpenAPI_authorization_data_parseFromJSON() failed [authorization_data]");

25
lib/sbi/openapi/model/authorized_default_qos.c
View File

@ -5,15 +5,20 @@
#include "authorized_default_qos.h"
OpenAPI_authorized_default_qos_t *OpenAPI_authorized_default_qos_create(
bool is__5qi,
int _5qi,
OpenAPI_arp_t *arp,
bool is_priority_level,
int priority_level,
bool is_aver_window,
int aver_window,
bool is_max_data_burst_vol,
int max_data_burst_vol,
char *maxbr_ul,
char *maxbr_dl,
char *gbr_ul,
char *gbr_dl,
bool is_ext_max_data_burst_vol,
int ext_max_data_burst_vol
)
{
@ -21,15 +26,20 @@ OpenAPI_authorized_default_qos_t *OpenAPI_authorized_default_qos_create(
if (!authorized_default_qos_local_var) {
return NULL;
}
authorized_default_qos_local_var->is__5qi = is__5qi;
authorized_default_qos_local_var->_5qi = _5qi;
authorized_default_qos_local_var->arp = arp;
authorized_default_qos_local_var->is_priority_level = is_priority_level;
authorized_default_qos_local_var->priority_level = priority_level;
authorized_default_qos_local_var->is_aver_window = is_aver_window;
authorized_default_qos_local_var->aver_window = aver_window;
authorized_default_qos_local_var->is_max_data_burst_vol = is_max_data_burst_vol;
authorized_default_qos_local_var->max_data_burst_vol = max_data_burst_vol;
authorized_default_qos_local_var->maxbr_ul = maxbr_ul;
authorized_default_qos_local_var->maxbr_dl = maxbr_dl;
authorized_default_qos_local_var->gbr_ul = gbr_ul;
authorized_default_qos_local_var->gbr_dl = gbr_dl;
authorized_default_qos_local_var->is_ext_max_data_burst_vol = is_ext_max_data_burst_vol;
authorized_default_qos_local_var->ext_max_data_burst_vol = ext_max_data_burst_vol;
return authorized_default_qos_local_var;
@ -59,7 +69,7 @@ cJSON *OpenAPI_authorized_default_qos_convertToJSON(OpenAPI_authorized_default_q
}
item = cJSON_CreateObject();
if (authorized_default_qos->_5qi) {
if (authorized_default_qos->is__5qi) {
if (cJSON_AddNumberToObject(item, "5qi", authorized_default_qos->_5qi) == NULL) {
ogs_error("OpenAPI_authorized_default_qos_convertToJSON() failed [_5qi]");
goto end;
@ -79,21 +89,21 @@ cJSON *OpenAPI_authorized_default_qos_convertToJSON(OpenAPI_authorized_default_q
}
}
if (authorized_default_qos->priority_level) {
if (authorized_default_qos->is_priority_level) {
if (cJSON_AddNumberToObject(item, "priorityLevel", authorized_default_qos->priority_level) == NULL) {
ogs_error("OpenAPI_authorized_default_qos_convertToJSON() failed [priority_level]");
goto end;
}
}
if (authorized_default_qos->aver_window) {
if (authorized_default_qos->is_aver_window) {
if (cJSON_AddNumberToObject(item, "averWindow", authorized_default_qos->aver_window) == NULL) {
ogs_error("OpenAPI_authorized_default_qos_convertToJSON() failed [aver_window]");
goto end;
}
}
if (authorized_default_qos->max_data_burst_vol) {
if (authorized_default_qos->is_max_data_burst_vol) {
if (cJSON_AddNumberToObject(item, "maxDataBurstVol", authorized_default_qos->max_data_burst_vol) == NULL) {
ogs_error("OpenAPI_authorized_default_qos_convertToJSON() failed [max_data_burst_vol]");
goto end;
@ -128,7 +138,7 @@ cJSON *OpenAPI_authorized_default_qos_convertToJSON(OpenAPI_authorized_default_q
}
}
if (authorized_default_qos->ext_max_data_burst_vol) {
if (authorized_default_qos->is_ext_max_data_burst_vol) {
if (cJSON_AddNumberToObject(item, "extMaxDataBurstVol", authorized_default_qos->ext_max_data_burst_vol) == NULL) {
ogs_error("OpenAPI_authorized_default_qos_convertToJSON() failed [ext_max_data_burst_vol]");
goto end;
@ -231,15 +241,20 @@ OpenAPI_authorized_default_qos_t *OpenAPI_authorized_default_qos_parseFromJSON(c
}
authorized_default_qos_local_var = OpenAPI_authorized_default_qos_create (
_5qi ? true : false,
_5qi ? _5qi->valuedouble : 0,
arp ? arp_local_nonprim : NULL,
priority_level ? true : false,
priority_level ? priority_level->valuedouble : 0,
aver_window ? true : false,
aver_window ? aver_window->valuedouble : 0,
max_data_burst_vol ? true : false,
max_data_burst_vol ? max_data_burst_vol->valuedouble : 0,
maxbr_ul ? ogs_strdup_or_assert(maxbr_ul->valuestring) : NULL,
maxbr_dl ? ogs_strdup_or_assert(maxbr_dl->valuestring) : NULL,
gbr_ul ? ogs_strdup_or_assert(gbr_ul->valuestring) : NULL,
gbr_dl ? ogs_strdup_or_assert(gbr_dl->valuestring) : NULL,
ext_max_data_burst_vol ? true : false,
ext_max_data_burst_vol ? ext_max_data_burst_vol->valuedouble : 0
);

10
lib/sbi/openapi/model/authorized_default_qos.h
View File

@ -20,28 +20,38 @@ extern "C" {
typedef struct OpenAPI_authorized_default_qos_s OpenAPI_authorized_default_qos_t;
typedef struct OpenAPI_authorized_default_qos_s {
bool is__5qi;
int _5qi;
struct OpenAPI_arp_s *arp;
bool is_priority_level;
int priority_level;
bool is_aver_window;
int aver_window;
bool is_max_data_burst_vol;
int max_data_burst_vol;
char *maxbr_ul;
char *maxbr_dl;
char *gbr_ul;
char *gbr_dl;
bool is_ext_max_data_burst_vol;
int ext_max_data_burst_vol;
} OpenAPI_authorized_default_qos_t;
OpenAPI_authorized_default_qos_t *OpenAPI_authorized_default_qos_create(
bool is__5qi,
int _5qi,
OpenAPI_arp_t *arp,
bool is_priority_level,
int priority_level,
bool is_aver_window,
int aver_window,
bool is_max_data_burst_vol,
int max_data_burst_vol,
char *maxbr_ul,
char *maxbr_dl,
char *gbr_ul,
char *gbr_dl,
bool is_ext_max_data_burst_vol,
int ext_max_data_burst_vol
);
void OpenAPI_authorized_default_qos_free(OpenAPI_authorized_default_qos_t *authorized_default_qos);

3
lib/sbi/openapi/model/av5_ghe_aka.c
View File

@ -91,7 +91,6 @@ OpenAPI_av5_ghe_aka_t *OpenAPI_av5_ghe_aka_parseFromJSON(cJSON *av5_ghe_akaJSON)
}
OpenAPI_av_type_e av_typeVariable;
if (!cJSON_IsString(av_type)) {
ogs_error("OpenAPI_av5_ghe_aka_parseFromJSON() failed [av_type]");
goto end;
@ -104,7 +103,6 @@ OpenAPI_av5_ghe_aka_t *OpenAPI_av5_ghe_aka_parseFromJSON(cJSON *av5_ghe_akaJSON)
goto end;
}
if (!cJSON_IsString(rand)) {
ogs_error("OpenAPI_av5_ghe_aka_parseFromJSON() failed [rand]");
goto end;
@ -125,7 +123,6 @@ OpenAPI_av5_ghe_aka_t *OpenAPI_av5_ghe_aka_parseFromJSON(cJSON *av5_ghe_akaJSON)
goto end;
}
if (!cJSON_IsString(autn)) {
ogs_error("OpenAPI_av5_ghe_aka_parseFromJSON() failed [autn]");
goto end;

3
lib/sbi/openapi/model/av5g_aka.c
View File

@ -71,7 +71,6 @@ OpenAPI_av5g_aka_t *OpenAPI_av5g_aka_parseFromJSON(cJSON *av5g_akaJSON)
goto end;
}
if (!cJSON_IsString(rand)) {
ogs_error("OpenAPI_av5g_aka_parseFromJSON() failed [rand]");
goto end;
@ -83,7 +82,6 @@ OpenAPI_av5g_aka_t *OpenAPI_av5g_aka_parseFromJSON(cJSON *av5g_akaJSON)
goto end;
}
if (!cJSON_IsString(hxres_star)) {
ogs_error("OpenAPI_av5g_aka_parseFromJSON() failed [hxres_star]");
goto end;
@ -95,7 +93,6 @@ OpenAPI_av5g_aka_t *OpenAPI_av5g_aka_parseFromJSON(cJSON *av5g_akaJSON)
goto end;
}
if (!cJSON_IsString(autn)) {
ogs_error("OpenAPI_av5g_aka_parseFromJSON() failed [autn]");
goto end;

3
lib/sbi/openapi/model/av_eap_aka_prime.c
View File

@ -101,7 +101,6 @@ OpenAPI_av_eap_aka_prime_t *OpenAPI_av_eap_aka_prime_parseFromJSON(cJSON *av_eap
}
OpenAPI_av_type_e av_typeVariable;
if (!cJSON_IsString(av_type)) {
ogs_error("OpenAPI_av_eap_aka_prime_parseFromJSON() failed [av_type]");
goto end;
@ -114,7 +113,6 @@ OpenAPI_av_eap_aka_prime_t *OpenAPI_av_eap_aka_prime_parseFromJSON(cJSON *av_eap
goto end;
}
if (!cJSON_IsString(rand)) {
ogs_error("OpenAPI_av_eap_aka_prime_parseFromJSON() failed [rand]");
goto end;
@ -135,7 +133,6 @@ OpenAPI_av_eap_aka_prime_t *OpenAPI_av_eap_aka_prime_parseFromJSON(cJSON *av_eap
goto end;
}
if (!cJSON_IsString(autn)) {
ogs_error("OpenAPI_av_eap_aka_prime_parseFromJSON() failed [autn]");
goto end;

5
lib/sbi/openapi/model/av_eps_aka.c
View File

@ -87,7 +87,6 @@ OpenAPI_av_eps_aka_t *OpenAPI_av_eps_aka_parseFromJSON(cJSON *av_eps_akaJSON)
}
OpenAPI_hss_av_type_e av_typeVariable;
if (!cJSON_IsString(av_type)) {
ogs_error("OpenAPI_av_eps_aka_parseFromJSON() failed [av_type]");
goto end;
@ -100,7 +99,6 @@ OpenAPI_av_eps_aka_t *OpenAPI_av_eps_aka_parseFromJSON(cJSON *av_eps_akaJSON)
goto end;
}
if (!cJSON_IsString(rand)) {
ogs_error("OpenAPI_av_eps_aka_parseFromJSON() failed [rand]");
goto end;
@ -112,7 +110,6 @@ OpenAPI_av_eps_aka_t *OpenAPI_av_eps_aka_parseFromJSON(cJSON *av_eps_akaJSON)
goto end;
}
if (!cJSON_IsString(xres)) {
ogs_error("OpenAPI_av_eps_aka_parseFromJSON() failed [xres]");
goto end;
@ -124,7 +121,6 @@ OpenAPI_av_eps_aka_t *OpenAPI_av_eps_aka_parseFromJSON(cJSON *av_eps_akaJSON)
goto end;
}
if (!cJSON_IsString(autn)) {
ogs_error("OpenAPI_av_eps_aka_parseFromJSON() failed [autn]");
goto end;
@ -136,7 +132,6 @@ OpenAPI_av_eps_aka_t *OpenAPI_av_eps_aka_parseFromJSON(cJSON *av_eps_akaJSON)
goto end;
}
if (!cJSON_IsString(kasme)) {
ogs_error("OpenAPI_av_eps_aka_parseFromJSON() failed [kasme]");
goto end;

6
lib/sbi/openapi/model/av_ims_gba_eap_aka.c
View File

@ -95,7 +95,6 @@ OpenAPI_av_ims_gba_eap_aka_t *OpenAPI_av_ims_gba_eap_aka_parseFromJSON(cJSON *av
}
OpenAPI_hss_av_type_e av_typeVariable;
if (!cJSON_IsString(av_type)) {
ogs_error("OpenAPI_av_ims_gba_eap_aka_parseFromJSON() failed [av_type]");
goto end;
@ -108,7 +107,6 @@ OpenAPI_av_ims_gba_eap_aka_t *OpenAPI_av_ims_gba_eap_aka_parseFromJSON(cJSON *av
goto end;
}
if (!cJSON_IsString(rand)) {
ogs_error("OpenAPI_av_ims_gba_eap_aka_parseFromJSON() failed [rand]");
goto end;
@ -120,7 +118,6 @@ OpenAPI_av_ims_gba_eap_aka_t *OpenAPI_av_ims_gba_eap_aka_parseFromJSON(cJSON *av
goto end;
}
if (!cJSON_IsString(xres)) {
ogs_error("OpenAPI_av_ims_gba_eap_aka_parseFromJSON() failed [xres]");
goto end;
@ -132,7 +129,6 @@ OpenAPI_av_ims_gba_eap_aka_t *OpenAPI_av_ims_gba_eap_aka_parseFromJSON(cJSON *av
goto end;
}
if (!cJSON_IsString(autn)) {
ogs_error("OpenAPI_av_ims_gba_eap_aka_parseFromJSON() failed [autn]");
goto end;
@ -144,7 +140,6 @@ OpenAPI_av_ims_gba_eap_aka_t *OpenAPI_av_ims_gba_eap_aka_parseFromJSON(cJSON *av
goto end;
}
if (!cJSON_IsString(ck)) {
ogs_error("OpenAPI_av_ims_gba_eap_aka_parseFromJSON() failed [ck]");
goto end;
@ -156,7 +151,6 @@ OpenAPI_av_ims_gba_eap_aka_t *OpenAPI_av_ims_gba_eap_aka_parseFromJSON(cJSON *av
goto end;
}
if (!cJSON_IsString(ik)) {
ogs_error("OpenAPI_av_ims_gba_eap_aka_parseFromJSON() failed [ik]");
goto end;

1
lib/sbi/openapi/model/backup_amf_info.c
View File

@ -81,7 +81,6 @@ OpenAPI_backup_amf_info_t *OpenAPI_backup_amf_info_parseFromJSON(cJSON *backup_a
goto end;
}
if (!cJSON_IsString(backup_amf)) {
ogs_error("OpenAPI_backup_amf_info_parseFromJSON() failed [backup_amf]");
goto end;

Some files were not shown because too many files have changed in this diff Show More