From 22e53ea20f272f1a648216d3aa4e1750ca3b9dd6 Mon Sep 17 00:00:00 2001
From: simonzhangsz <simonzhangsz@outlook.com>
Date: Tue, 24 Oct 2023 18:52:38 +0800
Subject: [PATCH] fix: get alarms from NFs

---
 features/fm/alarm.go | 21 +++++++++++++++------
 misc/omcsvc.sh       |  2 +-
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/features/fm/alarm.go b/features/fm/alarm.go
index 36db2567..298d3e38 100644
--- a/features/fm/alarm.go
+++ b/features/fm/alarm.go
@@ -491,15 +491,24 @@ func GetAlarmFromNF(w http.ResponseWriter, r *http.Request) {
 			//services.ResponseInternalServerError500ProcessError(w, err)
 			continue
 		}
-		body := response.Body()
-		log.Debug("Request body:", string(body))
+
 		alarmArray := new([]Alarm)
-		err = json.Unmarshal(body, &alarmArray)
-		if err != nil {
-			log.Error("Failed to Unmarshal:", err)
-			//services.ResponseInternalServerError500ProcessError(w, err)
+		switch response.StatusCode() {
+		case http.StatusOK, http.StatusCreated, http.StatusNoContent, http.StatusAccepted:
+			body := response.Body()
+			log.Debug("Request body:", string(body))
+
+			err = json.Unmarshal(body, &alarmArray)
+			if err != nil {
+				log.Error("Failed to Unmarshal:", err)
+				//services.ResponseInternalServerError500ProcessError(w, err)
+				continue
+			}
+		default:
+			log.Error("Failed to get alarms:", response.Status)
 			continue
 		}
+
 		valueJson, err := dborm.XormGetAAConfig()
 		if err != nil {
 			log.Error("Failed to XormGetAAConfig:", err)
diff --git a/misc/omcsvc.sh b/misc/omcsvc.sh
index ddeee3eb..9f99581a 100644
--- a/misc/omcsvc.sh
+++ b/misc/omcsvc.sh
@@ -35,7 +35,7 @@ case "$1" in
             done
         ;;
         *)
-                echo "OMC"
+                echo "OMC service"
                 echo "Usage: $0 start|status|stop|restart|version"
         ;;
 esac