10582 Commits

Author SHA1 Message Date
Ayaka Koshibe
a7384a83d8 fixes related to getRole() assumptions
Change-Id: Icf19d95714dc217200eed021a495d9a78440ca8e
2014-10-22 18:59:34 -07:00
alshabib
44521eccf6 Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next
Conflicts:
	core/net/src/test/java/org/onlab/onos/net/flow/impl/FlowRuleManagerTest.java

Change-Id: I23a7b1bff399c95499a39f7a00563650f58b7210
2014-10-22 18:36:02 -07:00
alshabib
3d643ecc8d functional stats service
Change-Id: I90de3aa5d7721db8ef6a154e122af8b446243f60
2014-10-22 18:33:00 -07:00
Thomas Vachuska
944cb6c30d Added CLI support for showing key/value annotations for devices, ports, links & hosts. 2014-10-22 17:05:42 -07:00
Thomas Vachuska
9b8278c8aa Merge remote-tracking branch 'origin/master' 2014-10-22 16:40:52 -07:00
Thomas Vachuska
56dbeb18d3 Fixed a defect that allowed ancillary device providers to overwrite primary provider's data. 2014-10-22 16:40:44 -07:00
Simon Hunt
1c219897b1 Added geometry lib script, and implemented collision prevention of nodes. 2014-10-22 16:32:39 -07:00
Simon Hunt
ae968a6681 Oops. Added missing .png's and fixed a couple of errors in network.js. 2014-10-22 14:54:41 -07:00
Jonathan Hart
4c2b15e265 Implemented getMatchingInterface and added unit tests for
HostToInterfaceAdaptor.

Change-Id: Ibb56902e13f26dbd619d1ef87e283e8e4c5317db
2014-10-22 14:47:07 -07:00
Simon Hunt
1c5f8b6a58 Added code to adjust node rectangle size based on text label size, plus a little more for the icon. 2014-10-22 14:43:01 -07:00
Thomas Vachuska
83e090e320 Adding intent operations batch abstraction.
Adding copyright to intent and flows.
2014-10-22 14:25:35 -07:00
Thomas Vachuska
1fb982fe93 Adding intent operations batch abstraction. 2014-10-22 14:09:17 -07:00
Praseed Balakrishnan
328251fd70 Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next
Conflicts:
	apps/optical/src/main/java/org/onlab/onos/optical/cfg/OpticalConfigProvider.java
2014-10-22 14:05:41 -07:00
Simon Hunt
68ae665ef3 Added 32x32 icons to nodes (place holder images for now).
Made 'layering' layout choice a config option.
Switched sample data to use full length dpids.
2014-10-22 13:58:07 -07:00
Praseed Balakrishnan
69d95be9e5 Fixed learning optical links 2014-10-22 13:55:05 -07:00
Ayaka Koshibe
38594c28b5 implement DeviceProvider triggerProbe() to call after mastership change
Change-Id: I65002296189e6a499ef353255a016b013eb24020
2014-10-22 13:40:26 -07:00
Ayaka Koshibe
e8708e3c8d trigger device query after mastership reelection
Change-Id: Ibf8b32ed1de2a904289731596a28bd5524d6ea25

Conflicts:
	core/net/src/main/java/org/onlab/onos/net/device/impl/DeviceManager.java
2014-10-22 13:40:18 -07:00
Simon Hunt
3ab76a84f0 Added basic drag and select behavior to nodes.
Changed base colors and added .pkt and .opt classes to differentiate nodes.
2014-10-22 13:07:32 -07:00
Ray Milkey
5154ec3e91 Fix some unchecked conversion warnings
Change-Id: I5cfb0fceb6ab1d200fb1d7e9849ce458a2aa8ac7
2014-10-22 11:05:43 -07:00
alshabib
2374fc9e45 many fixes from different people in various place. Optical, FlowRuleManager, LinkDiscovery
Change-Id: Ie3302e80ee94bf2e41b3da7ac765557b1e7509fd
2014-10-22 11:03:23 -07:00
Pavlin Radoslavov
2ca9cf2e5c Replaced another instance of deep nested "if..else" statement with
"switch..case".
No functional changes.
2014-10-22 10:39:40 -07:00
Pavlin Radoslavov
c8ccbd958c Replaced deep nested "if..else" statement with "switch..case".
No functional changes.
2014-10-22 09:59:37 -07:00
Yuta HIGUCHI
e8252bb91a removeDevice on non-master node to silently ignore the request
instead of throwing IllegalState exception

Change-Id: Ida778ec112e80507fb05921e49297350d74dc519
2014-10-22 09:43:24 -07:00
Thomas Vachuska
9adc374fe5 Merge remote-tracking branch 'origin/master' 2014-10-22 09:08:50 -07:00
Thomas Vachuska
436c076701 Fixed javadocs. 2014-10-22 09:08:43 -07:00
Brian O'Connor
195191b4f7 adding onos.py, a work in progress
Change-Id: Idfc2087fd8be2ffa24e7e93c2744fa8b1d46811b
2014-10-22 01:09:50 -07:00
Thomas Vachuska
e0d90df698 Merge remote-tracking branch 'origin/master' 2014-10-21 23:52:34 -07:00
Thomas Vachuska
5d42c6b1aa Fixed javadoc groups. 2014-10-21 23:52:28 -07:00
Yuta HIGUCHI
67dce883d4 Mastership related minor fixes on DeviceManager
Change-Id: I8aefedd22b285f132d8b0cd2e7b76bf422dcf444
2014-10-21 22:26:15 -07:00
Pavlin Radoslavov
6bc5594e7b Fix the property name inside the JSON representation of the topology
event rate metric:
  listenerEventRate -> topologyEventRate
2014-10-21 22:16:53 -07:00
Pavlin Radoslavov
64d9e47215 Added initial implementation of Topology-related event and
event metrics collector. It can be loaded by one of the following two (new)
features: onos-app-metrics, onos-app-metrics-topology

After loading the module, it subscribes for topology-related events
and keeps the following state:
 (a) The last 10 events
 (b) The timestamp of the last event (ms after epoch) as observed by this
     module
 (c) The rate of the topology events: count, median rate, average rate
     over the last 1, 5 or 15 minutes

The following CLI commands are added:
 * onos:topology-events
   Shows the last 10 topology events

 * onos:topology-events-metrics
   Shows the timestamp of the last event, and the rate of the topology
   events: see (b) and (c) above
2014-10-21 22:13:09 -07:00
Madan Jampani
37eb8416a3 Removed os-maven-plugin (for netty epoll) until we fully test it 2014-10-21 22:04:25 -07:00
Madan Jampani
6f065271f3 Removed fixed TODO. Cleaned up logging 2014-10-21 22:02:16 -07:00
Pavlin Radoslavov
3559249b9b Refactoring and cleanup in the Metrics module:
* Removed logging related code inside class MetricsManager
 * Removed @Component related code, because it is not suppose to be used
   as an component.
 * Added a new class-wrapper so the Metrics can be used as a loadable service:
   MetricsManagerComponent. The name and the location of this class
   will be refactored in the future.
 * Added new method MetricsManager.removeMetric()
 * Line formatting
 * Changed "interface MetricsService" to public
2014-10-21 21:57:25 -07:00
Simon Hunt
0b05d4a9b2 Initial (v.rough) draft of ONOS UI.
Finally got something working, and need to check it in.
2014-10-21 21:51:18 -07:00
Pavlin Radoslavov
df042bd11d Minor cleanup in the Metrics module:
* Add missing Javadoc
 * Line formatting

No functional changes.
2014-10-21 21:47:38 -07:00
alshabib
c1c056b471 typo
Change-Id: I355fff0432d4c347b88b7e66e65a7a90cb99cad0
2014-10-21 21:42:51 -07:00
alshabib
e8641634f2 Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next 2014-10-21 21:36:47 -07:00
alshabib
a43aa25218 api and manager for statistic service
Change-Id: If00b8b43a2bd780ae3c05321697896290fb0f415
2014-10-21 21:36:41 -07:00
Thomas Vachuska
756fb29d74 Enhanced onos-log and onos-check-logs to work against instance specific logs when an optional second argument is given, e.g. onos-log $OC1 c0 2014-10-21 20:35:10 -07:00
Thomas Vachuska
0bbcb00cba Merge remote-tracking branch 'origin/master' 2014-10-21 20:26:57 -07:00
Thomas Vachuska
5c4324ec6a Enhanced onos-install to pre-stage ONOS artifacts from apache karaf system/org/onlab to ~/.m2/repository/org/onlab to enable operating karaf instances. 2014-10-21 20:26:40 -07:00
alshabib
574afdab6a Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next 2014-10-21 20:13:31 -07:00
alshabib
dfc7afb1a7 distributed link fixes
Change-Id: Iefede001a76834599a5629d843a4325283e42711
2014-10-21 20:13:27 -07:00
Yuta HIGUCHI
a85542bd5c LinkStore bugfix. avoid DIRECT -> INDIRECT transition
Change-Id: If2a4c3e5e33f705a73374010cd7941167cef1aaf
2014-10-21 19:31:02 -07:00
Thomas Vachuska
7d693f5be7 Experimenting with Apache 2 copyright on the onos-cli module. More later... 2014-10-21 19:17:57 -07:00
Jonathan Hart
6e88c687a3 Intent treatments need to be passed down to the flows
Change-Id: I4569536cb62188f711ce005af1c3501dc31f7e74
2014-10-21 17:05:25 -07:00
Madan Jampani
871009392c Added NettyMessagingService constructor that accepts both ip and port 2014-10-21 16:46:12 -07:00
Thomas Vachuska
61d59dac06 Merge "Add L2 selector options to connectivity intents" 2014-10-21 16:37:40 -07:00
Ray Milkey
9fdf1eaaae Add L2 selector options to connectivity intents
Added --etherType, --etherSrc, and --etherDst to
PointToPointIntent and MultiPontToSinglePointIntent
creation in the ONOS CLI.

Change-Id: Ibccd3c0b331e7f89be6903f264a6889ac1ad5f17
2014-10-21 16:27:41 -07:00