First round of ClusterMetadata improvements:
Introduced a PartitionId type for identifying partitions
Introduced a admin service for making metadata updates
Update cluster.json format to specify all partitions (including p0) and changed partitionId to be an int.
Change-Id: Ia0617f1ed0ce886680dcee4f5396a4bbdfa225da
diff --git a/providers/lldp/src/test/java/org/onosproject/provider/lldp/impl/LldpLinkProviderTest.java b/providers/lldp/src/test/java/org/onosproject/provider/lldp/impl/LldpLinkProviderTest.java
index 28b08ea..940be57 100644
--- a/providers/lldp/src/test/java/org/onosproject/provider/lldp/impl/LldpLinkProviderTest.java
+++ b/providers/lldp/src/test/java/org/onosproject/provider/lldp/impl/LldpLinkProviderTest.java
@@ -32,11 +32,13 @@
import org.onlab.packet.ONOSLLDP;
import org.onosproject.cfg.ComponentConfigAdapter;
import org.onosproject.cluster.ClusterMetadata;
+import org.onosproject.cluster.ClusterMetadataEventListener;
import org.onosproject.cluster.ClusterMetadataService;
import org.onosproject.cluster.ControllerNode;
import org.onosproject.cluster.DefaultControllerNode;
import org.onosproject.cluster.NodeId;
import org.onosproject.cluster.Partition;
+import org.onosproject.cluster.PartitionId;
import org.onosproject.cluster.RoleInfo;
import org.onosproject.core.ApplicationId;
import org.onosproject.core.CoreService;
@@ -77,6 +79,7 @@
import org.onosproject.net.provider.ProviderId;
import java.nio.ByteBuffer;
+import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
@@ -950,7 +953,16 @@
public ClusterMetadata getClusterMetadata() {
final NodeId nid = new NodeId("test-node");
final IpAddress addr = IpAddress.valueOf(0);
- final Partition p = new Partition("test-pt", Sets.newHashSet(nid));
+ final Partition p = new Partition() {
+ public PartitionId getId() {
+ return PartitionId.from(1);
+ }
+
+ @Override
+ public Collection<NodeId> getMembers() {
+ return Sets.newHashSet(nid);
+ }
+ };
return ClusterMetadata.builder()
.withName("test-cluster")
.withControllerNodes(Sets.newHashSet(new DefaultControllerNode(nid, addr)))
@@ -958,12 +970,16 @@
}
@Override
- public void setClusterMetadata(ClusterMetadata metadata) {
+ public ControllerNode getLocalNode() {
+ return null;
}
@Override
- public ControllerNode getLocalNode() {
- return null;
+ public void addListener(ClusterMetadataEventListener listener) {
+ }
+
+ @Override
+ public void removeListener(ClusterMetadataEventListener listener) {
}
}
}