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/main/java/net/onrc/onos/core/topology/web/DevicesResource.java b/src/main/java/net/onrc/onos/core/topology/web/HostsResource.java
similarity index 88%
rename from src/main/java/net/onrc/onos/core/topology/web/DevicesResource.java
rename to src/main/java/net/onrc/onos/core/topology/web/HostsResource.java
index ef5f4a3..301fb9e 100644
--- a/src/main/java/net/onrc/onos/core/topology/web/DevicesResource.java
+++ b/src/main/java/net/onrc/onos/core/topology/web/HostsResource.java
@@ -11,7 +11,7 @@
/**
* A class to access hosts information from the network topology.
*/
-public class DevicesResource extends ServerResource {
+public class HostsResource extends ServerResource {
/**
* Gets the hosts information from the network topology.
*
@@ -27,7 +27,7 @@
Topology topology = topologyService.getTopology();
topology.acquireReadLock();
try {
- return eval(toRepresentation(topology.getDevices(), null));
+ return eval(toRepresentation(topology.getHosts(), null));
} finally {
topology.releaseReadLock();
}
diff --git a/src/main/java/net/onrc/onos/core/topology/web/TopologyWebRoutable.java b/src/main/java/net/onrc/onos/core/topology/web/TopologyWebRoutable.java
index 1f224d2..88085ef 100644
--- a/src/main/java/net/onrc/onos/core/topology/web/TopologyWebRoutable.java
+++ b/src/main/java/net/onrc/onos/core/topology/web/TopologyWebRoutable.java
@@ -18,7 +18,7 @@
// Topology API
router.attach("", TopologyResource.class);
- router.attach("/hosts", DevicesResource.class);
+ router.attach("/hosts", HostsResource.class);
router.attach("/links", LinksResource.class);
router.attach("/switches", SwitchesResource.class);
diff --git a/src/main/java/net/onrc/onos/core/topology/web/serializers/DeviceEventSerializer.java b/src/main/java/net/onrc/onos/core/topology/web/serializers/HostEventSerializer.java
similarity index 64%
rename from src/main/java/net/onrc/onos/core/topology/web/serializers/DeviceEventSerializer.java
rename to src/main/java/net/onrc/onos/core/topology/web/serializers/HostEventSerializer.java
index 4ced3c3..eefb4eb 100644
--- a/src/main/java/net/onrc/onos/core/topology/web/serializers/DeviceEventSerializer.java
+++ b/src/main/java/net/onrc/onos/core/topology/web/serializers/HostEventSerializer.java
@@ -2,7 +2,7 @@
import java.io.IOException;
-import net.onrc.onos.core.topology.DeviceEvent;
+import net.onrc.onos.core.topology.HostEvent;
import net.onrc.onos.core.topology.TopologyElement;
import net.onrc.onos.core.util.SwitchPort;
@@ -10,28 +10,28 @@
import org.codehaus.jackson.map.SerializerProvider;
import org.codehaus.jackson.map.ser.std.SerializerBase;
-public class DeviceEventSerializer extends SerializerBase<DeviceEvent> {
+public class HostEventSerializer extends SerializerBase<HostEvent> {
- public DeviceEventSerializer() {
- super(DeviceEvent.class);
+ public HostEventSerializer() {
+ super(HostEvent.class);
}
@Override
- public void serialize(DeviceEvent deviceEvent, JsonGenerator jsonGenerator,
+ public void serialize(HostEvent hostEvent, JsonGenerator jsonGenerator,
SerializerProvider serializerProvider) throws IOException {
//
// TODO: For now, the JSON format of the serialized output should
- // be same as the JSON format of the corresponding class Device.
+ // be same as the JSON format of the corresponding class Host.
// In the future, we will use a single serializer.
//
jsonGenerator.writeStartObject();
- jsonGenerator.writeStringField(TopologyElement.TYPE, deviceEvent.getType());
- jsonGenerator.writeStringField("mac", deviceEvent.getMac().toString());
+ jsonGenerator.writeStringField(TopologyElement.TYPE, hostEvent.getType());
+ jsonGenerator.writeStringField("mac", hostEvent.getMac().toString());
jsonGenerator.writeFieldName("attachmentPoints");
jsonGenerator.writeStartArray();
- for (SwitchPort switchPort : deviceEvent.getAttachmentPoints()) {
+ for (SwitchPort switchPort : hostEvent.getAttachmentPoints()) {
jsonGenerator.writeObject(switchPort);
}
jsonGenerator.writeEndArray();
diff --git a/src/main/java/net/onrc/onos/core/topology/web/serializers/DeviceSerializer.java b/src/main/java/net/onrc/onos/core/topology/web/serializers/HostSerializer.java
similarity index 67%
rename from src/main/java/net/onrc/onos/core/topology/web/serializers/DeviceSerializer.java
rename to src/main/java/net/onrc/onos/core/topology/web/serializers/HostSerializer.java
index 1445787..c706f26 100644
--- a/src/main/java/net/onrc/onos/core/topology/web/serializers/DeviceSerializer.java
+++ b/src/main/java/net/onrc/onos/core/topology/web/serializers/HostSerializer.java
@@ -2,7 +2,7 @@
import java.io.IOException;
-import net.onrc.onos.core.topology.Device;
+import net.onrc.onos.core.topology.Host;
import net.onrc.onos.core.topology.Port;
import net.onrc.onos.core.topology.TopologyElement;
@@ -10,28 +10,28 @@
import org.codehaus.jackson.map.SerializerProvider;
import org.codehaus.jackson.map.ser.std.SerializerBase;
-public class DeviceSerializer extends SerializerBase<Device> {
+public class HostSerializer extends SerializerBase<Host> {
- public DeviceSerializer() {
- super(Device.class);
+ public HostSerializer() {
+ super(Host.class);
}
@Override
- public void serialize(Device dev, JsonGenerator jsonGenerator,
+ public void serialize(Host host, JsonGenerator jsonGenerator,
SerializerProvider serializerProvider) throws IOException {
//
// TODO: For now, the JSON format of the serialized output should
- // be same as the JSON format of the corresponding class DeviceEvent.
+ // be same as the JSON format of the corresponding class HostEvent.
// In the future, we will use a single serializer.
//
jsonGenerator.writeStartObject();
- jsonGenerator.writeStringField(TopologyElement.TYPE, dev.getType());
- jsonGenerator.writeStringField("mac", dev.getMacAddress().toString());
+ jsonGenerator.writeStringField(TopologyElement.TYPE, host.getType());
+ jsonGenerator.writeStringField("mac", host.getMacAddress().toString());
jsonGenerator.writeFieldName("attachmentPoints");
jsonGenerator.writeStartArray();
- for (Port port : dev.getAttachmentPoints()) {
+ for (Port port : host.getAttachmentPoints()) {
jsonGenerator.writeObject(port.asSwitchPort());
}
jsonGenerator.writeEndArray();
diff --git a/src/main/java/net/onrc/onos/core/topology/web/serializers/TopologyEventsSerializer.java b/src/main/java/net/onrc/onos/core/topology/web/serializers/TopologyEventsSerializer.java
index e5f81c0..713969b 100644
--- a/src/main/java/net/onrc/onos/core/topology/web/serializers/TopologyEventsSerializer.java
+++ b/src/main/java/net/onrc/onos/core/topology/web/serializers/TopologyEventsSerializer.java
@@ -1,6 +1,6 @@
package net.onrc.onos.core.topology.web.serializers;
-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.PortEvent;
import net.onrc.onos.core.topology.SwitchEvent;
@@ -87,14 +87,14 @@
// Output the added hosts array
jsonGenerator.writeArrayFieldStart("addedHosts");
- for (final DeviceEvent hostEvent : topologyEvents.getAddedHostEvents()) {
+ for (final HostEvent hostEvent : topologyEvents.getAddedHostEvents()) {
jsonGenerator.writeObject(hostEvent);
}
jsonGenerator.writeEndArray();
// Output the removed hosts array
jsonGenerator.writeArrayFieldStart("removedHosts");
- for (final DeviceEvent hostEvent : topologyEvents.getRemovedHostEvents()) {
+ for (final HostEvent hostEvent : topologyEvents.getRemovedHostEvents()) {
jsonGenerator.writeObject(hostEvent);
}
jsonGenerator.writeEndArray();
diff --git a/src/main/java/net/onrc/onos/core/topology/web/serializers/TopologySerializer.java b/src/main/java/net/onrc/onos/core/topology/web/serializers/TopologySerializer.java
index 48a5cfc..db3bdeb 100644
--- a/src/main/java/net/onrc/onos/core/topology/web/serializers/TopologySerializer.java
+++ b/src/main/java/net/onrc/onos/core/topology/web/serializers/TopologySerializer.java
@@ -1,6 +1,6 @@
package net.onrc.onos.core.topology.web.serializers;
-import net.onrc.onos.core.topology.Device;
+import net.onrc.onos.core.topology.Host;
import net.onrc.onos.core.topology.Link;
import net.onrc.onos.core.topology.Switch;
import net.onrc.onos.core.topology.Topology;
@@ -57,8 +57,8 @@
// Output the hosts array
jsonGenerator.writeArrayFieldStart("hosts");
- for (final Device device : topology.getDevices()) {
- jsonGenerator.writeObject(device);
+ for (final Host host : topology.getHosts()) {
+ jsonGenerator.writeObject(host);
}
jsonGenerator.writeEndArray();