Topo2: Add grid (x,y) option to null-provider devices and hosts (and basic element config).
Change-Id: Ia9eed66bda03174a6986d07fec40eb2a8f7728e3
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/topo/Topo2Jsonifier.java b/web/gui/src/main/java/org/onosproject/ui/impl/topo/Topo2Jsonifier.java
index 6234391..8db72aa 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/topo/Topo2Jsonifier.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/topo/Topo2Jsonifier.java
@@ -364,6 +364,7 @@
}
}
+ // FIXME: need to handle geo vs. grid location...
private void addGeoLocation(ObjectNode node, Annotated a) {
List<String> lngLat = getAnnotValues(a, LONGITUDE, LATITUDE);
if (lngLat != null) {
diff --git a/web/gui/src/main/webapp/app/view/topo2/topo2Region.js b/web/gui/src/main/webapp/app/view/topo2/topo2Region.js
index 5fa2390..929f1c9 100644
--- a/web/gui/src/main/webapp/app/view/topo2/topo2Region.js
+++ b/web/gui/src/main/webapp/app/view/topo2/topo2Region.js
@@ -183,7 +183,7 @@
if (event.memo === 'added') {
device = this.model.get('devices').add(event.data);
- $log('Added device', device)
+ $log.debug('Added device', device);
} else if (event.memo === 'updated') {
device = this.getDevice(event.subject);
device.set(event.data);