Support for NOMA + some minor code refactoring

[ric-plt/alarm-go.git] / manager / cmd / restapi.go

diff --git a/manager/cmd/restapi.go b/manager/cmd/restapi.go
index 3a18a72..412c71c 100755 (executable)
--- a/manager/cmd/restapi.go
+++ b/manager/cmd/restapi.go
@@ -96,6 +96,7 @@ func (a *AlarmManager) SetAlarmDefinition(w http.ResponseWriter, r *http.Request
                        ricAlarmDefintion.EventType = alarmDefinition.EventType
                        ricAlarmDefintion.OperationInstructions = alarmDefinition.OperationInstructions
                        alarm.RICAlarmDefinitions[alarmDefinition.AlarmId] = ricAlarmDefintion
+                       app.Logger.Debug("POST - alarm definition added for alarm id %v", alarmDefinition.AlarmId)
                }
        }
 
@@ -109,6 +110,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,7 +180,7 @@ 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
 }