renamed IpAddress to IpPrefix
Change-Id: I35990622e5b1c29ab6f6a0a0227088cd5d6c7294
diff --git a/core/api/src/main/java/org/onlab/onos/net/host/DefaultHostDescription.java b/core/api/src/main/java/org/onlab/onos/net/host/DefaultHostDescription.java
index 68795bd..0a419fd 100644
--- a/core/api/src/main/java/org/onlab/onos/net/host/DefaultHostDescription.java
+++ b/core/api/src/main/java/org/onlab/onos/net/host/DefaultHostDescription.java
@@ -6,7 +6,7 @@
import java.util.Set;
import org.onlab.onos.net.HostLocation;
-import org.onlab.packet.IpAddress;
+import org.onlab.packet.IpPrefix;
import org.onlab.packet.MacAddress;
import org.onlab.packet.VlanId;
@@ -17,22 +17,22 @@
private final MacAddress mac;
private final VlanId vlan;
private final HostLocation location;
- private final Set<IpAddress> ips;
+ private final Set<IpPrefix> ips;
public DefaultHostDescription(MacAddress mac, VlanId vlan,
HostLocation loc) {
this.mac = mac;
this.vlan = vlan;
this.location = loc;
- this.ips = new HashSet<IpAddress>();
+ this.ips = new HashSet<IpPrefix>();
}
public DefaultHostDescription(MacAddress mac, VlanId vlan,
- HostLocation loc, Set<IpAddress> ips) {
+ HostLocation loc, Set<IpPrefix> ips) {
this.mac = mac;
this.vlan = vlan;
this.location = loc;
- this.ips = new HashSet<IpAddress>(ips);
+ this.ips = new HashSet<IpPrefix>(ips);
}
@Override
@@ -51,7 +51,7 @@
}
@Override
- public Set<IpAddress> ipAddresses() {
+ public Set<IpPrefix> ipAddresses() {
return ImmutableSet.copyOf(ips);
}
diff --git a/core/api/src/main/java/org/onlab/onos/net/host/HostDescription.java b/core/api/src/main/java/org/onlab/onos/net/host/HostDescription.java
index 5917bef..27014b6 100644
--- a/core/api/src/main/java/org/onlab/onos/net/host/HostDescription.java
+++ b/core/api/src/main/java/org/onlab/onos/net/host/HostDescription.java
@@ -4,7 +4,7 @@
import org.onlab.onos.net.Description;
import org.onlab.onos.net.HostLocation;
-import org.onlab.packet.IpAddress;
+import org.onlab.packet.IpPrefix;
import org.onlab.packet.MacAddress;
import org.onlab.packet.VlanId;
@@ -39,6 +39,6 @@
*
* @return a set of IP addresses.
*/
- Set<IpAddress> ipAddresses();
+ Set<IpPrefix> ipAddresses();
}
diff --git a/core/api/src/main/java/org/onlab/onos/net/host/HostService.java b/core/api/src/main/java/org/onlab/onos/net/host/HostService.java
index a42e231..39f63c0 100644
--- a/core/api/src/main/java/org/onlab/onos/net/host/HostService.java
+++ b/core/api/src/main/java/org/onlab/onos/net/host/HostService.java
@@ -4,7 +4,7 @@
import org.onlab.onos.net.DeviceId;
import org.onlab.onos.net.Host;
import org.onlab.onos.net.HostId;
-import org.onlab.packet.IpAddress;
+import org.onlab.packet.IpPrefix;
import org.onlab.packet.MacAddress;
import org.onlab.packet.VlanId;
@@ -59,7 +59,7 @@
* @param ip ip address
* @return set of hosts with the given IP
*/
- Set<Host> getHostsByIp(IpAddress ip);
+ Set<Host> getHostsByIp(IpPrefix ip);
// TODO: consider adding Host getHostByIp(IpAddress ip, VlanId vlan);
diff --git a/core/api/src/main/java/org/onlab/onos/net/host/HostStore.java b/core/api/src/main/java/org/onlab/onos/net/host/HostStore.java
index cb5ed64..94c4585 100644
--- a/core/api/src/main/java/org/onlab/onos/net/host/HostStore.java
+++ b/core/api/src/main/java/org/onlab/onos/net/host/HostStore.java
@@ -5,7 +5,7 @@
import org.onlab.onos.net.Host;
import org.onlab.onos.net.HostId;
import org.onlab.onos.net.provider.ProviderId;
-import org.onlab.packet.IpAddress;
+import org.onlab.packet.IpPrefix;
import org.onlab.packet.MacAddress;
import org.onlab.packet.VlanId;
@@ -81,7 +81,7 @@
* @param ip ip address
* @return set of hosts with the given IP
*/
- Set<Host> getHosts(IpAddress ip);
+ Set<Host> getHosts(IpPrefix ip);
/**
* Returns the set of hosts whose location falls on the given connection point.