Skip to content

chore: upgrade pkg #226

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Alonza0314 merged 2 commits into from
Aug 19, 2026
Merged

chore: upgrade pkg #226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5108de0
chore: upgrade pkg
Alonza0314 Aug 19, 2026
f63e61a
chore: tidy
Alonza0314 Aug 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions backend/WebUI/api_charging.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,11 +142,11 @@ func GetChargingRecord(c *gin.Context) {

// Get supi of UEs
var uesJsonData interface{}
if amfUris := webuiSelf.GetOamUris(models.NrfNfManagementNfType_AMF); amfUris != nil {
if amfUris := webuiSelf.GetOamUris(models.Nrf_NFMgmt_NFType_AMF); amfUris != nil {
requestUri := fmt.Sprintf("%s/namf-oam/v1/registered-ue-context", amfUris[0])

ctx, pd, tokerErr := webui_context.GetSelf().GetTokenCtx(
models.ServiceName_NAMF_OAM, models.NrfNfManagementNfType_AMF)
models.Nrf_NFMgmt_ServiceName_NAMF_OAM, models.Nrf_NFMgmt_NFType_AMF)
if tokerErr != nil {
logger.ProcLog.Errorf("GetTokenCtx error: %+v", tokerErr)
c.JSON(http.StatusInternalServerError, pd)
Expand Down
44 changes: 22 additions & 22 deletions backend/WebUI/api_sample.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@ func GetSampleJSON(c *gin.Context) {
SequenceNumber: "16f3b3f70fc2",
}

amDataData := models.AccessAndMobilitySubscriptionData{
amDataData := models.Udr_DR_AccessAndMobilitySubscriptionData{
Gpsis: []string{
"msisdn-0900000000",
},
Nssai: &models.Nssai{
Nssai: &models.Udm_SDM_Nssai{
DefaultSingleNssais: []models.Snssai{
{
Sd: "010203",
Expand Down Expand Up @@ -77,21 +77,21 @@ func GetSampleJSON(c *gin.Context) {
},
}

smDataData := []models.SessionManagementSubscriptionData{
smDataData := []models.Udm_SDM_SessionManagementSubscriptionData{
{
SingleNssai: &models.Snssai{
Sst: 1,
Sd: "010203",
},
DnnConfigurations: map[string]models.DnnConfiguration{
DnnConfigurations: map[string]models.Udm_SDM_DnnConfiguration{
"internet": {
PduSessionTypes: &models.PduSessionTypes{
PduSessionTypes: &models.Udm_SDM_PduSessionTypes{
DefaultSessionType: models.PduSessionType_IPV4,
AllowedSessionTypes: []models.PduSessionType{models.PduSessionType_IPV4},
},
SscModes: &models.SscModes{
DefaultSscMode: models.SscMode__1,
AllowedSscModes: []models.SscMode{models.SscMode__1},
SscModes: &models.Udm_SDM_SscModes{
DefaultSscMode: models.SscMode_1,
AllowedSscModes: []models.SscMode{models.SscMode_1},
},
SessionAmbr: &models.Ambr{
Downlink: "1000 Kbps",
Expand All @@ -112,15 +112,15 @@ func GetSampleJSON(c *gin.Context) {
Sst: 1,
Sd: "112233",
},
DnnConfigurations: map[string]models.DnnConfiguration{
DnnConfigurations: map[string]models.Udm_SDM_DnnConfiguration{
"internet": {
PduSessionTypes: &models.PduSessionTypes{
PduSessionTypes: &models.Udm_SDM_PduSessionTypes{
DefaultSessionType: models.PduSessionType_IPV4,
AllowedSessionTypes: []models.PduSessionType{models.PduSessionType_IPV4},
},
SscModes: &models.SscModes{
DefaultSscMode: models.SscMode__1,
AllowedSscModes: []models.SscMode{models.SscMode__1},
SscModes: &models.Udm_SDM_SscModes{
DefaultSscMode: models.SscMode_1,
AllowedSscModes: []models.SscMode{models.SscMode_1},
},
SessionAmbr: &models.Ambr{
Downlink: "1000 Kbps",
Expand All @@ -138,17 +138,17 @@ func GetSampleJSON(c *gin.Context) {
},
}

smfSelData := models.SmfSelectionSubscriptionData{
SubscribedSnssaiInfos: map[string]models.SnssaiInfo{
smfSelData := models.Udr_DR_SmfSelectionSubscriptionData{
SubscribedSnssaiInfos: map[string]models.Udm_SDM_SnssaiInfo{
"01010203": {
DnnInfos: []models.DnnInfo{
DnnInfos: []models.Udm_SDM_DnnInfo{
{
Dnn: "internet",
},
},
},
"01112233": {
DnnInfos: []models.DnnInfo{
DnnInfos: []models.Udm_SDM_DnnInfo{
{
Dnn: "internet",
},
Expand All @@ -157,20 +157,20 @@ func GetSampleJSON(c *gin.Context) {
},
}

amPolicyData := models.AmPolicyData{
amPolicyData := models.Udr_DR_AmPolicyData{
SubscCats: []string{
"free5gc",
},
}

smPolicyData := models.SmPolicyData{
SmPolicySnssaiData: map[string]models.SmPolicySnssaiData{
smPolicyData := models.Udr_DR_SmPolicyData{
SmPolicySnssaiData: map[string]models.Udr_DR_SmPolicySnssaiData{
"01010203": {
Snssai: &models.Snssai{
Sd: "010203",
Sst: 1,
},
SmPolicyDnnData: map[string]models.SmPolicyDnnData{
SmPolicyDnnData: map[string]models.Udr_DR_SmPolicyDnnData{
"internet": {
Dnn: "internet",
},
Expand All @@ -181,7 +181,7 @@ func GetSampleJSON(c *gin.Context) {
Sd: "112233",
Sst: 1,
},
SmPolicyDnnData: map[string]models.SmPolicyDnnData{
SmPolicyDnnData: map[string]models.Udr_DR_SmPolicyDnnData{
"internet": {
Dnn: "internet",
},
Expand Down
10 changes: 5 additions & 5 deletions backend/WebUI/api_verify.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,12 @@ func GetSmfUserPlaneInfo() (interface{}, error) {
var jsonData interface{}

// TODO: support fetching data from multiple SMF
if smfUris := webuiSelf.GetOamUris(models.NrfNfManagementNfType_SMF); len(smfUris) > 0 {
if smfUris := webuiSelf.GetOamUris(models.Nrf_NFMgmt_NFType_SMF); len(smfUris) > 0 {
requestUri := fmt.Sprintf("%s/nsmf-oam/v1/user-plane-info/", smfUris[0])

ctx, pd, err := webuiSelf.GetTokenCtx(models.ServiceName_NSMF_OAM, models.NrfNfManagementNfType_SMF)
ctx, pd, err := webuiSelf.GetTokenCtx(models.Nrf_NFMgmt_ServiceName_NSMF_OAM, models.Nrf_NFMgmt_NFType_SMF)
if err != nil {
logger.ConsumerLog.Infof("GetTokenCtx: service %v, err: %+v", models.ServiceName_NSMF_OAM, err)
logger.ConsumerLog.Infof("GetTokenCtx: service %v, err: %+v", models.Nrf_NFMgmt_ServiceName_NSMF_OAM, err)
return pd, err
}

Expand Down Expand Up @@ -195,7 +195,7 @@ func validateStaticIPv4InPools(address string, staticPools []netip.Prefix) error
}

func validateSubscriberStaticIPs(
smData []models.SessionManagementSubscriptionData,
smData []models.Udm_SDM_SessionManagementSubscriptionData,
poolProvider staticIPPoolProvider,
) error {
poolCache := make(map[staticIPPoolCacheKey][]netip.Prefix)
Expand Down Expand Up @@ -384,7 +384,7 @@ func checkIpCollisionFromDb(
})
return mongo_err
}
var smDatas []models.SessionManagementSubscriptionData
var smDatas []models.Udm_SDM_SessionManagementSubscriptionData
if err := json.Unmarshal(sliceToByte(smDataDataInterface), &smDatas); err != nil {
logger.ProcLog.Errorf("Unmarshal smDatas err: %+v", err)
c.JSON(http.StatusInternalServerError, gin.H{})
Expand Down
25 changes: 13 additions & 12 deletions backend/WebUI/api_webui.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1174,31 +1174,31 @@ func GetSubscriberByID(c *gin.Context) {
c.JSON(http.StatusInternalServerError, gin.H{})
return
}
var amDataData models.AccessAndMobilitySubscriptionData
var amDataData models.Udr_DR_AccessAndMobilitySubscriptionData
if err = json.Unmarshal(mapToByte(amDataDataInterface), &amDataData); err != nil {
logger.ProcLog.Errorf("GetSubscriberByID err: %+v", err)
c.JSON(http.StatusInternalServerError, gin.H{})
return
}
var smDataData []models.SessionManagementSubscriptionData
var smDataData []models.Udm_SDM_SessionManagementSubscriptionData
if err = json.Unmarshal(sliceToByte(smDataDataInterface), &smDataData); err != nil {
logger.ProcLog.Errorf("GetSubscriberByID err: %+v", err)
c.JSON(http.StatusInternalServerError, gin.H{})
return
}
var smfSelData models.SmfSelectionSubscriptionData
var smfSelData models.Udr_DR_SmfSelectionSubscriptionData
if err = json.Unmarshal(mapToByte(smfSelDataInterface), &smfSelData); err != nil {
logger.ProcLog.Errorf("GetSubscriberByID err: %+v", err)
c.JSON(http.StatusInternalServerError, gin.H{})
return
}
var amPolicyData models.AmPolicyData
var amPolicyData models.Udr_DR_AmPolicyData
if err = json.Unmarshal(mapToByte(amPolicyDataInterface), &amPolicyData); err != nil {
logger.ProcLog.Errorf("GetSubscriberByID err: %+v", err)
c.JSON(http.StatusInternalServerError, gin.H{})
return
}
var smPolicyData models.SmPolicyData
var smPolicyData models.Udr_DR_SmPolicyData
if err = json.Unmarshal(mapToByte(smPolicyDataInterface), &smPolicyData); err != nil {
logger.ProcLog.Errorf("GetSubscriberByID err: %+v", err)
c.JSON(http.StatusInternalServerError, gin.H{})
Expand Down Expand Up @@ -1234,7 +1234,7 @@ func GetSubscriberByID(c *gin.Context) {
}

for key, SnssaiData := range smPolicyData.SmPolicySnssaiData {
tmpSmPolicyDnnData := make(map[string]models.SmPolicyDnnData)
tmpSmPolicyDnnData := make(map[string]models.Udr_DR_SmPolicyDnnData)
for escapedDnn, dnn := range SnssaiData.SmPolicyDnnData {
dnnKey := UnescapeDnn(escapedDnn)
tmpSmPolicyDnnData[dnnKey] = dnn
Expand Down Expand Up @@ -1419,7 +1419,8 @@ func sendRechargeNotification(ueId string, rg int32) {

requestUri := fmt.Sprintf("%s/nchf-convergedcharging/v3/recharging/%s?ratingGroup=%d",
"http://127.0.0.113:8000", ueId, rg)
ctx, pd, tokenErr := webuiSelf.GetTokenCtx(models.ServiceName_NCHF_CONVERGEDCHARGING, models.NrfNfManagementNfType_CHF)
ctx, pd, tokenErr := webuiSelf.GetTokenCtx(
models.Nrf_NFMgmt_ServiceName_NCHF_CONVERGEDCHARGING, models.Nrf_NFMgmt_NFType_CHF)
if tokenErr != nil {
logger.ProcLog.Errorf("GetTokenCtx for CHF recharge err: %+v", pd)
return
Expand Down Expand Up @@ -1610,7 +1611,7 @@ func dbOperation(
}

for key, SnssaiData := range subsData.SmPolicyData.SmPolicySnssaiData {
tmpSmPolicyDnnData := make(map[string]models.SmPolicyDnnData)
tmpSmPolicyDnnData := make(map[string]models.Udr_DR_SmPolicyDnnData)
for dnnKey, dnn := range SnssaiData.SmPolicyDnnData {
escapedDnn := EscapeDnn(dnnKey)
tmpSmPolicyDnnData[escapedDnn] = dnn
Expand Down Expand Up @@ -2035,7 +2036,7 @@ func GetRegisteredUEContext(c *gin.Context) {

supi, supiExists := c.Params.Get("supi")
// TODO: support fetching data from multiple AMFs
if amfUris := webuiSelf.GetOamUris(models.NrfNfManagementNfType_AMF); amfUris != nil {
if amfUris := webuiSelf.GetOamUris(models.Nrf_NFMgmt_NFType_AMF); amfUris != nil {
var requestUri string

if supiExists {
Expand All @@ -2045,7 +2046,7 @@ func GetRegisteredUEContext(c *gin.Context) {
}

ctx, pd, tokerErr := webui_context.GetSelf().GetTokenCtx(
models.ServiceName_NAMF_OAM, models.NrfNfManagementNfType_AMF)
models.Nrf_NFMgmt_ServiceName_NAMF_OAM, models.Nrf_NFMgmt_NFType_AMF)
if tokerErr != nil {
logger.ProcLog.Errorf("GetTokenCtx error: %+v", tokerErr)
c.JSON(http.StatusInternalServerError, pd)
Expand Down Expand Up @@ -2125,11 +2126,11 @@ func GetUEPDUSessionInfo(c *gin.Context) {
}

// TODO: support fetching data from multiple SMF
if smfUris := webuiSelf.GetOamUris(models.NrfNfManagementNfType_SMF); smfUris != nil {
if smfUris := webuiSelf.GetOamUris(models.Nrf_NFMgmt_NFType_SMF); smfUris != nil {
requestUri := fmt.Sprintf("%s/nsmf-oam/v1/ue-pdu-session-info/%s", smfUris[0], smContextRef)

ctx, pd, tokerErr := webui_context.GetSelf().GetTokenCtx(
models.ServiceName_NSMF_OAM, models.NrfNfManagementNfType_SMF)
models.Nrf_NFMgmt_ServiceName_NSMF_OAM, models.Nrf_NFMgmt_NFType_SMF)
if tokerErr != nil {
logger.ProcLog.Errorf("GetTokenCtx error: %+v", tokerErr)
c.JSON(http.StatusInternalServerError, pd)
Expand Down
18 changes: 9 additions & 9 deletions backend/WebUI/model_profile_data.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ package WebUI
import "github.com/free5gc/openapi/models"

type Profile struct {
ProfileName string `json:"profileName"`
TenantId string `json:"tenantId"`
AccessAndMobilitySubscriptionData models.AccessAndMobilitySubscriptionData `json:"AccessAndMobilitySubscriptionData"`
SessionManagementSubscriptionData []models.SessionManagementSubscriptionData `json:"SessionManagementSubscriptionData"`
SmfSelectionSubscriptionData models.SmfSelectionSubscriptionData `json:"SmfSelectionSubscriptionData"`
AmPolicyData models.AmPolicyData `json:"AmPolicyData"`
SmPolicyData models.SmPolicyData `json:"SmPolicyData"`
FlowRules []FlowRule `json:"FlowRules"`
QosFlows []QosFlow `json:"QosFlows"`
ProfileName string `json:"profileName"`
TenantId string `json:"tenantId"`
AccessAndMobilitySubscriptionData models.Udr_DR_AccessAndMobilitySubscriptionData `json:"AccessAndMobilitySubscriptionData"` //nolint:lll
SessionManagementSubscriptionData []models.Udm_SDM_SessionManagementSubscriptionData `json:"SessionManagementSubscriptionData"` //nolint:lll
SmfSelectionSubscriptionData models.Udr_DR_SmfSelectionSubscriptionData `json:"SmfSelectionSubscriptionData"` //nolint:lll
AmPolicyData models.Udr_DR_AmPolicyData `json:"AmPolicyData"`
SmPolicyData models.Udr_DR_SmPolicyData `json:"SmPolicyData"`
FlowRules []FlowRule `json:"FlowRules"`
QosFlows []QosFlow `json:"QosFlows"`
ChargingDatas []ChargingData
}
22 changes: 11 additions & 11 deletions backend/WebUI/model_subs_data.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ package WebUI
import "github.com/free5gc/openapi/models"

type SubsData struct {
PlmnID string `json:"plmnID"`
UeId string `json:"ueId"`
WebAuthenticationSubscription WebAuthenticationSubscription `json:"AuthenticationSubscription"`
AccessAndMobilitySubscriptionData models.AccessAndMobilitySubscriptionData `json:"AccessAndMobilitySubscriptionData"`
SessionManagementSubscriptionData []models.SessionManagementSubscriptionData `json:"SessionManagementSubscriptionData"`
SmfSelectionSubscriptionData models.SmfSelectionSubscriptionData `json:"SmfSelectionSubscriptionData"`
AmPolicyData models.AmPolicyData `json:"AmPolicyData"`
SmPolicyData models.SmPolicyData `json:"SmPolicyData"`
FlowRules []FlowRule `json:"FlowRules"`
QosFlows []QosFlow `json:"QosFlows"`
ChargingDatas []ChargingData `json:"ChargingDatas"`
PlmnID string `json:"plmnID"`
UeId string `json:"ueId"`
WebAuthenticationSubscription WebAuthenticationSubscription `json:"AuthenticationSubscription"` //nolint:lll
AccessAndMobilitySubscriptionData models.Udr_DR_AccessAndMobilitySubscriptionData `json:"AccessAndMobilitySubscriptionData"` //nolint:lll
SessionManagementSubscriptionData []models.Udm_SDM_SessionManagementSubscriptionData `json:"SessionManagementSubscriptionData"` //nolint:lll
SmfSelectionSubscriptionData models.Udr_DR_SmfSelectionSubscriptionData `json:"SmfSelectionSubscriptionData"` //nolint:lll
AmPolicyData models.Udr_DR_AmPolicyData `json:"AmPolicyData"`
SmPolicyData models.Udr_DR_SmPolicyData `json:"SmPolicyData"`
FlowRules []FlowRule `json:"FlowRules"`
QosFlows []QosFlow `json:"QosFlows"`
ChargingDatas []ChargingData `json:"ChargingDatas"`
}
10 changes: 5 additions & 5 deletions backend/WebUI/model_web_auth_subs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import (
)

type WebAuthenticationSubscription struct {
AuthenticationMethod models.AuthMethod `json:"authenticationMethod" bson:"authenticationMethod"`
PermanentKey *PermanentKey `json:"permanentKey" bson:"permanentKey"`
SequenceNumber string `json:"sequenceNumber" bson:"sequenceNumber"`
Milenage *Milenage `json:"milenage,omitempty" bson:"milenage"`
Opc *Opc `json:"opc,omitempty" bson:"opc"`
AuthenticationMethod models.Udr_DR_AuthMethod `json:"authenticationMethod" bson:"authenticationMethod"`
PermanentKey *PermanentKey `json:"permanentKey" bson:"permanentKey"`
SequenceNumber string `json:"sequenceNumber" bson:"sequenceNumber"`
Milenage *Milenage `json:"milenage,omitempty" bson:"milenage"`
Opc *Opc `json:"opc,omitempty" bson:"opc"`
//nolint
AuthenticationManagementField string `json:"authenticationManagementField,omitempty" bson:"authenticationManagementField"`
}
Expand Down
8 changes: 4 additions & 4 deletions backend/WebUI/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

func WebAuthSubToModels(
webAuth WebAuthenticationSubscription,
) (*models.AuthenticationSubscription, error) {
) (*models.Udr_DR_AuthenticationSubscription, error) {
if webAuth.Opc == nil && webAuth.Milenage == nil {
return nil, fmt.Errorf("WebAuthenticationSubscription OPc & Milenage are nil")
}
Expand All @@ -26,12 +26,12 @@ func WebAuthSubToModels(
return nil, fmt.Errorf("WebAuthenticationSubscription OPc OP not found")
}

authSub := &models.AuthenticationSubscription{
authSub := &models.Udr_DR_AuthenticationSubscription{
AuthenticationMethod: webAuth.AuthenticationMethod,
EncOpcKey: encOpc,
EncPermanentKey: webAuth.PermanentKey.PermanentKeyValue,
SequenceNumber: &models.SequenceNumber{
SqnScheme: models.SqnScheme_GENERAL,
SequenceNumber: &models.Udr_DR_SequenceNumber{
SqnScheme: models.Udr_DR_SqnScheme_GENERAL,
Sqn: webAuth.SequenceNumber,
},
AuthenticationManagementField: webAuth.AuthenticationManagementField,
Expand Down
Loading
Loading