X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=manager%2Fcmd%2Frestapi.go;h=5a43a4f7cff4f31c050ddf81210cb6237cc84df4;hb=HEAD;hp=3a18a72b7e198a9b7842f69aa178d63978eabc7c;hpb=54a3a4f89cf7de393be1ab28281a804e1b2c863e;p=ric-plt%2Falarm-go.git

diff --git a/manager/cmd/restapi.go b/manager/cmd/restapi.go
index 3a18a72..5a43a4f 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.git/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)
 		}
 	}
 
@@ -109,6 +129,7 @@ func (a *AlarmManager) DeleteAlarmDefinition(w http.ResponseWriter, r *http.Requ
 	if alarmIdok {
 		if ialarmId, err := strconv.Atoi(alarmId); err == nil {
 			delete(alarm.RICAlarmDefinitions, ialarmId)
+			app.Logger.Debug("DELETE - alarm definition deleted for alarmId %v", ialarmId)
 		} else {
 			app.Logger.Error("DELETE - alarmId string to int conversion failed %v", alarmId)
 			a.respondWithError(w, http.StatusBadRequest, "Invalid path parameter")
@@ -178,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 {
@@ -197,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
@@ -221,3 +244,58 @@ 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.MarshalIndent(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.MarshalIndent(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
+		}
+	}
+
+	if alerts, err := a.GetAlerts(); err == nil {
+		if b, err := json.MarshalIndent(alerts, "", "    "); err == nil {
+			if err := app.Util.WriteToFile(baseDir+"alerts.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.MarshalIndent(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.MarshalIndent(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")
+}