commit bfc77f09ab5841b838850ab4e2eefb4e4d52d124
author Yuta HIGUCHI <y-higuchi@onlab.us> Mon Jul 14 22:50:25 2014 -0700
committer Yuta HIGUCHI <y-higuchi@onlab.us> Thu Jul 17 10:54:54 2014 -0700
tree 11738a2163161b1ef02ebfe3847a32e3efdb65e8
parent 79649d9d318de012bc1059d33df392c5845e1339

rename topology related objects: Device -> Host

- KVDevice to be renamed later.
- Use fully qualified name for topology's Host. (HostManager.java)

Change-Id: I1538f96d7ca93ca2197d23e5a69b85d284611412

src/main/java/net/onrc/onos/core/hostmanager/HostManager.java

diff --git a/src/main/java/net/onrc/onos/core/hostmanager/HostManager.java b/src/main/java/net/onrc/onos/core/hostmanager/HostManager.java
index 9e62bd9..fd34519 100644
--- a/src/main/java/net/onrc/onos/core/hostmanager/HostManager.java
+++ b/src/main/java/net/onrc/onos/core/hostmanager/HostManager.java
@@ -24,7 +24,6 @@
 import net.floodlightcontroller.core.module.IFloodlightService;
 import net.floodlightcontroller.util.MACAddress;
 import net.onrc.onos.core.packet.Ethernet;
-import net.onrc.onos.core.topology.Device;
 import net.onrc.onos.core.topology.ITopologyService;
 import net.onrc.onos.core.topology.Port;
 import net.onrc.onos.core.topology.Topology;
@@ -172,8 +171,8 @@
             log.debug("called HostCleaner");
             topology.acquireReadLock();
             try {
-                Set<Device> deleteSet = new HashSet<Device>();
-                for (Device host : topology.getDevices()) {
+                Set<net.onrc.onos.core.topology.Host> deleteSet = new HashSet<>();
+                for (net.onrc.onos.core.topology.Host host : topology.getHosts()) {
                     long now = System.currentTimeMillis();
                     if ((now - host.getLastSeenTime() > agingMillisecConfig)) {
                         if (log.isTraceEnabled()) {
@@ -184,7 +183,7 @@
                     }
                 }
 
-                for (Device host : deleteSet) {
+                for (net.onrc.onos.core.topology.Host host : deleteSet) {
                     deleteHostByMac(host.getMacAddress());
                 }
             } catch (Exception e) {
@@ -277,7 +276,7 @@
         Host deleteHost = null;
         topology.acquireReadLock();
         try {
-            Device host = topology.getDeviceByMac(mac);
+            net.onrc.onos.core.topology.Host host = topology.getHostByMac(mac);
 
             for (Port switchPort : host.getAttachmentPoints()) {
                 // We don't handle vlan now and multiple attachment points.