71 Commits

Author SHA1 Message Date
Praseed Balakrishnan
8c67d17142 MPLS label selector and treatment
Change-Id: Id1fba1e04155e6d97de4c8fd95573641537f1b7a
2014-11-15 10:42:36 -08:00
Thomas Vachuska
9b2da21522 Fixing flow rule batches
Problem should now be fixed. Hashing on enums last is a bad
idea because the enum value could be 0.

Change-Id: Ib29e90b393b5285be2807729b52e69b121340f09
2014-11-11 17:08:14 -08:00
Brian O'Connor
e4adf24970 remove actions from flowmod delete
Change-Id: I8cf6e940faf28b4f796e820827c307bf3c65ef16
2014-11-09 02:46:26 -08:00
Pavlin Radoslavov
ff894a2fcb Use Ip4Address and Ip4Prefix inside FlowEntryBuilder when dealing
with IPv4 source or destination.

Change-Id: Ia9084c2361b296d8636052e859c2a2d1516a4a11
2014-11-05 16:09:35 -08:00
Pavlin Radoslavov
23e398d804 Updated the Flow Mod builders (FlowModBuilder, FlowModBuilderVer10,
and FlowModBuilderVer13) to use Ip4Address and Ip4Prefix
instead of the generic IpAddress and IpPrefix when handling
IPv4 source and destination.

Change-Id: If35d735efe4cf557c79dc04eccf38f6a909e4506
2014-11-05 15:17:57 -08:00
Ray Milkey
7808105d8c Add unit test for Instructions class and improve Criteria toString() test
Change-Id: Ie1ffb4ca0c0bcd168625213fecbdb3818a61704e
2014-11-05 12:36:36 -08:00
Praseed Balakrishnan
5c324331e3 Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next 2014-11-03 14:56:44 -08:00
Praseed Balakrishnan
2dd5abd17f Optical Treatment to include SigType 2014-11-03 14:56:28 -08:00
Pavlin Radoslavov
d0e32d7486 Added support for IPv6 addresses to class IpAddress:
- For some of the methods, the IP Version needs to be specified by the
   caller. This applies to the IpPrefix API as well.
 - For now, everywhere IpAddress is used and the IP version has to be
   explicitly specified by the caller, we assume/specify IPv4.
 - Added unit test for class IpAddress: for both IPv4 and IPv6 addresses.
2014-10-31 18:11:43 -07:00
Ayaka Koshibe
3ef2b0db6c vertical feedback path for Role replies
Change-Id: I31bdb85f90901ec79147adeea0df8ceae00ed1dc
2014-10-31 14:02:54 -07:00
Pavlin Radoslavov
855ea2d5b9 Refactor the IpPrefix API and implementation:
* Now IpPrefix uses IpAddress to represent the subnet address
 * The IpPrefix subnet address is masked-out by the prefix length.
   E.g., IpPrefix("1.2.3.4/24") is now stored as IpPrefix("1.2.3.0/24")
 * Removed IpPrefix methods that are not used or don't apply anymore
 * Replaced usage of IpPrefix with IpAddress where appropriate
2014-10-30 15:32:39 -07:00
Pavlin Radoslavov
52307e60ba IpAddress and IpPrefix related cleanup:
* Removed IpAddress.MAX_INET_MASK and use IpPrefix.MAX_INET_MASK_LENGTH
   instead
 * Renamed IpAddress.INET_LEN to INET_BYTE_LENGTH
 * Added IpAddress.INET_BIT_LENGTH, INET6_BYTE_LENGTH, and INET6_BIT_LENGTH
 * Removed methods that are semantically incorrect, or are not needed/used
   - IpAddress.prefixLength()
   - IpAddress.toPrefix()
   - IpAddress.mask()
   - IpAddress.netmask()
   - IpAddress.network()
   - IpAddress.host()
   - IpAddress.isMasked()
   - IpAddress.contains()
   - IpPrefix constructor for version and bytes (but no netmask)
   - IpPrefix.valueOf(int)

 * Misc. other cleanup.
2014-10-29 15:07:37 -07:00
Thomas Vachuska
4f1a60c9fd Revised copyright message. 2014-10-28 13:39:11 -07:00
Jonathan Hart
d4a8bba682 Changed back to using apply-actions in 1.3 because LINC-OE doesn't support write-actions
Change-Id: I5fcd386d329d1d520da31098c81f25c5cd877c1f
2014-10-28 12:44:20 -07:00
Thomas Vachuska
e0f804aa3f Added application ID store; both trivial and distributed variants. 2014-10-27 23:40:48 -07:00
Thomas Vachuska
781d18bfa1 Added copyrights to cli, features, openflow, providers and web code 2014-10-27 10:31:25 -07:00
Yuta HIGUCHI
1b6f5688d0 FlowStatsCollector: collect FlowStats on MASTER sw only
Change-Id: I4a7e808cceeaee209aaf22d85c9fa4dc069d8acc
2014-10-26 19:44:55 -07:00
Jonathan Hart
86e5935289 Change the way 1.3 flow mods are built to support rewrite actions.
Change-Id: I9c1c3059822b19d0665702162dee9904f95127d8
2014-10-24 11:04:27 -07:00
Marc De Leenheer
9eb47ec124 Working lambda treatment & selectors 2014-10-23 14:15:49 -07:00
Marc De Leenheer
4908775b84 Support lambda's in selector & treatment 2014-10-23 13:54:09 -07:00
Madan Jampani
31961c1409 Resolving merge conflicts 2014-10-23 12:06:58 -07:00
Madan Jampani
117aaae1fd Towards a distributed flow rule store 2014-10-23 10:04:05 -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
Ayaka Koshibe
38594c28b5 implement DeviceProvider triggerProbe() to call after mastership change
Change-Id: I65002296189e6a499ef353255a016b013eb24020
2014-10-22 13:40:26 -07:00
alshabib
dfc7afb1a7 distributed link fixes
Change-Id: Iefede001a76834599a5629d843a4325283e42711
2014-10-21 20:13:27 -07:00
Jonathan Hart
bc4a793a00 Allowed flows to be permanent
Change-Id: I61952fe4cbad98be53094c7ec4a474868384b616
2014-10-21 11:46:00 -07:00
Jonathan Hart
11096406ca Changed some non concurrent structures to ConcurrentHashMaps in
SimpleIntentStore and OpenFlowRuleProvider.

Also improved logging in IntentManager so exception stack traces are logged.

Change-Id: I72f5e20893bda633dc36ea271a0f56c0ddb7fb5a
2014-10-20 17:38:38 -07:00
Jonathan Hart
0e12fadd5b Fixed issues with reading masked IP addresses from Loxi 2014-10-17 14:55:13 -07:00
Yuta HIGUCHI
a309989f49 checkstyle fix
Change-Id: I5912abd81b95b2422bfb75454b0fa1b7a9d63f5a
2014-10-17 12:27:14 -07:00
alshabib
da9c64f4a9 Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next 2014-10-17 12:00:35 -07:00
alshabib
3effd04e74 fix for a failed sub batch
Change-Id: Ie686efd41a6815f913e06d1167f2282334a98ecb
2014-10-17 12:00:31 -07:00
Jonathan Hart
34bc61458e Added support for matching TCP ports and fixed flow stat IP address matching 2014-10-17 11:06: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
Jonathan Hart
bcae7bdf0e Removed faulty toInt method and renamed toRealInt to toInt. 2014-10-16 10:26:54 -07:00
Jonathan Hart
dc711bd59d Ported PeerConnectivity onto ONOS next, and implemented a service that can
construct Interface objects based on PortAddresses from HostService.
2014-10-15 11:27:04 -07:00
alshabib
26834584e7 you must call get on futures
Change-Id: I2ed3a9b2250f2a1c6e2e68e35cec50e691702099
2014-10-08 20:15:46 -07:00
alshabib
193525bb7f clean batch operations
Change-Id: I7187de40bb5276d6ae9e9831e5d47d36e16560ad
2014-10-08 18:58:03 -07:00
alshabib
902d41b8cd initial working impl of batch operations
Change-Id: Ie970543dec1104a394c7bcfa6eec24c0538278d6
2014-10-07 16:52:05 -07:00
alshabib
1c319ffc2e the return of the flowentry
Change-Id: I7dbeb6af2014a4df5b0beb7fe0157eaaac63bd0f
2014-10-04 20:29:09 -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
86166b0a67 Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next 2014-10-03 11:38:21 -07:00
alshabib
19fdc12b85 fixed of13 glitches
Change-Id: Iaaaec162cc3b33f25912da8b06e509d1ff7e2ec4
2014-10-03 11:38:19 -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
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
alshabib
6eb438a78b fixes for office deployment
Change-Id: I322dc856cb2f724e1860f3e30b3bcb5445c8fb65
2014-10-01 16:39:37 -07:00
alshabib
7814e9f6e3 office cell and associated fixes (role, idle timeout)
Change-Id: Icc1fbed46c59f9be1d124569779250c0796150ce
2014-09-30 11:52:12 -07:00