commit | 1d56fe4dbe68b307376b27a2a5ba0123db64dfae | [log] [tgz] |
---|---|---|
author | Ayaka Koshibe <ayaka@onlab.us> | Fri Sep 19 16:51:58 2014 -0700 |
committer | Ayaka Koshibe <ayaka@onlab.us> | Fri Sep 19 16:51:58 2014 -0700 |
tree | 94df61505ba7a75cc68c5f02776645cfc3380705 | |
parent | e2efe72bcb651cc6d55201a62425428503cd6bf3 [diff] |
renamed IpAddress to IpPrefix Change-Id: I35990622e5b1c29ab6f6a0a0227088cd5d6c7294
diff --git a/core/trivial/src/main/java/org/onlab/onos/net/trivial/host/impl/SimpleHostManager.java b/core/trivial/src/main/java/org/onlab/onos/net/trivial/host/impl/SimpleHostManager.java index 9cf235b..109d238 100644 --- a/core/trivial/src/main/java/org/onlab/onos/net/trivial/host/impl/SimpleHostManager.java +++ b/core/trivial/src/main/java/org/onlab/onos/net/trivial/host/impl/SimpleHostManager.java
@@ -23,7 +23,7 @@ import org.onlab.onos.net.host.HostStore; import org.onlab.onos.net.provider.AbstractProviderRegistry; import org.onlab.onos.net.provider.AbstractProviderService; -import org.onlab.packet.IpAddress; +import org.onlab.packet.IpPrefix; import org.onlab.packet.MacAddress; import org.onlab.packet.VlanId; import org.slf4j.Logger; @@ -100,7 +100,7 @@ } @Override - public Set<Host> getHostsByIp(IpAddress ip) { + public Set<Host> getHostsByIp(IpPrefix ip) { checkNotNull(ip, "IP address cannot be null"); return store.getHosts(ip); }
diff --git a/core/trivial/src/main/java/org/onlab/onos/net/trivial/host/impl/SimpleHostStore.java b/core/trivial/src/main/java/org/onlab/onos/net/trivial/host/impl/SimpleHostStore.java index 1febb67..d540afb 100644 --- a/core/trivial/src/main/java/org/onlab/onos/net/trivial/host/impl/SimpleHostStore.java +++ b/core/trivial/src/main/java/org/onlab/onos/net/trivial/host/impl/SimpleHostStore.java
@@ -25,7 +25,7 @@ import org.onlab.onos.net.host.HostEvent; import org.onlab.onos.net.host.HostStore; 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; @@ -166,7 +166,7 @@ } @Override - public Set<Host> getHosts(IpAddress ip) { + public Set<Host> getHosts(IpPrefix ip) { Set<Host> ipset = new HashSet<>(); for (Host h : hosts.values()) { if (h.ipAddresses().contains(ip)) {