rename topology related objects: Device -> Host
- KVDevice to be renamed later.
- Use fully qualified name for topology's Host. (HostManager.java)
Change-Id: I1538f96d7ca93ca2197d23e5a69b85d284611412
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);
diff --git a/src/test/java/net/onrc/onos/core/intent/runtime/UseCaseTest.java b/src/test/java/net/onrc/onos/core/intent/runtime/UseCaseTest.java
index 08150ec..b7de7b0 100644
--- a/src/test/java/net/onrc/onos/core/intent/runtime/UseCaseTest.java
+++ b/src/test/java/net/onrc/onos/core/intent/runtime/UseCaseTest.java
@@ -29,7 +29,7 @@
import net.onrc.onos.core.intent.ShortestPathIntent;
import net.onrc.onos.core.intent.runtime.web.IntentWebRoutable;
import net.onrc.onos.core.registry.IControllerRegistryService;
-import net.onrc.onos.core.topology.DeviceEvent;
+import net.onrc.onos.core.topology.HostEvent;
import net.onrc.onos.core.topology.ITopologyListener;
import net.onrc.onos.core.topology.ITopologyService;
import net.onrc.onos.core.topology.LinkEvent;
@@ -231,8 +231,8 @@
List<PortEvent> removedPortEvents = new LinkedList<>();
List<LinkEvent> addedLinkEvents = new LinkedList<>();
List<LinkEvent> removedLinkEvents = new LinkedList<>();
- List<DeviceEvent> addedDeviceEvents = new LinkedList<>();
- List<DeviceEvent> removedDeviceEvents = new LinkedList<>();
+ List<HostEvent> addedHostEvents = new LinkedList<>();
+ List<HostEvent> removedHostEvents = new LinkedList<>();
TopologyEvents topologyEvents;
// create shortest path intents
@@ -283,8 +283,8 @@
removedPortEvents,
addedLinkEvents,
removedLinkEvents,
- addedDeviceEvents,
- removedDeviceEvents);
+ addedHostEvents,
+ removedHostEvents);
runtime1.topologyEvents(topologyEvents);
System.out.println("*** Link goes down. ***");
@@ -317,8 +317,8 @@
removedPortEvents,
addedLinkEvents,
removedLinkEvents,
- addedDeviceEvents,
- removedDeviceEvents);
+ addedHostEvents,
+ removedHostEvents);
runtime1.topologyEvents(topologyEvents);
System.out.println("*** Link goes up. ***");