Milos Fabian [Wed, 4 Jun 2014 09:19:41 +0000 (11:19 +0200)]
Fixed CInitiated00SrpObjectParser
-fixed parser/serializer to be able read/write TLVs
-removed "final" keyword from class declaration - to be extensible class
Change-Id: I127575163677aeda2813940180007059ea7edbe0
Signed-off-by: Milos Fabian <milfabia@cisco.com>
Milos Fabian [Mon, 12 May 2014 06:42:32 +0000 (08:42 +0200)]
Bug 607 - PCEP Segment Routing - yang model
-created yang model odl-pcep-segment-routing02
-based on http://tools.ietf.org/html/draft-sivabalan-pce-segment-routing-02
-SR-ERO object and subobject
-SR-PCE-CAPABILITY TLV
-related augmentation
-created yang model odl-pcep-lsp-setup-type01
-based on http://tools.ietf.org/html/draft-sivabalan-pce-lsp-setup-type-01
-PATH-SETUP-TYPE TLV
-related augmentations
Change-Id: I9d0b0d1a1ad4adae843c04009d3259fd23f50f2a
Signed-off-by: Milos Fabian <milfabia@cisco.com>
Dana Kutenicsova [Tue, 3 Jun 2014 13:48:11 +0000 (15:48 +0200)]
Added missing augment.
Change-Id: Ia33695afab751e21396d5cd94f86e657ddb2be6a
Signed-off-by: Dana Kutenicsova <dkutenic@cisco.com>
Dana Kutenicsova [Tue, 3 Jun 2014 13:22:55 +0000 (15:22 +0200)]
Fixed failing PCEP tests (wrong readerIndex handling).
Change-Id: I12f54f56b47c40ceed2b40b3981862bcf822fdd4
Signed-off-by: Dana Kutenicsova <dkutenic@cisco.com>
Dana Kutenicsova [Sun, 1 Jun 2014 22:01:43 +0000 (00:01 +0200)]
BUG-612 : switched Labels to ByteBuf.
Change-Id: Ib3ff3cc49022af0193c55d7d0fef6f872ac4f250
Signed-off-by: Dana Kutenicsova <dkutenic@cisco.com>
Dana Kutenicsova [Sun, 1 Jun 2014 21:53:46 +0000 (23:53 +0200)]
BUG-612 : switch XRO to ByteBuf.
Change-Id: I2122ef661f5697a7e8cff8c293aa24b7c200cd0f
Signed-off-by: Dana Kutenicsova <dkutenic@cisco.com>
Dana Kutenicsova [Sun, 1 Jun 2014 21:14:44 +0000 (23:14 +0200)]
BUG-612 : switched ERO to ByteBuf.
Change-Id: Ifb376786285f8dc0abce2405dcdadb9f1f7d0883
Signed-off-by: Dana Kutenicsova <dkutenic@cisco.com>
Dana Kutenicsova [Sun, 1 Jun 2014 20:15:28 +0000 (22:15 +0200)]
Removed unnecessary checks for SRP-ID value.
Change-Id: Ie01e1e47a6b956bfd3c5f15fac3a57fdcca20ef0
Signed-off-by: Dana Kutenicsova <dkutenic@cisco.com>
Dana Kutenicsova [Sun, 1 Jun 2014 17:48:15 +0000 (19:48 +0200)]
BUG-612 : switched RRO subobjects to ByteBuf.
Change-Id: I0a353e9c0196be8b3524014a65ab387c8e09e541
Signed-off-by: Dana Kutenicsova <dkutenic@cisco.com>
Dana Kutenicsova [Sun, 1 Jun 2014 13:15:58 +0000 (15:15 +0200)]
BUG-612 : switched PCEP Tlvs to ByteBuf
Change-Id: I103e4bf0c5104993cded9c281795571786379889
Signed-off-by: Dana Kutenicsova <dkutenic@cisco.com>
Dana Kutenicsova [Sun, 1 Jun 2014 09:04:52 +0000 (11:04 +0200)]
BUG-612 : switch PCEP objects to ByteBuf.
Change-Id: I14a6f1877e0feeb08499807b51632630a79104e3
Signed-off-by: Dana Kutenicsova <dkutenic@cisco.com>
Dana Kutenicsova [Sat, 31 May 2014 21:45:48 +0000 (23:45 +0200)]
BUG-612 : switched PCEP message parsing to ByteBuf.
Change-Id: I4f68539bd8b70097f62506ad655f1d899ef4204f
Signed-off-by: Dana Kutenicsova <dkutenic@cisco.com>
Dana Kutenicsova [Fri, 30 May 2014 13:47:24 +0000 (15:47 +0200)]
Removed additional check for SRP-ID value.
Change-Id: I63b1769899d80dcf94589ba0e62740e8d564ccae
Signed-off-by: Dana Kutenicsova <dkutenic@cisco.com>
Dana Kutenicsova [Fri, 30 May 2014 13:20:08 +0000 (15:20 +0200)]
Fixed various small bugs when testing stateful07 version.
- srp & lsp serializers assumed all flags are present
- missing augmentation of lsp in add-lsp operation
Change-Id: I945fe7adf5f3352760dda8936c74642de91f7f94
Signed-off-by: Dana Kutenicsova <dkutenic@cisco.com>
Martin Bobak [Tue, 27 May 2014 06:16:06 +0000 (08:16 +0200)]
Fixed test failing on windows because of missing resources.
Change-Id: Ic8218f4ce0f6c45995e3ae510377c73fecd901d2
Signed-off-by: Martin Bobak <mbobak@cisco.com>
Robert Varga [Thu, 29 May 2014 13:25:38 +0000 (15:25 +0200)]
Fix integration tests failing on yangtools.util
Yangtools has introduced a new package, which is now required by some of
our dependencies. List it in the pax-exam config.
Change-Id: I9a762339163698fb51e93a8833f8316c3c378b9f
Signed-off-by: Robert Varga <rovarga@cisco.com>
Dana Kutenicsova [Thu, 29 May 2014 10:56:12 +0000 (12:56 +0200)]
BUG-429 : fixed unstable tests when two verify jobs are running.
Change-Id: I176a9322b5f33d2349cc25be9d71d74112bb1cc1
Signed-off-by: Dana Kutenicsova <dkutenic@cisco.com>
Dana Kutenicsova [Tue, 27 May 2014 11:26:18 +0000 (13:26 +0200)]
Removed unused and deprecated message type class.
Change-Id: Ie9586811155b7f689c4446f858df8d2fa88605a4
Signed-off-by: Dana Kutenicsova <dkutenic@cisco.com>
Dana Kutenicsova [Tue, 27 May 2014 09:08:24 +0000 (11:08 +0200)]
BUG-730 : added test for pcep-spi util classes.
Change-Id: I1c89c176a0a5567dd3e2b102e498c47330edced5
Signed-off-by: Dana Kutenicsova <dkutenic@cisco.com>
Dana Kutenicsova [Tue, 27 May 2014 08:43:55 +0000 (10:43 +0200)]
Adjusted SRP-ID range to include 0.
Change-Id: I5c5bcf160c727f018d15f0bc82f107442950a058
Signed-off-by: Dana Kutenicsova <dkutenic@cisco.com>
Tomas Olvecky [Tue, 20 May 2014 15:20:01 +0000 (17:20 +0200)]
Quick fix for failing PAX tests.
This test removes TestHelper that was copied from controller.
There are several drawbacks of current usage of PAX, that this commit
is not solving:
* several abstract classes, each defines its own configuration that is hard
to merge into TestHelper
* PAX in general is not helpful when dealing with resolvation and other errors
* these tests are not run with the actual distribution
Change-Id: Ib4304b3bf3d7e0f0dd33322f0f53de294e66f53f
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>
Dana Kutenicsova [Wed, 14 May 2014 09:11:50 +0000 (11:11 +0200)]
Fixed Ipv4 topology appearing in ipv6 slot.
Change-Id: I4543e4fddba97444190b17b5c46cc334511be131
Signed-off-by: Dana Kutenicsova <dkutenic@cisco.com>
Dana Kutenicsova [Tue, 13 May 2014 14:17:23 +0000 (16:17 +0200)]
Improved logging in PCEP.
Change-Id: I65fc9ff9ab7409317e2cb43033534ad643efb051
Signed-off-by: Dana Kutenicsova <dkutenic@cisco.com>
Dana Kutenicsova [Tue, 13 May 2014 13:54:51 +0000 (15:54 +0200)]
Improved logging in BGP.
Change-Id: Id9d8f726a4ca255280be0ea31e1b217af64c72ee
Signed-off-by: Dana Kutenicsova <dkutenic@cisco.com>
Dana Kutenicsova [Sat, 10 May 2014 20:33:30 +0000 (22:33 +0200)]
Concepts cleanup.
Change-Id: I7ecc2989c14d26c47a8b0add293cd678871ef6fe
Signed-off-by: Dana Kutenicsova <dkutenic@cisco.com>
Dana Kutenicsova [Sat, 10 May 2014 13:55:32 +0000 (15:55 +0200)]
Refactoring util.
Change-Id: I9c26d821c8ebc9c959c966de3b347fc16413895c
Signed-off-by: Dana Kutenicsova <dkutenic@cisco.com>
Dana Kutenicsova [Sat, 10 May 2014 12:01:48 +0000 (12:01 +0000)]
Merge "BUG-731: rename LSPID and SRPID"
Dana Kutenicsova [Sat, 10 May 2014 06:45:42 +0000 (08:45 +0200)]
Refactoring of linkstate module.
- removed ByteList
- refactor to use Multimap to allow for multiple keys in map
- simplified AdjRIBsIn class
- use UnsignedInteger for casting back longs
Change-Id: Iebdf4081bad909fd861d8a10b8b7286f70962038
Signed-off-by: Dana Kutenicsova <dkutenic@cisco.com>
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Fri, 9 May 2014 11:17:26 +0000 (13:17 +0200)]
BUG-731: rename LSPID and SRPID
This adds a bit of documentation and renames the offending generic
arguments to L (for LSP) and S (for SRP).
Change-Id: I2854f2cbc5df345b4febcebc229f7ec22ae5c7fc
Signed-off-by: Robert Varga <rovarga@cisco.com>
Dana Kutenicsova [Fri, 9 May 2014 11:38:55 +0000 (13:38 +0200)]
Removing deprecated getType() method from serializers.
Change-Id: I502916e21f74f546f3e374fa5bdabdcf242731d0
Signed-off-by: Dana Kutenicsova <dkutenic@cisco.com>
Robert Varga [Fri, 9 May 2014 11:23:06 +0000 (11:23 +0000)]
Merge "BUG-730 : added tests for Encoders/Decoders in PCEP."
Robert Varga [Fri, 9 May 2014 09:59:55 +0000 (11:59 +0200)]
BUG-731: do not throw Exceptions
This patch updates the configuration bindings to declare concrete
exceptions as thrown.
Furthermore it removes the ability for a LocRIBListener to throw checked
exceptoins: implementations are expected to handle them from now on.
Change-Id: Iaf4785075ea901af5cd9d9a9ad5e9954526e9a93
Signed-off-by: Robert Varga <rovarga@cisco.com>
Dana Kutenicsova [Fri, 9 May 2014 10:14:20 +0000 (12:14 +0200)]
BUG-730 : added tests for Encoders/Decoders in PCEP.
Change-Id: I07fca73a415f78c7f3e15f5522ea22efbccb44fd
Signed-off-by: Dana Kutenicsova <dkutenic@cisco.com>
Robert Varga [Mon, 7 Apr 2014 11:56:26 +0000 (13:56 +0200)]
Move uptodate into its own container
This patch side-steps the need to read the entire table in order
to update a single leaf (uptodate) by moving it into its own container.
Change-Id: Ib9f31cd4d10e2c2808b374a215ee6f4325e95ef3
Signed-off-by: Robert Varga <rovarga@cisco.com>
Signed-off-by: Dana Kutenicsova <dkutenic@cisco.com>
Robert Varga [Wed, 7 May 2014 13:18:30 +0000 (15:18 +0200)]
Fix nagasena artifact ID
Change-Id: Ic955d272d1007b18dabdd8093e8b6bbc9d220129
Signed-off-by: Robert Varga <rovarga@cisco.com>
Dana Kutenicsova [Wed, 7 May 2014 07:46:07 +0000 (07:46 +0000)]
Merge "BUG-632: add missing module"
Robert Varga [Wed, 7 May 2014 07:15:44 +0000 (09:15 +0200)]
BUG-632: add missing module
This adds the missing controller-config module for TCPMD5.
Change-Id: Id61f93ab9e2c3aaf50ce4b37bd02bded37b4458c
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Tue, 6 May 2014 16:04:35 +0000 (18:04 +0200)]
BUG-731: reduce field visibility
Sonar correctly reports these fields should be private. Let's add
accessors and hide them.
Change-Id: I97e4f6443d22a9b9ed90c3bdab8c3db251d5e4f3
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Tue, 6 May 2014 15:59:48 +0000 (17:59 +0200)]
BUG-731: limit protected field visibility
One field can become private, others get @VisibleForTesting
Change-Id: I2d5214620a83953dae080d4a1f67e1e6470944e9
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Tue, 6 May 2014 15:52:49 +0000 (17:52 +0200)]
BUG-731: hide visible fields
Fields in private class need to have non-private access, so squash the
associated warnings.
Change-Id: Ib285c8d17230452f8958a85e5c2cb0d0fb54df0f
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Tue, 6 May 2014 15:49:29 +0000 (17:49 +0200)]
BUG-731: hide serverSessionManager
It should not be visible, so expose the only functionality required by
subclasses.
Change-Id: Ic90c71080ed14cfcb1afbc67f18f85ab9888ffa5
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Tue, 6 May 2014 15:43:24 +0000 (17:43 +0200)]
BUG-731: simplify CommunitiesParser
We can unify some parts of into common codepaths, so let's do it.
Change-Id: I1e9acba475b5b35e5aba670937776ee9d5e9c236
Signed-off-by: Robert Varga <rovarga@cisco.com>
Dana Kutenicsova [Tue, 6 May 2014 14:11:35 +0000 (14:11 +0000)]
Merge "Bug 187 - PCEP: object parser - report correctly unknown objects"
Milos Fabian [Mon, 5 May 2014 14:59:28 +0000 (16:59 +0200)]
Bug 187 - PCEP: object parser - report correctly unknown objects
-differs between unknown object-class and object-type, returns proper error
Change-Id: I04c5f274294793776c84c4de8875e22d71b9a650
Signed-off-by: Milos Fabian <milfabia@cisco.com>
Robert Varga [Mon, 5 May 2014 14:39:42 +0000 (16:39 +0200)]
BUG-731: unnecessary final keywords
We don't need them, so reduce warnings a bit.
Change-Id: Iac20966ae2ef4a89a7dde6610341f5d549339c43
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Mon, 5 May 2014 14:32:46 +0000 (16:32 +0200)]
BUG-731: remove empty statements
These are not harmful, but let's keep the code clean;
Change-Id: Ifbf7ba2af61e8b5361bf8dba3c1447fb9bd4fc2f
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Mon, 5 May 2014 15:21:50 +0000 (15:21 +0000)]
Merge "BUG-730: cleanup tests in pcep-impl"
Robert Varga [Mon, 5 May 2014 15:21:03 +0000 (15:21 +0000)]
Merge "Remove unnecessary try-catch. OF codes are no longer in an enum."
Robert Varga [Mon, 5 May 2014 15:20:18 +0000 (15:20 +0000)]
Merge "Added open object parser/serializer to basic activator."
Robert Varga [Mon, 5 May 2014 14:24:45 +0000 (16:24 +0200)]
BUG-731: do not declare Exception as thrown
In one place it's completely unneeded, on the other one we can refactor.
Change-Id: I6d84424c02430c33a964013c11e7130cd2f4ec0f
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Mon, 5 May 2014 13:26:37 +0000 (15:26 +0200)]
BUG-731: move annotation
Moving the annotation renders the temporary variable unneeded, which in
turn fixes a warning. The method is simple enough so it does not matter.
Change-Id: I188870a6f5c0ab55f30803d2f944589ee6a74ad9
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Mon, 5 May 2014 13:24:54 +0000 (15:24 +0200)]
BUG-731: simplify boolean expression
This is less obvious, but still as good as the original. Plus it removes
a complaint.
Change-Id: I672a16c41687b319de3918822edc7a4073f5169e
Signed-off-by: Robert Varga <rovarga@cisco.com>
Dana Kutenicsova [Mon, 5 May 2014 13:24:30 +0000 (15:24 +0200)]
BUG-730: cleanup tests in pcep-impl
Change-Id: Ic478b45803faff29d63b01cc986a0dcb135af295
Signed-off-by: Dana Kutenicsova <dkutenic@cisco.com>
Robert Varga [Mon, 5 May 2014 13:22:45 +0000 (15:22 +0200)]
BUG-731: do not assign to parameters
It is convenient to coerce the argument value, but this approach is a
bit more clean and avoids the sonar warning.
Change-Id: I8648e09c5c02bb082321c3a9a858142eaabdc9ea
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Mon, 5 May 2014 13:19:35 +0000 (15:19 +0200)]
BUG-731: do not throw RuntimeException
Let's turn this into an IllegalArgumentException, with a proper message.
Change-Id: I5bb149de83001ea6817c6f58fb1d5d9be41907e1
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Mon, 5 May 2014 13:16:09 +0000 (15:16 +0200)]
BUG-731: rework catch clausule
This eliminates warning about rethrowing exceptions.
Change-Id: I46a3531a7753c049d78919c0134d714a509b29a6
Signed-off-by: Robert Varga <rovarga@cisco.com>
Dana Kutenicsova [Mon, 5 May 2014 13:15:46 +0000 (15:15 +0200)]
Remove unnecessary try-catch.
OF codes are no longer in an enum.
Change-Id: I635565fb04d7439d2bf2bb761d8b39e02785ae48
Signed-off-by: Dana Kutenicsova <dkutenic@cisco.com>
Dana Kutenicsova [Mon, 5 May 2014 13:14:27 +0000 (15:14 +0200)]
Added open object parser/serializer to basic activator.
Change-Id: I4ebb828b67becd89a35880594914daca7e800b5d
Signed-off-by: Dana Kutenicsova <dkutenic@cisco.com>
Robert Varga [Mon, 5 May 2014 12:29:00 +0000 (14:29 +0200)]
BUG-731: move to new APIs
This fixes "Overriding method merely calls super".
Change-Id: I02794a2c2a118cafa847138ad22199a18df4a83c
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Mon, 5 May 2014 12:18:48 +0000 (14:18 +0200)]
BUG-731: fix keyword ordering
Fixes abstract/protected keyword order.
Change-Id: I1d486b1113e0a5dc7f46a6220203e25c806ebd19
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Mon, 5 May 2014 09:47:53 +0000 (11:47 +0200)]
Remove BGPCEP distribution
This distribution is now defunct, so let's remove it.
Change-Id: Ifdfe2d5f19f6f1988ac287f0772a55d794cc1b69
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Mon, 5 May 2014 09:40:56 +0000 (11:40 +0200)]
Add abstract method documentation
This just clarifies the API contract for identifierForKey.
Change-Id: Ia855cc69e36271e317ffc529d0963dc0a314e722
Signed-off-by: Robert Varga <rovarga@cisco.com>
Tony Tkacik [Mon, 5 May 2014 09:04:25 +0000 (11:04 +0200)]
Enabled replace action in PCEP Topology Provider
With legacy compatibility APIs default action of datastore
is merge, enabled replace operation, in order to
assume correct behaviour.
Change-Id: I9302a535e1ea4b4e001e45dae28015dcf45b3362
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
Robert Varga [Sun, 4 May 2014 19:48:26 +0000 (21:48 +0200)]
BUG-731: JMX attributes are static now
The JMX attribute fields are now public static so let's not use object
reference when accessing them.
Change-Id: I1613188a11d528f06ef30183f1eade1c4d60ab79
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Sun, 4 May 2014 19:34:55 +0000 (21:34 +0200)]
BUG-731: remove implied modifier
All methods in an interface are always public, no need to re-state that.
Change-Id: Ibb1c87ab2f2c0a81636607fbfa95dd109ccdc0d6
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Sun, 4 May 2014 19:33:19 +0000 (21:33 +0200)]
BUG-731: remove unused imports
These imports are only used in javadoc -- so let's not do that and
specify the name in full in the javadoc.
Change-Id: I90ebe8da4ff84ca7620d1713630899492a3b09fa
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Sun, 4 May 2014 19:29:47 +0000 (21:29 +0200)]
BUG-731: utility classes should be final
There's no reason to subclass these -- they cannot be instantiated,
anyway.
Change-Id: I6e07c8eba054fb9d6ad5a6c5ee1e12a6c83acd7d
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Sun, 4 May 2014 19:27:09 +0000 (21:27 +0200)]
BUG-731: Raw RuntimeExceptions should not be thrown
They really tell us very little -- so convert them to
IllegalStateExceptions where appropriate.
Change-Id: I885570a0a0ae7972b2227dcd08bf83dcb9f86c5a
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Sun, 4 May 2014 19:20:53 +0000 (21:20 +0200)]
BUG-731: do not use temporary variables
These are single-use and can be easily simplified, so get rid of them.
Change-Id: I50c074fa184f59cfe39df34af05c60b20f6b035a
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Sun, 4 May 2014 19:16:28 +0000 (21:16 +0200)]
BUG-731: do not declare Exception to be thrown
These 7 methods either throw only a subclass of RuntimeException,
or IOException. Declare them accordingly.
Change-Id: I253e659dde725df004f63f156448591ef5e85bbb
Signed-off-by: Robert Varga <rovarga@cisco.com>
Dana Kutenicsova [Sat, 3 May 2014 21:09:10 +0000 (23:09 +0200)]
BUG-730 : added unit tests for stateful02
Change-Id: I0673520a53e5c2c46e0c76bf3a4da8f5a8ef6219
Signed-off-by: Dana Kutenicsova <dkutenic@cisco.com>
Dana Kutenicsova [Sun, 20 Apr 2014 09:15:17 +0000 (11:15 +0200)]
Fixed typo.
Change-Id: Ic346974d03a358a377f36acfbc14c2723222e4e9
Signed-off-by: Dana Kutenicsova <dkutenic@cisco.com>
Robert Varga [Fri, 2 May 2014 05:13:30 +0000 (07:13 +0200)]
BUG-632: supress unneeded round-trips to JNI
This fixes Java logic to not update keys which match.
Change-Id: I7ff22f74cb82066367e4bb77c319ab11eb97eb99
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Thu, 1 May 2014 20:16:47 +0000 (22:16 +0200)]
BUG-632: Fix NIO package thinko
It turns out we cannot just proxy around the Selector and
SelectorProvider -- we have to have our own. This is okay, as we can
nicely drop this in.
Change-Id: Idcda5b263bc584fbd9157f0d0fc57d4af82d08d4
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Thu, 1 May 2014 19:03:36 +0000 (21:03 +0200)]
BUG-632: fix netty binding
It turns out netty is not really friendly to us subclassing its channel
implementations. Rework the implementation such that it subclasses the
netty generic substrate.
Change-Id: Ia25f23a5791fd43d617130f5b11d7cbde713e75f
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Thu, 1 May 2014 14:30:35 +0000 (16:30 +0200)]
BUG-632: add initial configuration bits for TCP-MD5
This patch adds the controller-config bit for tcp-md5 and modifies both
BGP and PCEP configurations to take advantage of it. Since the runtime
support is not universally available, these options are left
deactivated.
Change-Id: I61d455966aada9e0cc68dadab724994ba8dcb794
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Thu, 1 May 2014 14:28:12 +0000 (16:28 +0200)]
BUG-632: fix configuration interactions
This commit fixes various problems in configuration module code, so it
actually works. Key problems addressed:
- netty integration was not returning proper instance
- BGP/PCEP modules need to look at actual implementation mbean, not the
service reference
Change-Id: Iaaf03a5fd94f4a2953f671015bee8f635a4c69d5
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Thu, 1 May 2014 15:31:10 +0000 (17:31 +0200)]
BUG-636: fix PCEP MD5 keys not being propagated
This patch fixes the slight oversight of not passing MD5 keys not being
passed down to the dispatcher.
Change-Id: I54246a7a427c7de4d0e9cc9a4e574653bfe9a956
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Thu, 1 May 2014 16:05:09 +0000 (18:05 +0200)]
BUG-370: update Netty version to 4.0.17
Change-Id: I633489a6d90f5718cdc1bf6e325f0e3ef024d34b
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Wed, 30 Apr 2014 05:53:27 +0000 (07:53 +0200)]
BUG-731: fix unused imports and pom.xml override
There are two unused mockito imports and an config artifact version
override -- fix all three of them.
Change-Id: Id6e5b9b2ed1b5e0427fb10f56b065540f728fe0d
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Tue, 29 Apr 2014 12:43:02 +0000 (14:43 +0200)]
BUG-635: implement MD5 auth option for BGP peers
This adds the wiring for the BGP dispatcher to make use of client/server
channels. It also adds validation support.
Change-Id: Ieb2dc4c60dfcd92d8e7a3f732198ad07a734853e
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Sat, 26 Apr 2014 12:27:54 +0000 (14:27 +0200)]
BUG-636: Add configuration option to PCEP
This patch adds the ability to configure a RFC2385 key on a PCEP server
session. The configuration is accepted only if the runtime supports it,
e.g. PCEPTopologyProviderModule checks for presence before ever
attempting to use it.
Change-Id: I349cdef08655ec56ba2ed413f67ab187b0a9fc0c
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Sun, 27 Apr 2014 10:27:54 +0000 (12:27 +0200)]
BUG-634: add tcpmd5 configuration binding
Change-Id: I64d400fb7083a5e9de8a88d067d4d16358fabfff
Signed-off-by: Robert Varga <rovarga@cisco.com>
Dana Kutenicsova [Tue, 29 Apr 2014 08:57:55 +0000 (08:57 +0000)]
Merge "Remove bgp-update-api-config"
Robert Varga [Tue, 29 Apr 2014 05:19:31 +0000 (07:19 +0200)]
Remove bgp-update-api-config
This bundle has been evacuated before Hydrogen release, but retained for
compatibility purposes. It can be safely removed now.
Change-Id: Ic870a7fd255ed42f0f4aba1ef7a0b9327f9e4504
Signed-off-by: Robert Varga <rovarga@cisco.com>
Milos Fabian [Mon, 28 Apr 2014 13:38:38 +0000 (15:38 +0200)]
Bug 187 - PCEP's message parser should ignore unknow objects with flag P=0
-Fixed: ObjectRegistry#parseObject returns null, so such objects are ignored in message parser.
Change-Id: I14251257e55b0495e592ff213c0aa48cffc15640
Signed-off-by: Milos Fabian <milfabia@cisco.com>
Robert Varga [Sun, 27 Apr 2014 09:54:36 +0000 (11:54 +0200)]
BUG-634: improve netty interface
This introduces dedicated ChannelFactory implementations, which allow
for non-default KeyAccessFactory use in the MD5-enabled sockets.
Change-Id: I7ae2e7400076123f6627fdd4b300130da1799539
Signed-off-by: Robert Varga <rovarga@cisco.com>
Tomas Olvecky [Wed, 9 Apr 2014 11:48:47 +0000 (13:48 +0200)]
Resolve Bug:681 - Fix bgpcep after config-manager tests have been changed.
This must be merged after https://git.opendaylight.org/gerrit/#/c/5964/
is merged.
Change-Id: I2b56c5a5bd4f138b58c96a70fcb8296ba2eff261
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>
Robert Varga [Sat, 26 Apr 2014 17:21:17 +0000 (19:21 +0200)]
BUG-592: use new InstanceIdentifier APIs
This patch gets rid of deprecation warnings stemming from changes to
InstanceIdentifier APIs. These have been optimized to elide as many
list copies as possible and expose utility functions which are very
useful for building temporary instance identifier objects. We attempt to
use them as much as possible.
Change-Id: I7cd8e116eaf2080974ba6d943279f6586298ca50
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Thu, 24 Apr 2014 19:43:35 +0000 (21:43 +0200)]
BUG-634: add connecticity test suite
This patch adds two tests, which test both the positive (matching key)
and negative (mismatched key) scenarios.
Change-Id: Ibee31baa126a54d9cff4d905febad46a812bea21
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Sun, 27 Apr 2014 08:57:16 +0000 (10:57 +0200)]
Easier felix switch
Adjust the comment block such that it is easier to switch to felix for
debugging purposes.
Change-Id: I0207cd1be5158172af5148a5960551aed580aed3
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Fri, 25 Apr 2014 08:53:00 +0000 (10:53 +0200)]
Make sure tests are run in a deterministic order
This simple patch makes sure our order of tests is deterministic and
repeatable. Unit tests should generally be nice and cleanup after
themselves, but that is not always the case and having the ability to
re-create reported conditions is more important than speed.
Change-Id: I51c756a21916e533dd0271db4f6f9e82963f06aa
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Tue, 22 Apr 2014 08:56:47 +0000 (10:56 +0200)]
BUG-634: Rework KeyAccess to work on maps
This fixes an invalid assumptions about how the TCPMD5 API works. It
turns out each FD has a detabase of various keys on a per-address basis,
so we really need to promote the single key into a map of keys.
Also fixes a bundle misconfiguration which prevented it from being
useful in OSGi environment.
Change-Id: Idcbb26383b4e787d7eb8d5d2ce183f5c5a782b2e
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Mon, 21 Apr 2014 05:12:10 +0000 (07:12 +0200)]
BUG-634: add tcpmd5-nio tests
This adds basic tests to the NIO package. These validate correct
operation of MD5ChannelOptions and MD5SocketChannel.
Change-Id: Ic8667416cc575730a814b83ae39a88335b9e611d
Signed-off-by: Robert Varga <rovarga@cisco.com>
Milos Fabian [Fri, 25 Apr 2014 10:42:25 +0000 (12:42 +0200)]
Randomized port number for PCEPTopologyProviderModule instance in PCEPTopologyProviderModuleTest.
Change-Id: Id362d0d9d6b775ddab3ce376dca78f81b97647fe
Signed-off-by: Milos Fabian <milfabia@cisco.com>
Milos Fabian [Tue, 15 Apr 2014 13:06:16 +0000 (15:06 +0200)]
Bug 474 - Added missing config junit tests.
-added config tests in BGP's modules:
-linkstate-config
-parser-spi-config
-topology-provider-config
-rib-spi-config
-created AbstractRibImplModuleTest:
-abstract test class contains mocked md-sal stuff and methods for creating related config module instances
-test classes, where RIBImplModule is injected, or tested directly, should extends this abstract class
-added config tests in PCEP's modules:
-ietf-stateful07
-impl-config (parser modules)
-spi-config
-topology-provider-config
-tunnel-provider-config
-changed dead-timer-value and keep-alive-timer-value type from uint16 into uint8 in pcep-session-proposal-factory config modules
-added config tests in Programming's modules:
-impl-config
-added AbstractInstructionSchedulerTest abstract test class:
-contains mocked md-sal stuff and methods for creating related config module instances
-tests classed, where InstructionSchedulerImplModule is injected, or directly tested, should extends this abstract class
-fixed config tests dependency management
-other minor fixes
Change-Id: I7a439eafb80fd52c4363058d498a3de62129542b
Signed-off-by: Milos Fabian <milfabia@cisco.com>
Robert Varga [Wed, 23 Apr 2014 12:32:26 +0000 (12:32 +0000)]
Merge "Bug 498 - Fixed PCEP and BGP testtools"
Robert Varga [Mon, 21 Apr 2014 05:11:03 +0000 (07:11 +0200)]
BUG-634: add tcpmd5-api tests
Introduce basic tests for API utility classes.
Change-Id: Ic87581edb2d0a9ed767176c23df681b5f14dcaa2
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Mon, 21 Apr 2014 05:03:36 +0000 (07:03 +0200)]
BUG-634: rework packaging
First we split out tcpmd5-api component, which contains the basic
interfaces and classes.
Second we rename tcpmd5-core to tcpmd5-nio to better reflect the fact
this is the binding to java.nio package. We also introduce
DefaultKeyAccessFactoryFactory, which provides a facade to selecting the
best-functioning KeyAccessFactory.
Third we introduce NativeSupportUnavailableException to indicate when
the native support library fails to load/initialize.
Finally we fix invalid javaChannel() reference in tcpmd5-netty, which
should have been called on the superclass.
Change-Id: I1243189ab728abecc473b3aa5a38e9e167b80aad
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Sat, 19 Apr 2014 07:41:51 +0000 (09:41 +0200)]
BUG-634: Rework getKey() implementation
As it turns out, getsockopt(TCP_MD5SIG) is not implemented, which means
we cannot read back the key associated with the channel. This patch
makes sure we cache in the KeyAccess layer and removes the unused native
method.
Change-Id: I941c60afa7380ffddd5745f0e71286e6fcabcdcc
Signed-off-by: Robert Varga <rovarga@cisco.com>