Merge "BUG-86: Fixed echo response processing"

Merge "OPNFLWPLUG-952: All links disappear from the topology"

Bump versions by x.(y+1).z for next dev cycle

Change-Id: Ib83c016ca4bdfc87da9ab847c874afe29a9a710a
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>

OPNFLWPLUG-952: All links disappear from the topology

In cluster split situations LLDP Speaker can get into a bad state, with
incorrect number of node-connectors mapped locally. In some cases
multiple controllers can start sending packet outs. The solution here is
to use clustered DTCL to keep the node-connectors more consistent across
all instances of LLDPSpeaker and use EOS to determine who should
actually transmit the packet.

Change-Id: I36df734dff23688e8ace27b42f85291aa62ac391
Signed-off-by: Evan Zeller <evanrzeller@gmail.com>

BUG-86: Fixed echo response processing

Change-Id: Ib83eb3463d101e872830d3985044c1154668baa1
Signed-off-by: Jalpa Modasiya <jmodasiy@luminanetworks.com>

Fix checkstyle violations in openflowplugin extensions

Change-Id: I6c2404ee9e0e30efab156a621bd7e641a78af972
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>

Fix checkstyle violations in openflowjava extensions

Change-Id: Ie4a01ec30e1feb054bfceb52a2598a2936264ace
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>

Fix checkstyle violations in samples

Change-Id: I5879e9d420c57c252d301ce7a5c296f8b5b914a6
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>

Fix checkstyle violations in applications

Change-Id: I1ac5ba94705ffba78d4765185ff6ade5f299a671
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>

Merge "Fix checkstyle violations in liblldp"

export lldp as feature

Those bundles are used by genius and netvirt.
They should be consumable as feature, not bundle.

For detailed discussion, please refer to the followings
https://lists.opendaylight.org/pipermail/release/2018-January/013604.html
https://lists.opendaylight.org/pipermail/release/2017-September/012356.html

Change-Id: I034494a38c88c69c8d75731b73bab7b0f116db9d
Signed-off-by: Faseela K <faseela.k@ericsson.com>

Fix checkstyle violations in liblldp

Change-Id: I1006a34064ca339a4280a255074eded82dbf5ce5
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>

OPNFLWPLUG-974: Message deserialization failed

Description:

"Message deserialization failed...msgType: 36864 oxm_field: 6
experimenterID: null was not found - please verify that all needed
deserializers ale loaded correctly".

Observation:

The deserialization of this message failed due to the msg type of one of
the oxm fields (CtMark) was getting decoded wrongly.

This was due to the CtMarkCodec present in the packet(before the Metadata
oxm field) was decoding the field wrongly. The field doesnt have mask field
in it but still the mask it was read, ie, it was reading the next oxm field bytes too(Metadata)
thereby skipping the bytes from which the oxm Metadata is supposed to be read
and hence wrong data(skipped 4 bytes) is decoded in the next oxm field deserialization.

Fix:

The incorrect read of mask field in Ctmark codec has been removed now.

Change-Id: I79b6899686b05217df533e9ef365e9909dfc048d
Signed-off-by: gobinath <gobinath@ericsson.com>

Merge "OPNFLWPLUG-929 : Remove deprecated guava library"

Merge "OPNFLWPLUG-972: Point to openflowplugin liblldp"

Fix remaining checkstyle violations in openflowjava

Change-Id: I720977b96996a462946c5b6114a6b6b7dd1285bc
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>

Fix checkstyle violations in openflow-protocol-impl - part 12

Many violations - more to follow

Change-Id: I909943b0b0b3e8974dd73422843238042b4bac1b
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>

Fix checkstyle violations in openflow-protocol-impl - part 11

Many violations - more to follow

Change-Id: Iaa832ec597a543b1d963cd58307d7fed05f50720
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>

Fix checkstyle violations in openflow-protocol-impl - part 10

Many violations - more to follow

Change-Id: I3b7ab07f56a13982f88df17805c3d82bbf14a062
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>

Fix checkstyle violations in openflow-protocol-impl - part 9

Many violations - more to follow

Change-Id: Ide57e636e33d752cd9a6c912de071fd1493a7097
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>

Fix checkstyle violations in openflow-protocol-impl - part 8

Many violations - more to follow

Change-Id: Ie7aac9d6bc6b1372ff425b89d83cf44b617f7751
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>

Fix checkstyle violations in openflow-protocol-impl - part 7

Many violations - more to follow

Change-Id: I35f1ada078217cc89d03f2953829ac2274a53655
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>

Fix checkstyle violations in openflow-protocol-impl - part 6

Many violations - more to follow

Change-Id: I18badf1a7b759dfbe63d240ea786c716d3135c97
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>

Fix checkstyle violations in openflow-protocol-impl - part 5

Many violations - more to follow

Change-Id: I19ea3b92b66c0121946e88699af5e7c2742ea54d
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>

Fix checkstyle violations in openflow-protocol-impl - part 4

Many violations - more to follow

Change-Id: I9107de913adef9e19cdf7583b996598d4b9a63b0
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>

Fix checkstyle violations in openflow-protocol-impl - part 3

Many violations - more to follow

Change-Id: I5cba0f1e5d8f61106db5d1461c205b80be585993
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>

Fix checkstyle violations in openflow-protocol-impl - part 2

Many violations - more to follow

Change-Id: I360cd3cd431d1c05df1262df8debeb68f95ffac9
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>

Fix checkstyle violations in openflow-protocol-impl - part 1

Many violations - more to follow

Change-Id: I3467223dd8ab3a9fe52906a2b029b0ab130b0b7d
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>

Merge "Spec: OFPGC_ADD_OR_MOD support in openflowplugin"

Merge "Fix checkstyle violations in openflowjava-util"

Merge "Fix checkstyle violations in openflow-protocol-api"

Merge "Remove unused interface"

Merge "Remove dependency on sal-common-util"

Merge "Remove deprecated EOS services"

Remove dependency on sal-common-util

This dependency is no longer used, remove it along with use
of controller's odl-mdsal-common.

Change-Id: Id15cc085c56dcb45796593f12da9b4fd4f95a99b
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

OPNFLWPLUG-929 : Remove deprecated guava library

use overload Futures.transform api

Change-Id: Iba64da122b31a022493a793f2e986bd91e530112
Signed-off-by: D Arunprakash <d.arunprakash@ericsson.com>

Merge "OPNFLWPLUG-969: ONF Extension is not installed due to which bundle based  resync is failing:"

OPNFLWPLUG-972: Point to openflowplugin liblldp

Change-Id: Ic029736e257e09825d35946287433bb41c6d61d3
Signed-off-by: D Arunprakash <d.arunprakash@ericsson.com>

OPNFLWPLUG-972: Add liblldp module to openflowplugin pom

1. Change package from org.opendaylight.controller
   to org.opendaylight.openflowplugin.libraries
2. Enable liblldp module - Add to openfloplugin pom.xml

Change-Id: I0d6fa73a78e4fea587e250aed5577c10375e6b31
Signed-off-by: D Arunprakash <d.arunprakash@ericsson.com>

Merge "OPNFLWPLUG-963 : Updating ports delete reason from OFP:"

OPNFLWPLUG-969: ONF Extension is not installed due to which bundle based
resync is failing:

Feature ONF Extension is not installed due to dependency missing hence
bundle based resync event is not taking place.It's resolved by adding
corresponding dependency in odl-openflowplugin-southbound pom.xml file.

Change-Id: Iaae13d0a327bcc6c867ca4f7b7945c81fde32118
Signed-off-by: SujaT <suja.t@ericsson.com>

Merge "OPNFLWPLUG-929 : Remove deprecated guava library"

Merge "OPNFLWPLUG-929 : Remove deprecated guava library"

Merge "OFPGC_ADD_OR_MOD support in openflowplugin"

Fix checkstyle violations in openflowjava-util

Change-Id: Iac5a02900711a36c79481f0ee19be06c20bbd879
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>

Fix checkstyle violations in openflow-protocol-api

Change-Id: Ie6aa924aeb857035e8389a50a70d6c9149d4e4ee
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>

Eliminate explicit yangtools dependencies and pom cleanup

Changed the openflowplugin-parent pom to derive from bindng-parent so
yangtools version and dependencies come from mdsal. Also removed
unnecessary, duplicated configurations, eg yang-maven-plugin, in derived
poms thatcare inherited from the parents.

Change-Id: Ie331b93a5f1d6784109ff82afe63ca481c67ceec
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>

Bump yangtools to 2.0.1

Change-Id: I10fbb74bc762768e90d1f4b1f3fe0ad2a607af82
Signed-off-by: Luis Gomez <ecelgp@gmail.com>

Merge remote-tracking branch 'liblldp/master'

Change-Id: I7be037f65e45d138e07e3fd136c82bdd65d23c3d
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

Move liblldp into libraries/liblldp

Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

Bump to yangtools-2.0.0 and odlparent-3.0.2

Change-Id: I55e46a801fa02d37117caf80f2f9ddcd7941dfb7
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>

Merge "Fix odlparent 3 Checkstyle issues"

Bump to odlparent 3.0.2

Change-Id: Ifb16521edc9fa7209c0af8e13745c6b5611d77b7
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>

Remove unused interface

- remove unused OpenflowPluginTimer

See bug: OPNFLWPLUG-966

Change-Id: I18f9d5db28cc9f8780db1fe513619a438ca88793
Signed-off-by: Jozef Bacigal <jozef.bacigal@me.com>

Bump yangtools to 2.0.0

This bumps odlparent to 3.0.1 and yangtools to 2.0.0. Also fixes
references to features, so that the build reactor is consistent.

Compilation fixes are addressed in a follow-up patch.

Change-Id: I24f9997c2ec22861e674b74fb01d43f783e3dbc1
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

OPNFLWPLUG-929 : Remove deprecated guava library

use overloaded transformAsync api

Change-Id: I8c087f1b77f7d3f5364a3b545033e16631c48f60
Signed-off-by: D Arunprakash <d.arunprakash@ericsson.com>

OPNFLWPLUG-929 : Remove deprecated guava library

use overloaded transformAsync api

Change-Id: I9c6cc9b78aeba0afe3b08bedc978a800fc804ab3
Signed-off-by: D Arunprakash <d.arunprakash@ericsson.com>

OFPGC_ADD_OR_MOD support in openflowplugin

Addition of new command OFPGC_ADD_OR_MOD for OFPT_GROUP_MOD message
that adds a new group that does not exist (like ADD) or modifies
an existing groups like (MODIFY).

Added a configurable property group_add_mod_enabled which when set to
"true", the addition/updation of a group would send OFPGC_ADD_OR_MOD
message to the switches. When set to false, the addition/updation of the
group has the same existing behavior,ie, OFPGC_ADD for addition and
OFPGC_UPDATE for the updation of the groups.

This patch fixes the following bugs: OPNFLWPLUG-788, OPNFLWPLUG-877, OPNFLWPLUG-667

Gerrit link for the specs: https://git.opendaylight.org/gerrit/#/c/65465/

Change-Id: Ifb2f7ff55d07ca565d87eaa8b253021cad667fd6
Signed-off-by: Gobinath <gobinath@ericsson.com>

Remove deprecated EOS services

See also: OPNFLWPLUG-927

Change-Id: Ie9a4b7904c492f2f3b2a011f358e70bfee6bd510
Signed-off-by: Jozef Bacigal <jozef.bacigal@pantheon.tech>

Merge "OPNFLWPLUG-929 : Remove deprecated guava library in openflowplugin-impl"

Merge "OPNFLWPLUG-929 : Remove deprecated guava library in applications"

Merge "OPNFLWPLUG-929 : Remove deprecated guava library"

OPNFLWPLUG-963 : Updating ports delete reason from OFP:

This patch is required by interface manager (GENIUS) to differentiate
NodeConnector removal due to PORT DEL Openflow Message or due to node
itself gets removed.

Change-Id: I84ab57abda78b5796ef94dc07e83e0f4e30fd2ce
Signed-off-by: eeiillu <suja.t@ericsson.com>

OPNFLWPLUG-929 : Remove deprecated guava library in openflowplugin-impl

Change-Id: Ie95eb2e4af6917e9594c5774e91147619f88d590
Signed-off-by: D Arunprakash <d.arunprakash@ericsson.com>

OPNFLWPLUG-929 : Remove deprecated guava library

Change-Id: Ica86ef2e1ad320a1fdedc1b1266cb980acd2464b
Signed-off-by: D Arunprakash <d.arunprakash@ericsson.com>

OPNFLWPLUG-929 : Remove deprecated guava library in applications

Change-Id: I7c21fc9fdb2529968c68e1a535f400cd5f5a61b2
Signed-off-by: D Arunprakash <d.arunprakash@ericsson.com>

OPNFLWPLUG-953: Property change listener for lldp discovery config properties

Runtime update for properties in openflowplugin.cfg is failing
as there is no listener added for newly added toplogy lldp
discovery properties

Change-Id: I87bcba910f8d51a5b940b82c588a06d39092404a
Signed-off-by: D Arunprakash <d.arunprakash@ericsson.com>

Fix odlparent 3 Checkstyle issues

Change-Id: I9ed666294ecdfa04290dc56dcf3610c85b117e92
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>

Merge "Rename addDeleteOperationTotTxChain => addDeleteOperationToTxChain"

Run time check and update of OFP service status

Change-Id: I8b41cd32990e7c4ea14cabbf862008fe77c7cc91
Signed-off-by: gobinath <gobinath@ericsson.com>
(cherry picked from commit 042a4f1a62e14cd78fab243b450f77bc6e0bc86e)
Signed-off-by: gobinath <gobinath@ericsson.com>

Merge "System ready integration for OFP"

System ready integration for OFP

The openflowplugin will start switch connections only on the system
ready event triggered by the infrautils.

Change-Id: Ia60b36cb2446ed92d58d3507d2de9524d6efbc00
Signed-off-by: gobinath <gobinath@ericsson.com>

Rename addDeleteOperationTotTxChain => addDeleteOperationToTxChain

to drop the 't' which looks like an obvious typo in this method

Change-Id: I0c7648f13bc1ea2312fa8fd31f8e9238260e731e
Signed-off-by: Michael Vorburger <vorburger@redhat.com>

Merge "Minor: Remove 3 un-used private methods found by FindBugs"

Merge "Make HandshakeManagerImpl more thread-safe, as recommended by FindBugs"

Merge changes I400fdd74,I18d70f22,Icc83aef3,I3a67dc87,I05b3e988

* changes:
  Make two classes _static_ inner classes, as recommended by FindBugs
  Suppress FindBugs null analysis warning in FlowDescriptorDtoTest
  Suppress FindBugs concurrency warning which is wrong
  Fix FindBugs null analysis problems due to wrong @Nullable
  Fix FindBugs level "Scariest" problem in SalAsyncConfigServiceImplTest

Merge "FindBugs enforcement in module openflowplugin-api/"

Merge changes Ic5f4324c,I7611359f

* changes:
  FindBugs enforcement in module common/
  Checkstyle enforcement (and required fixes) in module common/

Fix possible transaction leak in StatisticsGatheringUtils

see https://jira.opendaylight.org/projects/OPNFLWPLUG/issues/OPNFLWPLUG-961;
5x transactions opened here which were not closed

Change-Id: I1d9983a257881a7618943f76a6780a14c4e97e82
Signed-off-by: Michael Vorburger <vorburger@redhat.com>

Minor: Remove 3 un-used private methods found by FindBugs

Change-Id: I6fc436746b35bd4971a35f9af45201a2065bd438
Signed-off-by: Michael Vorburger <vorburger@redhat.com>

Make HandshakeManagerImpl more thread-safe, as recommended by FindBugs

Change-Id: I7b60abf3dfca6cad9936acdb1ce03f77f1a97768
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Change-Id: I7b60abf3dfca6cad9936acdb1ce03f77f1a97768
Signed-off-by: Michael Vorburger <vorburger@redhat.com>

Make two classes _static_ inner classes, as recommended by FindBugs

Change-Id: I400fdd7492f18728690ccd5ef5063936a8021ae0
Signed-off-by: Michael Vorburger <vorburger@redhat.com>

Suppress FindBugs null analysis warning in FlowDescriptorDtoTest

Change-Id: I18d70f22a4bb979f2153bf34d1b131e7139f807a
Signed-off-by: Michael Vorburger <vorburger@redhat.com>

Suppress FindBugs concurrency warning which is wrong

Change-Id: Icc83aef349ce1c16ce774c1aebfa108a7718c4bd
Signed-off-by: Michael Vorburger <vorburger@redhat.com>

Fix FindBugs null analysis problems due to wrong @Nullable

In each of these 3 cases, the RpcResult is very clearly de facto not
@Nullable (because it is de-referenced in the method, so if it was null,
that would cause a NPE) - so just remove the @Nullable.

Change-Id: I3a67dc87a7b2f538b830d189d287d32c583f81b9
Signed-off-by: Michael Vorburger <vorburger@redhat.com>

Fix FindBugs level "Scariest" problem in SalAsyncConfigServiceImplTest

FB says: "VERY confusing to have methods
org.opendaylight.openflowplugin.impl.services.sal.SalAsyncConfigServiceImplTest.setUp()
and org.opendaylight.openflowplugin.impl.services.ServiceMocking.setup()
The referenced methods have names that differ only by capitalization.
This is very confusing because if the capitalization were identical then
one of the methods would override the other."

Change-Id: I05b3e98833d22b3915b0564d05d2ec8968811457
Signed-off-by: Michael Vorburger <vorburger@redhat.com>

FindBugs enforcement in module openflowplugin-api/

No serious FindBugs violation needed to be corrected (1 very minor)

Change-Id: Ibb1ea7a0d3bbcd775187c4639f7549fbdb254dc5
Signed-off-by: Michael Vorburger <vorburger@redhat.com>

FindBugs enforcement in module common/

No FindBugs violation needed to be corrected in TransactionChainManager

Includes .gitignore of .fbExcludeFilterFile created by FB Eclipse plugin

Change-Id: Ic5f4324c5b4855a489585083cb2964c527f2fc9a
Signed-off-by: Michael Vorburger <vorburger@redhat.com>

Checkstyle enforcement (and required fixes) in module common/

Change-Id: I7611359fee604b2a68b42e16ca5bb673813c1e13
Signed-off-by: Michael Vorburger <vorburger@redhat.com>

Merge "Clean up in module reconciliation-framework"

Spec: OFPGC_ADD_OR_MOD support in openflowplugin

Implementation spec for OFPGC_ADD_OR_MOD

https://jira.opendaylight.org/browse/OPNFLWPLUG-877

Change-Id: Ief5b63416b586b44e0b73a4bab816b2844ddcaae
Signed-off-by: D Arunprakash <d.arunprakash@ericsson.com>

Spec: Reconciliation framework

Change-Id: I80c8a6ce4b073f59d69ecd01558ce024adce0748
Signed-off-by: D Arunprakash <d.arunprakash@ericsson.com>

Allow PacketException to store the cause

This avoids callers’ losing the original exception.

Change-Id: I99f11dd6866670229f8e3d2aa6556f540369de19
Signed-off-by: Stephen Kitt <skitt@redhat.com>

Clean up in module reconciliation-framework

- Remove some deprecated
- Make some variables final
- Other minor clean up

Change-Id: Ib87f59bf31009d5222c7512fa5d2d29a14454fef
Signed-off-by: David Suarez <david.suarez.fuentes@gmail.com>

Merge "Revert "Bug 8902 : Spec for Reconciliation Framework""

Remove the rst file and add later with proper formatting

Change-Id: Ib92caeb6c7e657b51e76dd169c5569e2bb45bbe7
Signed-off-by: D Arunprakash <d.arunprakash@ericsson.com>

Revert "Bug 8902 : Spec for Reconciliation Framework"

Patch #60283 is preventing patch #65556 from being verified

This reverts commit f1e058a660cf98d1411ba763c6b0989e2439fabc.

Change-Id: I11c277ae85a366ed83dd240586d5ef8e2ca60d0e
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>

Merge "Add Docs for Openflowplugin"

Merge "Bug 8902 : Spec for Reconciliation Framework"

Merge "DiagStatus integration for openflowplugin"