567 Commits

Author SHA1 Message Date
Simon Hunt
7cd48f3620 GUI -- store ref to node/link selection in backing data.
- tweaking force-layout parameters; now host-to-host intent path is highlighted.
- injectTestEvent() now uses recursion to look for appropriate json files.
- implemented updateHost() event.
- some refactoring cleanup in topo2.js

Change-Id: I888f05032d3c9df6470bd4d2f399f61efb9dbd46
2014-11-10 00:56:05 -08:00
Thomas Vachuska
4830d390a9 Added server-side code to create host-to-host intent. Still WIP.
Change-Id: I80626aa9ecb38802ddca4be3bce3def85ccfdb88
2014-11-09 18:17:24 -08:00
Thomas Vachuska
db3695a73f Merge "GUI -- augmented hash parsing to include flags (after '?'), which are passed into view callbacks as a boolean map. - moved event test files into sub directories - prepared topo2.js for scenario choice via hash context and 'local' (and 'debug') flag. - added 'simple' scenario: 2 switches, 1 link, and 2 hosts. - augmented topo event dispatch for yet-to-be-implemented event handlers. - implemented addHost() event handler." 2014-11-09 15:40:44 -08:00
Simon Hunt
56d5185575 GUI -- augmented hash parsing to include flags (after '?'), which are passed into view callbacks as a boolean map.
- moved event test files into sub directories
 - prepared topo2.js for scenario choice via hash context and 'local' (and 'debug') flag.
 - added 'simple' scenario: 2 switches, 1 link, and 2 hosts.
 - augmented topo event dispatch for yet-to-be-implemented event handlers.
 - implemented addHost() event handler.

Change-Id: I06b032684fd4d5f85262d13d58ad10edae23b3ed
2014-11-09 15:24:49 -08:00
Thomas Vachuska
70c16adc2b Adding "id" to the link messages to the GUI.
Change-Id: I4ce4b7e4a643307cb05ead6c544a8531d516af4e
2014-11-09 11:20:35 -08:00
Thomas Vachuska
690e5f6286 Adding GUI server-side code.
Change-Id: Iaa8452a315762f9a57c5bdaec2de4ec60877d928
2014-11-09 10:00:52 -08:00
Simon Hunt
5f36d34be9 GUI -- Fixed empty or null label issue (cycle labels)
- use Math.floor on [x,y] coords sent to server.

Change-Id: I81940892cb11e14c207e0e153425513022cef669
2014-11-08 21:33:14 -08:00
Thomas Vachuska
65368e37d1 GUI -- Added global key bindings mechanism
- 'T' now toggles theme (light/dark) -- mast CSS done, other CSS to do
 - 'ESC' now closes alerts box if it is open
 - Minor cleanup to topo2.js

Change-Id: I506a6add4299a6c03dcb717c33394ad94be26997
2014-11-08 21:08:36 -08:00
Thomas Vachuska
d1be50de92 Adding multi-selection to the GUI and sketching out GUI/Server interactions.
Added persistent meta-data; including node coordinates.
Added ability to request path and return one.

Change-Id: I3edbdf44bbb8d8133a5e5a1fd0660a3fa5a2d6a1
2014-11-08 17:18:37 -08:00
Simon Hunt
50128c084f GUI -- Some cleanup in topo.js
Change-Id: Icee133a25d1638cdcc7be591ffc62fed4e3d9808
2014-11-08 13:36:15 -08:00
Thomas Vachuska
d472c6e0d7 Hooking up GUI server & client via web-socket.
Change-Id: If522a5f46de528f28bf09a985af40b140ef5abaa
2014-11-07 19:11:05 -08:00
Thomas Vachuska
7d638d3712 Initial sketch of the GUI web-socket mechanics.
Change-Id: I5f481886fd45ce058be4aaf07fba466e702ae7ad
2014-11-07 15:12:00 -08:00
Simon Hunt
1a9eff99ee GUI -- Test events: unpinned the first node; increased a few link widths.
- added alerts pane to framework.
 - added library registration mechanism to framework.
 - created d3Utils library
 - reimplemented drag behavior of nodes.

Change-Id: I501f4ab6eded8393948cede903573580599258b1
2014-11-07 12:21:36 -08:00
Simon Hunt
99c138497e GUI - reworked to allow for event-based topology building, in preparation for web-socket connection to the server.
- device nodes will enter in a fixed location, if metaUi data is included in the addDevice event.
 - device nodes now adjust their bounds to fit the text (and show an icon).
 - added cycle labels function (press the 'L' key).
 - links now appear with "transition" animation.
 NOTE: this is still WIP.

Change-Id: I3adbe9895e189e482316e86384dd53fd27781cd3
2014-11-07 07:37:47 -08:00
Simon Hunt
929f77b021 Set boolean to true for live data.
Change-Id: I5d13ddcd51e17e529db87480ba1671d57c53f164
2014-11-06 10:40:04 -08:00
Simon Hunt
2fe26ac426 test (added lines)
Change-Id: I9af9dceb5058d5d17c6943371d3c78e5d65ed65e
2014-11-06 10:07:25 -08:00
Simon Hunt
c7ee066102 GUI -- Major Work-In-Progress
- Added dataLoadError to view token.
- Restructured code, viz:
(1) svg and force layout initialized in preload callback
(2) load callback initializes topo rendering
(3) subsequent data loads modify topo rendering
2014-11-05 16:46:50 -08:00
Simon Hunt
934c3ce9ed GUI -- Simplified setRadio() api. Other minor cleanup. Added test topology data files. 2014-11-05 11:45:57 -08:00
Simon Hunt
a09b927829 GUI -- Removed out of date comment. 2014-11-04 23:01:07 -08:00
Simon Hunt
0df1b1d83c GUI -- Added key handler mechanism. 2014-11-04 22:58:55 -08:00
Simon Hunt
142d003abf GUI -- Starting migration of topology view to the updated framework. WIP. 2014-11-04 20:18:04 -08:00
Simon Hunt
db9eb07247 GUI -- Added sample view to demonstrate radio buttons. 2014-11-04 19:12:52 -08:00
Simon Hunt
8914d8bd8f GUI -- two module template flavors: DIV and SVG. 2014-11-04 19:12:52 -08:00
Simon Hunt
e7f4bb00f2 GUI -- Reworking sample view to be more interesting. 2014-11-04 15:52:00 -08:00
Simon Hunt
2524891f58 Restructuring GUI code - implementing view life-cycles.
Using sample views for now.
Still WIP.
2014-11-04 11:25:48 -08:00
Simon Hunt
195cb389fd Restructuring GUI code - first pass - WIP. 2014-11-03 17:50:51 -08:00
Simon Hunt
1bd9ccf510 Fixed cut'n'paste error in topo details response. 2014-11-03 13:59:19 -08:00
Simon Hunt
dc3fa083b1 Cleanup CSS 2014-10-31 08:44:55 -07:00
Simon Hunt
ac525757a6 Fixed bug whereby port labels did not fade in filtered views. 2014-10-31 08:38:27 -07:00
Thomas Vachuska
5f99849709 Fixed a defect in GUI details fly-out (it would not appear)
Adjusted L&F of the port labels
Suppressed using buffer-id in packet-out messages; we now always send data; cbench is much more steady now and I see no 0s!!!!
2014-10-31 00:46:11 -07:00
Simon Hunt
3c29c14284 Added port numbers to port labels. Still needs fine tuning, but good enough for the demo. 2014-10-30 21:31:55 -07:00
Simon Hunt
69a8d21d07 Adding port labels to links. WIP. 2014-10-30 17:57:45 -07:00
Simon Hunt
ee66e61638 Added 'B' keystroke to toggle background image visibility.
Also added configuration boolean to indicate whether the background image should be visible on startup.
2014-10-30 14:56:40 -07:00
Thomas Vachuska
8cd66a53aa Added background image of a us-map as a provisional eye-candy. 2014-10-30 11:53:07 -07:00
Simon Hunt
b4d9d4c7db Added 'useLiveData' configuration switch. 2014-10-30 11:27:28 -07:00
Simon Hunt
a4911315ea Added more sample data. 2014-10-30 09:47:05 -07:00
Simon Hunt
73171375f9 Minor format change to network.js 2014-10-30 09:25:54 -07:00
Thomas Vachuska
c3d86aee9b Added link port information to topology data. 2014-10-30 09:15:34 -07:00
Simon Hunt
7c7aafb688 Added ports to link data in sample json. 2014-10-30 08:15:58 -07:00
Thomas Vachuska
1de6601cc1 Tweaked GUI files to clean-up the look and feel and to add a few enhancements.
Default for network.js is now to use live data.
2014-10-30 03:03:30 -07:00
Thomas Vachuska
e972ea52fd Added GUI integration for device & host properties.
Fixed cell files to remove ONOS_CELL definition within; this is defined externally based on the cell itself.
2014-10-30 00:14:16 -07:00
Simon Hunt
cc26756bf7 Added sample switch data, and augmented selection logic to fetch the detail data from the server.
Also used styled table for displaying properties.
2014-10-29 10:22:17 -07:00
Simon Hunt
c586e216a1 Added fly-in detail pane. 2014-10-28 21:24:08 -07:00
Simon Hunt
f967d51662 Added styling to unpinned nodes.
Also wired up the radio buttons to suppress nodes/links appropriately.
2014-10-28 20:34:29 -07:00
Simon Hunt
9a16c8211c Pin nodes at end of mousedrag.
Allow nodes to be unpinned by hovering over and pressing 'U'.
2014-10-28 17:48:54 -07:00
Simon Hunt
6f376a3f0a Changed hosts to small circles (rather than labeled rectangles), and updated collision prevention code appropriately.
Removed hover-selection mode (will replace with tooltips later).
Added flyout div (hidden for now).
2014-10-28 17:48:54 -07:00
Thomas Vachuska
ce2474aa91 Revised copyright message. 2014-10-28 13:40:49 -07:00
Thomas Vachuska
4f1a60c9fd Revised copyright message. 2014-10-28 13:39:11 -07:00
Simon Hunt
d35961bc18 Added keydown handler.
Some refactoring.
Cleaned up debug configuration.
Links now clipped to edges of node rectangles.
Updated ONOS icon (just a placeholder for now)
2014-10-28 10:31:55 -07:00
Pavlin Radoslavov
33f228af5a Replaced IpPrefix and IpAddress in the following methods
and cleanup related code:

 - Host.ipAddresses()
 - DefaultHost.ipAddresses()
 - HostDescription.ipAddress()
 - DefaultHostDescription.ipAddress()
 - HostService.getHostsByIp()
 - HostManager.getHostsByIp()
 - HostStore.getHosts()
 - GossipHostStore.getHosts()
 - SimpleHostStore.getHosts()
 - ProxyArpService.known()
 - ProxyArpManager.known()

As a result of the above cleanup, the "hosts" CLI command outputs
the IP addresses as "1.2.3.4" instead of "1.2.3.4/32".

Also, the following REST calls might be affected as well with
the above format replacement:
  - REST POST: config/topology
  - REST GET: topology/graph
2014-10-27 19:33:16 -07:00