1812 Commits

Author SHA1 Message Date
Srikanth Vavilapalli
ed12ae5e81 ONOS-985: Sample integration test application for group subsystem
Change-Id: I68352f922e5c7a0800fcc4fa839955769bf925a6
2015-02-17 17:58:49 +00:00
Jonathan Hart
77bdd26ac6 Moved EventuallyConsistentMap classes into their own package.
Change-Id: I930a988a8cd8d47826a6f7d0f4ce23c56446df20
2015-02-17 17:40:49 +00:00
Sho SHIMIZU
c4ebc717a0 Avoid unnecessary instance creation in hashCode()
Change-Id: I9967020cfa80c616909932181be7e3b6862c3757
2015-02-14 10:08:06 +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
Jonathan Hart
9288836389 Return null instead of throw exception for invalid event states.
Change-Id: Ie40ca4dc1c241aa4f27652aa4e8b3f99eb924169
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
Jonathan Hart
2085e0751a Removed deprecated IntentStore#batchWrite() API.
Also javadoc fixes.

Change-Id: I4ccd109a22189f4762afec15a719e42a3b9e4f7b
2015-02-13 14:14:00 -08:00
Ray Milkey
8010bb48a6 Unit test for IntentData class
Change-Id: If98b737b4ddd92ebfb8b2a35ad5d80984b0e681a
2015-02-13 14:13:59 -08:00
Brian O'Connor
ea2ba3e713 Intent manager cleanup
Change-Id: I5a83a69cbaa8f498e5c0ed21588dedf15790d877
2015-02-13 14:13:58 -08:00
Jonathan Hart
07e58be5db Fixes for GossipIntentStore
* State checking to prevent state updates outrunning.
 * Copy IntentData on the way in and out of the store.

Change-Id: Id18164d15c896c5a62376aac17b7c8c2cac420c2
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
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
Brian O'Connor
47bc855fff Updating SimpleIntentStore
Change-Id: Ide940216f05a69875fcb844d36b073e2e4b9988e
2015-02-13 14:13:22 -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
Brian O'Connor
5811ac2285 Updating MockFlowRuleService with new semantics
Change-Id: I0a373e6cb25728ca48736902feedc3ed8869fa44
2015-02-13 14:10:55 -08:00
Jonathan Hart
74c83135c4 Implemented a PartitionManager to keep track of partitions
assigned to instances.

Also updated GossipIntentStore a little to the new API. This work is not
yet complete.

Change-Id: I64d1779b669de51c35da686b65006a80ac4819b0
2015-02-13 14:10:55 -08:00
Jonathan Hart
82b9feca35 Add term information in HazelcastLeadershipService
Implementation based on Hazelcast IAtomicLong.

Change-Id: I9dca40228a84fdb3edf02ffd2cc32d7d38c90378
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
b488b19706 Adding SimpleIntentStore to distributed bundle
Also deactivating GossipIntentStore for now.

Change-Id: I9af7352c64adcf252ed01f7c32c84358146aee93
2015-02-13 14:10:48 -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
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
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
Sho SHIMIZU
5f281a45e4 Refactor: rename "ops" to "data"
Change-Id: I92fc471e545e880d90079923c47c405b29853ed2
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
Sho SHIMIZU
5cb438e386 Pull out inner IntentUpdate sub-classes from IntentManager
Change-Id: Iefec2e3d5929d0e85e40bee24ba4fd0679c13b19
2015-02-13 14:10:46 -08:00
Sho SHIMIZU
8d9d136bd2 Extract a method to create a list of FlowRuleBatchOperation
- Define FlowRuleBatchOperationConvertionException, which is a
  new IntentException sub-class

Change-Id: I798303fa986f573c885b8712ac1dfee1bcaadf95
2015-02-13 14:10:46 -08:00
Sho SHIMIZU
c708f3b4af Remove CompilingFailed because it does nothing
Change-Id: Ibeb244d0a9ebfbf019bc72e1efeacb73c3140cb2
2015-02-13 14:10:46 -08:00