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

diff --git a/manager/cmd/restapi.go b/manager/cmd/restapi.go
index 7a09083..a4668aa 100755
--- a/manager/cmd/restapi.go
+++ b/manager/cmd/restapi.go
@@ -22,14 +22,30 @@ 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() {
+	app.Resource.InjectRoute("/ric/v1/alarms", a.RaiseAlarm, "POST")
+	app.Resource.InjectRoute("/ric/v1/alarms", a.ClearAlarm, "DELETE")
+	app.Resource.InjectRoute("/ric/v1/alarms/active", a.GetActiveAlarms, "GET")
+	app.Resource.InjectRoute("/ric/v1/alarms/history", a.GetAlarmHistory, "GET")
+	app.Resource.InjectRoute("/ric/v1/alarms/config", a.SetAlarmConfig, "POST")
+	app.Resource.InjectRoute("/ric/v1/alarms/config", a.GetAlarmConfig, "GET")
+	app.Resource.InjectRoute("/ric/v1/alarms/define", a.SetAlarmDefinition, "POST")
+	app.Resource.InjectRoute("/ric/v1/alarms/define/{alarmId}", a.DeleteAlarmDefinition, "DELETE")
+	app.Resource.InjectRoute("/ric/v1/alarms/define", a.GetAlarmDefinition, "GET")
+	app.Resource.InjectRoute("/ric/v1/alarms/define/{alarmId}", a.GetAlarmDefinition, "GET")
+
+	app.Resource.InjectRoute("/ric/v1/symptomdata", a.SymptomDataHandler, "GET")
+}
+
 func (a *AlarmManager) respondWithError(w http.ResponseWriter, code int, message string) {
 	a.respondWithJSON(w, code, map[string]string{"error": message})
 }
@@ -95,7 +111,11 @@ func (a *AlarmManager) SetAlarmDefinition(w http.ResponseWriter, r *http.Request
 			ricAlarmDefintion.AlarmText = alarmDefinition.AlarmText
 			ricAlarmDefintion.EventType = alarmDefinition.EventType
 			ricAlarmDefintion.OperationInstructions = alarmDefinition.OperationInstructions
+			ricAlarmDefintion.RaiseDelay = alarmDefinition.RaiseDelay
+			ricAlarmDefintion.ClearDelay = alarmDefinition.ClearDelay
+			ricAlarmDefintion.TimeToLive = alarmDefinition.TimeToLive
 			alarm.RICAlarmDefinitions[alarmDefinition.AlarmId] = ricAlarmDefintion
+			app.Logger.Debug("POST - alarm definition added for alarm id %v", alarmDefinition.AlarmId)
 		}
 	}
 
@@ -179,10 +199,12 @@ func (a *AlarmManager) doAction(w http.ResponseWriter, r *http.Request, isRaiseA
 		m.AlarmTime = time.Now().UnixNano()
 	}
 
-	_, err := a.ProcessAlarm(&m)
+	_, err := a.ProcessAlarm(&AlarmNotification{m, alarm.AlarmDefinition{}})
 	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 {
@@ -198,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
@@ -222,3 +244,49 @@ func (a *AlarmManager) GetAlarmConfig(w http.ResponseWriter, r *http.Request) {
 	a.respondWithJSON(w, http.StatusOK, m)
 	return
 }
+
+func (a *AlarmManager) SymptomDataHandler(w http.ResponseWriter, r *http.Request) {
+	baseDir := "/tmp/symptomdata/"
+	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 := 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 := app.Util.WriteToFile(baseDir+"alarm_history.json", string(b)); err != nil {
+			app.Resource.SendSymptomDataError(w, r, "writeToFile failed: "+err.Error())
+			return
+		}
+	}
+
+	var ac alarm.AlarmConfigParams
+	ac.MaxActiveAlarms = a.maxActiveAlarms
+	ac.MaxAlarmHistory = a.maxAlarmHistory
+
+	if b, err := json.Marshal(ac); err == nil {
+		if err := app.Util.WriteToFile(baseDir+"alarm_config.json", string(b)); err != nil {
+			app.Resource.SendSymptomDataError(w, r, "writeToFile failed: "+err.Error())
+			return
+		}
+	}
+
+	var ad RicAlarmDefinitions
+	for _, alarmDefinition := range alarm.RICAlarmDefinitions {
+		ad.AlarmDefinitions = append(ad.AlarmDefinitions, alarmDefinition)
+	}
+	if b, err := json.Marshal(ad); err == nil {
+		if err := app.Util.WriteToFile(baseDir+"alarm_defs.json", string(b)); err != nil {
+			app.Resource.SendSymptomDataError(w, r, "writeToFile failed: "+err.Error())
+			return
+		}
+	}
+
+	app.Resource.SendSymptomDataFile(w, r, baseDir, "symptomdata.zip")
+}