Merge pull request #31 from andy89923/refactor/app

Refactor: Comply with new App Interface
free5gc · Jun 20, 2024 · 516f992 · 516f992
2 parents 30e0f20 + 67a76a4
commit 516f992
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 18 deletions.
diff --git a/cmd/main.go b/cmd/main.go
@@ -89,8 +89,7 @@ func action(cliCtx *cli.Context) error {
 	}
 	CHF = chf
 
-	chf.Start("")
-	CHF.WaitRoutineStopped()
+	chf.Start()
 
 	return nil
 }

diff --git a/internal/sbi/consumer/nrf_service.go b/internal/sbi/consumer/nrf_service.go
@@ -8,7 +8,6 @@ import (
 	"sync"
 	"time"
 
-	// "github.com/free5gc/openapi/nrf/NFManagement" // R17
 	chf_context "github.com/free5gc/chf/internal/context"
 	"github.com/free5gc/chf/internal/logger"
 	"github.com/free5gc/openapi"
@@ -73,8 +72,10 @@ func (s *nnrfService) getNFDiscClient(uri string) *Nnrf_NFDiscovery.APIClient {
 }
 
 func (s *nnrfService) SendSearchNFInstances(
-	nrfUri string, targetNfType, requestNfType models.NfType, param Nnrf_NFDiscovery.SearchNFInstancesParamOpts) (
-	*models.SearchResult, error) {
+	nrfUri string, targetNfType, requestNfType models.NfType, param Nnrf_NFDiscovery.SearchNFInstancesParamOpts,
+) (
+	*models.SearchResult, error,
+) {
 	// Set client and set url
 	chfContext := s.consumer.Context()
 
@@ -147,7 +148,7 @@ func (s *nnrfService) RegisterNFInstance(ctx context.Context) (
 	var nf models.NfProfile
 	var res *http.Response
 	for {
-		nf, res, err = client.NFInstanceIDDocumentApi.RegisterNFInstance(context.TODO(), chfContext.NfId, nfProfile)
+		nf, res, err = client.NFInstanceIDDocumentApi.RegisterNFInstance(ctx, chfContext.NfId, nfProfile)
 		if err != nil || res == nil {
 			logger.ConsumerLog.Errorf("CHF register to NRF Error[%v]", err)
 			time.Sleep(2 * time.Second)

diff --git a/internal/sbi/server.go b/internal/sbi/server.go
@@ -119,5 +119,5 @@ func (s *Server) startServer(wg *sync.WaitGroup) {
 	if err != nil && err != http.ErrServerClosed {
 		logger.SBILog.Errorf("SBI server error: %v", err)
 	}
-	logger.SBILog.Warnf("SBI server (listen on %s) stopped", s.httpServer.Addr)
+	logger.SBILog.Infof("SBI server (listen on %s) stopped", s.httpServer.Addr)
 }
diff --git a/pkg/app/app.go b/pkg/app/app.go
@@ -10,7 +10,7 @@ type App interface {
 	SetLogLevel(level string)
 	SetReportCaller(reportCaller bool)
 
-	Start(tlsKeyLogPath string)
+	Start()
 	Terminate()
 
 	Context() *chf_context.CHFContext

diff --git a/pkg/service/init.go b/pkg/service/init.go
@@ -26,11 +26,6 @@ var CHF *ChfApp
 var _ app.App = &ChfApp{}
 
 type ChfApp struct {
-	app.App
-	consumer.ConsumerChf
-	processor.ProcessorChf
-	sbi.ServerChf
-
 	chfCtx *chf_context.CHFContext
 	cfg    *factory.Config
 
@@ -134,13 +129,11 @@ func (c *ChfApp) SetReportCaller(reportCaller bool) {
 	if reportCaller == logger.Log.ReportCaller {
 		return
 	}
-
 	c.Config().SetLogReportCaller(reportCaller)
 	logger.Log.SetReportCaller(reportCaller)
 }
 
-// tlsKeyLogPath have to remove after all NFs are refactor
-func (a *ChfApp) Start(tlsKeyLogPath string) {
+func (a *ChfApp) Start() {
 	logger.InitLog.Infoln("Server started")
 
 	a.wg.Add(1)
@@ -158,6 +151,8 @@ func (a *ChfApp) Start(tlsKeyLogPath string) {
 	if err := a.sbiServer.Run(context.Background(), &a.wg); err != nil {
 		logger.MainLog.Fatalf("Run SBI server failed: %+v", err)
 	}
+
+	a.WaitRoutineStopped()
 }
 
 func (a *ChfApp) listenShutdownEvent() {
@@ -170,12 +165,15 @@ func (a *ChfApp) listenShutdownEvent() {
 	}()
 
 	<-a.ctx.Done()
-	a.Terminate()
+	a.terminateProcedure()
 }
 
 func (c *ChfApp) Terminate() {
-	logger.MainLog.Infof("Terminating CHF...")
 	c.cancel()
+}
+
+func (c *ChfApp) terminateProcedure() {
+	logger.MainLog.Infof("Terminating CHF...")
 	c.CallServerStop()
 
 	// deregister with NRF