1436 Commits

Author SHA1 Message Date
Yuta HIGUCHI
3cc190759e Fix to make things serializable
Change-Id: Id6ec282d72065241f8942c2b169311de5710a6b7
2014-10-07 17:33:23 -07:00
Yuta HIGUCHI
24b2e2ae8e Fix Mastership timstamping issue
Change-Id: I80cfa71f844ddf7d64dbff0458db193734a3f737
2014-10-07 17:31:45 -07:00
Yuta HIGUCHI
3215ebd1e1 core-dist OSGi related fixes
Change-Id: I4f4690652604efb1a5f4000da71190c68d70d83a
2014-10-07 14:39:24 -07:00
Madan Jampani
a5d0d78861 Using ClusterService in ClusterCommunicationManager (NPE fix) 2014-10-07 14:36:00 -07:00
Madan Jampani
0177b0ef50 Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next 2014-10-07 14:16:25 -07:00
Madan Jampani
da1a6b06d2 Initialize NettyMessagingService explicitly as it is not a OSGi service yet 2014-10-07 14:16:15 -07:00
alshabib
8ca53901fe added hashcode and equals to treatments
UnmodifiableCollection can be bad in a hashCode

Change-Id: I55700541dc7ab46b21e5e9e9cc19c70f0c7f7494
2014-10-07 13:11:17 -07:00
Madan Jampani
53e44e623a Simplified how message payloads get serialized/deserialized 2014-10-07 12:42:59 -07:00
Yuta HIGUCHI
672488d8cf KryoSerializationService -> Serializer
- no longer a shared OSGi service.

Change-Id: Ie2b2320e92685cd515b30ffc472e3a02149a5bbd
2014-10-07 09:32:19 -07:00
Yuta HIGUCHI
53a285d5ee use encode/decode instead of serialize/deserialize
Change-Id: I273bb86d32cb763e1eb8bbbe4efa7a8dab541c51
2014-10-07 09:32:19 -07:00
tom
85258ee4a8 Reworked intent states to the new set of states.
Separate intent state from intent event type.
Implemented new state transitions in IntentManager.
Implemented ObjectiveTracker.
Re-route now works.
2014-10-07 00:10:02 -07:00
Yuta HIGUCHI
993d7aadd2 renamed Serializer -> (onlab.netty-layer) PayloadSerializer
- Added TODO memos to ClusterCommunicationService layer

Change-Id: I4c81a72d03cddd23637f9c6cbf102125ea448c01
2014-10-06 23:00:28 -07:00
Madan Jampani
af797185a5 Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next 2014-10-06 21:04:29 -07:00
Madan Jampani
2206e01e44 Added missing javadocs. Created a separate class for message subjects used by distribued device store 2014-10-06 21:04:20 -07:00
tom
a2ad1186a8 Merge remote-tracking branch 'origin/master' 2014-10-06 20:52:17 -07:00
Madan Jampani
47c93731c4 Added support to device store for broadcasting device/port update events to peers 2014-10-06 20:46:08 -07:00
Yuta HIGUCHI
c057c63974 Moving classes around, reflecting discussion with Madan.
Change-Id: I83a08fc3f31003b6a521f3f7fe48c47b5c489bb1
2014-10-06 18:38:14 -07:00
tom
1456fe758f Merge remote-tracking branch 'origin/master'
Conflicts:
	apps/ifwd/src/main/java/org/onlab/onos/ifwd/IntentReactiveForwarding.java
2014-10-06 16:56:06 -07:00
Yuta HIGUCHI
3f4c2b4e91 Add TODO memos
Change-Id: I087b3c6ce3b9ad1fc5cab292a58af685f8b76609
2014-10-06 16:55:16 -07:00
Yuta HIGUCHI
8a85138a62 add hashCode, etc. to MessageSubject
Change-Id: I5c0185ea6bc8ab37fc5bade1c64cc30be6a79f9a
2014-10-06 14:56:46 -07:00
Yuta HIGUCHI
c35efaca47 DeviceStore update
- Add off-line/remove handling to Gossip~
- Backport lock scope to Simple~

Change-Id: I5b4c8e12738ef78920341fb8699c4b07bde8712a
2014-10-06 14:44:38 -07:00
Yuta HIGUCHI
d2266a70f7 added toString
Change-Id: I5ea98752b3f753eb398c83616afae11305d84e72
2014-10-06 14:44:38 -07:00
tom
a0ed763c88 Merge remote-tracking branch 'origin/master' 2014-10-06 13:13:45 -07:00
Yuta HIGUCHI
9ee0d5b133 Fix unit test issue
Change-Id: Ie0809591652a22379e59cd5f80b7cddb3896459d
2014-10-06 10:50:45 -07:00
tom
9b4030df2a Added a summary command. 2014-10-06 10:39:03 -07:00
tom
95329ebc68 Starting to experiment with flow tracking. 2014-10-06 08:40:06 -07:00
Yuta HIGUCHI
885be1d0ae Fixed annotation handling.
- Store as SparseAnnotations internally and convert to Annotations
  when merging multiple provider supplied annotations.

Change-Id: I82fe159b536b3e7344a33e09792f6a3473fb3500
2014-10-04 21:49:42 -07:00
Yuta HIGUCHI
5bdebe38f9 Kryo related fixes
- ProviderIdSerializer fix (ancillary)
- minor improvements
- add test cases

Change-Id: I6d969ac6518c44499f0fac167db4bdf1964f6aaa
2014-10-04 21:49:41 -07:00
alshabib
1c319ffc2e the return of the flowentry
Change-Id: I7dbeb6af2014a4df5b0beb7fe0157eaaac63bd0f
2014-10-04 20:29:09 -07:00
Yuta HIGUCHI
0d6a5e6846 Fixed remove behavior for Device and Link Store
Change-Id: I2d6c6a48f9b92136c2f0734d0216f9f3b05b4d8c
2014-10-03 16:46:07 -07:00
Yuta HIGUCHI
39ede6a103 SimpleLinkStore with annotation and multi-provider support
Change-Id: I98a35c4497363c6115fd0c61d140dfe7790e6cee
2014-10-03 16:46:07 -07:00
Ayaka Koshibe
25fd23a6f0 handle devices agreed to be inactive during master re-election
Change-Id: Ia193d7210a8319f04ce957f2bd4a0479b88d15a8
2014-10-03 15:50:43 -07:00
Yuta HIGUCHI
03fec1f2a8 minor Kryo related cleanup
Change-Id: I772fc1f776563d30f1a4081c6fddd5739d985263
2014-10-03 09:15:01 -07:00
Yuta HIGUCHI
273dcc8ab1 renamed OnosTimestamp -> MastershipBasedTimestamp
Change-Id: Ie6ee5d85bc0f5aadfa32e27e1d31e3c1d5c9fea8
2014-10-03 09:15:01 -07:00
tom
a1d16b655d Corrected some javadocs. 2014-10-02 23:45:11 -07:00
Yuta HIGUCHI
68b349491e Sliced out Provider-ish API from ClockService
Change-Id: I438815f2dc7a3a304f7dc8fb09550b2a5f779265
2014-10-02 23:23:21 -07:00
Yuta HIGUCHI
67a527feaf implemented GossipDeviceStore with multi-provider, annotation support
Change-Id: I1953bdc37b28af79703ebcfc9201a71a2af49ab2
2014-10-02 23:01:11 -07:00
Yuta HIGUCHI
c99a8d3fca Add TODO memo + cosmetics
Change-Id: If0e82e42893a8cb5e04087622f727d1fd8df5210
2014-10-02 23:01:11 -07:00
Brian O'Connor
66630c8f6e Adding Intent Impl and shell command to install simple intent 2014-10-02 21:08:31 -07:00
Ayaka Koshibe
5c0f237a0c notification for mastership changes
Change-Id: I191ccd42ff9f8a41e87cfcda07531e4fbdd923c8
2014-10-02 17:59:04 -07:00
Ayaka Koshibe
bb218b6965 Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next 2014-10-02 17:44:21 -07:00
alshabib
95cf139886 Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next 2014-10-02 17:15:27 -07:00
alshabib
ba5ac487b5 flowrules no longer install a timeout but are monitored by onos in order to be expired
Change-Id: Ibd1a5952349d7ccb27c92b4982d04574f31424c0
2014-10-02 17:15:20 -07:00
Madan Jampani
3b0dfd53bd Javadoc improvements 2014-10-02 16:48:13 -07:00
Ayaka Koshibe
c4139867ba Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next 2014-10-02 16:28:23 -07:00
Ayaka Koshibe
8583ff3b88 tests for DistributedMastershipStore
Change-Id: Ic7daa333ac7d7947155b745daf08e4771f1189ef
2014-10-02 16:26:37 -07:00
Madan Jampani
c9ed9be511 Moved Netty messaging out of onos-core-dist to under onos-utils 2014-10-02 16:13:11 -07:00
Madan Jampani
48e54c34d6 Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next 2014-10-02 15:17:40 -07:00
Madan Jampani
e4ff21be53 Introduced a serializer interface and minimal kyro based implementation as a precursor to moving netty messaging out to onos-utils 2014-10-02 15:17:32 -07:00
Yuta HIGUCHI
55710e70c0 implemented annotation merging on SimpleDeviceStore.
- Added annotation support to PortsDescriptions

Change-Id: I157e4fb93b8f387b405722b8d004501d993decda
2014-10-02 15:03:21 -07:00