openflowjava.git
9 years agoRemove trailing whitespace 10/13210/2
Robert Varga [Fri, 28 Nov 2014 15:03:49 +0000 (16:03 +0100)]
Remove trailing whitespace

Trailing whitespace generates a lot of warnings -- mass-remove it.

Change-Id: I9b73bc873685576daa80a998a58d1ce55e475c35
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoMass replace CRLF->LF 09/13209/2
Robert Varga [Fri, 28 Nov 2014 14:59:46 +0000 (15:59 +0100)]
Mass replace CRLF->LF

Windows EOLs generate a checkstyle warning. Eliminate them to silence
the build a bit.

Change-Id: I16281420a51e237f516decd64ed46bbe7b4b1461
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoStatic fields should be accessed via class 08/13208/2
Robert Varga [Fri, 28 Nov 2014 15:26:13 +0000 (16:26 +0100)]
Static fields should be accessed via class

This emits a warning in eclipse, so get rid of it.

Change-Id: I92734c32e76cfc6320340de714689aa6c235f34e
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoMake sure to pick up junit version from odlparent 07/13207/2
Robert Varga [Fri, 28 Nov 2014 15:07:41 +0000 (16:07 +0100)]
Make sure to pick up junit version from odlparent

Fixes 4.10/4.11 inconsistency reported by maven. Also migrates imports
of Assert to the new place.

Change-Id: Id0953e69207ac9507b6baa0cc47bfaa938d86655
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoDo not override versions supplied by odlparent 06/13206/2
Robert Varga [Fri, 28 Nov 2014 15:17:06 +0000 (16:17 +0100)]
Do not override versions supplied by odlparent

Remove overrides which cause downgrades.

Change-Id: I7c55209cfce404368bfa732543197a9e1db91539
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoReference odlparent to get common settings 05/13205/1
Robert Varga [Fri, 28 Nov 2014 14:58:54 +0000 (15:58 +0100)]
Reference odlparent to get common settings

Change-Id: If12f2a59b039d43fd8f325445a4246ef578c45a2
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoTest updated according to yangtools string validation change 13/13113/2
Michal Polkorab [Tue, 25 Nov 2014 12:10:50 +0000 (13:10 +0100)]
Test updated according to yangtools string validation change

Change-Id: I61a5a215721ef9d2d98e92a0fa0b15fcf1e43440
Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
9 years agoStatistics loadable / installable in Karaf 09/12909/2
Michal Polkorab [Tue, 18 Nov 2014 09:41:42 +0000 (10:41 +0100)]
Statistics loadable / installable in Karaf

 - created new feature odl-openflowjava-stats in order to ensure correct
   module start
 - created new project openflowjava-config to properly store and delagate
   statistics config file
 - removed stats-collection as a service from configuration xml

Change-Id: If2b94c4ec9bf2a2c8157eaad546672df6e1d1500
Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
9 years agoJConsole support for statistics collection 18/12818/3
Michal Polkorab [Thu, 13 Nov 2014 15:20:44 +0000 (16:20 +0100)]
JConsole support for statistics collection

 - sevice identity moved to spi
 - removed unnecessary methods
 - toString() renamed to getStat()

Change-Id: I84d8c2f333f11c202b3cbb82f55578ea3f7961f9
Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
9 years agoStatistics collection added 06/12606/2
Marian Adamjak [Fri, 7 Nov 2014 13:17:10 +0000 (14:17 +0100)]
Statistics collection added

 - added statistics counters and tests
 - collection configurable through configSubsystem

Change-Id: I0b292174789fbb39ff7abd25fec9b53b35ff7927
Signed-off-by: Marian Adamjak <marian.adamjak@pantheon.sk>
Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
9 years agoStatistics collection - initial change 05/12605/2
Marian Adamjak [Wed, 5 Nov 2014 06:51:27 +0000 (07:51 +0100)]
Statistics collection - initial change

Change-Id: I0f252a08a40b93c5ee280d289b28bdd9c88d8419
Signed-off-by: Marian Adamjak <marian.adamjak@pantheon.sk>
Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
9 years agoBug 2245 - Fixed Avoid cycle between java packages 19/12319/1
Marian Adamjak [Wed, 29 Oct 2014 13:59:47 +0000 (14:59 +0100)]
Bug 2245 - Fixed Avoid cycle between java packages
         - between protocol.impl.core and protocol.impl.connection

Change-Id: Ieb3a5a495fffc679852245b0a70e17c57023d3b1
Signed-off-by: Marian Adamjak <marian.adamjak@pantheon.sk>
9 years agoMaintaining code - Move buildRpcError method into AbstractRpcListener 14/12314/2
Marian Adamjak [Wed, 29 Oct 2014 12:06:57 +0000 (13:06 +0100)]
Maintaining code - Move buildRpcError method into AbstractRpcListener
                 - remove unused method from ConnectionAdapterImpl

Change-Id: I4d25b566fafd28a307345ebdffadcd14e844f2ee
Signed-off-by: Marian Adamjak <marian.adamjak@pantheon.sk>
9 years agoMaintaining code - remove unused class SslTrustManagerFactory 11/12311/1
Marian Adamjak [Wed, 29 Oct 2014 08:45:55 +0000 (09:45 +0100)]
Maintaining code - remove unused class SslTrustManagerFactory

Change-Id: I24a35c5c3ad6a06a27599f689f3de72ab1a47cc1
Signed-off-by: Marian Adamjak <marian.adamjak@pantheon.sk>
9 years agoMaintaining code - review log levels 10/12310/1
Marian Adamjak [Wed, 29 Oct 2014 08:22:47 +0000 (09:22 +0100)]
Maintaining code - review log levels

Change-Id: Ic43628ee1067e112e8c6e1cf21ff9f9a32b0e000
Signed-off-by: Marian Adamjak <marian.adamjak@pantheon.sk>
9 years agoMaintainig code - OFDatagramPacketDecoder, UdpConnectionMap 82/12282/6
Marian Adamjak [Tue, 28 Oct 2014 09:02:15 +0000 (10:02 +0100)]
Maintainig code - OFDatagramPacketDecoder, UdpConnectionMap

Change-Id: I7485108109145b48f605d8f9dce1fee87fad9688
Signed-off-by: Marian Adamjak <marian.adamjak@pantheon.sk>
9 years agoBug 2245 - Fixed critical issues 69/12269/1
Michal Polkorab [Mon, 27 Oct 2014 16:59:11 +0000 (17:59 +0100)]
Bug 2245 - Fixed critical issues

 - Array is stored directly
 - Wait not in loop
 - Naked notify

Change-Id: Ifa9f431b84298d724351c89e8c330a69b8ab1ff3
Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
9 years agoFixed cache logging 67/12267/1
Michal Polkorab [Thu, 23 Oct 2014 14:56:10 +0000 (16:56 +0200)]
Fixed cache logging

 - successful rpc is no more logged as discarded
 - rpc is discarded only when it exceeds specified timeout

Change-Id: I60b334958e76a428c7fa1eebe9a4910c90ef5a8d
Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
9 years agoBUG 2245 - Fixed Magic Number 65/12265/1
Marian Adamjak [Mon, 27 Oct 2014 14:38:02 +0000 (15:38 +0100)]
BUG 2245 - Fixed Magic Number

Change-Id: Ic725d3604d8901c8fd43e31a2f59544df71fe724
Signed-off-by: Marian Adamjak <marian.adamjak@pantheon.sk>
9 years agoBUG 2245 - Fixed Collapsible If Statements 56/12256/2
Marian Adamjak [Mon, 27 Oct 2014 10:11:06 +0000 (11:11 +0100)]
BUG 2245 - Fixed Collapsible If Statements

Change-Id: Idee4d65869ed7041fde16706b4fb8bea2f77bfdd
Signed-off-by: Marian Adamjak <marian.adamjak@pantheon.sk>
9 years agoBUG 2245 - Fixed Modifier Order 55/12255/2
Marian Adamjak [Mon, 27 Oct 2014 10:02:05 +0000 (11:02 +0100)]
BUG 2245 - Fixed Modifier Order

Change-Id: Iba652fb7afe982613c5c5519160c8714de00d1ba
Signed-off-by: Marian Adamjak <marian.adamjak@pantheon.sk>
9 years agoBUG 2245 - Fixed Singular Field 54/12254/2
Marian Adamjak [Mon, 27 Oct 2014 09:57:38 +0000 (10:57 +0100)]
BUG 2245 - Fixed Singular Field

Change-Id: I9489b5e8c9cb221cf7a29e7e41d4c909204ed9c7
Signed-off-by: Marian Adamjak <marian.adamjak@pantheon.sk>
9 years agoBUG 2245 - Fixed Constant Name 50/12250/2
Marian Adamjak [Mon, 27 Oct 2014 09:33:24 +0000 (10:33 +0100)]
BUG 2245 - Fixed Constant Name

Change-Id: I2401601e84f1255212cad3b09f4eaba65df430e9
Signed-off-by: Marian Adamjak <marian.adamjak@pantheon.sk>
9 years agoBUG 2245 - Fixed Redundant Modifier 48/12248/2
Marian Adamjak [Mon, 27 Oct 2014 09:19:32 +0000 (10:19 +0100)]
BUG 2245 - Fixed Redundant Modifier

Change-Id: Iabdb33c37646cd3bff16c978abac73914875aeb5
Signed-off-by: Marian Adamjak <marian.adamjak@pantheon.sk>
9 years agoBUG 2245 - Fix Unnecessary Local Before Return 28/12228/2
Marian Adamjak [Fri, 24 Oct 2014 12:49:12 +0000 (14:49 +0200)]
BUG 2245 - Fix Unnecessary Local Before Return

Change-Id: I6fc4762d8af5cced96e82529cf23d75bb017dffa
Signed-off-by: Marian Adamjak <marian.adamjak@pantheon.sk>
9 years agoBUG 2245 - Fixed Parameter Name 26/12226/2
Marian Adamjak [Fri, 24 Oct 2014 12:20:18 +0000 (14:20 +0200)]
BUG 2245 - Fixed Parameter Name

Change-Id: I06b083325c4c6755ae21afd50f19b970a1a1d69a
Signed-off-by: Marian Adamjak <marian.adamjak@pantheon.sk>
9 years agoBUG 2245 - Fixed Avoid cycle between Java package (TypeToClassKey only) 20/12220/2
Marian Adamjak [Fri, 24 Oct 2014 11:19:40 +0000 (13:19 +0200)]
BUG 2245 - Fixed Avoid cycle between Java package (TypeToClassKey only)

Change-Id: I4496cd238824b1b1430805775e30665a7c199c11
Signed-off-by: Marian Adamjak <marian.adamjak@pantheon.sk>
9 years agoBUG 2245 - Fixed 'Preserve Stack Trace' 14/12214/2
Marian Adamjak [Fri, 24 Oct 2014 06:37:28 +0000 (08:37 +0200)]
BUG 2245 - Fixed 'Preserve Stack Trace'

Change-Id: I53a451b1d2f0691a1de44f671f71b2cd8024076d
Signed-off-by: Marian Adamjak <marian.adamjak@pantheon.sk>
9 years agoBUG-2245 - Fixed Magic Number 60/12260/1
Marian Adamjak [Thu, 23 Oct 2014 12:03:26 +0000 (14:03 +0200)]
BUG-2245 - Fixed Magic Number

Change-Id: I2b1ce6948edb411531ad93a3a85986d97534ae9a
Signed-off-by: Marian Adamjak <marian.adamjak@pantheon.sk>
9 years agoBUG-2245 Sonar technical debt 95/12195/2
Marian Adamjak [Thu, 23 Oct 2014 12:03:26 +0000 (14:03 +0200)]
BUG-2245 Sonar technical debt
   - correct Local Final Variable Name

Change-Id: I4fde8e15edc8893fd9871a268465eb39da5b92b9
Signed-off-by: Marian Adamjak <marian.adamjak@pantheon.sk>
9 years agoBug 2245 - Fixed 'Hide Utility Class Constructor' 99/12199/3
Michal Polkorab [Thu, 23 Oct 2014 10:33:30 +0000 (12:33 +0200)]
Bug 2245 - Fixed 'Hide Utility Class Constructor'

 - also fixed 'Method Type(Generic) Parameter Name'

Change-Id: I4323326dba8a371c65a5d9c1bfeefe867dbcbd4e
Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
9 years agoBug 2245 - Fixed 'Unused formal parameter' 89/12189/3
Michal Polkorab [Thu, 23 Oct 2014 10:33:30 +0000 (12:33 +0200)]
Bug 2245 - Fixed 'Unused formal parameter'

Change-Id: I4feaab675be5cd3459e1f0907c4dffa73da37a32
Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
9 years agoBUG 2245 - Fixed Loose coupling 03/12203/1
Marian Adamjak [Thu, 23 Oct 2014 13:05:23 +0000 (15:05 +0200)]
BUG 2245 - Fixed Loose coupling

Change-Id: I0328d47b3817b4c8aa1f64e81b1e1aea304e97c0
Signed-off-by: Marian Adamjak <marian.adamjak@pantheon.sk>
9 years agoBUG 2245 Fixed Local Variable Names 01/12201/2
Marian Adamjak [Thu, 23 Oct 2014 12:31:50 +0000 (14:31 +0200)]
BUG 2245 Fixed Local Variable Names

Change-Id: Iae8a14c08d5a2d902a0be56bb0a1752132e0e3ab
Signed-off-by: Marian Adamjak <marian.adamjak@pantheon.sk>
9 years agoChange local names of local variables in FeaturesReplyMessageFactory and OxmIpv6ExtHd... 81/12181/2
Marian Adamjak [Thu, 23 Oct 2014 07:25:43 +0000 (09:25 +0200)]
Change local names of local variables in FeaturesReplyMessageFactory and OxmIpv6ExtHdrDeserializer

Change-Id: Id55fae5958725e9526f9a5633f8ea7fde8ac9c5b
Signed-off-by: Marian Adamjak <marian.adamjak@pantheon.sk>
9 years agoEnhancedMessageTypeKey add hash(), ChannelOutboundQueue change address to final and... 79/12179/2
Marian Adamjak [Thu, 23 Oct 2014 07:02:32 +0000 (09:02 +0200)]
EnhancedMessageTypeKey add hash(), ChannelOutboundQueue change address to final and modify constructor

Change-Id: I732e81ff1949a8f9a9c4aa42579d20287faf5e03
Signed-off-by: Marian Adamjak <marian.adamjak@pantheon.sk>
9 years agoCreated unit tests for OFDatagramPacketDecoder, OFDatagramPacketHandler 63/12163/5
Marian Adamjak [Wed, 22 Oct 2014 14:31:08 +0000 (16:31 +0200)]
Created unit tests for OFDatagramPacketDecoder, OFDatagramPacketHandler

Change-Id: I4984189ebc2e93fb186a718bce6e8d787095ed76
Signed-off-by: Marian Adamjak <marian.adamjak@pantheon.sk>
9 years agoBug 2245 - Fixed 'If Stmts Must Use Braces' 86/12186/1
Michal Polkorab [Thu, 23 Oct 2014 10:09:49 +0000 (12:09 +0200)]
Bug 2245 - Fixed 'If Stmts Must Use Braces'

Change-Id: Ibef534ef02ef6058ec34dbca7ec172a03612d8d1
Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
9 years agoAdd unit test for OF13SetFieldActionSerializer (experimenter) 43/12143/4
Marian Adamjak [Wed, 22 Oct 2014 11:05:11 +0000 (13:05 +0200)]
Add unit test for OF13SetFieldActionSerializer (experimenter)

Change-Id: Ib058979325b75cc8972648360b99069d8007db32
Signed-off-by: Marian Adamjak <marian.adamjak@pantheon.sk>
9 years agoFix HelloMessageFactory - repair handling message with bad HelloElementType 37/12137/5
Marian Adamjak [Wed, 22 Oct 2014 05:55:28 +0000 (07:55 +0200)]
Fix HelloMessageFactory - repair handling message with bad HelloElementType
    - when message has bad HelloElementType empty list of elements will return
    - modifying test to follow fix HelloMessageFactory
    - add test for message with padding

Change-Id: Ie6a97f79a4d133b9da07b15023cda60ba74eec2f
Signed-off-by: Marian Adamjak <marian.adamjak@pantheon.sk>
9 years agoIncreased unit test coverage of serialization factories 64/12164/1
Michal Polkorab [Tue, 21 Oct 2014 12:36:29 +0000 (14:36 +0200)]
Increased unit test coverage of serialization factories

Change-Id: Ia284e5e9050b4ab19deb3ba0e5dfa3d0317e2c38
Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
9 years agoIncreased unit test coverage for the rest of deserialization factories 02/12102/2
Michal Polkorab [Tue, 21 Oct 2014 10:36:46 +0000 (12:36 +0200)]
Increased unit test coverage for the rest of deserialization factories

Change-Id: I6dcf3094071fcb8013084469574dc0af48f293bf
Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
9 years agoAdd unit test ChannelOutboundQueue, tested by closed and read only channel 36/12136/1
Marian Adamjak [Tue, 21 Oct 2014 10:20:19 +0000 (12:20 +0200)]
Add unit test ChannelOutboundQueue, tested by closed and read only channel

Change-Id: I7ac6d35c8c2fd09fc53d2cf7974b77a717743aaf
Signed-off-by: Marian Adamjak <marian.adamjak@pantheon.sk>
9 years agoMerge "Increased unit test coverage for some deserialization factories"
michal rehak [Tue, 21 Oct 2014 06:58:06 +0000 (06:58 +0000)]
Merge "Increased unit test coverage for some deserialization factories"

9 years agoIncreased unit test coverage for some deserialization factories 81/12081/1
Michal Polkorab [Mon, 20 Oct 2014 12:25:09 +0000 (14:25 +0200)]
Increased unit test coverage for some deserialization factories

Change-Id: If770094c17a7c2988602d17a7463243cbce63fee
Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
9 years agoRemoved EnhancedKeyRegistryHelper 80/12080/1
Michal Polkorab [Wed, 15 Oct 2014 11:06:19 +0000 (13:06 +0200)]
Removed EnhancedKeyRegistryHelper

 - as it is no longer used

Change-Id: I3f9643cb94f022fd4d784f4afd038af0221aa636
Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
9 years agoAdd unit test - fully covered SwitchConnectionProviderImpl, ConnectionAdapterImpl 49/12049/4
Marian Adamjak [Fri, 17 Oct 2014 12:26:41 +0000 (14:26 +0200)]
Add unit test - fully covered SwitchConnectionProviderImpl, ConnectionAdapterImpl

Change-Id: I038649bd02d95ab8b37888f3a3c22daeaac99caa
Signed-off-by: Marian Adamjak <marian.adamjak@pantheon.sk>
9 years agoAdd unit tests for ExperimenterIdSerializerKey, ExperimenterIdDeserializerKey 48/12048/6
Marian Adamjak [Thu, 16 Oct 2014 13:21:52 +0000 (15:21 +0200)]
Add unit tests for ExperimenterIdSerializerKey, ExperimenterIdDeserializerKey

Change-Id: Iaf2ad17a1b6ceee6ed1ec040cb12943f0964f582
Signed-off-by: Marian Adamjak <marian.adamjak@pantheon.sk>
9 years agoAdd unit tests for EchoInputMessageFactory, EchoReplyInputMessageFactory 13/12013/7
Marian Adamjak [Thu, 16 Oct 2014 13:10:21 +0000 (15:10 +0200)]
Add unit tests for EchoInputMessageFactory, EchoReplyInputMessageFactory

Change-Id: I519e6cf4cb5657be3f506716c999da611079a1d6
Signed-off-by: Marian Adamjak <marian.adamjak@pantheon.sk>
Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
9 years agoAdded unit tests for MultipartReply message factory 72/12072/1
Michal Polkorab [Fri, 17 Oct 2014 10:50:17 +0000 (12:50 +0200)]
Added unit tests for MultipartReply message factory

Change-Id: I5de66ba1a4ae97e527342b7d8de31512d2be5d5a
Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
9 years agoFixed MultipartReply - MeterFeatures capabilities bitmap translation 70/12070/1
Michal Polkorab [Fri, 17 Oct 2014 15:18:20 +0000 (17:18 +0200)]
Fixed MultipartReply - MeterFeatures capabilities bitmap translation

 - meter features test moved into separate file
 - updated name conversion in TableFeatures translation

Change-Id: Iaa85dd176e02cb9d7bd99dd1bce347252de08180
Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
9 years agoBug 2212 - Fixed MultipartReply - GroupFeatures action bitmap translation 43/12043/2
Michal Polkorab [Fri, 17 Oct 2014 10:01:02 +0000 (12:01 +0200)]
Bug 2212 - Fixed MultipartReply - GroupFeatures action bitmap translation

 + added unit test for GroupFeatures type

Change-Id: I3a4dbcdfe274a960dbf26231637324298220602d
Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
9 years agoAdded unit tests for Error and Vendor/Experimenter message factories 23/12023/1
Michal Polkorab [Thu, 16 Oct 2014 14:00:30 +0000 (16:00 +0200)]
Added unit tests for Error and Vendor/Experimenter message factories

 - + covered AbstractInstructionDeserializer

Change-Id: I80804f7e38b42d0b53200e8e06ed41f415152605
Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
9 years agoIncreased unit test coverage for keys 07/12007/1
Michal Polkorab [Thu, 16 Oct 2014 11:13:07 +0000 (13:13 +0200)]
Increased unit test coverage for keys

 - removed check in DeserializationFactory as it is done in DeserializerRegistry
   - also updated DeserializerRegistryImplTest

Change-Id: I4baa4fea035104827b34ec7e1b99e1ca4056dd44
Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
9 years agoImproved unit test coverage for openflowjava/protocol/impl/util/* classes 80/11980/1
Michal Polkorab [Wed, 15 Oct 2014 13:29:38 +0000 (15:29 +0200)]
Improved unit test coverage for openflowjava/protocol/impl/util/* classes

Change-Id: Ic1d68de6e59e61eb245acdce9499202b07647840
Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
9 years agoAdd new tests, fix several mistakes, add and edit copyright comments 74/11974/2
Marian Adamjak [Wed, 15 Oct 2014 11:58:53 +0000 (13:58 +0200)]
Add new tests, fix several mistakes, add and edit copyright comments

Change-Id: Ied68bd5c0f1c713ee7a1d819756101ccf4026181
Signed-off-by: Marian Adamjak <marian.adamjak@pantheon.sk>
9 years agoAdded test 51/11951/3
Marian Adamjak [Tue, 14 Oct 2014 14:03:58 +0000 (16:03 +0200)]
Added test

Change-Id: I2d70d80894a7b7c3f87cf778588a3ce4cf89c119
Signed-off-by: Marian Adamjak <marian.adamjak@pantheon.sk>
9 years agoImproved unit test coverage (covered some untested branches) 57/11957/1
Michal Polkorab [Tue, 26 Aug 2014 08:55:25 +0000 (10:55 +0200)]
Improved unit test coverage (covered some untested branches)

 - Fixed a typo in EncodeConstants javadoc
 - added access to Cache in ConnectionAdapterImpl (only for testing purposes)
 - removed check from SerializationFactory#messageToBuffer
   as it is done in SerializerRegistryImpl

Change-Id: I2e752a883a296f6e097084243aca0b109dd62c27
Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
9 years agoAdded key unit tests 27/11927/2
Marian Adamjak [Mon, 13 Oct 2014 13:42:57 +0000 (15:42 +0200)]
Added key unit tests

Change-Id: Icc1c59f32eb5004860273512bbf1588d388ff4e3
Signed-off-by: Marian Adamjak <marian.adamjak@pantheon.sk>
9 years agoAdded unit tests 26/11926/1
Michal Polkorab [Tue, 16 Sep 2014 12:28:54 +0000 (14:28 +0200)]
Added unit tests

Change-Id: I1b6b771d5748d348e8420d33ee05676dbac4fed3
Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
9 years agoBug 2177 - Updated SwitchConnectionProviderImpl 90/11690/3
Michal Polkorab [Tue, 16 Sep 2014 12:28:54 +0000 (14:28 +0200)]
Bug 2177 - Updated SwitchConnectionProviderImpl

 - added test packaging - to be able to use ConnectionConfigurationImpl in both
   spi and impl

SwitchConnectionProviderImpl:
 - skipped checks for null and already running serverFacade as those are no longer
   needed when using ConfigSubsystem (startup())
 - added check for unknown transport protocol received (createAndConfigureServer())
ExperimenterMessageFactory:
 - fixed EXPERIMENTER_ID_INDEX constant
MessageFactoryInitializer:
 - added Experimenter message deserializers registration

Change-Id: I382d7fed0b626050847dafd47e691b7c9c902285
Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
9 years agoIncrementing versions by 0.1.0 for post-helium master branch 62/11762/1
Michal Polkorab [Mon, 6 Oct 2014 15:14:52 +0000 (17:14 +0200)]
Incrementing versions by 0.1.0 for post-helium master branch

Change-Id: If5011d280b4053c5db9ed3b3d7df671e4f5a6a11
Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
9 years agoRemoved unused extensibility bundles 58/11358/2
Michal Polkorab [Wed, 17 Sep 2014 09:34:40 +0000 (11:34 +0200)]
Removed unused extensibility bundles

 - functionality of removed bundles is present in openflowplugin

Change-Id: I073d2de7e0a3c0dee92511e47c45e44e9be12e16
Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
9 years agoBug 1935 - Double fireConnectionReady notification 77/11277/2
Michal Polkorab [Wed, 17 Sep 2014 09:06:40 +0000 (11:06 +0200)]
Bug 1935 - Double fireConnectionReady notification

 - in case of communication over TCP protocol the fireConnectionReady
   notification was incorrectly triggered twice

Change-Id: I23373a6130ebd30f4f183568e4ddda354976df3f
Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
9 years agoImproved test coverage 51/11051/1
Michal Polkorab [Tue, 9 Sep 2014 13:22:17 +0000 (15:22 +0200)]
Improved test coverage

Change-Id: I0846432b14d880b17ccf1dad5759b3a1c1dcf2af
Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
9 years agoFixed incorrect exception type on deserializer lookup 48/10848/3
Michal Polkorab [Fri, 5 Sep 2014 12:05:26 +0000 (14:05 +0200)]
Fixed incorrect exception type on deserializer lookup

 - removed .toString() call from log
 - updated test to match functionality
 - lowered log level on (de)serializer overwriting

Change-Id: Ie58dc4e4d9bac76532a4df55170ed52e0a0e5fbc
Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
9 years agoAdded warn log on same key registration 73/10773/2
Michal Polkorab [Tue, 22 Jul 2014 12:25:27 +0000 (14:25 +0200)]
Added warn log on same key registration

Change-Id: I7a42f674fa1e2fa4c027a480884ba785b6264646
Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
9 years agoSwitchConnectionProvider javadoc updated 65/10765/2
Michal Polkorab [Tue, 22 Jul 2014 11:29:30 +0000 (13:29 +0200)]
SwitchConnectionProvider javadoc updated

Change-Id: I1a724de6b0abcbf42ee2bdf666aea8a4961d0386
Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
9 years agoBUG-1675: bump netty version 80/10680/2
Robert Varga [Wed, 3 Sep 2014 09:46:40 +0000 (11:46 +0200)]
BUG-1675: bump netty version

This patch depends on https://git.opendaylight.org/gerrit/10679.

Change-Id: Iafec7084afd6c364f9852b7ff76f7cb2f947a637
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoAdded missing extension registration methods + keys (serialization part) 99/10699/1
Michal Polkorab [Wed, 3 Sep 2014 12:29:18 +0000 (14:29 +0200)]
Added missing extension registration methods + keys (serialization part)

Change-Id: I44bd91a975c8bd6e56e9c13aa152999d34c8546f
Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
9 years agoAdded missing extension registration methods + keys (deserialization part) 94/10694/2
Michal Polkorab [Tue, 2 Sep 2014 13:23:08 +0000 (15:23 +0200)]
Added missing extension registration methods + keys (deserialization part)

Change-Id: Id997a3fc52ab8e4491ee74ba61bddec20d23c2d9
Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
9 years agoUDP support implementation 32/10432/3
Michal Polkorab [Thu, 7 Aug 2014 09:54:00 +0000 (11:54 +0200)]
UDP support implementation

 - unit tests will be added in another change

Change-Id: I8b6fba59a82febf60c0ddfb97ef8e2e9267aff56
Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
9 years agoAllow to configure number of threads used by Netty's EventLoopGroups 50/9650/4
Michal Polkorab [Mon, 4 Aug 2014 14:04:10 +0000 (16:04 +0200)]
Allow to configure number of threads used by Netty's EventLoopGroups

Change-Id: I07e95b45069bcc3437add607cf5dc990f263eb0d
Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
9 years agoAdded a get method for InetSocketAddress of a remote OF switch 15/9615/3
Martin Sunal [Sat, 2 Aug 2014 17:24:09 +0000 (19:24 +0200)]
Added a get method for InetSocketAddress of a remote OF switch

Signed-off-by: Martin Sunal <msunal@cisco.com>
9 years agoFixed FIXME on MAC address serialization 59/10359/3
Rob Adams [Fri, 18 Jul 2014 16:53:10 +0000 (09:53 -0700)]
Fixed FIXME on MAC address serialization

 + Fix incorrect log message formatting

Change-Id: Ifc523e1e67e1e29ee3c1271995ca79d6edc8b223
Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
9 years agoMerge "Improve unit test coverage"
michal rehak [Wed, 27 Aug 2014 08:35:09 +0000 (08:35 +0000)]
Merge "Improve unit test coverage"

9 years agoImprove unit test coverage 32/10132/2
Michal Polkorab [Tue, 19 Aug 2014 13:45:29 +0000 (15:45 +0200)]
Improve unit test coverage

Change-Id: I374bcf2c76a4a3b6cba441dc0c0570be7855d8a9
Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
9 years agoFeatures.xml update 87/10287/3
Michal Polkorab [Tue, 26 Aug 2014 08:54:26 +0000 (10:54 +0200)]
Features.xml update

 - removed odl-yangtools-binding-generator feature as it is not needed

Change-Id: Ia6a31f0fd235536a87d86fbd3b47305aab44460c
Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
9 years agoFix karaf features, and add testing for them. 05/10105/2
Ed Warnicke [Wed, 20 Aug 2014 16:09:15 +0000 (11:09 -0500)]
Fix karaf features, and add testing for them.

Change-Id: I272e0b92099d68e72f30138fe42935495ddf7d94
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoMore updates to sonar 43/9743/1
Robert Varga [Wed, 6 Aug 2014 11:55:41 +0000 (13:55 +0200)]
More updates to sonar

- per-test reports
- integration test support
- findbugs reports

Change-Id: Ie6a8865551f3d4957be87ccef4b4820d30a1cbd1
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoFix UT coverage not reported in sonar 31/9731/1
Robert Varga [Wed, 6 Aug 2014 04:56:27 +0000 (06:56 +0200)]
Fix UT coverage not reported in sonar

Just a couple of properties and making sure jacoco runs.

Change-Id: I75aeae7b74f5c7e94a0a237728dc2b6f0c4df090
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoCreated experimenter subtype for vendor's actions 29/9429/6
Martin Sunal [Tue, 29 Jul 2014 10:21:56 +0000 (12:21 +0200)]
Created experimenter subtype for vendor's actions

ExperimenterActionSerializerKey has a new parameter which is type of vendor's action.
It allows to select right serializer directly in OFJava so a vendor does not need to care about it.
- created codec for Nicira match nxm_of_eth_type

Change-Id: Id9bc0f06820cab7b897eb710a70ddc3d6af13a45
Signed-off-by: Martin Sunal <msunal@cisco.com>
9 years agoNicira extensions in OpenFlowJava library 86/8986/16
Martin Sunal [Mon, 14 Jul 2014 12:27:09 +0000 (14:27 +0200)]
Nicira extensions in OpenFlowJava library

- creates and registers codecs(serializers & deserializers) for:
actions:
reg-load
reg-move
matches:
NXM_NX_REG(0-7)
NXM_NX_TUN_ID
NXM_NX_ARP_SHA
NXM_NX_ARP_THA
NXM_OF_ARP_OP
NXM_OF_ARP_SPA
NXM_OF_ARP_TPA
NXM_NX_TUN_IPV4_DST
NXM_NX_TUN_IPV4_SRC
NXM_OF_ETH_SRC
NXM_OF_ETH_DST
- moved CoSS config to appropriate place
- added revision to ietf-yang-types

Change-Id: If847b9098722337318109d3ffe34ddaca8b6b363
Signed-off-by: Martin Sunal <msunal@cisco.com>
Signed-off-by: Michal Rehak <mirehak@cisco.com>
9 years agoCorrected equals & hashcode methods in extension keys 71/9271/1
Martin Sunal [Wed, 23 Jul 2014 22:17:22 +0000 (00:17 +0200)]
Corrected equals & hashcode methods in extension keys

- corrected equals & hashcode methods in keys
- tests for equals & hashcode methods in keys

Signed-off-by: Martin Sunal <msunal@cisco.com>
9 years agoAdded switch TLS keys 25/9225/4
Michal Polkorab [Tue, 22 Jul 2014 09:58:45 +0000 (11:58 +0200)]
Added switch TLS keys

 - this allows to finish exemplary TLS configuration
 - selfSignedSwitch and selfSignedController keystores were moved to src/test/resources
  as they are used only in test
 - other keystores located in src/main/resources were updated with "exemplary-" prefixes
to clearly mark them for exemplary usage

Change-Id: I821f79e1af8b50fc59e3e5067841a017ec9c1282
Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
9 years agoSimplified Multipart TableFeatureProperties serialization 98/8798/2
Michal Polkorab [Mon, 7 Jul 2014 12:10:50 +0000 (14:10 +0200)]
Simplified Multipart TableFeatureProperties serialization

Change-Id: Ifdf3936b5985beba23c94bc1e64dde738a844ca2
Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
9 years agoReplaced usage of BytebufUtils.padBuffer() as it is deprecated 94/8794/2
Michal Polkorab [Mon, 7 Jul 2014 14:28:18 +0000 (16:28 +0200)]
Replaced usage of BytebufUtils.padBuffer() as it is deprecated

 - replaced with buffer.writeZero()

Change-Id: Ica7ef6d244fc531419c42d4055f0d42b09e7ebf0
Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
9 years agoTcpFlag match entry serializer registration fix 20/9220/1
Michal Polkorab [Tue, 22 Jul 2014 07:30:40 +0000 (09:30 +0200)]
TcpFlag match entry serializer registration fix

 - TcpFlag and Tunnel match entry serializers used old keys for registration

Change-Id: Ib0c3944d7d27b3ce8601aa3797d175dc94bce6dd
Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
9 years agoFix: Correct key looked up on experimenter messages 59/9159/2
Michal Polkorab [Fri, 18 Jul 2014 13:56:57 +0000 (15:56 +0200)]
Fix: Correct key looked up on experimenter messages

Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
9 years agoExample of openflowjava extension for nx_action_resubmit 08/8808/5
Michal Polkorab [Tue, 8 Jul 2014 16:21:11 +0000 (18:21 +0200)]
Example of openflowjava extension for nx_action_resubmit

 - configuration file is located in src/main/resources - use this file to load / register this bundle
 - configuration file is exemplary - it registers the NX_ACTION_RESUBMIT into ofjava 6633 and 6653 instances
 - change contains 2 yang files:
   - nx-resubmit-action.yang - shows how to augment existing structures
   - openflow-nx-resubmit-action.yang - shows how to configure custom bundle
 - unit tests test if the structure is (de)serialized correctly

Change-Id: I6ed7226dba83f36deb100de88e5408ae32c060b2
Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
9 years agoUpdated experimenter model 55/9155/1
Michal Polkorab [Wed, 16 Jul 2014 11:36:24 +0000 (13:36 +0200)]
Updated experimenter model

 - all extension-capable-messages have their augmentations (experimenter message is defined - so no augment needed here)
 - these augmentations will be used for vendor / experimenter differentiation

Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
9 years agoExtracted (De)SerializerExtensionProvider interfaces from SwitchConnectionProvider 51/9151/1
Michal Polkorab [Fri, 4 Jul 2014 13:48:35 +0000 (15:48 +0200)]
Extracted (De)SerializerExtensionProvider interfaces from SwitchConnectionProvider

Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
9 years agoSimplified extension registration (part1) 38/9138/2
Michal Polkorab [Thu, 17 Jul 2014 14:00:45 +0000 (16:00 +0200)]
Simplified extension registration (part1)

 - introduced methods for match, action and instruction registration
 - other extension method will be added in part2

Change-Id: I928833e8df6d4a9037fea480ddef4d54d4ac46a6
Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
9 years agoRenamed base identity for match oxm_classes 37/9137/1
Michal Polkorab [Thu, 17 Jul 2014 14:34:19 +0000 (16:34 +0200)]
Renamed base identity for match oxm_classes

 - renamed from "Clazz" to "OxmClassBase"

Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
9 years agoBug 1373 - Fixed NullPointerException on incorrect input 15/9115/2
Michal Polkorab [Thu, 17 Jul 2014 10:21:38 +0000 (12:21 +0200)]
Bug 1373 - Fixed NullPointerException on incorrect input

 - now throws IllegalArgumentException. This is just logged and pushed into Future, the Future delegates the information further to upper ODL layers

Change-Id: I64ac1e4904e8837ab5b26572235bdaf5fac984da
Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
9 years agoCreated special extension keys for more easier (de)serializer (un)registration 63/9063/1
Michal Polkorab [Wed, 16 Jul 2014 12:17:52 +0000 (14:17 +0200)]
Created special extension keys for more easier (de)serializer (un)registration

 - these keys don't need special types in their constructors, because they always use the same type (e.g. Experimenter.class)
 - also created two marker interfaces (Experimenter(De)SerializerKey) to mark appropriate extension keys

Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
9 years agoDeleted openflow-protocol-ext bundle 52/9052/1
Michal Polkorab [Wed, 16 Jul 2014 09:20:27 +0000 (11:20 +0200)]
Deleted openflow-protocol-ext bundle

 - there is another exemplary bundle - more simpler
 - removal needed by upcoming changes

Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
9 years agoUpdated extension registration keys 91/8991/4
Michal Polkorab [Mon, 14 Jul 2014 14:45:04 +0000 (16:45 +0200)]
Updated extension registration keys

 - keys now properly use experimenter ID to distinguish between experimenter messages
 - also updated initialization and registry helper classes

Change-Id: I6177c72397aa7b534cffdf0a9b729fbec2effa50
Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
9 years agoBug 1324 - Buffer released correctly (even if translated dataObject is null) 87/8787/4
Michal Polkorab [Tue, 8 Jul 2014 09:28:48 +0000 (11:28 +0200)]
Bug 1324 - Buffer released correctly (even if translated dataObject is null)

 - updated OFDecoderTest - buffer is now released even on deserialization exception

Change-Id: I1a3a6f17309f795b7db08bf3ed68ea49ab888cf0
Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
9 years agoBug 1323 - Treated expensive logging in OFDecoder and OFFrameDecoder 86/8786/1
Michal Polkorab [Tue, 8 Jul 2014 09:18:55 +0000 (11:18 +0200)]
Bug 1323 - Treated expensive logging in OFDecoder and OFFrameDecoder

Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>