638 Commits

Author SHA1 Message Date
Ray Milkey
9f74c08c6b Fix intent manager unit tests
Change-Id: I4bdde294a6cd181d3acf9218824645714c227bae
2015-02-13 14:13:53 -08:00
Jonathan Hart
5ec32ba0f3 Finished implementation of GossipIntentStore based on new API and semantics.
Change-Id: I1a71d075e5d34ab7b9f7c2533d389235d6da1d9a
2015-02-13 14:13:52 -08:00
Jonathan Hart
d0ba217c33 Fix javadoc issues
Change-Id: I68b5e8feba625104f9a5c9eb62a56654ddea0516
2015-02-13 14:13:48 -08:00
Ray Milkey
abbdcb7761 Unit tests for intent key class
Change-Id: I691b37f1df331e72fcbd1eec356e37547385dcf5
2015-02-13 14:13:22 -08:00
Ray Milkey
4f5d93e992 Fixes for ObjectiveTrackerTest and IntentServiceTest
Change-Id: I10acda2220c2012e0aa07493c2dc91b1a6a81109
2015-02-13 14:13:21 -08:00
Ray Milkey
3af1386461 Keys based on longs should display in hexadecimal
Change-Id: I45d826a4e8c24271d6689f9438d5eca78f557241
2015-02-13 14:13:21 -08:00
Ray Milkey
65cb59ab2a Add toString() method to IntentData for debugging
Change-Id: Ie7787b87df17edf342233980431d87fbb01568c7
2015-02-13 14:13:21 -08:00
Ray Milkey
5ad3966707 Fix bug where the values of keys could change
Change-Id: I34993c413c3f928690701a055ec38c1e7029b473
2015-02-13 14:13:19 -08:00
Jonathan Hart
4fd4ebb9d0 Continue updating GossipIntentStore to new API.
Includes changes to ECMap to support generating timestamps based on values.

Change-Id: Ide55979aaa4f7757e67a6b3efed6e51d45ee318c
2015-02-13 14:12:30 -08:00
Brian O'Connor
2ba63fdba0 Adding version stamping/checking to SimpleIntentStore
Change-Id: I08c0bf5e0f5a89275a72fa0900e52ca996942b79
2015-02-13 14:10:56 -08:00
Ray Milkey
f9af43c2ea Refactoring of IntentId based APIs
- getIntent
- getIntentState
- getInstallableIntents

Change-Id: I6d2073dfa165e0e5adcef46fe5908b563b481a43
2015-02-13 14:10:55 -08:00
Ray Milkey
c357381fc1 ONOS-989 - Add key to toString() methods of intents
Change-Id: Ic82b25e26ab7fb767f3ca571ef7594679c501ba5
2015-02-13 14:10:48 -08:00
Brian O'Connor
7775bdaa09 Intent F/W improvements
- aggregate installables into FlowRuleOperations
 - added some impl. to SimpleIntentStore
 - created Coordinating State

Change-Id: I5b26ec1fdb7aaff9d5da4f21b2d5a249568ac5ac
2015-02-13 14:10:48 -08:00
Ray Milkey
5b3717ea46 Add keys to intents
- use Key class rather than String for intent keys
- add CLI option to specify a string key
- add key field to constructors for connectivity intents
- translate id into a key if no key is specified

Change-Id: I69ffbad93bc3daddf06a67cb0cffa2130e781b37
2015-02-13 14:10:47 -08:00
Brian O'Connor
055fb975c9 Adding Key class for intents
Change-Id: Ib6e586bcc938e062de0b1d6c92e3b885334a4769
2015-02-13 14:10:47 -08:00
Brian O'Connor
0e271dc6d2 Refactored intermediate IntentUpdate classes
Change-Id: I3d4a435ef4aa97559d5407d49f45519098c3f193
2015-02-13 14:10:47 -08:00
Brian O'Connor
db15b04081 started work to parrallize compliation and "installation"
Change-Id: I2e7f03b9f8074ef6f9e1c186009ed3cad6980b49
2015-02-13 14:10:46 -08:00
Brian O'Connor
098da072fe fixed typo and undeprecated a method
Change-Id: Ia15c4df9978ac66d4cd5288f9462d3238958893e
2015-02-13 14:10:46 -08:00
Ray Milkey
2468502d4c Removed deprecated intent operations
Change-Id: I2ca316dab4c1ac1a66fb4ddf101c4adf3302dcd2
2015-02-13 14:10:45 -08:00
Ray Milkey
2da272b94e Removed deprecated classes/interfaces
IntentBatchLeaderEvent
IntentBatchListener
IntentBatchService

Change-Id: I712f0eb0b26d9bfaa820a14022c1dd30943fab27
2015-02-13 14:10:45 -08:00
Sho SHIMIZU
4931ee5dc6 Delete unnecessary semicolon
Change-Id: I2eaa4d900342a665f6dc4731a298b30a9ec40696
2015-02-13 14:10:41 -08:00
Brian O'Connor
03406a4702 IntentStore interface changes
Change-Id: Ifa8728fb4c7edcc6d58a5e071f7252493ab2a578
2015-02-13 14:07:52 -08:00
Brian O'Connor
b499b3594d Updates to Intent Manager and store interface
Change-Id: Ida612bf5d0f4abe7e81d2f307a80f989603015e7
2015-02-13 13:59:20 -08:00
Ray Milkey
24226a2175 Start IntentOperations removal
Change-Id: Ib5fb9c19b37e447a62c61fa33bb98f3d789cbefa
2015-02-13 13:59:20 -08:00
Brian O'Connor
cff03322bf Started refactoring Intent Manager
Introduced IntentData and reworked APIs

Change-Id: I1fa437ceb1b72c4017ac2da1573bfbeb64c0632a
2015-02-13 13:59:19 -08:00
Madan Jampani
393e0f0745 1. Refactored ConsistentMap and StorageServive (renamed from DatabaseService) to api bundle.
2. Misc bug fixes uncovered during testing

Change-Id: I1219c5264831bcfa93565f764511f89de35a949d
2015-02-13 01:57:23 +00:00
Pavlin Radoslavov
febe82cc82 Implement some of the missing IPv6 flowmod treatments
Work toward ONOS-509

The following treatments are added/implemented:
  - IPV6_SRC
  - IPV6_DST
  - IPV6_FLABEL

Also:
 - Renamed L3ModificationInstruction.L3SubType.IP_SRC and IP_DST
   to IPV4_SRC and IPV4_DST (for naming consistency).
 - Few minor fixes in related code: Javadocs, comments, log messages,
   and IP address usage.

Change-Id: I551056f767a37e7cb6ae7d79f4a3929183500b57
2015-02-12 18:24:54 +00:00
Ray Milkey
7b3981b529 Fix Javadoc warnings
Change-Id: I2975b3d7bb581d5574969037e1f99401b94ef3dc
2015-02-12 09:15:44 -08:00
sangho
7ff01813fe ONOS-944: Implemented a Group operation failure handler in GroupManger and SimpleGroupStore.
Change-Id: Ib3be4d534ceff04af2dad0c062fd4cd63d49ee82
2015-02-11 23:56:53 +00:00
Brian O'Connor
72cb19a90e Implementation of new Flow Subsystem:
The subsystem no longer returns futures for tracking completion of work.
Notifications are explicitely returned via a call back mechanism. Also, the
subsystem is now asynchronous.

Change-Id: I1a4cef931c24820f9ae9ed9a5398f163f05dfbc9

more flowservice improvements

Change-Id: I5c9c1b6be4b2ebfa523b64f6f52e7634b7d3e05f

more flowservice impl

Change-Id: I05f6774460effb53ced8c36844bcda2f8f6c096f

Manager to store functional (at least i believe it)

Change-Id: I09b04989bd1004c98fe0bafed4c76714b9155d53

flow subsystem functional: need to fix unit tests

Change-Id: I1667f25b91320f625a03e5e1d5e92823184d9de0

flow subsystem functional

Change-Id: I429b3335c16d4fc16f5d55f233dd37c4d1d6111d

finished refactor of flow subsystem

Change-Id: I1899abc6ff6a974a2018d936cc555049c70a6804

fix for null flow provider to use new api

Change-Id: If2fd9bd5baf74d9c61c5c8085cef8bc2d204cbdc
2015-02-11 21:28:01 +00:00
Pavlin Radoslavov
5e4f754f19 Implement some of the missing Selector and Match Conditions
Work toward ONOS-509

The following match conditions are added/implemented:
  - IPV6_EXTHDR

Also, fixed the match criteria for the optical signal type
to represent unsigned 8 bits integer (per spec).

Change-Id: I925db19cb43c5d9f589c1f090b6a75faabe0a19b
2015-02-09 01:20:09 +00:00
Pavlin Radoslavov
f3b693381d Fix toward ONOS-960 - Signed/unsigned value mismatch for OpenFlow-related
match/action conditions

Fixed the signed/unsigned issue for the match conditions

Also:
  * Reordered some of the code in CriterionCodec.java so the order
    of handling various Criterion types follows the order as defined in
    Criterion.java
    - In the process, removed a duplicated entry for Type.MPLS_LABE
    - Fixed an issue with TCP/UDP/SCTP ports being accessed as 8-bit integers
      instead of 16-bit integers

  * Updated some of the unit tests in CriterionCodecTest.java to use
    larger integer values that could expose better potential bugs in
    the tested code.

Change-Id: I531d13bd258ebc559ce6be716863c01613427a98
2015-02-09 01:16:31 +00:00
Yuta HIGUCHI
32a53c5a85 Instruction related fixes
- Fixed PushHeaderInstructions bug, where half-baked Ethernet instace was used
  only to hold ethernetType. (ONOS-987)

Change-Id: I330a862c8a18206250befbd4e22ee6d189beed83
2015-02-08 01:41:43 -08:00
Thomas Vachuska
4a51e57cbf Adding and fixing javados.
Change-Id: I38eddb0b11630cdd83c5d1e5d5dc393ee2555897
2015-02-07 21:36:23 -08:00
Thomas Vachuska
a1c4ccd831 Updating Javadocs
Change-Id: Iad04f377f571c4879db245c9b96030678faad5b9
2015-02-07 20:54:14 -08:00
Yuta HIGUCHI
cca5e72f99 L2/L3 modification instruction bug fixes
- Fixed instanceOf with wrong type (ONOS-974)
- Aligned #toString() format to be the same as other instructions

Change-Id: I526c2ef8d92660e0b821a10f0cf87ee72a84cdf3
2015-02-05 16:22:57 -08:00
Kunihiro Ishiguro
f1bff5075a WIP: proxy NDP for IPv6.
ONOS-924

Need to implement test cases.

Change-Id: I86b0cb8c3c8d75f7276778e04c1a7166c9bb2f59
2015-02-05 08:58:39 +00:00
Pavlin Radoslavov
d0fd841978 Implement some of the missing Selector and Match Conditions
Work toward ONOS-509

The following match conditions are added/implemented:
  - IN_PHY_PORT
  - IP_DSCP
  - IP_ECN
  - METADATA

Change-Id: I6f529ee90b2b9e0d5046f83c034e8be3faf86d8b
2015-02-05 05:44:00 +00:00
Thomas Vachuska
ebf5e54d44 ONOS-542 Added ability for app bundle to carry it's own artifacts, including feature repo. Fixed onos-package script. Added JSON output to CLI.
Change-Id: If4f2c774d3fc2d68c0a8e91b3084b99d7c75d927
2015-02-05 05:22:53 +00:00
sangho
8995ac580d ONOS-958: Add a Group action to TrafficTreatment subsystem.
Change-Id: I2a377508b9721ee96a5a52b0bb2ed3a960c982ce
2015-02-05 05:00:56 +00:00
Jonathan Hart
ecaa8a8f29 Increase delay for time-based test which is failing a lot.
ONOS-867

Change-Id: I4e93f72ca6a07dba83bffc76f3cf2c09fa909c1f
2015-02-04 18:19:32 +00:00
Jonathan Hart
584d2f3c54 Unit tests for EventuallyConsistentMapImpl.
Most functionality is tested here, except for the anti-entropy code.

ONOS-859.

Change-Id: Ib9e83518f8a91d599364106bc0f7d869e62f5133
2015-02-03 19:34:54 -08:00
Srikanth Vavilapalli
45c27c8c62 ONOS-895: Group manager implementation
Change-Id: Ie183f722fa39012f8de056961715c325e2388e63
2015-02-04 01:01:07 +00:00
Srikanth Vavilapalli
0599d51603 ONOS-885: Group store interface definition and in-memory store implementation
Change-Id: I1125fbc23f1e58bcb8aaf5f67c02da610fa7ef25

ONOS-885: Group store interface definition and in-memory store implementation

Change-Id: Id3794bed63785e10ed86c0b5d90bf875d127224c
2015-02-04 01:00:00 +00:00
Sho SHIMIZU
3c01833353 Remove unnecessary Object declaration in type parameter
Change-Id: I466a2d43e9f9d3effd3860761a97855110b71781
2015-02-03 23:25:11 +00:00
Thomas Vachuska
0cd4de8425 Fixed a few javadoc warnings.
Change-Id: I554712727fdf0b68ea461bd8ab909022037da1cd
2015-02-03 09:17:08 -08:00
Pavlin Radoslavov
320e6c97f8 Implement some of the missing Selector and Match Conditions
Work toward ONOS-509

The following match conditions are added/implemented:
 - UDP_SRC, UDP_DST
 - SCTP_SRC, SCTP_DST
 - ICMPV4_TYPE, ICMPV4_CODE
 - IPV6_FLABEL
 - IPV6_ND_TARGET
 - IPV6_ND_SLL
 - IPV6_ND_TLL

Also:
 * Renamed method
     TrafficSelector.Builder.matchInport(PortNumber port)
   to
     TrafficSelector.Builder.matchInPort(PortNumber port)
   (for consistency with the corresponding method(s) elsewhere)
 * Reordered the code for some of the existing matching conditions
   to follow the order in the OpenFlow spec, so it is easier to
   cross-reference such code.
 * Added missing Javadoc
 * Added few more Criterion.Type values as per OpenFlow spec 1.5.0

Change-Id: I7fc1656f32d8a7280c67d7827e4aa84528b0eafc
2015-02-03 14:40:08 +00:00
Sho SHIMIZU
aba9d009c9 Apply the naming convention to BatchOperationEntry
Resolve ONOS-889

Change-Id: I2001fabba138b9ff5be9a5943d3f020b4c38d195
2015-02-03 00:35:23 +00:00
Yuta HIGUCHI
c7aa50719b typo fix
Change-Id: I2dbb24bcb20eca1049fc7520248a33477d460a64
2015-02-02 15:01:11 -08:00
Ayaka Koshibe
b1224ab24f Revert "FlowRule equals() incorporates FlowId to factor in treatment."
Using Flow ID forces a dependency on the Group/App ID.

This reverts commit 38f8c232295c33a455887366469f81c874bdef94.

Change-Id: Ib08166c8f778228ebbb68f98c763fcc57a9d6771
2015-01-31 00:54:29 +00:00