[SDFAB-753] Improve ONOS cluster event
Main idea of this change is to add an additional parameter
in the event that carries information about the failed instance.
Additionally, prevents several NPE by using hostname as id
when controller hostname cannot be resolved into an ip.
Change-Id: Id9886afe3f1e5ecee0f1414b2722c340680a813e
(cherry picked from commit fa5dc3c137a4deaa020a669388470b511c2b6a8e)
diff --git a/core/api/src/test/java/org/onosproject/cluster/ClusterEventTest.java b/core/api/src/test/java/org/onosproject/cluster/ClusterEventTest.java
index 8995062..f5e1f1e 100644
--- a/core/api/src/test/java/org/onosproject/cluster/ClusterEventTest.java
+++ b/core/api/src/test/java/org/onosproject/cluster/ClusterEventTest.java
@@ -49,6 +49,26 @@
new ClusterEvent(ClusterEvent.Type.INSTANCE_READY, cNode2, time);
private final ClusterEvent sameAsEvent7 =
new ClusterEvent(ClusterEvent.Type.INSTANCE_READY, cNode2, time);
+ private final ClusterEvent event8 =
+ new ClusterEvent(ClusterEvent.Type.INSTANCE_ADDED, cNode2, ClusterEvent.InstanceType.ONOS);
+ private final ClusterEvent event9 =
+ new ClusterEvent(ClusterEvent.Type.INSTANCE_ADDED, cNode2, ClusterEvent.InstanceType.STORAGE);
+ private final ClusterEvent event10 =
+ new ClusterEvent(ClusterEvent.Type.INSTANCE_REMOVED, cNode2, ClusterEvent.InstanceType.ONOS);
+ private final ClusterEvent event11 =
+ new ClusterEvent(ClusterEvent.Type.INSTANCE_REMOVED, cNode2, ClusterEvent.InstanceType.STORAGE);
+ private final ClusterEvent event12 =
+ new ClusterEvent(ClusterEvent.Type.INSTANCE_ACTIVATED, cNode1, ClusterEvent.InstanceType.ONOS);
+ private final ClusterEvent event13 =
+ new ClusterEvent(ClusterEvent.Type.INSTANCE_ACTIVATED, cNode1, ClusterEvent.InstanceType.STORAGE);
+ private final ClusterEvent event14 =
+ new ClusterEvent(ClusterEvent.Type.INSTANCE_READY, cNode1, ClusterEvent.InstanceType.ONOS);
+ private final ClusterEvent event15 =
+ new ClusterEvent(ClusterEvent.Type.INSTANCE_READY, cNode1, ClusterEvent.InstanceType.STORAGE);
+ private final ClusterEvent event16 =
+ new ClusterEvent(ClusterEvent.Type.INSTANCE_DEACTIVATED, cNode1, ClusterEvent.InstanceType.ONOS);
+ private final ClusterEvent event17 =
+ new ClusterEvent(ClusterEvent.Type.INSTANCE_DEACTIVATED, cNode1, ClusterEvent.InstanceType.STORAGE);
/**
* Tests for proper operation of equals(), hashCode() and toString() methods.
@@ -63,6 +83,16 @@
.addEqualityGroup(event5)
.addEqualityGroup(event6)
.addEqualityGroup(event7, sameAsEvent7)
+ .addEqualityGroup(event8)
+ .addEqualityGroup(event9)
+ .addEqualityGroup(event10)
+ .addEqualityGroup(event11)
+ .addEqualityGroup(event12)
+ .addEqualityGroup(event13)
+ .addEqualityGroup(event14)
+ .addEqualityGroup(event15)
+ .addEqualityGroup(event16)
+ .addEqualityGroup(event17)
.testEquals();
}
@@ -73,10 +103,52 @@
public void checkConstruction() {
assertThat(event1.type(), is(ClusterEvent.Type.INSTANCE_ADDED));
assertThat(event1.subject(), is(cNode1));
+ assertThat(event1.instanceType(), is(ClusterEvent.InstanceType.UNKNOWN));
assertThat(event7.time(), is(time));
assertThat(event7.type(), is(ClusterEvent.Type.INSTANCE_READY));
assertThat(event7.subject(), is(cNode2));
+ assertThat(event7.instanceType(), is(ClusterEvent.InstanceType.UNKNOWN));
+
+ assertThat(event8.type(), is(ClusterEvent.Type.INSTANCE_ADDED));
+ assertThat(event8.subject(), is(cNode2));
+ assertThat(event8.instanceType(), is(ClusterEvent.InstanceType.ONOS));
+
+ assertThat(event9.type(), is(ClusterEvent.Type.INSTANCE_ADDED));
+ assertThat(event9.subject(), is(cNode2));
+ assertThat(event9.instanceType(), is(ClusterEvent.InstanceType.STORAGE));
+
+ assertThat(event10.type(), is(ClusterEvent.Type.INSTANCE_REMOVED));
+ assertThat(event10.subject(), is(cNode2));
+ assertThat(event10.instanceType(), is(ClusterEvent.InstanceType.ONOS));
+
+ assertThat(event11.type(), is(ClusterEvent.Type.INSTANCE_REMOVED));
+ assertThat(event11.subject(), is(cNode2));
+ assertThat(event11.instanceType(), is(ClusterEvent.InstanceType.STORAGE));
+
+ assertThat(event12.type(), is(ClusterEvent.Type.INSTANCE_ACTIVATED));
+ assertThat(event12.subject(), is(cNode1));
+ assertThat(event12.instanceType(), is(ClusterEvent.InstanceType.ONOS));
+
+ assertThat(event13.type(), is(ClusterEvent.Type.INSTANCE_ACTIVATED));
+ assertThat(event13.subject(), is(cNode1));
+ assertThat(event13.instanceType(), is(ClusterEvent.InstanceType.STORAGE));
+
+ assertThat(event14.type(), is(ClusterEvent.Type.INSTANCE_READY));
+ assertThat(event14.subject(), is(cNode1));
+ assertThat(event14.instanceType(), is(ClusterEvent.InstanceType.ONOS));
+
+ assertThat(event15.type(), is(ClusterEvent.Type.INSTANCE_READY));
+ assertThat(event15.subject(), is(cNode1));
+ assertThat(event15.instanceType(), is(ClusterEvent.InstanceType.STORAGE));
+
+ assertThat(event16.type(), is(ClusterEvent.Type.INSTANCE_DEACTIVATED));
+ assertThat(event16.subject(), is(cNode1));
+ assertThat(event16.instanceType(), is(ClusterEvent.InstanceType.ONOS));
+
+ assertThat(event17.type(), is(ClusterEvent.Type.INSTANCE_DEACTIVATED));
+ assertThat(event17.subject(), is(cNode1));
+ assertThat(event17.instanceType(), is(ClusterEvent.InstanceType.STORAGE));
}
}