openflowplugin.git
7 years agoMerge changes from topic 'BUG-4117'
Abhijit Kumbhare [Fri, 20 May 2016 22:46:25 +0000 (22:46 +0000)]
Merge changes from topic 'BUG-4117'

* changes:
  BUG-4117: add impl for FlowCapableNode Connector notif.
  BUG-4117: add impl for FlowCapableNode notification

7 years agoMerge "BUG-4117: preparation for FlowCapableNode notification impl."
Abhijit Kumbhare [Fri, 20 May 2016 21:18:56 +0000 (21:18 +0000)]
Merge "BUG-4117: preparation for FlowCapableNode notification impl."

8 years agoMerge "Bug 5914 - Flow statistics don't show up on the same flow id, if flow uses...
Abhijit Kumbhare [Thu, 19 May 2016 17:24:28 +0000 (17:24 +0000)]
Merge "Bug 5914 - Flow statistics don't show up on the same flow id, if flow uses IPv6 match with subnet mask"

8 years agoBug 5692 - Direct statistics RPC 44/38744/15
Tomas Slusny [Wed, 11 May 2016 17:03:01 +0000 (19:03 +0200)]
Bug 5692 - Direct statistics RPC

- Added new RPCs for direct gathering of statistics
  with optional flag of storing the statistics to DS/operational

Change-Id: I9d94595f9fb4f5e93f22958c64dd6cf3d4c19bcc
Signed-off-by: Tomas Slusny <tomas.slusny@pantheon.sk>
8 years agoBug 5692 - Statistics ON/OFF 34/38634/9
Tomas Slusny [Tue, 10 May 2016 11:48:51 +0000 (13:48 +0200)]
Bug 5692 - Statistics ON/OFF

- Removed DeviceState.getRole
- Statistics are properly shut down when device changes to state other than Master
- Statistics are properly started only when device becomes Master
- LifecycleConductor now have access to StatisticsManager

Change-Id: I68e437b758c6e6a4343d815e5cf3d2570ef28aef
Signed-off-by: Tomas Slusny <tomas.slusny@pantheon.sk>
8 years agoBug 5914 - Flow statistics don't show up on the same flow id, 85/39085/1
Anil Vishnoi [Thu, 19 May 2016 04:46:39 +0000 (21:46 -0700)]
Bug 5914 - Flow statistics don't show up on the same flow id,
if flow uses IPv6 match with subnet mask

Patch2: Added unit test

Change-Id: I566c84334a096229274925d223bb906be643f326
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
8 years agoMerge "Bug 5591 - Changed DeviceContext to DeviceState in translate methods of Messag...
Jozef Bacigal [Tue, 17 May 2016 07:04:16 +0000 (07:04 +0000)]
Merge "Bug 5591 - Changed DeviceContext to DeviceState in translate methods of MessageTranslator classes - Added util static method createWithOook to AggregateFlowsInTableService   and to OpendaylightFlowStatisticsServiceImpl (calls DeviceContext.oook() before   creating instance of the service)"

8 years agoBug 5590 - writeToTransaction+submitTransaction 78/36878/6
Tomas Slusny [Wed, 30 Mar 2016 11:41:17 +0000 (13:41 +0200)]
Bug 5590 - writeToTransaction+submitTransaction
- New interface TxFacade, DeviceContext now implements this interface
- Changed constructor of SalTableServiceImpl to accept TxFacade and NodeId
- Changed MultipartRequestOnTheFlyCallback to not need the DeviceContext and accept TxFacade
- Updated some methods in StatisticGatheringUtils to not depend on DeviceContext (because of change above)
- Updated usages of these classes according to changes.
- Updated tests

Change-Id: Ib4f7a075e27999bc57c324601123bd0e18bd83d4
Signed-off-by: Tomas Slusny <tomas.slusny@pantheon.sk>
8 years agoBug 5591 92/38592/2
Tomas Slusny [Mon, 18 Apr 2016 14:26:04 +0000 (16:26 +0200)]
Bug 5591
- Changed DeviceContext to DeviceState in translate methods of MessageTranslator classes
- Added util static method createWithOook to AggregateFlowsInTableService
  and to OpendaylightFlowStatisticsServiceImpl (calls DeviceContext.oook() before
  creating instance of the service)

Change-Id: I957ab21fcd9e439a6e0e228dc2156bf571c98385
Signed-off-by: Tomas Slusny <tomas.slusny@pantheon.sk>
8 years agoMerge "BUG-5573: Altering the HandshakePool to have a LinkedBlockingQueue instead...
Jozef Bacigal [Mon, 16 May 2016 13:57:54 +0000 (13:57 +0000)]
Merge "BUG-5573: Altering the HandshakePool to have a LinkedBlockingQueue instead of an ArrayBlockingQueue with size 20. The main difference between ArrayBlockingQueue and LinkedBlockingQueue is clear from constructor one has underlying data structure Array and other linkedList."

8 years agoBug 5543 - JUnit tests update 15/38915/3
Tomas Slusny [Tue, 3 May 2016 12:10:33 +0000 (14:10 +0200)]
Bug 5543 - JUnit tests update

Change-Id: I7bfcec5ad87213870d3043a3ea00c098e21391b9
Signed-off-by: Tomas Slusny <tomas.slusny@pantheon.sk>
Signed-off-by: miroslav.macko <miroslav.macko@pantheon.tech>
8 years agoMerge "BUG 5680 - TxManager init submit fix"
Jozef Bacigal [Mon, 16 May 2016 11:43:46 +0000 (11:43 +0000)]
Merge "BUG 5680 - TxManager init submit fix"

8 years agoBUG-5573: Altering the HandshakePool to have a LinkedBlockingQueue instead of an 84/38284/4
Shuva Kar [Mon, 2 May 2016 15:11:40 +0000 (20:41 +0530)]
BUG-5573: Altering the HandshakePool to have a LinkedBlockingQueue instead of an
ArrayBlockingQueue with size 20. The main difference between
ArrayBlockingQueue and LinkedBlockingQueue is clear from constructor one
has underlying data structure Array and other linkedList.

ArrayBlockingQueue uses single-lock double condition algorithm and
LinkedBlockingQueue is variant of the "two lock queue" algorithm and it
has 2 locks 2 conditions ( takeLock , putLock)

In scenarios that involve adding and removing elemenst LinkedBlockingQueue
performs better than ArrayBlockingQueue.

Change-Id: I08f077552599d663857db2ca6d33a86e3b5eb01e
Signed-off-by: Shuva Kar <shuva.jyoti.kar@ericsson.com>
8 years agoMerge "Bug 5592 - NodeId+DatapathId in Services (remove dependency on DeviceContext...
Jozef Bacigal [Mon, 16 May 2016 09:11:58 +0000 (09:11 +0000)]
Merge "Bug 5592 - NodeId+DatapathId in Services (remove dependency on DeviceContext) - Changed AbstractService.getVersion and AbstractService.getDatapathId to return data from DeviceState - Added AbstractService.getNodeId what returns nodeId from DeviceState - Updated all ocurences of getting above 3 values in subclasses to use these methods - Updated tests (in most of them, DeviceState was not mocked)"

8 years agoMerge "BUG-4148: Improving the logging levels, adding more information wherever required"
Abhijit Kumbhare [Mon, 16 May 2016 06:17:01 +0000 (06:17 +0000)]
Merge "BUG-4148: Improving the logging levels, adding more information wherever required"

8 years agoMerge "BUG-5841: Enhances bulk-o-matic to stress test Data Store and Openflowplugin...
Abhijit Kumbhare [Sat, 14 May 2016 06:35:12 +0000 (06:35 +0000)]
Merge "BUG-5841: Enhances bulk-o-matic to stress test Data Store and Openflowplugin RPC Added asciidoc for the same"

8 years agoBUG-5841: Enhances bulk-o-matic to stress test Data Store and Openflowplugin RPC 47/37047/5
Faiz Ilahi Kothari [Mon, 4 Apr 2016 06:03:52 +0000 (11:33 +0530)]
BUG-5841: Enhances bulk-o-matic to stress test Data Store and Openflowplugin RPC
Added asciidoc for the same

- Takes JSON input from REST to provision flows
- Different options to push to DS or Openflowplugin
- Results are printed to karaf.log

Change-Id: I231e9278a7292ac2424751a0689f632d3382c497
Signed-off-by: Shuva Kar <shuva.jyoti.kar@ericsson.com>
8 years agoMerge "BUG-5839: Removing groups and meters on being stale-marked"
Abhijit Kumbhare [Sat, 14 May 2016 04:54:06 +0000 (04:54 +0000)]
Merge "BUG-5839: Removing groups and meters on being stale-marked"

8 years agoMerge "BUG-4148: Improving the logging in flow/group/meter to provide more contextual...
Abhijit Kumbhare [Sat, 14 May 2016 04:23:00 +0000 (04:23 +0000)]
Merge "BUG-4148: Improving the logging in flow/group/meter to provide more contextual information as to the success/failure of the operation"

8 years agoMerge "Add custom compare for ArpMatch objects"
Anil Vishnoi [Sat, 14 May 2016 00:52:00 +0000 (00:52 +0000)]
Merge "Add custom compare for ArpMatch objects"

8 years agoBug 5592 - NodeId+DatapathId in Services (remove dependency on DeviceContext) 83/37083/5
Tomas Slusny [Mon, 4 Apr 2016 14:43:14 +0000 (16:43 +0200)]
Bug 5592 - NodeId+DatapathId in Services (remove dependency on DeviceContext)
- Changed AbstractService.getVersion and AbstractService.getDatapathId to return data from DeviceState
- Added AbstractService.getNodeId what returns nodeId from DeviceState
- Updated all ocurences of getting above 3 values in subclasses to use these methods
- Updated tests (in most of them, DeviceState was not mocked)

Change-Id: Ie0b38788d66687c07d1a6265006d0026076f8dc9
Signed-off-by: Tomas Slusny <tomas.slusny@pantheon.sk>
8 years agoAdd custom compare for ArpMatch objects 49/38749/1
Josh [Thu, 21 Apr 2016 16:19:46 +0000 (18:19 +0200)]
Add custom compare for ArpMatch objects

The problem here was that layer3MatchEquals was falling through to
the default compare where the generated equals() method is called
which was comparing the mac addresses case sensitive. This caused
an IT test we're working on in netvirt to fail because certain ARP
flows were not making their way into the operational store. This
only occurs on the beryllium branch but not on master as this
method has a fully different implementation there.

Change-Id: I3aa6e79b48741f656ae036b16743e0e097623593
Signed-off-by: Josh <jhershbe@redhat.com>
8 years agoBUG 5680 - TxManager init submit fix 27/37427/2
andrej.leitner [Mon, 11 Apr 2016 09:13:09 +0000 (11:13 +0200)]
BUG 5680 - TxManager init submit fix

Initial submit could fail with unexpected reason and we have to catch it, because we could have distributed DS without corect Node path and sub-path initialization. Added initCommit property.
TODO: think about alternative solution (try to reinit whole Node)

Change-Id: I6a12fb1a9542312408d76a774dd7c0ff66328e47
Signed-off-by: andrej.leitner <anleitne@cisco.com>
8 years agoBug 5595 - RpcContext nodeId+xidSequencer (remove dependency on DeviceContext) 48/37048/3
Tomas Slusny [Thu, 31 Mar 2016 13:31:55 +0000 (15:31 +0200)]
Bug 5595 - RpcContext nodeId+xidSequencer (remove dependency on DeviceContext)
- Changed RpcContextImpl to not depend on DeviceContext.
- Moved isStatisticsRpcEnabled to DeviceManager and DeviceContext
- Updated RpcContextManagerImpl to use new RpcContextImpl constructor
- Updated tests

Change-Id: If658c506caeb257cde32084e81089b604d8484e3
Signed-off-by: Tomas Slusny <tomas.slusny@pantheon.sk>
8 years agoBug-5523 Lifecycle conductor changes 66/38566/4
Jozef Bacigal [Wed, 4 May 2016 12:43:07 +0000 (14:43 +0200)]
Bug-5523 Lifecycle conductor changes

- changed lifecycle conductor from static thread safe singleton
to singleton created in OpenFlowPluginImpl as are managers defined

Change-Id: I1bd21b2e3a842ce3152882a746a2b9efd3f2cb83
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
Signed-off-by: Tomas Slusny <tomas.slusny@pantheon.sk>
8 years agoBug-5523 CloseConnection changes 25/38225/5
Jozef Bacigal [Tue, 26 Apr 2016 12:49:03 +0000 (14:49 +0200)]
Bug-5523 CloseConnection changes

- dependency of deviceContext removed from starting
- lifecycle conductor thread safe now
- role manager was not removing context from map
- test update

Change-Id: Iadafdfb8f377326bfb76e9163ad66656b16c15f3
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
8 years agoBug-5523 RoleManager changes 24/38224/2
Jozef Bacigal [Fri, 15 Apr 2016 11:13:57 +0000 (13:13 +0200)]
Bug-5523 RoleManager changes

- all functionality moved to role manager
- role context hold only information about status
- life cycle conductor defined as listener to role change
- able to register listener to start/stop master services
- timer for initialization device disabled
- added thrown exception when not able to write to transaction
- added junit tests

Change-Id: I741cde5c8161dde8c45f27c6a2e1f99617a613bf
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
8 years agoMerge "Remove nexusproxy property"
Abhijit Kumbhare [Thu, 5 May 2016 21:31:00 +0000 (21:31 +0000)]
Merge "Remove nexusproxy property"

8 years agoBUG-5839: Removing groups and meters on being stale-marked 69/37769/2
Shuva Kar [Tue, 19 Apr 2016 02:59:32 +0000 (08:29 +0530)]
BUG-5839: Removing groups and meters on being stale-marked

Change-Id: I18f752b7e099a7c423e569de23d957e4f32779c7
Signed-off-by: Shuva Kar <shuva.jyoti.kar@ericsson.com>
8 years agoBUG-4148: Improving the logging levels, adding more information wherever required 74/38274/3
Shuva Kar [Mon, 2 May 2016 14:26:09 +0000 (19:56 +0530)]
BUG-4148: Improving the logging levels, adding more information wherever required

Change-Id: I165db99bf76c52dc5c7a20ce84b0058e6a45058d
Signed-off-by: Shuva Kar <shuva.jyoti.kar@ericsson.com>
8 years agoBUG-4148: Improving the logging in flow/group/meter to provide more contextual 54/38254/4
Shuva Kar [Mon, 2 May 2016 08:17:23 +0000 (13:47 +0530)]
BUG-4148: Improving the logging in flow/group/meter to provide more contextual
information as to the success/failure of the operation

Change-Id: Ica94dbca7559f0afff1f8dfe5695ed8d0bf6376e
Signed-off-by: Shuva Kar <shuva.jyoti.kar@ericsson.com>
8 years agoWIP: BUG-5464: scaling issue 59/36559/5
Jozef Bacigal [Wed, 23 Mar 2016 14:04:35 +0000 (15:04 +0100)]
WIP: BUG-5464: scaling issue

    - pull up table-features to flow-cabable-node
    - fix adjanced logic
    - remove augmentation of flow-capable-node (redundant table-features)
    - fixed unit test

Change-Id: I798f87420330cfd71045eac3de61291a10abdafa
Signed-off-by: Michal Rehak <mirehak@cisco.com>
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
8 years agoMerge "Derive distributuon/karaf pom from karaf-parent"
Jozef Bacigal [Tue, 26 Apr 2016 07:11:23 +0000 (07:11 +0000)]
Merge "Derive distributuon/karaf pom from karaf-parent"

8 years agoMerge "Log at ERROR level when add/remove flow fail"
Abhijit Kumbhare [Mon, 25 Apr 2016 23:06:30 +0000 (23:06 +0000)]
Merge "Log at ERROR level when add/remove flow fail"

8 years agoLog at ERROR level when add/remove flow fail 81/38081/6
Alexis de Talhouët [Mon, 25 Apr 2016 19:38:06 +0000 (15:38 -0400)]
Log at ERROR level when add/remove flow fail

Change-Id: I78c14450e6ba235c99a74efff68c0a38ed4ce739
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>
8 years agoMerge "Log at ERROR level when request context failed to close"
Abhijit Kumbhare [Mon, 25 Apr 2016 21:22:10 +0000 (21:22 +0000)]
Merge "Log at ERROR level when request context failed to close"

8 years agoLog at ERROR level when request context failed to close 85/38085/1
Alexis de Talhouët [Mon, 25 Apr 2016 20:03:14 +0000 (16:03 -0400)]
Log at ERROR level when request context failed to close

And also log the whole exception as the message can be null

 RequestContextUtil               | 190 - org.opendaylight.openflowplugin.impl - 0.3.0.SNAPSHOT | Request context wasn't closed. Exception message: null

Change-Id: Ib5d3f263db0baf83bc2d978a2c3e9f2cb1317b0c
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>
8 years agoLog at ERROR level when the queue isn't set... 84/38084/1
Alexis de Talhouët [Mon, 25 Apr 2016 19:53:00 +0000 (15:53 -0400)]
Log at ERROR level when the queue isn't set...

... as this results in failing the request.
This helps debug, and I believe should be turned
at error level

Change-Id: Ib5152371f449bc81d69b216a2061db7eed624d5a
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>
8 years agoDerive distributuon/karaf pom from karaf-parent 62/38062/1
Tom Pantelis [Mon, 25 Apr 2016 14:41:16 +0000 (10:41 -0400)]
Derive distributuon/karaf pom from karaf-parent

This picks up the recent changes to the karaf distro from a common
place.

Signed-off-by: Tom Pantelis <tpanteli@brocade.com>
8 years agoMerge "Bug 5589 - Deprecate PortNumberCache"
Jozef Bacigal [Mon, 25 Apr 2016 07:41:54 +0000 (07:41 +0000)]
Merge "Bug 5589 - Deprecate PortNumberCache"

8 years agoMerge changes from topic 'bug-5574'
Jozef Bacigal [Thu, 21 Apr 2016 12:53:18 +0000 (12:53 +0000)]
Merge changes from topic 'bug-5574'

* changes:
  BUG-5574: added flat-bulk service registration
  BUG-5574: flat batch proposal
  BUG-5574: bulk meters proposal
  BUG-5574: introduces sal-groups-batch service impl
  BUG-5574: sal-flows-batch proposal

8 years agoBUG-5574: added flat-bulk service registration 90/37790/2
Michal Rehak [Mon, 4 Apr 2016 18:17:05 +0000 (20:17 +0200)]
BUG-5574: added flat-bulk service registration

    - added registration/unregistation for flat-batch routed service

Change-Id: I95d005aeb12d1b817c643ffc11a6f5343361d5a4
Signed-off-by: Michal Rehak <mirehak@cisco.com>
(cherry picked from commit b5ffe8525d85dcf92d38a1eab96e4f3d2836aad0)
Signed-off-by: andrej.leitner <anleitne@cisco.com>
8 years agoBUG-5574: flat batch proposal 22/36722/6
Michal Rehak [Mon, 21 Mar 2016 17:02:39 +0000 (18:02 +0100)]
BUG-5574: flat batch proposal

    - yang model
    - implementation proposal
    - flat batch util
    - unit tests

Change-Id: I4406eaa19024348e63e2cc6d07039949ba8aa941
Signed-off-by: Michal Rehak <mirehak@cisco.com>
(cherry picked from commit 60ddc33574168296cf1b59f59a1cbb998cecfc36)
Signed-off-by: andrej.leitner <anleitne@cisco.com>
8 years agoBUG-5574: bulk meters proposal 09/36309/6
Michal Rehak [Wed, 16 Mar 2016 12:48:00 +0000 (13:48 +0100)]
BUG-5574: bulk meters proposal

    - added bulk API implementation for groups
    - with parametrized barrier-after support
    - MeterUtil
    - unit tests

Change-Id: I9146894ae0b1f630706b8aea6b85a13c8ce3364b
Signed-off-by: Michal Rehak <mirehak@cisco.com>
(cherry picked from commit 26fa4ba6f87c23e159b74526f6fb849f0ceb4783)
Signed-off-by: andrej.leitner <anleitne@cisco.com>
8 years agoBug 5589 - Deprecate PortNumberCache 07/37807/2
Tomas Slusny [Tue, 19 Apr 2016 12:08:09 +0000 (14:08 +0200)]
Bug 5589 - Deprecate PortNumberCache

- New class - Port to NodeConnectorRef converter
- New test - Conversion between port and NodeConnectorRef
- Methods in PortNumberCache are now deprecated
- Replaced use of above methods in PacketReceivedTranslator with new methods
- Modified tests for PacketReceivedTranslator to work with new methods

Change-Id: Icb04e3f8699d436b549ea670b1e3c42d2e057026
Signed-off-by: Tomas Slusny <tomas.slusny@pantheon.sk>
8 years agoBug 5747 Introduced snapshot gathering marks 09/37809/2
Michal Rehak [Thu, 7 Apr 2016 18:45:34 +0000 (20:45 +0200)]
Bug 5747 Introduced snapshot gathering marks

Added timestamp of statistics collection start and finish
and successful collection flag.

Change-Id: If00fbb7532f292d69602de7857db73fabc5fd49f
Signed-off-by: Andrej Leitner <anleitne@cisco.com>
8 years agoBUG-5574: introduces sal-groups-batch service impl 08/36308/5
Michal Rehak [Tue, 15 Mar 2016 17:54:41 +0000 (18:54 +0100)]
BUG-5574: introduces sal-groups-batch service impl

 - added bulk API implementation for groups
 - with parametrized barrier-after support
 - added tests

Change-Id: If3e3d70d4ceb8eeb4a9902e2ea7f4bad26d9c934
Signed-off-by: Michal Rehak <mirehak@cisco.com>
(cherry picked from commit 134bd7a822a5a3d76ec82f3bd7ad6abf1a933a60)
Signed-off-by: andrej.leitner <anleitne@cisco.com>
8 years agoBUG-5574: sal-flows-batch proposal 07/36307/5
Michal Rehak [Mon, 14 Mar 2016 15:44:21 +0000 (16:44 +0100)]
BUG-5574: sal-flows-batch proposal

    - added common model for attaching barrier
    - added bulk API implementation for flows
      - with parametrized barrier-after support
    - added tests

Change-Id: I4e941d3654dc142e1d1d64a2258e629016e95a0e
Signed-off-by: Michal Rehak <mirehak@cisco.com>
(cherry picked from commit 79e8e834f0cbbccfbff99e51e4ddd854dd812d19)
Signed-off-by: andrej.leitner <anleitne@cisco.com>
8 years agoRevert "Fix "Bug 5589 - Deprecate PortNumberCache"" 85/37785/1
Michal Rehak [Tue, 19 Apr 2016 07:14:53 +0000 (09:14 +0200)]
Revert "Fix "Bug 5589 - Deprecate PortNumberCache""

This reverts commit 0cd77f8ef3c8045fba03dde20044a08ec44e29f5.
Signed-off-by: Michal Rehak <mirehak@cisco.com>
Change-Id: I852bf5dc979ef8a581b3d8326413451cd21cc83a

8 years agoRemove nexusproxy property 59/37759/1
Luis Gomez [Mon, 18 Apr 2016 23:09:55 +0000 (16:09 -0700)]
Remove nexusproxy property

Change-Id: Ie6cc211e3e4a5b39ef6a09c23cb737eab6c57a96
Signed-off-by: Luis Gomez <ecelgp@gmail.com>
8 years agoMerge "Bug 5592 - DeviceContext -> DeviceState in *ToNotificationTransformer classes"
Jozef Bacigal [Mon, 18 Apr 2016 12:28:36 +0000 (12:28 +0000)]
Merge "Bug 5592 - DeviceContext -> DeviceState in *ToNotificationTransformer classes"

8 years agoMerge "Fix "Bug 5589 - Deprecate PortNumberCache" - New class that can convert Device...
Jozef Bacigal [Mon, 18 Apr 2016 12:18:45 +0000 (12:18 +0000)]
Merge "Fix "Bug 5589 - Deprecate PortNumberCache" - New class that can convert DeviceState to NodeConnectorRef and NodeConnectorRef to port number. - 1 test that will verify if conversion between DeviceState and NodeConnectorRef is valid. - Made methods in PortNumberCache deprecated and replaced use of them in PacketReceivedTranslator with new methods. - Modified tests for PacketReceivedTranslator to work with new methods."

8 years agoFix "Bug 5589 - Deprecate PortNumberCache" 40/36740/5
Tomas Slusny [Thu, 24 Mar 2016 13:08:02 +0000 (14:08 +0100)]
Fix "Bug 5589 - Deprecate PortNumberCache"
- New class that can convert DeviceState to NodeConnectorRef and NodeConnectorRef to port number.
- 1 test that will verify if conversion between DeviceState and NodeConnectorRef is valid.
- Made methods in PortNumberCache deprecated and replaced use of them in PacketReceivedTranslator with new methods.
- Modified tests for PacketReceivedTranslator to work with new methods.

Change-Id: I4960fd701ce0bf905208806c94e6ba1b7684a0cd
Signed-off-by: Tomas Slusny <tomas.slusny@pantheon.sk>
8 years agoDo not deploy the karaf artifact 53/36353/2
Thanh Ha [Wed, 16 Mar 2016 22:33:40 +0000 (18:33 -0400)]
Do not deploy the karaf artifact

The karaf artifact is only used for testing. It does not need to be
released to the world.

Change-Id: Ieca324babbf2cf8ac710808fdf40134981ed38e5
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
8 years agoBug-5534:RoleService does not take care of rpc errors 23/36523/5
Kamal Rameshan [Wed, 16 Mar 2016 00:24:01 +0000 (17:24 -0700)]
Bug-5534:RoleService does not take care of rpc errors

Change-Id: Id65e597f5952b689dec176c29ae9e78284123ce2
Signed-off-by: Kamal Rameshan <kramesha@cisco.com>
8 years agoBug 5592 82/37082/1
Tomas Slusny [Thu, 31 Mar 2016 07:02:05 +0000 (09:02 +0200)]
Bug 5592
- DeviceContext -> DeviceState in *ToNotificationTransformer classes

Change-Id: I60cb6c908798115addc9ec10e8ed31e556a56f8d
Signed-off-by: Tomas Slusny <tomas.slusny@pantheon.sk>
8 years agoBUG 5523 RoleCtx changes 62/36962/1
Jozef Bacigal [Tue, 29 Mar 2016 08:30:12 +0000 (10:30 +0200)]
BUG 5523 RoleCtx changes

 *add onDeviceContextLevelDown method
  * simplify RoleContext close process
  * add timer for clean (fix cluster sync. problems)
 *simplify ownershipChange process
 *RoleContext with one semaphor only
 *add new method for prevent misunderstanding process in RoleContext
 *capsulate Semafors locks in RoleContext
 *add new state markers (isMainCandidateRegister, isTxCandidateRegistered,
  getClusterRole)

Change-Id: I14438aafc8fe62264a62ccca0bd55a4520ffaeda
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
8 years agoBUG 5523 Add onDeviceContextLevelDown for Statistics and Rpc Managers 61/36961/1
Jozef Bacigal [Tue, 29 Mar 2016 08:18:40 +0000 (10:18 +0200)]
BUG 5523 Add onDeviceContextLevelDown for Statistics and Rpc Managers

 *change Termination order in OFpluginProvider
 *add onDeviceContextLevelDown methods
 *add pair NodeId with Context for every manager
  *only NodeId is keyProtection with not finished unregistration
   for every shutting down order

Change-Id: Iec0defc9efeb276668404a0935114e523ab3fc10
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
8 years agoBUG 5523 DeviceManager handler for connection and disconnection too 56/36956/1
Jozef Bacigal [Tue, 29 Mar 2016 08:17:17 +0000 (10:17 +0200)]
BUG 5523 DeviceManager handler for connection and disconnection too

 *Init and close DeviceCtx suite has contract with ConnectionCtx
  so we'd like to have only one way for Clean DeviceCtx suite :
onDeviceDisconnected event for primary connectionContext.
 *add timer for shuttinDown TxManager because Cluster
 *clean TxManager close txChain handling

Change-Id: Ifba1c538b3369bd125908a114786d5bf92a15c7f
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
8 years agoBUG 5523 - DeviceContext additional functionality 55/36955/1
Jozef Bacigal [Tue, 29 Mar 2016 08:15:12 +0000 (10:15 +0200)]
BUG 5523 - DeviceContext additional functionality

 *add shutdonwConnection for use in OFP instead deviceCtx.close
 *add DeviceContext states object
 *add method for get actualState
 *TransactionChainManager
   *remove read DS by shuttingDown process
   *remove close tx possibility
   *Guard submitIsEnabled property (only active TxChainFactory
is real marker for set property to true)

Change-Id: I44789c04b819eed27a297372d6d819727e45f26c
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
8 years agoBUG 5523 - API changes 51/36951/1
Jozef Bacigal [Tue, 29 Mar 2016 08:12:06 +0000 (10:12 +0200)]
BUG 5523 - API changes

Fixing closing process for DeviceContext

* rename existing Interfaces
* add method for registration TerminationHandler
* implement TerminationOrder
* fix tests

Change-Id: I69e5305ea45ab7bb34b5133980d2ca29b282cf4b
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
(cherry picked from commit e27f3af11009d085518be491e96b29bf7cf9f7de)

8 years agoBug-5486:Device disconnected handers on disconnection get closed in no particular... 22/36522/2
Kamal Rameshan [Thu, 10 Mar 2016 18:36:33 +0000 (10:36 -0800)]
Bug-5486:Device disconnected handers on disconnection get closed in no particular order

HashSets dont gaurantee any retrieval order. Further we dont need hashing as we just iterate through it.

Some log changes.

Change-Id: Ia31ce404e44e78bd0a3483e969da06119afe75f0
Signed-off-by: Kamal Rameshan <kramesha@cisco.com>
8 years agoMerge "Bug-5551:Audit of Connection Events"
michal rehak [Thu, 24 Mar 2016 09:38:37 +0000 (09:38 +0000)]
Merge "Bug-5551:Audit of Connection Events"

8 years agoBug-5562 - Ipv4 L3-ArbitraryMask patch 71/36571/1
Sai MarapaReddy [Sat, 19 Mar 2016 06:36:20 +0000 (23:36 -0700)]
Bug-5562 - Ipv4 L3-ArbitraryMask patch
Current code expects the Arbitrary Mask to be normalized from switch.
Example:- 3.3.3.3/255.0.255.0 to 3.0.3.0/255.0.255.0
Not all switches normalizes arbitrary bit mask in the flows when they are injected.
Example:- 3.3.3.3/255.0.255.0 to 3.3.3.3/255.0.255.0
This patch ensures that the operational data store is in congruent with the flows
that are shown on the switch. Patch is built on checking the mask & comparing the
normalized stores & stats flows which ensures Ipv4 L3-ArbitraryMask works independant
of how the switches normalizes the ip addresses when flows are pushed.

Conflicts:
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/IpConversionUtil.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchConvertorImpl.java

Change-Id: Icfc6d4805c58f6483fc3ca0458b827b14c0a0cb1
Signed-off-by: Sai MarapaReddy <sai.marapareddy@gmail.com>
8 years agoBug-5551:Audit of Connection Events 24/36524/1
Kamal Rameshan [Thu, 17 Mar 2016 20:18:51 +0000 (13:18 -0700)]
Bug-5551:Audit of Connection Events

Change-Id: Ida3e632e80add4491e29e6c014a94a19c7ed9909
Signed-off-by: Kamal Rameshan <kramesha@cisco.com>
8 years agoMerge "BUG-5489 Group Delete not working with ovs2.5"
Anil Vishnoi [Mon, 21 Mar 2016 22:13:19 +0000 (22:13 +0000)]
Merge "BUG-5489 Group Delete not working with ovs2.5"

8 years agoMerge "Fix Mockito Generics"
michal rehak [Tue, 15 Mar 2016 09:23:12 +0000 (09:23 +0000)]
Merge "Fix Mockito Generics"

8 years agoBug 5521 - flows reconciliation 31/36131/3
Jozef Bacigal [Fri, 11 Mar 2016 14:20:43 +0000 (15:20 +0100)]
Bug 5521 - flows reconciliation

Fix missing flows by initialization/reconciliation

Change-Id: I2b3d892cb53abc1603db45c7937ae98ac4a36a79
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
8 years agoFix Mockito Generics 96/36196/1
andrej.leitner [Mon, 14 Mar 2016 14:54:06 +0000 (15:54 +0100)]
Fix Mockito Generics

 *fix Generic for mockito matcher
 *fix testGroupModConvertSortedBuckets

Change-Id: I8148c94cf572440a1cb9be7a0d962c8501cb3f42
Signed-off-by: andrej.leitner <anleitne@cisco.com>
8 years agoMerge "Correction classes names in loggers."
michal rehak [Fri, 11 Mar 2016 14:42:51 +0000 (14:42 +0000)]
Merge "Correction classes names in loggers."

8 years agoMerge "Post "Clustering optimization" updates"
michal rehak [Fri, 11 Mar 2016 14:40:25 +0000 (14:40 +0000)]
Merge "Post "Clustering optimization" updates"

8 years agoBUG-5489 Group Delete not working with ovs2.5 35/36035/1
Shuva Jyoti Kar [Thu, 10 Mar 2016 09:43:19 +0000 (15:13 +0530)]
BUG-5489 Group Delete not working with ovs2.5

Change-Id: Ie63c46e5d9def2c89e5e22e6d5ca56678b43424d
Signed-off-by: Shuva Jyoti Kar <shuva.jyoti.kar@ericsson.com>
8 years agoSuppressed INFO log messages. 26/36026/1
Hideyuki Tai [Fri, 26 Feb 2016 14:27:39 +0000 (06:27 -0800)]
Suppressed INFO log messages.

According to the Logging Best Practices in the OpenDaylight wiki,
messages at INFO level should be for operators and administrators.
However, some log messages for developers inappropriately used the INFO
level. This patch changed the log level of the messages from INFO to
TRACE.

Change-Id: I7e666149a7ea3dbdcddf7f157a5010d4fb5aee63
Signed-off-by: Hideyuki Tai <Hideyuki.Tai@necam.com>
(cherry picked from commit a7b507c778ead7c2e316b1acadd55653dcb2dcaa)

8 years agoMerge "Bug:3026 - Echo response timeout needs be exported to configuration"
Kamal Rameshan [Wed, 9 Mar 2016 17:33:00 +0000 (17:33 +0000)]
Merge "Bug:3026 - Echo response timeout needs be exported to configuration"

8 years agoCorrection classes names in loggers. 83/35983/1
Jozef Bacigal [Wed, 9 Mar 2016 11:24:40 +0000 (12:24 +0100)]
Correction classes names in loggers.

- this are probably copy paste errors

Change-Id: I7ac309b218fc8250edd4ba2e65e2174fab2babcb
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
8 years agoPost "Clustering optimization" updates 69/35969/1
Jozef Bacigal [Wed, 2 Mar 2016 11:25:23 +0000 (12:25 +0100)]
Post "Clustering optimization" updates

3/2/16

- small updates after clustering optimizations
- grammar policy for method names, class name and logs
- clean ups

3/3/16

- deviceState class, set SLAVE after init
- deviceStateTest updates

Change-Id: Ia38b125cb974fc15a49ce288f9880278d4db6288
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
8 years agoMerge "Quick fix RPCs and DevicCtx.close"
michal rehak [Wed, 9 Mar 2016 08:55:15 +0000 (08:55 +0000)]
Merge "Quick fix RPCs and DevicCtx.close"

8 years agoBug:3026 - Echo response timeout needs be exported to configuration 18/35618/4
Kamal Rameshan [Fri, 26 Feb 2016 23:39:50 +0000 (15:39 -0800)]
Bug:3026 - Echo response timeout needs be exported to configuration

Takes care of Bug-4677 : Li: Knob to configure Barrier duration

Also incorporated Jozef bacigal's hot fix in stable

Change-Id: I42697dbbb93cc40c1547b92e9665851e7f5f0b98
Signed-off-by: Kamal Rameshan <kramesha@cisco.com>
(cherry picked from commit e22904723888cfe73fff63e280e4c4c5af51b910)

8 years agoBug-5119 - Adding support for L3 address arbitraty bit mask with Unittests coverage... 63/35963/1
Sai MarapaReddy [Wed, 10 Feb 2016 23:26:04 +0000 (15:26 -0800)]
Bug-5119 - Adding support for L3 address arbitraty bit mask with Unittests coverage & indentation & addressed latest comments &  rebased

Author:     Sai MarapaReddy <sai.marapareddy@gmail.com>
Commit:     Sai MarapaReddy <sai.marapareddy@gmail.com>
Change-Id: I26ef6aef4ffdbc5047c5a2282fbdc42d7bbfcd27
Signed-off-by: Sai MarapaReddy <sai.marapareddy@gmail.com>
8 years agoQuick fix RPCs and DevicCtx.close 78/35878/2
Jozef Bacigal [Fri, 4 Mar 2016 15:11:06 +0000 (16:11 +0100)]
Quick fix RPCs and DevicCtx.close

Change-Id: I1cd92d91e1025ae3aee00418b86912f2e86580b4
Signed-off-by: Vaclav Demcak <vdemcak@cisco.com>
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
8 years agoBug 5404 - He plugin: Meter stats not reported the first time switch connects to... 05/35905/1
Anil Vishnoi [Tue, 8 Mar 2016 03:31:07 +0000 (19:31 -0800)]
Bug 5404 - He plugin: Meter stats not reported the first time switch connects to controller

Change-Id: I970ed9bd02fd20054d552e3a6127f9766cd8ab92
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
(cherry picked from commit 60fd94868c75a9d49eb968f73a1ed337a38ed727)

8 years agoDo not retain DeviceState 31/35831/1
Robert Varga [Fri, 4 Mar 2016 14:36:41 +0000 (15:36 +0100)]
Do not retain DeviceState

TransactionChainManager only needs the instance identifier (or Node Id,
available from there), do not retain the entire state.

Change-Id: I93ff1fc08ebf469a907493452e9e771d59dd849f
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years agoDo not leak internal state 30/35830/1
Robert Varga [Fri, 4 Mar 2016 14:16:52 +0000 (15:16 +0100)]
Do not leak internal state

The state transition enum should not be visible from outside, hide it.

Change-Id: I2b3fa8af7829509b5a968eb952a53c829e189aaa
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years agoDo not lose thread on close 29/35829/1
Robert Varga [Fri, 4 Mar 2016 13:41:27 +0000 (14:41 +0100)]
Do not lose thread on close

We need to make sure we shutdown the spypool on close.

Change-Id: I07d7144b9ca29e35a6dc24231b525c64c8e3891a
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years agoUse IetInetUtil conversion 99/35099/10
Robert Varga [Fri, 19 Feb 2016 14:37:42 +0000 (15:37 +0100)]
Use IetInetUtil conversion

Instead of home-grown covnersion, use the utilities provided.

Change-Id: I9a44b8eb87f297c8d456182b7080fd9f447802c3
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years agoFix a guaranteed NPE 85/35785/2
Robert Varga [Fri, 4 Mar 2016 13:31:08 +0000 (14:31 +0100)]
Fix a guaranteed NPE

If we fail to decode a packet, we will end up causing a NPE in
statistics. Use the packetIn class for that instead.

Change-Id: Ib53ca939ee4a08319c2595d560bfdd99c013eba2
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years agoDo not override java source/target 86/35786/1
Robert Varga [Fri, 4 Mar 2016 13:34:01 +0000 (14:34 +0100)]
Do not override java source/target

odlparent already provides correct definitions (which are Java 8), so
use those.

Change-Id: Ib6d19bbe1aff0930fd9f0151e44a643fa7854e38
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years agoMerge "Bug 4957 Cleaning code and fixing issues from manual tests"
michal rehak [Wed, 2 Mar 2016 16:46:59 +0000 (16:46 +0000)]
Merge "Bug 4957 Cleaning code and fixing issues from manual tests"

8 years agoMerge "Bug 4957: OF Role processing changes"
michal rehak [Wed, 2 Mar 2016 16:46:56 +0000 (16:46 +0000)]
Merge "Bug 4957: OF Role processing changes"

8 years agoMerge "Bug-4957 Cluster Role change fix"
michal rehak [Wed, 2 Mar 2016 16:46:53 +0000 (16:46 +0000)]
Merge "Bug-4957 Cluster Role change fix"

8 years agoMerge "Bug-4957: Make async operational DS Read"
michal rehak [Wed, 2 Mar 2016 16:27:38 +0000 (16:27 +0000)]
Merge "Bug-4957: Make async operational DS Read"

8 years agoMerge "Bug-4957 Fix SalRoleService blocking call"
michal rehak [Wed, 2 Mar 2016 16:27:35 +0000 (16:27 +0000)]
Merge "Bug-4957 Fix SalRoleService blocking call"

8 years agoMerge "Bug-4957: Double candidate, close processing"
michal rehak [Wed, 2 Mar 2016 16:27:32 +0000 (16:27 +0000)]
Merge "Bug-4957: Double candidate, close processing"

8 years agoMerge "Bug-4957: Double candidate, introduced roleCtx states"
michal rehak [Wed, 2 Mar 2016 16:27:28 +0000 (16:27 +0000)]
Merge "Bug-4957: Double candidate, introduced roleCtx states"

8 years agoMerge "Bug-4957: Double candidate, clean up"
michal rehak [Wed, 2 Mar 2016 16:27:25 +0000 (16:27 +0000)]
Merge "Bug-4957: Double candidate, clean up"

8 years agoMerge "Bug-4957 Double candidate Onwership initial commit"
michal rehak [Wed, 2 Mar 2016 16:27:22 +0000 (16:27 +0000)]
Merge "Bug-4957 Double candidate Onwership initial commit"

8 years agoMerge "Bug 4957 Fix Cluster Role change for Statistics Polling"
michal rehak [Wed, 2 Mar 2016 16:27:19 +0000 (16:27 +0000)]
Merge "Bug 4957 Fix Cluster Role change for Statistics Polling"

8 years agoMerge "Bug 4957 Fix Cluster Role change for RPC registration"
michal rehak [Wed, 2 Mar 2016 16:27:15 +0000 (16:27 +0000)]
Merge "Bug 4957 Fix Cluster Role change for RPC registration"

8 years agoBug 4957 Cleaning code and fixing issues from manual tests 85/35585/1
Vaclav Demcak [Thu, 25 Feb 2016 13:15:04 +0000 (14:15 +0100)]
Bug 4957 Cleaning code and fixing issues from manual tests

 *Initialization Device info collecting
  -Device Info collecting is async function and it could finish
   with unactive connection (bug stat collecting always return true)
   so we need to check actual state before we finish MASTER
   roleChange.
  -We don't wish to commit any data and we are able to close
   NEW Transaction. So we try to do it.

 *SalRoleServiceImpl changes
  -add result FutureCallback for release semafor guard
  -add check for cancel for every loop
  -fix return failed future for InterruptedException

 *Change close method for all Managers
  -Fix close method in RoleManager we not suspend TxEntity
  -Use consumingIterator for cleaning manager's contexts
  -Use concumingIterator for close in RpcContext

 *Additional clean
  -clean RoleContext for TxLockOwned
  -fix not propagated Excepton from DeviceContext#onDeviceContextLevelUp
  -clean RoleManager
  -add check for Connection state for statistics
  -fix tests

Change-Id: I04d19e4c0a0e87e4158cd2ca25da32fe15cfef22
Signed-off-by: Vaclav Demcak <vdemcak@cisco.com>
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>
8 years agoMerge "Pre-compute ipv4 masks"
michal rehak [Tue, 1 Mar 2016 14:00:05 +0000 (14:00 +0000)]
Merge "Pre-compute ipv4 masks"