194 Commits

Author SHA1 Message Date
tom
6db1f0a83c Added javadocs.
Renamed intent remove command.
2014-10-07 09:12:29 -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
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
Yuta HIGUCHI
adcafb6e26 Add missing null check
Change-Id: I363765d3e033dbc5e2fa9fa86137ace5f869fa46
2014-10-06 10:50:45 -07:00
Yuta HIGUCHI
f9ce497c12 Fixed potentially thread unsafe initialization.
Change-Id: I047bcd9358a544723603a069faa234c00ba6b757
2014-10-06 10:50:44 -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
2d48cedbd7 Addded missing javadoc
Change-Id: I97b263dcefb865b32d9cfa50e83d340f7026a3df
2014-10-04 21:49:41 -07:00
alshabib
ca5706c1dc the real return of the flowentry
Change-Id: I9ec244710345dbae193613ab95f473a888d7d771
2014-10-04 20:29:41 -07:00
alshabib
1c319ffc2e the return of the flowentry
Change-Id: I7dbeb6af2014a4df5b0beb7fe0157eaaac63bd0f
2014-10-04 20:29:09 -07:00
Yuta HIGUCHI
39ede6a103 SimpleLinkStore with annotation and multi-provider support
Change-Id: I98a35c4497363c6115fd0c61d140dfe7790e6cee
2014-10-03 16:46:07 -07:00
tom
f5c9d920f7 Added bi-directional nature to HostToHost intent. 2014-10-03 15:22:03 -07:00
alshabib
c274c90395 proxy arp application
Change-Id: Ic2136537a4104e75b64ae4731e1bae4f3a4c1661
2014-10-03 14:58:27 -07:00
alshabib
a0e0498e26 illegalArgument exception for priority
Change-Id: I9bce0b677b937ee691ac24c13c88a632cfb2339e
2014-10-03 13:03:19 -07:00
alshabib
5fe8f4c056 priority 0 is off limits; because of OF13
Change-Id: I50fb8575450f11c500f532e878597d3b1632e50a
2014-10-03 11:55:55 -07:00
tom
9a693fda41 Fixed traffic selector builder to allow only one criterion.
Temporarily disabled flow rule time-out.
2014-10-03 11:32:19 -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
Brian O'Connor
66630c8f6e Adding Intent Impl and shell command to install simple intent 2014-10-02 21:08:31 -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
Brian O'Connor
f3d0616b07 Adding Intent API tests 2014-10-02 15:54:33 -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
Brian O'Connor
b876bf1fe5 Adding Intent Framework API 2014-10-02 14:59:37 -07:00
tom
747a2130c3 Adding more unit tests. 2014-10-02 08:18:41 -07:00
tom
5a9383a4fa Adding more unit tests.
Made some classes abstract which should have been.
2014-10-02 07:33:52 -07:00
tom
44179d6378 Fixed a few javadocs. 2014-10-02 05:31:25 -07:00
tom
f5d85d4968 Working on model & description annotations. 2014-10-02 05:27:56 -07:00
tom
3ea11252fb Working on model annotations; still in progress. 2014-10-02 04:32:26 -07:00
tom
db6c3f8cee Adding javadocs for ProviderId changes. 2014-10-01 21:30:17 -07:00
tom
27ae0e60b5 Working on model annotations; still in progress. 2014-10-01 20:35:01 -07:00
tom
53af33b4ee Merge remote-tracking branch 'origin/master' 2014-10-01 16:51:53 -07:00
tom
2482e6ff40 Enhanced cell & cells tools.
Provided initial sketch of the Annotated concept for the model attributes.
2014-10-01 16:51:48 -07:00
alshabib
1f641c0b4c Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next 2014-10-01 16:39:42 -07:00
alshabib
6eb438a78b fixes for office deployment
Change-Id: I322dc856cb2f724e1860f3e30b3bcb5445c8fb65
2014-10-01 16:39:37 -07:00
Yuta HIGUCHI
5f6739c078 Add ProviderID to DeviceStore port update APIs
- Not utilized by store implementation yet.

Change-Id: Iad757c2504fbeb3d9672f163aa05b5c45b19d3bd
2014-10-01 14:04:01 -07:00
tom
a536886841 Enhanced ProviderId to support notion of primary vs. ancillary and modified AbstractProviderRegistry to enforce one primary provider per URI scheme. 2014-10-01 12:35:48 -07:00
Ayaka Koshibe
78d16a4eb2 Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next 2014-09-29 23:43:50 -07:00
Jonathan Hart
74f9c3b043 Added config app to read address config from json file 2014-09-29 20:04:26 -07:00
alshabib
cccd6b95a9 Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next
Conflicts:
	core/net/src/main/java/org/onlab/onos/net/proxyarp/impl/package-info.java

Change-Id: I7bf076fae02c619ff0d57ffcbff4a4189716c474
2014-09-29 19:20:39 -07:00
alshabib
b5522ff102 proxy arp functional; needs testing
Change-Id: Ib948ec3eac07d2650becf720a9c3c5ca014a0994
2014-09-29 19:20:00 -07:00
Ayaka Koshibe
65efaefeb1 Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next
Conflicts:
	core/net/src/main/java/org/onlab/onos/cluster/impl/MastershipManager.java
	core/net/src/main/java/org/onlab/onos/net/device/impl/DeviceManager.java
	core/store/hz/cluster/src/main/java/org/onlab/onos/store/cluster/impl/DistributedMastershipStore.java

Change-Id: I6a8b756fc20968e18ea3fd145e155d6282cea945
2014-09-29 18:21:56 -07:00
Ayaka Koshibe
d9f693e621 Relinquish mastership, tests, and few modifications to trivial MastershipStore
Change-Id: Iae29de010f13cb3ee02bcb316510cc254d5756fc
2014-09-29 18:04:54 -07:00
Yuta HIGUCHI
7aef393450 NewLine at EOF
Change-Id: I8e53dacb481b3965d18bf6bfa4154c2c697f4699
2014-09-29 10:26:45 -07:00
tom
c52a8a9e22 Merge remote-tracking branch 'origin/master' 2014-09-28 22:42:29 -07:00
alshabib
b7b4063981 initial impl of proxy arp
Change-Id: I131667e8051e88c27f5fa020b580be57fee358ea
2014-09-28 21:30:00 -07:00
Yuta HIGUCHI
2e96389a56 moving around Madan's pieces
update features.xml to use hazelcast distributed bundle for now

Change-Id: I806dc7f9f2f1db1fdfa8e16f083025888b237937
2014-09-27 18:44:17 -07:00