fix: fix PR comment

free5gc · Jun 25, 2024 · d4025e0 · d4025e0
1 parent 0001050
commit d4025e0
Show file tree

Hide file tree

Showing 6 changed files with 86 additions and 97 deletions.
diff --git a/internal/sbi/processor/event_exposure.go b/internal/sbi/processor/event_exposure.go
@@ -16,7 +16,7 @@ import (
 func (p *Processor) CreateEeSubscriptionProcedure(c *gin.Context, ueIdentity string,
 	eesubscription models.EeSubscription,
 ) {
-	udmSelf := udm_context.GetSelf()
+	udmSelf := p.Context()
 	logger.EeLog.Debugf("udIdentity: %s", ueIdentity)
 	switch {
 	// GPSI (MSISDN identifier) represents a single UE
@@ -110,7 +110,7 @@ func (p *Processor) CreateEeSubscriptionProcedure(c *gin.Context, ueIdentity str
 
 // TODO: complete this procedure based on TS 29503 5.5
 func (p *Processor) DeleteEeSubscriptionProcedure(c *gin.Context, ueIdentity string, subscriptionID string) {
-	udmSelf := udm_context.GetSelf()
+	udmSelf := p.Context()
 
 	switch {
 	case strings.HasPrefix(ueIdentity, "msisdn-"):
@@ -148,7 +148,7 @@ func (p *Processor) DeleteEeSubscriptionProcedure(c *gin.Context, ueIdentity str
 func (p *Processor) UpdateEeSubscriptionProcedure(c *gin.Context, ueIdentity string, subscriptionID string,
 	patchList []models.PatchItem,
 ) {
-	udmSelf := udm_context.GetSelf()
+	udmSelf := p.Context()
 
 	switch {
 	case strings.HasPrefix(ueIdentity, "msisdn-"):

diff --git a/internal/sbi/processor/generate_auth_data.go b/internal/sbi/processor/generate_auth_data.go
@@ -18,7 +18,6 @@ import (
 	"github.com/free5gc/openapi"
 	"github.com/free5gc/openapi/Nudr_DataRepository"
 	"github.com/free5gc/openapi/models"
-	udm_context "github.com/free5gc/udm/internal/context"
 	"github.com/free5gc/udm/internal/logger"
 	"github.com/free5gc/udm/pkg/suci"
 	"github.com/free5gc/util/milenage"
@@ -81,7 +80,7 @@ func (p *Processor) ConfirmAuthDataProcedure(c *gin.Context,
 	authEvent models.AuthEvent,
 	supi string,
 ) {
-	ctx, pd, err := udm_context.GetSelf().GetTokenCtx(models.ServiceName_NUDR_DR, models.NfType_UDR)
+	ctx, pd, err := p.Context().GetTokenCtx(models.ServiceName_NUDR_DR, models.NfType_UDR)
 	if err != nil {
 		c.JSON(int(pd.Status), pd)
 		return
@@ -124,7 +123,7 @@ func (p *Processor) GenerateAuthDataProcedure(
 	authInfoRequest models.AuthenticationInfoRequest,
 	supiOrSuci string,
 ) {
-	ctx, pd, err := udm_context.GetSelf().GetTokenCtx(models.ServiceName_NUDR_DR, models.NfType_UDR)
+	ctx, pd, err := p.Context().GetTokenCtx(models.ServiceName_NUDR_DR, models.NfType_UDR)
 	if err != nil {
 		c.JSON(int(pd.Status), pd)
 		return
@@ -133,7 +132,7 @@ func (p *Processor) GenerateAuthDataProcedure(
 
 	response := &models.AuthenticationInfoResult{}
 	rand.New(rand.NewSource(time.Now().UnixNano()))
-	supi, err := suci.ToSupi(supiOrSuci, udm_context.GetSelf().SuciProfiles)
+	supi, err := suci.ToSupi(supiOrSuci, p.Context().SuciProfiles)
 	if err != nil {
 		problemDetails := &models.ProblemDetails{
 			Status: http.StatusForbidden,
@@ -409,7 +408,7 @@ func (p *Processor) GenerateAuthDataProcedure(
 						keyIndex)
 				} else {
 					logger.UeauLog.Errorln("Re-Sync Failed UDM Public Key ",
-						udm_context.GetSelf().SuciProfiles[keyIndex-1].PublicKey)
+						p.Context().SuciProfiles[keyIndex-1].PublicKey)
 				}
 			}
 			logger.UeauLog.Errorln("MACS ", macS)

diff --git a/internal/sbi/processor/notifier.go b/internal/sbi/processor/notifier.go
@@ -6,21 +6,20 @@ import (
 	"github.com/gin-gonic/gin"
 
 	"github.com/free5gc/openapi/models"
-	udm_context "github.com/free5gc/udm/internal/context"
 	"github.com/free5gc/udm/internal/logger"
 )
 
 func (p *Processor) DataChangeNotificationProcedure(c *gin.Context,
 	notifyItems []models.NotifyItem,
 	supi string,
 ) {
-	ctx, pd, err := udm_context.GetSelf().GetTokenCtx(models.ServiceName_NUDM_SDM, models.NfType_UDM)
+	ctx, pd, err := p.Context().GetTokenCtx(models.ServiceName_NUDM_SDM, models.NfType_UDM)
 	if err != nil {
 		c.JSON(int(pd.Status), pd)
 		return
 	}
 
-	ue, _ := udm_context.GetSelf().UdmUeFindBySupi(supi)
+	ue, _ := p.Context().UdmUeFindBySupi(supi)
 
 	clientAPI := p.consumer.GetSDMClient("DataChangeNotification")
 
@@ -61,7 +60,7 @@ func (p *Processor) DataChangeNotificationProcedure(c *gin.Context,
 func (p *Processor) SendOnDeregistrationNotification(ueId string, onDeregistrationNotificationUrl string,
 	deregistData models.DeregistrationData,
 ) *models.ProblemDetails {
-	ctx, pd, err := udm_context.GetSelf().GetTokenCtx(models.ServiceName_NUDM_UECM, models.NfType_UDM)
+	ctx, pd, err := p.Context().GetTokenCtx(models.ServiceName_NUDM_UECM, models.NfType_UDM)
 	if err != nil {
 		return pd
 	}

diff --git a/internal/sbi/processor/parameter_provision.go b/internal/sbi/processor/parameter_provision.go
@@ -7,15 +7,14 @@ import (
 
 	"github.com/free5gc/openapi"
 	"github.com/free5gc/openapi/models"
-	udm_context "github.com/free5gc/udm/internal/context"
 	"github.com/free5gc/udm/internal/logger"
 )
 
 func (p *Processor) UpdateProcedure(c *gin.Context,
 	updateRequest models.PpData,
 	gpsi string,
 ) {
-	ctx, pd, err := udm_context.GetSelf().GetTokenCtx(models.ServiceName_NUDR_DR, models.NfType_UDR)
+	ctx, pd, err := p.Context().GetTokenCtx(models.ServiceName_NUDR_DR, models.NfType_UDR)
 	if err != nil {
 		c.JSON(int(pd.Status), pd)
 		return