347 Commits

Author SHA1 Message Date
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
Ayaka Koshibe
67af1f4247 add roleInfo structure and backup_changed mastership event
Change-Id: Iedee219fe250d681377d73a50a71f5fa72cd7802
2014-10-20 17:31:10 -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
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
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
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
f6f50a6471 FlowEntry must not be modified outside store.
- Remove set method from FlowEntry
- Storing last seen timestamp for FlowEntry eviction locally on FlowManager.
  FlowEntry eviction based on packet counter will take longer time to timeout
  after master Node change.

Change-Id: I7134d698dd5b9bf7cca379c5ba7c4fbcc2e3d5f3
2014-10-19 15:58:49 -07:00
alshabib
0ed6a20fac added test for lldp provider
Change-Id: I31e7c21840d48c38ec60ec7437657daccc185846
2014-10-19 12:42:57 -07:00
Ayaka Koshibe
da1cda69a0 Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next 2014-10-18 18:43:08 -07:00
Yuta HIGUCHI
3498aab4ea each FlowEntry instance should not have logger instance
Change-Id: Idd47696efa5df7015cb1e5f3d362577194351f0f
2014-10-18 18:03:14 -07:00
Madan Jampani
8a89509948 Added support for responding directly via a cluster message received from a peer 2014-10-17 16:55:50 -07:00
alshabib
23022f7bf0 fix provider loading and unloading issue
Change-Id: If10ec427dc7be6b4609eb1ac4955f228274e6742
2014-10-17 14:50:00 -07:00
Madan Jampani
4a9cb6d072 Added sendAndReceive API to ClusterCommunicationService 2014-10-17 10:48:50 -07:00
Yuta HIGUCHI
33b5e766dc Add note for Javadoc bug in Topology interface
Change-Id: Ia963d276191c3f2618517e48a216ba0ea5385c0e
2014-10-16 20:00:50 -07:00
alshabib
75e774203d Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next
Conflicts:
	core/store/hz/net/src/main/java/org/onlab/onos/store/device/impl/DistributedDeviceStore.java
	core/store/hz/net/src/test/java/org/onlab/onos/store/device/impl/DistributedDeviceStoreTest.java
	features/features.xml
	tools/test/cells/office

Change-Id: I08e6d7c6a0bdaae072dd50ff7ac36d94f16d77e1
2014-10-16 18:03:40 -07:00
alshabib
7911a05aae lldp discovery independent of OF
Change-Id: I720f727f6628e30e5d732e6d7bf742d1b7050812
2014-10-16 17:49:37 -07:00