openflowplugin.git
9 years agoBug 1458 - Migrate to next MD-SAL dataStore API 28/9528/4
Martin Bobak [Thu, 31 Jul 2014 11:58:47 +0000 (13:58 +0200)]
Bug 1458 - Migrate to next MD-SAL dataStore API

- drop-test usage of classes originating from deprecated org.opendaylight.controller.sal.binding.api.data
  and org.opendaylight.controller.sal.core.api.data
  replaced by classes originating from  org.opendaylight.controller.md.sal.binding.api

Change-Id: Id636a4d133484a7524aee24bf40292bb86d6f60c
Signed-off-by: Martin Bobak <mbobak@cisco.com>
9 years agoBug 1254 - increase unit test coverage 73/9473/3
Martin Bobak [Wed, 30 Jul 2014 09:25:14 +0000 (11:25 +0200)]
Bug 1254 - increase unit test coverage

- Fixed issue in PortTranslatorUtil#translatePortFeatures(PortFeatures)
  and PortTranslatorUtil#translatePortFeatures(PortFeaturesV10). Both
  methods were using PortFeatures constructor with arguments in wrong order.
  Added unit test for if correct properties are used as constructor arguments.

Change-Id: I3b5073338616f6de52e0c8403018cec01a53686d
Signed-off-by: Martin Bobak <mbobak@cisco.com>
9 years agoBUG 956 - thread problem 86/9486/3
Timotej Kubas [Tue, 24 Jun 2014 17:48:40 +0000 (19:48 +0200)]
BUG 956 - thread problem
thread problem fixed
added unit tests
OFRpcTaskFactory.createUpdateFlowTask changed - result from flow removing used in further processing
port stats repaired

Change-Id: Idef68139ced6eb5db7a29fb1eb302a105b7a1a4c
Signed-off-by: Timotej Kubas <tkubas@cisco.com>
Signed-off-by: Michal Rehak <mirehak@cisco.com>
9 years agoBug 1458 - Migrate to next MD-SAL dataStore API 27/9527/1
Martin Bobak [Thu, 31 Jul 2014 10:36:27 +0000 (12:36 +0200)]
Bug 1458 - Migrate to next MD-SAL dataStore API

- classes originating from deprecated org.opendaylight.controller.sal.binding.api.data
  and org.opendaylight.controller.sal.core.api.data
  replaced by classes originating from  org.opendaylight.controller.md.sal.binding.api

Change-Id: I53d1c1cb3fa56103b97d7333153e9d145f14559d
Signed-off-by: Martin Bobak <mbobak@cisco.com>
9 years agoreverting to patch set 7 21/8321/9
Prasanna Huddar [Wed, 30 Jul 2014 11:32:29 +0000 (17:02 +0530)]
reverting to patch set 7

Signed-off-by: Prasanna Huddar <prasanna.huddar@ericsson.com>
Change-Id: I7b4a14095545e21bf2f4de325962fcf693931939

9 years agoBug 1254 - Increase unit test coverage 52/9152/2
Martin Bobak [Thu, 17 Jul 2014 21:38:27 +0000 (23:38 +0200)]
Bug 1254 - Increase unit test coverage

Change-Id: I32f02ccb090f8fa7fec88a5b303134953669348d
Signed-off-by: Martin Bobak <mbobak@cisco.com>
9 years agoBUG-432 Registration change 89/9389/1
Michal Rehak [Mon, 28 Jul 2014 15:02:18 +0000 (17:02 +0200)]
BUG-432 Registration change

- removed generic parameter

Change-Id: I9a464bcec927db1ba9a10ee81d327a65a0091267
Signed-off-by: Michal Rehak <mirehak@cisco.com>
9 years agoBUG-1254 test for PortConvertor - tests with all parameters 12/9312/1
Jakub Toth [Fri, 25 Jul 2014 12:01:26 +0000 (08:01 -0400)]
BUG-1254 test for PortConvertor - tests with all parameters

Signed-off-by: Jakub Toth <jatoth@cisco.com>
9 years agoBug 545 - Added exemplary TLS configuration 52/9252/3
Michal Polkorab [Wed, 23 Jul 2014 06:17:46 +0000 (08:17 +0200)]
Bug 545 - Added exemplary TLS configuration

 - uncommenting the code takes effect only after https://git.opendaylight.org/gerrit/#/c/9225/ is merged
   and keys are used inside mininet for tls communication

Change-Id: I4397d094a35a429f8393466b6d69ae700a61cc4a
Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
9 years agoRevert "Bug 545 - Added exemplary TLS configuration" 45/9245/1
Ed Warnicke [Tue, 22 Jul 2014 21:19:49 +0000 (16:19 -0500)]
Revert "Bug 545 - Added exemplary TLS configuration"

This reverts commit 8d5aced73d32bcadc6dbd0a8229db797448fe1dd.

Change-Id: Ia2dffab4f4af5fcea0dba5ecb867682a32a070c6
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoBug 545 - Added exemplary TLS configuration 21/9021/5
Michal Polkorab [Tue, 15 Jul 2014 13:17:34 +0000 (15:17 +0200)]
Bug 545 - Added exemplary TLS configuration

 - takes effect after https://git.opendaylight.org/gerrit/#/c/9225/ is merged

Change-Id: If5724ea5b63abb6ee874709b06629694f4f5f323
Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
9 years agoAdded conversion for Tunnel Endpoints to ofplugin 22/7722/6
Brent Salisbury [Thu, 5 Jun 2014 08:39:25 +0000 (04:39 -0400)]
Added conversion for Tunnel Endpoints to ofplugin

Patchset #2:
-Added a few comments to oftestprovider, renumbered
the test functions and rebased.
-Dependencies for this are already merged into
controller and openflowjava.
-Test results after rebase at:
https://gist.github.com/ebb81b8344696a951de6

Patchset #1:
-Per conversations tracked in bug 1133 adding
support for flow based TEPs. As soon as
the openflow implementation is extensible
we will pull them into a seperate bundle.
In the meantime this prevents blocking.
-I broke out a couple of extension specific
type conversions that refernce NXM1Class into
a class named NxmExtensionsConvertor.
-Test and results at:
https://gist.github.com/20d049c8c61a7a03e2c7

Change-Id: I8c0e5fbe8d68eb123cabbe58db49823424d1dfb0
Signed-off-by: Brent Salisbury <brent.salisbury@gmail.com>
9 years agoBUG-1397 Openflowjava corresponding changes for experimenter model update 88/9188/2
Michal Polkorab [Mon, 21 Jul 2014 08:22:30 +0000 (10:22 +0200)]
BUG-1397 Openflowjava corresponding changes for experimenter model update

 - DO NOT MERGE before https://git.opendaylight.org/gerrit/#/c/9155/ is merged

BUG-1307 - unit test NP fix (caused by yangtools fix)

Change-Id: I1b9a1f07821aa265fea4f280914d4fc2f0d975a6
Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
Signed-off-by: Michal Rehak <mirehak@cisco.com>
9 years agoFix various null pointer exceptions caused by flows with an empty match 79/8879/3
Rob Adams [Wed, 9 Jul 2014 22:14:16 +0000 (15:14 -0700)]
Fix various null pointer exceptions caused by flows with an empty match
Add unit tests where possible

Change-Id: I893d47dd92daf3fd8d9a2155dc6a6bf32949f7dc
Signed-off-by: Rob Adams <readams@readams.net>
9 years agoMerge "BUG 1310 Simplefix - guarded shake() from late arriving HELLO"
Abhijit Kumbhare [Tue, 15 Jul 2014 22:52:24 +0000 (22:52 +0000)]
Merge "BUG 1310 Simplefix - guarded shake() from late arriving HELLO"

9 years agoBug - 1008 Define checked exceptions 38/8838/2
Martin Bobak [Tue, 8 Jul 2014 15:36:08 +0000 (17:36 +0200)]
Bug - 1008 Define checked exceptions

- IllegalStateException thrown by MessageDispatchServiceImpl#getConnectionAdapter
  is replaced by ConnectionException
- all Future<RpcResult<T>> methods return RpcError wrapped in RpcResult if
  ConenctionException is thrown by MessageDispatchServiceImpl#getConnectionAdapter
  when method is called
- openfloplugin-api bundle added to integration tests

Change-Id: Ib930dfc2ab19e56eea43022b586979c6bc52d034
Signed-off-by: Martin Bobak <mbobak@cisco.com>
9 years agoBug - 1008 Define checked exceptions 37/8837/2
Martin Bobak [Tue, 8 Jul 2014 13:57:17 +0000 (15:57 +0200)]
Bug - 1008 Define checked exceptions

- introduced ConnectionException

Change-Id: I9b5c8594ecc1a4e3134a1643f961970f88a76eda
Signed-off-by: Martin Bobak <mbobak@cisco.com>
9 years agoBUG-1332 added cbench distribution 96/8796/4
Michal Rehak [Tue, 8 Jul 2014 12:09:11 +0000 (14:09 +0200)]
BUG-1332 added cbench distribution

- derived from base distribution
- zipped image is produced by default
- included into modules in order to make cbench distribution available
  as result of each automated build

Change-Id: I695c0189a8a6448aa9fa5ee3414fb100fb0fa7a4
Signed-off-by: Michal Rehak <mirehak@cisco.com>
9 years agoBUG 1310 Simplefix - guarded shake() from late arriving HELLO 00/8900/2
jameshall03885 [Thu, 10 Jul 2014 15:04:30 +0000 (11:04 -0400)]
BUG 1310 Simplefix - guarded shake() from late arriving HELLO

Added two new IT scenarios.  The NoVBM_OF10_TwoHello produces a
duplicate datapathId problem prior to this fix.

Change-Id: Idedac4524acd15d77df73223cd75d67b5b1f4887
Signed-off-by: jameshall03885 <ghall@brocade.com>
9 years agoBug 1008 - Define checked exceptions 91/8791/2
Martin Bobak [Tue, 8 Jul 2014 11:47:25 +0000 (13:47 +0200)]
Bug 1008 - Define checked exceptions

- introduced openflowplugin-api bundle

Change-Id: I6e349c8e58b72a23ead8664f2865108040060d8b
Signed-off-by: Martin Bobak <mbobak@cisco.com>
9 years agoFix Eclipse errors. 41/8441/4
Ed Warnicke [Sun, 29 Jun 2014 22:32:35 +0000 (17:32 -0500)]
Fix Eclipse errors.

Change-Id: I9003ba36f54442636c9d93e72e99c91a738b8dd5
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoRemoved redundant dependency 79/8779/1
Martin Bobak [Tue, 8 Jul 2014 08:17:14 +0000 (10:17 +0200)]
Removed redundant dependency

Change-Id: Ief98a7304ae875cbf32d6f7ced66b92b576e1692
Signed-off-by: Martin Bobak <mbobak@cisco.com>
9 years agoMake configuration of msg-spy in local distro clearer 30/8730/3
Ed Warnicke [Mon, 7 Jul 2014 11:05:43 +0000 (06:05 -0500)]
Make configuration of msg-spy in local distro clearer

This patch:
1)  Gets the initial config from the
openflowplugin-controller-config bundle
2)  Adds a local 43-msg-spy.xml to configure
msg-spy

Change-Id: I2ce87eedb97fc1784aa81c8016983af5deb89959
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoBug 1312 - msg-spy config validation fix 28/8728/3
Vaclav Demcak [Thu, 3 Jul 2014 07:21:48 +0000 (09:21 +0200)]
Bug 1312 - msg-spy config validation fix

* fix for commited  BugFix 542 - Plugin internal stats
* fix for forgotten TODO task (initialization method in PluginProvider)

* refactoring for internal statistics
* add internal statistic confSubsystem module
* add MXBean for statistic's report

Change-Id: I1e734063396b2e5344ebd755fde19cea85ac1490
Signed-off-by: Vaclav Demcak <vdemcak@cisco.com>
9 years agofix for BUG 587 84/5784/2
Martin Bobak [Wed, 26 Mar 2014 20:42:40 +0000 (13:42 -0700)]
fix for BUG 587

- reduced tripple registered salFlowListener to one instance
- removed "flow" from message - this listeners catches all error messages

Change-Id: I82f87d71586e5e5de43e7a2a67daa43304a99d17
Signed-off-by: Martin Bobak <mbobak@cisco.com>
9 years agoBug 542 - Plugin internal stats 66/8666/2
Vaclav Demcak [Thu, 3 Jul 2014 07:21:48 +0000 (09:21 +0200)]
Bug 542 - Plugin internal stats

* refactoring for internal statistics
* add internal statistic confSubsystem module
* add MXBean for statistic's report

Change-Id: I2574d16bb087538dc0f85963717a0160c5729112
Signed-off-by: Vaclav Demcak <vdemcak@cisco.com>
9 years agoBug-1307 - unit test failing (NPE) 67/8667/1
Martin Bobak [Fri, 4 Jul 2014 13:05:23 +0000 (15:05 +0200)]
Bug-1307 - unit test failing (NPE)

Change-Id: I9f1714fc9a7c4e3de0b7e73927dda308ccaef062
Signed-off-by: Martin Bobak <mbobak@cisco.com>
9 years agoBUG 1302 Fix NullPointerException in MultipartReplyTranslator 47/8647/1
Rob Adams [Thu, 3 Jul 2014 22:30:14 +0000 (15:30 -0700)]
BUG 1302 Fix NullPointerException in MultipartReplyTranslator

Signed-off-by: Rob Adams <readams@readams.net>
9 years agoAdded a missing nullcheck in stats converter 34/8634/1
Ed Warnicke [Thu, 3 Jul 2014 19:42:59 +0000 (14:42 -0500)]
Added a missing nullcheck in stats converter

There was a missing null check in
FlowStatsResponseConvertor

This pre-existing bug was uncovered when a bug was fixed in the
setCookie() method that caused it to stop inappropriately accepting
nulls.

Change-Id: I1a1bcc8f9de1cc49573b468726418520081159fb
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoBUG-1277 Add missing openflowplugin.util dependency to distribution pom 29/8629/3
Rob Adams [Thu, 3 Jul 2014 16:19:38 +0000 (09:19 -0700)]
BUG-1277 Add missing openflowplugin.util dependency to distribution pom

Signed-off-by: Rob Adams <adams@noironetworks.com>
Change-Id: I3e409b36a10c0faf908538b68e78fcab3fa9ad35

9 years agoBUG-1277 Reflection of OFJava's ByteBufUtils move on OFPlugin 27/8627/1
Michal Rehak [Thu, 3 Jul 2014 17:10:31 +0000 (19:10 +0200)]
BUG-1277 Reflection of OFJava's ByteBufUtils move on OFPlugin

- added the introduced bundle as dependency to distribution/base

Change-Id: I6924b5ce86e164846f5df2e7b75ea65d7f07aff2
Signed-off-by: Michal Rehak <mirehak@cisco.com>
9 years agoBUG-1297 + BUG-1277 Reflection of OFJava's ByteBufUtils move on OFPlugin 08/8608/5
Martin Bobak [Thu, 3 Jul 2014 09:00:09 +0000 (11:00 +0200)]
BUG-1297 + BUG-1277 Reflection of OFJava's ByteBufUtils move on OFPlugin

Merge only after these two are merged :

https://git.opendaylight.org/gerrit/#/c/8552/
https://git.opendaylight.org/gerrit/#/c/8554/
https://git.opendaylight.org/gerrit/#/c/8609/

BUG-1297 flowCookie with null value (unit test blocker)

- added if-branch in order not to create flowCookie if null input

Change-Id: Ib4149f9f41a6b3b2b7b84ec6713d83391db598a9
Signed-off-by: Martin Bobak <mbobak@cisco.com>
Signed-off-by: Michal Rehak <mirehak@cisco.com>
9 years agoMerge "Bug 1254 - OFP test coverage increase"
michal rehak [Thu, 3 Jul 2014 11:52:42 +0000 (11:52 +0000)]
Merge "Bug 1254 - OFP test coverage increase"

9 years agoBug 1254 - OFP test coverage increase 87/8487/3
Martin Bobak [Mon, 30 Jun 2014 13:52:32 +0000 (15:52 +0200)]
Bug 1254 - OFP test coverage increase

- ByteUtil is final with private constructor instead of being abstract
- ByteUtil#bytesToUnsignedInt expects its paramater to be exactly 4 bytes long
- ByteUtil#bytesToUnsignedShort expects its parameter to be exactly 2 bytes long
- ByteUtil tests added

Change-Id: I7820bb0e0c33070317c08c1f3fd9a65ce99f6f09
Signed-off-by: Martin Bobak <mbobak@cisco.com>
9 years agoBug 1254 - OFP test coverage increase 27/8527/1
Martin Bobak [Wed, 2 Jul 2014 08:20:12 +0000 (10:20 +0200)]
Bug 1254 - OFP test coverage increase

- PacketInUtil is final with private constructor instead of being abstract
- added unit test for PacketInUtil#getMdSalPacketInReason method

Change-Id: I260c3f92580187de93b4ce7a16512c4a13b9882b
Signed-off-by: Martin Bobak <mbobak@cisco.com>
9 years agoCorresponding change for openflowjava - TLS support (https://git.opendaylight.org... 84/8484/2
Michal Polkorab [Tue, 1 Jul 2014 09:45:31 +0000 (11:45 +0200)]
Corresponding change for openflowjava - TLS support (https://git.opendaylight.org/gerrit/#/c/7904)

Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
9 years agoBug 1254 - OFP test coverage increase 52/8452/3
Martin Bobak [Mon, 30 Jun 2014 12:01:49 +0000 (14:01 +0200)]
Bug 1254 - OFP test coverage increase

- FlowCreatorUtil is final with private constructor instead of being
abstract

Change-Id: I063f114279582598770c03e00c3e947c6ee7a4e8
Signed-off-by: Martin Bobak <mbobak@cisco.com>
9 years agoBUG-1257 cbench data store test is failing 53/8453/1
Michal Rehak [Mon, 30 Jun 2014 12:10:22 +0000 (14:10 +0200)]
BUG-1257 cbench data store test is failing

- added order value required by instruction
- changed capability in IT (copied from sal-binding-it)

Change-Id: I7adb2ae47e98fb01792229a87bff4718ca88a164
Signed-off-by: Michal Rehak <mirehak@cisco.com>
9 years agoBug-835 - Reserve Ports should be logical ports, part2 22/8422/1
Michal Rehak [Fri, 27 Jun 2014 20:21:07 +0000 (22:21 +0200)]
Bug-835 - Reserve Ports should be logical ports, part2

- spread ofVersion parameter
- improved logical port number usage
- unit tests

Change-Id: I904baefdb62db7d9e49f1eede765bbb389aa7b03
Signed-off-by: Michal Rehak <mirehak@cisco.com>
9 years agoBug-835 - Reserve Ports should be logical ports 18/7618/3
Kamal Rameshan [Thu, 19 Jun 2014 02:42:41 +0000 (19:42 -0700)]
Bug-835 - Reserve Ports should be logical ports

- rebased
- spread ofVersion parameter

Change-Id: I62aa6b441642c8677396522462527d42526775d1
Signed-off-by: Kamal Rameshan <kramesha@cisco.com>
Signed-off-by: Michal Rehak <mirehak@cisco.com>
9 years agoBUG-709 packetIn and connectionCookie 80/8180/3
Michal Rehak [Fri, 20 Jun 2014 15:12:37 +0000 (17:12 +0200)]
BUG-709 packetIn and connectionCookie

- started sending connectionCookie up to MD-SAL wrapped in packetIn
- started honoring connectionCookie coming down from MD-SAL
  wrapped in TransmitPacketInput
- fixed NPE when auxiliary identifier missing

Change-Id: I1f3d1e4392cc8e3b766c4f90ac251e1692ba37eb
Signed-off-by: Michal Rehak <mirehak@cisco.com>
9 years agoMerge "Bug 1187 - of-flow: instruction/.../action/set-field with missing detail in...
michal rehak [Mon, 23 Jun 2014 09:32:57 +0000 (09:32 +0000)]
Merge "Bug 1187 - of-flow: instruction/.../action/set-field with missing detail in operational data store"

9 years agoMerge "Bug 1186 - of-flow: pop-mpls-action different in config and operational data...
michal rehak [Mon, 23 Jun 2014 09:28:20 +0000 (09:28 +0000)]
Merge "Bug 1186 - of-flow: pop-mpls-action different in config and operational data store"

9 years agoBug 1187 - of-flow: instruction/.../action/set-field with missing detail in operation... 15/8215/1
Anilkumar Vishnoi [Sat, 21 Jun 2014 04:39:31 +0000 (10:09 +0530)]
Bug 1187 - of-flow: instruction/.../action/set-field with missing detail in operational data store

Change-Id: Ie69c5d87b6a26fa9a6aef98b6523ed4603daae5c
Signed-off-by: Anilkumar Vishnoi <avishnoi@in.ibm.com>
9 years agoBug 1229: POM Restructuring for reliable weekly automated releases 99/8199/2
Vaishali Mithbaokar [Fri, 20 Jun 2014 22:22:07 +0000 (15:22 -0700)]
Bug 1229: POM Restructuring for reliable weekly automated releases

Change-Id: I8561e847251a2ea99b2c7fac63591091de8a63cb
Signed-off-by: Vaishali Mithbaokar <vmithbao@cisco.com>
10 years agoBug 1186 - of-flow: pop-mpls-action different in config and operational data store 31/8131/1
Anilkumar Vishnoi [Wed, 18 Jun 2014 19:25:46 +0000 (00:55 +0530)]
Bug 1186 - of-flow: pop-mpls-action different in config and operational data store

Change-Id: I9b13cd917200504c24b2892590661a85824899cb
Signed-off-by: Anilkumar Vishnoi <avishnoi@in.ibm.com>
10 years agoBUG-1075: ingress back pressure 58/7458/9
Michal Rehak [Tue, 27 May 2014 11:43:42 +0000 (13:43 +0200)]
BUG-1075: ingress back pressure

- added fair competition queue keeper implementation
- added queueProcessor (harvesting and processing messages)
- per-connection-queues register for queueProcessor and are blocked if polling queue is full
- removed netty thread blocking by publish
- added dropping of messages
- added meaningful names to threads
- added harvester, queues zipper, messageSource registration stuff
- changed ticketPool to blocking if poolQueue full
- doubleCheckedLocking for harverster starving
- handshake pool switched to logging implementation
- onHello method is no more synchronized
- for messages {hello, features} timeout = 8s
- optimized synchronized singleton methods
- used ThreadFactoryBuilder
- processed comments

Change-Id: Ic0b4ebc2df4e19793fa1d1d125a0d31dd2f9c6c8
Signed-off-by: Michal Rehak <mirehak@cisco.com>
10 years agoBug 1185 :of-flow: push-mpls-action different in config and operational data store 02/8002/1
Anilkumar Vishnoi [Fri, 13 Jun 2014 20:45:13 +0000 (02:15 +0530)]
Bug 1185 :of-flow: push-mpls-action different in config and operational data store

Change-Id: I2fac5b3eaeced2a1f93f963fc7a180dc164fc589
Signed-off-by: Anilkumar Vishnoi <avishnoi@in.ibm.com>
10 years agoKaraf integration with plugin 20/7620/9
Prasanna Huddar [Tue, 3 Jun 2014 06:13:25 +0000 (11:43 +0530)]
Karaf integration with plugin

Signed-off-by: Prasanna Huddar <prasanna.huddar@ericsson.com>
Change-Id: I1ffa7ff3ae2d88b63c69a3c7bdc6a8c28ce2db4d

10 years agoBug 1181 : of-flow: Flow match criteria (ipv6-source,ipv6-destination) is different... 57/7957/2
Anilkumar Vishnoi [Thu, 12 Jun 2014 19:06:35 +0000 (00:36 +0530)]
Bug 1181 : of-flow: Flow match criteria (ipv6-source,ipv6-destination) is different in config and operational database

- added unit test

Change-Id: I186d9bdd67a62fa8f98606a8f3ad76d99ef56fec
Signed-off-by: Anilkumar Vishnoi <avishnoi@in.ibm.com>
Signed-off-by: Michal Rehak <mirehak@cisco.com>
10 years agoMerge "Use openflowjava-supplied MAC address utilities"
michal rehak [Thu, 12 Jun 2014 06:05:49 +0000 (06:05 +0000)]
Merge "Use openflowjava-supplied MAC address utilities"

10 years agoMerge "Bug-1152:Converting PopVlan to StripVlan for OF1.0"
michal rehak [Thu, 12 Jun 2014 06:04:51 +0000 (06:04 +0000)]
Merge "Bug-1152:Converting PopVlan to StripVlan for OF1.0"

10 years agoBug-1152:Converting PopVlan to StripVlan for OF1.0 87/7887/2
Kamal Rameshan [Wed, 11 Jun 2014 02:09:23 +0000 (19:09 -0700)]
Bug-1152:Converting PopVlan to StripVlan for OF1.0

Change-Id: If2d3e8f1ffdc6bbd089d5d073fab55d88fac9900
Signed-off-by: Kamal Rameshan <kramesha@cisco.com>
Bug-1152:Converting StripVlan to PopVlan for OFP-SAL traffic

Change-Id: If2d3e8f1ffdc6bbd089d5d073fab55d88fac9900
Signed-off-by: Kamal Rameshan <kramesha@cisco.com>
10 years agoMerge "Bug 1072 -Add OF13 pre-req for PCP match in TestCommandProvider"
michal rehak [Wed, 11 Jun 2014 16:09:40 +0000 (16:09 +0000)]
Merge "Bug 1072 -Add OF13 pre-req for PCP match in TestCommandProvider"

10 years agoBug 1072 -Add OF13 pre-req for PCP match in TestCommandProvider 73/7373/2
Brent Salisbury [Sun, 25 May 2014 05:02:18 +0000 (01:02 -0400)]
Bug 1072 -Add OF13 pre-req for PCP match in TestCommandProvider

-OXM_OF_VLAN_PCP requires a VID match pre-req. The function
f80() results in a OFPBAC_MATCH_INCONSISTENT since it is
only matching on nw_dst and not a vid.

-Patching this seperate from Bug-1072/Patch-ba79f4f in
case there was a specific reason for this combination
that is outside the spec.

Field: OXM_OF_VLAN_PCP
Dependency: VLAN VID!=NONE
Reference: See table 10, section A.2.3.5 for validation

Change-Id: Ie88b5b9bbfdfa9634252b79242fc333c0b966f77
Signed-off-by: Brent Salisbury <brent.salisbury@gmail.com>
10 years agoMerge "Bug-1137:Handling OF-SAL Match for Vlan range of FFFF"
michal rehak [Tue, 10 Jun 2014 11:35:44 +0000 (11:35 +0000)]
Merge "Bug-1137:Handling OF-SAL Match for Vlan  range of FFFF"

10 years agoBug 1035 - Invalid mask in CommandProvider for uint64/byte conversion 74/7374/3
Brent Salisbury [Sun, 25 May 2014 07:37:14 +0000 (03:37 -0400)]
Bug 1035 - Invalid mask in CommandProvider for uint64/byte conversion

Patchset3: typo on last commit. This resolves both the mask
and goto table issues.

Patchset2: Added Michal's recommendation on the tunnel mask
and that looks good to go now.

After digging I saw the root of tunnelId failures was
actually due to the GotoTable Instructions function
was setting the GotoTable->2 which was also the same
table as the writeTable->2 transaction. Since the OF
spec requires forward progress at the end of each table
this was causing function f48() but also f6() to fail.

Change-Id: If975da5e872115495a7c1b38553a5e2bfe4a18ea
Signed-off-by: Brent Salisbury <brent.salisbury@gmail.com>
10 years agoBug-1137:Handling OF-SAL Match for Vlan range of FFFF 44/7844/1
Kamal Rameshan [Tue, 10 Jun 2014 02:08:22 +0000 (19:08 -0700)]
Bug-1137:Handling OF-SAL Match for Vlan  range of FFFF

Change-Id: I14b7284940e45254445fc89077fc231039c412ed
Signed-off-by: Kamal Rameshan <kramesha@cisco.com>
10 years agoBug-1137:Vlan-id defaulted to 65535 for OF1.0. Depends on yangtools patch 7793 94/7794/3
Kamal Rameshan [Sat, 7 Jun 2014 00:11:06 +0000 (17:11 -0700)]
Bug-1137:Vlan-id defaulted to 65535 for OF1.0. Depends on yangtools patch 7793

Change-Id: I942576f2269a23e8d938d80d43feaa294f476cb1
Signed-off-by: Kamal Rameshan <kramesha@cisco.com>
10 years agoUse openflowjava-supplied MAC address utilities 60/7660/4
Robert Varga [Tue, 3 Jun 2014 21:57:54 +0000 (23:57 +0200)]
Use openflowjava-supplied MAC address utilities

The implementations provided here are trivial and do not perform as well
as they could. openflowjava has optimized versions of these, so use
those.

Change-Id: I895b9e2d0268b8497590438195c644c97967abfe
Signed-off-by: Robert Varga <robert.varga@pantheon.sk>
10 years agoUse non-sign-extending shift 79/7679/3
Robert Varga [Wed, 4 Jun 2014 11:59:59 +0000 (13:59 +0200)]
Use non-sign-extending shift

Just a precaution of intent: use shift which introduces 0, not
sign-dependent.

Change-Id: I370805c1d1dd5e9ba3893768767f1cb6047acbbd
Signed-off-by: Robert Varga <robert.varga@pantheon.sk>
10 years agoDrop-test: remove minor janitorial things 74/7674/3
Robert Varga [Wed, 4 Jun 2014 10:29:21 +0000 (12:29 +0200)]
Drop-test: remove minor janitorial things

- remove superfluous constructors
- remove supresswarnings
- optimize sb.append a tiny bit

Change-Id: Id9e4662f4212e0160bf4095f21a66d709f179372
Signed-off-by: Robert Varga <robert.varga@pantheon.sk>
10 years agoDroptest: optimize builder allocation 73/7673/3
Robert Varga [Wed, 4 Jun 2014 08:58:47 +0000 (10:58 +0200)]
Droptest: optimize builder allocation

Builder can be reused between invocations, so let's cache it in a
thread-local variable.

Change-Id: Ib76f1d10aabd95d896d81c5be33d42230ee3f366
Signed-off-by: Robert Varga <robert.varga@pantheon.sk>
10 years agoDroptest: unify packet handling 72/7672/3
Robert Varga [Wed, 4 Jun 2014 07:43:53 +0000 (09:43 +0200)]
Droptest: unify packet handling

Rework the two implementation to make sure they do equivalent
processing, such that the difference between the two really is only the
way they propage changes through the system.

Change-Id: I01cb2daea78747a5659d04da65c810188b3e38c6
Signed-off-by: Robert Varga <robert.varga@pantheon.sk>
10 years agoBUG-1134: Added TCP flag conversions between md-sal and openflowjava 07/7607/3
Brent Salisbury [Mon, 2 Jun 2014 19:03:25 +0000 (15:03 -0400)]
BUG-1134: Added TCP flag conversions between md-sal and openflowjava

-Conversions from high level model (model-flow-base)
to low level models (ofjava).

-Test included in OpenflowpluginTestCommandProvider
as function addMDFlow f83() for testing.

-Test results here:
https://gist.github.com/04f96a080eb7ee32413b

---- Extensions info (see BUG-1133) ----
Support for extensions in OFPlugin is not going to be implemented
this way (for POC it is temporarily ok). Vendor specific messages
should be modeled in vendor bundle (augmenting MD-SAL or OFJAVA-API
models). Current strategy is based on trasnparent forwarding of
vendor messages through OFPlugin.
More info will be shortly at
https://wiki.opendaylight.org/view/OpenDaylight_OpenFlow_Plugin:Backlog:Extensibility

Change-Id: Ifaa835a43ec8e0b2fb23e84abf121aefdbcde339
Signed-off-by: Brent Salisbury <brent.salisbury@gmail.com>
Signed-off-by: Michal Rehak <mirehak@cisco.com>
10 years agoOptimize string splitting by using Splitter class 59/7659/1
Robert Varga [Tue, 3 Jun 2014 21:53:29 +0000 (23:53 +0200)]
Optimize string splitting by using Splitter class

Instead of performing costli String.split() operation, instantiate a
shared Splitter and use it to split the string. Requires slight
alterations to logic, but those are rather obvious.

Change-Id: Icec3c4588e062373c090b3479635a93428f278f1
Signed-off-by: Robert Varga <robert.varga@pantheon.sk>
10 years agoImprove InjectionKey performance 43/7643/1
Robert Varga [Tue, 3 Jun 2014 12:12:01 +0000 (14:12 +0200)]
Improve InjectionKey performance

As it turns out we put these into a HashMap, so not dispersing on class
name is actively hurting us. The trade-off here is between hashCode()
performance and its effectiveness.

The design of this class called for Strings to be used as identifiers,
and hashCode() of strings is generally slow. As it turns out, though,
all the strings used were derived from classes -- which is good news.

This patch switches to using Class<?> objects as identifiers, as they
have fast hashCode/equals and the lookups are equivalent.

Change-Id: I51e572dc98088733eca15c35ee6d0bac991c5da7
Signed-off-by: Robert Varga <robert.varga@pantheon.sk>
10 years agoOptimize conversionMapping table 39/7639/1
Robert Varga [Tue, 3 Jun 2014 10:50:26 +0000 (12:50 +0200)]
Optimize conversionMapping table

Once the table has been initialized, we can switch it to immutable, as
the keys (Short) provide fast hashCode/equals. Saves memory and
increases lookup speed.

Change-Id: I4698f44ce5a8e83c7c54e544e5ab72487f22a92e
Signed-off-by: Robert Varga <robert.varga@pantheon.sk>
10 years agoDroptest: optimize macToString 38/7638/1
Robert Varga [Tue, 3 Jun 2014 10:01:12 +0000 (12:01 +0200)]
Droptest: optimize macToString

This elides the creation of multiple objects and rather formats the
bytes quickly.

Change-Id: Iabac79bf86c0b2098bffe69f221797f2fd1c326f
Signed-off-by: Robert Varga <robert.varga@pantheon.sk>
10 years agoMerge changes Id2bb5c7d,I341f0ca7
michal rehak [Tue, 3 Jun 2014 09:27:09 +0000 (09:27 +0000)]
Merge changes Id2bb5c7d,I341f0ca7

* changes:
  Use singleton list for simple packetIn
  Prefer more threads than deeper queue

10 years agoMerge "Fixed incorrect help message."
michal rehak [Tue, 3 Jun 2014 09:12:35 +0000 (09:12 +0000)]
Merge "Fixed incorrect help message."

10 years agoUse singleton list for simple packetIn 32/7632/1
Robert Varga [Mon, 2 Jun 2014 17:19:26 +0000 (19:19 +0200)]
Use singleton list for simple packetIn

Tracing has shown we are spending quite some time constructing
CopyOnWriteArrayList -- just to throw it away. Let's use a singleton
list, which is way faster.

Change-Id: Id2bb5c7d548d5d4257170828667a66543099fa38
Signed-off-by: Robert Varga <robert.varga@pantheon.sk>
10 years agoPrefer more threads than deeper queue 31/7631/1
Robert Varga [Tue, 3 Jun 2014 05:56:29 +0000 (07:56 +0200)]
Prefer more threads than deeper queue

ThreadPoolExecutor does not start spawning new threads until the
underlying queue's offer() method return false. This means that we would
completely fill the queue before kicking off more threads.

This patch introduces a ForwardingBlockingQueue, which always returns
false from offer(), thus forcing the threadpool to expand. The policy
then uses put() to schedule (or block on scheduling) the tasks.

Change-Id: I341f0ca7061f6b76ae1f3e049b12704f35140633
Signed-off-by: Robert Varga <robert.varga@pantheon.sk>
10 years agoMerge "Fixed incorrect help message, converted to more standard format."
michal rehak [Tue, 3 Jun 2014 08:49:22 +0000 (08:49 +0000)]
Merge "Fixed incorrect help message, converted to more standard format."

10 years agoFixed incorrect help message. 96/7596/1
Daniel Farrell [Mon, 2 Jun 2014 15:49:14 +0000 (11:49 -0400)]
Fixed incorrect help message.

Change-Id: Id1d62c2ea0a2e7c3f08e3275e12b5a3d9453f4ef
Signed-off-by: Daniel Farrell <dfarrell@redhat.com>
10 years agopython tests fix: 82/7582/3
Vaclav Demcak [Mon, 2 Jun 2014 08:32:57 +0000 (10:32 +0200)]
python tests fix:

* SAL fix build xml update input (flow, meter, grup)
* fix the URL address for a flow in operational DS
* set default coloring disabled
* add logging wait time info

Change-Id: Ibd839ab64313ba9186e47d4f3b91b026c6d57cf8
Signed-off-by: Vaclav Demcak <vdemcak@cisco.com>
10 years agoBUG-529: Remove Reactor getter contention 41/7541/1
Robert Varga [Fri, 30 May 2014 15:55:17 +0000 (17:55 +0200)]
BUG-529: Remove Reactor getter contention

Performance testing has identified contention on getInstance() methods.
It turns out that we can pre-create the instance and then get it in a
lock-free manner.

Change-Id: I49c219d5954fa792218040a0ae66bf344992413a
Signed-off-by: Robert Varga <robert.varga@pantheon.sk>
10 years agoBUG-529: imrpove statistics collection 40/7540/1
Robert Varga [Fri, 30 May 2014 15:54:31 +0000 (17:54 +0200)]
BUG-529: imrpove statistics collection

This removes synchronized blocks in statistics gathering, as these are
multi-threaded codepaths and we saw contention here.

Change-Id: Ie99ea3fd2e16b66af533e773af04d7978c2c0ac1
Signed-off-by: Robert Varga <robert.varga@pantheon.sk>
10 years agoBUG-529: improve droptest performance 39/7539/1
Robert Varga [Fri, 30 May 2014 15:53:45 +0000 (17:53 +0200)]
BUG-529: improve droptest performance

This eliminates the use of synmchronized blocks to perform statistics
maintenance.

Change-Id: I18ba3b0bcf2d04e2ce8ba993e0fa776cd6d67a72
Signed-off-by: Robert Varga <robert.varga@pantheon.sk>
10 years agoFixed incorrect help message, converted to more standard format. 25/7525/1
Daniel Farrell [Thu, 29 May 2014 20:44:52 +0000 (16:44 -0400)]
Fixed incorrect help message, converted to more standard format.

Change-Id: If346d70baba1ec11c310cbafcb2040e64a874fe9
Signed-off-by: Daniel Farrell <dfarrell07@gmail.com>
10 years agoMerge "BUG-1074: add javadoc for QueueKeeper"
Abhijit Kumbhare [Tue, 27 May 2014 16:51:04 +0000 (16:51 +0000)]
Merge "BUG-1074: add javadoc for QueueKeeper"

10 years agoRemoved unnecessary libxml2 import 21/7421/1
Martin Bobak [Tue, 27 May 2014 11:24:46 +0000 (13:24 +0200)]
Removed unnecessary libxml2 import

Signed-off-by: Martin Bobak <mbobak@cisco.com>
10 years agoCRUD ODL python RESTconf tests 90/7390/3
Vaclav Demcak [Fri, 24 Jan 2014 17:30:44 +0000 (18:30 +0100)]
CRUD ODL python RESTconf tests

* move to python2.6 and python script refactoring
* fix xml
* add CRUD tests (flow, meter, group)

https://wiki.opendaylight.org/view/OpenDaylight_OpenFlow_Plugin::Python_test_scripts

Signed-off-by: Vaclav Demcak <vdemcak@cisco.com>
Change-Id: I3c8723dae0cbd1500f9fe318ec90115ff739f3db

10 years agoBUG-1074: add javadoc for QueueKeeper 01/7401/1
Michal Rehak [Mon, 26 May 2014 15:22:22 +0000 (17:22 +0200)]
BUG-1074: add javadoc for QueueKeeper

- added javadoc for QueueKeeper and QueueKeeperImpl

Change-Id: I5cf4d5c2798766435985bb9a93c45b07e18d4d8b
Signed-off-by: Michal Rehak <mirehak@cisco.com>
10 years agoBUG-770: NumberFormatException for datapathId 99/7399/2
Michal Rehak [Mon, 26 May 2014 12:50:31 +0000 (14:50 +0200)]
BUG-770: NumberFormatException for datapathId

- changed long to bigInteger in order to avoid negative Long
- added unit tests for touched util-methods

Change-Id: Ibdebd3965baf552bd92702af0399961b70defe56
Signed-off-by: Michal Rehak <mirehak@cisco.com>
10 years agoBug 1071: Invalid value used for frame priority code point in OFCommandProvider 71/7371/1
Brent Salisbury [Sun, 25 May 2014 03:29:16 +0000 (23:29 -0400)]
Bug 1071: Invalid value used for frame priority code point in OFCommandProvider

-Adjusted to a magic number in bounds for PCP (0-7) to enable the test to stop failing for the function f80 in OpenFlowPluginTestCommandProvider.

Change-Id: Ib146f228e174b6785dfe9fecf93fa7cabba79f4f
Signed-off-by: Brent Salisbury <brent.salisbury@gmail.com>
10 years agoBUG-1065: translation of Ipv6ExtHeader flags to int 38/7338/1
Michal Rehak [Thu, 22 May 2014 15:51:19 +0000 (17:51 +0200)]
BUG-1065: translation of Ipv6ExtHeader flags to int

- moved translation to separate method + test
- fixed the false part of ternary operator

Change-Id: I498dbf6c37f2d7348743d33bd49fe2ff46870621
Signed-off-by: Michal Rehak <mirehak@cisco.com>
10 years agoopenflowPlugin still uses for IT unsupported version of nagasena 02/7302/2
Giovanni Meo [Tue, 20 May 2014 14:45:00 +0000 (16:45 +0200)]
openflowPlugin still uses for IT unsupported version of nagasena

Updated the openflowplugin IT to use the newer version of the nagasena
artifacts that not longer comes from controller. Without this patch
this project cannot release artifacts because will depends on a
SNAPSHOT that cannot be made RELEASED

Signed-off-by: Giovanni Meo <gmeo@cisco.com>
10 years agoBug:275 - Modifying a flow is not applying the changes to the switch 99/7099/2
Kamal Rameshan [Fri, 16 May 2014 01:21:21 +0000 (18:21 -0700)]
Bug:275 - Modifying a flow is not applying the changes to the switch

Change-Id: I75847446791a4dab3aa2e3b076c8b369c7337b64
Signed-off-by: Kamal Rameshan <kramesha@cisco.com>
10 years agoBug:995-Controller does not learn node connectors from mininet OF10 27/7127/3
Michal Rehak [Mon, 19 May 2014 13:35:52 +0000 (15:35 +0200)]
Bug:995-Controller does not learn node connectors from mininet OF10

- replaced shutdownNow with shutdown+purge

Change-Id: Ia9f299fd5e46d13a9bbd9d28925ca4e758ec46ec
Signed-off-by: Kamal Rameshan <kramesha@cisco.com>
Signed-off-by: Michal Rehak <mirehak@cisco.com>
10 years agoOptimize list manipulation 42/7142/3
Robert Varga [Sat, 17 May 2014 20:29:15 +0000 (22:29 +0200)]
Optimize list manipulation

This patch optimizes the various allocations of ArrayList where we know
the target size.
- by versionOrder the size equals to the highest version value + 1

Change-Id: I2a54a4cacc21fe8d382080954de5fd8d2c16f472
Signed-off-by: Robert Varga <robert.varga@pantheon.sk>
Signed-off-by: Michal Rehak <mirehak@cisco.com>
10 years agoImprove droptest logging 52/7152/1
Robert Varga [Sun, 18 May 2014 09:49:15 +0000 (11:49 +0200)]
Improve droptest logging

Print out the full exceptions, such that we can reason about it.

Change-Id: Ie0ec723253a8e65e255bdc06f6322b1d72033e22
Signed-off-by: Robert Varga <robert.varga@pantheon.sk>
10 years agoOptimize drop-test memory usage 40/7140/2
Robert Varga [Sat, 17 May 2014 20:12:17 +0000 (22:12 +0200)]
Optimize drop-test memory usage

This patch makes sure drop-test uses the Collections.singletonList(),
so as to not waste memory on ArrayList, since we are only forwarding a
single entry.

Change-Id: Iaf4e7e408ed147177a40355b3c0ab2d4e18d133c
Signed-off-by: Robert Varga <robert.varga@pantheon.sk>
10 years agoBUG-542 - adding overall statictics 24/7124/1
Michal Rehak [Fri, 16 May 2014 19:11:08 +0000 (21:11 +0200)]
BUG-542 - adding overall statictics

- temporary extended messageSpy code
- added logging to rpc threadPool - afterExecution
- cleaned imports
- deprecated hard coded configurations for OFJava SwitchConnectionProvider
- simplified signature of MessageSpy
- added messageSpy and rpcPool into SessionManager

Change-Id: If41e33c885dab0907fdf642ad1f483d93f74b19c
Signed-off-by: Michal Rehak <mirehak@cisco.com>
10 years agoBUG-956 deadlock by rpc invocation - phase2 17/7117/1
Michal Rehak [Thu, 8 May 2014 20:09:43 +0000 (22:09 +0200)]
BUG-956 deadlock by rpc invocation - phase2

- tuning Future chaining
- introduced ListeningExecutorService
- dereference used
- clean up after bulkTransactionCache removal
- add/update meter and group refactored in order to follow future responses and run in pool

Change-Id: I5c9367512c3ab6f1799f30dad1344667fde63991
Signed-off-by: Michal Rehak <mirehak@cisco.com>
10 years agoBUG-1006 - removal of bulkTransactionCache 24/7024/2
Michal Rehak [Thu, 15 May 2014 15:56:44 +0000 (17:56 +0200)]
BUG-1006 - removal of bulkTransactionCache

- removed bulkTransactionCache - this contract is considered a bad tradeoff:
  Application which invoked rpc bound with device will receive transaction id
  in response. If the app needs to analyze error it is up to app
  - to listen to appropriate errorNotification and
  - to keep track of last input value and pair it by transactionId with
    error notification

Change-Id: Icf38f82986451bc9cd46ce84996fe9631295bc16
Signed-off-by: Michal Rehak <mirehak@cisco.com>
10 years agoBUG-1006 - limiting bulkTransactionCache 94/6994/1
Michal Rehak [Wed, 14 May 2014 17:24:58 +0000 (19:24 +0200)]
BUG-1006 - limiting bulkTransactionCache

- size
- soft values
- shorter lifetime
- removing values after use

Change-Id: Ia02c07c02726291834c1f73bb19b03610124e9b8
Signed-off-by: Michal Rehak <mirehak@cisco.com>
10 years agoBug 998 - Fix for update flow process 36/6936/1
Vaclav Demcak [Tue, 13 May 2014 16:28:15 +0000 (18:28 +0200)]
Bug 998 - Fix for update flow process

- change FlowAddBuilder to FlowUpdateBuilder for update process

Change-Id: I727ae03332bee6079b7927e98660b45e9dc537ef
Signed-off-by: Vaclav Demcak <vdemcak@cisco.com>
10 years agoBug 998 - fix for update flow 35/6935/1
Vaclav Demcak [Tue, 13 May 2014 16:07:52 +0000 (18:07 +0200)]
Bug 998 - fix for update flow

Change-Id: Iad157785a9f42e89d6b99d4211fdce591efcea41
Signed-off-by: Vaclav Demcak <vdemcak@cisco.com>
10 years agofix for BUG-947 - ErrorHandler classLoader issue 25/6725/4
Michal Rehak [Mon, 5 May 2014 15:05:20 +0000 (17:05 +0200)]
fix for BUG-947 - ErrorHandler classLoader issue

- exception must be logged in the same thread as there is thread classLoader context, which might differ from the previously dedicated thread for exception logging

Change-Id: Ia2f911fdd5845280575fcb6a57c16aafdc0c2b53
Signed-off-by: Michal Rehak <mirehak@cisco.com>