Renamed "devices" to "hosts" in the Topology REST API:
* REST call path rename:
http://%s:%s/wm/onos/topology/devices ->
http://%s:%s/wm/onos/topology/hosts
* Topology output JSON format: renamed field "devices" to "hosts".
OLD:
{
...
"devices": [...],
...
}
NEW:
{
...
"hosts": [...],
...
}
TODO in (a) separate commit(s):
* Renaming of "Device/Devices" and "device/devices" in the Java API
* Renaming of "Device/Devices" and "device/devices" in the backend
implementation
Change-Id: Ic70bf166f885a1a5ba7d8d33326ff43f84d2c506
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 8eb18d4..1f224d2 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("/devices", DevicesResource.class);
+ router.attach("/hosts", DevicesResource.class);
router.attach("/links", LinksResource.class);
router.attach("/switches", SwitchesResource.class);
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 0769805..48a5cfc 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
@@ -55,8 +55,8 @@
}
jsonGenerator.writeEndArray();
- // Output the devices array
- jsonGenerator.writeArrayFieldStart("devices");
+ // Output the hosts array
+ jsonGenerator.writeArrayFieldStart("hosts");
for (final Device device : topology.getDevices()) {
jsonGenerator.writeObject(device);
}