Skip to content

Commit

Permalink
Dev cleanup dep (#21)
Browse files Browse the repository at this point in the history
* Removing dependency
  • Loading branch information
thakurajayL authored May 27, 2022
1 parent 3756e35 commit c9c04fe
Show file tree
Hide file tree
Showing 55 changed files with 296 additions and 331 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 1 addition & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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))

Expand Down
6 changes: 3 additions & 3 deletions consumer/nf_discovery.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
12 changes: 6 additions & 6 deletions consumer/nf_managemant.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion context/context.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"fmt"
"sync"

"github.com/free5gc/openapi/models"
"github.com/omec-project/openapi/models"
)

var udrContext = UDRContext{}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions datarepository/api_amf3_gpp_access_registration_document.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions datarepository/api_amf_non3_gpp_access_registration_document.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions datarepository/api_amf_subscription_info_document.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions datarepository/api_authentication_data_document.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions datarepository/api_authentication_so_r_document.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions datarepository/api_authentication_status_document.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions datarepository/api_default.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
10 changes: 5 additions & 5 deletions datarepository/api_event_amf_subscription_info_document.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions datarepository/api_event_exposure_data_document.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions datarepository/api_event_exposure_group_subscription_document.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions datarepository/api_event_exposure_subscription_document.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions datarepository/api_event_exposure_subscriptions_collection.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions datarepository/api_operator_specific_data_container_document.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions datarepository/api_parameter_provision_document.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions datarepository/api_provisioned_data_document.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions datarepository/api_provisioned_parameter_data_document.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions datarepository/api_query_amf_subscription_info_document.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading

0 comments on commit c9c04fe

Please sign in to comment.