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
1,219 Commits 69 Branches 240 Tags
Commit Graph

654 Commits

Author SHA1 Message Date
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
Yuta HIGUCHI
868def0f97 minor changes to RoleValue 
Change-Id: Id870843c53549439e88ada40e8b2ef5513b8e4b7
 2014-10-23 12:14:37 -07:00
Yuta HIGUCHI
87102541a9 attempt to fix buffer underflow 
- IMap#get usually returns clone of original value,
  but when the type is byte[], it returns the original value.
- During the deserialization process, Kryo temporarily modifies the input buffer,
  which may cause problem when multiple threads were reading the same value.

- applying clone only to value deserialization for now,
  since it is unlikely that caller will be modifying Map key

Change-Id: I52214ba711b4060663b0e1c451f49bdd1d472ea9
 2014-10-23 12:14:37 -07:00
Yuta HIGUCHI
e5ca93bf1f fix some of findbugs issues 
Change-Id: I20aa54af16f3a1e3323d735fe53cc26c03d5e52e
 2014-10-23 12:14:37 -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
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
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
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
alshabib
f6c2ede95f remote stats service functional 
Change-Id: I4ebc4c565b7ee7533b5bd1a0379f54470223ba0e
 2014-10-22 23:31:50 -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
Yuta HIGUCHI
4cf23cede7 KryoSerializer usage fix 
Change-Id: I48e578b33f4c13272a4aa780ee6718e38c2cbea8
 2014-10-22 20:37:30 -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
56dbeb18d3 Fixed a defect that allowed ancillary device providers to overwrite primary provider's data. 2014-10-22 16:40:44 -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
Pavlin Radoslavov
2ca9cf2e5c Replaced another instance of deep nested "if..else" statement with 
"switch..case".
No functional changes.
 2014-10-22 10:39:40 -07:00
Pavlin Radoslavov
c8ccbd958c Replaced deep nested "if..else" statement with "switch..case". 
No functional changes.
 2014-10-22 09:59:37 -07:00
Yuta HIGUCHI
e8252bb91a removeDevice on non-master node to silently ignore the request 
instead of throwing IllegalState exception

Change-Id: Ida778ec112e80507fb05921e49297350d74dc519
 2014-10-22 09:43:24 -07:00
Thomas Vachuska
436c076701 Fixed javadocs. 2014-10-22 09:08:43 -07:00
Yuta HIGUCHI
67dce883d4 Mastership related minor fixes on DeviceManager 
Change-Id: I8aefedd22b285f132d8b0cd2e7b76bf422dcf444
 2014-10-21 22:26:15 -07:00
Madan Jampani
6f065271f3 Removed fixed TODO. Cleaned up logging 2014-10-21 22:02:16 -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
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
Yuta HIGUCHI
a85542bd5c LinkStore bugfix. avoid DIRECT -> INDIRECT transition 
Change-Id: If2a4c3e5e33f705a73374010cd7941167cef1aaf
 2014-10-21 19:31:02 -07:00