CHANGE 1:
Patch to show API for Alarms in Fault Management.
AlarmsWebResource.java & Alarm.java show what the external REST API for alarms would look like.
See more info at https://wiki.onosproject.org/display/ONOS/Fault+Management
Everything else is very early and work-in-progress/mostly just stubbed out, and not ready for review but all advice welcome.
CHANGE 2:
[ONOS-3203] Update re. comments on FM API draft.
Comments were from Thomas Vachuska regarding https://gerrit.onosproject.org/#/c/6180/
Change-Id: If8d330d1b18b503e89849587e2d4388bf67becc0
diff --git a/incubator/api/src/test/java/org/onosproject/incubator/net/faultmanagement/alarm/AlarmEntityIdTest.java b/incubator/api/src/test/java/org/onosproject/incubator/net/faultmanagement/alarm/AlarmEntityIdTest.java
new file mode 100644
index 0000000..55f052a
--- /dev/null
+++ b/incubator/api/src/test/java/org/onosproject/incubator/net/faultmanagement/alarm/AlarmEntityIdTest.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2014-2015 Open Networking Laboratory
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.onosproject.incubator.net.faultmanagement.alarm;
+
+import com.google.common.testing.EqualsTester;
+import static org.junit.Assert.assertEquals;
+import org.junit.Test;
+import static org.onlab.junit.ImmutableClassChecker.assertThatClassIsImmutable;
+import static org.onosproject.incubator.net.faultmanagement.alarm.AlarmEntityId.alarmEntityId;
+
+/**
+ * Test of the alarm source identifier.
+ *
+ */
+public class AlarmEntityIdTest {
+
+ /**
+ * Checks that the class is immutable.
+ */
+ @Test
+ public void testImmutability() {
+ assertThatClassIsImmutable(AlarmEntityId.class);
+ }
+
+ @Test
+ public void string() {
+ assertEquals("och:foo",
+ alarmEntityId("och:foo").toString());
+ }
+
+ @Test
+ public void basics() {
+ new EqualsTester()
+ .addEqualityGroup(
+ alarmEntityId("och:foo"),
+ alarmEntityId("och:foo"))
+ .addEqualityGroup(alarmEntityId("och:bar"))
+ .testEquals();
+
+ }
+
+ @Test
+ public void validSchemaPermitted() {
+ alarmEntityId("none:foo");
+ alarmEntityId("port:foo");
+ alarmEntityId("och:foo");
+ alarmEntityId("other:foo");
+
+ }
+
+ @Test(expected = IllegalArgumentException.class)
+ public void verifyUnexpectedSchemaRejected() {
+ alarmEntityId("junk:foo");
+ }
+
+ @Test(expected = IllegalArgumentException.class)
+ public void verifyCorruptSchemaRejected() {
+ alarmEntityId("other:");
+ }
+
+}
diff --git a/incubator/api/src/test/java/org/onosproject/incubator/net/faultmanagement/alarm/AlarmIdTest.java b/incubator/api/src/test/java/org/onosproject/incubator/net/faultmanagement/alarm/AlarmIdTest.java
new file mode 100644
index 0000000..74453a4
--- /dev/null
+++ b/incubator/api/src/test/java/org/onosproject/incubator/net/faultmanagement/alarm/AlarmIdTest.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright 2014 Open Networking Laboratory
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.onosproject.incubator.net.faultmanagement.alarm;
+
+import com.google.common.testing.EqualsTester;
+import org.junit.Test;
+
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.not;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+import static org.onlab.junit.ImmutableClassChecker.assertThatClassIsImmutable;
+
+/**
+ * This class tests the immutability, equality, and non-equality of
+ * {@link AlarmId}.
+ */
+public class AlarmIdTest {
+ private static final long ID_A = 1L;
+ private static final long ID_B = 2L;
+ private static final long ID_Z = 987654321L;
+
+ /**
+ * Tests the immutability of {@link AlarmId}.
+ */
+ @Test
+ public void intentIdFollowsGuidelineForImmutableObject() {
+ assertThatClassIsImmutable(AlarmId.class);
+ }
+
+ /**
+ * Tests equality of {@link AlarmId}.
+ */
+ @Test
+ public void testEquality() {
+ final AlarmId id1 = new AlarmId(ID_A);
+ final AlarmId id2 = new AlarmId(ID_A);
+
+ assertThat(id1, is(id2));
+ }
+
+
+ /**
+ * Tests non-equality of {@link AlarmId}.
+ */
+ @Test
+ public void testNonEquality() {
+ final AlarmId id1 = new AlarmId(ID_A);
+ final AlarmId id2 = new AlarmId(ID_B);
+
+ assertThat(id1, is(not(id2)));
+ }
+
+ @Test
+ public void valueOf() {
+ final AlarmId id = new AlarmId(0xdeadbeefL);
+ assertEquals("incorrect valueOf", id, AlarmId.valueOf(0xdeadbeefL));
+ }
+
+ /**
+ * Tests the equals(), hashCode() and toString() methods.
+ */
+ @Test
+ public void testEquals() {
+ final AlarmId id1 = new AlarmId(11111L);
+ final AlarmId sameAsId1 = new AlarmId(11111L);
+ final AlarmId id2 = new AlarmId(22222L);
+
+ new EqualsTester()
+ .addEqualityGroup(id1, sameAsId1)
+ .addEqualityGroup(id2)
+ .testEquals();
+ }
+
+ /**
+ * Tests construction of an AlarmId object.
+ */
+ @Test
+ public void testConstruction() {
+ final AlarmId id1 = new AlarmId(ID_Z);
+ assertEquals(id1.fingerprint(), ID_Z);
+
+ // No default constructor so no need to test it !
+ }
+}
diff --git a/incubator/api/src/test/java/org/onosproject/incubator/net/faultmanagement/alarm/DefaultAlarmTest.java b/incubator/api/src/test/java/org/onosproject/incubator/net/faultmanagement/alarm/DefaultAlarmTest.java
new file mode 100644
index 0000000..199ed0d
--- /dev/null
+++ b/incubator/api/src/test/java/org/onosproject/incubator/net/faultmanagement/alarm/DefaultAlarmTest.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2014 Open Networking Laboratory
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.onosproject.incubator.net.faultmanagement.alarm;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.notNullValue;
+import org.junit.Test;
+import static org.junit.Assert.*;
+import static org.onlab.junit.ImmutableClassChecker.assertThatClassIsImmutable;
+import org.onosproject.net.DeviceId;
+
+public class DefaultAlarmTest {
+
+ @Test
+ public void testImmutability() {
+ assertThatClassIsImmutable(DefaultAlarm.class);
+ }
+
+ /**
+ * Checks the construction of a DefaultAlarm object.
+ */
+ @Test
+ public void testConstruction() {
+ final String nameValue = "name3";
+ final DefaultAlarm a = new DefaultAlarm.Builder(AlarmId.valueOf(4),
+ DeviceId.NONE, nameValue, Alarm.SeverityLevel.CLEARED, 3).build();
+
+ assertThat(a, is(notNullValue()));
+ final DefaultAlarm b = new DefaultAlarm.Builder(a).build();
+
+ assertEquals(a, b);
+ }
+}