diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/topo/UiTopoLayoutManager.java b/web/gui/src/main/java/org/onosproject/ui/impl/topo/UiTopoLayoutManager.java index cdd95cfcba..9f92383eb1 100644 --- a/web/gui/src/main/java/org/onosproject/ui/impl/topo/UiTopoLayoutManager.java +++ b/web/gui/src/main/java/org/onosproject/ui/impl/topo/UiTopoLayoutManager.java @@ -136,8 +136,9 @@ public class UiTopoLayoutManager implements UiTopoLayoutService { UiTopoLayoutId parentId = layout.parent(); return layoutMap.values().stream() - // all layouts who are NOT me and who share my parent... + // all layouts who are NOT me (or root) and who share my parent... .filter(l -> !Objects.equals(l.id(), layoutId) && + !Objects.equals(l.id(), UiTopoLayoutId.DEFAULT_ID) && Objects.equals(l.parent(), parentId)) .collect(Collectors.toSet()); } diff --git a/web/gui/src/main/webapp/app/view/topoX/topoX.css b/web/gui/src/main/webapp/app/view/topoX/topoX.css index 3cb0514404..938e03d4d8 100644 --- a/web/gui/src/main/webapp/app/view/topoX/topoX.css +++ b/web/gui/src/main/webapp/app/view/topoX/topoX.css @@ -16,7 +16,7 @@ /* - ONOS GUI -- Topology View (layout) -- CSS file + ONOS GUI -- Topology View (test layout) -- CSS file */ /* --- Base SVG Layer --- */ diff --git a/web/gui/src/main/webapp/app/view/topoX/topoX.html b/web/gui/src/main/webapp/app/view/topoX/topoX.html index c5747dd62c..472f571592 100644 --- a/web/gui/src/main/webapp/app/view/topoX/topoX.html +++ b/web/gui/src/main/webapp/app/view/topoX/topoX.html @@ -1,19 +1,3 @@ - -
diff --git a/web/gui/src/main/webapp/app/view/topoX/topoXForce.js b/web/gui/src/main/webapp/app/view/topoX/topoXForce.js index b2e5e875d4..3f515095fa 100644 --- a/web/gui/src/main/webapp/app/view/topoX/topoXForce.js +++ b/web/gui/src/main/webapp/app/view/topoX/topoXForce.js @@ -143,7 +143,19 @@ } function doTmpPeerRegions(data) { + var peerDiv = topdiv.select('.peers').select('div'); + rmP(peerDiv); + function logPeer(p) { + var o = peerDiv.append('p'), + id = p.id, + nt = p.nodeType; + o.text('[' + nt + '] id = ' + id); + } + + data.peers.forEach(function (p) { + logPeer(p); + }); } // ========================== Event Handlers