1219 Commits

Author SHA1 Message Date
Madan Jampani
824a7c192a Netty epoll support. Now with updated pom.xml and features.xml to bring in the dependencies 2014-10-21 09:46:15 -07:00
Thomas Vachuska
4ccde78d03 Added package javadoc for net.resource package. 2014-10-21 03:00:36 -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
Yuta HIGUCHI
40d017769a switch to ImmutableList
Change-Id: Ia5f8936d0aaf447253f5dde0db1ee688441d2472
2014-10-21 01:08:55 -07:00
Yuta HIGUCHI
85d58d13cc register more flow related classes
Change-Id: I812285c26ab12ca84458492c929b2fd48ca97480
2014-10-21 01:08:55 -07:00
Thomas Vachuska
d03a56e02d Added normalization of HostToHost id fingerprint to allow host one/two to come in either order. 2014-10-21 00:51:57 -07:00
Thomas Vachuska
4926c1b06f Refactoring intent API. 2014-10-21 00:44:10 -07:00
Thomas Vachuska
01fbcdf626 Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next 2014-10-21 00:23:31 -07:00
Thomas Vachuska
b97cf28766 Refactoring intent API. 2014-10-21 00:21:24 -07:00
Ayaka Koshibe
adb2d3c354 minor fixes to RoleInfo
Change-Id: Ie3cfab9a18c18db3abef2a6c0c1a5c07e2ee102a
2014-10-20 23:40:54 -07:00
Thomas Vachuska
1c184f1df9 Merge remote-tracking branch 'origin/master' 2014-10-20 23:03:42 -07:00
Thomas Vachuska
c96058ae4d Refactoring intent API. 2014-10-20 23:00:16 -07:00
Yuta HIGUCHI
2809bf37e7 serialization related fixes for flow related classes
Change-Id: Id7e1241cc73645bd87b61eac4ca45acd35ad22ca
2014-10-20 22:44:56 -07:00
Yuta HIGUCHI
406a565c56 add dummy IntentStore to core-dist
Change-Id: I9b56ba07f3f953bdfc9269f44ac13a86bbf6eed7
2014-10-20 22:44:55 -07:00
Yuta HIGUCHI
cac919cc13 flushing just to be sure
Change-Id: Iebdc4b50a94e3247c15152c6c3148620739cc864
2014-10-20 22:44:55 -07:00
Toshio Koide
485b478c79 Update resource manager API and objects. 2014-10-20 19:35:40 -07:00
Yuta HIGUCHI
2fcfde9f0d Register FlowId to Kryo
Change-Id: Ic6bff17cff78f8b95350a97e89782e9c6ae8ce7e
2014-10-20 18:51:10 -07:00
Jonathan Hart
bc3f7f7130 Remove test route from SDN-IP
Change-Id: I767cc9829438e56da945ab35def86a3f7b9b244d
2014-10-20 18:50:17 -07:00
Yuta HIGUCHI
ceff7b0c20 expand netty-all to match feature.xml
Change-Id: I1543cd614d0b475076dc94d2d8cddbbabe10eb7d
2014-10-20 18:32:55 -07:00
Jonathan Hart
d7bd98290c Moved SDN-IP and config to fasterxml jackson package
Change-Id: I5a5319188bb54738238787b58a7854e8b5564c9a
2014-10-20 18:26:13 -07:00
Yuta HIGUCHI
94ffdd4b2a SimpleFlowRuleStore to support FlowId collision
Change-Id: I750a733146e9dfd6984cb701bdcc21d0fd61a14d
2014-10-20 18:05:59 -07:00
Yuta HIGUCHI
48ec4f75e6 Revert "Using native transport (epoll) with netty"
This reverts commit f22f2043548ddba2c1a2ffc46ff0672006f1bc7e.

- It did not run inside karaf

Change-Id: Ieab6684bbde1029ad53337e9a4ee03623c2e6ab7
2014-10-20 18:05:27 -07:00
Jonathan Hart
d0caacd397 Added example config files for SDN-IP
Change-Id: Ia40bea166c147e95c2d9f5dbe13c6ccbd622de3d
2014-10-20 17:56:35 -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
alshabib
f4f23fcdf4 Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next 2014-10-20 17:17:38 -07:00
alshabib
9eab22f09d possible fix for link discovery
Change-Id: Id52dce21e93f0ca4665b15d3b169dc6a8dba76b4
2014-10-20 17:17:31 -07:00
Thomas Vachuska
d8cf56648c Fixed features dependencies to make sure onos-cli has jackson stuff. 2014-10-20 17:07:57 -07:00
Madan Jampani
f22f204354 Using native transport (epoll) with netty 2014-10-20 16:55:54 -07:00
Madan Jampani
e0ec329402 Fixed imports 2014-10-20 16:10:51 -07:00
Madan Jampani
66a0c4e00b Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next 2014-10-20 16:03:49 -07:00
Madan Jampani
e602bb40da Revert netty nativ support 2014-10-20 16:03:41 -07:00
alshabib
68b7ad3b34 Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next 2014-10-20 15:47:13 -07:00
alshabib
2020b89720 fix for flow collisions
Change-Id: I07623fa06a5dbc1f36da021261f494f968fdf2f9
2014-10-20 15:47:08 -07:00
Madan Jampani
a665855401 Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next 2014-10-20 15:35:17 -07:00
Madan Jampani
5e83f333ca Netty native transport (epoll) support 2014-10-20 15:35:09 -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
Toshio Koide
6bf91bcb7e Fix the definition of LinkResourceService. 2014-10-20 15:32:52 -07:00
Toshio Koide
c9051db21b Starting point for designing a resource manager API. 2014-10-20 15:20:53 -07:00
alshabib
d796391bda fix for switch connecting
Change-Id: If4e16a692f79f94289bd0df4a0ffbb3dd828e246
2014-10-20 14:52:04 -07:00
Praseed Balakrishnan
82c4fc48b7 Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next
Conflicts:
	providers/openflow/device/src/main/java/org/onlab/onos/provider/of/device/impl/OpenFlowDeviceProvider.java
2014-10-20 14:27:57 -07:00
Praseed Balakrishnan
a22eadf914 Discover LINC-OE switch and ports. 2014-10-20 14:21:45 -07:00
Jonathan Hart
ce37f6d66d Renamed a class to better name 2014-10-20 10:25:03 -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
633cf88992 KryoNamespace as KryoFactory
Change-Id: I4b78433f08d01619b89f37a961213660a8e3c2db
2014-10-20 09:11:06 -07:00
Yuta HIGUCHI
8d143d2a01 Rename KryoPool -> KryoNamespace
Change-Id: Ife1c311b40eaab133bb3b8dd3314b98c60b4411d
2014-10-20 09:11:06 -07:00