refactor: use Consumer() instead of consumer.GetConsumer()

free5gc · May 14, 2024 · 9efc266 · 9efc266
1 parent a0c9e61
commit 9efc266
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/cmd/main.go b/cmd/main.go
@@ -13,7 +13,6 @@ import (
 	"github.com/free5gc/amf/internal/logger"
 	"github.com/free5gc/amf/pkg/factory"
 	"github.com/free5gc/amf/pkg/service"
-	// "github.com/free5gc/amf/pkg/utils"
 	logger_util "github.com/free5gc/util/logger"
 	"github.com/free5gc/util/version"
 )
@@ -71,7 +70,6 @@ func action(cliCtx *cli.Context) error {
 	}
 	factory.AmfConfig = cfg
 
-	// appStart, appStop := utils.InitFunc(tlsKeyLogPath)
 	amf, err := service.NewApp(ctx, cfg, tlsKeyLogPath)
 	if err != nil {
 		return err

diff --git a/internal/sbi/server.go b/internal/sbi/server.go
@@ -88,12 +88,12 @@ func newRouter(s *Server) *gin.Engine {
 
 func (s *Server) Run(traceCtx context.Context, wg *sync.WaitGroup) error {
 	var profile models.NfProfile
-	if profileTmp, err1 := consumer.GetConsumer().BuildNFInstance(s.Context()); err1 != nil {
+	if profileTmp, err1 := s.Consumer().BuildNFInstance(s.Context()); err1 != nil {
 		logger.InitLog.Error("Build AMF Profile Error")
 	} else {
 		profile = profileTmp
 	}
-	_, nfId, err_reg := consumer.GetConsumer().SendRegisterNFInstance(s.Context().NrfUri, s.Context().NfId, profile)
+	_, nfId, err_reg := s.Consumer().SendRegisterNFInstance(s.Context().NrfUri, s.Context().NfId, profile)
 	if err_reg != nil {
 		logger.InitLog.Warnf("Send Register NF Instance failed: %+v", err_reg)
 	} else {

diff --git a/pkg/service/init.go b/pkg/service/init.go
@@ -27,6 +27,7 @@ type AmfAppInterface interface {
 	app.App
 	consumer.ConsumerAmf
 	Consumer() *consumer.Consumer
+	Processor() *processor.Processor
 }
 
 var AMF AmfAppInterface
@@ -151,7 +152,7 @@ func (a *AmfApp) Terminate() {
 	a.cancel()
 	a.CallServerStop()
 	// deregister with NRF
-	problemDetails, err_deg := consumer.GetConsumer().SendDeregisterNFInstance()
+	problemDetails, err_deg := a.Consumer().SendDeregisterNFInstance()
 	if problemDetails != nil {
 		logger.InitLog.Errorf("Deregister NF instance Failed Problem[%+v]", problemDetails)
 	} else if err_deg != nil {