From 281d06025dd3e2fa71e1c2800eba8bd52c458563 Mon Sep 17 00:00:00 2001 From: Juha Hyttinen Date: Thu, 23 Dec 2021 10:14:40 +0200 Subject: [PATCH] Fix of alarm-go client library rmr init ric-dep alarmmanager helmchart have appconfig.yaml that defines ALARM_MANAGER_SERVICE_NAME and ALARM_MANAGER_SERVICE_PORT client should use those variables to give rmr endpoint of alarmanager Other way is to give PLT_NAMESPACE env, which then uses default names for given namespace. Signed-off-by: Juha Hyttinen Change-Id: If82eb03ed5684ac54a35fc522ba35515bbc0343e --- README.md | 2 +- alarm/alarm.go | 30 +++++-- alarm/go.mod | 2 - alarm/types.go | 12 +-- cli/alarm-cli.go | 2 +- docs/user-guide.rst | 2 +- go.mod | 4 +- go.sum | 2 - manager/cmd/manager.go | 2 +- manager/cmd/manager_test.go | 189 ++++++++++++++++++++++---------------------- manager/cmd/restapi.go | 4 +- manager/cmd/restapi_test.go | 4 +- manager/cmd/types.go | 2 +- 13 files changed, 128 insertions(+), 129 deletions(-) diff --git a/README.md b/README.md index a47da20..10e519e 100644 --- a/README.md +++ b/README.md @@ -55,7 +55,7 @@ The Alarm object contains following parameters: package main import ( - alarm "gerrit.o-ran-sc.org/r/ric-plt/alarm-go/alarm" + alarm "gerrit.o-ran-sc.org/r/ric-plt/alarm-go.git/alarm" ) func main() { diff --git a/alarm/alarm.go b/alarm/alarm.go index f8d909a..77e9281 100755 --- a/alarm/alarm.go +++ b/alarm/alarm.go @@ -46,19 +46,35 @@ import "C" // The identities are used when raising/clearing alarms, unless provided by the applications. func InitAlarm(mo, id string) (*RICAlarm, error) { r := &RICAlarm{ - moId: mo, - appId: id, - managerUrl: ALARM_MANAGER_HTTP_URL, + moId: mo, + appId: id, } + // + // http service information (used in case of no rmr connectivity) + // + namespace := os.Getenv("PLT_NAMESPACE") + if os.Getenv("ALARM_MANAGER_URL") != "" { r.managerUrl = os.Getenv("ALARM_MANAGER_URL") + } else if namespace != "" { + r.managerUrl = fmt.Sprintf("http://service-%s-alarmmanager-http.%s:8080", namespace, namespace) + } else { + r.managerUrl = "http://127.0.0.1:8080" } - if os.Getenv("ALARM_IF_RMR") == "" { - go InitRMR(r, "") + // + // rmr service + // + rmrservname := os.Getenv("ALARM_MANAGER_SERVICE_NAME") + rmrservport := os.Getenv("ALARM_MANAGER_SERVICE_PORT") + + if rmrservname != "" && rmrservport != "" { + go InitRMR(r, rmrservname+":"+rmrservport) + } else if namespace != "" { + go InitRMR(r, fmt.Sprintf("service-%s-alarmmanager-rmr.%s:4560", namespace, namespace)) } else { - go InitRMR(r, ALARM_MANAGER_RMR_URL) + go InitRMR(r, "") } return r, nil @@ -71,8 +87,8 @@ func (r *RICAlarm) NewAlarm(sp int, severity Severity, ainfo, iinfo string) Alar ApplicationId: r.appId, SpecificProblem: sp, PerceivedSeverity: severity, - AdditionalInfo: ainfo, IdentifyingInfo: iinfo, + AdditionalInfo: ainfo, } } diff --git a/alarm/go.mod b/alarm/go.mod index 235e2c3..1750f71 100644 --- a/alarm/go.mod +++ b/alarm/go.mod @@ -2,8 +2,6 @@ module gerrit.o-ran-sc.org/r/ric-plt/alarm-go.git/alarm go 1.13 -replace gerrit.o-ran-sc.org/r/ric-plt/alarm-go.git/alarm => ../alarm - replace gerrit.o-ran-sc.org/r/ric-plt/sdlgo => gerrit.o-ran-sc.org/r/ric-plt/sdlgo.git v0.7.0 replace gerrit.o-ran-sc.org/r/com/golog => gerrit.o-ran-sc.org/r/com/golog.git v0.0.2 diff --git a/alarm/types.go b/alarm/types.go index b61f436..04a53c5 100755 --- a/alarm/types.go +++ b/alarm/types.go @@ -23,8 +23,6 @@ package alarm import ( "sync" "unsafe" - "os" - "fmt" ) import "C" @@ -49,8 +47,8 @@ type Alarm struct { ApplicationId string `json:"applicationId"` SpecificProblem int `json:"specificProblem"` PerceivedSeverity Severity `json:"perceivedSeverity"` - AdditionalInfo string `json:"additionalInfo"` IdentifyingInfo string `json:"identifyingInfo"` + AdditionalInfo string `json:"additionalInfo"` } // Alarm actions @@ -91,7 +89,7 @@ const ( // Temp alarm constants & definitions const ( - E2_CONNECTION_PROBLEM int = 72004 + E2_CONNECTION_PROBLEM int = 72004 ACTIVE_ALARM_EXCEED_MAX_THRESHOLD int = 72007 ALARM_HISTORY_EXCEED_MAX_THRESHOLD int = 72008 ) @@ -108,9 +106,3 @@ type AlarmDefinition struct { var RICAlarmDefinitions map[int]*AlarmDefinition var RICPerfAlarmObjects map[int]*Alarm - -var ( - namespace = os.Getenv("PLT_NAMESPACE") - ALARM_MANAGER_HTTP_URL string = fmt.Sprintf("http://service-%s-alarmmanager-http.%s:8080", namespace, namespace) - ALARM_MANAGER_RMR_URL string = fmt.Sprintf("service-%s-alarmmanager-rmr.%s:4560", namespace, namespace) -) diff --git a/cli/alarm-cli.go b/cli/alarm-cli.go index 241792a..0b4af6b 100755 --- a/cli/alarm-cli.go +++ b/cli/alarm-cli.go @@ -11,7 +11,7 @@ import ( "sync" "time" - "gerrit.o-ran-sc.org/r/ric-plt/alarm-go/alarm" + "gerrit.o-ran-sc.org/r/ric-plt/alarm-go.git/alarm" clientruntime "github.com/go-openapi/runtime/client" "github.com/go-openapi/strfmt" "github.com/jedib0t/go-pretty/table" diff --git a/docs/user-guide.rst b/docs/user-guide.rst index 0acb623..7c1ab7e 100755 --- a/docs/user-guide.rst +++ b/docs/user-guide.rst @@ -356,7 +356,7 @@ Alarm library functions can be used directly from Golang code. Rising and cleari package main import ( - alarm "gerrit.o-ran-sc.org/r/ric-plt/alarm-go/alarm" + alarm "gerrit.o-ran-sc.org/r/ric-plt/alarm-go.git/alarm" ) func main() { diff --git a/go.mod b/go.mod index fd652c8..bab46bd 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module gerrit.o-ran-sc.org/r/ric-plt/alarm-go go 1.16 -replace gerrit.o-ran-sc.org/r/ric-plt/alarm-go/alarm => ./alarm/ +replace gerrit.o-ran-sc.org/r/ric-plt/alarm-go.git/alarm => ./alarm/ replace gerrit.o-ran-sc.org/r/ric-plt/xapp-frame => gerrit.o-ran-sc.org/r/ric-plt/xapp-frame.git v0.9.2-1 @@ -11,7 +11,7 @@ replace gerrit.o-ran-sc.org/r/ric-plt/sdlgo => gerrit.o-ran-sc.org/r/ric-plt/sdl replace gerrit.o-ran-sc.org/r/com/golog => gerrit.o-ran-sc.org/r/com/golog.git v0.0.2 require ( - gerrit.o-ran-sc.org/r/ric-plt/alarm-go/alarm v0.0.0-00010101000000-000000000000 + gerrit.o-ran-sc.org/r/ric-plt/alarm-go.git/alarm v0.5.0 gerrit.o-ran-sc.org/r/ric-plt/xapp-frame v0.0.0-00010101000000-000000000000 github.com/go-openapi/runtime v0.19.11 github.com/go-openapi/strfmt v0.19.4 diff --git a/go.sum b/go.sum index c65c26c..0aade64 100644 --- a/go.sum +++ b/go.sum @@ -1,8 +1,6 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= gerrit.o-ran-sc.org/r/com/golog.git v0.0.2 h1:Ix6SgFuzd6yW6Ur6+qDlGhDO65UYs8PiIkeAL1VaQ2o= gerrit.o-ran-sc.org/r/com/golog.git v0.0.2/go.mod h1:A7hUL52YQSO4dFIZNcj76XQ09C9PftAe3LyL7kqBnok= -gerrit.o-ran-sc.org/r/ric-plt/alarm-go.git/alarm v0.5.0 h1:OKDsIDlttbaoHwleyjflIWVZPgPvYbDhim6gWF0zf5E= -gerrit.o-ran-sc.org/r/ric-plt/alarm-go.git/alarm v0.5.0/go.mod h1:AdEWKtERGvOQy9ybLhyhrb9w9LLVn8i9xzTwoR5n4BY= gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/common v1.2.1 h1:3FFbXx55BODThXfyWAiz6cPXVELXFICDQUmJi13EoxM= gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/common v1.2.1/go.mod h1:QJ1uPPZosGbhxUWpUpeM5fLqFHdnWTrVnvW2DgyOCes= gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities v1.2.1 h1:8Z60JRsPgcS1Ona4fEh6d0/03nLq1WHoZcNnBsni5+g= diff --git a/manager/cmd/manager.go b/manager/cmd/manager.go index 660d637..e1678e9 100755 --- a/manager/cmd/manager.go +++ b/manager/cmd/manager.go @@ -29,7 +29,7 @@ import ( "os" "time" - "gerrit.o-ran-sc.org/r/ric-plt/alarm-go/alarm" + "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" clientruntime "github.com/go-openapi/runtime/client" "github.com/go-openapi/strfmt" diff --git a/manager/cmd/manager_test.go b/manager/cmd/manager_test.go index e867d0b..32333cf 100755 --- a/manager/cmd/manager_test.go +++ b/manager/cmd/manager_test.go @@ -36,7 +36,7 @@ import ( "testing" "time" - "gerrit.o-ran-sc.org/r/ric-plt/alarm-go/alarm" + "gerrit.o-ran-sc.org/r/ric-plt/alarm-go.git/alarm" "gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp" "github.com/gorilla/mux" "github.com/prometheus/alertmanager/api/v2/models" @@ -78,15 +78,15 @@ func TestGetPreDefinedAlarmDefinitions(t *testing.T) { checkResponseCode(t, http.StatusOK, response.Code) json.NewDecoder(response.Body).Decode(&alarmDefinition) xapp.Logger.Info("alarm definition = %v", alarmDefinition) - if alarmDefinition.AlarmId != alarm.E2_CONNECTION_PROBLEM || alarmDefinition.AlarmText != "E2 CONNECTION PROBLEM" { + if alarmDefinition.AlarmId != alarm.E2_CONNECTION_PROBLEM || alarmDefinition.AlarmText != "E2 CONNECTION PROBLEM" { t.Errorf("Incorrect alarm definition") } } func TestSetAlarmDefinitions(t *testing.T) { xapp.Logger.Info("TestSetAlarmDefinitions") - - var alarm72004Definition alarm.AlarmDefinition + + var alarm72004Definition alarm.AlarmDefinition alarm72004Definition.AlarmId = alarm.E2_CONNECTION_PROBLEM alarm72004Definition.AlarmText = "E2 CONNECTIVITY LOST TO E-NODEB/G-NODEB" alarm72004Definition.EventType = "Communication error" @@ -119,54 +119,53 @@ func TestSetAlarmDefinitions(t *testing.T) { xapp.Logger.Info("status = %v", status) } - func TestSetAlarmConfigDecodeError(t *testing.T) { - xapp.Logger.Info("TestSetAlarmConfigDecodeError") + xapp.Logger.Info("TestSetAlarmConfigDecodeError") var jsonStr = []byte(`{"test":"Invalid Alarm Data", "test1" 123}`) - req, _ := http.NewRequest("POST", "/ric/v1/alarms", bytes.NewBuffer(jsonStr)) - handleFunc := http.HandlerFunc(alarmManager.SetAlarmConfig) - response := executeRequest(req, handleFunc) - status := checkResponseCode(t,http.StatusOK,response.Code) - xapp.Logger.Info("status = %v", status) + req, _ := http.NewRequest("POST", "/ric/v1/alarms", bytes.NewBuffer(jsonStr)) + handleFunc := http.HandlerFunc(alarmManager.SetAlarmConfig) + response := executeRequest(req, handleFunc) + status := checkResponseCode(t, http.StatusOK, response.Code) + xapp.Logger.Info("status = %v", status) } func TestSetAlarmDefinitionDecodeError(t *testing.T) { - xapp.Logger.Info("TestSetAlarmDefinitionDecodeError") + xapp.Logger.Info("TestSetAlarmDefinitionDecodeError") - var jsonStr = []byte(`{"test":"Invalid Alarm Data", "test1" 123}`) - req, _ := http.NewRequest("POST", "/ric/v1/alarms/define", bytes.NewBuffer(jsonStr)) - handleFunc := http.HandlerFunc(alarmManager.SetAlarmDefinition) - response := executeRequest(req, handleFunc) - status := checkResponseCode(t,http.StatusBadRequest,response.Code) - xapp.Logger.Info("status = %v", status) + var jsonStr = []byte(`{"test":"Invalid Alarm Data", "test1" 123}`) + req, _ := http.NewRequest("POST", "/ric/v1/alarms/define", bytes.NewBuffer(jsonStr)) + handleFunc := http.HandlerFunc(alarmManager.SetAlarmDefinition) + response := executeRequest(req, handleFunc) + status := checkResponseCode(t, http.StatusBadRequest, response.Code) + xapp.Logger.Info("status = %v", status) } func TestRaiseAlarmEmptyBody(t *testing.T) { - xapp.Logger.Info("TestRaiseAlarmEmptyBody") - req, _ := http.NewRequest("POST", "/ric/v1/alarms", nil) - handleFunc := http.HandlerFunc(alarmManager.RaiseAlarm) - response := executeRequest(req, handleFunc) - status := checkResponseCode(t,http.StatusOK,response.Code) - xapp.Logger.Info("status = %v", status) + xapp.Logger.Info("TestRaiseAlarmEmptyBody") + req, _ := http.NewRequest("POST", "/ric/v1/alarms", nil) + handleFunc := http.HandlerFunc(alarmManager.RaiseAlarm) + response := executeRequest(req, handleFunc) + status := checkResponseCode(t, http.StatusOK, response.Code) + xapp.Logger.Info("status = %v", status) } func TestSetAlarmDefinitionsEmptyBody(t *testing.T) { - xapp.Logger.Info("TestSetAlarmDefinitionsEmptyBody") - req, _ := http.NewRequest("POST", "/ric/v1/alarms/define", nil) - handleFunc := http.HandlerFunc(alarmManager.SetAlarmDefinition) - response := executeRequest(req, handleFunc) - status := checkResponseCode(t,http.StatusBadRequest,response.Code) - xapp.Logger.Info("status = %v", status) + xapp.Logger.Info("TestSetAlarmDefinitionsEmptyBody") + req, _ := http.NewRequest("POST", "/ric/v1/alarms/define", nil) + handleFunc := http.HandlerFunc(alarmManager.SetAlarmDefinition) + response := executeRequest(req, handleFunc) + status := checkResponseCode(t, http.StatusBadRequest, response.Code) + xapp.Logger.Info("status = %v", status) } func TestClearAlarmEmptyBody(t *testing.T) { - xapp.Logger.Info("TestClearAlarmEmptyBody") - req, _ := http.NewRequest("DELETE", "/ric/v1/alarms", nil) - handleFunc := http.HandlerFunc(alarmManager.ClearAlarm) - response := executeRequest(req, handleFunc) - status := checkResponseCode(t,http.StatusOK,response.Code) - xapp.Logger.Info("status = %v", status) + xapp.Logger.Info("TestClearAlarmEmptyBody") + req, _ := http.NewRequest("DELETE", "/ric/v1/alarms", nil) + handleFunc := http.HandlerFunc(alarmManager.ClearAlarm) + response := executeRequest(req, handleFunc) + status := checkResponseCode(t, http.StatusOK, response.Code) + xapp.Logger.Info("status = %v", status) } func TestGetAlarmDefinitions(t *testing.T) { @@ -215,8 +214,8 @@ func TestDeleteAlarmDefinitions(t *testing.T) { response = executeRequest(req, handleFunc) checkResponseCode(t, http.StatusBadRequest, response.Code) - //Delete Alarm which doesn't present - //Set 72004 success + //Delete Alarm which doesn't present + //Set 72004 success var alarm72004Definition alarm.AlarmDefinition alarm72004Definition.AlarmId = alarm.E2_CONNECTION_PROBLEM alarm72004Definition.AlarmText = "E2 CONNECTION PROBLEM" @@ -292,7 +291,7 @@ func TestAlarmClearedSucess(t *testing.T) { // Now Clear the alarm and check alarm is removed a = alarmer.NewAlarm(alarm.E2_CONNECTION_PROBLEM, alarm.SeverityCritical, "Some App data", "eth 0 1") - assert.Nil(t, alarmer.Clear(a), "clear failed") + assert.Nil(t, alarmer.Clear(a), "clear failed") time.Sleep(time.Duration(2) * time.Second) assert.Equal(t, len(alarmManager.activeAlarms), 0) @@ -305,7 +304,7 @@ func TestMultipleAlarmsRaisedSucess(t *testing.T) { // Raise two alarms a := alarmer.NewAlarm(alarm.E2_CONNECTION_PROBLEM, alarm.SeverityMajor, "Some App data", "eth 0 1") - assert.Nil(t, alarmer.Raise(a), "raise failed") + assert.Nil(t, alarmer.Raise(a), "raise failed") b := alarmer.NewAlarm(alarm.ACTIVE_ALARM_EXCEED_MAX_THRESHOLD, alarm.SeverityMinor, "Hello", "abcd 11") assert.Nil(t, alarmer.Raise(b), "raise failed") @@ -637,98 +636,98 @@ func TestConfigChangeCB(t *testing.T) { } func TestPostAlarm(t *testing.T) { - xapp.Logger.Info("TestPostAlarm") - var activeAlarms []AlarmNotification - activeAlarms = make([]AlarmNotification, 1) - alarmManager.PostAlarm(&activeAlarms[0]) + xapp.Logger.Info("TestPostAlarm") + var activeAlarms []AlarmNotification + activeAlarms = make([]AlarmNotification, 1) + alarmManager.PostAlarm(&activeAlarms[0]) } func TestPostAlarm1(t *testing.T) { - xapp.Logger.Info("TestPostAlarm") - var activeAlarms []AlarmNotification - activeAlarms = make([]AlarmNotification, 2) - alarmManager.PostAlarm(&activeAlarms[0]) + xapp.Logger.Info("TestPostAlarm") + var activeAlarms []AlarmNotification + activeAlarms = make([]AlarmNotification, 2) + alarmManager.PostAlarm(&activeAlarms[0]) } -func TestNewAlarmManagerOther(t *testing.T){ - NewAlarmManager("", 0, true) +func TestNewAlarmManagerOther(t *testing.T) { + NewAlarmManager("", 0, true) } func TestStatusCallbackFailure(t *testing.T) { - xapp.Logger.Info("TestStatusCallbackFailure") - alarmManager.rmrReady = false - assert.Equal(t, false, alarmManager.StatusCB()) + xapp.Logger.Info("TestStatusCallbackFailure") + alarmManager.rmrReady = false + assert.Equal(t, false, alarmManager.StatusCB()) } func TestConfigChangeCBFailure(t *testing.T) { - xapp.Logger.Info("TestConfigChangeCBFailure") + xapp.Logger.Info("TestConfigChangeCBFailure") alarmManager.maxActiveAlarms = 0 alarmManager.maxAlarmHistory = 0 alarmManager.ConfigChangeCB("AlarmManager") } func TestReadAlarmDefinitionFromJsonWrongFilename(t *testing.T) { - // use to set wrong file name os.Setenv("SITE_TITLE", "Test Site") - xapp.Logger.Info("TestReadAlarmDefinitionFromJsonWrongFilename") - os.Setenv("DEF_FILE","test.json") - alarmManager.ReadAlarmDefinitionFromJson() - // correct the filename + // use to set wrong file name os.Setenv("SITE_TITLE", "Test Site") + xapp.Logger.Info("TestReadAlarmDefinitionFromJsonWrongFilename") + os.Setenv("DEF_FILE", "test.json") + alarmManager.ReadAlarmDefinitionFromJson() + // correct the filename } func TestReadAlarmDefinitionFromJsonInvalidFilename(t *testing.T) { - // use to set wrong file name os.Setenv("SITE_TITLE", "Test Site") - xapp.Logger.Info("TestReadAlarmDefinitionFromJsonInvalidFilename") - os.Setenv("DEF_FILE","../../definitions/test.json") - alarmManager.ReadAlarmDefinitionFromJson() - // correct the filename + // use to set wrong file name os.Setenv("SITE_TITLE", "Test Site") + xapp.Logger.Info("TestReadAlarmDefinitionFromJsonInvalidFilename") + os.Setenv("DEF_FILE", "../../definitions/test.json") + alarmManager.ReadAlarmDefinitionFromJson() + // correct the filename } func TestPersistentStorage(t *testing.T) { - xapp.Logger.Info("TestPersistentStorage") - alarmManager.alarmInfoPvFile = "../../definitions/sample.json" - alarmManager.ReadAlarmInfoFromPersistentVolume() + xapp.Logger.Info("TestPersistentStorage") + alarmManager.alarmInfoPvFile = "../../definitions/sample.json" + alarmManager.ReadAlarmInfoFromPersistentVolume() } func TestDeleteAlarmDefinitions1(t *testing.T) { - xapp.Logger.Info("TestDeleteAlarmDefinitions1") - //Get all - //Delete Alarm which doesn't present - req, _ := http.NewRequest("DELETE", "/ric/v1/alarms/define", nil) + xapp.Logger.Info("TestDeleteAlarmDefinitions1") + //Get all + //Delete Alarm which doesn't present + req, _ := http.NewRequest("DELETE", "/ric/v1/alarms/define", nil) vars := map[string]string{"alarmId": strconv.FormatUint(882004, 10)} - req = mux.SetURLVars(req, vars) + req = mux.SetURLVars(req, vars) handleFunc := http.HandlerFunc(alarmManager.DeleteAlarmDefinition) response := executeRequest(req, handleFunc) - checkResponseCode(t, http.StatusOK, response.Code) + checkResponseCode(t, http.StatusOK, response.Code) - //Delete Alarm which is incorrect present - req, _ = http.NewRequest("DELETE", "/ric/v1/alarms/define", nil) - vars = map[string]string{"alarmId": strconv.FormatUint(898989, 8)} - req = mux.SetURLVars(req, vars) + //Delete Alarm which is incorrect present + req, _ = http.NewRequest("DELETE", "/ric/v1/alarms/define", nil) + vars = map[string]string{"alarmId": strconv.FormatUint(898989, 8)} + req = mux.SetURLVars(req, vars) handleFunc = http.HandlerFunc(alarmManager.DeleteAlarmDefinition) response = executeRequest(req, handleFunc) - checkResponseCode(t, http.StatusOK, response.Code) + checkResponseCode(t, http.StatusOK, response.Code) } func TestGetPreDefinedAlarmInvalidAlarm(t *testing.T) { - xapp.Logger.Info("TestGetPreDefinedAlarmInvalidAlarm") - req, _ := http.NewRequest("GET", "/ric/v1/alarms/define", nil) - vars := map[string]string{"alarmId": "asdsc"} - req = mux.SetURLVars(req, vars) - handleFunc := http.HandlerFunc(alarmManager.GetAlarmDefinition) - response := executeRequest(req, handleFunc) - xapp.Logger.Info("response code = %v",response.Code) - checkResponseCode(t, http.StatusBadRequest, response.Code) + xapp.Logger.Info("TestGetPreDefinedAlarmInvalidAlarm") + req, _ := http.NewRequest("GET", "/ric/v1/alarms/define", nil) + vars := map[string]string{"alarmId": "asdsc"} + req = mux.SetURLVars(req, vars) + handleFunc := http.HandlerFunc(alarmManager.GetAlarmDefinition) + response := executeRequest(req, handleFunc) + xapp.Logger.Info("response code = %v", response.Code) + checkResponseCode(t, http.StatusBadRequest, response.Code) } func TestDeleteAlarmDefinitions2(t *testing.T) { - xapp.Logger.Info("TestDeleteAlarmDefinitions2") - req, _ := http.NewRequest("GET", "/ric/v1/alarms/define", nil) - //Giving Wrong alarmId which can't convert into int - vars := map[string]string{"alarmId": "asdsc"} - req = mux.SetURLVars(req, vars) - handleFunc := http.HandlerFunc(alarmManager.DeleteAlarmDefinition) - response := executeRequest(req, handleFunc) - checkResponseCode(t, http.StatusBadRequest, response.Code) + xapp.Logger.Info("TestDeleteAlarmDefinitions2") + req, _ := http.NewRequest("GET", "/ric/v1/alarms/define", nil) + //Giving Wrong alarmId which can't convert into int + vars := map[string]string{"alarmId": "asdsc"} + req = mux.SetURLVars(req, vars) + handleFunc := http.HandlerFunc(alarmManager.DeleteAlarmDefinition) + response := executeRequest(req, handleFunc) + checkResponseCode(t, http.StatusBadRequest, response.Code) } func VerifyAlarm(t *testing.T, a alarm.Alarm, expectedCount int) string { @@ -849,5 +848,3 @@ func readJSONFromFile(filename string) ([]byte, error) { } return file, nil } - - diff --git a/manager/cmd/restapi.go b/manager/cmd/restapi.go index a4668aa..31c9f8e 100755 --- a/manager/cmd/restapi.go +++ b/manager/cmd/restapi.go @@ -26,7 +26,7 @@ import ( "strconv" "time" - "gerrit.o-ran-sc.org/r/ric-plt/alarm-go/alarm" + "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" ) @@ -203,7 +203,7 @@ func (a *AlarmManager) doAction(w http.ResponseWriter, r *http.Request, isRaiseA return err } -// HandleViaRmr is defined but not used as of now +// 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) diff --git a/manager/cmd/restapi_test.go b/manager/cmd/restapi_test.go index 9ef4df4..b1c175c 100755 --- a/manager/cmd/restapi_test.go +++ b/manager/cmd/restapi_test.go @@ -27,8 +27,8 @@ import ( "net/http/httptest" "testing" + "gerrit.o-ran-sc.org/r/ric-plt/alarm-go.git/alarm" "github.com/stretchr/testify/assert" - "gerrit.o-ran-sc.org/r/ric-plt/alarm-go/alarm" ) // Test cases @@ -99,5 +99,3 @@ func TestSymptomDataHandler(t *testing.T) { assert.Equal(t, true, rr != nil) assert.Equal(t, rr.Code, http.StatusOK) } - - diff --git a/manager/cmd/types.go b/manager/cmd/types.go index 27376e9..73884d8 100755 --- a/manager/cmd/types.go +++ b/manager/cmd/types.go @@ -23,7 +23,7 @@ package main import ( "sync" - "gerrit.o-ran-sc.org/r/ric-plt/alarm-go/alarm" + "gerrit.o-ran-sc.org/r/ric-plt/alarm-go.git/alarm" ) type AlarmManager struct { -- 2.16.6