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/tools/test/topos/regions-bayarea.sh b/tools/test/topos/regions-bayarea.sh
index ae0ef10..f37373f 100755
--- a/tools/test/topos/regions-bayarea.sh
+++ b/tools/test/topos/regions-bayarea.sh
@@ -206,15 +206,16 @@
### Add regions and associate devices with them
#
-# region-add <region-id> <region-name> <region-type> <region-master>
+# region-add <region-id> <region-name> <region-type> \
+# <lat/Y> <long/X> <locType> <region-master>
# region-add-devices <region-id> <device-id>...
onos ${host} <<-EOF
-region-add c01 SanFrancisco DATA_CENTER 37.75394143914288 -122.45945851660800 ${host}
-region-add c02 PaloAlto DATA_CENTER 37.45466637790734 -122.21838933304870 ${host}
-region-add c03 SanJose DATA_CENTER 37.34425619809433 -121.94768095808017 ${host}
-region-add c04 Fremont DATA_CENTER 37.54328280574901 -122.01205548699211 ${host}
+region-add c01 SanFrancisco DATA_CENTER 37.75394143914288 -122.45945851660800 geo ${host}
+region-add c02 PaloAlto DATA_CENTER 37.45466637790734 -122.21838933304870 geo ${host}
+region-add c03 SanJose DATA_CENTER 37.34425619809433 -121.94768095808017 geo ${host}
+region-add c04 Fremont DATA_CENTER 37.54328280574901 -122.01205548699211 geo ${host}
region-add-devices c01 \
null:0000000000000001 \