mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2025-10-17 02:11:38 +02:00
Code Issues Projects Releases Wiki Activity

Fix peer data (never include root region).

Browse Source 
- Display peer data on temp view.

Change-Id: I1ba662ec36669e13ab03030685dbc2c07a8f8a17
This commit is contained in:
Simon Hunt 2016-09-01 17:01:58 -07:00
parent 377f5d291f
commit e43cccebfd
4 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
web/gui/src/main/java/org/onosproject/ui/impl/topo/UiTopoLayoutManager.java
View File

@ -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());
}

2
web/gui/src/main/webapp/app/view/topoX/topoX.css
View File

@ -16,7 +16,7 @@
/*
ONOS GUI -- Topology View (layout) -- CSS file
ONOS GUI -- Topology View (test layout) -- CSS file
*/
/* --- Base SVG Layer --- */

16
web/gui/src/main/webapp/app/view/topoX/topoX.html
View File

@ -1,19 +1,3 @@
<!--
~ Copyright 2016-present Open Networking Laboratory
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<!-- Topology View partial HTML -->
<div id="ov-topoX">
<div id="topoXtmp">

12
web/gui/src/main/webapp/app/view/topoX/topoXForce.js
View File

@ -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