Skip to content

Commit

Permalink
fix: go test error, ci error
Browse files Browse the repository at this point in the history
  • Loading branch information
ming-hsien committed May 15, 2024
1 parent 84af015 commit 2cf8281
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 11 deletions.
5 changes: 5 additions & 0 deletions internal/sbi/consumer/consumer.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"github.com/free5gc/openapi/Nsmf_PDUSession"
"github.com/free5gc/openapi/Nudm_SubscriberDataManagement"
"github.com/free5gc/openapi/Nudm_UEContextManagement"
smf_context "github.com/free5gc/smf/internal/context"
"github.com/free5gc/smf/pkg/app"
)

Expand All @@ -22,6 +23,10 @@ type Consumer struct {
*nnrfService
}

func (c *Consumer) Context() *smf_context.SMFContext {
return smf_context.GetSelf()
}

func NewConsumer(smf app.App) (*Consumer, error) {
c := &Consumer{
App: smf,
Expand Down
21 changes: 10 additions & 11 deletions internal/sbi/consumer/nrf_service.go
Original file line number Diff line number Diff line change
Expand Up @@ -178,15 +178,15 @@ func (s *nnrfService) RetrySendNFRegistration(MaxRetry int) error {
// func (s *nnrfService) SendNFDeregistration() error {
// // Check data (Use RESTful DELETE)

// ctx, _, err := smf_context.GetSelf().GetTokenCtx(models.ServiceName_NNRF_NFM, models.NfType_NRF)
// ctx, _, err := s.consumer.Context().GetTokenCtx(models.ServiceName_NNRF_NFM, models.NfType_NRF)
// if err != nil {
// return err
// }

// res, localErr := smf_context.GetSelf().
// res, localErr := s.consumer.Context().
// NFManagementClient.
// NFInstanceIDDocumentApi.
// DeregisterNFInstance(ctx, smf_context.GetSelf().NfInstanceID)
// DeregisterNFInstance(ctx, s.consumer.Context().NfInstanceID)
// if localErr != nil {
// logger.ConsumerLog.Warnln(localErr)
// return localErr
Expand All @@ -209,12 +209,12 @@ func (s *nnrfService) RetrySendNFRegistration(MaxRetry int) error {
func (s *nnrfService) SendDeregisterNFInstance() (problemDetails *models.ProblemDetails, err error) {
logger.ConsumerLog.Infof("Send Deregister NFInstance")

ctx, pd, err := smf_context.GetSelf().GetTokenCtx(models.ServiceName_NNRF_NFM, models.NfType_NRF)
smfContext := s.consumer.Context()
ctx, pd, err := smfContext.GetTokenCtx(models.ServiceName_NNRF_NFM, models.NfType_NRF)
if err != nil {
return pd, err
}

smfContext := s.consumer.Context()
client := s.getNFManagementClient(smfContext.NrfUri)

var res *http.Response
Expand Down Expand Up @@ -252,7 +252,7 @@ func (s *nnrfService) SendSearchNFInstances(nrfUri string, targetNfType, request
return nil, openapi.ReportError("nrf not found")
}

ctx, _, err := smf_context.GetSelf().GetTokenCtx(models.ServiceName_NNRF_DISC, models.NfType_NRF)
ctx, _, err := smfContext.GetTokenCtx(models.ServiceName_NNRF_DISC, models.NfType_NRF)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -317,13 +317,12 @@ func (s *nnrfService) NFDiscoveryAMF(smContext *smf_context.SMContext, ctx conte
}

func (s *nnrfService) SendNFDiscoveryUDM() (*models.ProblemDetails, error) {
ctx, pd, err := smf_context.GetSelf().GetTokenCtx(models.ServiceName_NNRF_DISC, models.NfType_NRF)
smfContext := s.consumer.Context()
ctx, pd, err := smfContext.GetTokenCtx(models.ServiceName_NNRF_DISC, models.NfType_NRF)
if err != nil {
return pd, err
}

smfContext := s.consumer.Context()

// Check data
result, httpResp, localErr := s.NFDiscoveryUDM(ctx)

Expand Down Expand Up @@ -359,7 +358,7 @@ func (s *nnrfService) SendNFDiscoveryUDM() (*models.ProblemDetails, error) {
}

func (s *nnrfService) SendNFDiscoveryPCF() (problemDetails *models.ProblemDetails, err error) {
ctx, pd, err := smf_context.GetSelf().GetTokenCtx(models.ServiceName_NNRF_DISC, models.NfType_NRF)
ctx, pd, err := s.consumer.Context().GetTokenCtx(models.ServiceName_NNRF_DISC, models.NfType_NRF)
if err != nil {
return pd, err
}
Expand Down Expand Up @@ -390,7 +389,7 @@ func (s *nnrfService) SendNFDiscoveryPCF() (problemDetails *models.ProblemDetail
}

func (s *nnrfService) SendNFDiscoveryServingAMF(smContext *smf_context.SMContext) (*models.ProblemDetails, error) {
ctx, pd, err := smf_context.GetSelf().GetTokenCtx(models.ServiceName_NNRF_DISC, models.NfType_NRF)
ctx, pd, err := s.consumer.Context().GetTokenCtx(models.ServiceName_NNRF_DISC, models.NfType_NRF)
if err != nil {
return pd, err
}
Expand Down

0 comments on commit 2cf8281

Please sign in to comment.