openflowplugin.git
7 years agoMerge "Fix modifiers order to comply with Java coding guidelines" into stable/boron
Anil Vishnoi [Fri, 14 Apr 2017 23:02:30 +0000 (23:02 +0000)]
Merge "Fix modifiers order to comply with Java coding guidelines" into stable/boron

7 years agoMerge "Fix checkstyle - api.openflow.md.queue" into stable/boron
Anil Vishnoi [Fri, 14 Apr 2017 23:02:13 +0000 (23:02 +0000)]
Merge "Fix checkstyle - api.openflow.md.queue" into stable/boron

7 years agoMerge "Fix minor issues regarding checkstyle" into stable/boron
Anil Vishnoi [Fri, 14 Apr 2017 23:01:36 +0000 (23:01 +0000)]
Merge "Fix minor issues regarding checkstyle" into stable/boron

7 years agoMerge "Fix checkstyle warnings." into stable/boron
Anil Vishnoi [Fri, 14 Apr 2017 23:00:52 +0000 (23:00 +0000)]
Merge "Fix checkstyle warnings." into stable/boron

7 years agoFix checkstyle - api.openflow.md.queue 70/55070/1
Jozef Bacigal [Thu, 23 Mar 2017 14:21:43 +0000 (15:21 +0100)]
Fix checkstyle - api.openflow.md.queue

Change-Id: I1c91dcee7b74ac1dba17e5c04651009c312124c3
Signed-off-by: Jozef Bacigal <jozef.bacigal@pantheon.tech>
(cherry picked from commit dc8e9554a3ca8e00667cdcc582c567d6106f24fa)

7 years agoFix checkstyle warnings. 69/55069/1
Jozef Bacigal [Fri, 3 Mar 2017 11:46:20 +0000 (12:46 +0100)]
Fix checkstyle warnings.

- org.opendaylight.openflowplugin.api.openflow.md.core

Change-Id: Ida0bf4149aaa70657a22fb527708d61b0d7d43b3
Signed-off-by: Jozef Bacigal <jozef.bacigal@pantheon.tech>
(cherry picked from commit f5cea4f9c7c5e44c1ea776204eb21497dc2bad2e)

7 years agoFix checkstyle warnings 68/55068/1
Jozef Bacigal [Thu, 2 Mar 2017 13:50:17 +0000 (14:50 +0100)]
Fix checkstyle warnings

- org.opendaylight.openflowplugin.api.openflow.md.core

Change-Id: I98490f3a4054bcfdb1339ac490d432ece0539097
Signed-off-by: Jozef Bacigal <jozef.bacigal@pantheon.tech>
(cherry picked from commit b1723fcc1e90149c95159e553a1084a046cf25c3)

7 years agoFix modifiers order to comply with Java coding guidelines 67/55067/1
David [Fri, 17 Mar 2017 20:30:44 +0000 (21:30 +0100)]
Fix modifiers order to comply with Java coding guidelines

Minor change: replace "final static" with "static final".

Change-Id: If7df3dd6f6999dde5a4bc1b495f28a598b6a9da1
Signed-off-by: David <david.suarez.fuentes@ericsson.com>
(cherry picked from commit 5eea4b8cabfacacfbecade86f0fc2f6863b0b0b5)

7 years agoFix minor issues regarding checkstyle 66/55066/1
David [Fri, 17 Mar 2017 22:09:09 +0000 (23:09 +0100)]
Fix minor issues regarding checkstyle

- Make BulkOMaticUtils a final class since its constructor is private.
- Parenthesis not needed

Change-Id: I2e0a58dfe204aec89ab49cb3fbd870229932c317
Signed-off-by: David <david.suarez.fuentes@ericsson.com>
(cherry picked from commit b260fb55a235bf4ce5b538515b9a4537ba0c3a6d)

7 years agoMerge "Bug 8217: Set error information into direct statistics RPC result." into stabl...
Anil Vishnoi [Thu, 13 Apr 2017 20:15:05 +0000 (20:15 +0000)]
Merge "Bug 8217: Set error information into direct statistics RPC result." into stable/boron

7 years agoMerge "Fix table miss flow push" into stable/boron
Anil Vishnoi [Thu, 13 Apr 2017 18:05:31 +0000 (18:05 +0000)]
Merge "Fix table miss flow push" into stable/boron

7 years agoMerge "Fix DeviceFlowRegistry performance regression" into stable/boron
Jozef Bacigal [Thu, 13 Apr 2017 07:28:13 +0000 (07:28 +0000)]
Merge "Fix DeviceFlowRegistry performance regression" into stable/boron

7 years agoMerge "Revert "Revert "Fix statistics race condition on big flows""" into stable...
Jozef Bacigal [Thu, 13 Apr 2017 07:28:02 +0000 (07:28 +0000)]
Merge "Revert "Revert "Fix statistics race condition on big flows""" into stable/boron

7 years agoBug 8217: Set error information into direct statistics RPC result. 33/54933/1
Shigeru Yasuda [Wed, 12 Apr 2017 14:01:23 +0000 (23:01 +0900)]
Bug 8217: Set error information into direct statistics RPC result.

Change-Id: I3fdf51b94bf95afefa47dddea37a82b8f139af95
Signed-off-by: Shigeru Yasuda <s-yasuda@da.jp.nec.com>
7 years agoBUG-7901: fix unsynchronized transaction access 38/54538/1
Robert Varga [Tue, 28 Mar 2017 15:29:16 +0000 (17:29 +0200)]
BUG-7901: fix unsynchronized transaction access

The evidence in the issue indicates that we have a race condition
where a batch of modifications is being submitted (triggered by
a write/delete and exceeded batch count) and we are observing a
concurrent modification. After auditing the CDS side of this, while
we can improve safety a bit, the scenario has to involve multi-threaded
access by the client.

Looking at TransactionChainManager, it seems to be heavily synchronized,
but there is a hole in the paths which are using getTransactionSafely().

While the access to the TransactionChain, it returns the transaction
(which really is an alias to the wTx field). That throws of static
analysis, as we end up the object pointed to by wTx without holding
the lock -- hence concurrent threads will end up touching the transaction
without any guards, leading to a violation of Transaction contract (which
requires external synchronization).

This patch reworks getTransactionSafely() so it only ensures the field
is initialized as appropriate and makes its callers access the wTx field
with the proper lock held.

Bug: 7500
Bug: 7901
Bug: 8060
Change-Id: I058feb55f91a40ccda6d69ee87cd1a20f792afba
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit 6dbbd412a88dafdb7d7acd824516850b473b145f)

7 years agoBumping versions by x.y.(z+1) for next dev cycle 93/54493/1
Anil Belur [Fri, 7 Apr 2017 08:01:49 +0000 (18:01 +1000)]
Bumping versions by x.y.(z+1) for next dev cycle

Change-Id: I24d2af439829cb1b037478d7799a2aa08ed01f05
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
7 years agoFix DeviceFlowRegistry performance regression 68/54268/1
Tomas Slusny [Tue, 28 Mar 2017 11:06:04 +0000 (13:06 +0200)]
Fix DeviceFlowRegistry performance regression

- Remove use of marks and modify DeviceFlowRegistry immediately
- Synchronize only access to DeviceFlowRegistry BiMap and not
  entire class
- Replace custom match comparison with match normalization (should be a
lot faster on big amount of flows)
- When logging to console, compute FlowRegistryKey hashes only when needed

See also: bug 6917

Change-Id: Id6d83bf746f05cc7e91f804e6b9c8fc84b39f501
Signed-off-by: Tomas Slusny <tomas.slusny@pantheon.tech>
7 years agoRevert "Revert "Fix statistics race condition on big flows"" 67/54267/1
Tomas Slusny [Mon, 3 Apr 2017 11:51:21 +0000 (13:51 +0200)]
Revert "Revert "Fix statistics race condition on big flows""

This reverts commit 1537fd31483e3c9f5ec62e882d54acf9e508e556.

Change-Id: I7763eb4fbe86e958088a4384299951246681cae5
Signed-off-by: Tomas Slusny <tomas.slusny@pantheon.tech>
7 years agoFix table miss flow push 22/54122/1
miroslav.macko [Mon, 20 Mar 2017 12:37:56 +0000 (13:37 +0100)]
Fix table miss flow push

- Use ClusteredDataTreeChangeListener

Resolves: Bug 7770

Change-Id: Icf845b5348af374530ce2db01203aea89e2bdbad
Signed-off-by: miroslav.macko <miroslav.macko@pantheon.tech>
7 years agoRevert "Fix statistics race condition on big flows" 53/53953/1
Jozef Bacigal [Tue, 28 Mar 2017 06:25:36 +0000 (08:25 +0200)]
Revert "Fix statistics race condition on big flows"

This reverts commit 501d4d64c806ad39e90b97def853fa043dda5f30.

Change-Id: I9e7c43ac81ec79c12db8ed2203464664d1a6910a
Signed-off-by: Jozef Bacigal <jozef.bacigal@pantheon.tech>
7 years agoFix statistics race condition on big flows 45/53545/1
Tomas Slusny [Fri, 24 Feb 2017 08:40:45 +0000 (09:40 +0100)]
Fix statistics race condition on big flows

Fix race condition that happens when we receive statistics faster
than flow is deleted from device, but we already sent request for
deletion and removed this flow from device registy.

Resolves: bug 6917

Change-Id: I95510fbc5d507eaffc34d58b3b7743e60911b541
Signed-off-by: Tomas Slusny <tomas.slusny@pantheon.tech>
7 years agoBug 7915 - Zero flows populated in all switches when connected to Leader Node 83/53383/3
Anil Vishnoi [Thu, 16 Mar 2017 07:10:20 +0000 (00:10 -0700)]
Bug 7915 - Zero flows populated in all switches when connected to Leader Node

Change-Id: I8e8df5d6cb51c114b23f8690d3d6f01fef37f81b
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
7 years agoAdd arbitrary mask for nxm-reg 24/53424/1
Tomas Slusny [Tue, 14 Mar 2017 09:27:48 +0000 (10:27 +0100)]
Add arbitrary mask for nxm-reg

According to specification, nxm-reg should be fully maskable
using arbitrary mask.

Resolves: bug 7897

Change-Id: I912017e6bd33813ac65ed5799c8bfa7ebf217889
Signed-off-by: Tomas Slusny <tomas.slusny@pantheon.tech>
(cherry picked from commit 113fc0c316f814452a535a66f0da085076d282b5)

7 years agoFix connection closing on switch IDLE state 97/53197/1
Tomas Slusny [Tue, 21 Feb 2017 15:04:57 +0000 (16:04 +0100)]
Fix connection closing on switch IDLE state

When device is disconnected, and connection is not equal primary
connection context, do not shut down all services and just remove
this connection context.

Resolves: bug 7689

Change-Id: I3c6149a44f266b423fdc4f6396022ad4c650e872
Signed-off-by: Tomas Slusny <tomas.slusny@pantheon.tech>
(cherry picked from commit 44a28ad62e641c0b4b0e7b81cc634316836e921f)

7 years agoMerge "Bug 6110: Fixed bugs in statistics manager due to race condition." into stable...
Anil Vishnoi [Sat, 11 Mar 2017 03:26:43 +0000 (03:26 +0000)]
Merge "Bug 6110: Fixed bugs in statistics manager due to race condition." into stable/boron

7 years agoMerge "Bug 7910 - Flow with ethernet mask (ff:ff:ff:ff:ff:ff), get stored under alien...
Abhijit Kumbhare [Thu, 9 Mar 2017 18:30:56 +0000 (18:30 +0000)]
Merge "Bug 7910 - Flow with ethernet mask (ff:ff:ff:ff:ff:ff), get stored under alien-id in operational data store" into stable/boron

7 years agoMerge "Fix comparison between port numbers in match" into stable/boron
Abhijit Kumbhare [Tue, 7 Mar 2017 12:42:29 +0000 (12:42 +0000)]
Merge "Fix comparison between port numbers in match" into stable/boron

7 years agoBug 7910 - Flow with ethernet mask (ff:ff:ff:ff:ff:ff), 15/52915/1
Anil Vishnoi [Tue, 7 Mar 2017 02:49:23 +0000 (18:49 -0800)]
Bug 7910 - Flow with ethernet mask (ff:ff:ff:ff:ff:ff),
get stored under alien-id in operational data store

Custom comparator for ethernet mask address is modified
to take care of this issue.

Change-Id: I0c5c1dbd61dd1a3fb83d3b16695553649c4ecf8f
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
7 years agoFix comparison between port numbers in match 07/52407/1
Tomas Slusny [Tue, 24 Jan 2017 16:57:13 +0000 (17:57 +0100)]
Fix comparison between port numbers in match

Properly extract port number from NodeConnectorId when comparing
port numbers, as NodeConnectorId is basically string, and sometimes
when going back from device, it do not contains datapath id
or prefix (for example in new serialization/deserialization path).

See also: bug 7139

Change-Id: I89999b71dba2e834ea1f37f42b5cddf1082bdd12
Signed-off-by: Tomas Slusny <tomas.slusny@pantheon.tech>
(cherry picked from commit 0ac8877c3539d82e55ffe49dc0a2c8bcb0c82b19)

7 years agoBug 7763 - Openflow plugin deletes switch from topology 30/52230/3
Anil Vishnoi [Fri, 24 Feb 2017 02:16:02 +0000 (18:16 -0800)]
Bug 7763 - Openflow plugin deletes switch from topology
while changing mastership from one controller to another

Change-Id: I89c514c678651fc1028db37df472209fccb18ac2
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
7 years agoMerge "Bug 7736 - Forwarding Rules application cluster singleton id should not use...
Abhijit Kumbhare [Wed, 22 Feb 2017 04:11:56 +0000 (04:11 +0000)]
Merge "Bug 7736 - Forwarding Rules application cluster singleton id should not use the same cluster singleton id as the openflow switch singleton connection handler" into stable/boron

7 years agoBug 7736 - Forwarding Rules application cluster singleton id should not use the same... 89/51489/7
Jon Castro [Mon, 6 Feb 2017 23:35:13 +0000 (10:35 +1100)]
Bug 7736 - Forwarding Rules application cluster singleton id should not use the same cluster singleton id as the openflow switch singleton connection handler

Change-Id: Ie82b2d7d23444927375ed5b63f5e765f3277ed00
Signed-off-by: Jon Castro <castro.jon@gmail.com>
7 years agoRevert "Bug 7500 - TransactionChainManager: fix synchronization issues and error... 14/51814/3
Sam Hague [Mon, 13 Feb 2017 19:32:30 +0000 (19:32 +0000)]
Revert "Bug 7500 - TransactionChainManager: fix synchronization issues and error handling when mdsal throws an error."

This reverts commit 4683e5748682a4739139fd11d426bb193385f346.

Change-Id: Ibe06731e2d17895d642864ce4f6a9838b33bc0c7
Signed-off-by: Sam Hague <shague@redhat.com>
7 years agoMerge "Bug 7501 - Ensure delete old statistics and create new ones are executed seque...
Abhijit Kumbhare [Thu, 9 Feb 2017 20:15:18 +0000 (20:15 +0000)]
Merge "Bug 7501 - Ensure delete old statistics and create new ones are executed sequentially to ensure stats are updated properly." into stable/boron

7 years agoBug 7764 - Do no throw warning on explicit task cancellation 07/51607/1
Anil Vishnoi [Thu, 9 Feb 2017 08:12:20 +0000 (00:12 -0800)]
Bug 7764 - Do no throw warning on explicit task cancellation

Change-Id: I9477823ffd1b4e9b28484ae8cde166a2d03f5a9f
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
7 years agoBug 7501 - Ensure delete old statistics and create new ones are executed sequentially... 54/50154/9
Jon Castro [Mon, 30 Jan 2017 01:24:55 +0000 (12:24 +1100)]
Bug 7501 - Ensure delete old statistics and create new ones are executed sequentially to ensure stats are updated properly.

Change-Id: I55c75288598f98db2937dc4796fba4e6510cb3c5
Signed-off-by: Jon Castro <castro.jon@gmail.com>
7 years agoBug 7500 - TransactionChainManager: fix synchronization issues and error handling... 53/50153/6
Jon Castro [Wed, 8 Feb 2017 03:49:57 +0000 (14:49 +1100)]
Bug 7500 - TransactionChainManager: fix synchronization issues and error handling when mdsal throws an error.

Change-Id: Iddfdcb7410e3c3d7bbcb8994908d206c8acd4fdb
Signed-off-by: Jon Castro <castro.jon@gmail.com>
7 years agoFix PacketInV10TranslatorTest 41/51541/1
miroslav.macko [Thu, 2 Feb 2017 13:33:59 +0000 (14:33 +0100)]
Fix PacketInV10TranslatorTest

Use object instead hardcoded string

Change-Id: I6408a927e0c6c186e78884a9851f1dbea56456aa
Signed-off-by: miroslav.macko <miroslav.macko@pantheon.tech>
(cherry picked from commit ad3188d4af8ced3235b90f997e4799926f3a6a56)

7 years agoMerge "Bug 7349 - Flow ID not updated in operational after removing and adding a...
Anil Vishnoi [Sat, 4 Feb 2017 08:34:05 +0000 (08:34 +0000)]
Merge "Bug 7349 - Flow ID not updated in operational after removing and adding a flow with same match" into stable/boron

7 years agoMerge "BUG-7608: use blueprint action-provider/action-service" into stable/boron
michal rehak [Fri, 3 Feb 2017 12:59:59 +0000 (12:59 +0000)]
Merge "BUG-7608: use blueprint action-provider/action-service" into stable/boron

7 years agoBUG-7608: use blueprint action-provider/action-service 42/51342/1
Robert Varga [Fri, 27 Jan 2017 12:47:21 +0000 (13:47 +0100)]
BUG-7608: use blueprint action-provider/action-service

The contract for RPC services containing Routed RPCs (RFC7950
actions) with respect to routing is different from normal RPCs.

In order to properly express dependencies, it needs a concept
of a promise to register instantiations (action-provider)
and the dependency on that promise (action-service). Use these
concepts instead of realying on rpc-service which happens to
work due to sal-remoterpc-connector (incorrecty) providing
the equivalent of action-provider for all Routed RPCs defined
in the local SchemaContext.

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

7 years agoBug 7499 - ensure statistics scheduler does not die and keep trying while the control... 50/50150/6
Jon Castro [Thu, 2 Feb 2017 01:57:49 +0000 (12:57 +1100)]
Bug 7499 - ensure statistics scheduler does not die and keep trying while the controller keeps the ownership of the device

Change-Id: Ia5923f200b6c7a8888d4e3c96fdf8358603d4ac9
Signed-off-by: Jon Castro <castro.jon@gmail.com>
7 years agoBug 7453 - FlowRemoved doesn't have Removed Reason Information 80/51280/1
eeiillu [Thu, 12 Jan 2017 04:59:18 +0000 (10:29 +0530)]
Bug 7453 - FlowRemoved doesn't have Removed Reason Information

On flow being removed from switch on idle timeout, onFlowRemoved() api was
invoked and while conversion reason was not being converted and added, so
the application using API onFlowRemoved() was not getting the reason for
flow being removed from the switch.
This change will provide the reason invoking onFlowRemoved() API

Change-Id: Id8b957b5b2cc581215fb84b8ca84d1d9a04e5619
Signed-off-by: eeiillu <suja.t@ericsson.com>
(cherry picked from commit 80cee5d71d306b8806d9316d12dceb5c1d1d63e6)

7 years agoBug 6110: Fixed bugs in statistics manager due to race condition. 17/44117/3
Shigeru Yasuda [Fri, 24 Jun 2016 13:10:07 +0000 (22:10 +0900)]
Bug 6110: Fixed bugs in statistics manager due to race condition.

  * Stats notification listener needs to wait for the XID to be cached.
  * Enqueue DS operation after all notifications are received.

Change-Id: I42ac315a65be1a1f02152fbd9ea9510bee586eb3
Signed-off-by: Shigeru Yasuda <s-yasuda@da.jp.nec.com>
7 years agoFix Direct statistics RPC - actions part 10/50810/1
miroslav.macko [Mon, 16 Jan 2017 09:00:06 +0000 (10:00 +0100)]
Fix Direct statistics RPC - actions part

Handle actions for direct statistics.

See also: bug 7232

Change-Id: Ib29f9a760bf123bac1745ea2fe8bc7e6bd3de73c
Signed-off-by: miroslav.macko <miroslav.macko@pantheon.tech>
7 years agoRPC opendaylight-direct-statistics:get-flow-statistics not taking nicira 80/50680/1
D Arunprakash [Fri, 13 Jan 2017 10:50:49 +0000 (16:20 +0530)]
RPC opendaylight-direct-statistics:get-flow-statistics not taking nicira
extension match

Added new MatchPath RPCFLOWSSTATISTICS_FLOWANDSTATISTICSMAPLIST_MATCH.

This will differentiate between the augment model between notification and
rpc.

Change-Id: If80ff86522ba406577b15c4a3d8a30ee364001db
Signed-off-by: D Arunprakash <d.arunprakash@ericsson.com>
(cherry picked from commit 49b53da651c4159841f5e9701df22cbe7e5984e7)

7 years agoMerge "Bug7485 Make statistics poller parameters configurable." into stable/boron
Shuva Jyoti Kar [Wed, 18 Jan 2017 08:38:57 +0000 (08:38 +0000)]
Merge "Bug7485 Make statistics poller parameters configurable." into stable/boron

7 years agoBUG-5222: do not pull in odl-mdsal-xsql 79/50479/1
Robert Varga [Fri, 13 Jan 2017 09:03:20 +0000 (10:03 +0100)]
BUG-5222: do not pull in odl-mdsal-xsql

xsql is deprecated, buggy and never was meant for production
use. Do not pull it in.

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

7 years agoBug7485 Make statistics poller parameters configurable. 29/50329/2
Sai MarapaReddy [Wed, 4 Jan 2017 18:27:21 +0000 (20:27 +0200)]
Bug7485 Make statistics poller parameters configurable.

Currently the the time intervals used for polling the statistics
are harcoded. (basicTimerDelay, maximumTimerDelay).
This patch helps makes parameters more configurable by defining
current default values in yang. Using BluePrint extensions user
can now configure the parameters without changing the source code.

Change-Id: Ic2d694351ee968a6f360e7a218aa17e69c5e9035
Signed-off-by: Sai Marapareddy <sai.marapareddy@gmail.com>
7 years agoBug 7071: adding support for fin-timeout 03/50203/1
Slava Radune [Tue, 20 Dec 2016 14:55:21 +0000 (16:55 +0200)]
Bug 7071: adding support for fin-timeout

Add support for serialization/deseralization and encoding/decoding of fin-timeout action.
This action currently is created using the learn action, so we nead only deseralization/decoding way (when flow statistics is sent to odl),
but this patch suppors also the other way of insalling flows from odl, in case it will be needed in the future.

Change-Id: I061100fab61e8d3398fddde98e76493a5afef468
Signed-off-by: Slava Radune <slava.radune@hpe.com>
(cherry picked from commit 1bd4c2b474f6301f9e9282cfc728e714a73fc21e)

7 years agoBug 7481 - Flows with nicira actions get corrupted after cluster failure 43/50143/1
Tali [Wed, 4 Jan 2017 18:27:21 +0000 (20:27 +0200)]
Bug 7481 - Flows with nicira actions get corrupted after cluster failure

Change-Id: I7fe988b54af3823e0fad672f1f3c5d7750c9095a
Signed-off-by: Tali <tali.ben-meir@hpe.com>
7 years agoMerge "Bug 7335 - Flow update rejected by switch generates faulty flow entry in opera...
Shuva Jyoti Kar [Fri, 23 Dec 2016 10:03:07 +0000 (10:03 +0000)]
Merge "Bug 7335 - Flow update rejected by switch generates faulty flow entry in operational DS" into stable/boron

7 years agoBUG:6997 supporting OXM_OF_MPLS_LABEL in nicira extensiona 31/49731/1
epgoraj [Thu, 27 Oct 2016 11:22:18 +0000 (16:52 +0530)]
BUG:6997 supporting OXM_OF_MPLS_LABEL in nicira extensiona

        Description : currently under nicira-extension, MPLS support is not
        present in nicira Move action. Mainly in ECMP use-case we need to use
        mpls_label under nicira_move_action type. The mpls_label will be using as
        example ( move:NXM_NX_REG1[0..19]->OXM_OF_MPLS_LABEL[] )

Change-Id: Ia497b963f30bf9ffcd09430db8ed85661a64859f
Signed-off-by: epgoraj <p.govinda.rajulu@ericsson.com>
Signed-off-by: Periyasamy Palanisamy <periyasamy.palanisamy@ericsson.com>
(cherry picked from commit d24260189065b6620af4f6829b91313c0a681c6d)

7 years agoBug 7415 Reducing the severity of the log message 74/49674/2
Sai Marapareddy [Tue, 20 Dec 2016 23:42:51 +0000 (15:42 -0800)]
Bug 7415 Reducing the severity of the log message

Whenever there is a change in configuration of l2switch,
bundle refresh happens. When bundles refresh, openflowplugin
pushes the same flow. Changing the severity of of the exception
to warning since it is expected to have a flow with same id.

Change-Id: I69874d14b83053edc97b6d299c8fdb05d7ccdd8c
Signed-off-by: Sai MarapaReddy <sai.marapareddy@gmail.com>
Author: Sai MarapaReddy <sai.marapareddy@gmail.com>

7 years agoMerge "Add LOG.isDebugEnabled to add performance." into stable/boron
Jozef Bacigal [Tue, 20 Dec 2016 13:49:21 +0000 (13:49 +0000)]
Merge "Add LOG.isDebugEnabled to add performance." into stable/boron

7 years agoMerge "Improve class with lambdas. Change wrong parameters and variables." into stabl...
Jozef Bacigal [Tue, 20 Dec 2016 13:49:13 +0000 (13:49 +0000)]
Merge "Improve class with lambdas. Change wrong parameters and variables." into stable/boron

7 years agoMerge "Split long lines (>120)" into stable/boron
Jozef Bacigal [Tue, 20 Dec 2016 13:49:05 +0000 (13:49 +0000)]
Merge "Split long lines (>120)" into stable/boron

7 years agoMerge "Remove unused imports, repair checkstyle first sentence." into stable/boron
Jozef Bacigal [Tue, 20 Dec 2016 13:48:59 +0000 (13:48 +0000)]
Merge "Remove unused imports, repair checkstyle first sentence." into stable/boron

7 years agoBumping versions by 0.0.1 for next dev cycle 08/49608/1
Anil Belur [Tue, 20 Dec 2016 04:20:12 +0000 (14:20 +1000)]
Bumping versions by 0.0.1 for next dev cycle

Change-Id: I923c53fef2d3ec12757cea39285decaf46bac906
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
7 years agoBug 7349 - Flow ID not updated in operational after removing and adding a flow with... 96/49396/4
Anil Vishnoi [Tue, 13 Dec 2016 03:57:05 +0000 (19:57 -0800)]
Bug 7349 - Flow ID not updated in operational after removing and adding a flow with same match

Change-Id: Ie370cf017bd8642c52f1469cc0b01b10fa38842d
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
7 years agoAdd LOG.isDebugEnabled to add performance. 19/48919/3
Jozef Bacigal [Fri, 2 Dec 2016 11:39:47 +0000 (12:39 +0100)]
Add LOG.isDebugEnabled to add performance.

- one more lambda expression
- test checkstyle corrections

Change-Id: I8973f765394a80d0291b9c203e37f6f8242cac3b
Signed-off-by: Jozef Bacigal <jozef.bacigal@pantheon.tech>
7 years agoImprove class with lambdas. 18/48918/3
Jozef Bacigal [Fri, 2 Dec 2016 11:24:26 +0000 (12:24 +0100)]
Improve class with lambdas.
Change wrong parameters and variables.

- checkstyle issues

Change-Id: If7552c83e0f6aac6ac332cdbc592c7f5b6ff4fe3
Signed-off-by: Jozef Bacigal <jozef.bacigal@pantheon.tech>
7 years agoSplit long lines (>120) 17/48917/3
Jozef Bacigal [Fri, 2 Dec 2016 11:14:40 +0000 (12:14 +0100)]
Split long lines (>120)

- checkstyle warning

Change-Id: Iea5fb2c8e572c2f675528ad1aee33099905fe523
Signed-off-by: Jozef Bacigal <jozef.bacigal@pantheon.tech>
7 years agoRemove unused imports, repair checkstyle first sentence. 14/48914/4
Jozef Bacigal [Fri, 2 Dec 2016 08:50:59 +0000 (09:50 +0100)]
Remove unused imports, repair checkstyle first sentence.

Change-Id: Ib77770af56584577aeaf7efb7bd47200fd54fb65
Signed-off-by: Jozef Bacigal <jozef.bacigal@pantheon.tech>
7 years agoBug 7335 - Flow update rejected by switch generates 08/49208/1
Anil Vishnoi [Sat, 10 Dec 2016 08:53:11 +0000 (00:53 -0800)]
Bug 7335 - Flow update rejected by switch generates
faulty flow entry in operational DS

When flow update request comes to plugin, it cleans up
the flow hashmap for the updated flow, but it does not
clean up the flow with the assumption that in the next
statistics cycle, this stale flow in operational data
store will be overwritten by the new modified flow,
but as reported in the issue, if installation of modified
flow fails, it will leave the stale flow in the data store.

Change-Id: I47905f980aabc83134c6eccfbf0655d48e71484b
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
7 years agoMerge "Revert the functional behavior change introduced through" into stable/boron
Shuva Jyoti Kar [Thu, 8 Dec 2016 08:39:43 +0000 (08:39 +0000)]
Merge "Revert the functional behavior change introduced through" into stable/boron

7 years agoRevert the functional behavior change introduced through 06/49106/1
Anil Vishnoi [Wed, 7 Dec 2016 20:14:43 +0000 (12:14 -0800)]
Revert the functional behavior change introduced through

https://git.opendaylight.org/gerrit/#/c/47138/3

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

7 years agoMerge "Bug 6820 - Implement SalExperimenterMpMessageService" into stable/boron
Jozef Bacigal [Mon, 5 Dec 2016 11:06:05 +0000 (11:06 +0000)]
Merge "Bug 6820 - Implement SalExperimenterMpMessageService" into stable/boron

7 years agoMerge "BUG-6890:Flow-Removed Notification configuration" into stable/boron
Jozef Bacigal [Mon, 5 Dec 2016 11:04:53 +0000 (11:04 +0000)]
Merge "BUG-6890:Flow-Removed Notification configuration" into stable/boron

7 years agoBug 6820 - Implement SalExperimenterMpMessageService 57/48557/1
yunyunhan [Tue, 1 Nov 2016 18:40:15 +0000 (02:40 +0800)]
Bug 6820 - Implement SalExperimenterMpMessageService

Change-Id: Ibfbdea25957b8259a6b5070fb0598172d44108bc
Signed-off-by: yunyunhan <han.yunyun@zte.com.cn>
(cherry picked from commit 2dec517931a2fb352b5391197f2baa305460ad91)

7 years agoBug 7209 - Null Pointer Exception in LearnCodecUtil when add learn flow for ipv6 98/48498/1
Vinh Nguyen [Fri, 18 Nov 2016 23:03:39 +0000 (15:03 -0800)]
Bug 7209 - Null Pointer Exception in LearnCodecUtil when add learn flow for ipv6

The exception caused by using ByteBuf::readShort
(valid range: -32,768 32,767) for ipv6 etherType '0x86dd'
The fix is to use ByteBuf::readUnsignedShort

Change-Id: I238535565a66692b5d4dbe39b8cb7809867f3cde
Signed-off-by: Vinh Nguyen <vinh.nguyen@hcl.com>
7 years agoBUG-6890:Flow-Removed Notification configuration 89/48189/1
Shuva Kar [Thu, 10 Nov 2016 05:47:23 +0000 (11:17 +0530)]
BUG-6890:Flow-Removed Notification configuration

Changing the flag to enable/disable flow removed
notification.

Currently the flow-removed notification is controlled by the flag
notification-flow-removed-off which is on by default(value set to false).
However this logic being double-negative causes some confusion to the
end-user. Thus modifying the flag to enable-flow-removed-notification
and setting it to true by default.

The associated logic involved at oyther places have been modified as
well as a part of this commit.

Change-Id: I1452de6e3e72030608c89168f19328d9c6aa8f1c
Signed-off-by: Shuva Kar <shuva.jyoti.kar@ericsson.com>
7 years agolower log level when stats come before flow is written to deviceflowregistry 83/48183/1
Jamo Luhrsen [Wed, 9 Nov 2016 18:55:13 +0000 (10:55 -0800)]
lower log level when stats come before flow is written to deviceflowregistry

Change-Id: Ib24b9e97c86b2d1a24610204b61fcf9237871f0e
Signed-off-by: Jamo Luhrsen <jluhrsen@redhat.com>
7 years agoMerge "Bug 7058 - [Helium Plugin]Stats collection issue when controller disconnect...
Shuva Jyoti Kar [Wed, 9 Nov 2016 10:16:34 +0000 (10:16 +0000)]
Merge "Bug 7058 - [Helium Plugin]Stats collection issue when controller disconnect the device" into stable/boron

7 years agoImplement SalExperimenterMpMessageService 33/47733/2
Tomas Slusny [Thu, 27 Oct 2016 12:35:19 +0000 (14:35 +0200)]
Implement SalExperimenterMpMessageService

Add missing implementation for experimenter multipart message
RPC service and register it as routed RPC implementation

Resolves: bug 6820

Change-Id: I5646f93dd6375b729e995a9e60e6d688f1508559
Signed-off-by: Tomas Slusny <tomas.slusny@pantheon.tech>
(cherry picked from commit cf84afd05137e68dcda33f88ae30312b649d79a9)

7 years agoImprove cleanup after device disconnected event 87/47587/3
Colin Dixon [Mon, 3 Oct 2016 15:43:08 +0000 (17:43 +0200)]
Improve cleanup after device disconnected event

- Ensure that all contexts are removed from managers at once
  at end of disconnect chain right before unregistration from
  cluster singleton service
- Prevent closing some services multiple times during device
  disconnect chain
- Prevent some NPEs in DeviceInitializationUtils what was caused
  by connecting and disconnecting device with no time in between
- Unify all openflow managers to implement OFPManager interface
- Ensure that when we will fail to set device to SLAVE we will wait
  until device is removed from operational DS and then continue

Resolves: bug 6672
See also: bug 6710, bug 5271

Actual work done by Tomas Slusny. Colin Dixon merely fixed a merge
conflict.

Change-Id: I3845c7d2a9147125b185d3abcc3fc8dd63ba5da8
Depends-On: I15f89cbd43310b0a8e4b7ac78595eeaaa82a65ee
Co-author: Tomas Slusny <tomas.slusny@pantheon.sk>
Signed-off-by: Tomas Slusny <tomas.slusny@pantheon.sk>
Signed-off-by: Colin Dixon <colin@colindixon.com>
(cherry picked from commit 4a89e389589676a2b6975096ba721cd4c354e1bd)

7 years agoMerge "Bug 7011 - Race condition in statistics collection related transaction chain...
Jozef Bacigal [Fri, 4 Nov 2016 13:20:23 +0000 (13:20 +0000)]
Merge "Bug 7011 - Race condition in statistics collection related transaction chain handling" into stable/boron

7 years agoMerge "Optimize port number lookups" into stable/boron
Shuva Jyoti Kar [Fri, 4 Nov 2016 13:12:17 +0000 (13:12 +0000)]
Merge "Optimize port number lookups" into stable/boron

7 years agoMerge "BUG-6890: Statistics-polling configuration" into stable/boron
Shuva Jyoti Kar [Fri, 4 Nov 2016 13:11:27 +0000 (13:11 +0000)]
Merge "BUG-6890: Statistics-polling configuration" into stable/boron

7 years agoBumping versions by 0.0.1 for next dev cycle 22/47922/1
Anil Belur [Fri, 4 Nov 2016 00:39:20 +0000 (10:39 +1000)]
Bumping versions by 0.0.1 for next dev cycle

Change-Id: I85a05ba2c9ea0ab3971e7a9930b3f26aa5cc41cb
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
7 years agoBug 7058 - [Helium Plugin]Stats collection issue when controller disconnect the device 41/47841/1
Anil Vishnoi [Fri, 28 Oct 2016 15:58:06 +0000 (17:58 +0200)]
Bug 7058 - [Helium Plugin]Stats collection issue when controller disconnect the device

Change-Id: I50164bf9c3f09097d211b9f40a3f2325dee38d45
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
7 years agoBUG-6890: Statistics-polling configuration 49/47449/7
Shuva Kar [Mon, 24 Oct 2016 16:21:06 +0000 (21:51 +0530)]
BUG-6890: Statistics-polling configuration

Changing the current flag to enable/disable statistics
polling.

Currently the statistics polling is controlled by the flag
is-statistics-polling-off which is off by default(value set to false).
However this logic being double-negative causes some confusion to the
end-user. Thus modifying the flag to is-statistics-polling-on and setting
it to true by default.

The associated logic involved at oyther places have been modified as
well as a part of this commit.

Change-Id: Ia9a027433611912c11ff0f3166aa6f68efdc6913
Signed-off-by: Shuva Kar <shuva.jyoti.kar@ericsson.com>
7 years agoOptimize port number lookups 32/47732/1
Tomas Slusny [Thu, 27 Oct 2016 08:33:32 +0000 (10:33 +0200)]
Optimize port number lookups

- Remove unnecessary OpenflowPortsUtil#init() and
  OpenflowPortsUtil#close() methods and add static constructors
  instead, so BiMaps will be initialized only when really needed,
  and we do not need to call OpenflowPortsUtil#init() method
  everywhere
- Cache inverse port BiMaps in OpenflowPortsUtil to greatly reduce
  lookup time in these BiMaps in some methods
- Try to use more short version instead of deprecated
  OpenflowVersion to reduce deprecation and to reduce
  memory use (less conversions from OpenflowVersion to short)
- Use proper MAX port constant when finding max port number
- Simplify some conditions in OpenflowPortsUtil
- Use proper OF_URI_PREFIX contant in InventoryDataServiceUtil

Resolves: bug 7046

Change-Id: I1ea033963fb48416d004398e2ee72909231aaea6
Signed-off-by: Tomas Slusny <tomas.slusny@pantheon.tech>
(cherry picked from commit 7acab16585770656cf65a826a4bbd9eee31a8822)

7 years agoBug 7011 - Race condition in statistics collection related transaction chain handling 79/47379/3
Anil Vishnoi [Sat, 22 Oct 2016 12:22:14 +0000 (05:22 -0700)]
Bug 7011 - Race condition in statistics collection related transaction chain handling

Change-Id: Iabc18b2814bf2f49bb6159f0bb8f9f55eda2e07d
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
7 years agoFix direct statistics 18/47418/1
miroslav.macko [Mon, 24 Oct 2016 09:14:37 +0000 (11:14 +0200)]
Fix direct statistics

- Initialize statistics gathering

Resolves: bug 7007

Change-Id: I0970b3c690f0771dbd1637405e3064a984b1ef4c
Signed-off-by: miroslav.macko <miroslav.macko@pantheon.tech>
(cherry picked from commit 02eedd8c320e6b9ff7bfafc7cda61e1c963c46bd)

7 years agoMerge "BUG-6890: Edit to cfg file reflecting that statistics collection is turned...
Abhijit Kumbhare [Mon, 24 Oct 2016 05:18:35 +0000 (05:18 +0000)]
Merge "BUG-6890: Edit to cfg file reflecting that statistics collection is turned on by default" into stable/boron

7 years agoMerge "BUG-6890:" into stable/boron
Abhijit Kumbhare [Mon, 24 Oct 2016 05:17:56 +0000 (05:17 +0000)]
Merge "BUG-6890:" into stable/boron

7 years agoMerge "Remove RoleManager and RoleContext" into stable/boron
Anil Vishnoi [Sat, 22 Oct 2016 10:56:16 +0000 (10:56 +0000)]
Merge "Remove RoleManager and RoleContext" into stable/boron

7 years agoFix flow matching function 20/47320/1
miroslav.macko [Tue, 18 Oct 2016 17:06:30 +0000 (19:06 +0200)]
Fix flow matching function

- If flow is not present in DeviceFlowRegistry,
  don't write to operational DS.
- Update SalFlowService "update" method
- Update Unit tests

Resolves: bug 6917

Change-Id: If07e94be2d2e8564a2d39d88aec0ea5ea6ac7d19
Signed-off-by: miroslav.macko <miroslav.macko@pantheon.tech>
(cherry picked from commit 91cacc74cf40c5fbe27ca912cdf78a27f1e40dd6)

7 years agoRemove RoleManager and RoleContext 09/47309/2
Jozef Bacigal [Mon, 17 Oct 2016 10:25:32 +0000 (12:25 +0200)]
Remove RoleManager and RoleContext

- no more functionality for role manager (after Singleton changes)
- all remain functionality from role-mng and ctx were moved to device-mgn and ctx

Change-Id: I1cc1ef23c45da7b9a4288194caa7f88f7534e409
Signed-off-by: Jozef Bacigal <jozef.bacigal@pantheon.tech>
7 years agoBUG-6890: Edit to cfg file reflecting that statistics 66/47066/3
Shuva Kar [Tue, 18 Oct 2016 11:31:06 +0000 (17:01 +0530)]
BUG-6890: Edit to cfg file reflecting that statistics
collection is turned on by default

Change-Id: I8a97cb11b1b98189a04daed50961b4a912113749
Signed-off-by: Shuva Kar <shuva.jyoti.kar@ericsson.com>
7 years agoBUG-6890: 24/47024/4
Shuva Kar [Mon, 17 Oct 2016 08:57:59 +0000 (14:27 +0530)]
BUG-6890:

Fix to provide default values for configurable parameters by
handling the NumberFormatException in case the configurable
parameters are either null or absent

Change-Id: Idb37565167778a900732df2dfef428847b0efd3b
Signed-off-by: Shuva Kar <shuva.jyoti.kar@ericsson.com>
7 years agoMerge "Optimize LLDP packet check" into stable/boron
Jozef Bacigal [Thu, 20 Oct 2016 13:19:28 +0000 (13:19 +0000)]
Merge "Optimize LLDP packet check" into stable/boron

7 years agoBug: 6930 Notiifcation-suppliers was broken 72/46872/6
GauravBhagwani [Thu, 13 Oct 2016 08:09:34 +0000 (13:39 +0530)]
Bug: 6930 Notiifcation-suppliers was broken

Review contains changes required for making notification-supplier as per
Blueprint Injection method
- Removed Config Subsystem parts - Yang, Config XML, Modules/ModuleFactory
- Added Blueprint XML for notification-supplier
- Removed Config Dependency from features Pom
- Removed references to Config XML

Change-Id: Ifbdcb21140903a668ad0b8dd6e2df666b7e3e37f
Signed-off-by: GauravBhagwani <gaurav.bhagwani@ericsson.com>
7 years agoBUG-6890: Updated the cfg file with detailed description 23/47023/1
Shuva Kar [Mon, 17 Oct 2016 05:55:36 +0000 (11:25 +0530)]
BUG-6890: Updated the cfg file with detailed description
of usage

Change-Id: Ibe772a29107296cb96cf4aa48c1d3cb2dee4f3b2
Signed-off-by: Shuva Kar <shuva.jyoti.kar@ericsson.com>
7 years agoBUG-6890: Enabling statistics collection through a config 21/47021/1
Shuva Kar [Mon, 10 Oct 2016 08:40:27 +0000 (14:10 +0530)]
BUG-6890: Enabling statistics collection through a config
parameter in openflowplugin.cfg

Change-Id: If7dbedd50d7f23a075c53279654e36d33b212867
Signed-off-by: Shuva Kar <shuva.jyoti.kar@ericsson.com>
7 years agoBUG-6890: Enabling echo timout configurable through 20/47020/1
Shuva Kar [Mon, 10 Oct 2016 08:27:43 +0000 (13:57 +0530)]
BUG-6890: Enabling echo timout configurable through
config file

Change-Id: I3ff729b418809e8342a491ac6ab2a102f5a1ffe5
Signed-off-by: Shuva Kar <shuva.jyoti.kar@ericsson.com>
7 years agoBUG-6890: Enabling barrier configurability through 19/47019/1
Shuva Kar [Mon, 10 Oct 2016 07:11:03 +0000 (12:41 +0530)]
BUG-6890: Enabling barrier configurability through
cfg file

Change-Id: Iaada857a439c7774c6e31c27cc7be1b26c68ad1b
Signed-off-by: Shuva Kar <shuva.jyoti.kar@ericsson.com>
7 years agoOptimize LLDP packet check 99/46999/1
miroslav.macko [Fri, 7 Oct 2016 09:19:57 +0000 (11:19 +0200)]
Optimize LLDP packet check

Deserialize only LLDP packets.

See also: bug 1462

Change-Id: Ibdd2f3eb0dfe784fd235e51a591da64971c2afd3
Signed-off-by: miroslav.macko <miroslav.macko@pantheon.tech>
(cherry picked from commit 10922cdfdcbc4c14456cd6a387468e11bb9b802e)

7 years agoBug 6745 SimplifiedOperationalListener optimation 34/46834/1
miroslav.macko [Mon, 3 Oct 2016 16:07:15 +0000 (18:07 +0200)]
Bug 6745 SimplifiedOperationalListener optimation

- optimize processNodeModification method
- update test

Change-Id: I941a84bff4322c2b2b64f8404791ec6d00a9d200
Signed-off-by: miroslav.macko <miroslav.macko@pantheon.tech>
(cherry picked from commit 40b60339e5e8aeb07e782f8c34b5c2ef50da56ab)