diff --git a/ampolicy/api_default.go b/ampolicy/api_default.go index 7b95812..09d90b6 100644 --- a/ampolicy/api_default.go +++ b/ampolicy/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/pcf/logger" - "github.com/free5gc/pcf/producer" - "github.com/free5gc/pcf/util" + "github.com/omec-project/http_wrapper" + "github.com/omec-project/openapi" + "github.com/omec-project/openapi/models" + "github.com/omec-project/pcf/logger" + "github.com/omec-project/pcf/producer" + "github.com/omec-project/pcf/util" ) func HTTPPoliciesPolAssoIdDelete(c *gin.Context) { diff --git a/ampolicy/routers.go b/ampolicy/routers.go index ea33da7..5f4ed50 100644 --- a/ampolicy/routers.go +++ b/ampolicy/routers.go @@ -20,8 +20,8 @@ import ( "github.com/gin-gonic/gin" - "github.com/free5gc/logger_util" - "github.com/free5gc/pcf/logger" + "github.com/omec-project/logger_util" + "github.com/omec-project/pcf/logger" ) // Route is the information for every URI. diff --git a/bdtpolicy/api_bdt_policies_collection_routers.go b/bdtpolicy/api_bdt_policies_collection_routers.go index 54993b8..e35e884 100644 --- a/bdtpolicy/api_bdt_policies_collection_routers.go +++ b/bdtpolicy/api_bdt_policies_collection_routers.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/pcf/logger" - "github.com/free5gc/pcf/producer" + "github.com/omec-project/http_wrapper" + "github.com/omec-project/openapi" + "github.com/omec-project/openapi/models" + "github.com/omec-project/pcf/logger" + "github.com/omec-project/pcf/producer" ) // CreateBDTPolicy - Create a new Individual BDT policy diff --git a/bdtpolicy/api_individual_bdt_policy_document_routers.go b/bdtpolicy/api_individual_bdt_policy_document_routers.go index 7db277b..a6936fe 100644 --- a/bdtpolicy/api_individual_bdt_policy_document_routers.go +++ b/bdtpolicy/api_individual_bdt_policy_document_routers.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/pcf/logger" - "github.com/free5gc/pcf/producer" + "github.com/omec-project/http_wrapper" + "github.com/omec-project/openapi" + "github.com/omec-project/openapi/models" + "github.com/omec-project/pcf/logger" + "github.com/omec-project/pcf/producer" ) // GetBDTPolicy - Read an Individual BDT policy diff --git a/bdtpolicy/routers.go b/bdtpolicy/routers.go index bd379de..facf60f 100644 --- a/bdtpolicy/routers.go +++ b/bdtpolicy/routers.go @@ -20,8 +20,8 @@ import ( "github.com/gin-gonic/gin" - "github.com/free5gc/logger_util" - "github.com/free5gc/pcf/logger" + "github.com/omec-project/logger_util" + "github.com/omec-project/pcf/logger" ) // Route is the information for every URI. diff --git a/consumer/communication.go b/consumer/communication.go index 23c4ec5..f542747 100644 --- a/consumer/communication.go +++ b/consumer/communication.go @@ -11,11 +11,11 @@ import ( "fmt" "strings" - "github.com/free5gc/openapi" - "github.com/free5gc/openapi/models" - pcf_context "github.com/free5gc/pcf/context" - "github.com/free5gc/pcf/logger" - "github.com/free5gc/pcf/util" + "github.com/omec-project/openapi" + "github.com/omec-project/openapi/models" + pcf_context "github.com/omec-project/pcf/context" + "github.com/omec-project/pcf/logger" + "github.com/omec-project/pcf/util" ) func AmfStatusChangeSubscribe(amfUri string, guamiList []models.Guami) ( diff --git a/consumer/nf_discovery.go b/consumer/nf_discovery.go index 68b5f34..0923bcd 100644 --- a/consumer/nf_discovery.go +++ b/consumer/nf_discovery.go @@ -13,10 +13,10 @@ import ( "github.com/antihax/optional" - "github.com/free5gc/openapi/Nnrf_NFDiscovery" - "github.com/free5gc/openapi/models" - "github.com/free5gc/pcf/logger" - "github.com/free5gc/pcf/util" + "github.com/omec-project/openapi/Nnrf_NFDiscovery" + "github.com/omec-project/openapi/models" + "github.com/omec-project/pcf/logger" + "github.com/omec-project/pcf/util" ) func SendSearchNFInstances( diff --git a/consumer/nf_management.go b/consumer/nf_management.go index 2ab4c28..2318ad9 100644 --- a/consumer/nf_management.go +++ b/consumer/nf_management.go @@ -12,11 +12,11 @@ import ( "strings" "time" - "github.com/free5gc/openapi" - "github.com/free5gc/openapi/Nnrf_NFManagement" - "github.com/free5gc/openapi/models" - pcf_context "github.com/free5gc/pcf/context" - "github.com/free5gc/pcf/logger" + "github.com/omec-project/openapi" + "github.com/omec-project/openapi/Nnrf_NFManagement" + "github.com/omec-project/openapi/models" + pcf_context "github.com/omec-project/pcf/context" + "github.com/omec-project/pcf/logger" ) func BuildNFInstance(context *pcf_context.PCFContext) (profile models.NfProfile, err error) { diff --git a/context/context.go b/context/context.go index d5a2014..9bce0dc 100644 --- a/context/context.go +++ b/context/context.go @@ -13,11 +13,11 @@ import ( "strings" "sync" - "github.com/free5gc/idgenerator" - "github.com/free5gc/openapi" - "github.com/free5gc/openapi/models" - "github.com/free5gc/pcf/factory" - "github.com/free5gc/pcf/logger" + "github.com/omec-project/idgenerator" + "github.com/omec-project/openapi" + "github.com/omec-project/openapi/models" + "github.com/omec-project/pcf/factory" + "github.com/omec-project/pcf/logger" "github.com/sirupsen/logrus" ) diff --git a/context/ue.go b/context/ue.go index 832b642..3acfa26 100644 --- a/context/ue.go +++ b/context/ue.go @@ -12,9 +12,9 @@ import ( "strconv" "strings" - "github.com/free5gc/idgenerator" - "github.com/free5gc/openapi/models" - "github.com/free5gc/pcf/logger" + "github.com/omec-project/idgenerator" + "github.com/omec-project/openapi/models" + "github.com/omec-project/pcf/logger" ) // key is supi diff --git a/factory/config.go b/factory/config.go index d089cc6..399ecae 100644 --- a/factory/config.go +++ b/factory/config.go @@ -11,8 +11,8 @@ package factory import ( - "github.com/free5gc/logger_util" - "github.com/free5gc/openapi/models" + "github.com/omec-project/logger_util" + "github.com/omec-project/openapi/models" ) const ( diff --git a/factory/factory.go b/factory/factory.go index af37cc4..528e317 100644 --- a/factory/factory.go +++ b/factory/factory.go @@ -15,7 +15,7 @@ import ( "gopkg.in/yaml.v2" - "github.com/free5gc/pcf/logger" + "github.com/omec-project/pcf/logger" ) var PcfConfig Config diff --git a/go.mod b/go.mod index f918313..5163940 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/free5gc/pcf +module github.com/omec-project/pcf go 1.14 @@ -7,25 +7,28 @@ require ( github.com/antonfisher/nested-logrus-formatter v1.3.1 github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect github.com/cydev/zero v0.0.0-20160322155811-4a4535dd56e7 - 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/idgenerator v1.0.0 - github.com/free5gc/logger_conf 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-contrib/cors v1.3.1 - github.com/gin-gonic/gin v1.6.3 + github.com/gin-gonic/gin v1.7.0 + github.com/golang/snappy v0.0.2 // indirect github.com/google/uuid v1.1.2 github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 - github.com/omec-project/config5g v1.0.7 + github.com/omec-project/MongoDBLibrary v1.0.100-dev + github.com/omec-project/config5g v1.0.100-dev + github.com/omec-project/http2_util v1.0.100-dev + github.com/omec-project/http_wrapper v1.0.102-dev + github.com/omec-project/idgenerator v1.0.100-dev + github.com/omec-project/logger_conf v1.0.100-dev + github.com/omec-project/logger_util v1.0.100-dev + github.com/omec-project/openapi v1.0.100-dev + github.com/omec-project/path_util v1.0.100-dev github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/sirupsen/logrus v1.8.1 + github.com/stretchr/testify v1.7.0 github.com/tim-ywliu/event v0.1.0 github.com/urfave/cli v1.22.5 + golang.org/x/sync v0.0.0-20201207232520-09787c993a3a // indirect + google.golang.org/appengine v1.6.7 // indirect gopkg.in/yaml.v2 v2.4.0 ) -replace github.com/free5gc/pcf => ../pcf +replace github.com/omec-project/pcf => ../pcf diff --git a/go.sum b/go.sum index 6e49bc0..aa6e914 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= @@ -57,8 +56,6 @@ github.com/cydev/zero v0.0.0-20160322155811-4a4535dd56e7/go.mod h1:XGbwUcTsr1d7e 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= @@ -67,32 +64,14 @@ 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/idgenerator v1.0.0 h1:e55Cn2p8dGCGYv5VoJ6oOsTj3SIVLToNLuS2CDOulZA= -github.com/free5gc/idgenerator v1.0.0/go.mod h1:+iGY7VUgUX88lqPhGAPGy/b2SxtNJMvymdJbNyjk4HU= -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/cors v1.3.1 h1:doAsuITavI4IOcd0Y19U4B+O0dNWihRyX//nn4sEmgA= github.com/gin-contrib/cors v1.3.1/go.mod h1:jjEJ4268OPZUcU7k9Pm653S7lXUGcqMADzFA61xsmDk= 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.5.0/go.mod h1:Nd6IXA8m5kNZdNEHMBd93KT+mdY3+bewLgRvmCsR2Do= -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= @@ -104,10 +83,8 @@ github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTM github.com/go-playground/universal-translator v0.16.0/go.mod h1:1AnU7NaIRDWWzGEKwgtJRd2xk99HeFyHw3yid4rvQIY= 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= @@ -134,6 +111,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= @@ -198,10 +177,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.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= @@ -212,9 +187,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= @@ -230,8 +204,8 @@ github.com/markbates/safe v1.0.1/go.mod h1:nAqgmRi7cY2nqMc92/bSEeQA+R4OheNU2T1kN github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ= 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= @@ -243,8 +217,24 @@ github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwd 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.0.100-dev h1:+jvEt1/IdM7Aoktid9IoRg111fIEZwZVyyZRH0zL4Ec= +github.com/omec-project/MongoDBLibrary v1.0.100-dev/go.mod h1:o8uginKyXvnoLqXPcG1mgrLARyB1tE5b9mw9BarY780= +github.com/omec-project/config5g v1.0.100-dev h1:SlDHqFP7jfB9gk3PaNaiwc8PD80YLVqJd7LO1mAbavk= +github.com/omec-project/config5g v1.0.100-dev/go.mod h1:9yJa9EITne3jY5UN0kBlvrHc44jXodU+s+658ErJfYo= +github.com/omec-project/http2_util v1.0.100-dev h1:j6jDU33uMqwN5Hz2rfoWFtOzB9UiuPePQpGFFLrQjVY= +github.com/omec-project/http2_util v1.0.100-dev/go.mod h1:QwoZRaUyhEp/kTEqXvf0gCYtfQrNHBdkVw939vsMjZY= +github.com/omec-project/http_wrapper v1.0.102-dev h1:dDkSLCV+wmSbj9qfuPPSfVGzyN6Y8ABZM3NIuuNz9vg= +github.com/omec-project/http_wrapper v1.0.102-dev/go.mod h1:mc045fjVVJ0/q0g4QG4nuSC0N1BIqGR/ZoK76XgifVU= +github.com/omec-project/idgenerator v1.0.100-dev h1:3RqxkQAIY0HT2JA4E/EWlRy5qK5FK49BnMVbXMstkXI= +github.com/omec-project/idgenerator v1.0.100-dev/go.mod h1:qFK0oP9WNCBjro7ZXPzmbSzCosWmxp4KRVORPl6ztRo= +github.com/omec-project/logger_conf v1.0.100-dev h1:cQkWo0jiSy3XtsggB1zArL9R9OMB0F3nb3+HYdrjyq4= +github.com/omec-project/logger_conf v1.0.100-dev/go.mod h1:Upj0MgzSpB/Ifw+3WsBaYbqWuF4SyyUeKqW7/HhL8Aw= +github.com/omec-project/logger_util v1.0.100-dev h1:8P1mudVxTQ/LflO1V+Jb0LvvHHI+nQ2uf6cyAgJOB7I= +github.com/omec-project/logger_util v1.0.100-dev/go.mod h1:UkD09amIhlh8P0k82A6Uz/atiZGeFS3C2wd334CKpuY= +github.com/omec-project/openapi v1.0.100-dev h1:bBtZ7wK90drsOLf1ot7fcfa6ZgOeBUiKOGxO18Io9RU= +github.com/omec-project/openapi v1.0.100-dev/go.mod h1:Fv9ajWROYypcNER+ZwWXPhLCdV4pBz75KqFp/R/2gCw= +github.com/omec-project/path_util v1.0.100-dev h1:J6lro3EFqMlMQloDa3c7IG6xwbW0u91XYkN2MJGdLC4= +github.com/omec-project/path_util v1.0.100-dev/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= @@ -275,8 +265,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/tim-ywliu/event v0.1.0 h1:lLh1lkm5CZtnAbQInEPufEF4yVST9THmvSSP2TYP1Ms= @@ -289,15 +280,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= @@ -308,9 +303,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= @@ -356,7 +351,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= @@ -371,16 +365,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= @@ -425,10 +419,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= @@ -436,8 +430,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= @@ -561,7 +557,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= @@ -581,9 +576,8 @@ gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE= gopkg.in/go-playground/validator.v9 v9.29.1/go.mod h1:+c9/zcJMFNgbLvly1L1V+PpxWdVbfP1avr/N00E2vyQ= -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/httpcallback/amf_status_change_notify.go b/httpcallback/amf_status_change_notify.go index 91f707b..28ab908 100644 --- a/httpcallback/amf_status_change_notify.go +++ b/httpcallback/amf_status_change_notify.go @@ -11,11 +11,11 @@ import ( "github.com/gin-gonic/gin" - "github.com/free5gc/http_wrapper" - "github.com/free5gc/openapi" - "github.com/free5gc/openapi/models" - "github.com/free5gc/pcf/logger" - "github.com/free5gc/pcf/producer" + "github.com/omec-project/http_wrapper" + "github.com/omec-project/openapi" + "github.com/omec-project/openapi/models" + "github.com/omec-project/pcf/logger" + "github.com/omec-project/pcf/producer" ) func HTTPAmfStatusChangeNotify(c *gin.Context) { diff --git a/httpcallback/router.go b/httpcallback/router.go index b8d014d..22eb80f 100644 --- a/httpcallback/router.go +++ b/httpcallback/router.go @@ -11,8 +11,8 @@ import ( "github.com/gin-gonic/gin" - "github.com/free5gc/logger_util" - "github.com/free5gc/pcf/logger" + "github.com/omec-project/logger_util" + "github.com/omec-project/pcf/logger" ) // Route is the information for every URI. diff --git a/httpcallback/sm_policy_notify.go b/httpcallback/sm_policy_notify.go index de95d2c..986fa5b 100644 --- a/httpcallback/sm_policy_notify.go +++ b/httpcallback/sm_policy_notify.go @@ -10,11 +10,11 @@ import ( "github.com/gin-gonic/gin" - "github.com/free5gc/http_wrapper" - "github.com/free5gc/openapi" - "github.com/free5gc/openapi/models" - "github.com/free5gc/pcf/logger" - "github.com/free5gc/pcf/producer" + "github.com/omec-project/http_wrapper" + "github.com/omec-project/openapi" + "github.com/omec-project/openapi/models" + "github.com/omec-project/pcf/logger" + "github.com/omec-project/pcf/producer" ) // Nudr-Notify-smpolicy diff --git a/internal/notifyevent/dispatcher.go b/internal/notifyevent/dispatcher.go index f012dfc..0f8ae47 100644 --- a/internal/notifyevent/dispatcher.go +++ b/internal/notifyevent/dispatcher.go @@ -8,8 +8,8 @@ package notifyevent import ( "github.com/tim-ywliu/event" - "github.com/free5gc/openapi/models" - "github.com/free5gc/pcf/logger" + "github.com/omec-project/openapi/models" + "github.com/omec-project/pcf/logger" ) var notifyDispatcher *event.Dispatcher diff --git a/internal/notifyevent/listener.go b/internal/notifyevent/listener.go index d61c70b..2054fe8 100644 --- a/internal/notifyevent/listener.go +++ b/internal/notifyevent/listener.go @@ -6,7 +6,7 @@ package notifyevent import ( - "github.com/free5gc/pcf/logger" + "github.com/omec-project/pcf/logger" ) type NotifyListener struct{} diff --git a/internal/notifyevent/send_smpolicy_termination.go b/internal/notifyevent/send_smpolicy_termination.go index 0656fdc..3f243ee 100644 --- a/internal/notifyevent/send_smpolicy_termination.go +++ b/internal/notifyevent/send_smpolicy_termination.go @@ -11,9 +11,9 @@ import ( "github.com/tim-ywliu/event" - "github.com/free5gc/openapi/models" - "github.com/free5gc/pcf/logger" - "github.com/free5gc/pcf/util" + "github.com/omec-project/openapi/models" + "github.com/omec-project/pcf/logger" + "github.com/omec-project/pcf/util" ) const SendSMpolicyTerminationNotifyEventName event.Name = "SendSMpolicyTerminationNotify" diff --git a/internal/notifyevent/send_smpolicy_update.go b/internal/notifyevent/send_smpolicy_update.go index ff2ea25..775a966 100644 --- a/internal/notifyevent/send_smpolicy_update.go +++ b/internal/notifyevent/send_smpolicy_update.go @@ -11,9 +11,9 @@ import ( "github.com/tim-ywliu/event" - "github.com/free5gc/openapi/models" - "github.com/free5gc/pcf/logger" - "github.com/free5gc/pcf/util" + "github.com/omec-project/openapi/models" + "github.com/omec-project/pcf/logger" + "github.com/omec-project/pcf/util" ) const SendSMpolicyUpdateNotifyEventName event.Name = "SendSMpolicyUpdateNotify" diff --git a/logger/logger.go b/logger/logger.go index 8e17f98..82b656f 100644 --- a/logger/logger.go +++ b/logger/logger.go @@ -13,8 +13,8 @@ import ( formatter "github.com/antonfisher/nested-logrus-formatter" "github.com/sirupsen/logrus" - "github.com/free5gc/logger_conf" - "github.com/free5gc/logger_util" + "github.com/omec-project/logger_conf" + "github.com/omec-project/logger_util" ) var ( diff --git a/oam/api_get_am_policy.go b/oam/api_get_am_policy.go index 2764274..b2107f4 100644 --- a/oam/api_get_am_policy.go +++ b/oam/api_get_am_policy.go @@ -10,11 +10,11 @@ import ( "github.com/gin-gonic/gin" - "github.com/free5gc/http_wrapper" - "github.com/free5gc/openapi" - "github.com/free5gc/openapi/models" - "github.com/free5gc/pcf/logger" - "github.com/free5gc/pcf/producer" + "github.com/omec-project/http_wrapper" + "github.com/omec-project/openapi" + "github.com/omec-project/openapi/models" + "github.com/omec-project/pcf/logger" + "github.com/omec-project/pcf/producer" ) func setCorsHeader(c *gin.Context) { diff --git a/oam/routers.go b/oam/routers.go index 82a1281..2332a39 100644 --- a/oam/routers.go +++ b/oam/routers.go @@ -10,8 +10,8 @@ import ( "github.com/gin-gonic/gin" - "github.com/free5gc/logger_util" - "github.com/free5gc/pcf/logger" + "github.com/omec-project/logger_util" + "github.com/omec-project/pcf/logger" ) // Route is the information for every URI. diff --git a/pcf.go b/pcf.go index 265cbcf..6b78b68 100644 --- a/pcf.go +++ b/pcf.go @@ -19,19 +19,52 @@ package main import ( "fmt" "os" + "runtime" "github.com/sirupsen/logrus" "github.com/urfave/cli" - "github.com/free5gc/pcf/logger" - "github.com/free5gc/pcf/service" - "github.com/free5gc/version" + "github.com/omec-project/pcf/logger" + "github.com/omec-project/pcf/service" ) var PCF = &service.PCF{} var appLog *logrus.Entry +var ( + VERSION string + BUILD_TIME string + COMMIT_HASH string + COMMIT_TIME string +) + +func GetVersion() string { + if VERSION != "" { + return fmt.Sprintf( + "\n\tfree5GC version: %s"+ + "\n\tbuild time: %s"+ + "\n\tcommit hash: %s"+ + "\n\tcommit time: %s"+ + "\n\tgo version: %s %s/%s", + VERSION, + BUILD_TIME, + COMMIT_HASH, + COMMIT_TIME, + runtime.Version(), + runtime.GOOS, + runtime.GOARCH, + ) + } else { + return fmt.Sprintf( + "\n\tNot specify ldflags (which link version) during go build\n\tgo version: %s %s/%s", + runtime.Version(), + runtime.GOOS, + runtime.GOARCH, + ) + } +} + func init() { appLog = logger.AppLog } @@ -40,7 +73,7 @@ func main() { app := cli.NewApp() app.Name = "pcf" fmt.Print(app.Name, "\n") - appLog.Infoln("PCF version: ", version.GetVersion()) + appLog.Infoln("PCF version: ", GetVersion()) app.Usage = "-free5gccfg common configuration file -pcfcfg pcf configuration file" app.Action = action app.Flags = PCF.GetCliCmd() diff --git a/pcf_test.go b/pcf_test.go index d9bf31b..237780f 100644 --- a/pcf_test.go +++ b/pcf_test.go @@ -10,9 +10,9 @@ package main import ( "encoding/json" "fmt" - "github.com/free5gc/pcf/context" - "github.com/free5gc/pcf/service" protos "github.com/omec-project/config5g/proto/sdcoreConfig" + "github.com/omec-project/pcf/context" + "github.com/omec-project/pcf/service" "github.com/stretchr/testify/require" "strconv" "testing" diff --git a/policyauthorization/api_application_sessions_collection.go b/policyauthorization/api_application_sessions_collection.go index d807955..ddad6a1 100644 --- a/policyauthorization/api_application_sessions_collection.go +++ b/policyauthorization/api_application_sessions_collection.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/pcf/logger" - "github.com/free5gc/pcf/producer" - "github.com/free5gc/pcf/util" + "github.com/omec-project/http_wrapper" + "github.com/omec-project/openapi" + "github.com/omec-project/openapi/models" + "github.com/omec-project/pcf/logger" + "github.com/omec-project/pcf/producer" + "github.com/omec-project/pcf/util" ) // HTTPPostAppSessions - Creates a new Individual Application Session Context resource diff --git a/policyauthorization/api_events_subscription_document.go b/policyauthorization/api_events_subscription_document.go index 2692666..16d011c 100644 --- a/policyauthorization/api_events_subscription_document.go +++ b/policyauthorization/api_events_subscription_document.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/pcf/logger" - "github.com/free5gc/pcf/producer" - "github.com/free5gc/pcf/util" + "github.com/omec-project/http_wrapper" + "github.com/omec-project/openapi" + "github.com/omec-project/openapi/models" + "github.com/omec-project/pcf/logger" + "github.com/omec-project/pcf/producer" + "github.com/omec-project/pcf/util" ) // HTTPDeleteEventsSubsc - deletes the Events Subscription subresource diff --git a/policyauthorization/api_individual_application_session_context_document.go b/policyauthorization/api_individual_application_session_context_document.go index 24fff6f..388d70d 100644 --- a/policyauthorization/api_individual_application_session_context_document.go +++ b/policyauthorization/api_individual_application_session_context_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/pcf/logger" - "github.com/free5gc/pcf/producer" + "github.com/omec-project/http_wrapper" + "github.com/omec-project/openapi" + "github.com/omec-project/openapi/models" + "github.com/omec-project/pcf/logger" + "github.com/omec-project/pcf/producer" ) // HTTPDeleteAppSession - Deletes an existing Individual Application Session Context diff --git a/policyauthorization/routers.go b/policyauthorization/routers.go index 2be351a..c4a3ad8 100644 --- a/policyauthorization/routers.go +++ b/policyauthorization/routers.go @@ -20,8 +20,8 @@ import ( "github.com/gin-gonic/gin" - "github.com/free5gc/logger_util" - "github.com/free5gc/pcf/logger" + "github.com/omec-project/logger_util" + "github.com/omec-project/pcf/logger" ) // Route is the information for every URI. diff --git a/producer/ampolicy.go b/producer/ampolicy.go index ca425e4..609ffd0 100644 --- a/producer/ampolicy.go +++ b/producer/ampolicy.go @@ -13,13 +13,13 @@ import ( "github.com/mohae/deepcopy" - "github.com/free5gc/http_wrapper" - "github.com/free5gc/openapi" - "github.com/free5gc/openapi/models" - "github.com/free5gc/pcf/consumer" - pcf_context "github.com/free5gc/pcf/context" - "github.com/free5gc/pcf/logger" - "github.com/free5gc/pcf/util" + "github.com/omec-project/http_wrapper" + "github.com/omec-project/openapi" + "github.com/omec-project/openapi/models" + "github.com/omec-project/pcf/consumer" + pcf_context "github.com/omec-project/pcf/context" + "github.com/omec-project/pcf/logger" + "github.com/omec-project/pcf/util" ) func HandleDeletePoliciesPolAssoId(request *http_wrapper.Request) *http_wrapper.Response { diff --git a/producer/bdtpolicy.go b/producer/bdtpolicy.go index bd95a11..17054ab 100644 --- a/producer/bdtpolicy.go +++ b/producer/bdtpolicy.go @@ -14,14 +14,14 @@ import ( "github.com/google/uuid" "github.com/mohae/deepcopy" - "github.com/free5gc/http_wrapper" - "github.com/free5gc/openapi/Nnrf_NFDiscovery" - "github.com/free5gc/openapi/Nudr_DataRepository" - "github.com/free5gc/openapi/models" - "github.com/free5gc/pcf/consumer" - pcf_context "github.com/free5gc/pcf/context" - "github.com/free5gc/pcf/logger" - "github.com/free5gc/pcf/util" + "github.com/omec-project/http_wrapper" + "github.com/omec-project/openapi/Nnrf_NFDiscovery" + "github.com/omec-project/openapi/Nudr_DataRepository" + "github.com/omec-project/openapi/models" + "github.com/omec-project/pcf/consumer" + pcf_context "github.com/omec-project/pcf/context" + "github.com/omec-project/pcf/logger" + "github.com/omec-project/pcf/util" ) func HandleGetBDTPolicyContextRequest(request *http_wrapper.Request) *http_wrapper.Response { diff --git a/producer/callback.go b/producer/callback.go index 720a1d7..524fbad 100644 --- a/producer/callback.go +++ b/producer/callback.go @@ -8,9 +8,9 @@ package producer import ( "net/http" - "github.com/free5gc/http_wrapper" - "github.com/free5gc/openapi/models" - "github.com/free5gc/pcf/logger" + "github.com/omec-project/http_wrapper" + "github.com/omec-project/openapi/models" + "github.com/omec-project/pcf/logger" ) func HandleAmfStatusChangeNotify(request *http_wrapper.Request) *http_wrapper.Response { diff --git a/producer/oam.go b/producer/oam.go index 44f7d24..9e2d4d7 100644 --- a/producer/oam.go +++ b/producer/oam.go @@ -9,10 +9,10 @@ import ( "net/http" "strconv" - "github.com/free5gc/http_wrapper" - "github.com/free5gc/openapi/models" - "github.com/free5gc/pcf/context" - "github.com/free5gc/pcf/logger" + "github.com/omec-project/http_wrapper" + "github.com/omec-project/openapi/models" + "github.com/omec-project/pcf/context" + "github.com/omec-project/pcf/logger" ) type UEAmPolicy struct { diff --git a/producer/policyauthorization.go b/producer/policyauthorization.go index 54f5422..d6d95b3 100644 --- a/producer/policyauthorization.go +++ b/producer/policyauthorization.go @@ -15,13 +15,13 @@ import ( "github.com/cydev/zero" - "github.com/free5gc/http_wrapper" - "github.com/free5gc/openapi" - "github.com/free5gc/openapi/models" - pcf_context "github.com/free5gc/pcf/context" - "github.com/free5gc/pcf/internal/notifyevent" - "github.com/free5gc/pcf/logger" - "github.com/free5gc/pcf/util" + "github.com/omec-project/http_wrapper" + "github.com/omec-project/openapi" + "github.com/omec-project/openapi/models" + pcf_context "github.com/omec-project/pcf/context" + "github.com/omec-project/pcf/internal/notifyevent" + "github.com/omec-project/pcf/logger" + "github.com/omec-project/pcf/util" ) func transferAfRoutReqRmToAfRoutReq(AfRoutReqRm *models.AfRoutingRequirementRm) *models.AfRoutingRequirement { diff --git a/producer/smpolicy.go b/producer/smpolicy.go index d9982e4..9cea685 100644 --- a/producer/smpolicy.go +++ b/producer/smpolicy.go @@ -16,13 +16,13 @@ import ( "github.com/antihax/optional" "github.com/mohae/deepcopy" - "github.com/free5gc/http_wrapper" - "github.com/free5gc/openapi" - "github.com/free5gc/openapi/Nudr_DataRepository" - "github.com/free5gc/openapi/models" - pcf_context "github.com/free5gc/pcf/context" - "github.com/free5gc/pcf/logger" - "github.com/free5gc/pcf/util" + "github.com/omec-project/http_wrapper" + "github.com/omec-project/openapi" + "github.com/omec-project/openapi/Nudr_DataRepository" + "github.com/omec-project/openapi/models" + pcf_context "github.com/omec-project/pcf/context" + "github.com/omec-project/pcf/logger" + "github.com/omec-project/pcf/util" ) const flowRuleDataColl = "policyData.ues.flowRule" diff --git a/service/init.go b/service/init.go index 735312f..05c16ae 100644 --- a/service/init.go +++ b/service/init.go @@ -23,29 +23,28 @@ import ( "github.com/sirupsen/logrus" "github.com/urfave/cli" - "github.com/free5gc/http2_util" - "github.com/free5gc/idgenerator" - "github.com/free5gc/logger_util" - "github.com/free5gc/openapi/Nnrf_NFDiscovery" - openApiLogger "github.com/free5gc/openapi/logger" - "github.com/free5gc/openapi/models" - "github.com/free5gc/path_util" - pathUtilLogger "github.com/free5gc/path_util/logger" - "github.com/free5gc/pcf/ampolicy" - "github.com/free5gc/pcf/bdtpolicy" - "github.com/free5gc/pcf/consumer" - "github.com/free5gc/pcf/context" - "github.com/free5gc/pcf/factory" - "github.com/free5gc/pcf/httpcallback" - "github.com/free5gc/pcf/internal/notifyevent" - "github.com/free5gc/pcf/logger" - "github.com/free5gc/pcf/oam" - "github.com/free5gc/pcf/policyauthorization" - "github.com/free5gc/pcf/smpolicy" - "github.com/free5gc/pcf/uepolicy" - "github.com/free5gc/pcf/util" "github.com/omec-project/config5g/proto/client" protos "github.com/omec-project/config5g/proto/sdcoreConfig" + "github.com/omec-project/http2_util" + "github.com/omec-project/idgenerator" + "github.com/omec-project/logger_util" + "github.com/omec-project/openapi/Nnrf_NFDiscovery" + "github.com/omec-project/openapi/models" + "github.com/omec-project/path_util" + pathUtilLogger "github.com/omec-project/path_util/logger" + "github.com/omec-project/pcf/ampolicy" + "github.com/omec-project/pcf/bdtpolicy" + "github.com/omec-project/pcf/consumer" + "github.com/omec-project/pcf/context" + "github.com/omec-project/pcf/factory" + "github.com/omec-project/pcf/httpcallback" + "github.com/omec-project/pcf/internal/notifyevent" + "github.com/omec-project/pcf/logger" + "github.com/omec-project/pcf/oam" + "github.com/omec-project/pcf/policyauthorization" + "github.com/omec-project/pcf/smpolicy" + "github.com/omec-project/pcf/uepolicy" + "github.com/omec-project/pcf/util" ) type PCF struct{} @@ -161,7 +160,7 @@ func (pcf *PCF) setLogLevel() { pathUtilLogger.SetReportCaller(factory.PcfConfig.Logger.PathUtil.ReportCaller) } - if factory.PcfConfig.Logger.OpenApi != nil { + /*if factory.PcfConfig.Logger.OpenApi != nil { if factory.PcfConfig.Logger.OpenApi.DebugLevel != "" { if level, err := logrus.ParseLevel(factory.PcfConfig.Logger.OpenApi.DebugLevel); err != nil { openApiLogger.OpenApiLog.Warnf("OpenAPI Log level [%s] is invalid, set to [info] level", @@ -175,7 +174,7 @@ func (pcf *PCF) setLogLevel() { openApiLogger.SetLogLevel(logrus.InfoLevel) } openApiLogger.SetReportCaller(factory.PcfConfig.Logger.OpenApi.ReportCaller) - } + }*/ } func (pcf *PCF) FilterCli(c *cli.Context) (args []string) { @@ -378,21 +377,21 @@ func GetBitRateUnit(val int64) (int64, string) { return val, unit } if val >= 0xFFFF { - val = (val/1000) + val = (val / 1000) unit = " Kbps" if val >= 0xFFFF { - val = (val/1000) + val = (val / 1000) unit = " Mbps" } if val >= 0xFFFF { - val = (val/1000) + val = (val / 1000) unit = " Gbps" } } else { - //minimum supported is kbps by SMF/UE - val = val/1000 - } - + //minimum supported is kbps by SMF/UE + val = val / 1000 + } + return val, unit } func getSessionRule(devGroup *protos.DeviceGroup) (sessionRule *models.SessionRule) { diff --git a/smpolicy/api_default.go b/smpolicy/api_default.go index 8617c50..141dcd8 100644 --- a/smpolicy/api_default.go +++ b/smpolicy/api_default.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/pcf/logger" - "github.com/free5gc/pcf/producer" + "github.com/omec-project/http_wrapper" + "github.com/omec-project/openapi" + "github.com/omec-project/openapi/models" + "github.com/omec-project/pcf/logger" + "github.com/omec-project/pcf/producer" ) // SmPoliciesPost - diff --git a/smpolicy/routers.go b/smpolicy/routers.go index 6f2bd13..7aa8ee9 100644 --- a/smpolicy/routers.go +++ b/smpolicy/routers.go @@ -20,8 +20,8 @@ import ( "github.com/gin-gonic/gin" - "github.com/free5gc/logger_util" - "github.com/free5gc/pcf/logger" + "github.com/omec-project/logger_util" + "github.com/omec-project/pcf/logger" ) // Route is the information for every URI. diff --git a/uepolicy/routers.go b/uepolicy/routers.go index 9883253..5753018 100644 --- a/uepolicy/routers.go +++ b/uepolicy/routers.go @@ -20,8 +20,8 @@ import ( "github.com/gin-gonic/gin" - "github.com/free5gc/logger_util" - "github.com/free5gc/pcf/logger" + "github.com/omec-project/logger_util" + "github.com/omec-project/pcf/logger" ) type Route struct { diff --git a/util/convert.go b/util/convert.go index 8259795..19d2c78 100644 --- a/util/convert.go +++ b/util/convert.go @@ -8,7 +8,7 @@ package util import ( "fmt" - "github.com/free5gc/openapi/models" + "github.com/omec-project/openapi/models" ) var policyTriggerArray = []models.PolicyControlRequestTrigger{ diff --git a/util/init_context.go b/util/init_context.go index 2300ca5..0874df9 100644 --- a/util/init_context.go +++ b/util/init_context.go @@ -11,12 +11,12 @@ import ( "github.com/google/uuid" - "github.com/free5gc/MongoDBLibrary" - "github.com/free5gc/openapi" - "github.com/free5gc/openapi/models" - "github.com/free5gc/pcf/context" - "github.com/free5gc/pcf/factory" - "github.com/free5gc/pcf/logger" + "github.com/omec-project/MongoDBLibrary" + "github.com/omec-project/openapi" + "github.com/omec-project/openapi/models" + "github.com/omec-project/pcf/context" + "github.com/omec-project/pcf/factory" + "github.com/omec-project/pcf/logger" ) // Init PCF Context from config flie diff --git a/util/pcc_rule.go b/util/pcc_rule.go index d0f6e6e..9902f6f 100644 --- a/util/pcc_rule.go +++ b/util/pcc_rule.go @@ -9,7 +9,7 @@ import ( "fmt" "time" - "github.com/free5gc/openapi/models" + "github.com/omec-project/openapi/models" ) var MediaTypeTo5qiMap = map[models.MediaType]int32{ diff --git a/util/pcf_util.go b/util/pcf_util.go index 5bbdaee..6ae8a39 100644 --- a/util/pcf_util.go +++ b/util/pcf_util.go @@ -13,15 +13,15 @@ import ( "reflect" "time" - "github.com/free5gc/openapi/Namf_Communication" - "github.com/free5gc/openapi/Npcf_AMPolicy" - "github.com/free5gc/openapi/Npcf_PolicyAuthorization" - "github.com/free5gc/openapi/Npcf_SMPolicyControl" - "github.com/free5gc/openapi/Nudr_DataRepository" - "github.com/free5gc/openapi/models" - "github.com/free5gc/path_util" - "github.com/free5gc/pcf/context" - "github.com/free5gc/pcf/logger" + "github.com/omec-project/openapi/Namf_Communication" + "github.com/omec-project/openapi/Npcf_AMPolicy" + "github.com/omec-project/openapi/Npcf_PolicyAuthorization" + "github.com/omec-project/openapi/Npcf_SMPolicyControl" + "github.com/omec-project/openapi/Nudr_DataRepository" + "github.com/omec-project/openapi/models" + "github.com/omec-project/path_util" + "github.com/omec-project/pcf/context" + "github.com/omec-project/pcf/logger" ) const TimeFormat = time.RFC3339 diff --git a/util/search_nf_service.go b/util/search_nf_service.go index 1ee3c3c..cfb1790 100644 --- a/util/search_nf_service.go +++ b/util/search_nf_service.go @@ -8,7 +8,7 @@ package util import ( "fmt" - "github.com/free5gc/openapi/models" + "github.com/omec-project/openapi/models" ) // SearchNFServiceUri returns NF Uri derived from NfProfile with corresponding service