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/test/java/net/onrc/onos/core/intent/runtime/PathCalcRuntimeModuleTest.java

diff --git a/src/test/java/net/onrc/onos/core/intent/runtime/PathCalcRuntimeModuleTest.java b/src/test/java/net/onrc/onos/core/intent/runtime/PathCalcRuntimeModuleTest.java
index 76ef3b0..119acc6 100644
--- a/src/test/java/net/onrc/onos/core/intent/runtime/PathCalcRuntimeModuleTest.java
+++ b/src/test/java/net/onrc/onos/core/intent/runtime/PathCalcRuntimeModuleTest.java
@@ -18,7 +18,7 @@
 import net.onrc.onos.core.intent.IntentOperation.Operator;
 import net.onrc.onos.core.intent.IntentOperationList;
 import net.onrc.onos.core.intent.ShortestPathIntent;
-import net.onrc.onos.core.topology.DeviceEvent;
+import net.onrc.onos.core.topology.HostEvent;
 import net.onrc.onos.core.topology.LinkEvent;
 import net.onrc.onos.core.topology.MockTopology;
 import net.onrc.onos.core.topology.PortEvent;
@@ -456,7 +456,7 @@
         //  Remove one of the links and check results
         final List<SwitchEvent> emptySwitchEvents = new LinkedList<>();
         final List<PortEvent> emptyPortEvents = new LinkedList<>();
-        final List<DeviceEvent> emptyDeviceEvents = new LinkedList<>();
+        final List<HostEvent> emptyHostEvents = new LinkedList<>();
         final List<LinkEvent> addedLinkEvents = new LinkedList<>();
         final List<LinkEvent> removedLinkEvents = new LinkedList<>();
         TopologyEvents topologyEvents;
@@ -478,8 +478,8 @@
                                             emptyPortEvents,
                                             addedLinkEvents,
                                             removedLinkEvents,
-                                            emptyDeviceEvents,
-                                            emptyDeviceEvents);
+                                            emptyHostEvents,
+                                            emptyHostEvents);
 
         runtime.topologyEvents(topologyEvents);
 
@@ -692,7 +692,7 @@
         //  Remove one of the links and check results
         final List<SwitchEvent> emptySwitchEvents = new LinkedList<>();
         final List<PortEvent> emptyPortEvents = new LinkedList<>();
-        final List<DeviceEvent> emptyDeviceEvents = new LinkedList<>();
+        final List<HostEvent> emptyHostEvents = new LinkedList<>();
         final List<LinkEvent> addedLinkEvents = new LinkedList<>();
         final List<LinkEvent> removedLinkEvents = new LinkedList<>();
         TopologyEvents topologyEvents;
@@ -714,8 +714,8 @@
                                             emptyPortEvents,
                                             addedLinkEvents,
                                             removedLinkEvents,
-                                            emptyDeviceEvents,
-                                            emptyDeviceEvents);
+                                            emptyHostEvents,
+                                            emptyHostEvents);
 
         runtime.topologyEvents(topologyEvents);
 
@@ -767,8 +767,8 @@
                                             emptyPortEvents,
                                             addedLinkEvents,
                                             removedLinkEvents,
-                                            emptyDeviceEvents,
-                                            emptyDeviceEvents);
+                                            emptyHostEvents,
+                                            emptyHostEvents);
 
         runtime.topologyEvents(topologyEvents);