334 Commits

Author SHA1 Message Date
Jonathan Hart
936c49d147 Added getCriterion method to TrafficSelector
Change-Id: I72d89d878e1fae95d1e16d9ed473b7711895e478
2014-10-23 16:41:00 -07:00
Brian O'Connor
38948410f7 Merge branch 'optical-integration' 2014-10-23 16:32:25 -07:00
Brian O'Connor
4908d60fe9 refactoring OpticalPathIntent yet again
Change-Id: Ibbad495b45f2d461eced6cae2a221887466a83c2
2014-10-23 15:58:36 -07:00
Praseed Balakrishnan
20d72c0ac3 Merge branch 'optical-integration' of ssh://gerrit.onlab.us:29418/onos-next into optical-integration 2014-10-23 15:55:53 -07:00
Praseed Balakrishnan
64369da98a sigtype selector and treatment and fix not finding the switch id in test app. 2014-10-23 15:55:20 -07:00
Yuta HIGUCHI
9def047b78 DistributedFlowRuleStore: remote batch support
Change-Id: I373a942697624440e025a8022a13394396058a71
2014-10-23 15:54:47 -07:00
Brian O'Connor
086724eb7e refactoring OpticalPathIntent
Change-Id: Ic6ab6237237b2a5019851182b2869110bc5b1b73
2014-10-23 15:47:47 -07:00
Toshio Koide
86160f548c Change method name of LinkResourceService 2014-10-23 14:59:26 -07:00
Toshio Koide
5c0a726977 Rename package name of LinkResourceManager. 2014-10-23 14:50:40 -07:00
Thomas Vachuska
d404c5177b Added initial sketch of JSON codec abstraction and related codec tracking service. 2014-10-23 14:19:46 -07:00
Toshio Koide
ca0fcff106 Implement fake requestResources() method. 2014-10-23 14:09:22 -07:00
weibit
9e622ac47b optical intent
Change-Id: I23714985a2fe1e3bbc59deff2d267007750d0420
2014-10-23 13:47:48 -07:00
weibit
7e5834602f optical intent module
Change-Id: Ifa405ab1d883b293d349f1b66d26a05a0724691f
2014-10-23 13:47:48 -07:00
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
Marc De Leenheer
4908775b84 Support lambda's in selector & treatment 2014-10-23 13:54:09 -07:00
Brian O'Connor
55153ce8bd adding javadoc to LinkResourceService
Change-Id: I2319c6cca4b1f051be453f1c87f5aba2773027f9
2014-10-23 13:44:05 -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
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