Replaced the usage of IpPrefix with IpAddress in the context of
Controller Nodes.
Change-Id: Id2b25fb071bb20541db3f77b7afefe886520538e
diff --git a/core/store/trivial/src/main/java/org/onlab/onos/store/trivial/impl/SimpleClusterStore.java b/core/store/trivial/src/main/java/org/onlab/onos/store/trivial/impl/SimpleClusterStore.java
index 1363fd0..65dc0ab 100644
--- a/core/store/trivial/src/main/java/org/onlab/onos/store/trivial/impl/SimpleClusterStore.java
+++ b/core/store/trivial/src/main/java/org/onlab/onos/store/trivial/impl/SimpleClusterStore.java
@@ -12,7 +12,7 @@
import org.onlab.onos.cluster.DefaultControllerNode;
import org.onlab.onos.cluster.NodeId;
import org.onlab.onos.store.AbstractStore;
-import org.onlab.packet.IpPrefix;
+import org.onlab.packet.IpAddress;
import org.slf4j.Logger;
import java.util.Set;
@@ -29,7 +29,7 @@
extends AbstractStore<ClusterEvent, ClusterStoreDelegate>
implements ClusterStore {
- public static final IpPrefix LOCALHOST = IpPrefix.valueOf("127.0.0.1");
+ public static final IpAddress LOCALHOST = IpAddress.valueOf("127.0.0.1");
private final Logger log = getLogger(getClass());
@@ -68,7 +68,7 @@
}
@Override
- public ControllerNode addNode(NodeId nodeId, IpPrefix ip, int tcpPort) {
+ public ControllerNode addNode(NodeId nodeId, IpAddress ip, int tcpPort) {
return null;
}
diff --git a/core/store/trivial/src/main/java/org/onlab/onos/store/trivial/impl/SimpleMastershipStore.java b/core/store/trivial/src/main/java/org/onlab/onos/store/trivial/impl/SimpleMastershipStore.java
index a0ac4c7..7125e50 100644
--- a/core/store/trivial/src/main/java/org/onlab/onos/store/trivial/impl/SimpleMastershipStore.java
+++ b/core/store/trivial/src/main/java/org/onlab/onos/store/trivial/impl/SimpleMastershipStore.java
@@ -26,7 +26,7 @@
import org.onlab.onos.net.DeviceId;
import org.onlab.onos.net.MastershipRole;
import org.onlab.onos.store.AbstractStore;
-import org.onlab.packet.IpPrefix;
+import org.onlab.packet.IpAddress;
import org.slf4j.Logger;
import com.google.common.collect.Lists;
@@ -45,7 +45,7 @@
private final Logger log = getLogger(getClass());
- public static final IpPrefix LOCALHOST = IpPrefix.valueOf("127.0.0.1");
+ public static final IpAddress LOCALHOST = IpAddress.valueOf("127.0.0.1");
private ControllerNode instance =
new DefaultControllerNode(new NodeId("local"), LOCALHOST);