Replaced the usage of IpPrefix with IpAddress in the context of
Controller Nodes.
Change-Id: Id2b25fb071bb20541db3f77b7afefe886520538e
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/cluster/impl/DistributedClusterStore.java b/core/store/dist/src/main/java/org/onlab/onos/store/cluster/impl/DistributedClusterStore.java
index 59267d1..07a3e6b8 100644
--- a/core/store/dist/src/main/java/org/onlab/onos/store/cluster/impl/DistributedClusterStore.java
+++ b/core/store/dist/src/main/java/org/onlab/onos/store/cluster/impl/DistributedClusterStore.java
@@ -22,7 +22,7 @@
import org.onlab.onos.store.hz.AbsentInvalidatingLoadingCache;
import org.onlab.onos.store.hz.AbstractHazelcastStore;
import org.onlab.onos.store.hz.OptionalCacheLoader;
-import org.onlab.packet.IpPrefix;
+import org.onlab.packet.IpAddress;
import java.util.Map;
import java.util.Set;
@@ -105,7 +105,7 @@
}
@Override
- public ControllerNode addNode(NodeId nodeId, IpPrefix ip, int tcpPort) {
+ public ControllerNode addNode(NodeId nodeId, IpAddress ip, int tcpPort) {
return addNode(new DefaultControllerNode(nodeId, ip, tcpPort));
}
@@ -127,13 +127,13 @@
// Creates a controller node descriptor from the Hazelcast member.
private DefaultControllerNode node(Member member) {
- IpPrefix ip = memberAddress(member);
+ IpAddress ip = memberAddress(member);
return new DefaultControllerNode(new NodeId(ip.toString()), ip);
}
- private IpPrefix memberAddress(Member member) {
+ private IpAddress memberAddress(Member member) {
byte[] address = member.getSocketAddress().getAddress().getAddress();
- return IpPrefix.valueOf(address);
+ return IpAddress.valueOf(address);
}
// Interceptor for membership events.