1208 Commits

Author SHA1 Message Date
Simon Hunt
239f09e2f9 Replace usage of .html(...) with .text(...) where possible;
Wrap input with fs.sanitize(...) where .html() must be used.

Change-Id: I39e20b6fb561b3a1801579ca6a86a5f94483e4a9
2017-05-19 14:48:42 +00:00
Simon Hunt
4a8de8263b Web UI: augment sanitize() function
to allow parameterized RE generation from evillist.

Change-Id: I0c41b973c1fdbac190d22806f08bb6fe107a7118
2017-05-18 00:45:51 +00:00
Simon Hunt
0fe05d6c80 Web UI: add sanitize() function to fn.js library.
Change-Id: I2d8fedf737dfaa86362b83edab57967888414088
2017-05-17 16:42:41 -07:00
Simon Hunt
ffbad3b10a ONOS-5784: Empty latitude/longitude in ONOS Web UI
- (part one)
- Enhanced HostManager to react to NetworkConfigEvents such that
     it applies annotations to relevant host instances from the
     config data.
- A little refactoring in DeviceManager.
- Updated topoModel.js to use updated field names latOrY/longOrX.

Change-Id: I06536a6b2279291ffe638549a80b56a9fe94f48a
(cherry picked from commit 78193fd06661a7fa524c8b3a8fa7ddb69d7437c9)
2017-05-17 01:35:57 +00:00
Simon Hunt
5b83ac2be4 ONOS-6415: NPE in Topo2Jsonifier
- check made for returned backing host being null.

Change-Id: Ib7df17c45d4b39a85662ec5e37dab4821da8225d
(cherry picked from commit 0a9b5a1c1d4f21a4426b1d2e62d1e951a38c2c04)
2017-05-16 23:50:19 +00:00
Ray Milkey
08b03a9ec8 Starting snapshot 1.11.0-SNAPSHOT
Change-Id: I5aa84e241545dace6192243c0079924ddf899404
2017-05-15 18:40:20 +00:00
Jian Li
70c460a4f5 Fix: Resolve MAC presentation issue caused by broken split method
Javascript's String.split() method is broken.
selArray[1] will not show the full MAC address, instead, it only
shows the first two digits of MAC which is not what we expected.

Change-Id: I4251fd4553d027ae7fb46daf95702bdacc8eeb1e
2017-05-15 02:34:37 +00:00
Simon Hunt
cf76a65add Topo2 - UiSynthLink aggregation in JSON structure.
- implemented aggregation of data

Change-Id: Ie54cd768c11a4e6345a541c3ba4b9992801cefdd
2017-05-12 18:28:36 -07:00
Simon Hunt
bf59db2631 Topo2 - UiSynthLink aggregation in JSON structure.
- augment UiLinkId with Type field
- preparing for new JSON structure in Topo2Jsonifier
- additional unit tests

Change-Id: Ib8628fc26f72c0369bf8358af905bc6a75e31397
2017-05-12 14:59:27 -07:00
Steven Burrows
10dd108f68 UI: Updated masthead styles so everything is properly aligned
Change-Id: Iaa594aaafd6edefa796e60d8ef1faaeba48064fa
2017-05-12 19:16:22 +00:00
Steven Burrows
2b29ca4414 Topo2: Updated collection to ignore models with the same Id
Change-Id: Ic2faadb76f865921092217bda0aac636349cc1af
2017-05-12 15:31:53 +00:00
Simon Hunt
05eba35690 ONOS-6259: Topo2 - Implement server-side highlighting model (WIP)
- Enhanced BiLink to allow a UiLinkId as its identifier.
- Corrected aggregation of traffic data for synthetic links in regions.
- Removed TrafficLink copy constructor (not needed).

Change-Id: Ia7d84f28ec69737e7474bfc100262b837effef73
2017-05-11 20:17:19 -07:00
Simon Hunt
cc2d7fc417 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
2017-05-11 17:42:04 -07:00
Simon Hunt
0ee20bf530 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
2017-05-11 18:24:02 +00:00
Thomas Vachuska
3bdfa77835 Fine-tuning the visuals in the Applications view.
Change-Id: I678364847767c09e65e6766a6eda407c8e1fe3ad
2017-05-10 18:33:42 -07:00
Simon Hunt
f01826c91d Fixed issue with canonicalization of link identifiers.
- added asId() to LinkKey
- BiLink.linkId() now returns LinkKey.asId()

Change-Id: Ie9069ca5302f09fca9e213ce33fa87bd8868e752
2017-05-09 17:28:24 -07:00
Andrea Campanella
b582df38ac OS-3 fixing exploit to upload malicious apps through UI rest APIs
Change-Id: Ia5f14b6667d7843a80cccb2794e3de5038eaa0be
2017-05-09 22:47:14 +00:00
Simon Hunt
0e16109409 ONOS-6259: Topo2 - Implement server-side highlighting model
- NOTE: Still WIP
- Implement doAggregation() in Traffic2Monitor.
- Plumb through call to get relevantSynthLinks().
- Create UiLinkId from LinkKey.
- Add reference to original UiLink in the UiSynthLink, (so we can use as a key later).
- TrafficLink enhancements:
-- Implement equals/hashCode
-- add a copy constructor
-- add mergeStats() method
-- add stats accessor methods

Change-Id: I693626971b3511b842e80cee7fcd2a252087597f
2017-05-09 17:56:11 +00:00
Steven Burrows
ca1a39c5d1 Topo2: Implemented Link Labels
JIRA-Tasks; ONOS-6387

Change-Id: I6d0292846349d73d6d274ae806d14736b2d3eb7c
2017-05-09 10:34:13 -07:00
Simon Hunt
8e258116dc ONOS-6259: Topo2 - Implement server-side highlighting model
- Generated highlights message now sent back to the client
  with the event id "topo2Highlights".

Change-Id: I873ebd38a0636a7d9b5c2a6caf98c6b33de2cc87
2017-05-05 13:19:16 -07:00
Simon Hunt
f27a929fbb ONOS-6372: Topo2 - Refactor "location" data to be consistent
- consistently labeled fields "locType", "latOrY", "longOrX"
- simplified code in topo2NodePosition.js

Change-Id: I73e8daadcc3e6ca3ff45f7f60e7b372ccfd8b045
2017-05-05 18:30:03 +00:00
Steven Burrows
cdf6b33e3e Topo: Suppress lat and long in details panel if null
JIRA Tasks; ONOS-6328

Change-Id: I3dcf1e28c3150c01dd4f50c9e5bc0f91bec45de6
2017-05-05 17:21:42 +00:00
Simon Hunt
2d7cd6fc33 ONOS-6259: Topo2 - Implement server-side highlighting model
- (Still WIP)
- Cleaned up createHandlersAndOverlays() in UiWebSocket.
- Augmented handlerCrossConnects to link Topo2MH to Topo2TrafficMH.
- Topo2Stop event now shuts down background traffic monitoring.

Change-Id: I87e7151ea813b7514521201ecffcf2c9eed22cd7
2017-05-05 00:37:07 +00:00
Simon Hunt
a7aea849c6 ONOS-6259: Topo2 - Implement server-side highlighting model
- (Still WIP)
- refactored trafficSummary() and related methods up into superclass
- introduced hook method for link aggregation

Change-Id: I0a993bbc5ba5f0e861214f8d06877dad3f7bc8ee
2017-05-04 16:41:03 +00:00
Simon Hunt
9e2413e4f3 ONOS-6259: Topo2 - Implement server-side highlighting model
- wiring in Traffic2Monitor calls
- added utility script to dynamically set debug level on Topo2 classes

Change-Id: Ie727de39739729e1c240ca0484ed08f020546dae
2017-05-03 23:56:58 +00:00
Simon Hunt
1911fe487e GUI - Topologies - refactoring of ServicesBundle.
Jira: ONOS-6259
 - also fixed bug where edge links were being omitted.

Change-Id: I19ac83d09ce7930de7a927fb2754e0c5004705f2
2017-05-03 17:47:19 +00:00
Ray Milkey
8fd28c7b80 Starting snapshot 1.10.0-SNAPSHOT 2017-05-02 14:37:34 -07:00
Ray Milkey
f0099022d2 Tagging 1.10.0-rc1 2017-05-02 14:35:27 -07:00
Simon Hunt
4b4d2d9344 Web UI framework README's - added skeletons for remaining Util services.
Change-Id: Id60ff50f8f702559f79e71f7caa3ad28ddf65c12
2017-05-01 18:54:15 -07:00
Simon Hunt
37cd451a16 Moved and updated Web UI framework function service README.
Change-Id: I6fb2bd4945ad61e5c2893e9799fa27e2d7fff31a
2017-05-01 17:57:27 -07:00
Steven Burrows
ad74af804c Topo2: Implement Link Labels
JIRA Tasks; ONOS-6263

Change-Id: If0304d90e1f5d5b3aff0332271c8e9a1b3b30b38
2017-04-28 19:57:31 +00:00
Steven Burrows
4a1b5531dc Topo2: Place peer regions in their configured locations
JIRA Tasks; ONOS-6257

Change-Id: Ifd6133c1c9ac7f4f7ea5dee54fd38f1ea3382c8b
2017-04-28 16:15:14 +00:00
Steven Burrows
2b15ae776c Bug fix: Drag threshold was prevent drag events when zoomed in
JIRA Tasks; ONOS-6261

Change-Id: I4165649404562054b5ae38b7c0c4e818c2b9dd66
2017-04-28 16:07:55 +00:00
Simon Hunt
e6f6461ea9 ONOS-6258: UiTopo2Overlay et al.
- Added Topo2TrafficMessageHandler
- Wired topo2 traffic overlay into topo2 view

Change-Id: I2b67af6abc10f737b8d3183d219d8c651bf57e31
2017-04-28 16:07:10 +00:00
Simon Hunt
6cc8645f93 ONOS-6258: UiTopo2Overlay et al.
- revert DriverMatrix app.
- simplify overlay base class to be consistent with classic topo
- add topo2overlay and topo2traffic (skeleton code for now)

Change-Id: I88fda4d7b75807bd08637d846a869846a364c1f8
2017-04-28 06:59:42 +00:00
Simon Hunt
22c35df758 ONOS-6258: UiTopo2Overlay et al.
- initial support for topo-2 highlighting.

Change-Id: I71c61b902047153ea420a8b2ecd89f6950daa4a9
2017-04-26 17:35:40 -07:00
Steven Burrows
6a4febe416 Topo2: Refactored NavigateToRegion events
There was duplicated logic in Topo2Breadcrumb|SubRegion|PeerRegion. This has been refactored out so
all the logic for navigating to a new region is handled in a single place (Topo2RegionNavigationService).

Topo2RegionNavigationService is a pub/sub class. There are two reasons for this choice;
1. Topo2Layout needs to create the new force layout simulation for the region that is about to enter.   Then it creates a transition between the old and new.
2. This will allow application developers to hook into the region:navigation event incase they need
   to update the topology for the new region displayed.

Change-Id: Ie8dad531b50afe2e4735086395c1285fb982122e
2017-04-26 18:29:52 +00:00
Simon Hunt
8f60ff8dcd ONOS-6257: fixing Region-peer-location function...
- corrected UiRegion.isRoot() implementation
- added to/from-compact-strings for LayoutLocation, so we can encode
   a list of them in an annotation
- Fixed bug in DistributedRegionStore which was emiting events that
   had a null region as subject.

Change-Id: I547e0c7f62385b85b191b8d63e6b569196623b84
2017-04-26 16:42:59 +00:00
Simon Hunt
e51a5e9f8d Start of client-side Framework Library documentation.
Change-Id: I503c0613db97fb181f9e97847bcca0b6ace564c2
2017-04-21 10:57:30 -07:00
Steven Burrows
9ce0e40b9a Topo2: Update multilink positions when scaling
JIRA Tasks; ONOS-6340

Change-Id: I0be48bddd179984179a90107bfe5b7bf062e2ab9
2017-04-21 15:07:38 +00:00
Marc De Leenheer
20913c6646 Adding visual mapping of packet to optical path.
Change-Id: Id75830a4361e4c50dab205c66761c116323aa984
2017-04-21 02:12:18 +00:00
Steven Burrows
0bc6665649 Topo2: Enhanced link width uses scale to set the width
Change-Id: I80ba00bfc1e2a238ef593de0d99dd6552c5041c5
2017-04-20 13:14:57 -04:00
Simon Hunt
12ea220b8a More work on UI documentation.
Change-Id: I0c1085d62f74f89db2cf6589861386b26bf4a709
2017-04-19 15:58:24 -07:00
Simon Hunt
8019e6f318 Packet Processors table view should NOT be sortable.
Table entries should be listed in the order that packets are
processed.

Change-Id: Icb7098b0f84afeff95739e1f531133c522a35fa5
2017-04-19 14:54:15 -07:00
Simon Hunt
965eeecab9 GUI README's: Add links to wiki pages.
Change-Id: I504f90f9cd8df9c1b4c2c5bc2c8eb443158f72f9
2017-04-19 20:01:38 +00:00
Simon Hunt
9bb0fc0421 Initial draft of GUI user documentation under revision control.
Change-Id: I64eafd8e9129db3ac4d92145a1275bc5c00cfe7d
2017-04-18 23:27:13 -07:00
Steven Burrows
c64d1b2235 Topo2: Improved node scaling performance
Originally the scale was being applied to all the child elements
of the node SVG. By grouping all the elements (label, icon, text, etc..)
into 1 group we can reduce the amount of 'redraw' events fired by 75%

- Label elements are grouped
- Icon elements are group

Change-Id: I7f7033174d70431ba9beb26dfe86d022a24cf048
2017-04-17 23:43:07 +00:00
Steven Burrows
25fa1dcd8c Topo2: Improved extensibility of Collections
Change-Id: I07f48e8d4bb74e4ebee78690ac2b102609c4f16d
2017-04-17 18:29:22 -04:00
Thomas Vachuska
8c0b18a2ef Added region-based filtering for the GUI to make sure only the relevant
events get sent to the session.

Change-Id: I649eb1b33fdf9ed4b82e29d7ba7eb3cfac5eadbb
2017-04-17 18:49:45 +00:00
Thomas Vachuska
b877a6fd6d Modified UI model objects to be backed merely by IDs of the core model objects.
Change-Id: I4ca81fb1c877ee4ce4209d405fd8c6645c8f5d20
2017-04-14 18:51:45 +00:00