fix: dereg problemdetail

free5gc · Aug 5, 2024 · 151f18b · 151f18b
1 parent 2babd69
commit 151f18b
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/internal/sbi/consumer/nrf_service.go b/internal/sbi/consumer/nrf_service.go
@@ -13,6 +13,8 @@ import (
 	"github.com/free5gc/openapi/models"
 	Nnrf_NFDiscovery "github.com/free5gc/openapi/nrf/NFDiscovery"
 	Nnrf_NFManagement "github.com/free5gc/openapi/nrf/NFManagement"
+
+	"github.com/free5gc/openapi"
 )
 
 type nnrfService struct {
@@ -95,7 +97,7 @@ func (s *nnrfService) SendSearchNFInstances(
 	return &result, nil
 }
 
-func (s *nnrfService) SendDeregisterNFInstance() (problemDetails *models.ProblemDetails, err error) {
+func (s *nnrfService) SendDeregisterNFInstance() (*models.ProblemDetails, error) {
 	logger.ConsumerLog.Infof("Send Deregister NFInstance")
 
 	ctx, pd, err := chf_context.GetSelf().GetTokenCtx(models.ServiceName_NNRF_NFM, models.NrfNfManagementNfType_NRF)
@@ -110,8 +112,14 @@ func (s *nnrfService) SendDeregisterNFInstance() (problemDetails *models.Problem
 	}
 
 	_, err = client.NFInstanceIDDocumentApi.DeregisterNFInstance(ctx, request)
-
-	return problemDetails, err
+	if apiErr, ok := err.(openapi.GenericOpenAPIError); ok {
+		// API error
+		if deregNfError, okDeg := apiErr.Model().(Nnrf_NFManagement.DeregisterNFInstanceError); okDeg {
+			return &deregNfError.ProblemDetails, err
+		}
+		return nil, err
+	}
+	return nil, err
 }
 
 func (s *nnrfService) RegisterNFInstance(ctx context.Context) (