ONOS-6259: Topo2 - Implement server-side highlighting model (WIP)
- added missing 'grid' parameter in config script.
- fixed handling of peer region locations.
Change-Id: I4cd8d4db49cfde105424ca786c3fed181afbe7b7
diff --git a/tools/test/topos/regionabc.sh b/tools/test/topos/regionabc.sh
index 64e205a..3b16117 100755
--- a/tools/test/topos/regionabc.sh
+++ b/tools/test/topos/regionabc.sh
@@ -23,14 +23,14 @@
region-add rC "Region C" LOGICAL_GROUP 30 60 grid ${host}
# -- set peer locations
-region-add-peer-loc rA rB 40 70
-region-add-peer-loc rA rC 50 70
+region-add-peer-loc rA rB 40 70 grid
+region-add-peer-loc rA rC 50 70 grid
-region-add-peer-loc rB rA 30 10
-region-add-peer-loc rB rC 30 70
+region-add-peer-loc rB rA 30 10 grid
+region-add-peer-loc rB rC 30 70 grid
-region-add-peer-loc rC rA 10 10
-region-add-peer-loc rC rB 20 10
+region-add-peer-loc rC rA 10 10 grid
+region-add-peer-loc rC rB 20 10 grid
EOF
diff --git a/web/gui/src/main/webapp/app/view/topo2/topo2NodePosition.js b/web/gui/src/main/webapp/app/view/topo2/topo2NodePosition.js
index 7c96cad..8889168 100644
--- a/web/gui/src/main/webapp/app/view/topo2/topo2NodePosition.js
+++ b/web/gui/src/main/webapp/app/view/topo2/topo2NodePosition.js
@@ -66,10 +66,15 @@
}
// assumed to be grid
- var loc = {
- longOrX: -20,
- latOrY: 10 * node.index()
- };
+ var loc = node.get('location');
+
+ // fallback to default placement if not defined.
+ if (!loc.latOrY && !loc.longOrX) {
+ loc = {
+ longOrX: -20,
+ latOrY: 10 * node.index()
+ };
+ }
setElCoord(node, coordFromXY(loc));
return;