commit | 92b016b1c047904261e8572819aa5e74ddc44ee7 | [log] [tgz] |
---|---|---|
author | Thomas Vachuska <tom@onlab.us> | Fri May 20 11:37:57 2016 -0700 |
committer | Gerrit Code Review <gerrit@onlab.us> | Fri May 20 19:11:49 2016 +0000 |
tree | 41eb6cbd8d75bb83802cfa5a7f8f826c43cdba98 | |
parent | 94e8a16212196f984cd37816df2e89e2fc2c0b4b [diff] |
Enhanced layout service and hooked-in the ui topo session. Change-Id: I357143766deb3f0d697a3e7963a53968ccdf3bc8
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/topo/model/ModelCache.java b/web/gui/src/main/java/org/onosproject/ui/impl/topo/model/ModelCache.java index 19ab015..6566511 100644 --- a/web/gui/src/main/java/org/onosproject/ui/impl/topo/model/ModelCache.java +++ b/web/gui/src/main/java/org/onosproject/ui/impl/topo/model/ModelCache.java
@@ -224,7 +224,10 @@ } private void updateDevice(UiDevice device) { - device.setRegionId(services.region().getRegionForDevice(device.id()).id()); + Region regionForDevice = services.region().getRegionForDevice(device.id()); + if (regionForDevice != null) { + device.setRegionId(regionForDevice.id()); + } } private void loadDevices() {
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/topo/model/UiSharedTopologyModel.java b/web/gui/src/main/java/org/onosproject/ui/impl/topo/model/UiSharedTopologyModel.java index 7dca64e..7cb0ffc 100644 --- a/web/gui/src/main/java/org/onosproject/ui/impl/topo/model/UiSharedTopologyModel.java +++ b/web/gui/src/main/java/org/onosproject/ui/impl/topo/model/UiSharedTopologyModel.java
@@ -66,7 +66,7 @@ /** * Service that creates and maintains the UI-model of the network topology. */ -@Component(immediate = true, enabled = false) +@Component(immediate = true, enabled = true) @Service(value = UiSharedTopologyModel.class) public final class UiSharedTopologyModel extends AbstractListenerManager<UiModelEvent, UiModelListener> {