Marc De Leenheer
922760bec9
Merge branch 'master' into optical-integration
2014-10-23 13:13:10 -07:00
Toshio Koide
a363f43b96
Cosmetic changes
2014-10-23 12:49:40 -07:00
Toshio Koide
d1865a4021
Add ResourceType field for ResourceAllocation, and change visibility of some of methods
2014-10-23 12:44:55 -07:00
Toshio Koide
d707d7a886
Update getResourceAllocation() of LinkResourceAllocations to return set of resource allocations
2014-10-23 12:37:51 -07:00
Madan Jampani
31961c1409
Resolving merge conflicts
2014-10-23 12:06:58 -07:00
Toshio Koide
65e890f153
Add DefaultLinkResourceRequest implementation.
2014-10-23 12:02:25 -07:00
Toshio Koide
fa0dff61cf
Implement link resource request/allocation objects.
2014-10-23 11:46:44 -07:00
Toshio Koide
569ca70f12
Implement BandwidthResourceRequest class and its builder.
2014-10-23 11:37:44 -07:00
Toshio Koide
50df38df23
Starting implementation of LinkResourceManager.
2014-10-23 10:36:51 -07:00
Madan Jampani
117aaae1fd
Towards a distributed flow rule store
2014-10-23 10:04:05 -07:00
Thomas Vachuska
65b3583a63
Merge remote-tracking branch 'origin/master'
2014-10-22 23:35:54 -07:00
alshabib
558e893766
Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next
2014-10-22 23:32:04 -07:00
Thomas Vachuska
5c436bab37
Merge remote-tracking branch 'origin/master'
2014-10-22 22:33:49 -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
Pavlin Radoslavov
156c2ff204
Added method DeviceEvent.toString() that overrides method
...
AbstractEvent.toString()
This method is needed so we can display the port as well (when set).
Change-Id: I35af68ccb4a63602de40a904a6cee0cfe5f4985f
2014-10-22 22:00:15 -07:00
alshabib
0a1866c2fe
Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next
2014-10-22 21:53:43 -07:00
alshabib
23a8d7c756
added stats command
...
Change-Id: Id6ac04e116858c4a105329ddcf5557fee93dfc8d
2014-10-22 21:53:39 -07:00
Yuta HIGUCHI
02eacfec68
ClusterMessageResponse to provide Future interface
...
Change-Id: I6d43382a1b572f34c5d7d1d41ca1e41dd472f6f2
2014-10-22 20:42:59 -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
Thomas Vachuska
436c076701
Fixed javadocs.
2014-10-22 09:08:43 -07:00
alshabib
c1c056b471
typo
...
Change-Id: I355fff0432d4c347b88b7e66e65a7a90cb99cad0
2014-10-21 21:42:51 -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
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
Thomas Vachuska
46c07adf1b
Added some todos.
2014-10-21 16:01:01 -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
Ayaka Koshibe
fc981cff24
MastershipEvent carries RoleInfo as a subject
...
Change-Id: I8f850ad1f21bfbdc23fedda1a53f4ccedb1b8d32
2014-10-21 12:44:36 -07:00
Jonathan Hart
bc4a793a00
Allowed flows to be permanent
...
Change-Id: I61952fe4cbad98be53094c7ec4a474868384b616
2014-10-21 11:46:00 -07:00
Jonathan Hart
d87aeca6c8
Implement toString for DefaultTrafficSelector and DefaultTrafficTreatment
...
Change-Id: I4e9348795855bd667e8931da161427cd4a450d44
2014-10-21 10:42:52 -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
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
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
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
Toshio Koide
485b478c79
Update resource manager API and objects.
2014-10-20 19:35:40 -07:00
Ayaka Koshibe
abedb0998d
MasteshipService, store, and CLI commands use RoleInfo
...
Change-Id: Ibc569498a67d33d088e5c9f89c6bb1f45eadc26e
2014-10-20 17:31:11 -07:00
