fix: remove redundant code and comment

free5gc · Jun 6, 2024 · 723e385 · 723e385
1 parent d9f5255
commit 723e385
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 64 deletions.
diff --git a/internal/context/ngap_handler.go b/internal/context/ngap_handler.go
@@ -40,10 +40,10 @@ func strNgapCause(cause *ngapType.Cause) string {
 	return ret
 }
 
-func HandlePDUSessionResourceSetupResponseTransfer(b []byte, ctx *SMContext) (err error) {
+func HandlePDUSessionResourceSetupResponseTransfer(b []byte, ctx *SMContext) error {
 	resourceSetupResponseTransfer := ngapType.PDUSessionResourceSetupResponseTransfer{}
 
-	err = aper.UnmarshalWithParams(b, &resourceSetupResponseTransfer, "valueExt")
+	err := aper.UnmarshalWithParams(b, &resourceSetupResponseTransfer, "valueExt")
 	if err != nil {
 		return err
 	}
@@ -104,10 +104,10 @@ func HandlePDUSessionResourceModifyResponseTransfer(b []byte, ctx *SMContext) er
 	return nil
 }
 
-func HandlePDUSessionResourceSetupUnsuccessfulTransfer(b []byte, ctx *SMContext) (err error) {
+func HandlePDUSessionResourceSetupUnsuccessfulTransfer(b []byte, ctx *SMContext) error {
 	resourceSetupUnsuccessfulTransfer := ngapType.PDUSessionResourceSetupUnsuccessfulTransfer{}
 
-	err = aper.UnmarshalWithParams(b, &resourceSetupUnsuccessfulTransfer, "valueExt")
+	err := aper.UnmarshalWithParams(b, &resourceSetupUnsuccessfulTransfer, "valueExt")
 	if err != nil {
 		return err
 	}
@@ -190,10 +190,10 @@ func HandlePathSwitchRequestTransfer(b []byte, ctx *SMContext) error {
 	return nil
 }
 
-func HandlePathSwitchRequestSetupFailedTransfer(b []byte, ctx *SMContext) (err error) {
+func HandlePathSwitchRequestSetupFailedTransfer(b []byte, ctx *SMContext) error {
 	pathSwitchRequestSetupFailedTransfer := ngapType.PathSwitchRequestSetupFailedTransfer{}
 
-	err = aper.UnmarshalWithParams(b, &pathSwitchRequestSetupFailedTransfer, "valueExt")
+	err := aper.UnmarshalWithParams(b, &pathSwitchRequestSetupFailedTransfer, "valueExt")
 	if err != nil {
 		return err
 	}
@@ -202,10 +202,10 @@ func HandlePathSwitchRequestSetupFailedTransfer(b []byte, ctx *SMContext) (err e
 	return nil
 }
 
-func HandleHandoverRequiredTransfer(b []byte, ctx *SMContext) (err error) {
+func HandleHandoverRequiredTransfer(b []byte, ctx *SMContext) error {
 	handoverRequiredTransfer := ngapType.HandoverRequiredTransfer{}
 
-	err = aper.UnmarshalWithParams(b, &handoverRequiredTransfer, "valueExt")
+	err := aper.UnmarshalWithParams(b, &handoverRequiredTransfer, "valueExt")
 
 	directForwardingPath := handoverRequiredTransfer.DirectForwardingPathAvailability
 	if directForwardingPath != nil {
@@ -222,10 +222,10 @@ func HandleHandoverRequiredTransfer(b []byte, ctx *SMContext) (err error) {
 	return nil
 }
 
-func HandleHandoverRequestAcknowledgeTransfer(b []byte, ctx *SMContext) (err error) {
+func HandleHandoverRequestAcknowledgeTransfer(b []byte, ctx *SMContext) error {
 	handoverRequestAcknowledgeTransfer := ngapType.HandoverRequestAcknowledgeTransfer{}
 
-	err = aper.UnmarshalWithParams(b, &handoverRequestAcknowledgeTransfer, "valueExt")
+	err := aper.UnmarshalWithParams(b, &handoverRequestAcknowledgeTransfer, "valueExt")
 	if err != nil {
 		return err
 	}
@@ -255,17 +255,15 @@ func HandleHandoverRequestAcknowledgeTransfer(b []byte, ctx *SMContext) (err err
 		var indirectFowardingPDR *PDR
 
 		if pdr, errAddPDR := ANUPF.AddPDR(); errAddPDR != nil {
-			err = errAddPDR
-			return err
+			return errAddPDR
 		} else {
 			indirectFowardingPDR = pdr
 		}
 
 		originPDR := ctx.Tunnel.DataPathPool.GetDefaultPath().FirstDPNode.UpLinkTunnel.PDR
 
 		if teid, errGenerateTEID := GenerateTEID(); errGenerateTEID != nil {
-			err = errGenerateTEID
-			return err
+			return errGenerateTEID
 		} else {
 			ctx.IndirectForwardingTunnel.FirstDPNode.UpLinkTunnel.TEID = teid
 			ctx.IndirectForwardingTunnel.FirstDPNode.UpLinkTunnel.PDR = indirectFowardingPDR

diff --git a/internal/sbi/consumer/consumer.go b/internal/sbi/consumer/consumer.go
@@ -17,8 +17,8 @@ type Consumer struct {
 
 	// consumer services
 	*nsmfService
-	*nchfService // Not sure
-	*npcfService // Not sure
+	*nchfService
+	*npcfService
 	*nudmService
 	*nnrfService
 }

diff --git a/internal/sbi/consumer/nrf_service.go b/internal/sbi/consumer/nrf_service.go
@@ -74,7 +74,6 @@ func (s *nnrfService) getNFDiscoveryClient(uri string) *Nnrf_NFDiscovery.APIClie
 	return client
 }
 
-// Done 4/28 14:03
 func (s *nnrfService) RegisterNFInstance() error {
 	smfContext := s.consumer.Context()
 	client := s.getNFManagementClient(smfContext.NrfUri)
@@ -134,7 +133,6 @@ func (s *nnrfService) RegisterNFInstance() error {
 	return nil
 }
 
-// Done 4/28 14:03
 func (s *nnrfService) buildNfProfile(smfContext *smf_context.SMFContext) (profile models.NfProfile, err error) {
 	smfProfile := smfContext.NfProfile
 
@@ -160,7 +158,6 @@ func (s *nnrfService) buildNfProfile(smfContext *smf_context.SMFContext) (profil
 	return profile, err
 }
 
-// Done 4/28 14:04
 func (s *nnrfService) RetrySendNFRegistration(maxRetry int) error {
 	retryCount := 0
 	for retryCount < maxRetry {
@@ -175,37 +172,6 @@ func (s *nnrfService) RetrySendNFRegistration(maxRetry int) error {
 	return fmt.Errorf("[SMF] Retry NF Registration has meet maximum")
 }
 
-// func (s *nnrfService) SendNFDeregistration() error {
-// 	// Check data (Use RESTful DELETE)
-
-// 	ctx, _, err :=  s.consumer.Context().GetTokenCtx(models.ServiceName_NNRF_NFM, models.NfType_NRF)
-// 	if err != nil {
-// 		return err
-// 	}
-
-// 	res, localErr :=  s.consumer.Context().
-// 		NFManagementClient.
-// 		NFInstanceIDDocumentApi.
-// 		DeregisterNFInstance(ctx,  s.consumer.Context().NfInstanceID)
-// 	if localErr != nil {
-// 		logger.ConsumerLog.Warnln(localErr)
-// 		return localErr
-// 	}
-// 	defer func() {
-// 		if resCloseErr := res.Body.Close(); resCloseErr != nil {
-// 			logger.ConsumerLog.Errorf("DeregisterNFInstance response body cannot close: %+v", resCloseErr)
-// 		}
-// 	}()
-// 	if res != nil {
-// 		if status := res.StatusCode; status != http.StatusNoContent {
-// 			logger.ConsumerLog.Warnln("handler returned wrong status code ", status)
-// 			return openapi.ReportError("handler returned wrong status code %d", status)
-// 		}
-// 	}
-// 	return nil
-// }
-
-// Done 4/26 18:44
 func (s *nnrfService) SendDeregisterNFInstance() (problemDetails *models.ProblemDetails, err error) {
 	logger.ConsumerLog.Infof("Send Deregister NFInstance")
 
@@ -240,7 +206,6 @@ func (s *nnrfService) SendDeregisterNFInstance() (problemDetails *models.Problem
 	return problemDetails, err
 }
 
-// Done 4/28 14:18
 func (s *nnrfService) SendSearchNFInstances(nrfUri string, targetNfType, requestNfType models.NfType,
 	param *Nnrf_NFDiscovery.SearchNFInstancesParamOpts,
 ) (*models.SearchResult, error) {
@@ -278,7 +243,7 @@ func (s *nnrfService) NFDiscoveryUDM(ctx context.Context) (result models.SearchR
 	localVarOptionals := Nnrf_NFDiscovery.SearchNFInstancesParamOpts{}
 
 	smfContext := s.consumer.Context()
-	// Not sure (?
+
 	client := s.getNFDiscoveryClient(smfContext.NrfUri)
 	// Check data
 	result, httpResp, localErr = client.NFInstancesStoreApi.
@@ -292,7 +257,7 @@ func (s *nnrfService) NFDiscoveryPCF(ctx context.Context) (
 	localVarOptionals := Nnrf_NFDiscovery.SearchNFInstancesParamOpts{}
 
 	smfContext := s.consumer.Context()
-	// Not sure (?
+
 	client := s.getNFDiscoveryClient(smfContext.NrfUri)
 	// Check data
 	result, httpResp, localErr = client.NFInstancesStoreApi.
@@ -308,7 +273,7 @@ func (s *nnrfService) NFDiscoveryAMF(smContext *smf_context.SMContext, ctx conte
 	localVarOptionals.TargetNfInstanceId = optional.NewInterface(smContext.ServingNfId)
 
 	smfContext := s.consumer.Context()
-	// Not sure (?
+
 	client := s.getNFDiscoveryClient(smfContext.NrfUri)
 	// Check data
 	result, httpResp, localErr = client.NFInstancesStoreApi.

diff --git a/internal/sbi/consumer/udm_service.go b/internal/sbi/consumer/udm_service.go
@@ -1,11 +1,8 @@
 package consumer
 
 import (
-	// "net/http"
 	"sync"
 
-	// "github.com/antihax/optional"
-	// "github.com/mohae/deepcopy"
 	"github.com/pkg/errors"
 
 	"github.com/free5gc/openapi"

diff --git a/internal/sbi/processor/processor.go b/internal/sbi/processor/processor.go
@@ -19,12 +19,6 @@ type Processor struct {
 	consumer *consumer.Consumer
 }
 
-type HandlerResponse struct {
-	Status  int
-	Headers map[string][]string
-	Body    interface{}
-}
-
 func NewProcessor(smf ProcessorSmf, consumer *consumer.Consumer) (*Processor, error) {
 	p := &Processor{
 		ProcessorSmf: smf,

diff --git a/pkg/utils/pfcp_util.go b/pkg/utils/pfcp_util.go
@@ -30,7 +30,7 @@ func InitPFCPFunc() (func(a *service.SmfApp), func()) {
 			go association.ToBeAssociatedWithUPF(ctx, upNode.UPF, a.Processor())
 		}
 
-		// Wait for PFCF start
+		// Wait for PFCP start
 		time.Sleep(1000 * time.Millisecond)
 	}