commit | 04a1a4e4fb4e0da3b43f24e802a3075650266031 | [log] [tgz] |
---|---|---|
author | Ayaka Koshibe <ayaka@onlab.us> | Thu Sep 11 14:31:29 2014 -0700 |
committer | Ayaka Koshibe <ayaka@onlab.us> | Thu Sep 11 14:31:29 2014 -0700 |
tree | fcddbcf650cc9d1cf43ae37c92881552ead5c114 | |
parent | 491fdb5de59de1b43c157945c4beb11cf71001f4 [diff] |
added VLANID construct Change-Id: Ia58abb268d52639215f289052bbf8802992f98a6
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 0bb291f1..3032ac9 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,6 +23,7 @@ import org.onlab.onos.net.provider.AbstractProviderService; import org.onlab.packet.IPAddress; import org.onlab.packet.MACAddress; +import org.onlab.packet.VLANID; import org.slf4j.Logger; import java.util.Set; @@ -85,7 +86,7 @@ } @Override - public Set<Host> getHostsByVlan(long vlanId) { + public Set<Host> getHostsByVlan(VLANID vlanId) { return store.getHosts(vlanId); }
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 96dce86..2f9eb29 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
@@ -21,6 +21,7 @@ import org.onlab.onos.net.provider.ProviderId; import org.onlab.packet.IPAddress; import org.onlab.packet.MACAddress; +import org.onlab.packet.VLANID; import com.google.common.collect.HashMultimap; import com.google.common.collect.ImmutableSet; @@ -149,10 +150,10 @@ * @param vlanId vlan id * @return set of hosts in the vlan */ - Set<Host> getHosts(long vlanId) { + Set<Host> getHosts(VLANID vlanId) { Set<Host> vlanset = new HashSet<Host>(); for (Host h : hosts.values()) { - if (h.vlan() == vlanId) { + if (h.vlan().equals(vlanId)) { vlanset.add(h); } }