fix potential problems that may cause panic

Signed-off-by: gatici <[email protected]>
omec-project · Dec 6, 2024 · 345e515 · 345e515
1 parent fdfaeaf
commit 345e515
Show file tree

Hide file tree

Showing 2 changed files with 72 additions and 49 deletions.
diff --git a/management/api_nf_instance_id_document.go b/management/api_nf_instance_id_document.go
@@ -125,7 +125,7 @@ func HTTPRegisterNFInstance(c *gin.Context) {
 	}
 }
 
-// UpdateNFInstance - Update NF Instance profile
+// HTTPUpdateNFInstance Update NF Instance profile
 func HTTPUpdateNFInstance(c *gin.Context) {
 	// step 1: retrieve http request body
 	requestBody, err := c.GetRawData()
@@ -152,7 +152,7 @@ func HTTPUpdateNFInstance(c *gin.Context) {
 		logger.ManagementLog.Warnln(err)
 		problemDetails := models.ProblemDetails{
 			Status: http.StatusInternalServerError,
-			Cause:  "SYSTEM_FAILURE",
+			Cause:  "SERIALIZATION_FAILURE",
 			Detail: err.Error(),
 		}
 		c.JSON(http.StatusInternalServerError, problemDetails)

diff --git a/producer/nf_management.go b/producer/nf_management.go
@@ -88,15 +88,32 @@ func HandleNFRegisterRequest(request *httpwrapper.Request) *httpwrapper.Response
 func HandleUpdateNFInstanceRequest(request *httpwrapper.Request) *httpwrapper.Response {
 	logger.ManagementLog.Infoln("Handle UpdateNFInstanceRequest")
 	nfInstanceID := request.Params["nfInstanceID"]
-	patchJSON := request.Body.([]byte)
-
-	response := UpdateNFInstanceProcedure(nfInstanceID, patchJSON)
-	if response != nil {
-		stats.IncrementNrfRegistrationsStats("update", fmt.Sprint(response["nfType"]), "SUCCESS")
-		return httpwrapper.NewResponse(http.StatusOK, nil, response)
-	} else {
-		return httpwrapper.NewResponse(http.StatusNoContent, nil, nil)
+	if nfInstanceID == "" {
+		logger.ManagementLog.Errorln("nfInstanceID is missing")
+		return httpwrapper.NewResponse(http.StatusBadRequest, nil, map[string]string{"error": "Missing nfInstanceID"})
+	}
+	patchJSON, ok := request.Body.([]byte)
+	if !ok {
+		logger.ManagementLog.Errorln("Invalid body format")
+		return httpwrapper.NewResponse(http.StatusBadRequest, nil, map[string]string{"error": "Invalid body format"})
+	}
+	response, err := UpdateNFInstanceProcedure(nfInstanceID, patchJSON)
+	if err != nil {
+		logger.ManagementLog.Errorln("UpdateNFInstanceProcedure failed:", err)
+		return httpwrapper.NewResponse(http.StatusInternalServerError, nil, map[string]string{"error": "Update procedure failed"})
 	}
+	if response == nil {
+		logger.ManagementLog.Errorln("Received nil response after update procedure")
+		return httpwrapper.NewResponse(http.StatusInternalServerError, nil, map[string]string{"error": "Update procedure returned nil response"})
+	}
+	nfType, ok := response["nfType"].(string)
+	if !ok {
+		logger.ManagementLog.Warnln("Response missing 'nfType' or wrong format")
+		nfType = "unknown"
+	}
+	stats.IncrementNrfRegistrationsStats("update", nfType, "SUCCESS")
+	return httpwrapper.NewResponse(http.StatusOK, nil, response)
+
 }
 
 func HandleGetNFInstancesRequest(request *httpwrapper.Request) *httpwrapper.Response {
@@ -329,53 +346,59 @@ func sendNFDownNotification(nfProfile models.NfProfile, nfInstanceID string) {
 	}
 }
 
-func UpdateNFInstanceProcedure(nfInstanceID string, patchJSON []byte) (response map[string]interface{}) {
+func UpdateNFInstanceProcedure(nfInstanceID string, patchJSON []byte) (response map[string]interface{}, err error) {
+	// Validation for NF Instance ID
+	if nfInstanceID == "" {
+		logger.ManagementLog.Errorln("NF Instance ID is required")
+		return nil, fmt.Errorf("NF Instance ID is required")
+	}
 	collName := "NfProfile"
 	filter := bson.M{"nfInstanceId": nfInstanceID}
 
-	err := dbadapter.DBClient.RestfulAPIJSONPatch(collName, filter, patchJSON)
-	if err == nil {
-		nf, _ := dbadapter.DBClient.RestfulAPIGetOne(collName, filter)
-
-		nfProfilesRaw := []map[string]interface{}{
-			nf,
-		}
-
-		nfProfiles, decodeErr := util.Decode(nfProfilesRaw, time.RFC3339)
-		if decodeErr != nil {
-			logger.ManagementLog.Info(decodeErr.Error())
-		}
-
-		// Update expiry time for document.
-		// Currently we are using 3 times the hearbeat timer as the expiry time interval.
-		// We should update it to be configurable : TBD
-		if factory.NrfConfig.Configuration.NfProfileExpiryEnable {
-			timein := time.Now().Local().Add(time.Second * time.Duration(factory.NrfConfig.Configuration.NfKeepAliveTime*3))
-			nf["expireAt"] = timein
-		}
-		//dbadapter.DBClient.RestfulAPIJSONPatch(collName, filter, jsonStr)
-		if ok, _ := dbadapter.DBClient.RestfulAPIPutOne(collName, filter, nf); ok {
-			logger.ManagementLog.Infof("nf profile [%s] update success", nfProfiles[0].NfType)
-		} else {
-			logger.ManagementLog.Infof("nf profile [%s] update failed", nfProfiles[0].NfType)
-		}
+	// Patch the existing NF Instance
+	patchError := dbadapter.DBClient.RestfulAPIJSONPatch(collName, filter, patchJSON)
+	if patchError != nil {
+		logger.ManagementLog.Errorln("Patch error in UpdateNFInstanceProcedure: ", patchError)
+		return nil, fmt.Errorf("patch error: %v", patchError)
+	}
+	// Get the updated NF Instance
+	nf, getErr := dbadapter.DBClient.RestfulAPIGetOne(collName, filter)
+	if getErr != nil || nf == nil {
+		logger.ManagementLog.Errorln("Failed to get NF instance: ", getErr)
+		return nil, fmt.Errorf("failed to get NF instance: %v", getErr)
+	}
 
-		// set info for NotificationData
-		// Notification not required so commenting it
-		/* Notification_event := models.NotificationEventType_PROFILE_CHANGED
-		uriList := nrf_context.GetNofificationUri(nfProfiles[0])
+	nfProfilesRaw := []map[string]interface{}{nf}
 
-		nfInstanceUri := nrf_context.GetNfInstanceURI(nfInstanceID)
+	// Decode NF instance
+	nfProfiles, decodeErr := util.Decode(nfProfilesRaw, time.RFC3339)
+	if decodeErr != nil {
+		logger.ManagementLog.Errorln("Decoding error: ", decodeErr)
+		return nil, fmt.Errorf("decoding error: %v", decodeErr)
+	}
 
-		for _, uri := range uriList {
-			SendNFStatusNotify(Notification_event, nfInstanceUri, uri)
-		}*/
+	if len(nfProfiles) == 0 {
+		// Handle empty decoded profiles case
+		logger.ManagementLog.Errorln("decoded NF profiles are empty")
+		return nil, fmt.Errorf("decoded NF profiles are empty")
+	}
 
-		return nf
-	} else {
-		logger.ManagementLog.Errorln("Marshal error in UpdateNFInstanceProcedure: ", err)
-		return nil
+	// Update expiry time if enabled
+	// Currently we are using 3 times the hearbeat timer as the expiry time interval.
+	// We should update it to be configurable : TBD
+	if factory.NrfConfig.Configuration.NfProfileExpiryEnable {
+		timein := time.Now().Local().Add(time.Second * time.Duration(factory.NrfConfig.Configuration.NfKeepAliveTime*3))
+		nf["expireAt"] = timein
 	}
+	// Put the updated NF instance
+	_, putErr := dbadapter.DBClient.RestfulAPIPutOne(collName, filter, nf)
+	if putErr != nil {
+		logger.ManagementLog.Errorf("nf profile [%s] update failed: %v", nfProfiles[0].NfType, putErr)
+		return nil, fmt.Errorf("NF profile update is failed: %v", putErr)
+	}
+
+	logger.ManagementLog.Infof("nf profile [%s] update success", nfProfiles[0].NfType)
+	return nf, nil
 }
 
 func GetNFInstanceProcedure(nfInstanceID string) (response map[string]interface{}) {