diff --git a/backend/WebUI/api_charging.go b/backend/WebUI/api_charging.go index 4fca18d884d43aabee46286978c1fa04220306c3..da82d271b26cd26c7fa95338cfc67d7640d37b38 100644 --- a/backend/WebUI/api_charging.go +++ b/backend/WebUI/api_charging.go @@ -11,13 +11,13 @@ import ( "github.com/gin-gonic/gin" "go.mongodb.org/mongo-driver/bson" + "git.unl.edu/pqc-free5gc/webconsole/backend/logger" + "git.unl.edu/pqc-free5gc/webconsole/backend/webui_context" "github.com/free5gc/chf/cdr/asn" "github.com/free5gc/chf/cdr/cdrFile" "github.com/free5gc/chf/cdr/cdrType" "github.com/free5gc/openapi/models" "github.com/free5gc/util/mongoapi" - "github.com/free5gc/webconsole/backend/logger" - "github.com/free5gc/webconsole/backend/webui_context" ) const ( diff --git a/backend/WebUI/api_verify.go b/backend/WebUI/api_verify.go index a1ced1422ef8a97fec07c2f3cc323ed2bbc1d71d..71601c6aaa2446f9d11f7f5f7386218495f3f810 100644 --- a/backend/WebUI/api_verify.go +++ b/backend/WebUI/api_verify.go @@ -9,11 +9,11 @@ import ( "github.com/gin-gonic/gin" "go.mongodb.org/mongo-driver/bson" + "git.unl.edu/pqc-free5gc/webconsole/backend/logger" + "git.unl.edu/pqc-free5gc/webconsole/backend/webui_context" "github.com/free5gc/openapi/models" smf_factory "github.com/free5gc/smf/pkg/factory" "github.com/free5gc/util/mongoapi" - "github.com/free5gc/webconsole/backend/logger" - "github.com/free5gc/webconsole/backend/webui_context" ) type VerifyScope struct { diff --git a/backend/WebUI/api_webui.go b/backend/WebUI/api_webui.go index ae7185b8afed6112d4e8f7583942ac0627e62f4a..9cd9825aac5168cfb9e181307c4f1aa8647450e4 100644 --- a/backend/WebUI/api_webui.go +++ b/backend/WebUI/api_webui.go @@ -21,10 +21,10 @@ import ( "go.mongodb.org/mongo-driver/bson/primitive" "golang.org/x/crypto/bcrypt" + "git.unl.edu/pqc-free5gc/webconsole/backend/logger" + "git.unl.edu/pqc-free5gc/webconsole/backend/webui_context" "github.com/free5gc/openapi/models" "github.com/free5gc/util/mongoapi" - "github.com/free5gc/webconsole/backend/logger" - "github.com/free5gc/webconsole/backend/webui_context" ) const ( diff --git a/backend/WebUI/routers.go b/backend/WebUI/routers.go index d513b10c746b7e55883964453286a2ef65b3911d..82b9a4699d77485109b1ba4db69e2dee1a7c9f8d 100644 --- a/backend/WebUI/routers.go +++ b/backend/WebUI/routers.go @@ -5,8 +5,8 @@ import ( "github.com/gin-gonic/gin" + "git.unl.edu/pqc-free5gc/webconsole/backend/logger" logger_util "github.com/free5gc/util/logger" - "github.com/free5gc/webconsole/backend/logger" ) // Route is the information for every URI. diff --git a/backend/billing/client.go b/backend/billing/client.go index 1b6bcb66530ae45ac8e067b88eddbfcabaa68683..f40c19408fc6a2a0081a26ec271386c0e6cd457b 100644 --- a/backend/billing/client.go +++ b/backend/billing/client.go @@ -7,8 +7,8 @@ import ( "github.com/jlaffaye/ftp" - "github.com/free5gc/webconsole/backend/factory" - "github.com/free5gc/webconsole/backend/logger" + "git.unl.edu/pqc-free5gc/webconsole/backend/factory" + "git.unl.edu/pqc-free5gc/webconsole/backend/logger" ) // The ftp client is for CDR Pull method, that is the billing domain actively query CDR file from CHF diff --git a/backend/billing/server.go b/backend/billing/server.go index 0517333ff5eaed646929f77267f1e105b4c0f66a..acabb4e668707ea74213f94beaa2674adc428a23 100644 --- a/backend/billing/server.go +++ b/backend/billing/server.go @@ -13,8 +13,8 @@ import ( "github.com/fclairamb/ftpserver/server" ftpserver "github.com/fclairamb/ftpserverlib" - "github.com/free5gc/webconsole/backend/factory" - "github.com/free5gc/webconsole/backend/logger" + "git.unl.edu/pqc-free5gc/webconsole/backend/factory" + "git.unl.edu/pqc-free5gc/webconsole/backend/logger" ) type BillingDomain struct { diff --git a/backend/factory/config.go b/backend/factory/config.go index f4db6bb0246447e528f95f29ee2692ed91d62508..31b35151c71097ec39568dc22ed6242d2db65a20 100644 --- a/backend/factory/config.go +++ b/backend/factory/config.go @@ -12,7 +12,7 @@ import ( "github.com/asaskevich/govalidator" - "github.com/free5gc/webconsole/backend/logger" + "git.unl.edu/pqc-free5gc/webconsole/backend/logger" ) const ( diff --git a/backend/factory/factory.go b/backend/factory/factory.go index fa4e23ea5b9e370c944ff0207ea982d077c498d8..45e7c145fd561bbf82f8352faceeb2fb0f950539 100644 --- a/backend/factory/factory.go +++ b/backend/factory/factory.go @@ -11,7 +11,7 @@ import ( "github.com/asaskevich/govalidator" "gopkg.in/yaml.v2" - "github.com/free5gc/webconsole/backend/logger" + "git.unl.edu/pqc-free5gc/webconsole/backend/logger" ) var WebuiConfig *Config diff --git a/backend/webui_context/context.go b/backend/webui_context/context.go index 9157a5e843746f502da8e8404cfb3436083c3bf5..e7eacbe4aac82f95dcfe7dc6ea137a32b1319b3e 100644 --- a/backend/webui_context/context.go +++ b/backend/webui_context/context.go @@ -8,13 +8,13 @@ import ( "github.com/google/uuid" "golang.org/x/oauth2" + "git.unl.edu/pqc-free5gc/webconsole/backend/factory" + "git.unl.edu/pqc-free5gc/webconsole/backend/logger" "github.com/free5gc/openapi" "github.com/free5gc/openapi/Nnrf_NFDiscovery" "github.com/free5gc/openapi/Nnrf_NFManagement" "github.com/free5gc/openapi/models" "github.com/free5gc/openapi/oauth" - "github.com/free5gc/webconsole/backend/factory" - "github.com/free5gc/webconsole/backend/logger" ) var webuiContext WEBUIContext diff --git a/backend/webui_context/nrf_discovery.go b/backend/webui_context/nrf_discovery.go index c7c47a7d30878ba37f662d1ab9cb574c3ded2d9f..08b21086f6a60e170d21b31f015bea7449df3c5e 100644 --- a/backend/webui_context/nrf_discovery.go +++ b/backend/webui_context/nrf_discovery.go @@ -3,9 +3,9 @@ package webui_context import ( "net/http" + "git.unl.edu/pqc-free5gc/webconsole/backend/logger" "github.com/free5gc/openapi/Nnrf_NFDiscovery" "github.com/free5gc/openapi/models" - "github.com/free5gc/webconsole/backend/logger" ) type NfInstance struct { diff --git a/backend/webui_context/nrf_management.go b/backend/webui_context/nrf_management.go index f9ee9a0112a8f08f4710f2c2c2e99ab25b0bf3d3..1d6193fb7ec9a144ecc1ea1344c67a29633c50bf 100644 --- a/backend/webui_context/nrf_management.go +++ b/backend/webui_context/nrf_management.go @@ -7,9 +7,9 @@ import ( "strings" "time" + "git.unl.edu/pqc-free5gc/webconsole/backend/logger" "github.com/free5gc/openapi" "github.com/free5gc/openapi/models" - "github.com/free5gc/webconsole/backend/logger" ) func SendNFRegistration() error { diff --git a/backend/webui_service/webui_init.go b/backend/webui_service/webui_init.go index e318378888aa6e6ade97cbaa751bb2a2d29e60e6..f9047eb5cf0d5ca4b53a0c246a273a5243800eaa 100644 --- a/backend/webui_service/webui_init.go +++ b/backend/webui_service/webui_init.go @@ -14,12 +14,12 @@ import ( "github.com/gin-contrib/cors" "github.com/sirupsen/logrus" + "git.unl.edu/pqc-free5gc/webconsole/backend/WebUI" + "git.unl.edu/pqc-free5gc/webconsole/backend/billing" + "git.unl.edu/pqc-free5gc/webconsole/backend/factory" + "git.unl.edu/pqc-free5gc/webconsole/backend/logger" + "git.unl.edu/pqc-free5gc/webconsole/backend/webui_context" "github.com/free5gc/util/mongoapi" - "github.com/free5gc/webconsole/backend/WebUI" - "github.com/free5gc/webconsole/backend/billing" - "github.com/free5gc/webconsole/backend/factory" - "github.com/free5gc/webconsole/backend/logger" - "github.com/free5gc/webconsole/backend/webui_context" ) type WebuiApp struct { diff --git a/frontend/webconsole.yaml b/frontend/webconsole.yaml index b6c02fdc934076b4196535eaa9f4cfaaa34a423f..d1b0f9f4d24f6252c84abd75bd76b82b8687517e 100644 --- a/frontend/webconsole.yaml +++ b/frontend/webconsole.yaml @@ -53,7 +53,7 @@ components: type: integer format: int64 # Subscriber - # github.com/free5gc/webconsole/backend/WebUI/model_subs_list_ie.go:SubsListIE + # git.unl.edu/pqc-free5gc/webconsole/backend/WebUI/model_subs_list_ie.go:SubsListIE Subscriber: type: object required: @@ -198,7 +198,7 @@ components: UpCnxState: type: string # Tenant - # github.com/free5gc/webconsole/backend/WebUI/model_tenant_data.go:Tenant + # git.unl.edu/pqc-free5gc/webconsole/backend/WebUI/model_tenant_data.go:Tenant Tenant: type: object required: @@ -209,7 +209,7 @@ components: tenantName: type: string # User - # github.com/free5gc/webconsole/backend/WebUI/model_user_data.go:User + # git.unl.edu/pqc-free5gc/webconsole/backend/WebUI/model_user_data.go:User User: type: object required: @@ -563,7 +563,7 @@ components: smPolicySnssaiData: $ref: "#/components/schemas/SmPolicySnssaiData" # FlowRules - # github.com/free5gc/webconsole/backend/WebUI/model_flow_rule.go:FlowRule + # git.unl.edu/pqc-free5gc/webconsole/backend/WebUI/model_flow_rule.go:FlowRule FlowRules: type: object properties: @@ -579,7 +579,7 @@ components: qosRef: type: integer format: int64 - # github.com/free5gc/webconsole/backend/WebUI/model_qos_flow.go:QosFlow + # git.unl.edu/pqc-free5gc/webconsole/backend/WebUI/model_qos_flow.go:QosFlow QosFlows: type: object required: @@ -607,7 +607,7 @@ components: gbrDL: type: string # Subscription - # github.com/free5gc/webconsole/backend/WebUI/model_subs_data.go:SubsData + # git.unl.edu/pqc-free5gc/webconsole/backend/WebUI/model_subs_data.go:SubsData Subscription: type: object required: @@ -656,7 +656,7 @@ components: type: array items: $ref: "#/components/schemas/ChargingData" - # github.com/free5gc/webconsole/backend/WebUI/model_charging_data.go:ChargingData + # git.unl.edu/pqc-free5gc/webconsole/backend/WebUI/model_charging_data.go:ChargingData ChargingData: type: object required: @@ -680,7 +680,7 @@ components: type: string ueId: type: string - # github.com/free5gc/webconsole/backend/WebUI/model_rating_group_data_usage.go:RatingGroupDataUsage + # git.unl.edu/pqc-free5gc/webconsole/backend/WebUI/model_rating_group_data_usage.go:RatingGroupDataUsage FlowChargingRecord: type: object required: diff --git a/go.mod b/go.mod index 60355fe517951bc25a0de0a332deefd387d751aa..7f9b353ba2aa708d001a7cb13284664aa4158c7f 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/free5gc/webconsole +module git.unl.edu/pqc-free5gc/webconsole go 1.21 diff --git a/server.go b/server.go index 4289a98e6d14f783b61d8df61b91585669b09888..387e21242bcaea0ace4c7cf1403885c6379a3c68 100644 --- a/server.go +++ b/server.go @@ -7,11 +7,11 @@ import ( "github.com/urfave/cli" + "git.unl.edu/pqc-free5gc/webconsole/backend/factory" + "git.unl.edu/pqc-free5gc/webconsole/backend/logger" + "git.unl.edu/pqc-free5gc/webconsole/backend/webui_service" logger_util "github.com/free5gc/util/logger" "github.com/free5gc/util/version" - "github.com/free5gc/webconsole/backend/factory" - "github.com/free5gc/webconsole/backend/logger" - "github.com/free5gc/webconsole/backend/webui_service" ) var WEBUI *webui_service.WebuiApp