X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=adapter%2Fcmd%2Fadapter_test.go;h=dbb53e7c1e112b2077ae491d5c211694696f96b8;hb=4e86e68d94de4f1257ebe2a567bf37e8e847d515;hp=a2348b7854a7fe4c09480f1f961491891cf605e8;hpb=61bdef5fe4a22986832d1e51846cbb011ac04074;p=ric-plt%2Falarm-go.git

diff --git a/adapter/cmd/adapter_test.go b/adapter/cmd/adapter_test.go
index a2348b7..dbb53e7 100755
--- a/adapter/cmd/adapter_test.go
+++ b/adapter/cmd/adapter_test.go
@@ -64,10 +64,10 @@ func TestNewAlarmStoredAndPostedSucess(t *testing.T) {
 	ts := CreatePromAlertSimulator(t, "POST", "/api/v2/alerts", http.StatusOK, models.LabelSet{})
 	defer ts.Close()
 
-	a := alarmer.NewAlarm(RIC_RT_DISTRIBUTION_FAILED, alarm.SeverityMajor, "Some App data", "eth 0 1")
+	a := alarmer.NewAlarm(alarm.RIC_RT_DISTRIBUTION_FAILED, alarm.SeverityMajor, "Some App data", "eth 0 1")
 	assert.Nil(t, alarmer.Raise(a), "raise failed")
 
-	VerifyAlarm(t, a, 1, 0)
+	VerifyAlarm(t, a, 1)
 }
 
 func TestAlarmClearedSucess(t *testing.T) {
@@ -75,13 +75,13 @@ func TestAlarmClearedSucess(t *testing.T) {
 	defer ts.Close()
 
 	// Raise the alarm
-	a := alarmer.NewAlarm(RIC_RT_DISTRIBUTION_FAILED, alarm.SeverityMajor, "Some App data", "eth 0 1")
+	a := alarmer.NewAlarm(alarm.RIC_RT_DISTRIBUTION_FAILED, alarm.SeverityMajor, "Some App data", "eth 0 1")
 	assert.Nil(t, alarmer.Raise(a), "raise failed")
 
-	VerifyAlarm(t, a, 1, 0)
+	VerifyAlarm(t, a, 1)
 
 	// Now Clear the alarm and check alarm is removed
-	a = alarmer.NewAlarm(RIC_RT_DISTRIBUTION_FAILED, alarm.SeverityCleared, "Some App data", "eth 0 1")
+	a = alarmer.NewAlarm(alarm.RIC_RT_DISTRIBUTION_FAILED, alarm.SeverityCleared, "Some App data", "eth 0 1")
 	assert.Nil(t, alarmer.Clear(a), "clear failed")
 
 	time.Sleep(time.Duration(2) * time.Second)
@@ -93,14 +93,14 @@ func TestMultipleAlarmsRaisedSucess(t *testing.T) {
 	defer ts.Close()
 
 	// Raise two alarms
-	a := alarmer.NewAlarm(RIC_RT_DISTRIBUTION_FAILED, alarm.SeverityMajor, "Some App data", "eth 0 1")
+	a := alarmer.NewAlarm(alarm.RIC_RT_DISTRIBUTION_FAILED, alarm.SeverityMajor, "Some App data", "eth 0 1")
 	assert.Nil(t, alarmer.Raise(a), "raise failed")
 
-	b := alarmer.NewAlarm(CONNECTIVITY_LOST_TO_DBAAS, alarm.SeverityMinor, "Hello", "abcd 11")
+	b := alarmer.NewAlarm(alarm.TCP_CONNECTIVITY_LOST_TO_DBAAS, alarm.SeverityMinor, "Hello", "abcd 11")
 	assert.Nil(t, alarmer.Raise(b), "raise failed")
 
-	VerifyAlarm(t, a, 2, 0)
-	VerifyAlarm(t, b, 2, 1)
+	VerifyAlarm(t, a, 2)
+	VerifyAlarm(t, b, 2)
 }
 
 func TestMultipleAlarmsClearedSucess(t *testing.T) {
@@ -108,10 +108,10 @@ func TestMultipleAlarmsClearedSucess(t *testing.T) {
 	defer ts.Close()
 
 	// Raise two alarms
-	a := alarmer.NewAlarm(RIC_RT_DISTRIBUTION_FAILED, alarm.SeverityMajor, "Some App data", "eth 0 1")
+	a := alarmer.NewAlarm(alarm.RIC_RT_DISTRIBUTION_FAILED, alarm.SeverityMajor, "Some App data", "eth 0 1")
 	assert.Nil(t, alarmer.Clear(a), "clear failed")
 
-	b := alarmer.NewAlarm(CONNECTIVITY_LOST_TO_DBAAS, alarm.SeverityMinor, "Hello", "abcd 11")
+	b := alarmer.NewAlarm(alarm.TCP_CONNECTIVITY_LOST_TO_DBAAS, alarm.SeverityMinor, "Hello", "abcd 11")
 	assert.Nil(t, alarmer.Clear(b), "clear failed")
 
 	time.Sleep(time.Duration(2) * time.Second)
@@ -123,11 +123,11 @@ func TestAlarmsSuppresedSucess(t *testing.T) {
 	defer ts.Close()
 
 	// Raise two similar/matching alarms ... the second one suppresed
-	a := alarmer.NewAlarm(RIC_RT_DISTRIBUTION_FAILED, alarm.SeverityMajor, "Some App data", "eth 0 1")
+	a := alarmer.NewAlarm(alarm.RIC_RT_DISTRIBUTION_FAILED, alarm.SeverityMajor, "Some App data", "eth 0 1")
 	assert.Nil(t, alarmer.Raise(a), "raise failed")
 	assert.Nil(t, alarmer.Raise(a), "raise failed")
 
-	VerifyAlarm(t, a, 1, 0)
+	VerifyAlarm(t, a, 1)
 }
 
 func TestInvalidAlarms(t *testing.T) {
@@ -151,18 +151,12 @@ func TestStatusCallback(t *testing.T) {
 	assert.Equal(t, true, alarmAdapter.StatusCB())
 }
 
-func VerifyAlarm(t *testing.T, a alarm.Alarm, count, idx int) string {
+func VerifyAlarm(t *testing.T, a alarm.Alarm, expectedCount int) string {
 	receivedAlert := waitForEvent()
 
-	assert.Equal(t, len(alarmAdapter.activeAlarms), count)
-
-	b := alarmAdapter.activeAlarms[idx]
-	assert.Equal(t, b.ManagedObjectId, a.ManagedObjectId)
-	assert.Equal(t, b.ApplicationId, a.ApplicationId)
-	assert.Equal(t, b.SpecificProblem, a.SpecificProblem)
-	assert.Equal(t, b.PerceivedSeverity, a.PerceivedSeverity)
-	assert.Equal(t, b.AdditionalInfo, a.AdditionalInfo)
-	assert.Equal(t, b.IdentifyingInfo, a.IdentifyingInfo)
+	assert.Equal(t, len(alarmAdapter.activeAlarms), expectedCount)
+	_, ok := alarmAdapter.IsMatchFound(a)
+	assert.True(t, ok)
 
 	return receivedAlert
 }