openflowplugin.git
8 years agoCoverage - AbstractRequestCallback. 02/24702/1
Jozef Gloncak [Fri, 31 Jul 2015 13:05:10 +0000 (15:05 +0200)]
Coverage - AbstractRequestCallback.

Increase code coverage for AbstractRequestCallback class.

Change-Id: I6d796e083980bb7db340facb867968f735ae0bbf
Signed-off-by: Jozef Gloncak <jgloncak@cisco.com>
8 years agoMerge "Coverage - SalMeterServiceImpl."
michal rehak [Fri, 31 Jul 2015 08:28:02 +0000 (08:28 +0000)]
Merge "Coverage - SalMeterServiceImpl."

8 years agoCoverage - SalMeterServiceImpl. 88/24688/1
Jozef Gloncak [Fri, 31 Jul 2015 07:39:38 +0000 (09:39 +0200)]
Coverage - SalMeterServiceImpl.

Increase code coverage for SalMeterServiceImpl class.

Change-Id: I27850e93dde5a44ff0a04f2e6142f66ad29f787e
Signed-off-by: Jozef Gloncak <jgloncak@cisco.com>
8 years agoCoverage - SalPortServiceImpl. 29/24629/2
Jozef Gloncak [Thu, 30 Jul 2015 13:46:10 +0000 (15:46 +0200)]
Coverage - SalPortServiceImpl.

Increase code coverage for SalPortServiceImpl class.

Change-Id: I0ca4e870b5f1a35758381d033dcf1a18d5a87f01
Signed-off-by: Jozef Gloncak <jgloncak@cisco.com>
8 years agoCoverage - ancestor mocking class for services testing. 28/24628/3
Jozef Gloncak [Thu, 30 Jul 2015 13:39:21 +0000 (15:39 +0200)]
Coverage - ancestor mocking class for services testing.

New ancestor class is added for easier testing of service classes.

Change-Id: I769aea6caeea4785714bdce1d5f449a0e9fa6384
Signed-off-by: Jozef Gloncak <jgloncak@cisco.com>
8 years agoCoverage - MultipartRequestOnTheFlyCallback. 25/24625/1
Jozef Gloncak [Thu, 30 Jul 2015 12:14:23 +0000 (14:14 +0200)]
Coverage - MultipartRequestOnTheFlyCallback.

Increase of code coverage for class MultipartRequestOnTheFlyCallback.

Change-Id: Ieb5719d540122bfc3969fece77d1b96f42d1596f
Signed-off-by: Jozef Gloncak <jgloncak@cisco.com>
8 years agoMerge "BUG-4034: Missing barrier after flow remove"
Abhijit Kumbhare [Wed, 29 Jul 2015 13:27:45 +0000 (13:27 +0000)]
Merge "BUG-4034: Missing barrier after flow remove"

8 years agoMerge "Coverage - SalTableServiceImpl."
michal rehak [Wed, 29 Jul 2015 13:26:29 +0000 (13:26 +0000)]
Merge "Coverage - SalTableServiceImpl."

8 years agoMerge "BUG-4032: Missing topology-lldp-discovery config"
Abhijit Kumbhare [Wed, 29 Jul 2015 13:25:02 +0000 (13:25 +0000)]
Merge "BUG-4032: Missing topology-lldp-discovery config"

8 years agoCoverage - MessageIntelligenceAgencyImpl. 66/24566/3
Jozef Gloncak [Mon, 27 Jul 2015 09:11:45 +0000 (11:11 +0200)]
Coverage - MessageIntelligenceAgencyImpl.

Increase code coverage for MessageIntelligenceAgencyImpl.

Change-Id: I16000bb415f1b58e0b94113f5dc9b27c6e0fb1c1
Signed-off-by: Jozef Gloncak <jgloncak@cisco.com>
8 years agoAdd sal-binding-config as dependency into various components 71/24571/2
Vratko Polak [Mon, 27 Jul 2015 17:14:32 +0000 (19:14 +0200)]
Add sal-binding-config as dependency into various components

Usually, only sal-binging-api was present,
sometimes with sal-binding-broker-impl, but the essential yang model
opendaylight-md-sal-binding:2013-10-28 was never there;
and in Beryllium it stopped being found transitively.

Signed-off-by: Vratko Polak <vrpolak@cisco.com>
Change-Id: I47bd1be2002e92fdda69bd6e2699b5a40edc0b0e

8 years agoCoverage - SalTableServiceImpl. 23/24523/1
Jozef Gloncak [Fri, 24 Jul 2015 12:49:31 +0000 (14:49 +0200)]
Coverage - SalTableServiceImpl.

Increase code coverage for SalTableServiceImpl class.

Change-Id: I9e52368010b254a33ef9f596b3b1e271ebce4d70
Signed-off-by: Jozef Gloncak <jgloncak@cisco.com>
8 years agoMerge "Coverage - ofp/impl/statistics/services"
Abhijit Kumbhare [Fri, 24 Jul 2015 14:20:01 +0000 (14:20 +0000)]
Merge "Coverage - ofp/impl/statistics/services"

8 years agoMerge "Coverage - SalFlowServiceImpl."
michal rehak [Fri, 24 Jul 2015 14:03:12 +0000 (14:03 +0000)]
Merge "Coverage - SalFlowServiceImpl."

8 years agoMerge "Coverage - StatisticsManagerImpl."
michal rehak [Fri, 24 Jul 2015 14:02:51 +0000 (14:02 +0000)]
Merge "Coverage - StatisticsManagerImpl."

8 years agoCoverage - SalFlowServiceImpl. 01/24501/2
Jozef Gloncak [Fri, 24 Jul 2015 09:16:43 +0000 (11:16 +0200)]
Coverage - SalFlowServiceImpl.

Increase code coverage for class SalFlowServiceImpl.

Change-Id: I8234976c60858dbc25e90db569e90c96d325a52e
Signed-off-by: Jozef Gloncak <jgloncak@cisco.com>
8 years agoCoverage - StatisticsManagerImpl. 10/24510/1
Jozef Gloncak [Fri, 24 Jul 2015 12:47:14 +0000 (14:47 +0200)]
Coverage - StatisticsManagerImpl.

Increase code coverage for StatisticsManagerImpl.

Change-Id: I7c61449766c7400748e19ee8b3bdcb98ee7fc924
Signed-off-by: Jozef Gloncak <jgloncak@cisco.com>
8 years agoCoverage - fix error in FlowUtilTest. 03/24503/1
Jozef Gloncak [Fri, 24 Jul 2015 09:43:56 +0000 (11:43 +0200)]
Coverage - fix error in FlowUtilTest.

If method createAlienFlowId() was called before this test it caused that
dummy alien ID didn't contain index 1 but index 2 and test failed.

Currently test calls createAlienFlowId() method twice and then compares
whether index suffix from first call is smaller then index from second call.

Change-Id: Ie8e1e1ab7825e266e94045a30c9d63770ef33611
Signed-off-by: Jozef Gloncak <jgloncak@cisco.com>
8 years agoCoverage - ofp/impl/statistics/services 81/24481/1
Michal Rehak [Thu, 23 Jul 2015 14:59:58 +0000 (16:59 +0200)]
Coverage - ofp/impl/statistics/services

Change-Id: I59ab9efdf1883a0ddc0f2311fed0b6f30ce83aca
Signed-off-by: Michal Rehak <mirehak@cisco.com>
8 years agoCoverage - SalFlowServiceImpl. 71/24471/1
Jozef Gloncak [Thu, 23 Jul 2015 12:53:58 +0000 (14:53 +0200)]
Coverage - SalFlowServiceImpl.

Increase code coverage for class SalFlowServiceImpl.

Change-Id: Iffe547107d6fb84b7125db9015a8d29f436e388d
Signed-off-by: Jozef Gloncak <jgloncak@cisco.com>
8 years agoMerge "Coverage - OutboundQueueProviderImpl."
michal rehak [Thu, 23 Jul 2015 11:54:34 +0000 (11:54 +0000)]
Merge "Coverage - OutboundQueueProviderImpl."

8 years agoCoverage - OutboundQueueProviderImpl. 66/24466/1
Jozef Gloncak [Thu, 23 Jul 2015 11:12:47 +0000 (13:12 +0200)]
Coverage - OutboundQueueProviderImpl.

Increase code coverage for class OutboundQueueProviderImplTest.

Change-Id: Iaae0a5808b5080567107ae991888064b335d2fa1
Signed-off-by: Jozef Gloncak <jgloncak@cisco.com>
8 years agoCoverage - DeviceContextImpl2. 05/24405/4
Jozef Gloncak [Wed, 22 Jul 2015 16:50:17 +0000 (18:50 +0200)]
Coverage - DeviceContextImpl2.

Continuing increasing of code coverage for DeviceContextImpl.

Change-Id: I6c9eb9a12dd4aebff13bd2d5a29fe37f06300ec8
Signed-off-by: Jozef Gloncak <jgloncak@cisco.com>
8 years agoMerge "Use Beryllium version of liblldp"
michal rehak [Wed, 22 Jul 2015 15:58:11 +0000 (15:58 +0000)]
Merge "Use Beryllium version of liblldp"

8 years agoMerge "Coverage - DeviceContextImpl."
michal rehak [Wed, 22 Jul 2015 14:06:14 +0000 (14:06 +0000)]
Merge "Coverage - DeviceContextImpl."

8 years agoUse Beryllium version of liblldp 97/24397/1
Thanh Ha [Wed, 22 Jul 2015 13:52:06 +0000 (09:52 -0400)]
Use Beryllium version of liblldp

Bug: 4030
Change-Id: I2d8c496c23f7b6a5cc6acc89accef1ffada78c0b
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
8 years agoCoverage - DeviceContextImpl. 86/24386/2
Jozef Gloncak [Wed, 22 Jul 2015 11:13:23 +0000 (13:13 +0200)]
Coverage - DeviceContextImpl.

Increase code coverage in class DeviceContextImpl.

Change-Id: Iff4e793fcdf23c029c2df5cda2bb2cd80635a12b
Signed-off-by: Jozef Gloncak <jgloncak@cisco.com>
8 years agoCoverage - SinglePurposeMultipartReplyTranslator. 82/24382/1
Jozef Gloncak [Wed, 22 Jul 2015 08:53:47 +0000 (10:53 +0200)]
Coverage - SinglePurposeMultipartReplyTranslator.

Increase code coverage for method getGroupActionsSupportBitmap()

Change-Id: Ia9b8f72a4586394e7ccd301a31e3c320a88cf294
Signed-off-by: Jozef Gloncak <jgloncak@cisco.com>
8 years agoBUG-4034: Missing barrier after flow remove 79/24379/1
Michal Rehak [Wed, 22 Jul 2015 08:28:29 +0000 (10:28 +0200)]
BUG-4034: Missing barrier after flow remove

 - fixed barrier support for:
    - flow: remove
    - meter: remove, update
    - group: remove, update

Change-Id: I5934923614e7572343ce5bef068f74c0c7a5fb69
Signed-off-by: Michal Rehak <mirehak@cisco.com>
8 years agoBUG-4032: Missing topology-lldp-discovery config 76/24376/1
Michal Rehak [Wed, 22 Jul 2015 06:53:10 +0000 (08:53 +0200)]
BUG-4032: Missing topology-lldp-discovery config

 - in Li-features there was missing dependency on
   topology-manager and topology-lldp-discovery config files

Change-Id: I9d98d0f617deb4bc629b17b0dd9dec38d687fad4
Signed-off-by: Michal Rehak <mirehak@cisco.com>
8 years agoCoverage - SinglePurposeMultipartReplyTranslator. 44/24344/1
Jozef Gloncak [Tue, 21 Jul 2015 14:18:06 +0000 (16:18 +0200)]
Coverage - SinglePurposeMultipartReplyTranslator.

Increase code coverage for SinglePurposeMultipartReplyTranslator.

Change-Id: I2d816a51e5b3b9c8a6a3cd8f60603b9c6be6bafd
Signed-off-by: Jozef Gloncak <jgloncak@cisco.com>
8 years agoMerge "Cover - StatisticsGatheringUtils"
Anil Vishnoi [Mon, 20 Jul 2015 16:11:34 +0000 (16:11 +0000)]
Merge "Cover - StatisticsGatheringUtils"

8 years agoMerge "Coverage - StatisticsContextImpl"
Anil Vishnoi [Mon, 20 Jul 2015 16:11:08 +0000 (16:11 +0000)]
Merge "Coverage - StatisticsContextImpl"

8 years agoMerge "Coverage - PortUpdateTranslator"
Anil Vishnoi [Mon, 20 Jul 2015 16:10:11 +0000 (16:10 +0000)]
Merge "Coverage - PortUpdateTranslator"

8 years agoMerge "Coverage - PacketReceivedTranslator"
Anil Vishnoi [Mon, 20 Jul 2015 16:09:40 +0000 (16:09 +0000)]
Merge "Coverage - PacketReceivedTranslator"

8 years agoMerge "Coverage - AggregatedFlowStatisticsTranslator"
Anil Vishnoi [Mon, 20 Jul 2015 16:09:23 +0000 (16:09 +0000)]
Merge "Coverage - AggregatedFlowStatisticsTranslator"

8 years agoCoverage - DeviceManagerImpl. 87/24287/1
Jozef Gloncak [Mon, 20 Jul 2015 13:22:50 +0000 (15:22 +0200)]
Coverage - DeviceManagerImpl.

Increase code coverage in DeviceManagerImpl.

Change-Id: I89ebfc2791fe656205bc8a8c90aacd3199e772cc
Signed-off-by: Jozef Gloncak <jgloncak@cisco.com>
8 years agoCoverage - DeviceManagerImpl. 36/24236/4
joe [Fri, 17 Jul 2015 11:37:37 +0000 (13:37 +0200)]
Coverage - DeviceManagerImpl.

Increase coverage of DeviceManagerImpl.

Change-Id: I5bf1d7388280edd016bb46f6033d2a2701f716af
Signed-off-by: Jozef Gloncak <jgloncak@cisco.com>
8 years agoCover - StatisticsGatheringUtils 48/24148/6
Jozef Gloncak [Wed, 15 Jul 2015 09:08:36 +0000 (11:08 +0200)]
Cover - StatisticsGatheringUtils

Change-Id: I465ba12b5e14f699bde710a59decf85a5f34f99e
Signed-off-by: Jozef Gloncak <jgloncak@cisco.com>
Signed-off-by: Michal Rehak <mirehak@cisco.com>
8 years agoCoverage - PortUpdateTranslator 47/24247/1
Michal Rehak [Fri, 17 Jul 2015 15:21:25 +0000 (17:21 +0200)]
Coverage - PortUpdateTranslator

 - fixed typo in the translator (supportedFeatures per OF-version)

Change-Id: Ica52f80fb1b157c1de1a2497b4dcc440396234c4
Signed-off-by: Michal Rehak <mirehak@cisco.com>
8 years agoCoverage - PacketReceivedTranslator 46/24246/1
Michal Rehak [Fri, 17 Jul 2015 15:20:28 +0000 (17:20 +0200)]
Coverage - PacketReceivedTranslator

Change-Id: I42ce751aeadd49d7fa079a0c28bb4bb500adc266
Signed-off-by: Michal Rehak <mirehak@cisco.com>
8 years agoCoverage - AggregatedFlowStatisticsTranslator 45/24245/1
Michal Rehak [Fri, 17 Jul 2015 15:18:48 +0000 (17:18 +0200)]
Coverage - AggregatedFlowStatisticsTranslator

Change-Id: Id71d62eb759e6b7dc5db0e8a461c0366e5d8bd89
Signed-off-by: Michal Rehak <mirehak@cisco.com>
8 years agoCoverage - StatisticsContextImpl 07/24207/1
Michal Rehak [Thu, 16 Jul 2015 15:19:29 +0000 (17:19 +0200)]
Coverage - StatisticsContextImpl

Change-Id: Ifee04a43a1a10498e47c50fb8fbb983ab78e5050
Signed-off-by: Michal Rehak <mirehak@cisco.com>
8 years agoMerge "Coverage - DeviceManagerImpl."
michal rehak [Thu, 16 Jul 2015 12:44:59 +0000 (12:44 +0000)]
Merge "Coverage - DeviceManagerImpl."

8 years agoCoverage - DeviceManagerImpl. 59/24159/4
Jozef Gloncak [Wed, 15 Jul 2015 13:50:39 +0000 (15:50 +0200)]
Coverage - DeviceManagerImpl.

Increase of code coverage for clase DeviceManagerImpl.

Change-Id: I0dbee99d7ba299ec2a6a7052a70a3cc28e979bd9
Signed-off-by: Jozef Gloncak <jgloncak@cisco.com>
8 years agoBUG-4004: sal-echo.yang contains strange characters 91/24191/1
Michal Rehak [Thu, 16 Jul 2015 09:27:20 +0000 (11:27 +0200)]
BUG-4004: sal-echo.yang contains strange characters

 - chacters replaced (origin was probably OFP-1.3.2 specification pdf)

Change-Id: I1d37a291f14388c3436eb1fbb4f1245ad9fe09dd
Signed-off-by: Michal Rehak <mirehak@cisco.com>
8 years agoMethod visibility change - DeviceManagerImpl. 83/24183/2
Jozef Gloncak [Thu, 16 Jul 2015 08:35:30 +0000 (10:35 +0200)]
Method visibility change - DeviceManagerImpl.

To be able to test some method, modifiers were changed.

Change-Id: I5d331659c6fc0db300eebbc7fd35bf885a67d8b4
Signed-off-by: Jozef Gloncak <jgloncak@cisco.com>
8 years agoMerge "Cover - StatisticsContextImpl."
michal rehak [Wed, 15 Jul 2015 09:08:20 +0000 (09:08 +0000)]
Merge "Cover - StatisticsContextImpl."

8 years agoCover - StatisticsContextImpl. 98/24098/4
Jozef Gloncak [Tue, 14 Jul 2015 12:09:02 +0000 (14:09 +0200)]
Cover - StatisticsContextImpl.

Coverage for StatisticsContextImpl.

Change-Id: I42b9351379728f791535dc6d943974757ab34c6e
Signed-off-by: Jozef Gloncak <jgloncak@cisco.com>
8 years agounit test - fixing package 11/24111/1
Michal Rehak [Tue, 14 Jul 2015 14:52:52 +0000 (16:52 +0200)]
unit test - fixing package

 - moving tests of RpcManagerImpl and RpcContextImpl to appropriate package

Change-Id: Ibb0d0c55f049affd7c81558b8d56c8a2f0039daf
Signed-off-by: Michal Rehak <mirehak@cisco.com>
8 years agoFlowUtilTest 81/24081/2
Jozef Gloncak [Tue, 14 Jul 2015 06:34:18 +0000 (08:34 +0200)]
FlowUtilTest

Test for class FlowUtil.

Change-Id: I805f31f508a196dc4a69793ab3f55547ba23487a
Signed-off-by: Jozef Gloncak <jgloncak@cisco.com>
8 years agoCoverage - registrator and translator libraty util. 51/24051/4
Jozef Gloncak [Mon, 13 Jul 2015 09:23:53 +0000 (11:23 +0200)]
Coverage - registrator and translator libraty util.

Increasing code coverage for classes:
- MdSalRegistratorUtils
- TranslatorLibratyUtil
- DeviceStateUtil
- MatchUtil

Cosmetics.

Change-Id: I193862f8a2d9e96e719fc1b1185140230a7d31eb
Signed-off-by: Jozef Gloncak <jgloncak@cisco.com>
Signed-off-by: Michal Rehak <mirehak@cisco.com>
8 years agoMerge "BUG-3849: Unit test failure due to timing issues"
Anil Vishnoi [Wed, 1 Jul 2015 06:48:44 +0000 (06:48 +0000)]
Merge "BUG-3849: Unit test failure due to timing issues"

8 years agoBUG-2429: Need to close the ODL Denial of Service interface 79/23279/1
Michal Rehak [Wed, 24 Jun 2015 14:47:21 +0000 (16:47 +0200)]
BUG-2429: Need to close the ODL Denial of Service interface

 - added hsContext close action to connectionContext

Change-Id: I93d92951450f6a7af366d75ce985f1076b977d3f
Signed-off-by: Michal Rehak <mirehak@cisco.com>
8 years agoBUG-3849: Unit test failure due to timing issues 93/23193/1
Michal Rehak [Tue, 23 Jun 2015 18:44:16 +0000 (20:44 +0200)]
BUG-3849: Unit test failure due to timing issues

 - ConnectionConductorImplTest works better on machine under heavy load
   or slow CPU
 - added more reliable message sending (make sure that harvester picks it up)
 - (this bug manifests only when small amount of messages is sent in
   short time frame)

Change-Id: Iaa89748dfd938bf677cde0c8fc0893a95ded7430
Signed-off-by: Michal Rehak <mirehak@cisco.com>
8 years agoBug 3829: Fix for race condition between loading of plugin and inv/stats manager. 15/23115/1
Ed Warnicke [Mon, 22 Jun 2015 11:43:51 +0000 (05:43 -0600)]
Bug 3829: Fix for race condition between loading of plugin and inv/stats manager.

Change-Id: I63e0494e26cbb21876946a2bb0d2eaf3fce676b5
Signed-off-by: Ed Warnicke <hagbard@gmail.com>
(cherry picked from commit f1df44b59cd71db628b4985a826cf5bc21ac8155)

8 years agoMerge "Bug 3754 - NPE at org.opendaylight.openflowplugin.openflow.md.core.ConnectionC...
michal rehak [Mon, 22 Jun 2015 16:10:38 +0000 (16:10 +0000)]
Merge "Bug 3754 - NPE at org.opendaylight.openflowplugin.openflow.md.core.ConnectionConductorImpl"

8 years agoBug 3754 - NPE at org.opendaylight.openflowplugin.openflow.md.core.ConnectionConducto... 90/23090/1
Martin Bobak [Mon, 22 Jun 2015 12:36:50 +0000 (14:36 +0200)]
Bug 3754 - NPE at org.opendaylight.openflowplugin.openflow.md.core.ConnectionConductorImpl

Change-Id: Ib340a463076f805b29363c008bbdd214f25c2b78
Signed-off-by: Martin Bobak <mbobak@cisco.com>
8 years agoBUG 3548 - LLDP speaker doesn't start send LLDP packet on port up. 79/23079/1
Jozef Gloncak [Thu, 18 Jun 2015 12:10:52 +0000 (14:10 +0200)]
BUG 3548 - LLDP speaker doesn't start send LLDP packet on port up.

Listener on changes on changes on State subtree was added.

If instance of FlowCapableNodeConnector with port down is received
in NodeConnectorInventoryEventTranslator then it is stored to local map.
When event port up event is received then stored instance is looked up
in map, state part is replaced (with port up information) and it is sent
to LLDP.

Change-Id: Ic989a88c06b2e266c63375bd19e3ed2c2b4d4c2d
Signed-off-by: Jozef Gloncak <jgloncak@cisco.com>
(cherry picked from commit 5865c58f43808e730fdb9dc310741663c304112d)

8 years agoBUG-3741 - groups and meters failing 76/23076/1
Martin Bobak [Wed, 17 Jun 2015 12:25:30 +0000 (14:25 +0200)]
BUG-3741 - groups and meters failing

 - fixed group deletion
 - fixed meter deletion
 - optimized instance identifiers for flowCapableNode

Change-Id: I4645b2bd2e9b2aded1c55015dc2ad8f5b1428517
Signed-off-by: Martin Bobak <mbobak@cisco.com>
(cherry picked from commit 01b5fb16c02331da1d9dd6b2ca40509f4c90785f)

8 years agoBUG-3157: cbench tuneup - packetIn dynamic throttling proposal. 65/23065/1
Martin Bobak [Tue, 16 Jun 2015 07:08:28 +0000 (09:08 +0200)]
BUG-3157: cbench tuneup - packetIn dynamic throttling proposal.

Limit for total amount of outstanding notification can be parametrized.
By default there is 120k. Every device gets proportional part of that
limit and corresponding limiter is notified when number of devices
changes and new proportions affect limits.

 - added parameter to configSubsystem
 - water marks adaptation proposal
 - sanitize limit computation

Change-Id: I257f1b91b8f5d512f512c1694be6be3a670128c6
Signed-off-by: Martin Bobak <mbobak@cisco.com>
(cherry picked from commit 024a822cccc79cd15ca7f9d5d67f54215c82a9d5)

8 years ago- Creating separate bulk-o-matic features for the He and Li plugins 58/23058/1
Jan Medved [Tue, 16 Jun 2015 03:23:01 +0000 (20:23 -0700)]
- Creating separate bulk-o-matic features for the He and Li plugins
- fixed dependencies

Change-Id: I2de2addc4d31c7b03b5b9206367c9fe168dd4439
Signed-off-by: Jan Medved <jmedved@cisco.com>
Signed-off-by: Michal Rehak <mirehak@cisco.com>
(cherry picked from commit cca6476b40b353886ac1a501dcd3659a6aaa462b)

8 years agoMerge "bulk support application - initial proposal"
michal rehak [Mon, 22 Jun 2015 08:36:44 +0000 (08:36 +0000)]
Merge "bulk support application - initial proposal"

8 years agobulk support application - initial proposal 53/23053/2
Martin Bobak [Mon, 8 Jun 2015 16:44:34 +0000 (18:44 +0200)]
bulk support application - initial proposal

 - added models to config subsystem config file
 - created simple implementation
 - added to ofp-li features
 - workarounded restconf bugs (flow-ref related)
 - added parents creation for dataStore way (all or first only)
 - clean up rpc intput models
 - fixed version

Change-Id: I1716b32738c8e430d674ff5f0476d55ab10b43fb
Signed-off-by: Martin Bobak <mbobak@cisco.com>
(cherry picked from commit 45c121d507dbd45995fa3efa56a9cef5154dee62)

8 years agoMerge "Bug 3817: Fix action convertor for OF 1.3."
michal rehak [Mon, 22 Jun 2015 07:11:32 +0000 (07:11 +0000)]
Merge "Bug 3817: Fix action convertor for OF 1.3."

8 years agoBug 3817: Fix action convertor for OF 1.3. 12/23012/1
Hideyuki Tai [Thu, 18 Jun 2015 22:05:58 +0000 (15:05 -0700)]
Bug 3817: Fix action convertor for OF 1.3.

The action convertor for flow entries of OpenFlow 1.3 wrongly used
instance builders for UDP source port in the conversion for the UDP
destination port. In the result, the OpenFlow plugin failed to install a
flow entry which has an action modifying UDP destination port.

Also, the action convertor wrongly used Icmpv4Type.class to create an
action modifying ICMPv4 code filed. And, the size of mask for ICMPv4
code and type fields was wrongly set into 0x0f, though the size of these
fields were 8 bits.

This patch fixes these issues so that the OF plugin can correctly
install flow entries which modify UDP destination port and ICMPv4
fields.

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

8 years agoBug-3794 - OFHandshake thread leak leads to OOM. 99/22999/1
Anil Vishnoi [Fri, 19 Jun 2015 13:30:02 +0000 (19:00 +0530)]
Bug-3794 - OFHandshake thread leak leads to OOM.
Fixed the thread pool cleanup

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

8 years agoBug 3792 - Change default flow timeout values to 0 35/22835/1
Anil Vishnoi [Wed, 17 Jun 2015 22:16:41 +0000 (03:46 +0530)]
Bug 3792 - Change default flow timeout values to 0

Current OF plugin sets the following default values if idle and
hard timeouts are not set in flow body:

Idle_timeout=300
hard_timeout=600
as per openflow spec, if user don't set hard-timeout and idle-timeout
value explicitly, switch will set it to 0 and consider the flow permanent
flow. So existing behavior is clearly violating the specs.

Change-Id: Ibb08d5913d8cb6b2c794e2206e4c854537f2ce7d
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
8 years agoBug 2902 - NPE when apply_action doesn't contain action list 27/22827/1
Anil Vishnoi [Thu, 26 Mar 2015 13:43:49 +0000 (19:13 +0530)]
Bug 2902 - NPE when apply_action doesn't contain action list

Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
Change-Id: Ibf7f2e940388f1a28466fa5b19b75a95aa9a4e24

8 years agoBug 3041 - Meter and Meter Config messages not sent when controller starts after... 37/22637/2
Anil Vishnoi [Sun, 7 Jun 2015 11:31:06 +0000 (17:01 +0530)]
Bug 3041 - Meter and Meter Config messages not sent when controller starts after the switch

Openflow plugin explictly sends group/meter features statistics request
after successful switch handshake to the controller. Statistics-manager
receives multipart reply and ignores it, because it only process response
for the request sent by itself. So it does not make sense to send these
request from plugin.
Statistics manager also sends meter/group feature multipart request when
it's get notified that new node is added to the inventory. In case where
it gets the response immdiately from switch, sometime it creates race
condition where statistics manager don't find the transaction-id of the
request in the cache for which it received the response. This race condition
occures  because statistics manager store the key in cache once request send
operation finishes successfully in asyn manner. Processing the group/meter
response for the request send by plugin causing the reordering of the event
so that statistics processing happens before it adds transaction-id to the
cache. This race condition make statistics manager believe that the request
was not send by it and so it does not update the meter statistics capability
of the node and hence it stops sending the meter stats.

Patch 2 : Fixed unit test - plugin don't send meter/group feature request
now, so two less events.
Patch 3 : Fixed integration test for stable/lithium and master

Change-Id: I15fb58b8f9118f94d1a4154a2662972f69f938a0
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
8 years agoMerge "Bug 3660 - Missing flow for match ARP."
michal rehak [Sat, 13 Jun 2015 17:25:32 +0000 (17:25 +0000)]
Merge "Bug 3660 - Missing flow for match ARP."

8 years agoBug 3660 - Missing flow for match ARP. 28/22328/2
Jozef Gloncak [Wed, 10 Jun 2015 14:25:54 +0000 (16:25 +0200)]
Bug 3660 - Missing flow for match ARP.

Probably typo. Incorrect variable was evaluated.

Change-Id: I02ece504dda3603e8d5dbc60e6dda06d5f60ebbd
Signed-off-by: Jozef Gloncak <jgloncak@cisco.com>
(cherry picked from commit 33637cfb62d32ce59894c18de5e86e73c9047e70)

8 years agoBUG 3603 - Flow without priority isn't processed. 26/22526/1
Jozef Gloncak [Mon, 8 Jun 2015 09:36:47 +0000 (11:36 +0200)]
BUG 3603 - Flow without priority isn't processed.

If flow priority isn't specified then default value 0x8000 is used.
Operation no more fail with NPE.

Change-Id: I9de3457781478e83401a4b18000ded58af501654
Signed-off-by: Jozef Gloncak <jgloncak@cisco.com>
(cherry picked from commit 81f9238a2012999c4fe94c87486f4d7c9bf0f54a)

8 years agoBug 3616 - NPE if flow ref isn't provided. 22/22522/1
Jozef Gloncak [Mon, 8 Jun 2015 11:23:48 +0000 (13:23 +0200)]
Bug 3616 - NPE if flow ref isn't provided.

Check of nullity was added.
If flow ref:
- was provided in input data then it is used.
- wasn't then new flow isn't stored in flow registry.
  Once statistics will come then allien ID will be generated
  for this flow.

Change-Id: Id1ee07ca38825077acfda3af82badbac92db79a5
Signed-off-by: Jozef Gloncak <jgloncak@cisco.com>
(cherry picked from commit 2679df2fb38df97b44c4ca6f60526a35dc0d018f)

8 years agoBug 3635 - fix npe when device disconnects during handshake 20/22520/1
Martin Bobak [Tue, 9 Jun 2015 08:37:55 +0000 (10:37 +0200)]
Bug 3635 - fix npe when device disconnects during handshake

Change-Id: Ia92660d630ddbcefdfd37e887ab896c2550e88cc
Signed-off-by: Martin Bobak <mbobak@cisco.com>
(cherry picked from commit 3c0d578f2001e1114e6da8df8dfaf437d14f2a7a)

8 years agoBug 3569 - Missing TunIPv4DstConverter. 17/22517/1
Jozef Gloncak [Tue, 9 Jun 2015 06:12:00 +0000 (08:12 +0200)]
Bug 3569 - Missing TunIPv4DstConverter.

TunIPv4DstConverter was added to nicira. The class was created
according to TunIPv4SrcConverter.

Some helping methods were moved to MatchUtil.

Change-Id: Ic2e5fab847037258e56922620d2702e21294c2b7
Signed-off-by: Jozef Gloncak <jgloncak@cisco.com>
(cherry picked from commit ca3fb67fc8485dd72df46fcf63796bd433a8354e)

8 years agoBug 2987 - Set-Vlan action on OF1.3 Sends 2 remove flows (similar to addFlow) 13/22513/1
Martin Bobak [Fri, 24 Apr 2015 10:47:27 +0000 (12:47 +0200)]
Bug 2987 - Set-Vlan action on OF1.3 Sends 2 remove flows (similar to addFlow)

Change-Id: I408e5d7931e9fab0c02b0b6eb84f7e8d8ed6bf9d
Signed-off-by: Claudio D. Gasparini <cgaspari@cisco.com>
Signed-off-by: Martin Bobak <mbobak@cisco.com>
(cherry picked from commit 8d4984a0e75093877652ae31b1e5dfb4d7a49fb9)

8 years agoBug 3620 - don't handle connection state in DeviceTransactionChainManagerProvider 10/22510/1
Martin Bobak [Mon, 8 Jun 2015 11:21:49 +0000 (13:21 +0200)]
Bug 3620 - don't handle connection state in DeviceTransactionChainManagerProvider

Change-Id: Ief98f9c3d3e69b28a76a432714aaf56deedba385
Signed-off-by: Martin Bobak <mbobak@cisco.com>
(cherry picked from commit aa516b90b6f750cc30ab716efe8425f3906cf8e8)

8 years agoBUG-3157: performance tuning - Use a simple lookup table for prefix conversion 96/22496/2
Robert Varga [Sun, 7 Jun 2015 01:27:26 +0000 (03:27 +0200)]
BUG-3157: performance tuning - Use a simple lookup table for prefix conversion

This is a clear CPU/memory trade-off, where we have a pre-allocated
bytearray for valid prefixes. We then lookup the appropriate offset
into this array when performing a mask operation. If the user requests
the actual array, we return a Arrays.copyOf(), cutting just the
appropriate bytes out. Memory cost is around 2K.

Change-Id: Idd679084bd3be4a31331a38ecf978b07d738f495
Signed-off-by: Robert Varga <rovarga@cisco.com>
(cherry picked from commit c59861d4957cb69badda3737b146a0c98f9fec71)

8 years agoBUG-3363: code optimization and cleanup - Fix a few warnings 85/22485/1
Robert Varga [Sat, 6 Jun 2015 11:44:49 +0000 (13:44 +0200)]
BUG-3363: code optimization and cleanup - Fix a few warnings

Unused imports, methods that can be static, deprecated imports, missing
type arguments.

Change-Id: I04f7cee19ab1832e58e5b7c91e3f4bcbe55d2a1f
Signed-off-by: Robert Varga <rovarga@cisco.com>
Signed-off-by: Michal Rehak <mirehak@cisco.com>
(cherry picked from commit aedfc8ddeac646cd11b364e4faf1fca803175ef0)

8 years agoBug 3594 - error when updating flow via restconf 70/22470/1
Jozef Gloncak [Fri, 5 Jun 2015 12:30:22 +0000 (14:30 +0200)]
Bug 3594 - error when updating flow via restconf

If flow is updated via rpc update-flow where flow-ref
instance-identifier isn't specified then nothing is
deleted from flow hash to id map stored in operational DS.

Change-Id: Ia9151b9d8a85a920ef70d7328ef2dda769be297c
Signed-off-by: Jozef Gloncak <jgloncak@cisco.com>
(cherry picked from commit 0ca58c24157ab10d3a140ceffe5e3cbd4a7991de)

8 years agoBUG-3363: code optimization and cleanup - Use Strings.isNullOrEmpty() 62/22462/2
Robert Varga [Sun, 7 Jun 2015 02:00:01 +0000 (04:00 +0200)]
BUG-3363: code optimization and cleanup - Use Strings.isNullOrEmpty()

A convenience method making for an easier read.

Change-Id: I7d5868999e4644fdcc2e67657e44264dc950f4f8
Signed-off-by: Robert Varga <rovarga@cisco.com>
(cherry picked from commit a589f3912de430ad4889fa776325bebabf4ffa34)

8 years agoBUG-3363: code optimization and cleanup - Do not instantiate explicit arrays 55/22455/2
Robert Varga [Sun, 7 Jun 2015 01:56:47 +0000 (03:56 +0200)]
BUG-3363: code optimization and cleanup - Do not instantiate explicit arrays

Since Iterators.forArray() is variadic, we can simplify the call a bit.

Change-Id: Ib66035f0d18d76c2c6c8f8af0ad7f5915038b72a
Signed-off-by: Robert Varga <rovarga@cisco.com>
(cherry picked from commit 804e6d8da21c4f7b5fbb91ae08e90ef51f723294)

8 years agoBUG-3363: code optimization and cleanup - Use Arrays.copyOf(byte[], int) 49/22449/2
Robert Varga [Sun, 7 Jun 2015 01:16:28 +0000 (03:16 +0200)]
BUG-3363: code optimization and cleanup - Use Arrays.copyOf(byte[], int)

This is a simpler version of Arrays.copyOfRange(), with equivalent
effect.

Change-Id: Iabf03022e2ace5d083fbe485b8b0e110658c457a
Signed-off-by: Robert Varga <rovarga@cisco.com>
(cherry picked from commit 72153d9785596d79ad1261bf1b866939e0767e84)

8 years agoBUG-3363: code optimization and cleanup - Do not open-code array copy operations 77/22377/2
Robert Varga [Sun, 7 Jun 2015 01:02:32 +0000 (03:02 +0200)]
BUG-3363: code optimization and cleanup - Do not open-code array copy operations

System.arrayCopy() is the proper tool for the job, use it. Also add
final modifiers to arguments and organize imports.

Change-Id: I123c30c3e85b92a7b5d9a9f237cda019b7c362e0
Signed-off-by: Robert Varga <rovarga@cisco.com>
(cherry picked from commit 5f2ce7a9a8bb4758dc94ff543b251d6a8f4b3e47)

8 years agoBUG-3157: performance tuning - Use a TrieMap as the ConcurrentMap implementation 54/22354/2
Robert Varga [Sat, 6 Jun 2015 01:44:24 +0000 (03:44 +0200)]
BUG-3157: performance tuning - Use a TrieMap as the ConcurrentMap implementation

TrieMap is space-optimized and has a high fanout, which means it will
reclaim space when not needed and has shallower structure than a
ConcurrentHashMap. It also re-hashes automatically and concurrently.

Change-Id: I1e40dbb5588c1e42475e12d73f7cadf46b909594
Signed-off-by: Robert Varga <rovarga@cisco.com>
(cherry picked from commit 5faeb7ea76404e4da3620e63432b6038800d4de7)

8 years agoBUG-3363: code optimization and cleanup - Make flowRegistry concurrent 39/22339/2
Robert Varga [Sat, 6 Jun 2015 01:23:55 +0000 (03:23 +0200)]
BUG-3363: code optimization and cleanup - Make flowRegistry concurrent

Traces indicate that updating the flow registry can be a source of
contention. As it turns out all operations we perform on it can be
expressed in terms of ConccurentMap, so let's take advantage of that.

Change-Id: Iae145699cc5111a589eba421bc1082f88f39ee18
Signed-off-by: Robert Varga <rovarga@cisco.com>
(cherry picked from commit f355ec96d1d7c99038650839c133db0aff8b043c)

8 years agoBUG-3363: code optimization and cleanup - Fix unsynchronized access to marks 35/22335/2
Robert Varga [Sat, 6 Jun 2015 01:17:38 +0000 (03:17 +0200)]
BUG-3363: code optimization and cleanup - Fix unsynchronized access to marks

We must not iterate over marks while not holding the lock, as we risk a
concurrent modification. Mkae sure we synchronize properly.

Also minimize the synchronized sections around flowRegistry. These will
be removed in the next patchset.

Change-Id: I5575fa972aea6d8055d578da2d3418c25286668d
Signed-off-by: Robert Varga <rovarga@cisco.com>
(cherry picked from commit 06068449350ddee54597a38db39c678f93fe2ab3)

8 years agoBUG-3363: code optimization and cleanup - Do not leak mutable collection 30/22330/2
Robert Varga [Sat, 6 Jun 2015 01:13:39 +0000 (03:13 +0200)]
BUG-3363: code optimization and cleanup - Do not leak mutable collection

Flow descriptors should not be modified outside this class. Make sure
that is the case by wrapping it in an Collections.unmodifiableMap().

Change-Id: I188287d8d10911f6faabd5f31e028714ae005bce
Signed-off-by: Robert Varga <rovarga@cisco.com>
(cherry picked from commit 9930a5d6b7cfeed87e4e3308882b5375bea10f59)

8 years agoBUG-3363: code optimization and cleanup - Fix eclipse warnings 86/22286/2
Robert Varga [Sat, 6 Jun 2015 01:11:13 +0000 (03:11 +0200)]
BUG-3363: code optimization and cleanup - Fix eclipse warnings

Unused imports, missing serialVersionUID, unneeded cast. Formatting
changes courtesy autosave cleanup actions.

Change-Id: If85ef69d426b129170d5b55d0bd6893a901d50cc
Signed-off-by: Robert Varga <rovarga@cisco.com>
(cherry picked from commit d25cd407fd8f5d038349db4bb2407d023afe3150)

8 years agoBug 3599 - Li - transaction chain manager should not propagate connection context... 67/22267/1
Martin Bobak [Fri, 5 Jun 2015 13:19:52 +0000 (15:19 +0200)]
Bug 3599 - Li - transaction chain manager should not propagate connection context in notification

Change-Id: Ia03c152cec6c7ea3afbb29e5778b53cc1d80fd83
Signed-off-by: Martin Bobak <mbobak@cisco.com>
(cherry picked from commit 571b41953805ad4c14abbbd031fc86f4dfccf747)

8 years agoBug 3597 - added session statistics for switch connect/disconnect events 59/22259/1
Martin Bobak [Fri, 5 Jun 2015 15:05:55 +0000 (17:05 +0200)]
Bug 3597 - added session statistics for switch connect/disconnect events

    Change-Id: I75f388721a678ba00e10b352bd87d1b3ca9833c3
Signed-off-by: Martin Bobak <mbobak@cisco.com>
Change-Id: Ia702621740bbc7190813ff286d6b76158bd59f64
Signed-off-by: Martin Bobak <mbobak@cisco.com>
(cherry picked from commit 1ab03d3178b3d81f46ef6c94ba8e742327e89921)

8 years agoBUG-3592: topology not starting (Li) 53/22253/1
Michal Rehak [Fri, 5 Jun 2015 10:49:46 +0000 (12:49 +0200)]
BUG-3592: topology not starting (Li)

 - added config subsystem files to Li features

Change-Id: Ibcdfa83ab47777a6b3d739b024a1453d17b48791
Signed-off-by: Michal Rehak <mirehak@cisco.com>
(cherry picked from commit bea0a6e84adcc91ae681b2a07c69a168d72764e5)

8 years agoBUG-3580: statistics teardown improvement 11/22211/1
Martin Bobak [Thu, 4 Jun 2015 14:03:34 +0000 (16:03 +0200)]
BUG-3580: statistics teardown improvement

 - statistics context cancels next scheduled statistics poll

Change-Id: I3a4c1fb63d32f8ecc660da38455284bb142a62c6
Signed-off-by: Martin Bobak <mbobak@cisco.com>
(cherry picked from commit c8b1875c9f8dcb4f5a4db29b33285990abb1149b)

8 years agoBUG-3579: device disconnection cleanup 81/22181/1
Martin Bobak [Thu, 4 Jun 2015 07:19:33 +0000 (09:19 +0200)]
BUG-3579: device disconnection cleanup

 - connection + handshake revisited
 - device, rpc, statistics contexts/managers revisited
 - cleaned up logging
 - adapted tests
 - added propagating to connectionCtx close for timeout

Change-Id: I990012ecb34fd3a229c1988cbd1c2b71af6ec98e
Signed-off-by: Michal Rehak <mirehak@cisco.com>
Signed-off-by: Martin Bobak <mbobak@cisco.com>
(cherry picked from commit d54deb3112a9ee9cf71571cffd9fb40806d5bed2)

8 years agoBug:3048-Handle duplicate nodeRemoved and nodeConnectorUpdated notifications to preve... 62/22162/1
Kamal Rameshan [Fri, 5 Jun 2015 00:36:02 +0000 (17:36 -0700)]
Bug:3048-Handle duplicate nodeRemoved and nodeConnectorUpdated notifications to prevent tx failures

NodeRemoved notifications are received twice by the InventoryManager, in quick successions
If the duplicate node removal operation is clubbed with other node-removal operations in transaction chain, it fails the whole tx chain even
though we retry one time.

This patch caches the deleted nodes in-order to ignore the duplicate notifications. The cache entries are expired after 10s, to reduce the memory consumption.

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

8 years agoBug 3564 - Li - ofp when transaction chain manager exists in WORKING state, drop... 18/22118/1
Martin Bobak [Wed, 3 Jun 2015 14:23:52 +0000 (16:23 +0200)]
Bug 3564 - Li - ofp when transaction chain manager exists in WORKING state, drop new connection

Change-Id: I75810f705774a75264558166bd7570eb9bae41e6
Signed-off-by: Martin Bobak <mbobak@cisco.com>
(cherry picked from commit d2cc6d8fc130e6086cc75f98b210297fd4f85be3)

8 years agoBug-3104: Bypassing MultimessageCollector 99/22099/1
Martin Bobak [Tue, 2 Jun 2015 13:14:27 +0000 (15:14 +0200)]
Bug-3104: Bypassing MultimessageCollector

 - added service for on-the-fly processing (flow stats only)

Change-Id: I6308bc1b38009deb6187ac2ee57b94a9b3d29145
Signed-off-by: Martin Bobak <mbobak@cisco.com>
(cherry picked from commit cfda2cbdee0e34a67202bf7c740b841ef0a53a2b)

8 years agoBug 3557 - Li -ofp when device reconnects, it has to wait for previous transaction... 98/22098/1
Martin Bobak [Wed, 3 Jun 2015 06:52:49 +0000 (08:52 +0200)]
Bug 3557 - Li -ofp when device reconnects, it has to wait for previous transaction chain to complete

TransactionChain should be checked for its lifecycle status when device reconnects

Change-Id: I272da2eae4d81802c0dc3e70308989daa6dd8162
Signed-off-by: Martin Bobak <mbobak@cisco.com>
(cherry picked from commit 8fd4238633295a741f65e2e82a883dfb401bb5b3)

9 years agoBug 2862 - flow ID is unknown value in operational store. (e.g. id: #UF*200-3) 95/21995/1
Anil Vishnoi [Fri, 5 Jun 2015 13:08:48 +0000 (18:38 +0530)]
Bug 2862 - flow ID is unknown value in operational store. (e.g. id: #UF*200-3)

Fix for old Helium code base.
This issue only occurs when user don't set cookie value while installing the flow
and that's valid flow.

Cookie is used in flow comparison for the applications using match extensions
in their flow body. As of now openflowplugin don't use match extensions
in flow comparison, that can create a scenario where more then one stored flow
can match to any stats flow, if stored flows differ only by match extension.
Once match extensions are part of flow comparison, we should remove cookie
from flow comparison.

Cookie is an optional field, so user might not set it, but if switch
get flow without cookie value , it will use 0 as a default cookie value
and return cookie=0 when openflowplugin fetch the flow stats from switch.
In this scenario flow comparison will fail. This fix make sure that
if user didn't set cookie value while flow installation, skip the cookie
comparison while augmenting flow stats.

Change-Id: Ia156b70b08569ccd573ba07a549093fa1af3a82f
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>