From c9c04fe76b3e22cf1405e35b634e3cad51553077 Mon Sep 17 00:00:00 2001 From: Ajay Lotan Thakur Date: Thu, 26 May 2022 19:21:58 -0700 Subject: [PATCH] Dev cleanup dep (#21) * Removing dependency --- Dockerfile | 2 +- Makefile | 6 +- consumer/nf_discovery.go | 6 +- consumer/nf_managemant.go | 12 +- context/context.go | 2 +- ...and_mobility_subscription_data_document.go | 10 +- ...i_amf3_gpp_access_registration_document.go | 10 +- ...f_non3_gpp_access_registration_document.go | 10 +- .../api_amf_subscription_info_document.go | 10 +- .../api_authentication_data_document.go | 10 +- .../api_authentication_so_r_document.go | 10 +- .../api_authentication_status_document.go | 10 +- datarepository/api_default.go | 12 +- ...pi_event_amf_subscription_info_document.go | 10 +- .../api_event_exposure_data_document.go | 10 +- ...nt_exposure_group_subscription_document.go | 10 +- ...exposure_group_subscriptions_collection.go | 10 +- ...pi_event_exposure_subscription_document.go | 10 +- ...event_exposure_subscriptions_collection.go | 10 +- ...erator_specific_data_container_document.go | 10 +- .../api_parameter_provision_document.go | 10 +- .../api_provisioned_data_document.go | 10 +- ...api_provisioned_parameter_data_document.go | 10 +- ...pi_query_amf_subscription_info_document.go | 10 +- ..._identity_data_by_supi_or_gpsi_document.go | 10 +- ...query_odb_data_by_supi_or_gpsi_document.go | 10 +- .../api_retrieval_of_shared_data.go | 10 +- .../api_sdm_subscription_document.go | 10 +- .../api_sdm_subscriptions_collection.go | 10 +- ...pi_session_management_subscription_data.go | 10 +- .../api_smf_registration_document.go | 10 +- .../api_smf_registrations_collection.go | 10 +- ...mf_selection_subscription_data_document.go | 10 +- ...s_management_subscription_data_document.go | 10 +- .../api_sms_subscription_data_document.go | 10 +- .../api_smsf3_gpp_registration_document.go | 10 +- ...api_smsf_non3_gpp_registration_document.go | 10 +- .../api_subs_to_nofify_collection.go | 10 +- datarepository/api_subs_to_notify_document.go | 10 +- datarepository/api_trace_data_document.go | 10 +- datarepository/routers.go | 4 +- factory/config.go | 6 +- factory/factory.go | 2 +- go.mod | 25 ++-- go.sum | 115 ++++++++---------- producer/callback.go | 4 +- producer/callback/callback.go | 8 +- producer/data_repository.go | 12 +- service/init.go | 43 ++----- udr.go | 6 +- util/convert.go | 4 +- util/init_context.go | 8 +- util/path.go | 4 +- util/path_debug.go | 4 +- util/util.go | 2 +- 55 files changed, 296 insertions(+), 331 deletions(-) diff --git a/Dockerfile b/Dockerfile index a67f006..7eefa72 100644 --- a/Dockerfile +++ b/Dockerfile @@ -41,4 +41,4 @@ RUN mkdir -p udr/ # Copy executable and default certs COPY --from=builder /go/src/udr/bin/* ./udr -WORKDIR /free5gc/udr +WORKDIR /omec-project/udr diff --git a/Makefile b/Makefile index b8bc902..42db253 100644 --- a/Makefile +++ b/Makefile @@ -38,10 +38,6 @@ VERSION = $(shell git describe --tags) BUILD_TIME = $(shell date -u +"%Y-%m-%dT%H:%M:%SZ") COMMIT_HASH = $(shell git submodule status | grep $(GO_SRC_PATH)/$(@F) | awk '{print $$(1)}' | cut -c1-8) COMMIT_TIME = $(shell cd $(GO_SRC_PATH) && git log --pretty="%ai" -1 | awk '{time=$$(1)"T"$$(2)"Z"; print time}') -LDFLAGS = -X github.com/free5gc/version.VERSION=$(VERSION) \ - -X github.com/free5gc/version.BUILD_TIME=$(BUILD_TIME) \ - -X github.com/free5gc/version.COMMIT_HASH=$(COMMIT_HASH) \ - -X github.com/free5gc/version.COMMIT_TIME=$(COMMIT_TIME) .PHONY: $(NF) clean docker-build docker-push @@ -57,7 +53,7 @@ $(GO_BIN_PATH)/%: %.go $(NF_GO_FILES) # $(@F): The file-within-directory part of the file name of the target. @echo "Start building $(@F)...." cd $(GO_SRC_PATH)/ && \ - CGO_ENABLED=0 go build -ldflags "$(LDFLAGS)" -o $(ROOT_PATH)/$@ $(@F).go + CGO_ENABLED=0 go build -o $(ROOT_PATH)/$@ $(@F).go vpath %.go $(addprefix $(GO_SRC_PATH)/, $(GO_NF)) diff --git a/consumer/nf_discovery.go b/consumer/nf_discovery.go index 8da5e31..e1df9af 100644 --- a/consumer/nf_discovery.go +++ b/consumer/nf_discovery.go @@ -10,9 +10,9 @@ import ( "fmt" "net/http" - "github.com/free5gc/openapi/Nnrf_NFDiscovery" - "github.com/free5gc/openapi/models" - "github.com/free5gc/udr/logger" + "github.com/omec-project/openapi/Nnrf_NFDiscovery" + "github.com/omec-project/openapi/models" + "github.com/omec-project/udr/logger" ) func SendSearchNFInstances(nrfUri string, targetNfType, requestNfType models.NfType, diff --git a/consumer/nf_managemant.go b/consumer/nf_managemant.go index 1d954a5..0d1d577 100644 --- a/consumer/nf_managemant.go +++ b/consumer/nf_managemant.go @@ -13,12 +13,12 @@ import ( "strings" "time" - "github.com/free5gc/openapi" - "github.com/free5gc/openapi/Nnrf_NFManagement" - "github.com/free5gc/openapi/models" - udr_context "github.com/free5gc/udr/context" - "github.com/free5gc/udr/factory" - "github.com/free5gc/udr/logger" + "github.com/omec-project/openapi" + "github.com/omec-project/openapi/Nnrf_NFManagement" + "github.com/omec-project/openapi/models" + udr_context "github.com/omec-project/udr/context" + "github.com/omec-project/udr/factory" + "github.com/omec-project/udr/logger" ) func BuildNFInstance(context *udr_context.UDRContext) models.NfProfile { diff --git a/context/context.go b/context/context.go index 593f60d..6b1156c 100644 --- a/context/context.go +++ b/context/context.go @@ -9,7 +9,7 @@ import ( "fmt" "sync" - "github.com/free5gc/openapi/models" + "github.com/omec-project/openapi/models" ) var udrContext = UDRContext{} diff --git a/datarepository/api_access_and_mobility_subscription_data_document.go b/datarepository/api_access_and_mobility_subscription_data_document.go index 1d76491..9374170 100644 --- a/datarepository/api_access_and_mobility_subscription_data_document.go +++ b/datarepository/api_access_and_mobility_subscription_data_document.go @@ -19,11 +19,11 @@ import ( "github.com/gin-gonic/gin" - "github.com/free5gc/http_wrapper" - "github.com/free5gc/openapi" - "github.com/free5gc/openapi/models" - "github.com/free5gc/udr/logger" - "github.com/free5gc/udr/producer" + "github.com/omec-project/http_wrapper" + "github.com/omec-project/openapi" + "github.com/omec-project/openapi/models" + "github.com/omec-project/udr/logger" + "github.com/omec-project/udr/producer" ) // HTTPQueryAmData - Retrieves the access and mobility subscription data of a UE diff --git a/datarepository/api_amf3_gpp_access_registration_document.go b/datarepository/api_amf3_gpp_access_registration_document.go index 3fff010..28901a3 100644 --- a/datarepository/api_amf3_gpp_access_registration_document.go +++ b/datarepository/api_amf3_gpp_access_registration_document.go @@ -19,11 +19,11 @@ import ( "github.com/gin-gonic/gin" - "github.com/free5gc/http_wrapper" - "github.com/free5gc/openapi" - "github.com/free5gc/openapi/models" - "github.com/free5gc/udr/logger" - "github.com/free5gc/udr/producer" + "github.com/omec-project/http_wrapper" + "github.com/omec-project/openapi" + "github.com/omec-project/openapi/models" + "github.com/omec-project/udr/logger" + "github.com/omec-project/udr/producer" ) // HTTPAmfContext3gpp - To modify the AMF context data of a UE using 3gpp access in the UDR diff --git a/datarepository/api_amf_non3_gpp_access_registration_document.go b/datarepository/api_amf_non3_gpp_access_registration_document.go index c5ee960..e9445d6 100644 --- a/datarepository/api_amf_non3_gpp_access_registration_document.go +++ b/datarepository/api_amf_non3_gpp_access_registration_document.go @@ -19,11 +19,11 @@ import ( "github.com/gin-gonic/gin" - "github.com/free5gc/http_wrapper" - "github.com/free5gc/openapi" - "github.com/free5gc/openapi/models" - "github.com/free5gc/udr/logger" - "github.com/free5gc/udr/producer" + "github.com/omec-project/http_wrapper" + "github.com/omec-project/openapi" + "github.com/omec-project/openapi/models" + "github.com/omec-project/udr/logger" + "github.com/omec-project/udr/producer" ) // HTTPAmfContextNon3gpp - To modify the AMF context data of a UE using non 3gpp access in the UDR diff --git a/datarepository/api_amf_subscription_info_document.go b/datarepository/api_amf_subscription_info_document.go index 61e61fc..fbc34be 100644 --- a/datarepository/api_amf_subscription_info_document.go +++ b/datarepository/api_amf_subscription_info_document.go @@ -19,11 +19,11 @@ import ( "github.com/gin-gonic/gin" - "github.com/free5gc/http_wrapper" - "github.com/free5gc/openapi" - "github.com/free5gc/openapi/models" - "github.com/free5gc/udr/logger" - "github.com/free5gc/udr/producer" + "github.com/omec-project/http_wrapper" + "github.com/omec-project/openapi" + "github.com/omec-project/openapi/models" + "github.com/omec-project/udr/logger" + "github.com/omec-project/udr/producer" ) // HTTPModifyAmfSubscriptionInfo - modify the AMF Subscription Info diff --git a/datarepository/api_authentication_data_document.go b/datarepository/api_authentication_data_document.go index 17416ec..c413eac 100644 --- a/datarepository/api_authentication_data_document.go +++ b/datarepository/api_authentication_data_document.go @@ -19,11 +19,11 @@ import ( "github.com/gin-gonic/gin" - "github.com/free5gc/http_wrapper" - "github.com/free5gc/openapi" - "github.com/free5gc/openapi/models" - "github.com/free5gc/udr/logger" - "github.com/free5gc/udr/producer" + "github.com/omec-project/http_wrapper" + "github.com/omec-project/openapi" + "github.com/omec-project/openapi/models" + "github.com/omec-project/udr/logger" + "github.com/omec-project/udr/producer" ) // HTTPModifyAuthentication - modify the authentication subscription data of a UE diff --git a/datarepository/api_authentication_so_r_document.go b/datarepository/api_authentication_so_r_document.go index e1630e8..1bf022c 100644 --- a/datarepository/api_authentication_so_r_document.go +++ b/datarepository/api_authentication_so_r_document.go @@ -19,11 +19,11 @@ import ( "github.com/gin-gonic/gin" - "github.com/free5gc/http_wrapper" - "github.com/free5gc/openapi" - "github.com/free5gc/openapi/models" - "github.com/free5gc/udr/logger" - "github.com/free5gc/udr/producer" + "github.com/omec-project/http_wrapper" + "github.com/omec-project/openapi" + "github.com/omec-project/openapi/models" + "github.com/omec-project/udr/logger" + "github.com/omec-project/udr/producer" ) // HTTPCreateAuthenticationSoR - To store the SoR acknowledgement information of a UE diff --git a/datarepository/api_authentication_status_document.go b/datarepository/api_authentication_status_document.go index 7e031c0..8ec9852 100644 --- a/datarepository/api_authentication_status_document.go +++ b/datarepository/api_authentication_status_document.go @@ -19,11 +19,11 @@ import ( "github.com/gin-gonic/gin" - "github.com/free5gc/http_wrapper" - "github.com/free5gc/openapi" - "github.com/free5gc/openapi/models" - "github.com/free5gc/udr/logger" - "github.com/free5gc/udr/producer" + "github.com/omec-project/http_wrapper" + "github.com/omec-project/openapi" + "github.com/omec-project/openapi/models" + "github.com/omec-project/udr/logger" + "github.com/omec-project/udr/producer" ) // HTTPCreateAuthenticationStatus - To store the Authentication Status data of a UE diff --git a/datarepository/api_default.go b/datarepository/api_default.go index 9cc7439..580cebf 100644 --- a/datarepository/api_default.go +++ b/datarepository/api_default.go @@ -19,12 +19,12 @@ import ( "github.com/gin-gonic/gin" - "github.com/free5gc/http_wrapper" - "github.com/free5gc/openapi" - "github.com/free5gc/openapi/models" - "github.com/free5gc/udr/logger" - "github.com/free5gc/udr/producer" - "github.com/free5gc/udr/util" + "github.com/omec-project/http_wrapper" + "github.com/omec-project/openapi" + "github.com/omec-project/openapi/models" + "github.com/omec-project/udr/logger" + "github.com/omec-project/udr/producer" + "github.com/omec-project/udr/util" ) func sendResponse(c *gin.Context, rsp *http_wrapper.Response) { diff --git a/datarepository/api_event_amf_subscription_info_document.go b/datarepository/api_event_amf_subscription_info_document.go index 3a72b38..2864ac2 100644 --- a/datarepository/api_event_amf_subscription_info_document.go +++ b/datarepository/api_event_amf_subscription_info_document.go @@ -19,11 +19,11 @@ import ( "github.com/gin-gonic/gin" - "github.com/free5gc/http_wrapper" - "github.com/free5gc/openapi" - "github.com/free5gc/openapi/models" - "github.com/free5gc/udr/logger" - "github.com/free5gc/udr/producer" + "github.com/omec-project/http_wrapper" + "github.com/omec-project/openapi" + "github.com/omec-project/openapi/models" + "github.com/omec-project/udr/logger" + "github.com/omec-project/udr/producer" ) // HTTPCreateAMFSubscriptions - Creates AMF Subscription Info for an eeSubscription diff --git a/datarepository/api_event_exposure_data_document.go b/datarepository/api_event_exposure_data_document.go index cc66e6b..5d559f3 100644 --- a/datarepository/api_event_exposure_data_document.go +++ b/datarepository/api_event_exposure_data_document.go @@ -19,11 +19,11 @@ import ( "github.com/gin-gonic/gin" - "github.com/free5gc/http_wrapper" - "github.com/free5gc/openapi" - "github.com/free5gc/openapi/models" - "github.com/free5gc/udr/logger" - "github.com/free5gc/udr/producer" + "github.com/omec-project/http_wrapper" + "github.com/omec-project/openapi" + "github.com/omec-project/openapi/models" + "github.com/omec-project/udr/logger" + "github.com/omec-project/udr/producer" ) // HTTPQueryEEData - Retrieves the ee profile data of a UE diff --git a/datarepository/api_event_exposure_group_subscription_document.go b/datarepository/api_event_exposure_group_subscription_document.go index db1033a..226144f 100644 --- a/datarepository/api_event_exposure_group_subscription_document.go +++ b/datarepository/api_event_exposure_group_subscription_document.go @@ -19,11 +19,11 @@ import ( "github.com/gin-gonic/gin" - "github.com/free5gc/http_wrapper" - "github.com/free5gc/openapi" - "github.com/free5gc/openapi/models" - "github.com/free5gc/udr/logger" - "github.com/free5gc/udr/producer" + "github.com/omec-project/http_wrapper" + "github.com/omec-project/openapi" + "github.com/omec-project/openapi/models" + "github.com/omec-project/udr/logger" + "github.com/omec-project/udr/producer" ) // HTTPRemoveEeGroupSubscriptions - Deletes a eeSubscription for a group of UEs or any UE diff --git a/datarepository/api_event_exposure_group_subscriptions_collection.go b/datarepository/api_event_exposure_group_subscriptions_collection.go index 0bd2ab3..5b4835c 100644 --- a/datarepository/api_event_exposure_group_subscriptions_collection.go +++ b/datarepository/api_event_exposure_group_subscriptions_collection.go @@ -19,11 +19,11 @@ import ( "github.com/gin-gonic/gin" - "github.com/free5gc/http_wrapper" - "github.com/free5gc/openapi" - "github.com/free5gc/openapi/models" - "github.com/free5gc/udr/logger" - "github.com/free5gc/udr/producer" + "github.com/omec-project/http_wrapper" + "github.com/omec-project/openapi" + "github.com/omec-project/openapi/models" + "github.com/omec-project/udr/logger" + "github.com/omec-project/udr/producer" ) // HTTPCreateEeGroupSubscriptions - Create individual EE subscription for a group of UEs or any UE diff --git a/datarepository/api_event_exposure_subscription_document.go b/datarepository/api_event_exposure_subscription_document.go index e211c4b..2cf296c 100644 --- a/datarepository/api_event_exposure_subscription_document.go +++ b/datarepository/api_event_exposure_subscription_document.go @@ -19,11 +19,11 @@ import ( "github.com/gin-gonic/gin" - "github.com/free5gc/http_wrapper" - "github.com/free5gc/openapi" - "github.com/free5gc/openapi/models" - "github.com/free5gc/udr/logger" - "github.com/free5gc/udr/producer" + "github.com/omec-project/http_wrapper" + "github.com/omec-project/openapi" + "github.com/omec-project/openapi/models" + "github.com/omec-project/udr/logger" + "github.com/omec-project/udr/producer" ) // HTTPRemoveeeSubscriptions - Deletes a eeSubscription diff --git a/datarepository/api_event_exposure_subscriptions_collection.go b/datarepository/api_event_exposure_subscriptions_collection.go index 43480e3..2ba1ea6 100644 --- a/datarepository/api_event_exposure_subscriptions_collection.go +++ b/datarepository/api_event_exposure_subscriptions_collection.go @@ -19,11 +19,11 @@ import ( "github.com/gin-gonic/gin" - "github.com/free5gc/http_wrapper" - "github.com/free5gc/openapi" - "github.com/free5gc/openapi/models" - "github.com/free5gc/udr/logger" - "github.com/free5gc/udr/producer" + "github.com/omec-project/http_wrapper" + "github.com/omec-project/openapi" + "github.com/omec-project/openapi/models" + "github.com/omec-project/udr/logger" + "github.com/omec-project/udr/producer" ) // HTTPCreateEeSubscriptions - Create individual EE subscription diff --git a/datarepository/api_operator_specific_data_container_document.go b/datarepository/api_operator_specific_data_container_document.go index d5c27d6..34feb95 100644 --- a/datarepository/api_operator_specific_data_container_document.go +++ b/datarepository/api_operator_specific_data_container_document.go @@ -19,11 +19,11 @@ import ( "github.com/gin-gonic/gin" - "github.com/free5gc/http_wrapper" - "github.com/free5gc/openapi" - "github.com/free5gc/openapi/models" - "github.com/free5gc/udr/logger" - "github.com/free5gc/udr/producer" + "github.com/omec-project/http_wrapper" + "github.com/omec-project/openapi" + "github.com/omec-project/openapi/models" + "github.com/omec-project/udr/logger" + "github.com/omec-project/udr/producer" ) // HTTPAmfContext3gpp - To modify operator specific data of a UE diff --git a/datarepository/api_parameter_provision_document.go b/datarepository/api_parameter_provision_document.go index e304c14..7d065e4 100644 --- a/datarepository/api_parameter_provision_document.go +++ b/datarepository/api_parameter_provision_document.go @@ -19,11 +19,11 @@ import ( "github.com/gin-gonic/gin" - "github.com/free5gc/http_wrapper" - "github.com/free5gc/openapi" - "github.com/free5gc/openapi/models" - "github.com/free5gc/udr/logger" - "github.com/free5gc/udr/producer" + "github.com/omec-project/http_wrapper" + "github.com/omec-project/openapi" + "github.com/omec-project/openapi/models" + "github.com/omec-project/udr/logger" + "github.com/omec-project/udr/producer" ) // HTTPGetppData - Read the profile of a given UE diff --git a/datarepository/api_provisioned_data_document.go b/datarepository/api_provisioned_data_document.go index 5272ca3..f94b8f3 100644 --- a/datarepository/api_provisioned_data_document.go +++ b/datarepository/api_provisioned_data_document.go @@ -19,11 +19,11 @@ import ( "github.com/gin-gonic/gin" - "github.com/free5gc/http_wrapper" - "github.com/free5gc/openapi" - "github.com/free5gc/openapi/models" - "github.com/free5gc/udr/logger" - "github.com/free5gc/udr/producer" + "github.com/omec-project/http_wrapper" + "github.com/omec-project/openapi" + "github.com/omec-project/openapi/models" + "github.com/omec-project/udr/logger" + "github.com/omec-project/udr/producer" ) // HTTPQueryProvisionedData - Retrieve multiple provisioned data sets of a UE diff --git a/datarepository/api_provisioned_parameter_data_document.go b/datarepository/api_provisioned_parameter_data_document.go index b51207a..fa9af4d 100644 --- a/datarepository/api_provisioned_parameter_data_document.go +++ b/datarepository/api_provisioned_parameter_data_document.go @@ -19,11 +19,11 @@ import ( "github.com/gin-gonic/gin" - "github.com/free5gc/http_wrapper" - "github.com/free5gc/openapi" - "github.com/free5gc/openapi/models" - "github.com/free5gc/udr/logger" - "github.com/free5gc/udr/producer" + "github.com/omec-project/http_wrapper" + "github.com/omec-project/openapi" + "github.com/omec-project/openapi/models" + "github.com/omec-project/udr/logger" + "github.com/omec-project/udr/producer" ) // HTTPModifyPpData - modify the provisioned parameter data diff --git a/datarepository/api_query_amf_subscription_info_document.go b/datarepository/api_query_amf_subscription_info_document.go index 3c9f1e9..e85403d 100644 --- a/datarepository/api_query_amf_subscription_info_document.go +++ b/datarepository/api_query_amf_subscription_info_document.go @@ -19,11 +19,11 @@ import ( "github.com/gin-gonic/gin" - "github.com/free5gc/http_wrapper" - "github.com/free5gc/openapi" - "github.com/free5gc/openapi/models" - "github.com/free5gc/udr/logger" - "github.com/free5gc/udr/producer" + "github.com/omec-project/http_wrapper" + "github.com/omec-project/openapi" + "github.com/omec-project/openapi/models" + "github.com/omec-project/udr/logger" + "github.com/omec-project/udr/producer" ) // HTTPGetAmfSubscriptionInfo - Retrieve AMF subscription Info 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 cf63e50..3669e2f 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,11 +19,11 @@ import ( "github.com/gin-gonic/gin" - "github.com/free5gc/http_wrapper" - "github.com/free5gc/openapi" - "github.com/free5gc/openapi/models" - "github.com/free5gc/udr/logger" - "github.com/free5gc/udr/producer" + "github.com/omec-project/http_wrapper" + "github.com/omec-project/openapi" + "github.com/omec-project/openapi/models" + "github.com/omec-project/udr/logger" + "github.com/omec-project/udr/producer" ) // HTTPGetIdentityData - Retrieve identity data by SUPI or GPSI 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 175bee4..04c66a7 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,11 +19,11 @@ import ( "github.com/gin-gonic/gin" - "github.com/free5gc/http_wrapper" - "github.com/free5gc/openapi" - "github.com/free5gc/openapi/models" - "github.com/free5gc/udr/logger" - "github.com/free5gc/udr/producer" + "github.com/omec-project/http_wrapper" + "github.com/omec-project/openapi" + "github.com/omec-project/openapi/models" + "github.com/omec-project/udr/logger" + "github.com/omec-project/udr/producer" ) // HTTPGetOdbData - Retrieve ODB Data data by SUPI or GPSI diff --git a/datarepository/api_retrieval_of_shared_data.go b/datarepository/api_retrieval_of_shared_data.go index 67243b2..1f16515 100644 --- a/datarepository/api_retrieval_of_shared_data.go +++ b/datarepository/api_retrieval_of_shared_data.go @@ -19,11 +19,11 @@ import ( "github.com/gin-gonic/gin" - "github.com/free5gc/http_wrapper" - "github.com/free5gc/openapi" - "github.com/free5gc/openapi/models" - "github.com/free5gc/udr/logger" - "github.com/free5gc/udr/producer" + "github.com/omec-project/http_wrapper" + "github.com/omec-project/openapi" + "github.com/omec-project/openapi/models" + "github.com/omec-project/udr/logger" + "github.com/omec-project/udr/producer" ) // HTTPGetSharedData - retrieve shared data diff --git a/datarepository/api_sdm_subscription_document.go b/datarepository/api_sdm_subscription_document.go index 9b715a4..1ba403f 100644 --- a/datarepository/api_sdm_subscription_document.go +++ b/datarepository/api_sdm_subscription_document.go @@ -19,11 +19,11 @@ import ( "github.com/gin-gonic/gin" - "github.com/free5gc/http_wrapper" - "github.com/free5gc/openapi" - "github.com/free5gc/openapi/models" - "github.com/free5gc/udr/logger" - "github.com/free5gc/udr/producer" + "github.com/omec-project/http_wrapper" + "github.com/omec-project/openapi" + "github.com/omec-project/openapi/models" + "github.com/omec-project/udr/logger" + "github.com/omec-project/udr/producer" ) // HTTPRemovesdmSubscriptions - Deletes a sdmsubscriptions diff --git a/datarepository/api_sdm_subscriptions_collection.go b/datarepository/api_sdm_subscriptions_collection.go index 0105de3..dd190e9 100644 --- a/datarepository/api_sdm_subscriptions_collection.go +++ b/datarepository/api_sdm_subscriptions_collection.go @@ -19,11 +19,11 @@ import ( "github.com/gin-gonic/gin" - "github.com/free5gc/http_wrapper" - "github.com/free5gc/openapi" - "github.com/free5gc/openapi/models" - "github.com/free5gc/udr/logger" - "github.com/free5gc/udr/producer" + "github.com/omec-project/http_wrapper" + "github.com/omec-project/openapi" + "github.com/omec-project/openapi/models" + "github.com/omec-project/udr/logger" + "github.com/omec-project/udr/producer" ) // HTTPCreateSdmSubscriptions - Create individual sdm subscription diff --git a/datarepository/api_session_management_subscription_data.go b/datarepository/api_session_management_subscription_data.go index 06fd46f..951ac60 100644 --- a/datarepository/api_session_management_subscription_data.go +++ b/datarepository/api_session_management_subscription_data.go @@ -19,11 +19,11 @@ import ( "github.com/gin-gonic/gin" - "github.com/free5gc/http_wrapper" - "github.com/free5gc/openapi" - "github.com/free5gc/openapi/models" - "github.com/free5gc/udr/logger" - "github.com/free5gc/udr/producer" + "github.com/omec-project/http_wrapper" + "github.com/omec-project/openapi" + "github.com/omec-project/openapi/models" + "github.com/omec-project/udr/logger" + "github.com/omec-project/udr/producer" ) // HTTPQuerySmData - Retrieves the Session Management subscription data of a UE diff --git a/datarepository/api_smf_registration_document.go b/datarepository/api_smf_registration_document.go index 21813e2..3423d5d 100644 --- a/datarepository/api_smf_registration_document.go +++ b/datarepository/api_smf_registration_document.go @@ -19,11 +19,11 @@ import ( "github.com/gin-gonic/gin" - "github.com/free5gc/http_wrapper" - "github.com/free5gc/openapi" - "github.com/free5gc/openapi/models" - "github.com/free5gc/udr/logger" - "github.com/free5gc/udr/producer" + "github.com/omec-project/http_wrapper" + "github.com/omec-project/openapi" + "github.com/omec-project/openapi/models" + "github.com/omec-project/udr/logger" + "github.com/omec-project/udr/producer" ) // HTTPCreateSmfContextNon3gpp - To create an individual SMF context data of a UE in the UDR diff --git a/datarepository/api_smf_registrations_collection.go b/datarepository/api_smf_registrations_collection.go index 18ccee3..7aac6af 100644 --- a/datarepository/api_smf_registrations_collection.go +++ b/datarepository/api_smf_registrations_collection.go @@ -19,11 +19,11 @@ import ( "github.com/gin-gonic/gin" - "github.com/free5gc/http_wrapper" - "github.com/free5gc/openapi" - "github.com/free5gc/openapi/models" - "github.com/free5gc/udr/logger" - "github.com/free5gc/udr/producer" + "github.com/omec-project/http_wrapper" + "github.com/omec-project/openapi" + "github.com/omec-project/openapi/models" + "github.com/omec-project/udr/logger" + "github.com/omec-project/udr/producer" ) // HTTPQuerySmfRegList - Retrieves the SMF registration list of a UE diff --git a/datarepository/api_smf_selection_subscription_data_document.go b/datarepository/api_smf_selection_subscription_data_document.go index 2c32a48..1fccf07 100644 --- a/datarepository/api_smf_selection_subscription_data_document.go +++ b/datarepository/api_smf_selection_subscription_data_document.go @@ -19,11 +19,11 @@ import ( "github.com/gin-gonic/gin" - "github.com/free5gc/http_wrapper" - "github.com/free5gc/openapi" - "github.com/free5gc/openapi/models" - "github.com/free5gc/udr/logger" - "github.com/free5gc/udr/producer" + "github.com/omec-project/http_wrapper" + "github.com/omec-project/openapi" + "github.com/omec-project/openapi/models" + "github.com/omec-project/udr/logger" + "github.com/omec-project/udr/producer" ) // HTTPQuerySmfSelectData - Retrieves the SMF selection subscription data of a UE diff --git a/datarepository/api_sms_management_subscription_data_document.go b/datarepository/api_sms_management_subscription_data_document.go index dadce8e..241396e 100644 --- a/datarepository/api_sms_management_subscription_data_document.go +++ b/datarepository/api_sms_management_subscription_data_document.go @@ -19,11 +19,11 @@ import ( "github.com/gin-gonic/gin" - "github.com/free5gc/http_wrapper" - "github.com/free5gc/openapi" - "github.com/free5gc/openapi/models" - "github.com/free5gc/udr/logger" - "github.com/free5gc/udr/producer" + "github.com/omec-project/http_wrapper" + "github.com/omec-project/openapi" + "github.com/omec-project/openapi/models" + "github.com/omec-project/udr/logger" + "github.com/omec-project/udr/producer" ) // HTTPQuerySmsMngData - Retrieves the SMS management subscription data of a UE diff --git a/datarepository/api_sms_subscription_data_document.go b/datarepository/api_sms_subscription_data_document.go index 3f312b8..4edfadb 100644 --- a/datarepository/api_sms_subscription_data_document.go +++ b/datarepository/api_sms_subscription_data_document.go @@ -19,11 +19,11 @@ import ( "github.com/gin-gonic/gin" - "github.com/free5gc/http_wrapper" - "github.com/free5gc/openapi" - "github.com/free5gc/openapi/models" - "github.com/free5gc/udr/logger" - "github.com/free5gc/udr/producer" + "github.com/omec-project/http_wrapper" + "github.com/omec-project/openapi" + "github.com/omec-project/openapi/models" + "github.com/omec-project/udr/logger" + "github.com/omec-project/udr/producer" ) // HTTPQuerySmsData - Retrieves the SMS subscription data of a UE diff --git a/datarepository/api_smsf3_gpp_registration_document.go b/datarepository/api_smsf3_gpp_registration_document.go index 02a136e..7dbb137 100644 --- a/datarepository/api_smsf3_gpp_registration_document.go +++ b/datarepository/api_smsf3_gpp_registration_document.go @@ -19,11 +19,11 @@ import ( "github.com/gin-gonic/gin" - "github.com/free5gc/http_wrapper" - "github.com/free5gc/openapi" - "github.com/free5gc/openapi/models" - "github.com/free5gc/udr/logger" - "github.com/free5gc/udr/producer" + "github.com/omec-project/http_wrapper" + "github.com/omec-project/openapi" + "github.com/omec-project/openapi/models" + "github.com/omec-project/udr/logger" + "github.com/omec-project/udr/producer" ) // HTTPCreateSmsfContext3gpp - Create the SMSF context data of a UE via 3GPP access diff --git a/datarepository/api_smsf_non3_gpp_registration_document.go b/datarepository/api_smsf_non3_gpp_registration_document.go index 36ffec6..791fa3d 100644 --- a/datarepository/api_smsf_non3_gpp_registration_document.go +++ b/datarepository/api_smsf_non3_gpp_registration_document.go @@ -19,11 +19,11 @@ import ( "github.com/gin-gonic/gin" - "github.com/free5gc/http_wrapper" - "github.com/free5gc/openapi" - "github.com/free5gc/openapi/models" - "github.com/free5gc/udr/logger" - "github.com/free5gc/udr/producer" + "github.com/omec-project/http_wrapper" + "github.com/omec-project/openapi" + "github.com/omec-project/openapi/models" + "github.com/omec-project/udr/logger" + "github.com/omec-project/udr/producer" ) // HTTPCreateSmsfContextNon3gpp - Create the SMSF context data of a UE via non-3GPP access diff --git a/datarepository/api_subs_to_nofify_collection.go b/datarepository/api_subs_to_nofify_collection.go index 4b3660d..40ac92f 100644 --- a/datarepository/api_subs_to_nofify_collection.go +++ b/datarepository/api_subs_to_nofify_collection.go @@ -19,11 +19,11 @@ import ( "github.com/gin-gonic/gin" - "github.com/free5gc/http_wrapper" - "github.com/free5gc/openapi" - "github.com/free5gc/openapi/models" - "github.com/free5gc/udr/logger" - "github.com/free5gc/udr/producer" + "github.com/omec-project/http_wrapper" + "github.com/omec-project/openapi" + "github.com/omec-project/openapi/models" + "github.com/omec-project/udr/logger" + "github.com/omec-project/udr/producer" ) // HTTPPostSubscriptionDataSubscriptions - Subscription data subscriptions diff --git a/datarepository/api_subs_to_notify_document.go b/datarepository/api_subs_to_notify_document.go index 1d9ca7a..fb5c6ba 100644 --- a/datarepository/api_subs_to_notify_document.go +++ b/datarepository/api_subs_to_notify_document.go @@ -19,11 +19,11 @@ import ( "github.com/gin-gonic/gin" - "github.com/free5gc/http_wrapper" - "github.com/free5gc/openapi" - "github.com/free5gc/openapi/models" - "github.com/free5gc/udr/logger" - "github.com/free5gc/udr/producer" + "github.com/omec-project/http_wrapper" + "github.com/omec-project/openapi" + "github.com/omec-project/openapi/models" + "github.com/omec-project/udr/logger" + "github.com/omec-project/udr/producer" ) // HTTPRemovesubscriptionDataSubscriptions - Deletes a subscriptionDataSubscriptions diff --git a/datarepository/api_trace_data_document.go b/datarepository/api_trace_data_document.go index 19ce97b..8c08a79 100644 --- a/datarepository/api_trace_data_document.go +++ b/datarepository/api_trace_data_document.go @@ -19,11 +19,11 @@ import ( "github.com/gin-gonic/gin" - "github.com/free5gc/http_wrapper" - "github.com/free5gc/openapi" - "github.com/free5gc/openapi/models" - "github.com/free5gc/udr/logger" - "github.com/free5gc/udr/producer" + "github.com/omec-project/http_wrapper" + "github.com/omec-project/openapi" + "github.com/omec-project/openapi/models" + "github.com/omec-project/udr/logger" + "github.com/omec-project/udr/producer" ) // HTTPQueryTraceData - Retrieves the trace configuration data of a UE diff --git a/datarepository/routers.go b/datarepository/routers.go index 429f28d..8c7d88e 100644 --- a/datarepository/routers.go +++ b/datarepository/routers.go @@ -20,8 +20,8 @@ import ( "github.com/gin-gonic/gin" - "github.com/free5gc/logger_util" - "github.com/free5gc/udr/logger" + "github.com/omec-project/logger_util" + "github.com/omec-project/udr/logger" ) // Route is the information for every URI. diff --git a/factory/config.go b/factory/config.go index c49bc63..ab5681e 100644 --- a/factory/config.go +++ b/factory/config.go @@ -11,9 +11,9 @@ package factory import ( - "github.com/free5gc/logger_util" - "github.com/free5gc/openapi/models" - "github.com/free5gc/udr/logger" + "github.com/omec-project/logger_util" + "github.com/omec-project/openapi/models" + "github.com/omec-project/udr/logger" protos "github.com/omec-project/config5g/proto/sdcoreConfig" ) diff --git a/factory/factory.go b/factory/factory.go index 04deb0a..7d977e3 100644 --- a/factory/factory.go +++ b/factory/factory.go @@ -17,7 +17,7 @@ import ( "gopkg.in/yaml.v2" - "github.com/free5gc/udr/logger" + "github.com/omec-project/udr/logger" "github.com/omec-project/config5g/proto/client" protos "github.com/omec-project/config5g/proto/sdcoreConfig" "github.com/sirupsen/logrus" diff --git a/go.mod b/go.mod index 5acd783..de0e772 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/free5gc/udr +module github.com/omec-project/udr go 1.14 @@ -6,22 +6,19 @@ require ( github.com/antonfisher/nested-logrus-formatter v1.3.1 github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect github.com/evanphx/json-patch v4.9.0+incompatible - github.com/free5gc/MongoDBLibrary v1.0.0 - github.com/free5gc/http2_util v1.0.0 - github.com/free5gc/http_wrapper v1.0.0 - github.com/free5gc/logger_util v1.0.0 - github.com/free5gc/openapi v1.0.0 - github.com/free5gc/path_util v1.0.0 - github.com/free5gc/version v1.0.0 - github.com/gin-gonic/gin v1.6.3 + github.com/gin-gonic/gin v1.7.0 github.com/google/uuid v1.1.2 - github.com/mitchellh/mapstructure v1.4.0 - github.com/omec-project/config5g v1.0.7 + github.com/mitchellh/mapstructure v1.4.1 + github.com/omec-project/MongoDBLibrary v1.1.0 + github.com/omec-project/config5g v1.1.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 github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/sirupsen/logrus v1.8.1 github.com/urfave/cli v1.22.5 - go.mongodb.org/mongo-driver v1.4.4 + go.mongodb.org/mongo-driver v1.7.3 gopkg.in/yaml.v2 v2.4.0 ) - -replace github.com/free5gc/udr => ../udr diff --git a/go.sum b/go.sum index 16f447e..38dc2b2 100644 --- a/go.sum +++ b/go.sum @@ -38,9 +38,8 @@ github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kd github.com/antonfisher/nested-logrus-formatter v1.3.0/go.mod h1:6WTfyWFkBc9+zyBaKIqRrg/KwMqBbodBjgbHjDz7zjA= github.com/antonfisher/nested-logrus-formatter v1.3.1 h1:NFJIr+pzwv5QLHTPyKz9UMEoHck02Q9L0FP13b/xSbQ= github.com/antonfisher/nested-logrus-formatter v1.3.1/go.mod h1:6WTfyWFkBc9+zyBaKIqRrg/KwMqBbodBjgbHjDz7zjA= -github.com/aws/aws-sdk-go v1.34.28/go.mod h1:H7NKnBqNVzoTJpGfLrQkkD+ytBA93eiDYi/+8rV9s48= -github.com/aws/aws-sdk-go v1.36.7 h1:XoJPAjKoqvdL531XGWxKYn5eGX/xMoXzMN5fBtoyfSY= -github.com/aws/aws-sdk-go v1.36.7/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= +github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef h1:46PFijGLmAjMPwCCCo7Jf0W6f9slllCkkv7vyc1yOSg= +github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= @@ -55,8 +54,6 @@ github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsr github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM= -github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= @@ -65,27 +62,11 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.m github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/evanphx/json-patch v4.9.0+incompatible h1:kLcOMZeuLAJvL2BPWLMIj5oaZQobrkAqrL+WFZwQses= github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= -github.com/free5gc/MongoDBLibrary v1.0.0 h1:+CN5t3G9AvI4iv7azq46KUK4VWYsprbR7OHBqVM9XSo= -github.com/free5gc/MongoDBLibrary v1.0.0/go.mod h1:0TSgWaO+5KyIrylML6jbHqtgoJJKpHGiXHPFdHXXPts= -github.com/free5gc/http2_util v1.0.0 h1:0laMypHUNizAE5zsLoeJQq0R4XrfbvsLCW4NHCPpc44= -github.com/free5gc/http2_util v1.0.0/go.mod h1:GN2BCD8IINjtnAKYGwe+dEeTBRFEv4lQnZblFIIhbdE= -github.com/free5gc/http_wrapper v1.0.0 h1:NdnDHkItXxUzoxggiQsnR9SObBdi6KmwcN+QUJs4CoQ= -github.com/free5gc/http_wrapper v1.0.0/go.mod h1:vVArDqfCo7fvmYGi9WRPj4yurSu86GxRh3iQ70aq+OE= -github.com/free5gc/logger_conf v1.0.0 h1:cMqqB8L4HjE57tP36mBmiVUPIcHv8Ayr12jKfeiwqZU= -github.com/free5gc/logger_conf v1.0.0/go.mod h1:DHecLXVV1qA5Z+lSoUvZdZ6tCtZidTNmtx99jsCfgLE= -github.com/free5gc/logger_util v1.0.0 h1:hLTCTnKlEqJURrBwooNFQLavWPdJzS0o9KGIYUNKdJI= -github.com/free5gc/logger_util v1.0.0/go.mod h1:TK/bAJbm/l2TMNmbsKn83+xUmDNqts69IEir/nCa8w0= -github.com/free5gc/openapi v1.0.0 h1:DaGVt05b1pSDBOailKAlLj6hAk6vunN0Nhzvl/xcWCY= -github.com/free5gc/openapi v1.0.0/go.mod h1:7OzxoWBj6KQgznMW2ZiUtZdCGY+t89v4wtgKLhluKgU= -github.com/free5gc/path_util v1.0.0 h1:vJPGTymaWtavz6fJ/7k6WKEYv5BQLAq/O04RP54sab0= -github.com/free5gc/path_util v1.0.0/go.mod h1:OpmcebEKrMPnH7Jg5lZ8y9ZWJNAjQ4l9FGWXUv58Mo0= -github.com/free5gc/version v1.0.0 h1:Kn4uOhyHT1IAgerBgWRHag4xLMDXrRsqubLeMv5Nb/w= -github.com/free5gc/version v1.0.0/go.mod h1:wOTwzjk7sqeysX1b/Z4x+pWBHFuZOPtQj3h+IJXSpmQ= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= -github.com/gin-gonic/gin v1.6.3 h1:ahKqKTFpO5KTPHxWZjEdPScmYaGtLo8Y4DMHoEsnp14= -github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M= +github.com/gin-gonic/gin v1.7.0 h1:jGB9xAJQ12AIGNB4HguylppmDK1Am9ppF7XnGXXJuoU= +github.com/gin-gonic/gin v1.7.0/go.mod h1:jD2toBW3GZUr5UMcdrwQA10I7RuaFOl/SGeDjXkfUtY= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= @@ -95,10 +76,8 @@ github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8c github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8= github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD876Lmtgy7VtROAbHHXk8no= github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA= -github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI= github.com/go-playground/validator/v10 v10.4.1 h1:pH2c5ADXtd66mxoE0Zm9SUhxE20r7aM3F26W0hOn+GE= github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4= -github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/gobuffalo/attrs v0.0.0-20190224210810-a9411de4debd/go.mod h1:4duuawTqi2wkkpB4ePgWMaai6/Kc6WEz83bhFwpHzj0= @@ -125,6 +104,8 @@ github.com/gobuffalo/packd v0.1.0/go.mod h1:M2Juc+hhDXf/PnmBANFCqx4DM3wRbgDvnVWe github.com/gobuffalo/packr/v2 v2.0.9/go.mod h1:emmyGweYTm6Kdper+iywB6YK5YzuKchGtJQZ0Odn4pQ= github.com/gobuffalo/packr/v2 v2.2.0/go.mod h1:CaAwI0GPIAv+5wKLtv8Afwl+Cm78K/I/VCm/3ptBN+0= github.com/gobuffalo/syncx v0.0.0-20190224160051-33c29581e754/go.mod h1:HhnNqWY95UYwwW3uSASeV7vtgYkT2t16hJgV3AEPUpw= +github.com/golang-jwt/jwt v3.2.1+incompatible h1:73Z+4BJcrTC+KczS6WvTPvRGOp1WmfEP4Q1lOd9Z/+c= +github.com/golang-jwt/jwt v3.2.1+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -152,9 +133,8 @@ github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0 h1:LUVKkCeviFUMKqHa4tXIIij/lbhnMbP7Fn5wKdKkRh4= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/golang/snappy v0.0.2 h1:aeE13tS0IiQgFjYdoL8qN3K1N2bXXtI6Vi51/y7BpMw= -github.com/golang/snappy v0.0.2/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= @@ -189,10 +169,6 @@ github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= -github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= -github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= -github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= -github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.10 h1:Kz6Cvnvv2wGdaG/V8yMvfkmNiXq9Ya2KUv4rouJJr68= @@ -202,9 +178,8 @@ github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/X github.com/karrick/godirwalk v1.8.0/go.mod h1:H5KPZjojv4lE+QYImBI8xVtrBRgYrIVsaRPx4tDPEn4= github.com/karrick/godirwalk v1.10.3/go.mod h1:RoGL9dQei4vP9ilrpETWE8CLOZ1kiN0LhBygSwrAsHA= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.9.5/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= -github.com/klauspost/compress v1.11.3 h1:dB4Bn0tN3wdCzQxnS8r06kV74qN/TAfaIS0bVE8h3jc= -github.com/klauspost/compress v1.11.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= +github.com/klauspost/compress v1.13.6 h1:P76CopJELS0TiO2mebmnzgWaajssP/EszplttgQxcgc= +github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= @@ -218,8 +193,8 @@ github.com/markbates/oncer v0.0.0-20181203154359-bf2de49a0be2/go.mod h1:Ld9puTsI github.com/markbates/safe v1.0.1/go.mod h1:nAqgmRi7cY2nqMc92/bSEeQA+R4OheNU2T1kNSCBdG0= github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= -github.com/mitchellh/mapstructure v1.4.0 h1:7ks8ZkOP5/ujthUsT07rNv+nkLXCQWKNHuwzOAesEks= -github.com/mitchellh/mapstructure v1.4.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/mitchellh/mapstructure v1.4.1 h1:CpVNEelQCZBooIPDn+AR3NpivK/TIKU8bDxdASFVQag= +github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -229,8 +204,22 @@ github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3Rllmb github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc= github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32 h1:W6apQkHrMkS0Muv8G/TipAy/FJl/rCYT0+EuS8+Z0z4= github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32/go.mod h1:9wM+0iRr9ahx58uYLpLIr5fm8diHn0JbqRycJi6w0Ms= -github.com/omec-project/config5g v1.0.7 h1:qgSRHKiLaNkeIABSxAQJPb6KOk0HCUjHfCDXiBEqMbA= -github.com/omec-project/config5g v1.0.7/go.mod h1:Cn6IaxX/z7tHYhL7315C4iVVr8IVX81J+cKuHYanKiI= +github.com/omec-project/MongoDBLibrary v1.1.0 h1:0rIjN9NX8jm78iECJaFGQm+j8FIXVeFPupb4yZQgGFc= +github.com/omec-project/MongoDBLibrary v1.1.0/go.mod h1:bchS8sexPvTzgcA+fGzGeMyQk2Ji2xyAYgXDg6wOg1I= +github.com/omec-project/config5g v1.1.0 h1:NwXNSmy08xHBY5uF4iA3cEUVJRw2wKSxwc641FgCz20= +github.com/omec-project/config5g v1.1.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= +github.com/omec-project/logger_util v1.1.0/go.mod h1:UkD09amIhlh8P0k82A6Uz/atiZGeFS3C2wd334CKpuY= +github.com/omec-project/openapi v1.1.0 h1:N3v59+FM2V/eCv2Au10kbyeTf1DsScJkEdkDEcCdKE8= +github.com/omec-project/openapi v1.1.0/go.mod h1:Fv9ajWROYypcNER+ZwWXPhLCdV4pBz75KqFp/R/2gCw= +github.com/omec-project/path_util v1.1.0 h1:vzzLsay8+uexyYEqS06th8lMcwp+N+CXcaHhaypZn1Q= +github.com/omec-project/path_util v1.1.0/go.mod h1:O1ch35al6+FXKmg6+5vOpKusl4fiB0u36oYjxwI4QK4= github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -261,8 +250,9 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4= github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw= @@ -273,15 +263,19 @@ github.com/ugorji/go/codec v1.2.1 h1:/TRfW3XKkvWvmAYyCUaQlhoCDGjcvNR8xVVA/l5p/jQ github.com/ugorji/go/codec v1.2.1/go.mod h1:s/WxCRi46t8rA+fowL40EnmD7ec0XhR7ZypxeBNdzsM= github.com/urfave/cli v1.22.5 h1:lNq9sAHXK2qfdI8W+GRItjCEkI+2oR4d+MEHy1CKXoU= github.com/urfave/cli v1.22.5/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= -github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c h1:u40Z8hqBAAQyv+vATcGgV0YCnDjqSL7/q/JyPhhJSPk= -github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I= -github.com/xdg/stringprep v0.0.0-20180714160509-73f8eece6fdc h1:n+nNi93yXLkJvKwXNP9d55HC7lGK4H/SRcwB5IaUZLo= -github.com/xdg/stringprep v0.0.0-20180714160509-73f8eece6fdc/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y= +github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c= +github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI= +github.com/xdg-go/scram v1.0.2 h1:akYIkZ28e6A96dkWNJQu3nmCzH3YfwMPQExUYDaRv7w= +github.com/xdg-go/scram v1.0.2/go.mod h1:1WAq6h33pAW+iRreB34OORO2Nf7qel3VV3fjBj+hCSs= +github.com/xdg-go/stringprep v1.0.2 h1:6iq84/ryjjeRmMJwxutI51F2GIPlP5BfTvXHeYjyhBc= +github.com/xdg-go/stringprep v1.0.2/go.mod h1:8F9zXuvzgwmyT5DUm4GUfZGDdT3W+LCvS6+da4O5kxM= +github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d h1:splanxYIlg+5LfHAM6xpdFEAYOk8iySO56hMFq6uLyA= +github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.mongodb.org/mongo-driver v1.4.4 h1:bsPHfODES+/yx2PCWzUYMH8xj6PVniPI8DQrsJuSXSs= -go.mongodb.org/mongo-driver v1.4.4/go.mod h1:WcMNYLx/IlOxLe6JRJiv2uXuCz6zBLndR4SoGjYphSc= +go.mongodb.org/mongo-driver v1.7.3 h1:G4l/eYY9VrQAK/AUgkV0koQKzQnyddnWxrd/Etf0jIs= +go.mongodb.org/mongo-driver v1.7.3/go.mod h1:NqaYOwnXWr5Pm7AOpO5QFxKJ503nbMse/R79oO62zWg= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= @@ -292,9 +286,9 @@ golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnf golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190422162423-af44ce270edf/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201208171446-5f87f3452ae9 h1:sYNJzB4J8toYPQTM6pAkcmBRgw9SnQKP9oXCHfgy604= golang.org/x/crypto v0.0.0-20201208171446-5f87f3452ae9/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= @@ -340,7 +334,6 @@ golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20191021144547-ec77196f6094/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -355,16 +348,16 @@ golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/ golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201209123823-ac852fbbde11 h1:lwlPPsmjDKK0J6eG6xDWd5XPehI0R024zxjDnw3esPA= golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d h1:20cMwl2fHAzkJMEA+8J4JgqBQcQGzbisXo31MIeenXI= +golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5 h1:Lm4OryKCca1vehdsWogr9N4t7NfZxLbJoc/H0w4K4S4= -golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210810183815-faf39c7919d5 h1:Ati8dO7+U7mxpkPSxBZQEvzHVUYB/MqCklCN8ig5w/o= +golang.org/x/oauth2 v0.0.0-20210810183815-faf39c7919d5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -373,9 +366,8 @@ golang.org/x/sync v0.0.0-20190412183630-56d357773e84/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208 h1:qwRHBd0NqMbJxfbotnDhm2ByMI1Shq4Y6oRJo21SGJA= golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20201207232520-09787c993a3a h1:DcqTD9SDLc+1P/r1EmRBwnVsrOwW+kk2vWf9n+1sGhs= -golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -408,10 +400,10 @@ golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201211090839-8ad439b19e0f h1:QdHQnPce6K4XQewki9WNbG5KOROuDzqO3NaYjI1cXJ0= golang.org/x/sys v0.0.0-20201211090839-8ad439b19e0f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423082822-04245dca01da h1:b3NXsE2LusjYGGjL5bxEVZZORm/YEFFrWFjR8eFrw/c= +golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -419,8 +411,10 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.4 h1:0YWbFKbhXG/wIiuHDSKpS0Iy7FSA+u45VtBMfQcFTTc= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M= +golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -494,9 +488,8 @@ google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7 google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/appengine v1.6.6 h1:lMO5rYAqUxkmaj76jAkRUvt5JZgFymx/+Q5Mzfivuhc= google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= -google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= @@ -544,7 +537,6 @@ google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTp google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.39.0 h1:Klz8I9kdtkIN6EpHHUOMLCYhTn/2WAe5a0s1hcBkdTI= google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= -google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.2.0/go.mod h1:DNq5QpG7LJqD2AamLZ7zvKE0DEpVl2BSEVjFycAAjRY= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -562,9 +554,8 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= -gopkg.in/h2non/gentleman.v1 v1.0.4/go.mod h1:JYuHVdFzS4MKOXe0o+chKJ4hCe6tqKKw9XH9YP6WFrg= -gopkg.in/h2non/gock.v1 v1.0.16 h1:F11k+OafeuFENsjei5t2vMTSTs9L62AdyTe4E1cgdG8= -gopkg.in/h2non/gock.v1 v1.0.16/go.mod h1:XVuDAssexPLwgxCLMvDTWNU5eqklsydR6I5phZ9oPB8= +gopkg.in/h2non/gock.v1 v1.1.2 h1:jBbHXgGBK/AoPVfJh5x4r/WxIrElvbLel8TCZkkZJoY= +gopkg.in/h2non/gock.v1 v1.1.2/go.mod h1:n7UGz/ckNChHiK05rDoiC4MYSunEC/lyaUm2WWaDva0= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/producer/callback.go b/producer/callback.go index 58e584c..93ef0d3 100644 --- a/producer/callback.go +++ b/producer/callback.go @@ -6,8 +6,8 @@ package producer import ( - "github.com/free5gc/openapi/models" - "github.com/free5gc/udr/producer/callback" + "github.com/omec-project/openapi/models" + "github.com/omec-project/udr/producer/callback" ) func PreHandleOnDataChangeNotify(ueId string, resourceId string, patchItems []models.PatchItem, diff --git a/producer/callback/callback.go b/producer/callback/callback.go index d4ae9a3..a82bb7f 100644 --- a/producer/callback/callback.go +++ b/producer/callback/callback.go @@ -8,10 +8,10 @@ package callback import ( "context" - "github.com/free5gc/openapi/Nudr_DataRepository" - "github.com/free5gc/openapi/models" - udr_context "github.com/free5gc/udr/context" - "github.com/free5gc/udr/logger" + "github.com/omec-project/openapi/Nudr_DataRepository" + "github.com/omec-project/openapi/models" + udr_context "github.com/omec-project/udr/context" + "github.com/omec-project/udr/logger" ) func SendOnDataChangeNotify(ueId string, notifyItems []models.NotifyItem) { diff --git a/producer/data_repository.go b/producer/data_repository.go index 61215ee..50add76 100644 --- a/producer/data_repository.go +++ b/producer/data_repository.go @@ -19,12 +19,12 @@ import ( "go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/bson/primitive" - "github.com/free5gc/MongoDBLibrary" - "github.com/free5gc/http_wrapper" - "github.com/free5gc/openapi/models" - udr_context "github.com/free5gc/udr/context" - "github.com/free5gc/udr/logger" - "github.com/free5gc/udr/util" + "github.com/omec-project/MongoDBLibrary" + "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" protos "github.com/omec-project/config5g/proto/sdcoreConfig" ) diff --git a/service/init.go b/service/init.go index 1b7f214..40c0f54 100644 --- a/service/init.go +++ b/service/init.go @@ -19,20 +19,19 @@ import ( "github.com/sirupsen/logrus" "github.com/urfave/cli" - "github.com/free5gc/MongoDBLibrary" - mongoDBLibLogger "github.com/free5gc/MongoDBLibrary/logger" - "github.com/free5gc/http2_util" - "github.com/free5gc/logger_util" - openApiLogger "github.com/free5gc/openapi/logger" - "github.com/free5gc/path_util" - pathUtilLogger "github.com/free5gc/path_util/logger" - "github.com/free5gc/udr/consumer" - udr_context "github.com/free5gc/udr/context" - "github.com/free5gc/udr/datarepository" - "github.com/free5gc/udr/factory" - "github.com/free5gc/udr/logger" - "github.com/free5gc/udr/producer" - "github.com/free5gc/udr/util" + "github.com/omec-project/MongoDBLibrary" + mongoDBLibLogger "github.com/omec-project/MongoDBLibrary/logger" + "github.com/omec-project/http2_util" + "github.com/omec-project/logger_util" + "github.com/omec-project/path_util" + pathUtilLogger "github.com/omec-project/path_util/logger" + "github.com/omec-project/udr/consumer" + udr_context "github.com/omec-project/udr/context" + "github.com/omec-project/udr/datarepository" + "github.com/omec-project/udr/factory" + "github.com/omec-project/udr/logger" + "github.com/omec-project/udr/producer" + "github.com/omec-project/udr/util" ) type UDR struct{} @@ -131,22 +130,6 @@ func (udr *UDR) setLogLevel() { pathUtilLogger.SetReportCaller(factory.UdrConfig.Logger.PathUtil.ReportCaller) } - if factory.UdrConfig.Logger.OpenApi != nil { - if factory.UdrConfig.Logger.OpenApi.DebugLevel != "" { - if level, err := logrus.ParseLevel(factory.UdrConfig.Logger.OpenApi.DebugLevel); err != nil { - openApiLogger.OpenApiLog.Warnf("OpenAPI Log level [%s] is invalid, set to [info] level", - factory.UdrConfig.Logger.OpenApi.DebugLevel) - openApiLogger.SetLogLevel(logrus.InfoLevel) - } else { - openApiLogger.SetLogLevel(level) - } - } else { - openApiLogger.OpenApiLog.Warnln("OpenAPI Log level not set. Default set to [info] level") - openApiLogger.SetLogLevel(logrus.InfoLevel) - } - openApiLogger.SetReportCaller(factory.UdrConfig.Logger.OpenApi.ReportCaller) - } - if factory.UdrConfig.Logger.MongoDBLibrary != nil { if factory.UdrConfig.Logger.MongoDBLibrary.DebugLevel != "" { if level, err := logrus.ParseLevel(factory.UdrConfig.Logger.MongoDBLibrary.DebugLevel); err != nil { diff --git a/udr.go b/udr.go index 5c2f8b3..7e12987 100644 --- a/udr.go +++ b/udr.go @@ -12,9 +12,8 @@ import ( "github.com/sirupsen/logrus" "github.com/urfave/cli" - "github.com/free5gc/udr/logger" - udr_service "github.com/free5gc/udr/service" - "github.com/free5gc/version" + "github.com/omec-project/udr/logger" + udr_service "github.com/omec-project/udr/service" ) var UDR = &udr_service.UDR{} @@ -29,7 +28,6 @@ func main() { app := cli.NewApp() app.Name = "udr" appLog.Infoln(app.Name) - appLog.Infoln("UDR version: ", version.GetVersion()) app.Usage = "-free5gccfg common configuration file -udrcfg udr configuration file" app.Action = action app.Flags = UDR.GetCliCmd() diff --git a/util/convert.go b/util/convert.go index 644f6c7..3b70440 100644 --- a/util/convert.go +++ b/util/convert.go @@ -12,8 +12,8 @@ import ( "go.mongodb.org/mongo-driver/bson" - "github.com/free5gc/openapi/models" - "github.com/free5gc/udr/logger" + "github.com/omec-project/openapi/models" + "github.com/omec-project/udr/logger" ) func MapToByte(data map[string]interface{}) []byte { diff --git a/util/init_context.go b/util/init_context.go index d529bd8..ab858dc 100644 --- a/util/init_context.go +++ b/util/init_context.go @@ -11,10 +11,10 @@ import ( "github.com/google/uuid" - "github.com/free5gc/openapi/models" - udr_context "github.com/free5gc/udr/context" - "github.com/free5gc/udr/factory" - "github.com/free5gc/udr/logger" + "github.com/omec-project/openapi/models" + udr_context "github.com/omec-project/udr/context" + "github.com/omec-project/udr/factory" + "github.com/omec-project/udr/logger" ) func InitUdrContext(context *udr_context.UDRContext) { diff --git a/util/path.go b/util/path.go index 786ff36..e67e1b0 100644 --- a/util/path.go +++ b/util/path.go @@ -8,11 +8,11 @@ package util import ( - "github.com/free5gc/path_util" + "github.com/omec-project/path_util" ) var ( - UdrLogPath = path_util.Free5gcPath("free5gc/udrsslkey.log") + UdrLogPath = path_util.Free5gcPath("omec-project/udrsslkey.log") UdrPemPath = path_util.Free5gcPath("free5gc/support/TLS/udr.pem") UdrKeyPath = path_util.Free5gcPath("free5gc/support/TLS/udr.key") DefaultUdrConfigPath = path_util.Free5gcPath("free5gc/config/udrcfg.yaml") diff --git a/util/path_debug.go b/util/path_debug.go index 4bcd187..fe84b24 100644 --- a/util/path_debug.go +++ b/util/path_debug.go @@ -8,11 +8,11 @@ package util import ( - "github.com/free5gc/path_util" + "github.com/omec-project/path_util" ) var ( - UdrLogPath = path_util.Free5gcPath("free5gc/udrsslkey.log") + UdrLogPath = path_util.Free5gcPath("omec-project/udrsslkey.log") UdrPemPath = path_util.Free5gcPath("free5gc/support/TLS/_debug.pem") UdrKeyPath = path_util.Free5gcPath("free5gc/support/TLS/_debug.key") DefaultUdrConfigPath = path_util.Free5gcPath("free5gc/config/udrcfg.yaml") diff --git a/util/util.go b/util/util.go index 5281fd6..b2995bd 100644 --- a/util/util.go +++ b/util/util.go @@ -8,7 +8,7 @@ package util import ( "net/http" - "github.com/free5gc/openapi/models" + "github.com/omec-project/openapi/models" ) func ProblemDetailsSystemFailure(detail string) *models.ProblemDetails {