refactor: NSSF app, sbi, processor, consumer

cmd/main.go

@@ -1,13 +1,18 @@
 package main
 
 import (
+	"context"
 	"os"
+	"os/signal"
 	"path/filepath"
 	"runtime/debug"
+	"syscall"
 
 	"github.com/urfave/cli"
 
+	nssf_context "github.com/free5gc/nssf/internal/context"
 	"github.com/free5gc/nssf/internal/logger"
+	"github.com/free5gc/nssf/internal/repository"
 	"github.com/free5gc/nssf/pkg/factory"
 	"github.com/free5gc/nssf/pkg/service"
 	logger_util "github.com/free5gc/util/logger"
@@ -56,13 +61,25 @@ func action(cliCtx *cli.Context) error {
 	}
 	factory.NssfConfig = cfg
 
-	nssf, err := service.NewApp(cfg)
+	runtimeRepo := repository.NewRuntimeRepository(cfg)
+	nssf_context.InitNssfContext()
+	nssf, err := service.NewApp(runtimeRepo, tlsKeyLogPath)
 	if err != nil {
 		return err
 	}
 	NSSF = nssf
 
-	nssf.Start(tlsKeyLogPath)
+	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
+		cancel() // Notify each goroutine and wait them stopped
+	}()
+
+	nssf.Start(ctx)
+	nssf.Wait()
 
 	return nil
 }

internal/context/context.go

@@ -66,6 +66,8 @@ type NSSFContext struct {
 
 // Initialize NSSF context with configuration factory
 func InitNssfContext() {
+	Init()
+
 	nssfConfig := factory.NssfConfig
 	if nssfConfig.Configuration.NssfName != "" {
 		nssfContext.Name = nssfConfig.Configuration.NssfName

internal/repository/runtime.go

@@ -0,0 +1,26 @@
+package repository
+
+import (
+	nssf_context "github.com/free5gc/nssf/internal/context"
+	"github.com/free5gc/nssf/pkg/factory"
+)
+
+type RuntimeRepository struct {
+	config  *factory.Config
+	nssfCtx *nssf_context.NSSFContext
+}
+
+func NewRuntimeRepository(cfg *factory.Config) *RuntimeRepository {
+	return &RuntimeRepository{
+		config:  cfg,
+		nssfCtx: nssf_context.GetSelf(),
+	}
+}
+
+func (rr RuntimeRepository) Config() *factory.Config {
+	return rr.config
+}
+
+func (rr RuntimeRepository) Context() *nssf_context.NSSFContext {
+	return rr.nssfCtx
+}

internal/sbi/api_nssaiavailability.go

@@ -0,0 +1,60 @@
+package sbi
+
+import (
+	"net/http"
+	"strings"
+
+	"github.com/gin-gonic/gin"
+)
+
+func (s *Server) getNssaiAvailabilityRoutes() []Route {
+	return []Route{
+		{
+			"Health Check",
+			strings.ToUpper("Get"),
+			"/",
+			func(ctx *gin.Context) {
+				ctx.JSON(http.StatusOK, gin.H{"status": "Service Available"})
+			},
+		},
+
+		{
+			"NSSAIAvailabilityDelete",
+			strings.ToUpper("Delete"),
+			"/nssai-availability/:nfId",
+			s.Processor().HandleNSSAIAvailabilityDelete,
+		},
+
+		{
+			"NSSAIAvailabilityPatch",
+			strings.ToUpper("Patch"),
+			"/nssai-availability/:nfId",
+			s.Processor().HandleNSSAIAvailabilityPatch,
+		},
+
+		{
+			"NSSAIAvailabilityPut",
+			strings.ToUpper("Put"),
+			"/nssai-availability/:nfId",
+			s.Processor().HandleNSSAIAvailabilityPut,
+		},
+
+		// Regular expressions for route matching should be unique in Gin package
+		// 'subscriptions' would conflict with existing wildcard ':nfId'
+		// Simply replace 'subscriptions' with ':nfId' and check if ':nfId' is 'subscriptions' in handler function
+		{
+			"NSSAIAvailabilityUnsubscribe",
+			strings.ToUpper("Delete"),
+			// "/nssai-availability/subscriptions/:subscriptionId",
+			"/nssai-availability/:nfId/:subscriptionId",
+			s.Processor().HTTPNSSAIAvailabilityUnsubscribe,
+		},
+
+		{
+			"NSSAIAvailabilityPost",
+			strings.ToUpper("Post"),
+			"/nssai-availability/subscriptions",
+			s.Processor().HTTPNSSAIAvailabilityPost,
+		},
+	}
+}

internal/sbi/api_nsselection.go

@@ -0,0 +1,28 @@
+package sbi
+
+import (
+	"net/http"
+	"strings"
+
+	"github.com/gin-gonic/gin"
+)
+
+func (s *Server) getNsSelectionRoutes() []Route {
+	return []Route{
+		{
+			"Helth Check",
+			strings.ToUpper("Get"),
+			"/",
+			func(ctx *gin.Context) {
+				ctx.JSON(http.StatusOK, gin.H{"status": "Service Available"})
+			},
+		},
+
+		{
+			"NSSelectionGet",
+			strings.ToUpper("Get"),
+			"/network-slice-information",
+			s.Processor().HandleNetworkSliceInformationGet,
+		},
+	}
+}

internal/sbi/producer/nssaiavailability_store.go → internal/sbi/nssaiavailability/nssaiavailability_store.go

@@ -4,7 +4,7 @@
  * NSSF NSSAI Availability Service
  */
 
-package producer
+package nssaiavailability
 
 import (
 	"bytes"
@@ -22,8 +22,7 @@ import (
 	"github.com/free5gc/openapi/models"
 )
 
-// NSSAIAvailability DELETE method
-func NSSAIAvailabilityDeleteProcedure(nfId string) *models.ProblemDetails {
+func NfInstanceDelete(nfId string) *models.ProblemDetails {
 	var problemDetails *models.ProblemDetails
 	for i, amfConfig := range factory.NssfConfig.Configuration.AmfList {
 		if amfConfig.NfId == nfId {
@@ -34,16 +33,15 @@ func NSSAIAvailabilityDeleteProcedure(nfId string) *models.ProblemDetails {
 		}
 	}
 
-	*problemDetails = models.ProblemDetails{
+	problemDetails = &models.ProblemDetails{
 		Title:  util.UNSUPPORTED_RESOURCE,
 		Status: http.StatusNotFound,
 		Detail: fmt.Sprintf("AMF ID '%s' does not exist", nfId),
 	}
 	return problemDetails
 }
 
-// NSSAIAvailability PATCH method
-func NSSAIAvailabilityPatchProcedure(nssaiAvailabilityUpdateInfo plugin.PatchDocument, nfId string) (
+func NfInstancePatch(nssaiAvailabilityUpdateInfo plugin.PatchDocument, nfId string) (
 	*models.AuthorizedNssaiAvailabilityInfo, *models.ProblemDetails,
 ) {
 	var (
@@ -83,7 +81,7 @@ func NSSAIAvailabilityPatchProcedure(nssaiAvailabilityUpdateInfo plugin.PatchDoc
 	}
 	factory.NssfConfig.RUnlock()
 	if !hitAmf {
-		*problemDetails = models.ProblemDetails{
+		problemDetails = &models.ProblemDetails{
 			Title:  util.UNSUPPORTED_RESOURCE,
 			Status: http.StatusNotFound,
 			Detail: fmt.Sprintf("AMF ID '%s' does not exist", nfId),
@@ -110,7 +108,7 @@ func NSSAIAvailabilityPatchProcedure(nssaiAvailabilityUpdateInfo plugin.PatchDoc
 
 	patch, err := jsonpatch.DecodePatch(patchJSON)
 	if err != nil {
-		*problemDetails = models.ProblemDetails{
+		problemDetails = &models.ProblemDetails{
 			Title:  util.MALFORMED_REQUEST,
 			Status: http.StatusBadRequest,
 			Detail: err.Error(),
@@ -120,7 +118,7 @@ func NSSAIAvailabilityPatchProcedure(nssaiAvailabilityUpdateInfo plugin.PatchDoc
 
 	modified, err := patch.Apply(original)
 	if err != nil {
-		*problemDetails = models.ProblemDetails{
+		problemDetails = &models.ProblemDetails{
 			Title:  util.INVALID_REQUEST,
 			Status: http.StatusConflict,
 			Detail: err.Error(),
@@ -132,7 +130,7 @@ func NSSAIAvailabilityPatchProcedure(nssaiAvailabilityUpdateInfo plugin.PatchDoc
 	err = json.Unmarshal(modified, &factory.NssfConfig.Configuration.AmfList[amfIdx].SupportedNssaiAvailabilityData)
 	factory.NssfConfig.Unlock()
 	if err != nil {
-		*problemDetails = models.ProblemDetails{
+		problemDetails = &models.ProblemDetails{
 			Title:  util.INVALID_REQUEST,
 			Status: http.StatusBadRequest,
 			Detail: err.Error(),
@@ -152,7 +150,7 @@ func NSSAIAvailabilityPatchProcedure(nssaiAvailabilityUpdateInfo plugin.PatchDoc
 }
 
 // NSSAIAvailability PUT method
-func NSSAIAvailabilityPutProcedure(nssaiAvailabilityInfo models.NssaiAvailabilityInfo, nfId string) (
+func NfInstanceUpdate(nssaiAvailabilityInfo models.NssaiAvailabilityInfo, nfId string) (
 	*models.AuthorizedNssaiAvailabilityInfo, *models.ProblemDetails,
 ) {
 	var (