ONOS-6259: Topo2 - Implement server-side highlighting model (WIP)
- added locType parameter to region-add command
- created RegionABC sample topology
- fixed possible NPE in Topo2Jsonifier.jsonClosedRegion()
- added "plain" sprite layout
- check for undefined sprite layout and log a warning
- updated logger.sh script
- fixed Topo2Model to have a reference to colleciton before initialization
Change-Id: Ie6af28516338f5d64576bf465373cb5df3dff52c
diff --git a/web/gui/src/main/webapp/app/fw/svg/sprite.js b/web/gui/src/main/webapp/app/fw/svg/sprite.js
index 6eafe66..b64f58d 100644
--- a/web/gui/src/main/webapp/app/fw/svg/sprite.js
+++ b/web/gui/src/main/webapp/app/fw/svg/sprite.js
@@ -215,9 +215,9 @@
// Returns a layout "builder", which can be used to programmatically
// define a layout.
- function createLayout(id, w, h, grid) {
- $log.debug('createLayout:', id, w, 'x', h, '(grid=' + grid + ')');
- return layoutBuilder(id, w, h, grid);
+ function createLayout(id, w, h, opts) {
+ $log.debug('createLayout:', id, w, 'x', h, '(opts:', opts, ')');
+ return layoutBuilder(id, w, h, opts);
}
// Registers a sprite defined by the given object (JSON structure).
diff --git a/web/gui/src/main/webapp/app/fw/svg/spriteData.js b/web/gui/src/main/webapp/app/fw/svg/spriteData.js
index 1625a46..d970af9 100644
--- a/web/gui/src/main/webapp/app/fw/svg/spriteData.js
+++ b/web/gui/src/main/webapp/app/fw/svg/spriteData.js
@@ -77,6 +77,9 @@
.addLabel('Segment Routing 2', 120, 10, {anchor: 'right'})
.register();
+ ssApi.createLayout('plain', 80, 60)
+ .register();
+
ssApi.dump();
// ----------------------------------------------------------$$$
}