X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=manager%2Fcmd%2Frestapi.go;h=a4668aab6474df3051279fd4d5382f2d05d2d2b2;hb=44be37f7fc8cc9d52ca454a7a08ac2d6a883561c;hp=7d2a55ce6c505c466b75cfef5171b78a641c7d1a;hpb=2a74ea585d058fad21875877daf58ac018c808d4;p=ric-plt%2Falarm-go.git

diff --git a/manager/cmd/restapi.go b/manager/cmd/restapi.go
index 7d2a55c..a4668aa 100755
--- a/manager/cmd/restapi.go
+++ b/manager/cmd/restapi.go
@@ -22,12 +22,13 @@ package main
 
 import (
 	"encoding/json"
-	"gerrit.o-ran-sc.org/r/ric-plt/alarm-go/alarm"
-	app "gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"
-	"github.com/gorilla/mux"
 	"net/http"
 	"strconv"
 	"time"
+
+	"gerrit.o-ran-sc.org/r/ric-plt/alarm-go/alarm"
+	app "gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"
+	"github.com/gorilla/mux"
 )
 
 func (a *AlarmManager) InjectRoutes() {
@@ -43,8 +44,6 @@ func (a *AlarmManager) InjectRoutes() {
 	app.Resource.InjectRoute("/ric/v1/alarms/define/{alarmId}", a.GetAlarmDefinition, "GET")
 
 	app.Resource.InjectRoute("/ric/v1/symptomdata", a.SymptomDataHandler, "GET")
-
-	a.utils = NewUtils()
 }
 
 func (a *AlarmManager) respondWithError(w http.ResponseWriter, code int, message string) {
@@ -204,6 +203,8 @@ func (a *AlarmManager) doAction(w http.ResponseWriter, r *http.Request, isRaiseA
 	return err
 }
 
+// HandleViaRmr is defined but not used as of now 
+/*
 func (a *AlarmManager) HandleViaRmr(d alarm.Alarm, isRaiseAlarm bool) error {
 	alarmClient, err := alarm.InitAlarm(d.ManagedObjectId, d.ApplicationId)
 	if err != nil {
@@ -219,7 +220,7 @@ func (a *AlarmManager) HandleViaRmr(d alarm.Alarm, isRaiseAlarm bool) error {
 	}
 
 	return nil
-}
+}*/
 
 func (a *AlarmManager) SetAlarmConfig(w http.ResponseWriter, r *http.Request) {
 	var m alarm.AlarmConfigParams
@@ -246,21 +247,21 @@ func (a *AlarmManager) GetAlarmConfig(w http.ResponseWriter, r *http.Request) {
 
 func (a *AlarmManager) SymptomDataHandler(w http.ResponseWriter, r *http.Request) {
 	baseDir := "/tmp/symptomdata/"
-	if err := a.utils.CreateDir(baseDir); err != nil {
-		a.utils.SendSymptomDataError(w, r, "CreateDir failed: "+err.Error())
+	if err := app.Util.CreateDir(baseDir); err != nil {
+		app.Resource.SendSymptomDataError(w, r, "CreateDir failed: "+err.Error())
 		return
 	}
 
 	if b, err := json.Marshal(a.activeAlarms); err == nil {
-		if err := a.utils.WriteToFile(baseDir+"active_alarms.json", string(b)); err != nil {
-			a.utils.SendSymptomDataError(w, r, "writeToFile failed: "+err.Error())
+		if err := app.Util.WriteToFile(baseDir+"active_alarms.json", string(b)); err != nil {
+			app.Resource.SendSymptomDataError(w, r, "writeToFile failed: "+err.Error())
 			return
 		}
 	}
 
 	if b, err := json.Marshal(a.alarmHistory); err == nil {
-		if err := a.utils.WriteToFile(baseDir+"alarm_history.json", string(b)); err != nil {
-			a.utils.SendSymptomDataError(w, r, "writeToFile failed: "+err.Error())
+		if err := app.Util.WriteToFile(baseDir+"alarm_history.json", string(b)); err != nil {
+			app.Resource.SendSymptomDataError(w, r, "writeToFile failed: "+err.Error())
 			return
 		}
 	}
@@ -270,8 +271,8 @@ func (a *AlarmManager) SymptomDataHandler(w http.ResponseWriter, r *http.Request
 	ac.MaxAlarmHistory = a.maxAlarmHistory
 
 	if b, err := json.Marshal(ac); err == nil {
-		if err := a.utils.WriteToFile(baseDir+"alarm_config.json", string(b)); err != nil {
-			a.utils.SendSymptomDataError(w, r, "writeToFile failed: "+err.Error())
+		if err := app.Util.WriteToFile(baseDir+"alarm_config.json", string(b)); err != nil {
+			app.Resource.SendSymptomDataError(w, r, "writeToFile failed: "+err.Error())
 			return
 		}
 	}
@@ -281,11 +282,11 @@ func (a *AlarmManager) SymptomDataHandler(w http.ResponseWriter, r *http.Request
 		ad.AlarmDefinitions = append(ad.AlarmDefinitions, alarmDefinition)
 	}
 	if b, err := json.Marshal(ad); err == nil {
-		if err := a.utils.WriteToFile(baseDir+"alarm_defs.json", string(b)); err != nil {
-			a.utils.SendSymptomDataError(w, r, "writeToFile failed: "+err.Error())
+		if err := app.Util.WriteToFile(baseDir+"alarm_defs.json", string(b)); err != nil {
+			app.Resource.SendSymptomDataError(w, r, "writeToFile failed: "+err.Error())
 			return
 		}
 	}
 
-	a.utils.SendSymptomDataFile(w, r, baseDir, "symptomdata.zip")
+	app.Resource.SendSymptomDataFile(w, r, baseDir, "symptomdata.zip")
 }