openflowjava.git
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>
9 years agoDefault experimenter bundle migrated to ConfigSubsystem 15/8615/5
Michal Polkorab [Fri, 9 May 2014 13:21:05 +0000 (15:21 +0200)]
Default experimenter bundle migrated to ConfigSubsystem

 - updated copyright for ext bundle

Change-Id: I031afe7f1674d4fc44e91be64b5a1cb51bef44ac
Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
9 years agoDefault experimenters moved to separate bundle + unit tests 42/6742/5
Michal Polkorab [Wed, 30 Apr 2014 15:56:11 +0000 (17:56 +0200)]
Default experimenters moved to separate bundle + unit tests

(ConfigSubsystem migration will be added later)

Change-Id: Ia6477919fa56347d1e28fd329949b2fb4b852b55
Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
9 years agoChanged output directory for generated classes 07/8607/2
Michal Polkorab [Thu, 3 Jul 2014 11:17:03 +0000 (13:17 +0200)]
Changed output directory for generated classes

 - generated classes were not cleaned when located in src -> moved to target
 - also modified .gitignore - removed unnecessary lines

Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
9 years agoExtensibility support - added possibility to unregister registered (de)serializers 99/8599/2
Michal Polkorab [Thu, 3 Jul 2014 08:02:51 +0000 (10:02 +0200)]
Extensibility support - added possibility to unregister registered (de)serializers

Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
9 years agoUnified extensibility method names 97/8597/2
Michal Polkorab [Thu, 3 Jul 2014 07:04:37 +0000 (09:04 +0200)]
Unified extensibility method names

 - removed ambiguity - now both registration methods use the same name pattern
 - registerSerializer() now correctly allows usage of HeaderSerializer

Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
9 years agoMerge "Bug 1277 - Move ByteBuffUtils to separate bundle"
Michal Polkorab [Thu, 3 Jul 2014 14:43:16 +0000 (14:43 +0000)]
Merge "Bug 1277 - Move ByteBuffUtils to separate bundle"

9 years agoMerge "Bug 1277 - Move ByteBuffUtils to separate bundle"
Michal Polkorab [Thu, 3 Jul 2014 14:38:47 +0000 (14:38 +0000)]
Merge "Bug 1277 - Move ByteBuffUtils to separate bundle"

9 years agoMerge "Bug 1277 - Move ByteBuffUtils to separate bundle"
Michal Polkorab [Thu, 3 Jul 2014 14:35:26 +0000 (14:35 +0000)]
Merge "Bug 1277 - Move ByteBuffUtils to separate bundle"

9 years agoTLS support - configurable passwords 45/8545/2
Michal Polkorab [Tue, 1 Jul 2014 08:38:24 +0000 (10:38 +0200)]
TLS support - configurable passwords

 - this change allows usage of arbitrary passwords (for keystore, certificate, truststore) instead of hardcoded "opendaylight" password

Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
9 years agoMerge "TLS unit test resources moved from src/main/resources to test/main/resources"
Adam Brcek [Thu, 3 Jul 2014 14:24:23 +0000 (14:24 +0000)]
Merge "TLS unit test resources moved from src/main/resources to test/main/resources"

9 years agoBug 1277 - Move ByteBuffUtils to separate bundle 09/8609/2
Martin Bobak [Wed, 2 Jul 2014 14:04:11 +0000 (16:04 +0200)]
Bug 1277 - Move ByteBuffUtils to separate bundle

- ByteBufUtils moved to bundle utils

Signed-off-by: Martin Bobak <mbobak@cisco.com>
9 years agoBug 1277 - Move ByteBuffUtils to separate bundle 54/8554/3
Martin Bobak [Wed, 2 Jul 2014 13:46:47 +0000 (15:46 +0200)]
Bug 1277 - Move ByteBuffUtils to separate bundle

- constants classes moved form openflow-protocol-impl to openflow-protocol-api

Signed-off-by: Martin Bobak <mbobak@cisco.com>
9 years agoTLS unit test resources moved from src/main/resources to test/main/resources 60/8560/1
Michal Polkorab [Wed, 2 Jul 2014 14:37:32 +0000 (16:37 +0200)]
TLS unit test resources moved from src/main/resources to test/main/resources

 - TLS unit tests access resources via classpath (not relative path)

Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
9 years agoUpdated logging on NotSslRecordException 56/8556/1
Michal Polkorab [Wed, 2 Jul 2014 14:06:40 +0000 (16:06 +0200)]
Updated logging on NotSslRecordException

 - stackTrace was unnecessarily disruptive

Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
9 years agoBug 1277 - Move ByteBuffUtils to separate bundle 52/8552/1
Martin Bobak [Wed, 2 Jul 2014 13:36:14 +0000 (15:36 +0200)]
Bug 1277 - Move ByteBuffUtils to separate bundle

- bundle project directory created
- added dependency on util bundle to openflow-protocol-impl

Signed-off-by: Martin Bobak <mbobak@cisco.com>
9 years agoSimple client framing fix 98/8498/2
Michal Polkorab [Tue, 1 Jul 2014 12:42:37 +0000 (14:42 +0200)]
Simple client framing fix

 - fixes problem when 2 or more messages were sent simultaneously

Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
9 years agoBug 1248 - Pyang validation fixed 31/8531/1
Michal Polkorab [Wed, 2 Jul 2014 09:05:59 +0000 (11:05 +0200)]
Bug 1248 - Pyang validation fixed

Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
9 years agoExtensibility fix - simplified too strict key limitation 25/8525/1
Michal Polkorab [Wed, 2 Jul 2014 06:40:36 +0000 (08:40 +0200)]
Extensibility fix - simplified too strict key limitation

 - MessageTypeKey in SwitchConnectionProvider#registerCustomSerializer was restricted to <E extends DataObject>, which does not allow for use of other objects (such as descendants of BaseIdentity)

Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
9 years agoMerge "Fix Eclipse errors"
Michal Polkorab [Tue, 1 Jul 2014 12:26:45 +0000 (12:26 +0000)]
Merge "Fix Eclipse errors"

9 years agoTLS initialization fix 90/8490/1
Michal Polkorab [Tue, 1 Jul 2014 12:08:47 +0000 (14:08 +0200)]
TLS initialization fix

 - fixed TlsConfiguration object creation - now null instead of empty object

Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
9 years agoTLS support 04/7904/8
jameshall03885 [Mon, 23 Jun 2014 16:54:43 +0000 (12:54 -0400)]
TLS support

TLS is configured in 42-openflowplugin.xml (openflowplugin)
Added tests for:
 - pipeline components
 - TLS classes
 - updated integration test
Added new yang file: openflow-configuration.yang (contains generated classes for library configuration)
Logging updated

Change-Id: I5480b01760377db7de7791594a3b541338a1b43a
Signed-off-by: jameshall03885 <ghall@brocade.com>
Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
9 years agoFix Eclipse errors 40/8440/1
Ed Warnicke [Sun, 29 Jun 2014 22:24:53 +0000 (17:24 -0500)]
Fix Eclipse errors

Copied in the m2e section from controller.

Change-Id: I19694b87833f44d39433dc05ae4e88932b56fc2e
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoEclipse Build Errors - moved generated source for build-helper 94/8194/1
jameshall03885 [Mon, 16 Jun 2014 14:07:44 +0000 (10:07 -0400)]
Eclipse Build Errors - moved generated source for build-helper

Also removed a version override on maven-bundle-plugin

Change-Id: Ia22f3d3c60cbe1ff9c8f096c52c897eb7fc5fb2b
Signed-off-by: jameshall03885 <ghall@brocade.com>
9 years agoRemoved unnecessary writeAndFlush() from OFEncoder 32/7332/2
Michal Polkorab [Thu, 22 May 2014 09:27:44 +0000 (11:27 +0200)]
Removed unnecessary writeAndFlush() from OFEncoder

Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
9 years agoMoved interface part of OFJava config into SPI so that OFPlugin won't need dependency... 19/6919/6
Michal Rehak [Tue, 13 May 2014 17:12:50 +0000 (19:12 +0200)]
Moved interface part of OFJava config into SPI so that OFPlugin won't need dependency on OFJava-IMPL

Change-Id: Ia1c135c1b5d026212e400fe23844c5179d0bb06d
Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
Signed-off-by: Michal Rehak <mirehak@cisco.com>
9 years agoUse ReadTimeoutHandler for IdleHandler 83/7783/2
Robert Varga [Fri, 6 Jun 2014 16:28:50 +0000 (18:28 +0200)]
Use ReadTimeoutHandler for IdleHandler

This converts to using ReadTimeoutHandler, as it has no impact on the
writeout path -- which IdleStateHandler does by attaching listeners to
promises flying by -- which is omething we don't need.

Change-Id: I4e6f4ac862747116aa9f5f4fcaa9fc9d562f7de9
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoStarted using pooled buffers 26/7326/2
Michal Polkorab [Thu, 22 May 2014 06:29:47 +0000 (08:29 +0200)]
Started using pooled buffers

Change-Id: I1d5d583cdc0e7ff16da01f07929b8f17a63135fa
Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
9 years agoUpdated Netty to 4.0.19.Final 27/7727/2
Michal Polkorab [Thu, 5 Jun 2014 09:41:07 +0000 (11:41 +0200)]
Updated Netty to 4.0.19.Final

 - for pooled buffer performance enhancements
 - MERGE AFTER: https://git.opendaylight.org/gerrit/7727

Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
9 years agoCheckstyle maven plugin check - openflowjava 24/7724/1
Milos Fabian [Thu, 5 Jun 2014 09:11:17 +0000 (11:11 +0200)]
Checkstyle maven plugin check - openflowjava

    -violations do not fail build
    -rules defined in yangtools/common/checkstyle-logging
https://git.opendaylight.org/gerrit/#/c/7595/
https://git.opendaylight.org/gerrit/#/c/7108/

Change-Id: Ibf4e7c9dd0bbcc8a26e60a0cead7d2865c32e44d
Signed-off-by: Milos Fabian <milfabia@cisco.com>
9 years agoUse 0-shifting operand 80/7680/1
Robert Varga [Wed, 4 Jun 2014 12:01:49 +0000 (14:01 +0200)]
Use 0-shifting operand

Do not use sign-dependent operator. Should not matter, as we follow up
with mask, but this makes the intent obvious.

Change-Id: Ie5c4df5373d19f6abe8b48df5b965ee43bf3e8eb
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoOptimize ipv4/ipv6 formatting 62/7662/2
Robert Varga [Tue, 3 Jun 2014 22:41:56 +0000 (00:41 +0200)]
Optimize ipv4/ipv6 formatting

IPv4/IPv6 formatting relied on multiple objects until the final string
was produced. This fixes the way the algorithm operates to make it more
obvious, but also more performant.

Change-Id: Idcfbde227e999dc78363c87952bca7dfb376c5b7
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoOptimize time checking in flush() 69/7669/1
Robert Varga [Wed, 4 Jun 2014 09:15:17 +0000 (11:15 +0200)]
Optimize time checking in flush()

Pre-calculate deadline and do not do timeunit conversions while checking
if we should yield.

Change-Id: Ie315a9650f6f7cdbd1bbd2ac611df2a3dfda4975
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoOptimize macAddressToBytes() 61/7661/2
Robert Varga [Tue, 3 Jun 2014 20:59:49 +0000 (22:59 +0200)]
Optimize macAddressToBytes()

Using raw string parsing has some significant overhead. For parsing a
MAC address, we can employ hand-coded routing which has does not
allocate objects and is much more (~140x) more efficient.

Change-Id: Iad1e6bc1618dd1eedcdfbc9f1e55ac49d03ea4aa
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoOptimize mask creation utilities 48/7648/1
Robert Varga [Tue, 3 Jun 2014 16:13:45 +0000 (18:13 +0200)]
Optimize mask creation utilities

This introduces a simpified fillBitMask(), which is much simpler to use
and also much faster.

Change-Id: I5519032e3a83a3ace73c1b383784b1e372870782
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoAdding tunnel ipv4 src/dst openflow augmentations 33/7633/3
Brent Salisbury [Tue, 3 Jun 2014 09:47:42 +0000 (05:47 -0400)]
Adding tunnel ipv4 src/dst openflow augmentations

Augments the low-level openflowjava models and
OF13 implementation to support flow based tunnels
rather then port based tunnels only which is ovsdb
specific thus making a more generic TEP implementation.

I used the v4 parent serializer
AbstractOxmIpv4AddressSerializer since its pretty
class agnostic except for the v4 OpenflowBasic
match but it that is abstracted from the DP and
I don't see any glaring issues uses it. If you
guys would prefer an NXM1Class/NXM0Class specific
ipv4 super just say the word. I have both
implementations local with the same result in the DP.

Output of tests and ovs integration is posted here:
https://gist.github.com/22f0749bba00df1a3cf6

Change-Id: I0f3ebed560bba0137553944fe342704456b4658e
Signed-off-by: Brent Salisbury <brent.salisbury@gmail.com>
9 years agoOptimize macAddressToString and padBuffer 37/7637/1
Robert Varga [Tue, 3 Jun 2014 10:46:40 +0000 (12:46 +0200)]
Optimize macAddressToString and padBuffer

Optimizes macAddressToString to prevent multiple object allocations and
do a straightforward coversion -- speedup of ~6x.

padBuffer() is deprecated in favor of writeZero(), and uses it
internally.

Change-Id: I98264fe1744b66363b8b3fcae4d54b4b78814cc8
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoFlush all entries on channel shutdown 36/7636/1
Robert Varga [Tue, 3 Jun 2014 09:16:00 +0000 (11:16 +0200)]
Flush all entries on channel shutdown

This just makes sure we flush out outstanding queue quickly.

Change-Id: Ib1f7262545f012fe8c418cbe980cc63467a4f654
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoPre-cache key makers 35/7635/1
Robert Varga [Tue, 3 Jun 2014 10:48:56 +0000 (12:48 +0200)]
Pre-cache key makers

These are essentially constants, so there is no need to allocate them
over and over again -- just create a single instance and reuse it. Save
CPU and GC cycles.

Change-Id: I77670f4465d8139c6f218bd6f7dab13b66a5b8fc
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoDo not instantiate Joiner/Splitter 05/7605/1
Robert Varga [Mon, 2 Jun 2014 15:53:18 +0000 (17:53 +0200)]
Do not instantiate Joiner/Splitter

This patch centralized Splitter and Joiner instances to ByteBufUtils,
from where they are used -- reducing object allocation and CPU usage
(due to checks).

As a bonus, this optimizes splitters on single characters to the
simplest possible form, further reducing overhead.

Change-Id: If635656af49967cd17333ebbeef3452091edd5d5
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoDo not instantiate key in fast path 04/7604/1
Robert Varga [Mon, 2 Jun 2014 16:52:09 +0000 (18:52 +0200)]
Do not instantiate key in fast path

This is a constant lookup for each packet -- let's just use a static
key to prevent useless allocations.

Change-Id: I4a81fc04e29607ace710c7a35671420271836066
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoUsed Splitter instead of String.split() - performance improvement 83/7583/3
Michal Polkorab [Mon, 2 Jun 2014 10:58:50 +0000 (12:58 +0200)]
Used Splitter instead of String.split() - performance improvement

- removed ending whitespace characters from .buildBuffer method as those hexStrings should be ended with a hex character

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