mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2025-10-23 13:21:21 +02:00
Code Issues Projects Releases Wiki Activity
8,779 Commits 69 Branches 240 Tags
Commit Graph

1270 Commits

Author SHA1 Message Date
weibit
f32383bb00 Optical Path Porvisioning 
Change-Id: I9788fd9172edc8ab571aa1d41962c2bd10697c50
 2014-10-23 13:47:48 -07:00
Marc De Leenheer
09e5f64886 Merge branch 'optical-integration' of ssh://gerrit.onlab.us:29418/onos-next into optical-integration 2014-10-23 13:54:26 -07:00
Brian O'Connor
e7e4bd5825 adding Get by IntentId to LinkResourceService 
Change-Id: Ic27daef6e3e55a7d2301f8009432d6c216e1523d
 2014-10-23 13:36:59 -07:00
Marc De Leenheer
922760bec9 Merge branch 'master' into optical-integration 2014-10-23 13:13:10 -07:00
Madan Jampani
692ca59a98 Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next 2014-10-23 12:07:07 -07:00
Madan Jampani
31961c1409 Resolving merge conflicts 2014-10-23 12:06:58 -07:00
alshabib
9cbdec4015 stats manager cleanup 
Change-Id: Icf5ab2ef39d3ad887c56b2d49ebb418e9de4ff2d
 2014-10-23 10:45:55 -07:00
Toshio Koide
50df38df23 Starting implementation of LinkResourceManager. 2014-10-23 10:36:51 -07:00
alshabib
12288c8396 fix for distributed link discovery 
Change-Id: I2ef2b8f6bdfcbde5c4a71d15d868fef8092c4aaa
 2014-10-23 10:24:23 -07:00
Madan Jampani
117aaae1fd Towards a distributed flow rule store 2014-10-23 10:04:05 -07:00
alshabib
8d5665f295 Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next 2014-10-23 09:52:14 -07:00
alshabib
46122d8550 finished stats service 
Change-Id: Ic1edef3e9cabefb2cbfdd8eecc465b3fa7f96bd9
 2014-10-23 09:05:31 -07:00
Thomas Vachuska
0e752bdbb4 Added link types of TUNNEL and OPTICAL. 
Fixed the optical config json file.
Fixed treatment of links added by ancillary providers.
Added a trap for topology provider errors.
Added CLI to recompute topology.
 2014-10-22 22:33:41 -07:00
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
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
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
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
Yuta HIGUCHI
67dce883d4 Mastership related minor fixes on DeviceManager 
Change-Id: I8aefedd22b285f132d8b0cd2e7b76bf422dcf444
 2014-10-21 22:26:15 -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
alshabib
a43aa25218 api and manager for statistic service 
Change-Id: If00b8b43a2bd780ae3c05321697896290fb0f415
 2014-10-21 21:36:41 -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
Jonathan Hart
6e88c687a3 Intent treatments need to be passed down to the flows 
Change-Id: I4569536cb62188f711ce005af1c3501dc31f7e74
 2014-10-21 17:05:25 -07:00
Thomas Vachuska
07ac62ab2e Merge remote-tracking branch 'origin/master' 2014-10-21 12:47:34 -07:00
Thomas Vachuska
10d4abcf36 Adding JSON output for intent list command. 2014-10-21 12:47:26 -07:00
Jonathan Hart
bc4a793a00 Allowed flows to be permanent 
Change-Id: I61952fe4cbad98be53094c7ec4a474868384b616
 2014-10-21 11:46:00 -07:00
Thomas Vachuska
e291c8445e Enhanced toString for intents for consistency. 
Removed ID block allocator stuff.
 2014-10-21 02:52:38 -07:00
Thomas Vachuska
3a78be6ccf Merge remote-tracking branch 'origin/master' 2014-10-21 01:34:05 -07:00
Thomas Vachuska
a12fdf2fb0 Ooops... corrected a unit test. 2014-10-21 01:33:48 -07:00
Yuta HIGUCHI
f3d51bdbc0 Initial DistributedDlowRuleStore 
- known bug: responding to ClusterMessage not possible.

Change-Id: Iaa4245c64d2a6219d7c48ed30ddca7d558dbc177
 2014-10-21 01:08:55 -07:00
Thomas Vachuska
4926c1b06f Refactoring intent API. 2014-10-21 00:44:10 -07:00
Thomas Vachuska
b97cf28766 Refactoring intent API. 2014-10-21 00:21:24 -07:00
Jonathan Hart
11096406ca Changed some non concurrent structures to ConcurrentHashMaps in 
SimpleIntentStore and OpenFlowRuleProvider.

Also improved logging in IntentManager so exception stack traces are logged.

Change-Id: I72f5e20893bda633dc36ea271a0f56c0ddb7fb5a
 2014-10-20 17:38:38 -07:00
Ayaka Koshibe
abedb0998d MasteshipService, store, and CLI commands use RoleInfo 
Change-Id: Ibc569498a67d33d088e5c9f89c6bb1f45eadc26e
 2014-10-20 17:31:11 -07:00
Ayaka Koshibe
67af1f4247 add roleInfo structure and backup_changed mastership event 
Change-Id: Iedee219fe250d681377d73a50a71f5fa72cd7802
 2014-10-20 17:31:10 -07:00
Brian O'Connor
f2dbde576b refactoring intent framework installers 
installers should return work rather than futures

Change-Id: I664c9ef43279139eaf3bbc3cfc84b258b480eaab
 2014-10-20 15:35:06 -07:00
Jonathan Hart
6b2ffc35b9 Fixed issue where LinkCollectionIntentInstaller was missing a flow rule 
for the last hop switch.

Change-Id: I0f3d49de10dc5a6fd7cf65463d0d2e9b6d512346
 2014-10-20 10:14:23 -07:00
Yuta HIGUCHI
f6f50a6471 FlowEntry must not be modified outside store. 
- Remove set method from FlowEntry
- Storing last seen timestamp for FlowEntry eviction locally on FlowManager.
  FlowEntry eviction based on packet counter will take longer time to timeout
  after master Node change.

Change-Id: I7134d698dd5b9bf7cca379c5ba7c4fbcc2e3d5f3
 2014-10-19 15:58:49 -07:00
Yuta HIGUCHI
0722fb2149 added FIXME for disconnection corner case 
- disconnection event triggered while
  DeviceManager recognition of mastership is not in sync yet.

Change-Id: I03959ca59a4220a8e91b88f2f8565c883e39a93f
 2014-10-19 01:16:33 -07:00
Yuta HIGUCHI
d631e42168 bugfix: DeviceManager#applyRole should ignore NONE 
Change-Id: Ib235c4853b0a7e504a8ee42e9bc9eafe99257fc8
 2014-10-19 00:23:27 -07:00
Ayaka Koshibe
da1cda69a0 Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next 2014-10-18 18:43:08 -07:00
Ayaka Koshibe
b5c63a0af2 fixes for mastership handoff race conditions 
Change-Id: Ifed733df1bdc3b144b6a341a9322838ea2aacd72
 2014-10-18 18:42:27 -07:00
Yuta HIGUCHI
605347c288 modified SimpleFlowRuleStore not to use MultiMap 
Change-Id: Ie9adb127f1acb4d919951c75513e689fbd80596d
 2014-10-18 18:03:14 -07:00
Pavlin Radoslavov
a0e47543d6 Bug fix: don't generate topology events with "null" reasons. 
Approved by: Yuta
 2014-10-17 19:22:17 -07:00
Yuta HIGUCHI
e794cbe349 Add FIXME to LinkManager 
When multiple provider register Links (e.g., LLDP, Config),
and one of the provider remove a Link, all the Links sharering the
same ConnectionPoint will be removed.

Change-Id: I8e607edd3eeabd849ff8ec9d92367019a42892ac
 2014-10-17 13:21:23 -07:00
alshabib
da9c64f4a9 Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next 2014-10-17 12:00:35 -07:00