commit 444b519327cfd4636f76b0165451ff25b28aedf5
author Pavlin Radoslavov <pavlin@onlab.us> Tue Oct 28 10:45:19 2014 -0700
committer Pavlin Radoslavov <pavlin@onlab.us> Tue Oct 28 10:45:19 2014 -0700
tree 29afd2ef9f5c87e46ec6dbbee13f13931032cf0a
parent d35961bc18a86e3003fe55e70cf9ad7c0b52b6a9

Replaced the usage of IpPrefix with IpAddress in the context of
Controller Nodes.

Change-Id: Id2b25fb071bb20541db3f77b7afefe886520538e

core/net/src/test/java/org/onlab/onos/cluster/impl/MastershipManagerTest.java

diff --git a/core/net/src/test/java/org/onlab/onos/cluster/impl/MastershipManagerTest.java b/core/net/src/test/java/org/onlab/onos/cluster/impl/MastershipManagerTest.java
index 96b8ae0..4e1f905 100644
--- a/core/net/src/test/java/org/onlab/onos/cluster/impl/MastershipManagerTest.java
+++ b/core/net/src/test/java/org/onlab/onos/cluster/impl/MastershipManagerTest.java
@@ -16,7 +16,7 @@
 import org.onlab.onos.mastership.MastershipTermService;
 import org.onlab.onos.net.DeviceId;
 import org.onlab.onos.store.trivial.impl.SimpleMastershipStore;
-import org.onlab.packet.IpPrefix;
+import org.onlab.packet.IpAddress;
 
 import com.google.common.collect.Sets;
 
@@ -31,7 +31,7 @@
 
     private static final NodeId NID_LOCAL = new NodeId("local");
     private static final NodeId NID_OTHER = new NodeId("foo");
-    private static final IpPrefix LOCALHOST = IpPrefix.valueOf("127.0.0.1");
+    private static final IpAddress LOCALHOST = IpAddress.valueOf("127.0.0.1");
     private static final DeviceId DEV_MASTER = DeviceId.deviceId("of:1");
     private static final DeviceId DEV_OTHER = DeviceId.deviceId("of:2");
 

core/net/src/test/java/org/onlab/onos/net/device/impl/DeviceManagerTest.java

diff --git a/core/net/src/test/java/org/onlab/onos/net/device/impl/DeviceManagerTest.java b/core/net/src/test/java/org/onlab/onos/net/device/impl/DeviceManagerTest.java
index a86502f..86b59d7 100644
--- a/core/net/src/test/java/org/onlab/onos/net/device/impl/DeviceManagerTest.java
+++ b/core/net/src/test/java/org/onlab/onos/net/device/impl/DeviceManagerTest.java
@@ -38,7 +38,7 @@
 import org.onlab.onos.net.provider.ProviderId;
 import org.onlab.onos.store.trivial.impl.SimpleDeviceStore;
 import org.onlab.packet.ChassisId;
-import org.onlab.packet.IpPrefix;
+import org.onlab.packet.IpAddress;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -69,7 +69,7 @@
     private static final PortNumber P2 = PortNumber.portNumber(2);
     private static final PortNumber P3 = PortNumber.portNumber(3);
     private static final NodeId NID_LOCAL = new NodeId("local");
-    private static final IpPrefix LOCALHOST = IpPrefix.valueOf("127.0.0.1");
+    private static final IpAddress LOCALHOST = IpAddress.valueOf("127.0.0.1");
 
     private DeviceManager mgr;