Remove deprecated Alarm builder API
Change-Id: I2a51096836b918179b1e2b9e7a3358447e7170cb
diff --git a/protocols/snmp/ctl/src/main/java/org/onosproject/snmp/ctl/DefaultSnmpController.java b/protocols/snmp/ctl/src/main/java/org/onosproject/snmp/ctl/DefaultSnmpController.java
index 5703e82..8ddbb6b 100644
--- a/protocols/snmp/ctl/src/main/java/org/onosproject/snmp/ctl/DefaultSnmpController.java
+++ b/protocols/snmp/ctl/src/main/java/org/onosproject/snmp/ctl/DefaultSnmpController.java
@@ -27,6 +27,7 @@
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Service;
import org.onosproject.incubator.net.faultmanagement.alarm.Alarm;
+import org.onosproject.incubator.net.faultmanagement.alarm.AlarmId;
import org.onosproject.incubator.net.faultmanagement.alarm.DefaultAlarm;
import org.onosproject.net.DeviceId;
import org.onosproject.snmp.SnmpController;
@@ -122,9 +123,10 @@
@Override
public DefaultAlarm buildWalkFailedAlarm(DeviceId deviceId) {
+ long timeRaised = System.currentTimeMillis();
return new DefaultAlarm.Builder(
+ AlarmId.alarmId(deviceId, Long.toString(timeRaised)),
deviceId, "SNMP alarm retrieval failed",
- Alarm.SeverityLevel.CRITICAL,
- System.currentTimeMillis()).build();
+ Alarm.SeverityLevel.CRITICAL, timeRaised).build();
}
}
diff --git a/protocols/snmp/ctl/src/test/java/org/onosproject/snmp/ctl/DefaultSnmpControllerTest.java b/protocols/snmp/ctl/src/test/java/org/onosproject/snmp/ctl/DefaultSnmpControllerTest.java
index ff1aa03..a649633 100644
--- a/protocols/snmp/ctl/src/test/java/org/onosproject/snmp/ctl/DefaultSnmpControllerTest.java
+++ b/protocols/snmp/ctl/src/test/java/org/onosproject/snmp/ctl/DefaultSnmpControllerTest.java
@@ -23,6 +23,7 @@
import org.junit.Before;
import org.junit.Test;
import org.onosproject.incubator.net.faultmanagement.alarm.Alarm;
+import org.onosproject.incubator.net.faultmanagement.alarm.AlarmId;
import org.onosproject.incubator.net.faultmanagement.alarm.DefaultAlarm;
import java.io.IOException;
@@ -42,10 +43,12 @@
ISnmpSession snmpSession = new ISnmpSessionAdapter();
+ long time = System.currentTimeMillis();
DefaultAlarm alarm = new DefaultAlarm.Builder(
+ AlarmId.alarmId(device.deviceId(), Long.toString(time)),
device.deviceId(), "SNMP alarm retrieval failed",
Alarm.SeverityLevel.CRITICAL,
- System.currentTimeMillis()).build();
+ time).build();
@Before
public void setUp() {