fix: missing nf res in registernf and type assertion in smf and amfue…

… comment remove
free5gc · Oct 25, 2024 · 70637f4 · 70637f4
1 parent db8f201
commit 70637f4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/internal/context/amf_ue.go b/internal/context/amf_ue.go
@@ -683,9 +683,9 @@ func (ue *AmfUe) CopyDataFromUeContextModel(ueContext *models.UeContext) {
 		if ue.AccessAndMobilitySubscriptionData == nil {
 			ue.AccessAndMobilitySubscriptionData = new(models.AccessAndMobilitySubscriptionData)
 		}
-		// if ue.AccessAndMobilitySubscriptionData.SubscribedUeAmbr == nil {
-		// 	ue.AccessAndMobilitySubscriptionData.SubscribedUeAmbr = new(models.AmbrRm)
-		// }
+		if ue.AccessAndMobilitySubscriptionData.SubscribedUeAmbr == nil {
+			ue.AccessAndMobilitySubscriptionData.SubscribedUeAmbr = new(models.AmbrRm)
+		}
 
 		subAmbr := ue.AccessAndMobilitySubscriptionData.SubscribedUeAmbr
 		subAmbr.Uplink = ueContext.SubUeAmbr.Uplink

diff --git a/internal/sbi/consumer/nrf_service.go b/internal/sbi/consumer/nrf_service.go
@@ -276,6 +276,7 @@ func (s *nnrfService) SendRegisterNFInstance(ctx context.Context, nrfUri, nfInst
 			} else {
 				// NFRegister
 				resourceUri := res.Location
+				nf = res.NrfNfManagementNfProfile
 				index := strings.Index(resourceUri, "/nnrf-nfm/")
 				if index >= 0 {
 					resouceNrfUri = resourceUri[:index]

diff --git a/internal/sbi/consumer/smf_service.go b/internal/sbi/consumer/smf_service.go
@@ -178,7 +178,7 @@ func (s *nsmfService) SendCreateSmContextRequest(ue *amf_context.AmfUe, smContex
 		err1 = localErr
 		if apiErr, ok := localErr.(openapi.GenericOpenAPIError); ok {
 			// API error
-			posterr := apiErr.Model().(*Nsmf_PDUSession.PostSmContextsError)
+			posterr := apiErr.Model().(Nsmf_PDUSession.PostSmContextsError)
 			problemDetail = &posterr.ProblemDetails
 			errorResponse = &posterr.PostSmContextsError
 		}