Merge pull request #26 from HanHongChen/refactor/sbi-logic

refactor: App, Server, Processor, Consumer

cmd/main.go

@@ -12,10 +12,13 @@
 package main
 
 import (
+	"context"
 	"fmt"
 	"os"
+	"os/signal"
 	"path/filepath"
 	"runtime/debug"
+	"syscall"
 
 	"github.com/urfave/cli"
 
@@ -64,19 +67,32 @@ func action(cliCtx *cli.Context) error {
 	logger.MainLog.Infoln(cliCtx.App.Name)
 	logger.MainLog.Infoln("PCF version: ", version.GetVersion())
 
+	ctx, cancel := context.WithCancel(context.Background())
+	sigCh := make(chan os.Signal, 1)
+	signal.Notify(sigCh, os.Interrupt, syscall.SIGTERM)
+
+	go func() {
+		<-sigCh  // Wait for interrupt signal to gracefully shutdown UPF
+		cancel() // Notify each goroutine and wait them stopped
+	}()
+
 	cfg, err := factory.ReadConfig(cliCtx.String("config"))
 	if err != nil {
+		sigCh <- nil
 		return err
 	}
 	factory.PcfConfig = cfg
 
-	pcf, err := service.NewApp(cfg)
+	pcf, err := service.NewApp(ctx, cfg, tlsKeyLogPath)
 	if err != nil {
+		sigCh <- nil
 		return err
 	}
 	PCF = pcf
-
-	pcf.Start(tlsKeyLogPath)
+	if pcf == nil {
+		logger.MainLog.Infoln("pcf is nil")
+	}
+	pcf.Start()
 
 	return nil
 }

internal/context/context.go

@@ -82,7 +82,7 @@ type NFContext interface {
 
 var _ NFContext = &PCFContext{}
 
-func InitpcfContext(context *PCFContext) {
+func InitPcfContext(context *PCFContext) {
 	config := factory.PcfConfig
 	logger.UtilLog.Infof("pcfconfig Info: Version[%s] Description[%s]", config.Info.Version, config.Info.Description)
 	configuration := config.Configuration
@@ -157,7 +157,7 @@ func Init() {
 	pcfContext.PcfSuppFeats = make(map[models.ServiceName]openapi.SupportedFeature)
 	pcfContext.BdtPolicyIDGenerator = idgenerator.NewGenerator(1, math.MaxInt64)
 	pcfContext.RatingGroupIdGenerator = idgenerator.NewGenerator(1, math.MaxInt64)
-	InitpcfContext(&pcfContext)
+	InitPcfContext(&pcfContext)
 }
 
 // Create new PCF context
@@ -458,11 +458,6 @@ func (c *PCFContext) AuthorizationCheck(token string, serviceName models.Service
 		logger.UtilLog.Debugf("PCFContext::AuthorizationCheck: OAuth2 not required\n")
 		return nil
 	}
-	// TODO: free5gc webconsole uses npcf-oam but it can't get token since it's not an NF.
-	if serviceName == models.ServiceName_NPCF_OAM {
-		logger.UtilLog.Warnf("OAuth2 is enable but namf-oam didn't check token now.")
-		return nil
-	}
 
 	logger.UtilLog.Debugf("PCFContext::AuthorizationCheck: token[%s] serviceName[%s]\n", token, serviceName)
 	return oauth.VerifyOAuth(token, string(serviceName), c.NrfCertPem)

internal/logger/logger.go

@@ -14,6 +14,7 @@ var (
 	CfgLog        *logrus.Entry
 	CtxLog        *logrus.Entry
 	GinLog        *logrus.Entry
+	SBILog        *logrus.Entry
 	AmPolicyLog   *logrus.Entry
 	BdtPolicyLog  *logrus.Entry
 	ConsumerLog   *logrus.Entry
@@ -38,6 +39,7 @@ func init() {
 	CfgLog = NfLog.WithField(logger_util.FieldCategory, "CFG")
 	CtxLog = NfLog.WithField(logger_util.FieldCategory, "CTX")
 	GinLog = NfLog.WithField(logger_util.FieldCategory, "GIN")
+	SBILog = NfLog.WithField(logger_util.FieldCategory, "SBI")
 	AmPolicyLog = NfLog.WithField(logger_util.FieldCategory, "AmPol")
 	BdtPolicyLog = NfLog.WithField(logger_util.FieldCategory, "BdtPol")
 	ConsumerLog = NfLog.WithField(logger_util.FieldCategory, "Consumer")