From 887efa3f558d57b21914c6d7928f43254931fe84 Mon Sep 17 00:00:00 2001 From: vipin Date: Mon, 28 Sep 2020 13:26:28 +0000 Subject: [PATCH] adding robot unit testcases for alarmgo, cli based testing - alarmgo cli commands are used - review comments incorporated - robot cases removed - UT fixes corrected Change-Id: I4b274f9953796067630e03b470c1aa67e93f2691 Signed-off-by: vipin --- build/run_local.sh | 1 + manager/cmd/manager.go | 16 +++++++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/build/run_local.sh b/build/run_local.sh index 490f675..1c82c74 100755 --- a/build/run_local.sh +++ b/build/run_local.sh @@ -24,5 +24,6 @@ # export RMR_SEED_RT=$PWD/config/uta_rtg.rt export RMR_SRC_ID="service-ricplt-alarmmanager-rmr.ricplt" +export DEF_FILE=$PWD/definitions/alarm-definition.json $PWD/manager/alarm-manager -f $PWD/config/config-file.json diff --git a/manager/cmd/manager.go b/manager/cmd/manager.go index f3d3260..0cb528f 100755 --- a/manager/cmd/manager.go +++ b/manager/cmd/manager.go @@ -23,8 +23,6 @@ package main import ( "encoding/json" "fmt" - "time" - "os" "gerrit.o-ran-sc.org/r/ric-plt/alarm-go/alarm" app "gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp" clientruntime "github.com/go-openapi/runtime/client" @@ -34,6 +32,8 @@ import ( "github.com/prometheus/alertmanager/api/v2/models" "github.com/spf13/viper" "io/ioutil" + "os" + "time" ) func (a *AlarmManager) StartAlertTimer() { @@ -98,7 +98,13 @@ func (a *AlarmManager) ProcessAlarm(m *alarm.AlarmMessage) (*alert.PostAlertsOK, if found { a.alarmHistory = append(a.alarmHistory, *m) a.activeAlarms = a.RemoveAlarm(a.activeAlarms, idx, "active") - + if len(a.alarmHistory) >= a.maxAlarmHistory { + app.Logger.Error("alarm history count exceeded maxAlarmHistory threshold") + histAlarm := a.alarmClient.NewAlarm(alarm.ALARM_HISTORY_EXCEED_MAX_THRESHOLD, alarm.SeverityWarning, "threshold", "history") + histAlarmMessage := alarm.AlarmMessage{Alarm: histAlarm, AlarmAction: alarm.AlarmActionRaise, AlarmTime: (time.Now().UnixNano())} + a.activeAlarms = append(a.activeAlarms, histAlarmMessage) + a.alarmHistory = append(a.alarmHistory, histAlarmMessage) + } if a.postClear { return a.PostAlert(a.GenerateAlertLabels(m.Alarm, AlertStatusResolved, m.AlarmTime)) } @@ -143,7 +149,7 @@ func (a *AlarmManager) UpdateAlarmLists(newAlarm *alarm.AlarmMessage) { The attempt to raise the alarm next time will be supressed when found as duplicate. */ if len(a.activeAlarms) >= a.maxActiveAlarms { app.Logger.Error("active alarm count exceeded maxActiveAlarms threshold") - actAlarm := a.alarmClient.NewAlarm(alarm.ACTIVE_ALARM_EXCEED_MAX_THRESHOLD, alarm.SeverityWarning, "clear alarms or raise threshold", "active alarms full") + actAlarm := a.alarmClient.NewAlarm(alarm.ACTIVE_ALARM_EXCEED_MAX_THRESHOLD, alarm.SeverityWarning, "threshold", "active") actAlarmMessage := alarm.AlarmMessage{Alarm: actAlarm, AlarmAction: alarm.AlarmActionRaise, AlarmTime: (time.Now().UnixNano())} a.activeAlarms = append(a.activeAlarms, actAlarmMessage) a.alarmHistory = append(a.alarmHistory, actAlarmMessage) @@ -151,7 +157,7 @@ func (a *AlarmManager) UpdateAlarmLists(newAlarm *alarm.AlarmMessage) { if len(a.alarmHistory) >= a.maxAlarmHistory { app.Logger.Error("alarm history count exceeded maxAlarmHistory threshold") - histAlarm := a.alarmClient.NewAlarm(alarm.ALARM_HISTORY_EXCEED_MAX_THRESHOLD, alarm.SeverityWarning, "clear alarms or raise threshold", "alarm history full") + histAlarm := a.alarmClient.NewAlarm(alarm.ALARM_HISTORY_EXCEED_MAX_THRESHOLD, alarm.SeverityWarning, "threshold", "history") histAlarmMessage := alarm.AlarmMessage{Alarm: histAlarm, AlarmAction: alarm.AlarmActionRaise, AlarmTime: (time.Now().UnixNano())} a.activeAlarms = append(a.activeAlarms, histAlarmMessage) a.alarmHistory = append(a.alarmHistory, histAlarmMessage) -- 2.16.6