From 3f9ca906da8d50d5f5348e3a3ef25694145e5fdc Mon Sep 17 00:00:00 2001 From: Sukchan Lee Date: Wed, 4 Oct 2023 20:27:47 +0900 Subject: [PATCH] [PCF] Remove SM Policy Association Terminatation (#2650) --- src/pcf/nsmf-build.c | 38 -------------------------------------- src/pcf/nsmf-build.h | 2 -- src/pcf/sbi-path.c | 25 ------------------------- src/pcf/sbi-path.h | 1 - 4 files changed, 66 deletions(-) diff --git a/src/pcf/nsmf-build.c b/src/pcf/nsmf-build.c index 1ee4f0625..53738937c 100644 --- a/src/pcf/nsmf-build.c +++ b/src/pcf/nsmf-build.c @@ -83,41 +83,3 @@ end: return request; } - -ogs_sbi_request_t *pcf_nsmf_callback_build_smpolicycontrol_terminate( - pcf_sess_t *sess, void *data) -{ - ogs_sbi_message_t message; - ogs_sbi_header_t header; - ogs_sbi_request_t *request = NULL; - - ogs_assert(sess); - ogs_assert(sess->sm_policy_id); - ogs_assert(sess->notification_uri); - - memset(&header, 0, sizeof(header)); - header.service.name = (char *)OGS_SBI_SERVICE_NAME_NPCF_SMPOLICYCONTROL; - header.api.version = (char *)OGS_SBI_API_V1; - header.resource.component[0] = (char *)OGS_SBI_RESOURCE_NAME_SM_POLICIES; - header.resource.component[1] = sess->sm_policy_id; - header.resource.component[2] = (char *)OGS_SBI_RESOURCE_NAME_UPDATE; - - memset(&message, 0, sizeof(message)); - message.h.method = (char *)OGS_SBI_HTTP_METHOD_POST; - message.h.uri = ogs_msprintf("%s/%s", - sess->notification_uri, OGS_SBI_RESOURCE_NAME_TERMINATE); - if (!message.h.uri) { - ogs_error("No message.h.uri"); - goto end; - } - - request = ogs_sbi_build_request(&message); - ogs_assert(request); - -end: - - if (message.h.uri) - ogs_free(message.h.uri); - - return request; -} diff --git a/src/pcf/nsmf-build.h b/src/pcf/nsmf-build.h index 0ccbe418c..797c2e9ab 100644 --- a/src/pcf/nsmf-build.h +++ b/src/pcf/nsmf-build.h @@ -28,8 +28,6 @@ extern "C" { ogs_sbi_request_t *pcf_nsmf_callback_build_smpolicycontrol_update( pcf_sess_t *sess, void *data); -ogs_sbi_request_t *pcf_nsmf_callback_build_smpolicycontrol_terminate( - pcf_sess_t *sess, void *data); #ifdef __cplusplus } diff --git a/src/pcf/sbi-path.c b/src/pcf/sbi-path.c index e4a632c3f..0c30651b6 100644 --- a/src/pcf/sbi-path.c +++ b/src/pcf/sbi-path.c @@ -348,31 +348,6 @@ bool pcf_sbi_send_smpolicycontrol_delete_notify( return rc; } -bool pcf_sbi_send_smpolicycontrol_terminate_notify(pcf_sess_t *sess) -{ - bool rc; - ogs_sbi_request_t *request = NULL; - ogs_sbi_client_t *client = NULL; - - ogs_assert(sess); - client = sess->nsmf.client; - ogs_assert(client); - - request = pcf_nsmf_callback_build_smpolicycontrol_terminate(sess, NULL); - if (!request) { - ogs_error("pcf_nsmf_callback_build_smpolicycontrol_terminate() failed"); - return false; - } - - rc = ogs_sbi_send_request_to_client( - client, client_notify_cb, request, NULL); - ogs_expect(rc == true); - - ogs_sbi_request_free(request); - - return rc; -} - bool pcf_sbi_send_policyauthorization_terminate_notify(pcf_app_t *app) { bool rc; diff --git a/src/pcf/sbi-path.h b/src/pcf/sbi-path.h index 587732915..069921244 100644 --- a/src/pcf/sbi-path.h +++ b/src/pcf/sbi-path.h @@ -55,7 +55,6 @@ bool pcf_sbi_send_smpolicycontrol_update_notify( bool pcf_sbi_send_smpolicycontrol_delete_notify( pcf_sess_t *sess, pcf_app_t *app_session, OpenAPI_sm_policy_decision_t *SmPolicyDecision); -bool pcf_sbi_send_smpolicycontrol_terminate_notify(pcf_sess_t *sess); bool pcf_sbi_send_policyauthorization_terminate_notify(pcf_app_t *app);