Various gui & test script tweaks.
Change-Id: I62d8c560d4d533cd6d38ee9388a2a2e0400f51a2
diff --git a/web/api/src/main/java/org/onlab/onos/rest/ConfigResource.java b/web/api/src/main/java/org/onlab/onos/rest/ConfigResource.java
index 30fc51f..04e7836 100644
--- a/web/api/src/main/java/org/onlab/onos/rest/ConfigResource.java
+++ b/web/api/src/main/java/org/onlab/onos/rest/ConfigResource.java
@@ -55,7 +55,7 @@
new ConfigProvider(cfg, get(DeviceProviderRegistry.class),
get(LinkProviderRegistry.class),
get(HostProviderRegistry.class)).parse();
- return Response.ok(mapper.createObjectNode().toString()).build();
+ return Response.ok().build();
} catch (Exception e) {
log.error("Unable to parse topology configuration", e);
return Response.status(INTERNAL_SERVER_ERROR).entity(e.toString()).build();
diff --git a/web/gui/src/main/java/org/onlab/onos/gui/TopologyViewMessages.java b/web/gui/src/main/java/org/onlab/onos/gui/TopologyViewMessages.java
index fdf6caa..7a6a791 100644
--- a/web/gui/src/main/java/org/onlab/onos/gui/TopologyViewMessages.java
+++ b/web/gui/src/main/java/org/onlab/onos/gui/TopologyViewMessages.java
@@ -300,11 +300,10 @@
.put("master", master(device.id()));
// Generate labels: id, chassis id, no-label, optional-name
+ String name = device.annotations().value("name");
ArrayNode labels = mapper.createArrayNode();
+ labels.add(isNullOrEmpty(name) ? device.id().toString() : name);
labels.add(device.id().toString());
- labels.add(device.chassisId().toString());
- labels.add(""); // compact no-label view
- labels.add(device.annotations().value("name"));
// Add labels, props and stuff the payload into envelope.
payload.set("labels", labels);
@@ -340,7 +339,7 @@
String hostType = host.annotations().value("type");
ObjectNode payload = mapper.createObjectNode()
.put("id", host.id().toString())
- .put("type", isNullOrEmpty(hostType) ? "host" : hostType)
+ .put("type", isNullOrEmpty(hostType) ? "endstation" : hostType)
.put("ingress", compactLinkString(edgeLink(host, true)))
.put("egress", compactLinkString(edgeLink(host, false)));
payload.set("cp", hostConnect(mapper, host.location()));