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/topology/TopologyManagerTest.java b/src/test/java/net/onrc/onos/core/topology/TopologyManagerTest.java
index 597f534..e4f6c8c 100644
--- a/src/test/java/net/onrc/onos/core/topology/TopologyManagerTest.java
+++ b/src/test/java/net/onrc/onos/core/topology/TopologyManagerTest.java
@@ -82,12 +82,12 @@
anyObject(PortEvent.class)))
.andReturn(true).anyTimes();
- expect(dataStoreService.addDevice(
- anyObject(DeviceEvent.class)))
+ expect(dataStoreService.addHost(
+ anyObject(HostEvent.class)))
.andReturn(true).anyTimes();
- expect(dataStoreService.removeDevice(
- anyObject(DeviceEvent.class)))
+ expect(dataStoreService.removeHost(
+ anyObject(HostEvent.class)))
.andReturn(true).anyTimes();
expect(dataStoreService.addLink(
@@ -210,11 +210,11 @@
SwitchPort sp = new SwitchPort(swDPId, portId);
List<SwitchPort> spLists = new ArrayList<SwitchPort>();
spLists.add(sp);
- DeviceEvent deviceEvent = new DeviceEvent(devMac);
- deviceEvent.setAttachmentPoints(spLists);
+ HostEvent hostEvent = new HostEvent(devMac);
+ hostEvent.setAttachmentPoints(spLists);
// Call the topologyManager function for adding a device
- theTopologyManager.putDeviceDiscoveryEvent(deviceEvent);
+ theTopologyManager.putHostDiscoveryEvent(hostEvent);
// Verify the function calls
verify(eventChannel);
@@ -240,11 +240,11 @@
SwitchPort sp = new SwitchPort(swDPId, portId);
List<SwitchPort> spLists = new ArrayList<SwitchPort>();
spLists.add(sp);
- DeviceEvent deviceEvent = new DeviceEvent(devMac);
- deviceEvent.setAttachmentPoints(spLists);
+ HostEvent hostEvent = new HostEvent(devMac);
+ hostEvent.setAttachmentPoints(spLists);
// Call the topologyManager function for removing a device
- theTopologyManager.removeDeviceDiscoveryEvent(deviceEvent);
+ theTopologyManager.removeHostDiscoveryEvent(hostEvent);
// Verify the function calls
verify(eventChannel);