504 Commits

Author SHA1 Message Date
Ray Milkey
144eec5207 Fix Javadoc warnings
Change-Id: I366f2b9f3c11645a3392e0689619bfbad7a9eedd
2015-02-20 20:54:26 +00:00
Brian O'Connor
be28a87c0e Chaning IntentStore.isMaster to take a key
Change-Id: I2d04a6aa7418e06137b0688bcb4e3af060a02b63
2015-02-19 21:50:20 -08:00
Ray Milkey
71ade56cbf Refactor Intent subsystem to eliminate using FlowRuleBatchOperation
Change-Id: Iee76dac5fa9935713ffc370b34ac47d9286ff351
2015-02-20 00:59:03 +00:00
Ray Milkey
cc53abd74e Favor adapter classes over service interfaces in unit tests
In unit tests that are mocking an entire interface, instead
extend the Adapter class so the unused method overrides
are no longer needed.

Change-Id: I6e332cc5cb59410f163deea223fbc94e73d83917
2015-02-20 00:35:32 +00:00
Thomas Vachuska
718d399045 Fixing javadoc configuration and adding some package documentation.
Change-Id: Ibeb58b954b1d5ed1939a70afda3f5523807cee23
2015-02-19 19:08:12 +00:00
Thomas Vachuska
ecb63c5a01 Updated accumulator documentation and refactored names to remove the event heritage.
Change-Id: I2238ab1215281702e670a406fb901ba8a4ef85ce
2015-02-19 18:26:00 +00:00
Pavlin Radoslavov
a2626ef982 Implemented a mechanism to easily add and access Neighbor Discovery protocol
packet options.

Fixes ONOS-1011

Change-Id: I94daa3f3c1297fb9a7b44901927738a29aff030a
2015-02-19 17:17:56 +00:00
Brian O'Connor
b715f62e6c PathIntentInstaller: avoiding calls to Resource Store when unnecessary
Change-Id: I846ca543f922063ddc67a06353f43c590bd57d96
2015-02-18 21:04:54 -08:00
Brian O'Connor
bdc7f00e92 Changing IntentManager to use groupedThreads
Change-Id: I83854c2d6d6fcc8b10a0f50e625aa4be5ff255bb
2015-02-18 21:04:54 -08:00
Brian O'Connor
d12267c7b1 changing FlowRuleManager from cached threadpool to fixed thread pool
Change-Id: Ie24dae672e699447b55411bf3492efa96e2e16c2
2015-02-18 21:04:54 -08:00
alshabib
78baaf2af2 fix for flows stuck in pending add state
Problem is due to two packet requests from different services
for the same selector resulting in the same flow rule.
Since these rules where the same, only one ended up on the data plane,
but sadly only the first request made it into the flow service meaning
that in cases where what was in the flow service does not match what is
on the dataplane resulting in a PENDING_ADD situation.

Change-Id: I4c03e753be6e198e04f0b5263a2aa8cf2edc51e1
2015-02-19 03:05:17 +00:00
Sho SHIMIZU
36a8a6e8ef Move IntentUpdate subclasses to the dedicated package
Resolve ONOS-1051
- Create package "phase" under intent.impl
- Rename IntentUpdate and CompletedIntentUpdate
  - IntentUpdate -> IntentProcessPhase
  - CompletedIntentUpdate -> FinalIntentProcessPhase
- Loosen method/field visibility as short term hack

Change-Id: Idc0fd9a74aadd227d62006d00fee473c63b1fc05
2015-02-18 21:24:10 +00:00
Ray Milkey
024798622b ONOS-1058 - Add application Id to intent withdraw command
Change-Id: I6f660f2e115e4acc9d3c7d1ab2e2115caaf1822f
2015-02-18 19:09:03 +00:00
Ray Milkey
da36c40e9d ONOS-1057 - Remove references to deprecated applyBatch() method
Change-Id: I9215fde6be2acaa2becea58d8b6e5b171ff16817
2015-02-18 18:59:48 +00:00
Hongtao Yin
36f79aa93b Updated calendar server code. Added intent for bi-dirctional path. Added latency as one more parameter in constraints.
Added exception catch for parsing parameters.

Fixed Jenkins checking errors.

Use intent key and 2way intent P2P setup.

Change-Id: Ib2bd25deb793b2a34179cbf8794ca5aa3e427f91
2015-02-18 06:29:22 +00:00
Sho SHIMIZU
d3dcaa16b1 Fix comments
- Delete obsolete TODO comment
- Write Javadoc for IntentUpdate subclasses which have no Javadoc

Change-Id: I2b233fa9741733fd3642bbbe639990b1ce0b7405
2015-02-18 06:27:18 +00:00
Brian O'Connor
ab8ef82294 Fixing bug in withdraw request when current intent is null
Also, demoting some log levels

Change-Id: I4c7e85bc2bc06e08fe62819d4f66ec8111050a07
2015-02-17 18:08:54 -08:00
Brian O'Connor
916de34f16 Disabling FlowRuleExtService components
Change-Id: Ia4a53da3af577280966ad06cb343bcdb4eb68d01
2015-02-17 18:07:32 -08:00
Marc De Leenheer
b473b9dd2d Injecting topology through JSON ConfigProvider works for multi-instance (ONOS-490).
Change-Id: Ib977f4cf9a59ddec360072891fd803c6f9ee84f1

Injecting optical device annotations and ports works for multi-instance (ONOS-870).

Change-Id: Icdde16ef72fc4e47eec7213250b04902083f0537
2015-02-17 23:55:59 +00:00
alshabib
a66a05635c do not initialise the flowext subsystem
Change-Id: I760a95a27fce91c80b5f5f3d396c80e4b0eca378
2015-02-17 15:50:54 -08:00
Ray Milkey
f7329c77eb Remove some deprecated APIs and warnings from BatchOperationEntry
Change-Id: I44daf9646f6d2a60fd7c0ce96d6692ab8a9cdda2
2015-02-17 20:53:41 +00:00
Hongtao Yin
142b758ba3 Initial implementation: The init extended flow rule and store interface APIs
The APIs are for supporting service data to install on network devices.
This is related to JIRA ticket ID ONOS-869.

Updated API code and added implementation code files.

Modified API for supporting payload abstruction, and added routing mechanism for pushing flow rules to devices.
Added more javadoc, and fixed some minor issues.

Updated javadoc, removed unnecessary method, and test code.

Change-Id: I105defc92a9e01b30601fcb56a9dafa086d4adc0
2015-02-17 11:29:03 -08:00
alshabib
93cb57f160 Fix a bug where default rules were not pushed after restarting mininet.
Change-Id: Icf4c7ed009a5938d28b58128cfc226067a0d4c9e
2015-02-17 18:43:34 +00:00
Srikanth Vavilapalli
ed12ae5e81 ONOS-985: Sample integration test application for group subsystem
Change-Id: I68352f922e5c7a0800fcc4fa839955769bf925a6
2015-02-17 17:58:49 +00:00
Michele Santuari
4b6019e449 ONOS-631 #Initial MPLS intent implementation
Change-Id: I6f906b953f06f395cc67e612648802e333c0e581
2015-02-14 10:00:48 +00:00
Pavlin Radoslavov
a1e2656a8e Fix a copy-and-paste bug within method
LinkCollectionIntentInstaller.deactivate() to unregister as an installer.

Change-Id: Ia4ba3aefcbdc8c4e4c23c1ab831c71b6c61626f7
2015-02-13 16:10:43 -08:00
Brian O'Connor
e2eac102fc Using replace instead install when there is already an intent
Fixes the problem of flows being left on the data plane

Change-Id: Iec3db8b460123f2744a57d8c08d14c8effe9ec34
2015-02-13 14:16:23 -08:00
Sho SHIMIZU
95a7baf4fa Remove IntentStore access in IntentUpdate subclasses
Change-Id: I923c62f1d34dc2c911323f11990de5c9788bf655
2015-02-13 14:16:23 -08:00
Brian O'Connor
998f0cc744 adding and removing tracked resources
Change-Id: I5030e1c21a61e54f251dbc5760783f1ac2e4d2d7
2015-02-13 14:14:00 -08:00
Brian O'Connor
ea2ba3e713 Intent manager cleanup
Change-Id: I5a83a69cbaa8f498e5c0ed21588dedf15790d877
2015-02-13 14:13:58 -08:00
Sho SHIMIZU
bb4d827c44 Handle exception that is potentially occurred in WithdrawCoordinating
- Introduce a common parent class, AbstractFailed for IntentUpdate
  subclass representing failure
- Write Javadoc for each class representing failure

Change-Id: I3945642f5985ddd66c11b6de1924b9c1d23a5fc6
2015-02-13 14:13:56 -08:00
Sho SHIMIZU
6aa4fb422d Avoid unnecessary state transition
Change state from WithdrawRequest to Withdrawn directly when
there is nothing in the store with the key

Change-Id: Ia38d02bcff8df7aad35fbb975843c6741ff540f4
2015-02-13 14:13:56 -08:00
Jonathan Hart
2f669364ca Generalize the MultiValuedTimestamp.
Change-Id: I691730d59f440778856afd0e4808ba775eccba0a
2015-02-13 14:13:54 -08:00
Ray Milkey
9f74c08c6b Fix intent manager unit tests
Change-Id: I4bdde294a6cd181d3acf9218824645714c227bae
2015-02-13 14:13:53 -08:00
Jonathan Hart
d0ba217c33 Fix javadoc issues
Change-Id: I68b5e8feba625104f9a5c9eb62a56654ddea0516
2015-02-13 14:13:48 -08:00
Brian O'Connor
47bc855fff Updating SimpleIntentStore
Change-Id: Ide940216f05a69875fcb844d36b073e2e4b9988e
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
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
Ray Milkey
f9af43c2ea Refactoring of IntentId based APIs
- getIntent
- getIntentState
- getInstallableIntents

Change-Id: I6d2073dfa165e0e5adcef46fe5908b563b481a43
2015-02-13 14:10:55 -08:00
Brian O'Connor
5811ac2285 Updating MockFlowRuleService with new semantics
Change-Id: I0a373e6cb25728ca48736902feedc3ed8869fa44
2015-02-13 14:10:55 -08:00
Sho SHIMIZU
b5cd581d4e Handle exception when installing fails
- Catch an IntentException in InstallCoordinating and Installing
- Remove FlowRuleBatchOperationConvertionException because it is unused

Change-Id: I99cf07df811ba8489feb75088f83ddc4ebd93c9e
2015-02-13 14:10:55 -08:00
Sho SHIMIZU
877ec2c51f Handle exception when compiling fails
- Change arguments of the constructor of PathNotFoundException
- Change the catched exception in Compiling.execute()

Change-Id: I3b639ffd585900c2a6dd99aeeb313bf20c6104f4
2015-02-13 14:10:55 -08:00
Sho SHIMIZU
37a24a887a Split Withdrawing class into two classes WithdrawCoordinating and Withdrawing
Resolve ONOS-992
- Rename Coordinating to InstallCoordinating for naming consistency
- Add Javadoc to newly added/modified classes
- Rename uninstallIntent() to uninstallCoordinate() in IntentManager
- Rename coordinate() to installCoordinate() in IntentManager

Change-Id: I226592d96cfd8caf248addab2db0d28803c7ca12
2015-02-13 14:10:55 -08:00
Brian O'Connor
ba1abbe032 adding log for error case
Change-Id: Id0f779ad951ef9d11f6b0afeda2d3cba9239f46a
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
Sho SHIMIZU
0e5cdf259d Remove obsolete comment
Change-Id: Ib14cfa5b287d5852011fe9b16f7397a1da306a45
2015-02-13 14:10:47 -08:00
Sho SHIMIZU
d2d9974332 Ensure a CompletedIntentUpdate subclass is the final state
Change-Id: Icecf8a45fad7cb80f3953dcfc081c344d3fa0adb
2015-02-13 14:10:47 -08:00
Sho SHIMIZU
6a2952909a Add missing @Override annotation
Change-Id: Id6bf4bd0ef9a9094ea5523b2df8ecdaee365ee50
2015-02-13 14:10:47 -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