From 6e410e01b1183cde37ec39eeeb16b7397c943348 Mon Sep 17 00:00:00 2001 From: Ghislain Bourgeois Date: Thu, 8 Feb 2024 16:16:34 -0500 Subject: [PATCH] chore: Move http_wrapper dependency to util project (#60) --- ...and_mobility_subscription_data_document.go | 4 +- ...i_amf3_gpp_access_registration_document.go | 8 +- ...f_non3_gpp_access_registration_document.go | 8 +- .../api_amf_subscription_info_document.go | 4 +- .../api_authentication_data_document.go | 6 +- .../api_authentication_so_r_document.go | 6 +- .../api_authentication_status_document.go | 6 +- datarepository/api_default.go | 46 +- ...pi_event_amf_subscription_info_document.go | 6 +- .../api_event_exposure_data_document.go | 4 +- ...nt_exposure_group_subscription_document.go | 6 +- ...exposure_group_subscriptions_collection.go | 6 +- ...pi_event_exposure_subscription_document.go | 6 +- ...event_exposure_subscriptions_collection.go | 6 +- ...erator_specific_data_container_document.go | 6 +- .../api_parameter_provision_document.go | 4 +- .../api_provisioned_data_document.go | 4 +- ...api_provisioned_parameter_data_document.go | 4 +- ...pi_query_amf_subscription_info_document.go | 6 +- ..._identity_data_by_supi_or_gpsi_document.go | 4 +- ...query_odb_data_by_supi_or_gpsi_document.go | 4 +- .../api_retrieval_of_shared_data.go | 4 +- .../api_sdm_subscription_document.go | 6 +- .../api_sdm_subscriptions_collection.go | 6 +- ...pi_session_management_subscription_data.go | 4 +- .../api_smf_registration_document.go | 8 +- .../api_smf_registrations_collection.go | 4 +- ...mf_selection_subscription_data_document.go | 4 +- ...s_management_subscription_data_document.go | 4 +- .../api_sms_subscription_data_document.go | 4 +- .../api_smsf3_gpp_registration_document.go | 8 +- ...api_smsf_non3_gpp_registration_document.go | 8 +- .../api_subs_to_nofify_collection.go | 4 +- datarepository/api_subs_to_notify_document.go | 4 +- datarepository/api_trace_data_document.go | 4 +- go.mod | 1 - go.sum | 2 - producer/data_repository.go | 584 +++++++++--------- 38 files changed, 405 insertions(+), 408 deletions(-) diff --git a/datarepository/api_access_and_mobility_subscription_data_document.go b/datarepository/api_access_and_mobility_subscription_data_document.go index 9374170..4d815ac 100644 --- a/datarepository/api_access_and_mobility_subscription_data_document.go +++ b/datarepository/api_access_and_mobility_subscription_data_document.go @@ -19,7 +19,7 @@ import ( "github.com/gin-gonic/gin" - "github.com/omec-project/http_wrapper" + "github.com/omec-project/util/httpwrapper" "github.com/omec-project/openapi" "github.com/omec-project/openapi/models" "github.com/omec-project/udr/logger" @@ -28,7 +28,7 @@ import ( // HTTPQueryAmData - Retrieves the access and mobility subscription data of a UE func HTTPQueryAmData(c *gin.Context) { - req := http_wrapper.NewRequest(c.Request, nil) + req := httpwrapper.NewRequest(c.Request, nil) req.Params["ueId"] = c.Params.ByName("ueId") req.Params["servingPlmnId"] = c.Params.ByName("servingPlmnId") diff --git a/datarepository/api_amf3_gpp_access_registration_document.go b/datarepository/api_amf3_gpp_access_registration_document.go index 28901a3..2b9628a 100644 --- a/datarepository/api_amf3_gpp_access_registration_document.go +++ b/datarepository/api_amf3_gpp_access_registration_document.go @@ -19,7 +19,7 @@ import ( "github.com/gin-gonic/gin" - "github.com/omec-project/http_wrapper" + "github.com/omec-project/util/httpwrapper" "github.com/omec-project/openapi" "github.com/omec-project/openapi/models" "github.com/omec-project/udr/logger" @@ -56,7 +56,7 @@ func HTTPAmfContext3gpp(c *gin.Context) { return } - req := http_wrapper.NewRequest(c.Request, patchItemArray) + req := httpwrapper.NewRequest(c.Request, patchItemArray) req.Params["ueId"] = c.Params.ByName("ueId") rsp := producer.HandleAmfContext3gpp(req) @@ -105,7 +105,7 @@ func HTTPCreateAmfContext3gpp(c *gin.Context) { return } - req := http_wrapper.NewRequest(c.Request, amf3GppAccessRegistration) + req := httpwrapper.NewRequest(c.Request, amf3GppAccessRegistration) req.Params["ueId"] = c.Params.ByName("ueId") rsp := producer.HandleCreateAmfContext3gpp(req) @@ -126,7 +126,7 @@ func HTTPCreateAmfContext3gpp(c *gin.Context) { // HTTPQueryAmfContext3gpp - Retrieves the AMF context data of a UE using 3gpp access func HTTPQueryAmfContext3gpp(c *gin.Context) { - req := http_wrapper.NewRequest(c.Request, nil) + req := httpwrapper.NewRequest(c.Request, nil) req.Params["ueId"] = c.Params.ByName("ueId") rsp := producer.HandleQueryAmfContext3gpp(req) diff --git a/datarepository/api_amf_non3_gpp_access_registration_document.go b/datarepository/api_amf_non3_gpp_access_registration_document.go index e9445d6..54b8df2 100644 --- a/datarepository/api_amf_non3_gpp_access_registration_document.go +++ b/datarepository/api_amf_non3_gpp_access_registration_document.go @@ -19,7 +19,7 @@ import ( "github.com/gin-gonic/gin" - "github.com/omec-project/http_wrapper" + "github.com/omec-project/util/httpwrapper" "github.com/omec-project/openapi" "github.com/omec-project/openapi/models" "github.com/omec-project/udr/logger" @@ -56,7 +56,7 @@ func HTTPAmfContextNon3gpp(c *gin.Context) { return } - req := http_wrapper.NewRequest(c.Request, patchItemArray) + req := httpwrapper.NewRequest(c.Request, patchItemArray) req.Params["ueId"] = c.Params.ByName("ueId") rsp := producer.HandleAmfContextNon3gpp(req) @@ -105,7 +105,7 @@ func HTTPCreateAmfContextNon3gpp(c *gin.Context) { return } - req := http_wrapper.NewRequest(c.Request, amfNon3GppAccessRegistration) + req := httpwrapper.NewRequest(c.Request, amfNon3GppAccessRegistration) req.Params["ueId"] = c.Params.ByName("ueId") rsp := producer.HandleCreateAmfContextNon3gpp(req) @@ -126,7 +126,7 @@ func HTTPCreateAmfContextNon3gpp(c *gin.Context) { // HTTPQueryAmfContextNon3gpp - Retrieves the AMF context data of a UE using non-3gpp access func HTTPQueryAmfContextNon3gpp(c *gin.Context) { - req := http_wrapper.NewRequest(c.Request, nil) + req := httpwrapper.NewRequest(c.Request, nil) req.Params["ueId"] = c.Params.ByName("ueId") rsp := producer.HandleQueryAmfContextNon3gpp(req) diff --git a/datarepository/api_amf_subscription_info_document.go b/datarepository/api_amf_subscription_info_document.go index fbc34be..75ef0c1 100644 --- a/datarepository/api_amf_subscription_info_document.go +++ b/datarepository/api_amf_subscription_info_document.go @@ -19,7 +19,7 @@ import ( "github.com/gin-gonic/gin" - "github.com/omec-project/http_wrapper" + "github.com/omec-project/util/httpwrapper" "github.com/omec-project/openapi" "github.com/omec-project/openapi/models" "github.com/omec-project/udr/logger" @@ -56,7 +56,7 @@ func HTTPModifyAmfSubscriptionInfo(c *gin.Context) { return } - req := http_wrapper.NewRequest(c.Request, patchItemArray) + req := httpwrapper.NewRequest(c.Request, patchItemArray) req.Params["ueId"] = c.Params.ByName("ueId") req.Params["subsId"] = c.Params.ByName("subsId") diff --git a/datarepository/api_authentication_data_document.go b/datarepository/api_authentication_data_document.go index c413eac..fc035ca 100644 --- a/datarepository/api_authentication_data_document.go +++ b/datarepository/api_authentication_data_document.go @@ -19,7 +19,7 @@ import ( "github.com/gin-gonic/gin" - "github.com/omec-project/http_wrapper" + "github.com/omec-project/util/httpwrapper" "github.com/omec-project/openapi" "github.com/omec-project/openapi/models" "github.com/omec-project/udr/logger" @@ -56,7 +56,7 @@ func HTTPModifyAuthentication(c *gin.Context) { return } - req := http_wrapper.NewRequest(c.Request, patchItemArray) + req := httpwrapper.NewRequest(c.Request, patchItemArray) req.Params["ueId"] = c.Params.ByName("ueId") rsp := producer.HandleModifyAuthentication(req) @@ -77,7 +77,7 @@ func HTTPModifyAuthentication(c *gin.Context) { // HTTPQueryAuthSubsData - Retrieves the authentication subscription data of a UE func HTTPQueryAuthSubsData(c *gin.Context) { - req := http_wrapper.NewRequest(c.Request, nil) + req := httpwrapper.NewRequest(c.Request, nil) req.Params["ueId"] = c.Params.ByName("ueId") rsp := producer.HandleQueryAuthSubsData(req) diff --git a/datarepository/api_authentication_so_r_document.go b/datarepository/api_authentication_so_r_document.go index 1bf022c..afdb60c 100644 --- a/datarepository/api_authentication_so_r_document.go +++ b/datarepository/api_authentication_so_r_document.go @@ -19,7 +19,7 @@ import ( "github.com/gin-gonic/gin" - "github.com/omec-project/http_wrapper" + "github.com/omec-project/util/httpwrapper" "github.com/omec-project/openapi" "github.com/omec-project/openapi/models" "github.com/omec-project/udr/logger" @@ -56,7 +56,7 @@ func HTTPCreateAuthenticationSoR(c *gin.Context) { return } - req := http_wrapper.NewRequest(c.Request, sorData) + req := httpwrapper.NewRequest(c.Request, sorData) req.Params["ueId"] = c.Params.ByName("ueId") rsp := producer.HandleCreateAuthenticationSoR(req) @@ -77,7 +77,7 @@ func HTTPCreateAuthenticationSoR(c *gin.Context) { // HTTPQueryAuthSoR - Retrieves the SoR acknowledgement information of a UE func HTTPQueryAuthSoR(c *gin.Context) { - req := http_wrapper.NewRequest(c.Request, nil) + req := httpwrapper.NewRequest(c.Request, nil) req.Params["ueId"] = c.Params.ByName("ueId") rsp := producer.HandleQueryAuthSoR(req) diff --git a/datarepository/api_authentication_status_document.go b/datarepository/api_authentication_status_document.go index 8ec9852..ed55076 100644 --- a/datarepository/api_authentication_status_document.go +++ b/datarepository/api_authentication_status_document.go @@ -19,7 +19,7 @@ import ( "github.com/gin-gonic/gin" - "github.com/omec-project/http_wrapper" + "github.com/omec-project/util/httpwrapper" "github.com/omec-project/openapi" "github.com/omec-project/openapi/models" "github.com/omec-project/udr/logger" @@ -56,7 +56,7 @@ func HTTPCreateAuthenticationStatus(c *gin.Context) { return } - req := http_wrapper.NewRequest(c.Request, authEvent) + req := httpwrapper.NewRequest(c.Request, authEvent) req.Params["ueId"] = c.Params.ByName("ueId") rsp := producer.HandleCreateAuthenticationStatus(req) @@ -77,7 +77,7 @@ func HTTPCreateAuthenticationStatus(c *gin.Context) { // HTTPQueryAuthenticationStatus - Retrieves the Authentication Status of a UE func HTTPQueryAuthenticationStatus(c *gin.Context) { - req := http_wrapper.NewRequest(c.Request, nil) + req := httpwrapper.NewRequest(c.Request, nil) req.Params["ueId"] = c.Params.ByName("ueId") rsp := producer.HandleQueryAuthenticationStatus(req) diff --git a/datarepository/api_default.go b/datarepository/api_default.go index 580cebf..bfb1cf5 100644 --- a/datarepository/api_default.go +++ b/datarepository/api_default.go @@ -19,7 +19,7 @@ import ( "github.com/gin-gonic/gin" - "github.com/omec-project/http_wrapper" + "github.com/omec-project/util/httpwrapper" "github.com/omec-project/openapi" "github.com/omec-project/openapi/models" "github.com/omec-project/udr/logger" @@ -27,7 +27,7 @@ import ( "github.com/omec-project/udr/util" ) -func sendResponse(c *gin.Context, rsp *http_wrapper.Response) { +func sendResponse(c *gin.Context, rsp *httpwrapper.Response) { for k, v := range rsp.Header { // TODO: concatenate all values c.Header(k, v[0]) @@ -198,7 +198,7 @@ func HTTPExposureDataSubsToNotifySubIdPut(c *gin.Context) { // HTTPPolicyDataBdtDataBdtReferenceIdDelete - func HTTPPolicyDataBdtDataBdtReferenceIdDelete(c *gin.Context) { - req := http_wrapper.NewRequest(c.Request, nil) + req := httpwrapper.NewRequest(c.Request, nil) req.Params["bdtReferenceId"] = c.Params.ByName("bdtReferenceId") rsp := producer.HandlePolicyDataBdtDataBdtReferenceIdDelete(req) @@ -208,7 +208,7 @@ func HTTPPolicyDataBdtDataBdtReferenceIdDelete(c *gin.Context) { // HTTPPolicyDataBdtDataBdtReferenceIdGet - func HTTPPolicyDataBdtDataBdtReferenceIdGet(c *gin.Context) { - req := http_wrapper.NewRequest(c.Request, nil) + req := httpwrapper.NewRequest(c.Request, nil) req.Params["bdtReferenceId"] = c.Params.ByName("bdtReferenceId") rsp := producer.HandlePolicyDataBdtDataBdtReferenceIdGet(req) @@ -224,7 +224,7 @@ func HTTPPolicyDataBdtDataBdtReferenceIdPut(c *gin.Context) { return } - req := http_wrapper.NewRequest(c.Request, bdtData) + req := httpwrapper.NewRequest(c.Request, bdtData) req.Params["bdtReferenceId"] = c.Params.ByName("bdtReferenceId") rsp := producer.HandlePolicyDataBdtDataBdtReferenceIdPut(req) @@ -234,7 +234,7 @@ func HTTPPolicyDataBdtDataBdtReferenceIdPut(c *gin.Context) { // HTTPPolicyDataBdtDataGet - func HTTPPolicyDataBdtDataGet(c *gin.Context) { - req := http_wrapper.NewRequest(c.Request, nil) + req := httpwrapper.NewRequest(c.Request, nil) rsp := producer.HandlePolicyDataBdtDataGet(req) @@ -243,7 +243,7 @@ func HTTPPolicyDataBdtDataGet(c *gin.Context) { // HTTPPolicyDataPlmnsPlmnIdUePolicySetGet - func HTTPPolicyDataPlmnsPlmnIdUePolicySetGet(c *gin.Context) { - req := http_wrapper.NewRequest(c.Request, nil) + req := httpwrapper.NewRequest(c.Request, nil) req.Params["plmnId"] = c.Params.ByName("plmnId") rsp := producer.HandlePolicyDataPlmnsPlmnIdUePolicySetGet(req) @@ -253,7 +253,7 @@ func HTTPPolicyDataPlmnsPlmnIdUePolicySetGet(c *gin.Context) { // HTTPPolicyDataSponsorConnectivityDataSponsorIdGet - func HTTPPolicyDataSponsorConnectivityDataSponsorIdGet(c *gin.Context) { - req := http_wrapper.NewRequest(c.Request, nil) + req := httpwrapper.NewRequest(c.Request, nil) req.Params["sponsorId"] = c.Params.ByName("sponsorId") rsp := producer.HandlePolicyDataSponsorConnectivityDataSponsorIdGet(req) @@ -269,7 +269,7 @@ func HTTPPolicyDataSubsToNotifyPost(c *gin.Context) { return } - req := http_wrapper.NewRequest(c.Request, policyDataSubscription) + req := httpwrapper.NewRequest(c.Request, policyDataSubscription) req.Params["ueId"] = c.Params.ByName("ueId") rsp := producer.HandlePolicyDataSubsToNotifyPost(req) @@ -283,7 +283,7 @@ func HTTPPolicyDataSubsToNotifyPost(c *gin.Context) { // HTTPPolicyDataSubsToNotifySubsIdDelete - func HTTPPolicyDataSubsToNotifySubsIdDelete(c *gin.Context) { - req := http_wrapper.NewRequest(c.Request, nil) + req := httpwrapper.NewRequest(c.Request, nil) req.Params["subsId"] = c.Params.ByName("subsId") rsp := producer.HandlePolicyDataSubsToNotifySubsIdDelete(req) @@ -299,7 +299,7 @@ func HTTPPolicyDataSubsToNotifySubsIdPut(c *gin.Context) { return } - req := http_wrapper.NewRequest(c.Request, policyDataSubscription) + req := httpwrapper.NewRequest(c.Request, policyDataSubscription) req.Params["subsId"] = c.Params.ByName("subsId") rsp := producer.HandlePolicyDataSubsToNotifySubsIdPut(req) @@ -309,7 +309,7 @@ func HTTPPolicyDataSubsToNotifySubsIdPut(c *gin.Context) { // HTTPPolicyDataUesUeIdAmDataGet - func HTTPPolicyDataUesUeIdAmDataGet(c *gin.Context) { - req := http_wrapper.NewRequest(c.Request, nil) + req := httpwrapper.NewRequest(c.Request, nil) req.Params["ueId"] = c.Params.ByName("ueId") rsp := producer.HandlePolicyDataUesUeIdAmDataGet(req) @@ -319,7 +319,7 @@ func HTTPPolicyDataUesUeIdAmDataGet(c *gin.Context) { // HTTPPolicyDataUesUeIdOperatorSpecificDataGet - func HTTPPolicyDataUesUeIdOperatorSpecificDataGet(c *gin.Context) { - req := http_wrapper.NewRequest(c.Request, nil) + req := httpwrapper.NewRequest(c.Request, nil) req.Params["ueId"] = c.Params.ByName("ueId") rsp := producer.HandlePolicyDataUesUeIdOperatorSpecificDataGet(req) @@ -335,7 +335,7 @@ func HTTPPolicyDataUesUeIdOperatorSpecificDataPatch(c *gin.Context) { return } - req := http_wrapper.NewRequest(c.Request, patchItemArray) + req := httpwrapper.NewRequest(c.Request, patchItemArray) req.Params["ueId"] = c.Params.ByName("ueId") rsp := producer.HandlePolicyDataUesUeIdOperatorSpecificDataPatch(req) @@ -351,7 +351,7 @@ func HTTPPolicyDataUesUeIdOperatorSpecificDataPut(c *gin.Context) { return } - req := http_wrapper.NewRequest(c.Request, operatorSpecificDataContainerMap) + req := httpwrapper.NewRequest(c.Request, operatorSpecificDataContainerMap) req.Params["ueId"] = c.Params.ByName("ueId") rsp := producer.HandlePolicyDataUesUeIdOperatorSpecificDataPut(req) @@ -361,7 +361,7 @@ func HTTPPolicyDataUesUeIdOperatorSpecificDataPut(c *gin.Context) { // HTTPPolicyDataUesUeIdSmDataGet - func HTTPPolicyDataUesUeIdSmDataGet(c *gin.Context) { - req := http_wrapper.NewRequest(c.Request, nil) + req := httpwrapper.NewRequest(c.Request, nil) req.Params["ueId"] = c.Params.ByName("ueId") rsp := producer.HandlePolicyDataUesUeIdSmDataGet(req) @@ -377,7 +377,7 @@ func HTTPPolicyDataUesUeIdSmDataPatch(c *gin.Context) { return } - req := http_wrapper.NewRequest(c.Request, usageMonDataMap) + req := httpwrapper.NewRequest(c.Request, usageMonDataMap) req.Params["ueId"] = c.Params.ByName("ueId") rsp := producer.HandlePolicyDataUesUeIdSmDataPatch(req) @@ -387,7 +387,7 @@ func HTTPPolicyDataUesUeIdSmDataPatch(c *gin.Context) { // HTTPPolicyDataUesUeIdSmDataUsageMonIdDelete - func HTTPPolicyDataUesUeIdSmDataUsageMonIdDelete(c *gin.Context) { - req := http_wrapper.NewRequest(c.Request, nil) + req := httpwrapper.NewRequest(c.Request, nil) req.Params["ueId"] = c.Params.ByName("ueId") req.Params["usageMonId"] = c.Params.ByName("usageMonId") @@ -398,7 +398,7 @@ func HTTPPolicyDataUesUeIdSmDataUsageMonIdDelete(c *gin.Context) { // HTTPPolicyDataUesUeIdSmDataUsageMonIdGet - func HTTPPolicyDataUesUeIdSmDataUsageMonIdGet(c *gin.Context) { - req := http_wrapper.NewRequest(c.Request, nil) + req := httpwrapper.NewRequest(c.Request, nil) req.Params["ueId"] = c.Params.ByName("ueId") req.Params["usageMonId"] = c.Params.ByName("usageMonId") @@ -415,7 +415,7 @@ func HTTPPolicyDataUesUeIdSmDataUsageMonIdPut(c *gin.Context) { return } - req := http_wrapper.NewRequest(c.Request, usageMonData) + req := httpwrapper.NewRequest(c.Request, usageMonData) req.Params["ueId"] = c.Params.ByName("ueId") req.Params["usageMonId"] = c.Params.ByName("usageMonId") @@ -426,7 +426,7 @@ func HTTPPolicyDataUesUeIdSmDataUsageMonIdPut(c *gin.Context) { // HTTPPolicyDataUesUeIdUePolicySetGet - func HTTPPolicyDataUesUeIdUePolicySetGet(c *gin.Context) { - req := http_wrapper.NewRequest(c.Request, nil) + req := httpwrapper.NewRequest(c.Request, nil) req.Params["ueId"] = c.Params.ByName("ueId") rsp := producer.HandlePolicyDataUesUeIdUePolicySetGet(req) @@ -442,7 +442,7 @@ func HTTPPolicyDataUesUeIdUePolicySetPatch(c *gin.Context) { return } - req := http_wrapper.NewRequest(c.Request, uePolicySet) + req := httpwrapper.NewRequest(c.Request, uePolicySet) req.Params["ueId"] = c.Params.ByName("ueId") rsp := producer.HandlePolicyDataUesUeIdUePolicySetPatch(req) @@ -458,7 +458,7 @@ func HTTPPolicyDataUesUeIdUePolicySetPut(c *gin.Context) { return } - req := http_wrapper.NewRequest(c.Request, uePolicySet) + req := httpwrapper.NewRequest(c.Request, uePolicySet) req.Params["ueId"] = c.Params.ByName("ueId") rsp := producer.HandlePolicyDataUesUeIdUePolicySetPut(req) diff --git a/datarepository/api_event_amf_subscription_info_document.go b/datarepository/api_event_amf_subscription_info_document.go index 2864ac2..6f233ca 100644 --- a/datarepository/api_event_amf_subscription_info_document.go +++ b/datarepository/api_event_amf_subscription_info_document.go @@ -19,7 +19,7 @@ import ( "github.com/gin-gonic/gin" - "github.com/omec-project/http_wrapper" + "github.com/omec-project/util/httpwrapper" "github.com/omec-project/openapi" "github.com/omec-project/openapi/models" "github.com/omec-project/udr/logger" @@ -56,7 +56,7 @@ func HTTPCreateAMFSubscriptions(c *gin.Context) { return } - req := http_wrapper.NewRequest(c.Request, amfSubscriptionInfoArray) + req := httpwrapper.NewRequest(c.Request, amfSubscriptionInfoArray) req.Params["ueId"] = c.Params.ByName("ueId") req.Params["subsId"] = c.Params.ByName("subsId") @@ -78,7 +78,7 @@ func HTTPCreateAMFSubscriptions(c *gin.Context) { // HTTPRemoveAmfSubscriptionsInfo - Deletes AMF Subscription Info for an eeSubscription func HTTPRemoveAmfSubscriptionsInfo(c *gin.Context) { - req := http_wrapper.NewRequest(c.Request, nil) + req := httpwrapper.NewRequest(c.Request, nil) req.Params["ueId"] = c.Params.ByName("ueId") req.Params["subsId"] = c.Params.ByName("subsId") diff --git a/datarepository/api_event_exposure_data_document.go b/datarepository/api_event_exposure_data_document.go index 5d559f3..5ce9364 100644 --- a/datarepository/api_event_exposure_data_document.go +++ b/datarepository/api_event_exposure_data_document.go @@ -19,7 +19,7 @@ import ( "github.com/gin-gonic/gin" - "github.com/omec-project/http_wrapper" + "github.com/omec-project/util/httpwrapper" "github.com/omec-project/openapi" "github.com/omec-project/openapi/models" "github.com/omec-project/udr/logger" @@ -28,7 +28,7 @@ import ( // HTTPQueryEEData - Retrieves the ee profile data of a UE func HTTPQueryEEData(c *gin.Context) { - req := http_wrapper.NewRequest(c.Request, nil) + req := httpwrapper.NewRequest(c.Request, nil) req.Params["ueId"] = c.Params.ByName("ueId") rsp := producer.HandleQueryEEData(req) diff --git a/datarepository/api_event_exposure_group_subscription_document.go b/datarepository/api_event_exposure_group_subscription_document.go index 226144f..f6aea30 100644 --- a/datarepository/api_event_exposure_group_subscription_document.go +++ b/datarepository/api_event_exposure_group_subscription_document.go @@ -19,7 +19,7 @@ import ( "github.com/gin-gonic/gin" - "github.com/omec-project/http_wrapper" + "github.com/omec-project/util/httpwrapper" "github.com/omec-project/openapi" "github.com/omec-project/openapi/models" "github.com/omec-project/udr/logger" @@ -28,7 +28,7 @@ import ( // HTTPRemoveEeGroupSubscriptions - Deletes a eeSubscription for a group of UEs or any UE func HTTPRemoveEeGroupSubscriptions(c *gin.Context) { - req := http_wrapper.NewRequest(c.Request, nil) + req := httpwrapper.NewRequest(c.Request, nil) req.Params["ueGroupId"] = c.Params.ByName("ueGroupId") req.Params["subsId"] = c.Params.ByName("subsId") @@ -78,7 +78,7 @@ func HTTPUpdateEeGroupSubscriptions(c *gin.Context) { return } - req := http_wrapper.NewRequest(c.Request, eeSubscription) + req := httpwrapper.NewRequest(c.Request, eeSubscription) req.Params["ueGroupId"] = c.Params.ByName("ueGroupId") req.Params["subsId"] = c.Params.ByName("subsId") diff --git a/datarepository/api_event_exposure_group_subscriptions_collection.go b/datarepository/api_event_exposure_group_subscriptions_collection.go index 5b4835c..1c05632 100644 --- a/datarepository/api_event_exposure_group_subscriptions_collection.go +++ b/datarepository/api_event_exposure_group_subscriptions_collection.go @@ -19,7 +19,7 @@ import ( "github.com/gin-gonic/gin" - "github.com/omec-project/http_wrapper" + "github.com/omec-project/util/httpwrapper" "github.com/omec-project/openapi" "github.com/omec-project/openapi/models" "github.com/omec-project/udr/logger" @@ -55,7 +55,7 @@ func HTTPCreateEeGroupSubscriptions(c *gin.Context) { return } - req := http_wrapper.NewRequest(c.Request, eeSubscription) + req := httpwrapper.NewRequest(c.Request, eeSubscription) req.Params["ueGroupId"] = c.Params.ByName("ueGroupId") rsp := producer.HandleCreateEeGroupSubscriptions(req) @@ -76,7 +76,7 @@ func HTTPCreateEeGroupSubscriptions(c *gin.Context) { // HTTPQueryEeGroupSubscriptions - Retrieves the ee subscriptions of a group of UEs or any UE func HTTPQueryEeGroupSubscriptions(c *gin.Context) { - req := http_wrapper.NewRequest(c.Request, nil) + req := httpwrapper.NewRequest(c.Request, nil) req.Params["ueGroupId"] = c.Params.ByName("ueGroupId") rsp := producer.HandleQueryEeGroupSubscriptions(req) diff --git a/datarepository/api_event_exposure_subscription_document.go b/datarepository/api_event_exposure_subscription_document.go index 2cf296c..1157749 100644 --- a/datarepository/api_event_exposure_subscription_document.go +++ b/datarepository/api_event_exposure_subscription_document.go @@ -19,7 +19,7 @@ import ( "github.com/gin-gonic/gin" - "github.com/omec-project/http_wrapper" + "github.com/omec-project/util/httpwrapper" "github.com/omec-project/openapi" "github.com/omec-project/openapi/models" "github.com/omec-project/udr/logger" @@ -28,7 +28,7 @@ import ( // HTTPRemoveeeSubscriptions - Deletes a eeSubscription func HTTPRemoveeeSubscriptions(c *gin.Context) { - req := http_wrapper.NewRequest(c.Request, nil) + req := httpwrapper.NewRequest(c.Request, nil) req.Params["ueId"] = c.Params.ByName("ueId") req.Params["subsId"] = c.Params.ByName("subsId") @@ -78,7 +78,7 @@ func HTTPUpdateEesubscriptions(c *gin.Context) { return } - req := http_wrapper.NewRequest(c.Request, eeSubscription) + req := httpwrapper.NewRequest(c.Request, eeSubscription) req.Params["ueId"] = c.Params.ByName("ueId") req.Params["subsId"] = c.Params.ByName("subsId") diff --git a/datarepository/api_event_exposure_subscriptions_collection.go b/datarepository/api_event_exposure_subscriptions_collection.go index 2ba1ea6..44badd0 100644 --- a/datarepository/api_event_exposure_subscriptions_collection.go +++ b/datarepository/api_event_exposure_subscriptions_collection.go @@ -19,7 +19,7 @@ import ( "github.com/gin-gonic/gin" - "github.com/omec-project/http_wrapper" + "github.com/omec-project/util/httpwrapper" "github.com/omec-project/openapi" "github.com/omec-project/openapi/models" "github.com/omec-project/udr/logger" @@ -56,7 +56,7 @@ func HTTPCreateEeSubscriptions(c *gin.Context) { return } - req := http_wrapper.NewRequest(c.Request, eeSubscription) + req := httpwrapper.NewRequest(c.Request, eeSubscription) req.Params["ueGroupId"] = c.Params.ByName("ueGroupId") rsp := producer.HandleCreateEeSubscriptions(req) @@ -77,7 +77,7 @@ func HTTPCreateEeSubscriptions(c *gin.Context) { // HTTPQueryeesubscriptions - Retrieves the ee subscriptions of a UE func HTTPQueryeesubscriptions(c *gin.Context) { - req := http_wrapper.NewRequest(c.Request, nil) + req := httpwrapper.NewRequest(c.Request, nil) req.Params["ueGroupId"] = c.Params.ByName("ueGroupId") rsp := producer.HandleQueryeesubscriptions(req) diff --git a/datarepository/api_operator_specific_data_container_document.go b/datarepository/api_operator_specific_data_container_document.go index 34feb95..78904bf 100644 --- a/datarepository/api_operator_specific_data_container_document.go +++ b/datarepository/api_operator_specific_data_container_document.go @@ -19,7 +19,7 @@ import ( "github.com/gin-gonic/gin" - "github.com/omec-project/http_wrapper" + "github.com/omec-project/util/httpwrapper" "github.com/omec-project/openapi" "github.com/omec-project/openapi/models" "github.com/omec-project/udr/logger" @@ -56,7 +56,7 @@ func HTTPPatchOperSpecData(c *gin.Context) { return } - req := http_wrapper.NewRequest(c.Request, patchItemArray) + req := httpwrapper.NewRequest(c.Request, patchItemArray) req.Params["ueId"] = c.Params.ByName("ueId") rsp := producer.HandlePatchOperSpecData(req) @@ -77,7 +77,7 @@ func HTTPPatchOperSpecData(c *gin.Context) { // HTTPQueryOperSpecData - Retrieves the operator specific data of a UE func HTTPQueryOperSpecData(c *gin.Context) { - req := http_wrapper.NewRequest(c.Request, nil) + req := httpwrapper.NewRequest(c.Request, nil) req.Params["ueId"] = c.Params.ByName("ueId") rsp := producer.HandleQueryOperSpecData(req) diff --git a/datarepository/api_parameter_provision_document.go b/datarepository/api_parameter_provision_document.go index 7d065e4..037f72c 100644 --- a/datarepository/api_parameter_provision_document.go +++ b/datarepository/api_parameter_provision_document.go @@ -19,7 +19,7 @@ import ( "github.com/gin-gonic/gin" - "github.com/omec-project/http_wrapper" + "github.com/omec-project/util/httpwrapper" "github.com/omec-project/openapi" "github.com/omec-project/openapi/models" "github.com/omec-project/udr/logger" @@ -28,7 +28,7 @@ import ( // HTTPGetppData - Read the profile of a given UE func HTTPGetppData(c *gin.Context) { - req := http_wrapper.NewRequest(c.Request, nil) + req := httpwrapper.NewRequest(c.Request, nil) req.Params["ueId"] = c.Params.ByName("ueId") rsp := producer.HandleGetppData(req) diff --git a/datarepository/api_provisioned_data_document.go b/datarepository/api_provisioned_data_document.go index f94b8f3..65c69ef 100644 --- a/datarepository/api_provisioned_data_document.go +++ b/datarepository/api_provisioned_data_document.go @@ -19,7 +19,7 @@ import ( "github.com/gin-gonic/gin" - "github.com/omec-project/http_wrapper" + "github.com/omec-project/util/httpwrapper" "github.com/omec-project/openapi" "github.com/omec-project/openapi/models" "github.com/omec-project/udr/logger" @@ -28,7 +28,7 @@ import ( // HTTPQueryProvisionedData - Retrieve multiple provisioned data sets of a UE func HTTPQueryProvisionedData(c *gin.Context) { - req := http_wrapper.NewRequest(c.Request, nil) + req := httpwrapper.NewRequest(c.Request, nil) req.Params["ueId"] = c.Params.ByName("ueId") req.Params["servingPlmnId"] = c.Params.ByName("servingPlmnId") diff --git a/datarepository/api_provisioned_parameter_data_document.go b/datarepository/api_provisioned_parameter_data_document.go index fa9af4d..8166847 100644 --- a/datarepository/api_provisioned_parameter_data_document.go +++ b/datarepository/api_provisioned_parameter_data_document.go @@ -19,7 +19,7 @@ import ( "github.com/gin-gonic/gin" - "github.com/omec-project/http_wrapper" + "github.com/omec-project/util/httpwrapper" "github.com/omec-project/openapi" "github.com/omec-project/openapi/models" "github.com/omec-project/udr/logger" @@ -56,7 +56,7 @@ func HTTPModifyPpData(c *gin.Context) { return } - req := http_wrapper.NewRequest(c.Request, patchItemArray) + req := httpwrapper.NewRequest(c.Request, patchItemArray) req.Params["ueId"] = c.Params.ByName("ueId") rsp := producer.HandleModifyPpData(req) diff --git a/datarepository/api_query_amf_subscription_info_document.go b/datarepository/api_query_amf_subscription_info_document.go index e85403d..eb43643 100644 --- a/datarepository/api_query_amf_subscription_info_document.go +++ b/datarepository/api_query_amf_subscription_info_document.go @@ -19,7 +19,7 @@ import ( "github.com/gin-gonic/gin" - "github.com/omec-project/http_wrapper" + "github.com/omec-project/util/httpwrapper" "github.com/omec-project/openapi" "github.com/omec-project/openapi/models" "github.com/omec-project/udr/logger" @@ -28,7 +28,7 @@ import ( // HTTPGetAmfSubscriptionInfo - Retrieve AMF subscription Info func HTTPGetAmfSubscriptionInfo(c *gin.Context) { - req := http_wrapper.NewRequest(c.Request, nil) + req := httpwrapper.NewRequest(c.Request, nil) req.Params["ueId"] = c.Params.ByName("ueId") req.Params["subsId"] = c.Params.ByName("subsId") @@ -47,7 +47,7 @@ func HTTPGetAmfSubscriptionInfo(c *gin.Context) { c.Data(rsp.Status, "application/json", responseBody) } - // req := http_wrapper.NewRequest(c.Request, nil) + // req := httpwrapper.NewRequest(c.Request, nil) // req.Params["ueId"] = c.Params.ByName("ueId") // req.Params["subsId"] = c.Params.ByName("subsId") diff --git a/datarepository/api_query_identity_data_by_supi_or_gpsi_document.go b/datarepository/api_query_identity_data_by_supi_or_gpsi_document.go index 3669e2f..9093ae8 100644 --- a/datarepository/api_query_identity_data_by_supi_or_gpsi_document.go +++ b/datarepository/api_query_identity_data_by_supi_or_gpsi_document.go @@ -19,7 +19,7 @@ import ( "github.com/gin-gonic/gin" - "github.com/omec-project/http_wrapper" + "github.com/omec-project/util/httpwrapper" "github.com/omec-project/openapi" "github.com/omec-project/openapi/models" "github.com/omec-project/udr/logger" @@ -28,7 +28,7 @@ import ( // HTTPGetIdentityData - Retrieve identity data by SUPI or GPSI func HTTPGetIdentityData(c *gin.Context) { - req := http_wrapper.NewRequest(c.Request, nil) + req := httpwrapper.NewRequest(c.Request, nil) req.Params["ueId"] = c.Params.ByName("ueId") rsp := producer.HandleGetIdentityData(req) diff --git a/datarepository/api_query_odb_data_by_supi_or_gpsi_document.go b/datarepository/api_query_odb_data_by_supi_or_gpsi_document.go index 04c66a7..a0fc536 100644 --- a/datarepository/api_query_odb_data_by_supi_or_gpsi_document.go +++ b/datarepository/api_query_odb_data_by_supi_or_gpsi_document.go @@ -19,7 +19,7 @@ import ( "github.com/gin-gonic/gin" - "github.com/omec-project/http_wrapper" + "github.com/omec-project/util/httpwrapper" "github.com/omec-project/openapi" "github.com/omec-project/openapi/models" "github.com/omec-project/udr/logger" @@ -28,7 +28,7 @@ import ( // HTTPGetOdbData - Retrieve ODB Data data by SUPI or GPSI func HTTPGetOdbData(c *gin.Context) { - req := http_wrapper.NewRequest(c.Request, nil) + req := httpwrapper.NewRequest(c.Request, nil) req.Params["ueId"] = c.Params.ByName("ueId") rsp := producer.HandleGetOdbData(req) diff --git a/datarepository/api_retrieval_of_shared_data.go b/datarepository/api_retrieval_of_shared_data.go index 1f16515..94d9646 100644 --- a/datarepository/api_retrieval_of_shared_data.go +++ b/datarepository/api_retrieval_of_shared_data.go @@ -19,7 +19,7 @@ import ( "github.com/gin-gonic/gin" - "github.com/omec-project/http_wrapper" + "github.com/omec-project/util/httpwrapper" "github.com/omec-project/openapi" "github.com/omec-project/openapi/models" "github.com/omec-project/udr/logger" @@ -29,7 +29,7 @@ import ( // HTTPGetSharedData - retrieve shared data func HTTPGetSharedData(c *gin.Context) { sharedDataIdArray := c.QueryArray("shared-data-ids") - req := http_wrapper.NewRequest(c.Request, nil) + req := httpwrapper.NewRequest(c.Request, nil) req.Query["sharedDataIds"] = sharedDataIdArray rsp := producer.HandleGetSharedData(req) diff --git a/datarepository/api_sdm_subscription_document.go b/datarepository/api_sdm_subscription_document.go index 1ba403f..65dfdad 100644 --- a/datarepository/api_sdm_subscription_document.go +++ b/datarepository/api_sdm_subscription_document.go @@ -19,7 +19,7 @@ import ( "github.com/gin-gonic/gin" - "github.com/omec-project/http_wrapper" + "github.com/omec-project/util/httpwrapper" "github.com/omec-project/openapi" "github.com/omec-project/openapi/models" "github.com/omec-project/udr/logger" @@ -28,7 +28,7 @@ import ( // HTTPRemovesdmSubscriptions - Deletes a sdmsubscriptions func HTTPRemovesdmSubscriptions(c *gin.Context) { - req := http_wrapper.NewRequest(c.Request, nil) + req := httpwrapper.NewRequest(c.Request, nil) req.Params["ueId"] = c.Params.ByName("ueId") req.Params["subsId"] = c.Params.ByName("subsId") @@ -78,7 +78,7 @@ func HTTPUpdatesdmsubscriptions(c *gin.Context) { return } - req := http_wrapper.NewRequest(c.Request, sdmSubscription) + req := httpwrapper.NewRequest(c.Request, sdmSubscription) req.Params["ueId"] = c.Params.ByName("ueId") req.Params["subsId"] = c.Params.ByName("subsId") diff --git a/datarepository/api_sdm_subscriptions_collection.go b/datarepository/api_sdm_subscriptions_collection.go index dd190e9..7d93a07 100644 --- a/datarepository/api_sdm_subscriptions_collection.go +++ b/datarepository/api_sdm_subscriptions_collection.go @@ -19,7 +19,7 @@ import ( "github.com/gin-gonic/gin" - "github.com/omec-project/http_wrapper" + "github.com/omec-project/util/httpwrapper" "github.com/omec-project/openapi" "github.com/omec-project/openapi/models" "github.com/omec-project/udr/logger" @@ -56,7 +56,7 @@ func HTTPCreateSdmSubscriptions(c *gin.Context) { return } - req := http_wrapper.NewRequest(c.Request, sdmSubscription) + req := httpwrapper.NewRequest(c.Request, sdmSubscription) req.Params["ueId"] = c.Params.ByName("ueId") rsp := producer.HandleCreateSdmSubscriptions(req) @@ -80,7 +80,7 @@ func HTTPCreateSdmSubscriptions(c *gin.Context) { // HTTPQuerysdmsubscriptions - Retrieves the sdm subscriptions of a UE func HTTPQuerysdmsubscriptions(c *gin.Context) { - req := http_wrapper.NewRequest(c.Request, nil) + req := httpwrapper.NewRequest(c.Request, nil) req.Params["ueId"] = c.Params.ByName("ueId") rsp := producer.HandleQuerysdmsubscriptions(req) diff --git a/datarepository/api_session_management_subscription_data.go b/datarepository/api_session_management_subscription_data.go index 951ac60..fa1d9db 100644 --- a/datarepository/api_session_management_subscription_data.go +++ b/datarepository/api_session_management_subscription_data.go @@ -19,7 +19,7 @@ import ( "github.com/gin-gonic/gin" - "github.com/omec-project/http_wrapper" + "github.com/omec-project/util/httpwrapper" "github.com/omec-project/openapi" "github.com/omec-project/openapi/models" "github.com/omec-project/udr/logger" @@ -28,7 +28,7 @@ import ( // HTTPQuerySmData - Retrieves the Session Management subscription data of a UE func HTTPQuerySmData(c *gin.Context) { - req := http_wrapper.NewRequest(c.Request, nil) + req := httpwrapper.NewRequest(c.Request, nil) req.Params["ueId"] = c.Params.ByName("ueId") req.Params["servingPlmnId"] = c.Params.ByName("servingPlmnId") diff --git a/datarepository/api_smf_registration_document.go b/datarepository/api_smf_registration_document.go index 3423d5d..73924eb 100644 --- a/datarepository/api_smf_registration_document.go +++ b/datarepository/api_smf_registration_document.go @@ -19,7 +19,7 @@ import ( "github.com/gin-gonic/gin" - "github.com/omec-project/http_wrapper" + "github.com/omec-project/util/httpwrapper" "github.com/omec-project/openapi" "github.com/omec-project/openapi/models" "github.com/omec-project/udr/logger" @@ -56,7 +56,7 @@ func HTTPCreateSmfContextNon3gpp(c *gin.Context) { return } - req := http_wrapper.NewRequest(c.Request, smfRegistration) + req := httpwrapper.NewRequest(c.Request, smfRegistration) req.Params["ueId"] = c.Params.ByName("ueId") rsp := producer.HandleCreateSmfContextNon3gpp(req) @@ -77,7 +77,7 @@ func HTTPCreateSmfContextNon3gpp(c *gin.Context) { // HTTPDeleteSmfContext - To remove an individual SMF context data of a UE the UDR func HTTPDeleteSmfContext(c *gin.Context) { - req := http_wrapper.NewRequest(c.Request, nil) + req := httpwrapper.NewRequest(c.Request, nil) req.Params["ueId"] = c.Params.ByName("ueId") req.Params["pduSessionId"] = c.Params.ByName("pduSessionId") @@ -99,7 +99,7 @@ func HTTPDeleteSmfContext(c *gin.Context) { // HTTPQuerySmfRegistration - Retrieves the individual SMF registration of a UE func HTTPQuerySmfRegistration(c *gin.Context) { - req := http_wrapper.NewRequest(c.Request, nil) + req := httpwrapper.NewRequest(c.Request, nil) req.Params["ueId"] = c.Params.ByName("ueId") req.Params["pduSessionId"] = c.Params.ByName("pduSessionId") diff --git a/datarepository/api_smf_registrations_collection.go b/datarepository/api_smf_registrations_collection.go index 7aac6af..686fccb 100644 --- a/datarepository/api_smf_registrations_collection.go +++ b/datarepository/api_smf_registrations_collection.go @@ -19,7 +19,7 @@ import ( "github.com/gin-gonic/gin" - "github.com/omec-project/http_wrapper" + "github.com/omec-project/util/httpwrapper" "github.com/omec-project/openapi" "github.com/omec-project/openapi/models" "github.com/omec-project/udr/logger" @@ -28,7 +28,7 @@ import ( // HTTPQuerySmfRegList - Retrieves the SMF registration list of a UE func HTTPQuerySmfRegList(c *gin.Context) { - req := http_wrapper.NewRequest(c.Request, nil) + req := httpwrapper.NewRequest(c.Request, nil) req.Params["ueId"] = c.Params.ByName("ueId") rsp := producer.HandleQuerySmfRegList(req) diff --git a/datarepository/api_smf_selection_subscription_data_document.go b/datarepository/api_smf_selection_subscription_data_document.go index 1fccf07..a77dbe8 100644 --- a/datarepository/api_smf_selection_subscription_data_document.go +++ b/datarepository/api_smf_selection_subscription_data_document.go @@ -19,7 +19,7 @@ import ( "github.com/gin-gonic/gin" - "github.com/omec-project/http_wrapper" + "github.com/omec-project/util/httpwrapper" "github.com/omec-project/openapi" "github.com/omec-project/openapi/models" "github.com/omec-project/udr/logger" @@ -28,7 +28,7 @@ import ( // HTTPQuerySmfSelectData - Retrieves the SMF selection subscription data of a UE func HTTPQuerySmfSelectData(c *gin.Context) { - req := http_wrapper.NewRequest(c.Request, nil) + req := httpwrapper.NewRequest(c.Request, nil) req.Params["ueId"] = c.Params.ByName("ueId") req.Params["servingPlmnId"] = c.Params.ByName("servingPlmnId") diff --git a/datarepository/api_sms_management_subscription_data_document.go b/datarepository/api_sms_management_subscription_data_document.go index 241396e..10631ce 100644 --- a/datarepository/api_sms_management_subscription_data_document.go +++ b/datarepository/api_sms_management_subscription_data_document.go @@ -19,7 +19,7 @@ import ( "github.com/gin-gonic/gin" - "github.com/omec-project/http_wrapper" + "github.com/omec-project/util/httpwrapper" "github.com/omec-project/openapi" "github.com/omec-project/openapi/models" "github.com/omec-project/udr/logger" @@ -28,7 +28,7 @@ import ( // HTTPQuerySmsMngData - Retrieves the SMS management subscription data of a UE func HTTPQuerySmsMngData(c *gin.Context) { - req := http_wrapper.NewRequest(c.Request, nil) + req := httpwrapper.NewRequest(c.Request, nil) req.Params["ueId"] = c.Params.ByName("ueId") req.Params["servingPlmnId"] = c.Params.ByName("servingPlmnId") diff --git a/datarepository/api_sms_subscription_data_document.go b/datarepository/api_sms_subscription_data_document.go index 4edfadb..cac094d 100644 --- a/datarepository/api_sms_subscription_data_document.go +++ b/datarepository/api_sms_subscription_data_document.go @@ -19,7 +19,7 @@ import ( "github.com/gin-gonic/gin" - "github.com/omec-project/http_wrapper" + "github.com/omec-project/util/httpwrapper" "github.com/omec-project/openapi" "github.com/omec-project/openapi/models" "github.com/omec-project/udr/logger" @@ -28,7 +28,7 @@ import ( // HTTPQuerySmsData - Retrieves the SMS subscription data of a UE func HTTPQuerySmsData(c *gin.Context) { - req := http_wrapper.NewRequest(c.Request, nil) + req := httpwrapper.NewRequest(c.Request, nil) req.Params["ueId"] = c.Params.ByName("ueId") req.Params["servingPlmnId"] = c.Params.ByName("servingPlmnId") diff --git a/datarepository/api_smsf3_gpp_registration_document.go b/datarepository/api_smsf3_gpp_registration_document.go index 7dbb137..447a7fd 100644 --- a/datarepository/api_smsf3_gpp_registration_document.go +++ b/datarepository/api_smsf3_gpp_registration_document.go @@ -19,7 +19,7 @@ import ( "github.com/gin-gonic/gin" - "github.com/omec-project/http_wrapper" + "github.com/omec-project/util/httpwrapper" "github.com/omec-project/openapi" "github.com/omec-project/openapi/models" "github.com/omec-project/udr/logger" @@ -56,7 +56,7 @@ func HTTPCreateSmsfContext3gpp(c *gin.Context) { return } - req := http_wrapper.NewRequest(c.Request, smsfRegistration) + req := httpwrapper.NewRequest(c.Request, smsfRegistration) req.Params["ueId"] = c.Params.ByName("ueId") rsp := producer.HandleCreateSmsfContext3gpp(req) @@ -77,7 +77,7 @@ func HTTPCreateSmsfContext3gpp(c *gin.Context) { // HTTPDeleteSmsfContext3gpp - To remove the SMSF context data of a UE via 3GPP access func HTTPDeleteSmsfContext3gpp(c *gin.Context) { - req := http_wrapper.NewRequest(c.Request, nil) + req := httpwrapper.NewRequest(c.Request, nil) req.Params["ueId"] = c.Params.ByName("ueId") rsp := producer.HandleDeleteSmsfContext3gpp(req) @@ -98,7 +98,7 @@ func HTTPDeleteSmsfContext3gpp(c *gin.Context) { // HTTPQuerySmsfContext3gpp - Retrieves the SMSF context data of a UE using 3gpp access func HTTPQuerySmsfContext3gpp(c *gin.Context) { - req := http_wrapper.NewRequest(c.Request, nil) + req := httpwrapper.NewRequest(c.Request, nil) req.Params["ueId"] = c.Params.ByName("ueId") rsp := producer.HandleQuerySmsfContext3gpp(req) diff --git a/datarepository/api_smsf_non3_gpp_registration_document.go b/datarepository/api_smsf_non3_gpp_registration_document.go index 791fa3d..237106e 100644 --- a/datarepository/api_smsf_non3_gpp_registration_document.go +++ b/datarepository/api_smsf_non3_gpp_registration_document.go @@ -19,7 +19,7 @@ import ( "github.com/gin-gonic/gin" - "github.com/omec-project/http_wrapper" + "github.com/omec-project/util/httpwrapper" "github.com/omec-project/openapi" "github.com/omec-project/openapi/models" "github.com/omec-project/udr/logger" @@ -56,7 +56,7 @@ func HTTPCreateSmsfContextNon3gpp(c *gin.Context) { return } - req := http_wrapper.NewRequest(c.Request, smsfRegistration) + req := httpwrapper.NewRequest(c.Request, smsfRegistration) req.Params["ueId"] = c.Params.ByName("ueId") rsp := producer.HandleCreateSmsfContextNon3gpp(req) @@ -77,7 +77,7 @@ func HTTPCreateSmsfContextNon3gpp(c *gin.Context) { // HTTPDeleteSmsfContextNon3gpp - To remove the SMSF context data of a UE via non-3GPP access func HTTPDeleteSmsfContextNon3gpp(c *gin.Context) { - req := http_wrapper.NewRequest(c.Request, nil) + req := httpwrapper.NewRequest(c.Request, nil) req.Params["ueId"] = c.Params.ByName("ueId") rsp := producer.HandleDeleteSmsfContextNon3gpp(req) @@ -98,7 +98,7 @@ func HTTPDeleteSmsfContextNon3gpp(c *gin.Context) { // HTTPQuerySmsfContextNon3gpp - Retrieves the SMSF context data of a UE using non-3gpp access func HTTPQuerySmsfContextNon3gpp(c *gin.Context) { - req := http_wrapper.NewRequest(c.Request, nil) + req := httpwrapper.NewRequest(c.Request, nil) req.Params["ueId"] = c.Params.ByName("ueId") rsp := producer.HandleQuerySmsfContextNon3gpp(req) diff --git a/datarepository/api_subs_to_nofify_collection.go b/datarepository/api_subs_to_nofify_collection.go index 40ac92f..060beba 100644 --- a/datarepository/api_subs_to_nofify_collection.go +++ b/datarepository/api_subs_to_nofify_collection.go @@ -19,7 +19,7 @@ import ( "github.com/gin-gonic/gin" - "github.com/omec-project/http_wrapper" + "github.com/omec-project/util/httpwrapper" "github.com/omec-project/openapi" "github.com/omec-project/openapi/models" "github.com/omec-project/udr/logger" @@ -56,7 +56,7 @@ func HTTPPostSubscriptionDataSubscriptions(c *gin.Context) { return } - req := http_wrapper.NewRequest(c.Request, subscriptionDataSubscriptions) + req := httpwrapper.NewRequest(c.Request, subscriptionDataSubscriptions) req.Params["ueId"] = c.Params.ByName("ueId") rsp := producer.HandlePostSubscriptionDataSubscriptions(req) diff --git a/datarepository/api_subs_to_notify_document.go b/datarepository/api_subs_to_notify_document.go index fb5c6ba..99db3e0 100644 --- a/datarepository/api_subs_to_notify_document.go +++ b/datarepository/api_subs_to_notify_document.go @@ -19,7 +19,7 @@ import ( "github.com/gin-gonic/gin" - "github.com/omec-project/http_wrapper" + "github.com/omec-project/util/httpwrapper" "github.com/omec-project/openapi" "github.com/omec-project/openapi/models" "github.com/omec-project/udr/logger" @@ -28,7 +28,7 @@ import ( // HTTPRemovesubscriptionDataSubscriptions - Deletes a subscriptionDataSubscriptions func HTTPRemovesubscriptionDataSubscriptions(c *gin.Context) { - req := http_wrapper.NewRequest(c.Request, nil) + req := httpwrapper.NewRequest(c.Request, nil) req.Params["ueId"] = c.Params.ByName("ueId") rsp := producer.HandleRemovesubscriptionDataSubscriptions(req) diff --git a/datarepository/api_trace_data_document.go b/datarepository/api_trace_data_document.go index 8c08a79..52730c0 100644 --- a/datarepository/api_trace_data_document.go +++ b/datarepository/api_trace_data_document.go @@ -19,7 +19,7 @@ import ( "github.com/gin-gonic/gin" - "github.com/omec-project/http_wrapper" + "github.com/omec-project/util/httpwrapper" "github.com/omec-project/openapi" "github.com/omec-project/openapi/models" "github.com/omec-project/udr/logger" @@ -28,7 +28,7 @@ import ( // HTTPQueryTraceData - Retrieves the trace configuration data of a UE func HTTPQueryTraceData(c *gin.Context) { - req := http_wrapper.NewRequest(c.Request, nil) + req := httpwrapper.NewRequest(c.Request, nil) req.Params["ueId"] = c.Params.ByName("ueId") req.Params["servingPlmnId"] = c.Params.ByName("servingPlmnId") diff --git a/go.mod b/go.mod index e75d52c..6be1b8c 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,6 @@ require ( github.com/mitchellh/mapstructure v1.5.0 github.com/omec-project/config5g v1.2.0 github.com/omec-project/http2_util v1.1.0 - github.com/omec-project/http_wrapper v1.1.0 github.com/omec-project/logger_util v1.1.0 github.com/omec-project/openapi v1.1.0 github.com/omec-project/path_util v1.1.0 diff --git a/go.sum b/go.sum index f1e2ff8..b3a90a0 100644 --- a/go.sum +++ b/go.sum @@ -205,8 +205,6 @@ github.com/omec-project/config5g v1.2.0 h1:fyIg+1LZ9jn8DTkVUbD4jyxA4FgMICdIBwZVn github.com/omec-project/config5g v1.2.0/go.mod h1:AWFzCbbgCBx/iJwt+zWbpDGLHRpFzg24OYHqIkdcMVA= github.com/omec-project/http2_util v1.1.0 h1:8H2NME/V8iONth8TlyK/3w4pguAzaeUnEv9pmeAocwQ= github.com/omec-project/http2_util v1.1.0/go.mod h1:QwoZRaUyhEp/kTEqXvf0gCYtfQrNHBdkVw939vsMjZY= -github.com/omec-project/http_wrapper v1.1.0 h1:2hD8RUaR/VVg3tUUfuxsuo1/JNpZLiAE8IvATGqDME4= -github.com/omec-project/http_wrapper v1.1.0/go.mod h1:mc045fjVVJ0/q0g4QG4nuSC0N1BIqGR/ZoK76XgifVU= github.com/omec-project/logger_conf v1.1.0 h1:C0/HbsSOWV8D3/lm7Iqe1nUL9ltVtVO4MDC9ZxIo/xc= github.com/omec-project/logger_conf v1.1.0/go.mod h1:2+SOX9OFbPZ+UNv8k+tvPnaWHo4CuX5G/x12dz5sWUE= github.com/omec-project/logger_util v1.1.0 h1:R7tT80+ML1HlK4OoTrNv/UK+2H/u2GdIFNBx41g630Q= diff --git a/producer/data_repository.go b/producer/data_repository.go index 5d654c7..449e65b 100644 --- a/producer/data_repository.go +++ b/producer/data_repository.go @@ -17,11 +17,11 @@ import ( "strings" protos "github.com/omec-project/config5g/proto/sdcoreConfig" - "github.com/omec-project/http_wrapper" "github.com/omec-project/openapi/models" udr_context "github.com/omec-project/udr/context" "github.com/omec-project/udr/logger" "github.com/omec-project/udr/util" + "github.com/omec-project/util/httpwrapper" ) const ( @@ -53,8 +53,8 @@ func deleteDataFromDB(collName string, filter bson.M) { } } -func HandleCreateAccessAndMobilityData(request *http_wrapper.Request) *http_wrapper.Response { - return http_wrapper.NewResponse(http.StatusOK, nil, map[string]interface{}{}) +func HandleCreateAccessAndMobilityData(request *httpwrapper.Request) *httpwrapper.Response { + return httpwrapper.NewResponse(http.StatusOK, nil, map[string]interface{}{}) } // seems something which we should move to mongolib @@ -130,15 +130,15 @@ func AddEntrySmPolicyTable(imsi string, dnn string, snssai *protos.NSSAI) error return nil } -func HandleDeleteAccessAndMobilityData(request *http_wrapper.Request) *http_wrapper.Response { - return http_wrapper.NewResponse(http.StatusOK, nil, map[string]interface{}{}) +func HandleDeleteAccessAndMobilityData(request *httpwrapper.Request) *httpwrapper.Response { + return httpwrapper.NewResponse(http.StatusOK, nil, map[string]interface{}{}) } -func HandleQueryAccessAndMobilityData(request *http_wrapper.Request) *http_wrapper.Response { - return http_wrapper.NewResponse(http.StatusOK, nil, map[string]interface{}{}) +func HandleQueryAccessAndMobilityData(request *httpwrapper.Request) *httpwrapper.Response { + return httpwrapper.NewResponse(http.StatusOK, nil, map[string]interface{}{}) } -func HandleQueryAmData(request *http_wrapper.Request) *http_wrapper.Response { +func HandleQueryAmData(request *httpwrapper.Request) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle QueryAmData") collName := "subscriptionData.provisionedData.amData" @@ -147,9 +147,9 @@ func HandleQueryAmData(request *http_wrapper.Request) *http_wrapper.Response { response, problemDetails := QueryAmDataProcedure(collName, ueId, servingPlmnId) if problemDetails == nil { - return http_wrapper.NewResponse(http.StatusOK, nil, response) + return httpwrapper.NewResponse(http.StatusOK, nil, response) } else { - return http_wrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) + return httpwrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) } } @@ -167,7 +167,7 @@ func QueryAmDataProcedure(collName string, ueId string, servingPlmnId string) (* } } -func HandleAmfContext3gpp(request *http_wrapper.Request) *http_wrapper.Response { +func HandleAmfContext3gpp(request *httpwrapper.Request) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle AmfContext3gpp") collName := "subscriptionData.contextData.amf3gppAccess" patchItem := request.Body.([]models.PatchItem) @@ -175,9 +175,9 @@ func HandleAmfContext3gpp(request *http_wrapper.Request) *http_wrapper.Response problemDetails := AmfContext3gppProcedure(collName, ueId, patchItem) if problemDetails == nil { - return http_wrapper.NewResponse(http.StatusNoContent, nil, map[string]interface{}{}) + return httpwrapper.NewResponse(http.StatusNoContent, nil, map[string]interface{}{}) } else { - return http_wrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) + return httpwrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) } } @@ -206,7 +206,7 @@ func AmfContext3gppProcedure(collName string, ueId string, patchItem []models.Pa } } -func HandleCreateAmfContext3gpp(request *http_wrapper.Request) *http_wrapper.Response { +func HandleCreateAmfContext3gpp(request *httpwrapper.Request) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle CreateAmfContext3gpp") Amf3GppAccessRegistration := request.Body.(models.Amf3GppAccessRegistration) @@ -215,7 +215,7 @@ func HandleCreateAmfContext3gpp(request *http_wrapper.Request) *http_wrapper.Res CreateAmfContext3gppProcedure(collName, ueId, Amf3GppAccessRegistration) - return http_wrapper.NewResponse(http.StatusNoContent, nil, map[string]interface{}{}) + return httpwrapper.NewResponse(http.StatusNoContent, nil, map[string]interface{}{}) } func CreateAmfContext3gppProcedure(collName string, ueId string, @@ -230,7 +230,7 @@ func CreateAmfContext3gppProcedure(collName string, ueId string, } } -func HandleQueryAmfContext3gpp(request *http_wrapper.Request) *http_wrapper.Response { +func HandleQueryAmfContext3gpp(request *httpwrapper.Request) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle QueryAmfContext3gpp") ueId := request.Params["ueId"] @@ -239,13 +239,13 @@ func HandleQueryAmfContext3gpp(request *http_wrapper.Request) *http_wrapper.Resp response, problemDetails := QueryAmfContext3gppProcedure(collName, ueId) if response != nil { - return http_wrapper.NewResponse(http.StatusOK, nil, response) + return httpwrapper.NewResponse(http.StatusOK, nil, response) } else if problemDetails != nil { - return http_wrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) + return httpwrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) } pd := util.ProblemDetailsUpspecified("") - return http_wrapper.NewResponse(int(pd.Status), nil, pd) + return httpwrapper.NewResponse(int(pd.Status), nil, pd) } func QueryAmfContext3gppProcedure(collName string, ueId string) (*map[string]interface{}, *models.ProblemDetails) { @@ -262,7 +262,7 @@ func QueryAmfContext3gppProcedure(collName string, ueId string) (*map[string]int } } -func HandleAmfContextNon3gpp(request *http_wrapper.Request) *http_wrapper.Response { +func HandleAmfContextNon3gpp(request *httpwrapper.Request) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle AmfContextNon3gpp") ueId := request.Params["ueId"] @@ -273,9 +273,9 @@ func HandleAmfContextNon3gpp(request *http_wrapper.Request) *http_wrapper.Respon problemDetails := AmfContextNon3gppProcedure(ueId, collName, patchItem, filter) if problemDetails == nil { - return http_wrapper.NewResponse(http.StatusNoContent, nil, map[string]interface{}{}) + return httpwrapper.NewResponse(http.StatusNoContent, nil, map[string]interface{}{}) } else { - return http_wrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) + return httpwrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) } } @@ -303,7 +303,7 @@ func AmfContextNon3gppProcedure(ueId string, collName string, patchItem []models } } -func HandleCreateAmfContextNon3gpp(request *http_wrapper.Request) *http_wrapper.Response { +func HandleCreateAmfContextNon3gpp(request *httpwrapper.Request) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle CreateAmfContextNon3gpp") AmfNon3GppAccessRegistration := request.Body.(models.AmfNon3GppAccessRegistration) @@ -312,7 +312,7 @@ func HandleCreateAmfContextNon3gpp(request *http_wrapper.Request) *http_wrapper. CreateAmfContextNon3gppProcedure(AmfNon3GppAccessRegistration, collName, ueId) - return http_wrapper.NewResponse(http.StatusNoContent, nil, map[string]interface{}{}) + return httpwrapper.NewResponse(http.StatusNoContent, nil, map[string]interface{}{}) } func CreateAmfContextNon3gppProcedure(AmfNon3GppAccessRegistration models.AmfNon3GppAccessRegistration, @@ -327,7 +327,7 @@ func CreateAmfContextNon3gppProcedure(AmfNon3GppAccessRegistration models.AmfNon } } -func HandleQueryAmfContextNon3gpp(request *http_wrapper.Request) *http_wrapper.Response { +func HandleQueryAmfContextNon3gpp(request *httpwrapper.Request) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle QueryAmfContextNon3gpp") collName := "subscriptionData.contextData.amfNon3gppAccess" @@ -336,13 +336,13 @@ func HandleQueryAmfContextNon3gpp(request *http_wrapper.Request) *http_wrapper.R response, problemDetails := QueryAmfContextNon3gppProcedure(collName, ueId) if response != nil { - return http_wrapper.NewResponse(http.StatusOK, nil, response) + return httpwrapper.NewResponse(http.StatusOK, nil, response) } else if problemDetails != nil { - return http_wrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) + return httpwrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) } pd := util.ProblemDetailsUpspecified("") - return http_wrapper.NewResponse(int(pd.Status), nil, pd) + return httpwrapper.NewResponse(int(pd.Status), nil, pd) } func QueryAmfContextNon3gppProcedure(collName string, ueId string) (*map[string]interface{}, *models.ProblemDetails) { @@ -359,7 +359,7 @@ func QueryAmfContextNon3gppProcedure(collName string, ueId string) (*map[string] } } -func HandleModifyAuthentication(request *http_wrapper.Request) *http_wrapper.Response { +func HandleModifyAuthentication(request *httpwrapper.Request) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle ModifyAuthentication") collName := "subscriptionData.authenticationData.authenticationSubscription" @@ -369,9 +369,9 @@ func HandleModifyAuthentication(request *http_wrapper.Request) *http_wrapper.Res problemDetails := ModifyAuthenticationProcedure(collName, ueId, patchItem) if problemDetails == nil { - return http_wrapper.NewResponse(http.StatusNoContent, nil, map[string]interface{}{}) + return httpwrapper.NewResponse(http.StatusNoContent, nil, map[string]interface{}{}) } else { - return http_wrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) + return httpwrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) } } @@ -400,7 +400,7 @@ func ModifyAuthenticationProcedure(collName string, ueId string, patchItem []mod } } -func HandleQueryAuthSubsData(request *http_wrapper.Request) *http_wrapper.Response { +func HandleQueryAuthSubsData(request *httpwrapper.Request) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle QueryAuthSubsData") collName := "subscriptionData.authenticationData.authenticationSubscription" @@ -409,13 +409,13 @@ func HandleQueryAuthSubsData(request *http_wrapper.Request) *http_wrapper.Respon response, problemDetails := QueryAuthSubsDataProcedure(collName, ueId) if response != nil { - return http_wrapper.NewResponse(http.StatusOK, nil, response) + return httpwrapper.NewResponse(http.StatusOK, nil, response) } else if problemDetails != nil { - return http_wrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) + return httpwrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) } pd := util.ProblemDetailsUpspecified("") - return http_wrapper.NewResponse(int(pd.Status), nil, pd) + return httpwrapper.NewResponse(int(pd.Status), nil, pd) } func QueryAuthSubsDataProcedure(collName string, ueId string) (map[string]interface{}, *models.ProblemDetails) { @@ -433,7 +433,7 @@ func QueryAuthSubsDataProcedure(collName string, ueId string) (map[string]interf } } -func HandleCreateAuthenticationSoR(request *http_wrapper.Request) *http_wrapper.Response { +func HandleCreateAuthenticationSoR(request *httpwrapper.Request) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle CreateAuthenticationSoR") putData := util.ToBsonM(request.Body) ueId := request.Params["ueId"] @@ -441,7 +441,7 @@ func HandleCreateAuthenticationSoR(request *http_wrapper.Request) *http_wrapper. CreateAuthenticationSoRProcedure(collName, ueId, putData) - return http_wrapper.NewResponse(http.StatusNoContent, nil, map[string]interface{}{}) + return httpwrapper.NewResponse(http.StatusNoContent, nil, map[string]interface{}{}) } func CreateAuthenticationSoRProcedure(collName string, ueId string, putData bson.M) { @@ -454,7 +454,7 @@ func CreateAuthenticationSoRProcedure(collName string, ueId string, putData bson } } -func HandleQueryAuthSoR(request *http_wrapper.Request) *http_wrapper.Response { +func HandleQueryAuthSoR(request *httpwrapper.Request) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle QueryAuthSoR") ueId := request.Params["ueId"] @@ -463,13 +463,13 @@ func HandleQueryAuthSoR(request *http_wrapper.Request) *http_wrapper.Response { response, problemDetails := QueryAuthSoRProcedure(collName, ueId) if response != nil { - return http_wrapper.NewResponse(http.StatusOK, nil, response) + return httpwrapper.NewResponse(http.StatusOK, nil, response) } else if problemDetails != nil { - return http_wrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) + return httpwrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) } pd := util.ProblemDetailsUpspecified("") - return http_wrapper.NewResponse(int(pd.Status), nil, pd) + return httpwrapper.NewResponse(int(pd.Status), nil, pd) } func QueryAuthSoRProcedure(collName string, ueId string) (map[string]interface{}, *models.ProblemDetails) { @@ -487,7 +487,7 @@ func QueryAuthSoRProcedure(collName string, ueId string) (map[string]interface{} } } -func HandleCreateAuthenticationStatus(request *http_wrapper.Request) *http_wrapper.Response { +func HandleCreateAuthenticationStatus(request *httpwrapper.Request) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle CreateAuthenticationStatus") putData := util.ToBsonM(request.Body) @@ -496,7 +496,7 @@ func HandleCreateAuthenticationStatus(request *http_wrapper.Request) *http_wrapp CreateAuthenticationStatusProcedure(collName, ueId, putData) - return http_wrapper.NewResponse(http.StatusNoContent, nil, map[string]interface{}{}) + return httpwrapper.NewResponse(http.StatusNoContent, nil, map[string]interface{}{}) } func CreateAuthenticationStatusProcedure(collName string, ueId string, putData bson.M) { @@ -509,7 +509,7 @@ func CreateAuthenticationStatusProcedure(collName string, ueId string, putData b } } -func HandleQueryAuthenticationStatus(request *http_wrapper.Request) *http_wrapper.Response { +func HandleQueryAuthenticationStatus(request *httpwrapper.Request) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle QueryAuthenticationStatus") ueId := request.Params["ueId"] @@ -518,13 +518,13 @@ func HandleQueryAuthenticationStatus(request *http_wrapper.Request) *http_wrappe response, problemDetails := QueryAuthenticationStatusProcedure(collName, ueId) if response != nil { - return http_wrapper.NewResponse(http.StatusOK, nil, response) + return httpwrapper.NewResponse(http.StatusOK, nil, response) } else if problemDetails != nil { - return http_wrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) + return httpwrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) } pd := util.ProblemDetailsUpspecified("") - return http_wrapper.NewResponse(int(pd.Status), nil, pd) + return httpwrapper.NewResponse(int(pd.Status), nil, pd) } func QueryAuthenticationStatusProcedure(collName string, ueId string) (*map[string]interface{}, @@ -543,7 +543,7 @@ func QueryAuthenticationStatusProcedure(collName string, ueId string) (*map[stri } } -func HandleApplicationDataInfluenceDataGet(queryParams map[string][]string) *http_wrapper.Response { +func HandleApplicationDataInfluenceDataGet(queryParams map[string][]string) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle ApplicationDataInfluenceDataGet: queryParams=%#v", queryParams) influIDs := queryParams["influence-Ids"] @@ -553,12 +553,12 @@ func HandleApplicationDataInfluenceDataGet(queryParams map[string][]string) *htt supis := queryParams["supis"] if len(influIDs) == 0 && len(dnns) == 0 && len(snssais) == 0 && len(intGroupIDs) == 0 && len(supis) == 0 { pd := util.ProblemDetailsMalformedReqSyntax("No query parameters") - return http_wrapper.NewResponse(int(pd.Status), nil, pd) + return httpwrapper.NewResponse(int(pd.Status), nil, pd) } response := getApplicationDataInfluenceDatafromDB(influIDs, dnns, snssais, intGroupIDs, supis) - return http_wrapper.NewResponse(http.StatusOK, nil, response) + return httpwrapper.NewResponse(http.StatusOK, nil, response) } func getApplicationDataInfluenceDatafromDB(influIDs, dnns, snssais, @@ -630,12 +630,12 @@ func filterDataBySnssai(snssaiValues []string, return matchedDatas } -func HandleApplicationDataInfluenceDataInfluenceIdDelete(influId string) *http_wrapper.Response { +func HandleApplicationDataInfluenceDataInfluenceIdDelete(influId string) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle ApplicationDataInfluenceDataInfluenceIdDelete: influId=%q", influId) deleteApplicationDataIndividualInfluenceDataFromDB(influId) - return http_wrapper.NewResponse(http.StatusNoContent, nil, map[string]interface{}{}) + return httpwrapper.NewResponse(http.StatusNoContent, nil, map[string]interface{}{}) } func deleteApplicationDataIndividualInfluenceDataFromDB(influId string) { @@ -644,12 +644,12 @@ func deleteApplicationDataIndividualInfluenceDataFromDB(influId string) { } func HandleApplicationDataInfluenceDataInfluenceIdPatch(influID string, - trInfluDataPatch *models.TrafficInfluDataPatch) *http_wrapper.Response { + trInfluDataPatch *models.TrafficInfluDataPatch) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle ApplicationDataInfluenceDataInfluenceIdPatch: influID=%q", influID) response, status := patchApplicationDataIndividualInfluenceDataToDB(influID, trInfluDataPatch) - return http_wrapper.NewResponse(status, nil, response) + return httpwrapper.NewResponse(status, nil, response) } func patchApplicationDataIndividualInfluenceDataToDB(influID string, @@ -695,12 +695,12 @@ func patchApplicationDataIndividualInfluenceDataToDB(influID string, } func HandleApplicationDataInfluenceDataInfluenceIdPut(influID string, - trInfluData *models.TrafficInfluData) *http_wrapper.Response { + trInfluData *models.TrafficInfluData) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle ApplicationDataInfluenceDataInfluenceIdPut: influID=%q", influID) response, status := putApplicationDataIndividualInfluenceDataToDB(influID, trInfluData) - return http_wrapper.NewResponse(status, nil, response) + return httpwrapper.NewResponse(status, nil, response) } func putApplicationDataIndividualInfluenceDataToDB(influID string, @@ -723,7 +723,7 @@ func putApplicationDataIndividualInfluenceDataToDB(influID string, return data, http.StatusCreated } -func HandleApplicationDataInfluenceDataSubsToNotifyGet(queryParams map[string][]string) *http_wrapper.Response { +func HandleApplicationDataInfluenceDataSubsToNotifyGet(queryParams map[string][]string) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle ApplicationDataInfluenceDataSubsToNotifyGet: queryParams=%#v", queryParams) dnn := queryParams["dnn"] @@ -732,28 +732,28 @@ func HandleApplicationDataInfluenceDataSubsToNotifyGet(queryParams map[string][] supi := queryParams["supi"] if len(dnn) == 0 && len(snssai) == 0 && len(intGroupID) == 0 && len(supi) == 0 { pd := util.ProblemDetailsMalformedReqSyntax("No query parameters") - return http_wrapper.NewResponse(int(pd.Status), nil, pd) + return httpwrapper.NewResponse(int(pd.Status), nil, pd) } if len(dnn) > 1 { pd := util.ProblemDetailsMalformedReqSyntax("Too many dnn query parameters") - return http_wrapper.NewResponse(int(pd.Status), nil, pd) + return httpwrapper.NewResponse(int(pd.Status), nil, pd) } if len(snssai) > 1 { pd := util.ProblemDetailsMalformedReqSyntax("Too many snssai query parameters") - return http_wrapper.NewResponse(int(pd.Status), nil, pd) + return httpwrapper.NewResponse(int(pd.Status), nil, pd) } if len(intGroupID) > 1 { pd := util.ProblemDetailsMalformedReqSyntax("Too many internal-Group-Id query parameters") - return http_wrapper.NewResponse(int(pd.Status), nil, pd) + return httpwrapper.NewResponse(int(pd.Status), nil, pd) } if len(supi) > 1 { pd := util.ProblemDetailsMalformedReqSyntax("Too many supi query parameters") - return http_wrapper.NewResponse(int(pd.Status), nil, pd) + return httpwrapper.NewResponse(int(pd.Status), nil, pd) } response := getApplicationDataInfluenceDataSubsToNotifyfromDB(dnn, snssai, intGroupID, supi) - return http_wrapper.NewResponse(http.StatusOK, nil, response) + return httpwrapper.NewResponse(http.StatusOK, nil, response) } func getApplicationDataInfluenceDataSubsToNotifyfromDB(dnn, snssai, intGroupID, @@ -810,7 +810,7 @@ func filterDataBySnssais(snssaiValue string, return matchedDatas } -func HandleApplicationDataInfluenceDataSubsToNotifyPost(trInfluSub *models.TrafficInfluSub) *http_wrapper.Response { +func HandleApplicationDataInfluenceDataSubsToNotifyPost(trInfluSub *models.TrafficInfluSub) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle ApplicationDataInfluenceDataSubsToNotifyPost") udrSelf := udr_context.UDR_Self() @@ -824,7 +824,7 @@ func HandleApplicationDataInfluenceDataSubsToNotifyPost(trInfluSub *models.Traff logger.DataRepoLog.Infof("locationHeader:%q", locationHeader) headers := http.Header{} headers.Set("Location", locationHeader) - return http_wrapper.NewResponse(status, headers, response) + return httpwrapper.NewResponse(status, headers, response) } func postApplicationDataInfluenceDataSubsToNotifyToDB(subscID string, @@ -843,13 +843,13 @@ func postApplicationDataInfluenceDataSubsToNotifyToDB(subscID string, return data, http.StatusCreated } -func HandleApplicationDataInfluenceDataSubsToNotifySubscriptionIdDelete(subscID string) *http_wrapper.Response { +func HandleApplicationDataInfluenceDataSubsToNotifySubscriptionIdDelete(subscID string) *httpwrapper.Response { logger.DataRepoLog.Infof( "Handle ApplicationDataInfluenceDataSubsToNotifySubscriptionIdDelete: subscID=%q", subscID) deleteApplicationDataIndividualInfluenceDataSubsToNotifyFromDB(subscID) - return http_wrapper.NewResponse(http.StatusNoContent, nil, map[string]interface{}{}) + return httpwrapper.NewResponse(http.StatusNoContent, nil, map[string]interface{}{}) } func deleteApplicationDataIndividualInfluenceDataSubsToNotifyFromDB(subscID string) { @@ -857,15 +857,15 @@ func deleteApplicationDataIndividualInfluenceDataSubsToNotifyFromDB(subscID stri deleteDataFromDB(APPDATA_INFLUDATA_SUBSC_DB_COLLECTION_NAME, filter) } -func HandleApplicationDataInfluenceDataSubsToNotifySubscriptionIdGet(subscID string) *http_wrapper.Response { +func HandleApplicationDataInfluenceDataSubsToNotifySubscriptionIdGet(subscID string) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle ApplicationDataInfluenceDataSubsToNotifySubscriptionIdGet: subscID=%q", subscID) response, problemDetails := getApplicationDataIndividualInfluenceDataSubsToNotifyFromDB(subscID) if problemDetails != nil { - return http_wrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) + return httpwrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) } - return http_wrapper.NewResponse(http.StatusOK, nil, response) + return httpwrapper.NewResponse(http.StatusOK, nil, response) } func getApplicationDataIndividualInfluenceDataSubsToNotifyFromDB( @@ -880,13 +880,13 @@ func getApplicationDataIndividualInfluenceDataSubsToNotifyFromDB( } func HandleApplicationDataInfluenceDataSubsToNotifySubscriptionIdPut( - subscID string, trInfluSub *models.TrafficInfluSub) *http_wrapper.Response { + subscID string, trInfluSub *models.TrafficInfluSub) *httpwrapper.Response { logger.DataRepoLog.Infof( "Handle HandleApplicationDataInfluenceDataSubsToNotifySubscriptionIdPut: subscID=%q", subscID) response, status := putApplicationDataIndividualInfluenceDataSubsToNotifyToDB(subscID, trInfluSub) - return http_wrapper.NewResponse(status, nil, response) + return httpwrapper.NewResponse(status, nil, response) } func putApplicationDataIndividualInfluenceDataSubsToNotifyToDB(subscID string, @@ -913,12 +913,12 @@ func putApplicationDataIndividualInfluenceDataSubsToNotifyToDB(subscID string, return newData, http.StatusOK } -func HandleApplicationDataPfdsAppIdDelete(appID string) *http_wrapper.Response { +func HandleApplicationDataPfdsAppIdDelete(appID string) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle ApplicationDataPfdsAppIdDelete: appID=%q", appID) deleteApplicationDataIndividualPfdFromDB(appID) - return http_wrapper.NewResponse(http.StatusNoContent, nil, map[string]interface{}{}) + return httpwrapper.NewResponse(http.StatusNoContent, nil, map[string]interface{}{}) } func deleteApplicationDataIndividualPfdFromDB(appID string) { @@ -926,15 +926,15 @@ func deleteApplicationDataIndividualPfdFromDB(appID string) { deleteDataFromDB(APPDATA_PFD_DB_COLLECTION_NAME, filter) } -func HandleApplicationDataPfdsAppIdGet(appID string) *http_wrapper.Response { +func HandleApplicationDataPfdsAppIdGet(appID string) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle ApplicationDataPfdsAppIdGet: appID=%q", appID) response, problemDetails := getApplicationDataIndividualPfdFromDB(appID) if problemDetails != nil { - return http_wrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) + return httpwrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) } - return http_wrapper.NewResponse(http.StatusOK, nil, response) + return httpwrapper.NewResponse(http.StatusOK, nil, response) } func getApplicationDataIndividualPfdFromDB(appID string) (map[string]interface{}, *models.ProblemDetails) { @@ -942,12 +942,12 @@ func getApplicationDataIndividualPfdFromDB(appID string) (map[string]interface{} return getDataFromDB(APPDATA_PFD_DB_COLLECTION_NAME, filter) } -func HandleApplicationDataPfdsAppIdPut(appID string, pfdDataForApp *models.PfdDataForApp) *http_wrapper.Response { +func HandleApplicationDataPfdsAppIdPut(appID string, pfdDataForApp *models.PfdDataForApp) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle ApplicationDataPfdsAppIdPut: appID=%q", appID) response, status := putApplicationDataIndividualPfdToDB(appID, pfdDataForApp) - return http_wrapper.NewResponse(status, nil, response) + return httpwrapper.NewResponse(status, nil, response) } func putApplicationDataIndividualPfdToDB(appID string, pfdDataForApp *models.PfdDataForApp) (bson.M, int) { @@ -965,14 +965,14 @@ func putApplicationDataIndividualPfdToDB(appID string, pfdDataForApp *models.Pfd return data, http.StatusCreated } -func HandleApplicationDataPfdsGet(pfdsAppIDs []string) *http_wrapper.Response { +func HandleApplicationDataPfdsGet(pfdsAppIDs []string) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle ApplicationDataPfdsGet: pfdsAppIDs=%#v", pfdsAppIDs) // TODO: Parse appID with separator ',' // Ex: "app1,app2,..." response := getApplicationDataPfdsFromDB(pfdsAppIDs) - return http_wrapper.NewResponse(http.StatusOK, nil, response) + return httpwrapper.NewResponse(http.StatusOK, nil, response) } func getApplicationDataPfdsFromDB(pfdsAppIDs []string) (response []map[string]interface{}) { @@ -1005,26 +1005,26 @@ func getApplicationDataPfdsFromDB(pfdsAppIDs []string) (response []map[string]in return matchedPfds } -func HandleExposureDataSubsToNotifyPost(request *http_wrapper.Request) *http_wrapper.Response { - return http_wrapper.NewResponse(http.StatusOK, nil, map[string]interface{}{}) +func HandleExposureDataSubsToNotifyPost(request *httpwrapper.Request) *httpwrapper.Response { + return httpwrapper.NewResponse(http.StatusOK, nil, map[string]interface{}{}) } -func HandleExposureDataSubsToNotifySubIdDelete(request *http_wrapper.Request) *http_wrapper.Response { - return http_wrapper.NewResponse(http.StatusOK, nil, map[string]interface{}{}) +func HandleExposureDataSubsToNotifySubIdDelete(request *httpwrapper.Request) *httpwrapper.Response { + return httpwrapper.NewResponse(http.StatusOK, nil, map[string]interface{}{}) } -func HandleExposureDataSubsToNotifySubIdPut(request *http_wrapper.Request) *http_wrapper.Response { - return http_wrapper.NewResponse(http.StatusOK, nil, map[string]interface{}{}) +func HandleExposureDataSubsToNotifySubIdPut(request *httpwrapper.Request) *httpwrapper.Response { + return httpwrapper.NewResponse(http.StatusOK, nil, map[string]interface{}{}) } -func HandlePolicyDataBdtDataBdtReferenceIdDelete(request *http_wrapper.Request) *http_wrapper.Response { +func HandlePolicyDataBdtDataBdtReferenceIdDelete(request *httpwrapper.Request) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle PolicyDataBdtDataBdtReferenceIdDelete") collName := "policyData.bdtData" bdtReferenceId := request.Params["bdtReferenceId"] PolicyDataBdtDataBdtReferenceIdDeleteProcedure(collName, bdtReferenceId) - return http_wrapper.NewResponse(http.StatusNoContent, nil, map[string]interface{}{}) + return httpwrapper.NewResponse(http.StatusNoContent, nil, map[string]interface{}{}) } func PolicyDataBdtDataBdtReferenceIdDeleteProcedure(collName string, bdtReferenceId string) { @@ -1035,7 +1035,7 @@ func PolicyDataBdtDataBdtReferenceIdDeleteProcedure(collName string, bdtReferenc } } -func HandlePolicyDataBdtDataBdtReferenceIdGet(request *http_wrapper.Request) *http_wrapper.Response { +func HandlePolicyDataBdtDataBdtReferenceIdGet(request *httpwrapper.Request) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle PolicyDataBdtDataBdtReferenceIdGet") collName := "policyData.bdtData" @@ -1043,13 +1043,13 @@ func HandlePolicyDataBdtDataBdtReferenceIdGet(request *http_wrapper.Request) *ht response, problemDetails := PolicyDataBdtDataBdtReferenceIdGetProcedure(collName, bdtReferenceId) if response != nil { - return http_wrapper.NewResponse(http.StatusOK, nil, response) + return httpwrapper.NewResponse(http.StatusOK, nil, response) } else if problemDetails != nil { - return http_wrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) + return httpwrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) } pd := util.ProblemDetailsUpspecified("") - return http_wrapper.NewResponse(int(pd.Status), nil, pd) + return httpwrapper.NewResponse(int(pd.Status), nil, pd) } func PolicyDataBdtDataBdtReferenceIdGetProcedure(collName string, bdtReferenceId string) (*map[string]interface{}, @@ -1068,7 +1068,7 @@ func PolicyDataBdtDataBdtReferenceIdGetProcedure(collName string, bdtReferenceId } } -func HandlePolicyDataBdtDataBdtReferenceIdPut(request *http_wrapper.Request) *http_wrapper.Response { +func HandlePolicyDataBdtDataBdtReferenceIdPut(request *httpwrapper.Request) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle PolicyDataBdtDataBdtReferenceIdPut") collName := "policyData.bdtData" @@ -1077,11 +1077,11 @@ func HandlePolicyDataBdtDataBdtReferenceIdPut(request *http_wrapper.Request) *ht response := PolicyDataBdtDataBdtReferenceIdPutProcedure(collName, bdtReferenceId, bdtData) if response != nil { - return http_wrapper.NewResponse(http.StatusOK, nil, response) + return httpwrapper.NewResponse(http.StatusOK, nil, response) } pd := util.ProblemDetailsUpspecified("") - return http_wrapper.NewResponse(int(pd.Status), nil, pd) + return httpwrapper.NewResponse(int(pd.Status), nil, pd) } func PolicyDataBdtDataBdtReferenceIdPutProcedure(collName string, bdtReferenceId string, @@ -1103,13 +1103,13 @@ func PolicyDataBdtDataBdtReferenceIdPutProcedure(collName string, bdtReferenceId } } -func HandlePolicyDataBdtDataGet(request *http_wrapper.Request) *http_wrapper.Response { +func HandlePolicyDataBdtDataGet(request *httpwrapper.Request) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle PolicyDataBdtDataGet") collName := "policyData.bdtData" response := PolicyDataBdtDataGetProcedure(collName) - return http_wrapper.NewResponse(http.StatusOK, nil, response) + return httpwrapper.NewResponse(http.StatusOK, nil, response) } func PolicyDataBdtDataGetProcedure(collName string) (response *[]map[string]interface{}) { @@ -1121,7 +1121,7 @@ func PolicyDataBdtDataGetProcedure(collName string) (response *[]map[string]inte return &bdtDataArray } -func HandlePolicyDataPlmnsPlmnIdUePolicySetGet(request *http_wrapper.Request) *http_wrapper.Response { +func HandlePolicyDataPlmnsPlmnIdUePolicySetGet(request *httpwrapper.Request) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle PolicyDataPlmnsPlmnIdUePolicySetGet") collName := "policyData.plmns.uePolicySet" @@ -1130,13 +1130,13 @@ func HandlePolicyDataPlmnsPlmnIdUePolicySetGet(request *http_wrapper.Request) *h response, problemDetails := PolicyDataPlmnsPlmnIdUePolicySetGetProcedure(collName, plmnId) if response != nil { - return http_wrapper.NewResponse(http.StatusOK, nil, response) + return httpwrapper.NewResponse(http.StatusOK, nil, response) } else if problemDetails != nil { - return http_wrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) + return httpwrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) } pd := util.ProblemDetailsUpspecified("") - return http_wrapper.NewResponse(int(pd.Status), nil, pd) + return httpwrapper.NewResponse(int(pd.Status), nil, pd) } func PolicyDataPlmnsPlmnIdUePolicySetGetProcedure(collName string, @@ -1154,7 +1154,7 @@ func PolicyDataPlmnsPlmnIdUePolicySetGetProcedure(collName string, } } -func HandlePolicyDataSponsorConnectivityDataSponsorIdGet(request *http_wrapper.Request) *http_wrapper.Response { +func HandlePolicyDataSponsorConnectivityDataSponsorIdGet(request *httpwrapper.Request) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle PolicyDataSponsorConnectivityDataSponsorIdGet") collName := "policyData.sponsorConnectivityData" @@ -1163,13 +1163,13 @@ func HandlePolicyDataSponsorConnectivityDataSponsorIdGet(request *http_wrapper.R response, status := PolicyDataSponsorConnectivityDataSponsorIdGetProcedure(collName, sponsorId) if status == http.StatusOK { - return http_wrapper.NewResponse(http.StatusOK, nil, response) + return httpwrapper.NewResponse(http.StatusOK, nil, response) } else if status == http.StatusNoContent { - return http_wrapper.NewResponse(http.StatusNoContent, nil, map[string]interface{}{}) + return httpwrapper.NewResponse(http.StatusNoContent, nil, map[string]interface{}{}) } pd := util.ProblemDetailsUpspecified("") - return http_wrapper.NewResponse(int(pd.Status), nil, pd) + return httpwrapper.NewResponse(int(pd.Status), nil, pd) } func PolicyDataSponsorConnectivityDataSponsorIdGetProcedure(collName string, @@ -1188,7 +1188,7 @@ func PolicyDataSponsorConnectivityDataSponsorIdGetProcedure(collName string, } } -func HandlePolicyDataSubsToNotifyPost(request *http_wrapper.Request) *http_wrapper.Response { +func HandlePolicyDataSubsToNotifyPost(request *httpwrapper.Request) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle PolicyDataSubsToNotifyPost") PolicyDataSubscription := request.Body.(models.PolicyDataSubscription) @@ -1197,7 +1197,7 @@ func HandlePolicyDataSubsToNotifyPost(request *http_wrapper.Request) *http_wrapp headers := http.Header{} headers.Set("Location", locationHeader) - return http_wrapper.NewResponse(http.StatusCreated, headers, PolicyDataSubscription) + return httpwrapper.NewResponse(http.StatusCreated, headers, PolicyDataSubscription) } func PolicyDataSubsToNotifyPostProcedure(PolicyDataSubscription models.PolicyDataSubscription) string { @@ -1215,7 +1215,7 @@ func PolicyDataSubsToNotifyPostProcedure(PolicyDataSubscription models.PolicyDat return locationHeader } -func HandlePolicyDataSubsToNotifySubsIdDelete(request *http_wrapper.Request) *http_wrapper.Response { +func HandlePolicyDataSubsToNotifySubsIdDelete(request *httpwrapper.Request) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle PolicyDataSubsToNotifySubsIdDelete") subsId := request.Params["subsId"] @@ -1223,9 +1223,9 @@ func HandlePolicyDataSubsToNotifySubsIdDelete(request *http_wrapper.Request) *ht problemDetails := PolicyDataSubsToNotifySubsIdDeleteProcedure(subsId) if problemDetails == nil { - return http_wrapper.NewResponse(http.StatusNoContent, nil, map[string]interface{}{}) + return httpwrapper.NewResponse(http.StatusNoContent, nil, map[string]interface{}{}) } else { - return http_wrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) + return httpwrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) } } @@ -1240,7 +1240,7 @@ func PolicyDataSubsToNotifySubsIdDeleteProcedure(subsId string) (problemDetails return nil } -func HandlePolicyDataSubsToNotifySubsIdPut(request *http_wrapper.Request) *http_wrapper.Response { +func HandlePolicyDataSubsToNotifySubsIdPut(request *httpwrapper.Request) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle PolicyDataSubsToNotifySubsIdPut") subsId := request.Params["subsId"] @@ -1249,9 +1249,9 @@ func HandlePolicyDataSubsToNotifySubsIdPut(request *http_wrapper.Request) *http_ response, problemDetails := PolicyDataSubsToNotifySubsIdPutProcedure(subsId, policyDataSubscription) if problemDetails == nil { - return http_wrapper.NewResponse(http.StatusOK, nil, response) + return httpwrapper.NewResponse(http.StatusOK, nil, response) } else { - return http_wrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) + return httpwrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) } } @@ -1268,7 +1268,7 @@ func PolicyDataSubsToNotifySubsIdPutProcedure(subsId string, return &policyDataSubscription, nil } -func HandlePolicyDataUesUeIdAmDataGet(request *http_wrapper.Request) *http_wrapper.Response { +func HandlePolicyDataUesUeIdAmDataGet(request *httpwrapper.Request) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle PolicyDataUesUeIdAmDataGet") collName := "policyData.ues.amData" @@ -1277,13 +1277,13 @@ func HandlePolicyDataUesUeIdAmDataGet(request *http_wrapper.Request) *http_wrapp response, problemDetails := PolicyDataUesUeIdAmDataGetProcedure(collName, ueId) if response != nil { - return http_wrapper.NewResponse(http.StatusOK, nil, response) + return httpwrapper.NewResponse(http.StatusOK, nil, response) } else if problemDetails != nil { - return http_wrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) + return httpwrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) } pd := util.ProblemDetailsUpspecified("") - return http_wrapper.NewResponse(int(pd.Status), nil, pd) + return httpwrapper.NewResponse(int(pd.Status), nil, pd) } func PolicyDataUesUeIdAmDataGetProcedure(collName string, @@ -1302,7 +1302,7 @@ func PolicyDataUesUeIdAmDataGetProcedure(collName string, } } -func HandlePolicyDataUesUeIdOperatorSpecificDataGet(request *http_wrapper.Request) *http_wrapper.Response { +func HandlePolicyDataUesUeIdOperatorSpecificDataGet(request *httpwrapper.Request) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle PolicyDataUesUeIdOperatorSpecificDataGet") collName := "policyData.ues.operatorSpecificData" @@ -1311,13 +1311,13 @@ func HandlePolicyDataUesUeIdOperatorSpecificDataGet(request *http_wrapper.Reques response, problemDetails := PolicyDataUesUeIdOperatorSpecificDataGetProcedure(collName, ueId) if response != nil { - return http_wrapper.NewResponse(http.StatusOK, nil, response) + return httpwrapper.NewResponse(http.StatusOK, nil, response) } else if problemDetails != nil { - return http_wrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) + return httpwrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) } pd := util.ProblemDetailsUpspecified("") - return http_wrapper.NewResponse(int(pd.Status), nil, pd) + return httpwrapper.NewResponse(int(pd.Status), nil, pd) } func PolicyDataUesUeIdOperatorSpecificDataGetProcedure(collName string, @@ -1337,7 +1337,7 @@ func PolicyDataUesUeIdOperatorSpecificDataGetProcedure(collName string, } } -func HandlePolicyDataUesUeIdOperatorSpecificDataPatch(request *http_wrapper.Request) *http_wrapper.Response { +func HandlePolicyDataUesUeIdOperatorSpecificDataPatch(request *httpwrapper.Request) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle PolicyDataUesUeIdOperatorSpecificDataPatch") collName := "policyData.ues.operatorSpecificData" @@ -1347,9 +1347,9 @@ func HandlePolicyDataUesUeIdOperatorSpecificDataPatch(request *http_wrapper.Requ problemDetails := PolicyDataUesUeIdOperatorSpecificDataPatchProcedure(collName, ueId, patchItem) if problemDetails == nil { - return http_wrapper.NewResponse(http.StatusNoContent, nil, map[string]interface{}{}) + return httpwrapper.NewResponse(http.StatusNoContent, nil, map[string]interface{}{}) } else { - return http_wrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) + return httpwrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) } } @@ -1372,7 +1372,7 @@ func PolicyDataUesUeIdOperatorSpecificDataPatchProcedure(collName string, ueId s } } -func HandlePolicyDataUesUeIdOperatorSpecificDataPut(request *http_wrapper.Request) *http_wrapper.Response { +func HandlePolicyDataUesUeIdOperatorSpecificDataPut(request *httpwrapper.Request) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle PolicyDataUesUeIdOperatorSpecificDataPut") // json.NewDecoder(c.Request.Body).Decode(&operatorSpecificDataContainerMap) @@ -1383,7 +1383,7 @@ func HandlePolicyDataUesUeIdOperatorSpecificDataPut(request *http_wrapper.Reques PolicyDataUesUeIdOperatorSpecificDataPutProcedure(collName, ueId, OperatorSpecificDataContainer) - return http_wrapper.NewResponse(http.StatusOK, nil, map[string]interface{}{}) + return httpwrapper.NewResponse(http.StatusOK, nil, map[string]interface{}{}) } func PolicyDataUesUeIdOperatorSpecificDataPutProcedure(collName string, ueId string, @@ -1399,7 +1399,7 @@ func PolicyDataUesUeIdOperatorSpecificDataPutProcedure(collName string, ueId str } } -func HandlePolicyDataUesUeIdSmDataGet(request *http_wrapper.Request) *http_wrapper.Response { +func HandlePolicyDataUesUeIdSmDataGet(request *httpwrapper.Request) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle PolicyDataUesUeIdSmDataGet") collName := "policyData.ues.smData" @@ -1414,13 +1414,13 @@ func HandlePolicyDataUesUeIdSmDataGet(request *http_wrapper.Request) *http_wrapp response, problemDetails := PolicyDataUesUeIdSmDataGetProcedure(collName, ueId, sNssai, dnn) if response != nil { - return http_wrapper.NewResponse(http.StatusOK, nil, response) + return httpwrapper.NewResponse(http.StatusOK, nil, response) } else if problemDetails != nil { - return http_wrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) + return httpwrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) } pd := util.ProblemDetailsUpspecified("") - return http_wrapper.NewResponse(int(pd.Status), nil, pd) + return httpwrapper.NewResponse(int(pd.Status), nil, pd) } func PolicyDataUesUeIdSmDataGetProcedure(collName string, ueId string, snssai models.Snssai, @@ -1470,7 +1470,7 @@ func PolicyDataUesUeIdSmDataGetProcedure(collName string, ueId string, snssai mo } } -func HandlePolicyDataUesUeIdSmDataPatch(request *http_wrapper.Request) *http_wrapper.Response { +func HandlePolicyDataUesUeIdSmDataPatch(request *httpwrapper.Request) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle PolicyDataUesUeIdSmDataPatch") collName := "policyData.ues.smData.usageMonData" @@ -1479,9 +1479,9 @@ func HandlePolicyDataUesUeIdSmDataPatch(request *http_wrapper.Request) *http_wra problemDetails := PolicyDataUesUeIdSmDataPatchProcedure(collName, ueId, usageMonData) if problemDetails == nil { - return http_wrapper.NewResponse(http.StatusNoContent, nil, map[string]interface{}{}) + return httpwrapper.NewResponse(http.StatusNoContent, nil, map[string]interface{}{}) } else { - return http_wrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) + return httpwrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) } } @@ -1547,7 +1547,7 @@ func PolicyDataUesUeIdSmDataPatchProcedure(collName string, ueId string, } } -func HandlePolicyDataUesUeIdSmDataUsageMonIdDelete(request *http_wrapper.Request) *http_wrapper.Response { +func HandlePolicyDataUesUeIdSmDataUsageMonIdDelete(request *httpwrapper.Request) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle PolicyDataUesUeIdSmDataUsageMonIdDelete") collName := "policyData.ues.smData.usageMonData" @@ -1555,7 +1555,7 @@ func HandlePolicyDataUesUeIdSmDataUsageMonIdDelete(request *http_wrapper.Request usageMonId := request.Params["usageMonId"] PolicyDataUesUeIdSmDataUsageMonIdDeleteProcedure(collName, ueId, usageMonId) - return http_wrapper.NewResponse(http.StatusNoContent, nil, map[string]interface{}{}) + return httpwrapper.NewResponse(http.StatusNoContent, nil, map[string]interface{}{}) } func PolicyDataUesUeIdSmDataUsageMonIdDeleteProcedure(collName string, ueId string, usageMonId string) { @@ -1566,7 +1566,7 @@ func PolicyDataUesUeIdSmDataUsageMonIdDeleteProcedure(collName string, ueId stri } } -func HandlePolicyDataUesUeIdSmDataUsageMonIdGet(request *http_wrapper.Request) *http_wrapper.Response { +func HandlePolicyDataUesUeIdSmDataUsageMonIdGet(request *httpwrapper.Request) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle PolicyDataUesUeIdSmDataUsageMonIdGet") collName := "policyData.ues.smData.usageMonData" @@ -1576,9 +1576,9 @@ func HandlePolicyDataUesUeIdSmDataUsageMonIdGet(request *http_wrapper.Request) * response := PolicyDataUesUeIdSmDataUsageMonIdGetProcedure(collName, usageMonId, ueId) if response != nil { - return http_wrapper.NewResponse(http.StatusOK, nil, response) + return httpwrapper.NewResponse(http.StatusOK, nil, response) } else { - return http_wrapper.NewResponse(http.StatusNoContent, nil, map[string]interface{}{}) + return httpwrapper.NewResponse(http.StatusNoContent, nil, map[string]interface{}{}) } } @@ -1594,7 +1594,7 @@ func PolicyDataUesUeIdSmDataUsageMonIdGetProcedure(collName string, usageMonId s return &usageMonData } -func HandlePolicyDataUesUeIdSmDataUsageMonIdPut(request *http_wrapper.Request) *http_wrapper.Response { +func HandlePolicyDataUesUeIdSmDataUsageMonIdPut(request *httpwrapper.Request) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle PolicyDataUesUeIdSmDataUsageMonIdPut") ueId := request.Params["ueId"] @@ -1604,7 +1604,7 @@ func HandlePolicyDataUesUeIdSmDataUsageMonIdPut(request *http_wrapper.Request) * response := PolicyDataUesUeIdSmDataUsageMonIdPutProcedure(collName, ueId, usageMonId, usageMonData) - return http_wrapper.NewResponse(http.StatusCreated, nil, response) + return httpwrapper.NewResponse(http.StatusCreated, nil, response) } func PolicyDataUesUeIdSmDataUsageMonIdPutProcedure(collName string, ueId string, usageMonId string, @@ -1621,7 +1621,7 @@ func PolicyDataUesUeIdSmDataUsageMonIdPutProcedure(collName string, ueId string, return &putData } -func HandlePolicyDataUesUeIdUePolicySetGet(request *http_wrapper.Request) *http_wrapper.Response { +func HandlePolicyDataUesUeIdUePolicySetGet(request *httpwrapper.Request) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle PolicyDataUesUeIdUePolicySetGet") ueId := request.Params["ueId"] @@ -1630,13 +1630,13 @@ func HandlePolicyDataUesUeIdUePolicySetGet(request *http_wrapper.Request) *http_ response, problemDetails := PolicyDataUesUeIdUePolicySetGetProcedure(collName, ueId) if response != nil { - return http_wrapper.NewResponse(http.StatusOK, nil, response) + return httpwrapper.NewResponse(http.StatusOK, nil, response) } else if problemDetails != nil { - return http_wrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) + return httpwrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) } pd := util.ProblemDetailsUpspecified("") - return http_wrapper.NewResponse(int(pd.Status), nil, pd) + return httpwrapper.NewResponse(int(pd.Status), nil, pd) } func PolicyDataUesUeIdUePolicySetGetProcedure(collName string, ueId string) (*map[string]interface{}, @@ -1655,7 +1655,7 @@ func PolicyDataUesUeIdUePolicySetGetProcedure(collName string, ueId string) (*ma } } -func HandlePolicyDataUesUeIdUePolicySetPatch(request *http_wrapper.Request) *http_wrapper.Response { +func HandlePolicyDataUesUeIdUePolicySetPatch(request *httpwrapper.Request) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle PolicyDataUesUeIdUePolicySetPatch") collName := "policyData.ues.uePolicySet" @@ -1665,9 +1665,9 @@ func HandlePolicyDataUesUeIdUePolicySetPatch(request *http_wrapper.Request) *htt problemDetails := PolicyDataUesUeIdUePolicySetPatchProcedure(collName, ueId, UePolicySet) if problemDetails == nil { - return http_wrapper.NewResponse(http.StatusNoContent, nil, map[string]interface{}{}) + return httpwrapper.NewResponse(http.StatusNoContent, nil, map[string]interface{}{}) } else { - return http_wrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) + return httpwrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) } } @@ -1696,7 +1696,7 @@ func PolicyDataUesUeIdUePolicySetPatchProcedure(collName string, ueId string, } } -func HandlePolicyDataUesUeIdUePolicySetPut(request *http_wrapper.Request) *http_wrapper.Response { +func HandlePolicyDataUesUeIdUePolicySetPut(request *httpwrapper.Request) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle PolicyDataUesUeIdUePolicySetPut") collName := "policyData.ues.uePolicySet" @@ -1706,13 +1706,13 @@ func HandlePolicyDataUesUeIdUePolicySetPut(request *http_wrapper.Request) *http_ response, status := PolicyDataUesUeIdUePolicySetPutProcedure(collName, ueId, UePolicySet) if status == http.StatusNoContent { - return http_wrapper.NewResponse(http.StatusNoContent, nil, map[string]interface{}{}) + return httpwrapper.NewResponse(http.StatusNoContent, nil, map[string]interface{}{}) } else if status == http.StatusCreated { - return http_wrapper.NewResponse(http.StatusCreated, nil, response) + return httpwrapper.NewResponse(http.StatusCreated, nil, response) } pd := util.ProblemDetailsUpspecified("") - return http_wrapper.NewResponse(int(pd.Status), nil, pd) + return httpwrapper.NewResponse(int(pd.Status), nil, pd) } func PolicyDataUesUeIdUePolicySetPutProcedure(collName string, ueId string, @@ -1732,7 +1732,7 @@ func PolicyDataUesUeIdUePolicySetPutProcedure(collName string, ueId string, } } -func HandleCreateAMFSubscriptions(request *http_wrapper.Request) *http_wrapper.Response { +func HandleCreateAMFSubscriptions(request *httpwrapper.Request) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle CreateAMFSubscriptions") ueId := request.Params["ueId"] @@ -1742,9 +1742,9 @@ func HandleCreateAMFSubscriptions(request *http_wrapper.Request) *http_wrapper.R problemDetails := CreateAMFSubscriptionsProcedure(subsId, ueId, AmfSubscriptionInfo) if problemDetails == nil { - return http_wrapper.NewResponse(http.StatusNoContent, nil, map[string]interface{}{}) + return httpwrapper.NewResponse(http.StatusNoContent, nil, map[string]interface{}{}) } else { - return http_wrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) + return httpwrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) } } @@ -1766,7 +1766,7 @@ func CreateAMFSubscriptionsProcedure(subsId string, ueId string, return nil } -func HandleRemoveAmfSubscriptionsInfo(request *http_wrapper.Request) *http_wrapper.Response { +func HandleRemoveAmfSubscriptionsInfo(request *httpwrapper.Request) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle RemoveAmfSubscriptionsInfo") ueId := request.Params["ueId"] @@ -1775,9 +1775,9 @@ func HandleRemoveAmfSubscriptionsInfo(request *http_wrapper.Request) *http_wrapp problemDetails := RemoveAmfSubscriptionsInfoProcedure(subsId, ueId) if problemDetails == nil { - return http_wrapper.NewResponse(http.StatusNoContent, nil, map[string]interface{}{}) + return httpwrapper.NewResponse(http.StatusNoContent, nil, map[string]interface{}{}) } else { - return http_wrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) + return httpwrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) } } @@ -1804,7 +1804,7 @@ func RemoveAmfSubscriptionsInfoProcedure(subsId string, ueId string) *models.Pro return nil } -func HandleModifyAmfSubscriptionInfo(request *http_wrapper.Request) *http_wrapper.Response { +func HandleModifyAmfSubscriptionInfo(request *httpwrapper.Request) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle ModifyAmfSubscriptionInfo") patchItem := request.Body.([]models.PatchItem) @@ -1814,9 +1814,9 @@ func HandleModifyAmfSubscriptionInfo(request *http_wrapper.Request) *http_wrappe problemDetails := ModifyAmfSubscriptionInfoProcedure(ueId, subsId, patchItem) if problemDetails == nil { - return http_wrapper.NewResponse(http.StatusNoContent, nil, map[string]interface{}{}) + return httpwrapper.NewResponse(http.StatusNoContent, nil, map[string]interface{}{}) } else { - return http_wrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) + return httpwrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) } } @@ -1870,7 +1870,7 @@ func ModifyAmfSubscriptionInfoProcedure(ueId string, subsId string, return nil } -func HandleGetAmfSubscriptionInfo(request *http_wrapper.Request) *http_wrapper.Response { +func HandleGetAmfSubscriptionInfo(request *httpwrapper.Request) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle GetAmfSubscriptionInfo") ueId := request.Params["ueId"] @@ -1878,13 +1878,13 @@ func HandleGetAmfSubscriptionInfo(request *http_wrapper.Request) *http_wrapper.R response, problemDetails := GetAmfSubscriptionInfoProcedure(subsId, ueId) if response != nil { - return http_wrapper.NewResponse(http.StatusOK, nil, response) + return httpwrapper.NewResponse(http.StatusOK, nil, response) } else if problemDetails != nil { - return http_wrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) + return httpwrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) } pd := util.ProblemDetailsUpspecified("") - return http_wrapper.NewResponse(int(pd.Status), nil, pd) + return httpwrapper.NewResponse(int(pd.Status), nil, pd) } func GetAmfSubscriptionInfoProcedure(subsId string, ueId string) (*[]models.AmfSubscriptionInfo, @@ -1909,7 +1909,7 @@ func GetAmfSubscriptionInfoProcedure(subsId string, ueId string) (*[]models.AmfS return &UESubsData.EeSubscriptionCollection[subsId].AmfSubscriptionInfos, nil } -func HandleQueryEEData(request *http_wrapper.Request) *http_wrapper.Response { +func HandleQueryEEData(request *httpwrapper.Request) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle QueryEEData") ueId := request.Params["ueId"] @@ -1918,13 +1918,13 @@ func HandleQueryEEData(request *http_wrapper.Request) *http_wrapper.Response { response, problemDetails := QueryEEDataProcedure(collName, ueId) if response != nil { - return http_wrapper.NewResponse(http.StatusOK, nil, response) + return httpwrapper.NewResponse(http.StatusOK, nil, response) } else if problemDetails != nil { - return http_wrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) + return httpwrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) } pd := util.ProblemDetailsUpspecified("") - return http_wrapper.NewResponse(int(pd.Status), nil, pd) + return httpwrapper.NewResponse(int(pd.Status), nil, pd) } func QueryEEDataProcedure(collName string, ueId string) (*map[string]interface{}, *models.ProblemDetails) { @@ -1941,7 +1941,7 @@ func QueryEEDataProcedure(collName string, ueId string) (*map[string]interface{} } } -func HandleRemoveEeGroupSubscriptions(request *http_wrapper.Request) *http_wrapper.Response { +func HandleRemoveEeGroupSubscriptions(request *httpwrapper.Request) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle RemoveEeGroupSubscriptions") ueGroupId := request.Params["ueGroupId"] @@ -1950,9 +1950,9 @@ func HandleRemoveEeGroupSubscriptions(request *http_wrapper.Request) *http_wrapp problemDetails := RemoveEeGroupSubscriptionsProcedure(ueGroupId, subsId) if problemDetails == nil { - return http_wrapper.NewResponse(http.StatusNoContent, nil, map[string]interface{}{}) + return httpwrapper.NewResponse(http.StatusNoContent, nil, map[string]interface{}{}) } else { - return http_wrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) + return httpwrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) } } @@ -1974,7 +1974,7 @@ func RemoveEeGroupSubscriptionsProcedure(ueGroupId string, subsId string) *model return nil } -func HandleUpdateEeGroupSubscriptions(request *http_wrapper.Request) *http_wrapper.Response { +func HandleUpdateEeGroupSubscriptions(request *httpwrapper.Request) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle UpdateEeGroupSubscriptions") ueGroupId := request.Params["ueGroupId"] @@ -1984,9 +1984,9 @@ func HandleUpdateEeGroupSubscriptions(request *http_wrapper.Request) *http_wrapp problemDetails := UpdateEeGroupSubscriptionsProcedure(ueGroupId, subsId, EeSubscription) if problemDetails == nil { - return http_wrapper.NewResponse(http.StatusNoContent, nil, map[string]interface{}{}) + return httpwrapper.NewResponse(http.StatusNoContent, nil, map[string]interface{}{}) } else { - return http_wrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) + return httpwrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) } } @@ -2009,7 +2009,7 @@ func UpdateEeGroupSubscriptionsProcedure(ueGroupId string, subsId string, return nil } -func HandleCreateEeGroupSubscriptions(request *http_wrapper.Request) *http_wrapper.Response { +func HandleCreateEeGroupSubscriptions(request *httpwrapper.Request) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle CreateEeGroupSubscriptions") ueGroupId := request.Params["ueGroupId"] @@ -2019,7 +2019,7 @@ func HandleCreateEeGroupSubscriptions(request *http_wrapper.Request) *http_wrapp headers := http.Header{} headers.Set("Location", locationHeader) - return http_wrapper.NewResponse(http.StatusCreated, headers, EeSubscription) + return httpwrapper.NewResponse(http.StatusCreated, headers, EeSubscription) } func CreateEeGroupSubscriptionsProcedure(ueGroupId string, EeSubscription models.EeSubscription) string { @@ -2047,7 +2047,7 @@ func CreateEeGroupSubscriptionsProcedure(ueGroupId string, EeSubscription models return locationHeader } -func HandleQueryEeGroupSubscriptions(request *http_wrapper.Request) *http_wrapper.Response { +func HandleQueryEeGroupSubscriptions(request *httpwrapper.Request) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle QueryEeGroupSubscriptions") ueGroupId := request.Params["ueGroupId"] @@ -2055,13 +2055,13 @@ func HandleQueryEeGroupSubscriptions(request *http_wrapper.Request) *http_wrappe response, problemDetails := QueryEeGroupSubscriptionsProcedure(ueGroupId) if response != nil { - return http_wrapper.NewResponse(http.StatusOK, nil, response) + return httpwrapper.NewResponse(http.StatusOK, nil, response) } else if problemDetails != nil { - return http_wrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) + return httpwrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) } pd := util.ProblemDetailsUpspecified("") - return http_wrapper.NewResponse(int(pd.Status), nil, pd) + return httpwrapper.NewResponse(int(pd.Status), nil, pd) } func QueryEeGroupSubscriptionsProcedure(ueGroupId string) ([]models.EeSubscription, *models.ProblemDetails) { @@ -2081,7 +2081,7 @@ func QueryEeGroupSubscriptionsProcedure(ueGroupId string) ([]models.EeSubscripti return eeSubscriptionSlice, nil } -func HandleRemoveeeSubscriptions(request *http_wrapper.Request) *http_wrapper.Response { +func HandleRemoveeeSubscriptions(request *httpwrapper.Request) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle RemoveeeSubscriptions") ueId := request.Params["ueId"] @@ -2090,9 +2090,9 @@ func HandleRemoveeeSubscriptions(request *http_wrapper.Request) *http_wrapper.Re problemDetails := RemoveeeSubscriptionsProcedure(ueId, subsId) if problemDetails == nil { - return http_wrapper.NewResponse(http.StatusNoContent, nil, map[string]interface{}{}) + return httpwrapper.NewResponse(http.StatusNoContent, nil, map[string]interface{}{}) } else { - return http_wrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) + return httpwrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) } } @@ -2113,7 +2113,7 @@ func RemoveeeSubscriptionsProcedure(ueId string, subsId string) *models.ProblemD return nil } -func HandleUpdateEesubscriptions(request *http_wrapper.Request) *http_wrapper.Response { +func HandleUpdateEesubscriptions(request *httpwrapper.Request) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle UpdateEesubscriptions") ueId := request.Params["ueId"] @@ -2123,9 +2123,9 @@ func HandleUpdateEesubscriptions(request *http_wrapper.Request) *http_wrapper.Re problemDetails := UpdateEesubscriptionsProcedure(ueId, subsId, EeSubscription) if problemDetails == nil { - return http_wrapper.NewResponse(http.StatusNoContent, nil, map[string]interface{}{}) + return httpwrapper.NewResponse(http.StatusNoContent, nil, map[string]interface{}{}) } else { - return http_wrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) + return httpwrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) } } @@ -2148,7 +2148,7 @@ func UpdateEesubscriptionsProcedure(ueId string, subsId string, return nil } -func HandleCreateEeSubscriptions(request *http_wrapper.Request) *http_wrapper.Response { +func HandleCreateEeSubscriptions(request *httpwrapper.Request) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle CreateEeSubscriptions") ueId := request.Params["ueId"] @@ -2158,7 +2158,7 @@ func HandleCreateEeSubscriptions(request *http_wrapper.Request) *http_wrapper.Re headers := http.Header{} headers.Set("Location", locationHeader) - return http_wrapper.NewResponse(http.StatusCreated, headers, EeSubscription) + return httpwrapper.NewResponse(http.StatusCreated, headers, EeSubscription) } func CreateEeSubscriptionsProcedure(ueId string, EeSubscription models.EeSubscription) string { @@ -2187,7 +2187,7 @@ func CreateEeSubscriptionsProcedure(ueId string, EeSubscription models.EeSubscri return locationHeader } -func HandleQueryeesubscriptions(request *http_wrapper.Request) *http_wrapper.Response { +func HandleQueryeesubscriptions(request *httpwrapper.Request) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle Queryeesubscriptions") ueId := request.Params["ueId"] @@ -2195,13 +2195,13 @@ func HandleQueryeesubscriptions(request *http_wrapper.Request) *http_wrapper.Res response, problemDetails := QueryeesubscriptionsProcedure(ueId) if response != nil { - return http_wrapper.NewResponse(http.StatusOK, nil, response) + return httpwrapper.NewResponse(http.StatusOK, nil, response) } else if problemDetails != nil { - return http_wrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) + return httpwrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) } pd := util.ProblemDetailsUpspecified("") - return http_wrapper.NewResponse(int(pd.Status), nil, pd) + return httpwrapper.NewResponse(int(pd.Status), nil, pd) } func QueryeesubscriptionsProcedure(ueId string) ([]models.EeSubscription, *models.ProblemDetails) { @@ -2221,7 +2221,7 @@ func QueryeesubscriptionsProcedure(ueId string) ([]models.EeSubscription, *model return eeSubscriptionSlice, nil } -func HandlePatchOperSpecData(request *http_wrapper.Request) *http_wrapper.Response { +func HandlePatchOperSpecData(request *httpwrapper.Request) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle PatchOperSpecData") collName := "subscriptionData.operatorSpecificData" @@ -2231,9 +2231,9 @@ func HandlePatchOperSpecData(request *http_wrapper.Request) *http_wrapper.Respon problemDetails := PatchOperSpecDataProcedure(collName, ueId, patchItem) if problemDetails == nil { - return http_wrapper.NewResponse(http.StatusNoContent, nil, map[string]interface{}{}) + return httpwrapper.NewResponse(http.StatusNoContent, nil, map[string]interface{}{}) } else { - return http_wrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) + return httpwrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) } } @@ -2264,7 +2264,7 @@ func PatchOperSpecDataProcedure(collName string, ueId string, patchItem []models } } -func HandleQueryOperSpecData(request *http_wrapper.Request) *http_wrapper.Response { +func HandleQueryOperSpecData(request *httpwrapper.Request) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle QueryOperSpecData") ueId := request.Params["ueId"] @@ -2273,13 +2273,13 @@ func HandleQueryOperSpecData(request *http_wrapper.Request) *http_wrapper.Respon response, problemDetails := QueryOperSpecDataProcedure(collName, ueId) if response != nil { - return http_wrapper.NewResponse(http.StatusOK, nil, response) + return httpwrapper.NewResponse(http.StatusOK, nil, response) } else if problemDetails != nil { - return http_wrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) + return httpwrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) } pd := util.ProblemDetailsUpspecified("") - return http_wrapper.NewResponse(int(pd.Status), nil, pd) + return httpwrapper.NewResponse(int(pd.Status), nil, pd) } func QueryOperSpecDataProcedure(collName string, ueId string) (*map[string]interface{}, *models.ProblemDetails) { @@ -2299,7 +2299,7 @@ func QueryOperSpecDataProcedure(collName string, ueId string) (*map[string]inter } } -func HandleGetppData(request *http_wrapper.Request) *http_wrapper.Response { +func HandleGetppData(request *httpwrapper.Request) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle GetppData") collName := "subscriptionData.ppData" @@ -2308,13 +2308,13 @@ func HandleGetppData(request *http_wrapper.Request) *http_wrapper.Response { response, problemDetails := GetppDataProcedure(collName, ueId) if response != nil { - return http_wrapper.NewResponse(http.StatusOK, nil, response) + return httpwrapper.NewResponse(http.StatusOK, nil, response) } else if problemDetails != nil { - return http_wrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) + return httpwrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) } pd := util.ProblemDetailsUpspecified("") - return http_wrapper.NewResponse(int(pd.Status), nil, pd) + return httpwrapper.NewResponse(int(pd.Status), nil, pd) } func GetppDataProcedure(collName string, ueId string) (*map[string]interface{}, *models.ProblemDetails) { @@ -2332,19 +2332,19 @@ func GetppDataProcedure(collName string, ueId string) (*map[string]interface{}, } } -func HandleCreateSessionManagementData(request *http_wrapper.Request) *http_wrapper.Response { - return http_wrapper.NewResponse(http.StatusOK, nil, map[string]interface{}{}) +func HandleCreateSessionManagementData(request *httpwrapper.Request) *httpwrapper.Response { + return httpwrapper.NewResponse(http.StatusOK, nil, map[string]interface{}{}) } -func HandleDeleteSessionManagementData(request *http_wrapper.Request) *http_wrapper.Response { - return http_wrapper.NewResponse(http.StatusOK, nil, map[string]interface{}{}) +func HandleDeleteSessionManagementData(request *httpwrapper.Request) *httpwrapper.Response { + return httpwrapper.NewResponse(http.StatusOK, nil, map[string]interface{}{}) } -func HandleQuerySessionManagementData(request *http_wrapper.Request) *http_wrapper.Response { - return http_wrapper.NewResponse(http.StatusOK, nil, map[string]interface{}{}) +func HandleQuerySessionManagementData(request *httpwrapper.Request) *httpwrapper.Response { + return httpwrapper.NewResponse(http.StatusOK, nil, map[string]interface{}{}) } -func HandleQueryProvisionedData(request *http_wrapper.Request) *http_wrapper.Response { +func HandleQueryProvisionedData(request *httpwrapper.Request) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle QueryProvisionedData") var provisionedDataSets models.ProvisionedDataSets @@ -2354,13 +2354,13 @@ func HandleQueryProvisionedData(request *http_wrapper.Request) *http_wrapper.Res response, problemDetails := QueryProvisionedDataProcedure(ueId, servingPlmnId, provisionedDataSets) if response != nil { - return http_wrapper.NewResponse(http.StatusOK, nil, response) + return httpwrapper.NewResponse(http.StatusOK, nil, response) } else if problemDetails != nil { - return http_wrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) + return httpwrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) } pd := util.ProblemDetailsUpspecified("") - return http_wrapper.NewResponse(int(pd.Status), nil, pd) + return httpwrapper.NewResponse(int(pd.Status), nil, pd) } func QueryProvisionedDataProcedure(ueId string, servingPlmnId string, @@ -2474,7 +2474,7 @@ func QueryProvisionedDataProcedure(ueId string, servingPlmnId string, } } -func HandleModifyPpData(request *http_wrapper.Request) *http_wrapper.Response { +func HandleModifyPpData(request *httpwrapper.Request) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle ModifyPpData") collName := "subscriptionData.ppData" @@ -2483,9 +2483,9 @@ func HandleModifyPpData(request *http_wrapper.Request) *http_wrapper.Response { problemDetails := ModifyPpDataProcedure(collName, ueId, patchItem) if problemDetails == nil { - return http_wrapper.NewResponse(http.StatusNoContent, nil, map[string]interface{}{}) + return httpwrapper.NewResponse(http.StatusNoContent, nil, map[string]interface{}{}) } else { - return http_wrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) + return httpwrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) } } @@ -2516,7 +2516,7 @@ func ModifyPpDataProcedure(collName string, ueId string, patchItem []models.Patc } } -func HandleGetIdentityData(request *http_wrapper.Request) *http_wrapper.Response { +func HandleGetIdentityData(request *httpwrapper.Request) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle GetIdentityData") ueId := request.Params["ueId"] @@ -2525,13 +2525,13 @@ func HandleGetIdentityData(request *http_wrapper.Request) *http_wrapper.Response response, problemDetails := GetIdentityDataProcedure(collName, ueId) if response != nil { - return http_wrapper.NewResponse(http.StatusOK, nil, response) + return httpwrapper.NewResponse(http.StatusOK, nil, response) } else if problemDetails != nil { - return http_wrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) + return httpwrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) } pd := util.ProblemDetailsUpspecified("") - return http_wrapper.NewResponse(int(pd.Status), nil, pd) + return httpwrapper.NewResponse(int(pd.Status), nil, pd) } func GetIdentityDataProcedure(collName string, ueId string) (*map[string]interface{}, *models.ProblemDetails) { @@ -2549,7 +2549,7 @@ func GetIdentityDataProcedure(collName string, ueId string) (*map[string]interfa } } -func HandleGetOdbData(request *http_wrapper.Request) *http_wrapper.Response { +func HandleGetOdbData(request *httpwrapper.Request) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle GetOdbData") ueId := request.Params["ueId"] @@ -2558,13 +2558,13 @@ func HandleGetOdbData(request *http_wrapper.Request) *http_wrapper.Response { response, problemDetails := GetOdbDataProcedure(collName, ueId) if response != nil { - return http_wrapper.NewResponse(http.StatusOK, nil, response) + return httpwrapper.NewResponse(http.StatusOK, nil, response) } else if problemDetails != nil { - return http_wrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) + return httpwrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) } pd := util.ProblemDetailsUpspecified("") - return http_wrapper.NewResponse(int(pd.Status), nil, pd) + return httpwrapper.NewResponse(int(pd.Status), nil, pd) } func GetOdbDataProcedure(collName string, ueId string) (*map[string]interface{}, *models.ProblemDetails) { @@ -2582,7 +2582,7 @@ func GetOdbDataProcedure(collName string, ueId string) (*map[string]interface{}, } } -func HandleGetSharedData(request *http_wrapper.Request) *http_wrapper.Response { +func HandleGetSharedData(request *httpwrapper.Request) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle GetSharedData") var sharedDataIds []string @@ -2597,13 +2597,13 @@ func HandleGetSharedData(request *http_wrapper.Request) *http_wrapper.Response { response, problemDetails := GetSharedDataProcedure(collName, sharedDataIds) if response != nil { - return http_wrapper.NewResponse(http.StatusOK, nil, response) + return httpwrapper.NewResponse(http.StatusOK, nil, response) } else if problemDetails != nil { - return http_wrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) + return httpwrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) } pd := util.ProblemDetailsUpspecified("") - return http_wrapper.NewResponse(int(pd.Status), nil, pd) + return httpwrapper.NewResponse(int(pd.Status), nil, pd) } func GetSharedDataProcedure(collName string, sharedDataIds []string) (*[]map[string]interface{}, @@ -2627,7 +2627,7 @@ func GetSharedDataProcedure(collName string, sharedDataIds []string) (*[]map[str } } -func HandleRemovesdmSubscriptions(request *http_wrapper.Request) *http_wrapper.Response { +func HandleRemovesdmSubscriptions(request *httpwrapper.Request) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle RemovesdmSubscriptions") ueId := request.Params["ueId"] @@ -2636,9 +2636,9 @@ func HandleRemovesdmSubscriptions(request *http_wrapper.Request) *http_wrapper.R problemDetails := RemovesdmSubscriptionsProcedure(ueId, subsId) if problemDetails == nil { - return http_wrapper.NewResponse(http.StatusNoContent, nil, map[string]interface{}{}) + return httpwrapper.NewResponse(http.StatusNoContent, nil, map[string]interface{}{}) } else { - return http_wrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) + return httpwrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) } } @@ -2660,7 +2660,7 @@ func RemovesdmSubscriptionsProcedure(ueId string, subsId string) *models.Problem return nil } -func HandleUpdatesdmsubscriptions(request *http_wrapper.Request) *http_wrapper.Response { +func HandleUpdatesdmsubscriptions(request *httpwrapper.Request) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle Updatesdmsubscriptions") ueId := request.Params["ueId"] @@ -2670,9 +2670,9 @@ func HandleUpdatesdmsubscriptions(request *http_wrapper.Request) *http_wrapper.R problemDetails := UpdatesdmsubscriptionsProcedure(ueId, subsId, SdmSubscription) if problemDetails == nil { - return http_wrapper.NewResponse(http.StatusNoContent, nil, map[string]interface{}{}) + return httpwrapper.NewResponse(http.StatusNoContent, nil, map[string]interface{}{}) } else { - return http_wrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) + return httpwrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) } } @@ -2696,7 +2696,7 @@ func UpdatesdmsubscriptionsProcedure(ueId string, subsId string, return nil } -func HandleCreateSdmSubscriptions(request *http_wrapper.Request) *http_wrapper.Response { +func HandleCreateSdmSubscriptions(request *httpwrapper.Request) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle CreateSdmSubscriptions") SdmSubscription := request.Body.(models.SdmSubscription) @@ -2707,7 +2707,7 @@ func HandleCreateSdmSubscriptions(request *http_wrapper.Request) *http_wrapper.R headers := http.Header{} headers.Set("Location", locationHeader) - return http_wrapper.NewResponse(http.StatusCreated, headers, SdmSubscription) + return httpwrapper.NewResponse(http.StatusCreated, headers, SdmSubscription) } func CreateSdmSubscriptionsProcedure(SdmSubscription models.SdmSubscription, @@ -2737,7 +2737,7 @@ func CreateSdmSubscriptionsProcedure(SdmSubscription models.SdmSubscription, return locationHeader, SdmSubscription } -func HandleQuerysdmsubscriptions(request *http_wrapper.Request) *http_wrapper.Response { +func HandleQuerysdmsubscriptions(request *httpwrapper.Request) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle Querysdmsubscriptions") ueId := request.Params["ueId"] @@ -2745,13 +2745,13 @@ func HandleQuerysdmsubscriptions(request *http_wrapper.Request) *http_wrapper.Re response, problemDetails := QuerysdmsubscriptionsProcedure(ueId) if response != nil { - return http_wrapper.NewResponse(http.StatusOK, nil, response) + return httpwrapper.NewResponse(http.StatusOK, nil, response) } else if problemDetails != nil { - return http_wrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) + return httpwrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) } pd := util.ProblemDetailsUpspecified("") - return http_wrapper.NewResponse(int(pd.Status), nil, pd) + return httpwrapper.NewResponse(int(pd.Status), nil, pd) } func QuerysdmsubscriptionsProcedure(ueId string) (*[]models.SdmSubscription, *models.ProblemDetails) { @@ -2771,7 +2771,7 @@ func QuerysdmsubscriptionsProcedure(ueId string) (*[]models.SdmSubscription, *mo return &sdmSubscriptionSlice, nil } -func HandleQuerySmData(request *http_wrapper.Request) *http_wrapper.Response { +func HandleQuerySmData(request *httpwrapper.Request) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle QuerySmData") collName := "subscriptionData.provisionedData.smData" @@ -2787,7 +2787,7 @@ func HandleQuerySmData(request *http_wrapper.Request) *http_wrapper.Response { dnn := request.Query.Get("dnn") response := QuerySmDataProcedure(collName, ueId, servingPlmnId, singleNssai, dnn) - return http_wrapper.NewResponse(http.StatusOK, nil, response) + return httpwrapper.NewResponse(http.StatusOK, nil, response) } func QuerySmDataProcedure(collName string, ueId string, servingPlmnId string, @@ -2815,7 +2815,7 @@ func QuerySmDataProcedure(collName string, ueId string, servingPlmnId string, return &sessionManagementSubscriptionDatas } -func HandleCreateSmfContextNon3gpp(request *http_wrapper.Request) *http_wrapper.Response { +func HandleCreateSmfContextNon3gpp(request *httpwrapper.Request) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle CreateSmfContextNon3gpp") SmfRegistration := request.Body.(models.SmfRegistration) @@ -2829,13 +2829,13 @@ func HandleCreateSmfContextNon3gpp(request *http_wrapper.Request) *http_wrapper. response, status := CreateSmfContextNon3gppProcedure(SmfRegistration, collName, ueId, pduSessionId) if status == http.StatusCreated { - return http_wrapper.NewResponse(http.StatusCreated, nil, response) + return httpwrapper.NewResponse(http.StatusCreated, nil, response) } else if status == http.StatusOK { - return http_wrapper.NewResponse(http.StatusOK, nil, response) + return httpwrapper.NewResponse(http.StatusOK, nil, response) } pd := util.ProblemDetailsUpspecified("") - return http_wrapper.NewResponse(int(pd.Status), nil, pd) + return httpwrapper.NewResponse(int(pd.Status), nil, pd) } func CreateSmfContextNon3gppProcedure(SmfRegistration models.SmfRegistration, @@ -2857,7 +2857,7 @@ func CreateSmfContextNon3gppProcedure(SmfRegistration models.SmfRegistration, } } -func HandleDeleteSmfContext(request *http_wrapper.Request) *http_wrapper.Response { +func HandleDeleteSmfContext(request *httpwrapper.Request) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle DeleteSmfContext") collName := "subscriptionData.contextData.smfRegistrations" @@ -2865,7 +2865,7 @@ func HandleDeleteSmfContext(request *http_wrapper.Request) *http_wrapper.Respons pduSessionId := request.Params["pduSessionId"] DeleteSmfContextProcedure(collName, ueId, pduSessionId) - return http_wrapper.NewResponse(http.StatusNoContent, nil, map[string]interface{}{}) + return httpwrapper.NewResponse(http.StatusNoContent, nil, map[string]interface{}{}) } func DeleteSmfContextProcedure(collName string, ueId string, pduSessionId string) { @@ -2881,7 +2881,7 @@ func DeleteSmfContextProcedure(collName string, ueId string, pduSessionId string } } -func HandleQuerySmfRegistration(request *http_wrapper.Request) *http_wrapper.Response { +func HandleQuerySmfRegistration(request *httpwrapper.Request) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle QuerySmfRegistration") ueId := request.Params["ueId"] @@ -2890,13 +2890,13 @@ func HandleQuerySmfRegistration(request *http_wrapper.Request) *http_wrapper.Res response, problemDetails := QuerySmfRegistrationProcedure(collName, ueId, pduSessionId) if response != nil { - return http_wrapper.NewResponse(http.StatusOK, nil, response) + return httpwrapper.NewResponse(http.StatusOK, nil, response) } else if problemDetails != nil { - return http_wrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) + return httpwrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) } pd := util.ProblemDetailsUpspecified("") - return http_wrapper.NewResponse(int(pd.Status), nil, pd) + return httpwrapper.NewResponse(int(pd.Status), nil, pd) } func QuerySmfRegistrationProcedure(collName string, ueId string, @@ -2920,7 +2920,7 @@ func QuerySmfRegistrationProcedure(collName string, ueId string, } } -func HandleQuerySmfRegList(request *http_wrapper.Request) *http_wrapper.Response { +func HandleQuerySmfRegList(request *httpwrapper.Request) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle QuerySmfRegList") collName := "subscriptionData.contextData.smfRegistrations" @@ -2928,9 +2928,9 @@ func HandleQuerySmfRegList(request *http_wrapper.Request) *http_wrapper.Response response := QuerySmfRegListProcedure(collName, ueId) if response == nil { - return http_wrapper.NewResponse(http.StatusOK, nil, []map[string]interface{}{}) + return httpwrapper.NewResponse(http.StatusOK, nil, []map[string]interface{}{}) } else { - return http_wrapper.NewResponse(http.StatusOK, nil, response) + return httpwrapper.NewResponse(http.StatusOK, nil, response) } } @@ -2949,7 +2949,7 @@ func QuerySmfRegListProcedure(collName string, ueId string) *[]map[string]interf } } -func HandleQuerySmfSelectData(request *http_wrapper.Request) *http_wrapper.Response { +func HandleQuerySmfSelectData(request *httpwrapper.Request) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle QuerySmfSelectData") collName := "subscriptionData.provisionedData.smfSelectionSubscriptionData" @@ -2958,9 +2958,9 @@ func HandleQuerySmfSelectData(request *http_wrapper.Request) *http_wrapper.Respo response, problemDetails := QuerySmfSelectDataProcedure(collName, ueId, servingPlmnId) if problemDetails == nil { - return http_wrapper.NewResponse(http.StatusOK, nil, response) + return httpwrapper.NewResponse(http.StatusOK, nil, response) } else { - return http_wrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) + return httpwrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) } } @@ -2979,7 +2979,7 @@ func QuerySmfSelectDataProcedure(collName string, ueId string, } } -func HandleCreateSmsfContext3gpp(request *http_wrapper.Request) *http_wrapper.Response { +func HandleCreateSmsfContext3gpp(request *httpwrapper.Request) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle CreateSmsfContext3gpp") SmsfRegistration := request.Body.(models.SmsfRegistration) @@ -2988,7 +2988,7 @@ func HandleCreateSmsfContext3gpp(request *http_wrapper.Request) *http_wrapper.Re CreateSmsfContext3gppProcedure(collName, ueId, SmsfRegistration) - return http_wrapper.NewResponse(http.StatusNoContent, nil, map[string]interface{}{}) + return httpwrapper.NewResponse(http.StatusNoContent, nil, map[string]interface{}{}) } func CreateSmsfContext3gppProcedure(collName string, ueId string, SmsfRegistration models.SmsfRegistration) { @@ -3002,14 +3002,14 @@ func CreateSmsfContext3gppProcedure(collName string, ueId string, SmsfRegistrati } } -func HandleDeleteSmsfContext3gpp(request *http_wrapper.Request) *http_wrapper.Response { +func HandleDeleteSmsfContext3gpp(request *httpwrapper.Request) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle DeleteSmsfContext3gpp") collName := "subscriptionData.contextData.smsf3gppAccess" ueId := request.Params["ueId"] DeleteSmsfContext3gppProcedure(collName, ueId) - return http_wrapper.NewResponse(http.StatusNoContent, nil, map[string]interface{}{}) + return httpwrapper.NewResponse(http.StatusNoContent, nil, map[string]interface{}{}) } func DeleteSmsfContext3gppProcedure(collName string, ueId string) { @@ -3020,7 +3020,7 @@ func DeleteSmsfContext3gppProcedure(collName string, ueId string) { } } -func HandleQuerySmsfContext3gpp(request *http_wrapper.Request) *http_wrapper.Response { +func HandleQuerySmsfContext3gpp(request *httpwrapper.Request) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle QuerySmsfContext3gpp") collName := "subscriptionData.contextData.smsf3gppAccess" @@ -3028,13 +3028,13 @@ func HandleQuerySmsfContext3gpp(request *http_wrapper.Request) *http_wrapper.Res response, problemDetails := QuerySmsfContext3gppProcedure(collName, ueId) if response != nil { - return http_wrapper.NewResponse(http.StatusOK, nil, response) + return httpwrapper.NewResponse(http.StatusOK, nil, response) } else if problemDetails != nil { - return http_wrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) + return httpwrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) } pd := util.ProblemDetailsUpspecified("") - return http_wrapper.NewResponse(int(pd.Status), nil, pd) + return httpwrapper.NewResponse(int(pd.Status), nil, pd) } func QuerySmsfContext3gppProcedure(collName string, ueId string) (*map[string]interface{}, *models.ProblemDetails) { @@ -3052,7 +3052,7 @@ func QuerySmsfContext3gppProcedure(collName string, ueId string) (*map[string]in } } -func HandleCreateSmsfContextNon3gpp(request *http_wrapper.Request) *http_wrapper.Response { +func HandleCreateSmsfContextNon3gpp(request *httpwrapper.Request) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle CreateSmsfContextNon3gpp") SmsfRegistration := request.Body.(models.SmsfRegistration) @@ -3061,7 +3061,7 @@ func HandleCreateSmsfContextNon3gpp(request *http_wrapper.Request) *http_wrapper CreateSmsfContextNon3gppProcedure(SmsfRegistration, collName, ueId) - return http_wrapper.NewResponse(http.StatusNoContent, nil, map[string]interface{}{}) + return httpwrapper.NewResponse(http.StatusNoContent, nil, map[string]interface{}{}) } func CreateSmsfContextNon3gppProcedure(SmsfRegistration models.SmsfRegistration, collName string, ueId string) { @@ -3075,14 +3075,14 @@ func CreateSmsfContextNon3gppProcedure(SmsfRegistration models.SmsfRegistration, } } -func HandleDeleteSmsfContextNon3gpp(request *http_wrapper.Request) *http_wrapper.Response { +func HandleDeleteSmsfContextNon3gpp(request *httpwrapper.Request) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle DeleteSmsfContextNon3gpp") collName := "subscriptionData.contextData.smsfNon3gppAccess" ueId := request.Params["ueId"] DeleteSmsfContextNon3gppProcedure(collName, ueId) - return http_wrapper.NewResponse(http.StatusNoContent, nil, map[string]interface{}{}) + return httpwrapper.NewResponse(http.StatusNoContent, nil, map[string]interface{}{}) } func DeleteSmsfContextNon3gppProcedure(collName string, ueId string) { @@ -3093,7 +3093,7 @@ func DeleteSmsfContextNon3gppProcedure(collName string, ueId string) { } } -func HandleQuerySmsfContextNon3gpp(request *http_wrapper.Request) *http_wrapper.Response { +func HandleQuerySmsfContextNon3gpp(request *httpwrapper.Request) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle QuerySmsfContextNon3gpp") ueId := request.Params["ueId"] @@ -3101,13 +3101,13 @@ func HandleQuerySmsfContextNon3gpp(request *http_wrapper.Request) *http_wrapper. response, problemDetails := QuerySmsfContextNon3gppProcedure(collName, ueId) if response != nil { - return http_wrapper.NewResponse(http.StatusOK, nil, response) + return httpwrapper.NewResponse(http.StatusOK, nil, response) } else if problemDetails != nil { - return http_wrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) + return httpwrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) } pd := util.ProblemDetailsUpspecified("") - return http_wrapper.NewResponse(int(pd.Status), nil, pd) + return httpwrapper.NewResponse(int(pd.Status), nil, pd) } func QuerySmsfContextNon3gppProcedure(collName string, ueId string) (*map[string]interface{}, *models.ProblemDetails) { @@ -3125,7 +3125,7 @@ func QuerySmsfContextNon3gppProcedure(collName string, ueId string) (*map[string } } -func HandleQuerySmsMngData(request *http_wrapper.Request) *http_wrapper.Response { +func HandleQuerySmsMngData(request *httpwrapper.Request) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle QuerySmsMngData") collName := "subscriptionData.provisionedData.smsMngData" @@ -3134,13 +3134,13 @@ func HandleQuerySmsMngData(request *http_wrapper.Request) *http_wrapper.Response response, problemDetails := QuerySmsMngDataProcedure(collName, ueId, servingPlmnId) if response != nil { - return http_wrapper.NewResponse(http.StatusOK, nil, response) + return httpwrapper.NewResponse(http.StatusOK, nil, response) } else if problemDetails != nil { - return http_wrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) + return httpwrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) } pd := util.ProblemDetailsUpspecified("") - return http_wrapper.NewResponse(int(pd.Status), nil, pd) + return httpwrapper.NewResponse(int(pd.Status), nil, pd) } func QuerySmsMngDataProcedure(collName string, ueId string, @@ -3158,7 +3158,7 @@ func QuerySmsMngDataProcedure(collName string, ueId string, } } -func HandleQuerySmsData(request *http_wrapper.Request) *http_wrapper.Response { +func HandleQuerySmsData(request *httpwrapper.Request) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle QuerySmsData") ueId := request.Params["ueId"] @@ -3168,13 +3168,13 @@ func HandleQuerySmsData(request *http_wrapper.Request) *http_wrapper.Response { response, problemDetails := QuerySmsDataProcedure(collName, ueId, servingPlmnId) if response != nil { - return http_wrapper.NewResponse(http.StatusOK, nil, response) + return httpwrapper.NewResponse(http.StatusOK, nil, response) } else if problemDetails != nil { - return http_wrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) + return httpwrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) } pd := util.ProblemDetailsUpspecified("") - return http_wrapper.NewResponse(int(pd.Status), nil, pd) + return httpwrapper.NewResponse(int(pd.Status), nil, pd) } func QuerySmsDataProcedure(collName string, ueId string, @@ -3193,7 +3193,7 @@ func QuerySmsDataProcedure(collName string, ueId string, } } -func HandlePostSubscriptionDataSubscriptions(request *http_wrapper.Request) *http_wrapper.Response { +func HandlePostSubscriptionDataSubscriptions(request *httpwrapper.Request) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle PostSubscriptionDataSubscriptions") SubscriptionDataSubscriptions := request.Body.(models.SubscriptionDataSubscriptions) @@ -3202,7 +3202,7 @@ func HandlePostSubscriptionDataSubscriptions(request *http_wrapper.Request) *htt headers := http.Header{} headers.Set("Location", locationHeader) - return http_wrapper.NewResponse(http.StatusCreated, headers, SubscriptionDataSubscriptions) + return httpwrapper.NewResponse(http.StatusCreated, headers, SubscriptionDataSubscriptions) } func PostSubscriptionDataSubscriptionsProcedure( @@ -3221,7 +3221,7 @@ func PostSubscriptionDataSubscriptionsProcedure( return locationHeader } -func HandleRemovesubscriptionDataSubscriptions(request *http_wrapper.Request) *http_wrapper.Response { +func HandleRemovesubscriptionDataSubscriptions(request *httpwrapper.Request) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle RemovesubscriptionDataSubscriptions") subsId := request.Params["subsId"] @@ -3229,9 +3229,9 @@ func HandleRemovesubscriptionDataSubscriptions(request *http_wrapper.Request) *h problemDetails := RemovesubscriptionDataSubscriptionsProcedure(subsId) if problemDetails == nil { - return http_wrapper.NewResponse(http.StatusNoContent, nil, map[string]interface{}{}) + return httpwrapper.NewResponse(http.StatusNoContent, nil, map[string]interface{}{}) } else { - return http_wrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) + return httpwrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) } } @@ -3245,7 +3245,7 @@ func RemovesubscriptionDataSubscriptionsProcedure(subsId string) *models.Problem return nil } -func HandleQueryTraceData(request *http_wrapper.Request) *http_wrapper.Response { +func HandleQueryTraceData(request *httpwrapper.Request) *httpwrapper.Response { logger.DataRepoLog.Infof("Handle QueryTraceData") collName := "subscriptionData.provisionedData.traceData" @@ -3255,13 +3255,13 @@ func HandleQueryTraceData(request *http_wrapper.Request) *http_wrapper.Response response, problemDetails := QueryTraceDataProcedure(collName, ueId, servingPlmnId) if response != nil { - return http_wrapper.NewResponse(http.StatusOK, nil, response) + return httpwrapper.NewResponse(http.StatusOK, nil, response) } else if problemDetails != nil { - return http_wrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) + return httpwrapper.NewResponse(int(problemDetails.Status), nil, problemDetails) } pd := util.ProblemDetailsUpspecified("") - return http_wrapper.NewResponse(int(pd.Status), nil, pd) + return httpwrapper.NewResponse(int(pd.Status), nil, pd) } func QueryTraceDataProcedure(collName string, ueId string,