Bump versions by x.y.(z+1)

Change-Id: I2068a98cf1f178671f9b8c3809ffbee71b0bfa15
Signed-off-by: jenkins-releng <jenkins-releng@opendaylight.org>

remove 2 old fixed Maven plugin versions for Java 11

In the hope that this fixes the problem seen on
https://logs.opendaylight.org/releng/vex-yul-odl-jenkins-1/autorelease-release-neon-mvn35-openjdk11/7/

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

Do not override javadoc plugin version

We are currently at version 3.0.1, do not use an outdated version.

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

Merge "Rework bit-copying functions and re-enable tests"

Merge "Fix BitBufferHelper::toNumber()"

Merge "Clean up instance checks and casts"

Rework bit-copying functions and re-enable tests

This patch addresses the discrepancy between the insertBits() tests
and setBytes(), by making the source of the bits explicit (MSB or
LSB).

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

Fix BitBufferHelper::toNumber()

Static analysis suggested that toNumber() was incorrect (there was a
redundant write to value). Adding test cases to the UT showed that
this was the case; this patch adds the new test cases and fixes
toNumber(). It also switches assertTrue() to assertEquals() where
appropriate and cleans up a number of redundant initialisers.

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

Clean up instance checks and casts

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

Add javax.annotation-api dependencies

Java 11 no longer ships these annotations, hence they need to be
declared. The annotations are provided by the container, hence
we scope them as provided.

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

Use scope=provided for karaf shell

This dependency is actively filtered by odlparent, but its transitive
dependencies are still leaking to our features.

Lower the scope to provided to get rid of those dependencies.

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

Add jaxb-api dependencies

Java9+ does not ship JAXB, add dependecies on jaxb-api to make
Java 11 build pass.

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

Merge "minor: clean up TcpConnectionInitializer / SwitchConnectionProviderImpl"

Merge "add getFullyStarted() to OpenFlowPluginProviderImpl"

minor: clean up TcpConnectionInitializer / SwitchConnectionProviderImpl

also make TcpConnectionInitializer getIsOnlineFuture() actually work;
even though this, as far as I can tell, was over engineered and does not
actually appear to be used, it still nicer to be correct as it helps
understand how OnlineProvider / ServerFacade appears to have been
intended.

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

Bump to mdsal 3.0.6

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

Bump mdsal to 3.0.5

This aligns with odlparent-4.0.9 and yangtools-2.1.8.

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

Bump to odlparent 4.0.9

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

Merge "mv log4j.xml from src/main => src/test"

Merge "Bump mdsal to 3.0.4"

Merge "Bump odlparent to 4.0.8"

Merge "Log the address and port when binding fails"

Bump mdsal to 3.0.4

This realigns odlparent/yangtools/mdsal and brings in the latest
improvements.

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

Bump odlparent to 4.0.8

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

add getFullyStarted() to OpenFlowPluginProviderImpl

and fix the order of isOnlineFuture vs readyRunnable: For a test to be
able to await getFullyStarted() and then check diagstatus, that
(diagstatus) needs to be set BEFORE, otherwise there is a race
condition.

This has come up while writing the testDiagStatus() for the
OpenFlowPluginWiringTest for opendaylight-simple.

JIRA: OPNFLWPLUG-1061
Change-Id: Ic9b5f9b49038fa75451e81ebaa1e6fbdbc41c683
Signed-off-by: Michael Vorburger <vorburger@redhat.com>

Revert "Change log level for noisy disconnect log"

This reverts commit 00188709ae7cebe12da693f8dbe11108f940a4e3.

Change-Id: Ibd34cdc79d52ad74786c94f6f0cd25179c590970
Signed-off-by: Victor Pickard <vpickard@redhat.com>
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>

Merge "report diagstatus from UdpHandler/TcpHandler on Netty thread terminate"

Merge "use (infrautils') Executors in SwitchConnectionProviderImpl"

Merge "OPNFLWPLUG-1039: adding switch idle event registration at the end of channel initialization"

Migrate String padding

Guava provides a more efficient equivalent of StringUtils.padLeft(),
migrate to it, reducing dependencies on commons-lang3 a bit.

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

Merge "Bump mdsal to 3.0.3"

Merge "add blueprint-maven-plugin scanPath org.opendaylight.openflowplugin.impl"

Bump mdsal to 3.0.3

This brings in latest fixes and alignes with odlparent-4.0.5.

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

Bump to odlparent 4.0.5

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

report diagstatus from UdpHandler/TcpHandler on Netty thread terminate

This introduces new OPENFLOW_SERVER-{address}:{port} diagstatus service
names in SwitchConnectionProviderImpl, where UdpHandler/TcpHandler
start.

The Thread is now named including the same -{address}:{port} suffix.

This is a counter-proposal to the idea of "add a channelFuture to
listen for when the channel is closed and then update diagstatus"
originally proposed in Ieb78f225c1fcdd2ebf72ad1a99a49d4993a6a5b6,
because if/when that channel is closed, the UdpHandler/TcpHandler
Runnable thread exits, so this will achieve the same result in a
more general safer way.

This may (TBC) indirectly also fix OPNFLPLUG-1057.

JIRA: OPNFLWPLUG-1053
Change-Id: I5af740faa55ee55fbbe55acc34ea62905869fe35
Signed-off-by: Michael Vorburger <vorburger@redhat.com>

use (infrautils') Executors in SwitchConnectionProviderImpl

This will ensure that any unexpected uncaught exceptions from the
TcpHandler background thread are properly logged.  It will also give
that thread a nice name.  It will also let us listen for such threads
ending and correctly notifying the diagstatus.

BTW: The whole ServerFacade OnlineProvider ShutdownProvider business
I've stumbled upon here seems a bit of a mess and not really "doing"
anything useful, but I was reluctant to touch or propose to remove that.

JIRA: OPNFLWPLUG-1053
Change-Id: I75708330cfff0c495361a46def585a209b65ae4a
Signed-off-by: Michael Vorburger <vorburger@redhat.com>

Merge "Replace GroupingResolver with AugmentationGroupingResolver"

mv log4j.xml from src/main => src/test

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

add blueprint-maven-plugin scanPath org.opendaylight.openflowplugin.impl

to avoid the autowire.xml of openflowplugin-impl having a
<bean id="switchConnectionProviderFactoryImpl"
class="org.opendaylight.openflowjava.protocol.impl.core.SwitchConnectionProviderFactoryImpl">
which was, of course, completely wrong.

It seems to have done "no harm" so far because it's "just" an extra
bean initialization, which is then un-used, but it's very confusing
to see x2 SwitchConnectionProviderFactoryImpl starting up.

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

Merge "remove "polling" from OpenflowPluginDiagStatusProvider"

Merge "OPNFLWPLUG-1046 : Migrate OFP from XML to annotation based blueprint"

Merge "OPNFLWPLUG-1046 : Migrate OFP from XML to annotation based blueprint"

Merge "OPNFLWPLUG-1046 : Migrate OFP from XML to annotation based blueprint"

Replace GroupingResolver with AugmentationGroupingResolver

AugmentationGroupingResolver provides the same functionality with
an immutable implementation, geared towards low memory overhead
both in terms of static allocation and memory usage during traversal.

GroupingResolver.getExtension() functionality is exposed as
findExtension(), returning java.util.Optional -- thus allowing
for a clean option to retrofit a @Nullable getter if the need
arises.

JIRA: OPNFLWPLUG-1050
Change-Id: I7346ff41c6b1425a9f95dccb11547836f0a15c53
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

remove "polling" from OpenflowPluginDiagStatusProvider

diagstatus offers two ways if integrating: Either a module knows it
status changes and can therefore report it (push from module to
diagstatus infra).  Or a module has no clear status change points, and
wants to be asked when status is required to be provided (pull from
infra to a module; the DatastoreServiceStatusProvider is a good example
of where this is required).

The OpenflowPluginDiagStatusProvider however implemented a mix of those
two modes, which IMHO is not required - OpenFlowPluginProviderImpl seems
to know exactly when it is done starting switch connections.

We add report ERROR when shutting down, emulating what polling would
have reported if one were to check diagstatus during shutdown.

If there are additional scenarios where whatever is started to listen on
those ports (TcpHandler ?) closes, or dies, then those places should
simply also use report ERROR via openflowPluginStatusMonitor.

This reverts I8b41cd32990e7c4ea14cabbf862008fe77c7cc91, and is an
alternative to I4ece338a4f0cf01c98e2b9b02557f0406faf27ae.

JIRA: OPNFLWPLUG-1053
Change-Id: Ieb78f225c1fcdd2ebf72ad1a99a49d4993a6a5b6
Signed-off-by: Michael Vorburger <vorburger@redhat.com>

OPNFLWPLUG-1046 : Migrate OFP from XML to annotation based blueprint

BP to Annotation changes for reconciliation-framework module
Change-Id: If823064bd47cde9cc00d37bd33cb7410faae83ee
Signed-off-by: gobinath <gobinath@ericsson.com>

OPNFLWPLUG-1046 : Migrate OFP from XML to annotation based blueprint

BP to Annotation changes for of-switch-config-pusher module

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

Merge "Change channel outbound queue size log level"

OPNFLWPLUG-1046 : Migrate OFP from XML to annotation based blueprint

BP to Annotation changes for topology-manager module

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

OPNFLWPLUG-1039: adding switch idle event registration at the end of
channel initialization

Change-Id: If0c055788f03311bad2c94cf96cffeb613ed3a77
Signed-off-by: Somashekhar Javalagi <somashekhar.manohara.javalagi@ericsson.com>

Merge "switch from FindBugs to SpotBugs"

Merge "Bump to mdsal-3.0.2"

Change channel outbound queue size log level

Moves the log level for the queue size to debug.

Change-Id: I740de821f08d988c567c08d57c1241619f89ee5b
Signed-off-by: Tim Rozet <trozet@redhat.com>

Merge "OPNFLWPLUG-1046 : Migrate OFP from XML to annotation based blueprint"

OPNFLWPLUG-1046 : Migrate OFP from XML to annotation based blueprint

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

Merge "OPNFLWPLUG-1046 : Migrate OFP from XML to annotation based blueprint"

Bump to mdsal-3.0.2

This bumps mdsal to 3.0.2.

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

Log the address and port when binding fails

Currently, when we fail to bind, the error appears in a Netty thread
and is only logged if we have a last-chance logger on the relevant
thread. This patch ensures that TcpHandler and UdpHandler log binding
errors with an informative error message.

Change-Id: I687d84cec09d1ed2389bed9e2e04e50cd1296850
JIRA: OPNFLWPLUG-1054
Signed-off-by: Stephen Kitt <skitt@redhat.com>

OPNFLWPLUG-1046 : Migrate OFP from XML to annotation based blueprint

BP to Annotation changes for lldp-discovery module

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

Merge "replace @SuppressFBWarnings with LoggingFutures"

switch from FindBugs to SpotBugs

The commented out "if" in SyncPlanPushStrategyIncrementalImpl address a
UCF_USELESS_CONTROL_FLOW problem which SpotBugs correctly points out.

The "switch" related change in LLDPLinkAger addresses
DB_DUPLICATE_SWITCH_CLAUSES.

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

OPNFLWPLUG-1046 : Migrate OFP from XML to annotation based blueprint

JIRA: OPNFLWPLUG-1046
Change-Id: Id0387d4273e0566d2bebc75a471c6147c93b1eca
Signed-off-by: gobinath <gobinath@ericsson.com>

Merge "Change log level for noisy disconnect log"

Merge "Simplify lambdas"

Merge "Unwrap Optionals"

Simplify lambdas

... where it makes the code more readable.

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

Change log level for noisy disconnect log

JIRA: OPNFLWPLUG-1053

Change the log level to debug for the disconnect
log, which we see spewing every few secs in d/s
testing, until the root cause of these disconnects
are addressed.

Change-Id: I996f24ebb9b373b334edd02a319d779d82722a1a
Signed-off-by: Victor Pickard <vpickard@redhat.com>

minor clean-up of left-over un-used @Inject

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

Merge "Use List instead of SortedMap for scenario events"

Merge "improve fixed incorrect Future usage in (Bundle)FlowForwarder"

Merge "Log Future failure in NodeConfiguratorImpl"

Merge "fix incorrect Future usage in (Bundle)FlowForwarder"

Unwrap Optionals

This patch fixes a few instances of left-over code which used to
transform a Guava Optional to a Java Optional, but is no longer
necessary since the callee returns a Java Optional directly.

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

Use List instead of SortedMap for scenario events

ScenarioService::getEventsFromScenario uses a SortedMap to enforce
iteration order; this can be achieved less expensively using a List.

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

replace @SuppressFBWarnings with LoggingFutures

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

Log Future failure in NodeConfiguratorImpl

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

Merge "Use QueuedNotificationManager to dispatch tasks"

improve fixed incorrect Future usage in (Bundle)FlowForwarder

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

fix incorrect Future usage in (Bundle)FlowForwarder

Follow-up patch for https://git.opendaylight.org/gerrit/#/c/77796/ -
see comments there for details.

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

re-activate FindBugs

and fix a lot of logging format bugs which we now automatically detect

and also addresses a few other mistakes identified by FB

Change-Id: I37f0ab54736ba55f23cd3a1fa23c8263a4f3e212
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>

Merge "git rid of Blueprint openflowplugin.xml"

Merge "drop 'openflow-plugin-provider-impl' odl:type"

Merge "use annotations instead XML for BP in protocol-impl"

Merge "avoid <bean factory-ref/method> in lldp-speaker's BP XML"

Merge "use annotations instead XML for BP in impl"

Merge "fix ArbitratorReconciliationManagerImpl endReconciliation() remove"

fix ArbitratorReconciliationManagerImpl endReconciliation() remove

JIRA: OPNFLWPLUG-1048
Change-Id: If26656fa6f65d04435c94c0b7258144f45dc989e
Signed-off-by: Michael Vorburger <vorburger@redhat.com>

git rid of Blueprint openflowplugin.xml

JIRA: OPNFLWPLUG-1046
Change-Id: Icc6a06cba34e45a81bc5d0161bdc532a4b4012f4
Signed-off-by: Michael Vorburger <vorburger@redhat.com>

drop 'openflow-plugin-provider-impl' odl:type

because that actually seems to be un-used (there is no other type)

This will make it easier to migrate to annotations instead XML for BP.

JIRA: OPNFLWPLUG-1046
Change-Id: I77af6065063801672bb01ca5f81dcf8aac2e8aaa
Signed-off-by: Michael Vorburger <vorburger@redhat.com>

use annotations instead XML for BP in protocol-impl

JIRA: OPNFLWPLUG-1046
Change-Id: I96e492a39cca871600de325ac45ae1376e4a3c2e
Signed-off-by: Michael Vorburger <vorburger@redhat.com>

use annotations instead XML for BP in impl

JIRA: OPNFLWPLUG-1046
Change-Id: Idd8004a4aaac25c40fa7ec15beb1083115b0236a
Signed-off-by: Michael Vorburger <vorburger@redhat.com>

avoid <bean factory-ref/method> in lldp-speaker's BP XML

This hopefully will make it easier (trivial, normally) to migrate
lldp-speaker to use annotations instead XML for BP.

JIRA: OPNFLWPLUG-1046
Change-Id: I2930caa943e1d476ab538ae890b6252894855b9c
Signed-off-by: Michael Vorburger <vorburger@redhat.com>

mv BP XML from org/opendaylight to OSGI-INF/

1. Blueprint XML files moved, following
   https://wiki.opendaylight.org/view/Neon_platform_upgrade#Blueprint_declarations
   find . -path '*/src/main/resources/org/opendaylight/blueprint/*.xml' -execdir sh -c "mkdir -p ../../../OSGI-INF/blueprint; git mv {} ../../../OSGI-INF/blueprint" \;

2. ditch un-used http://opendaylight.org/xmlns/blueprint/v1.0.0 namespace
   in openflow-protocol-impl bundle which has no other controller dependency;
   see related update to Wiki just made for full background.

JIRA: OPNFLWPLUG-1032
Change-Id: I222d0a8aceee10960e493b7b165b79d7dd65d4a3
Signed-off-by: gobinath <gobinath@ericsson.com>
Signed-off-by: Michael Vorburger <vorburger@redhat.com>

Merge "use annotations instead of XML for blueprint"

Use QueuedNotificationManager to dispatch tasks

QueuedNotificationManager already provides the same execution
guarantees as NodeConfiguratorImpl while providing a non-busy-loop
dispatch and dealing with other complexities.

Use that instead of home-brewed code.

JIRA: OPNFLWPLUG-1047
Change-Id: I6ce124a007df6e1ed74a2744c5141dd6d630d18b
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

Fix raw types in NodeConfiguratorImpl

This patch fixes raw type warnings in NodeConfiguratorImpl and inlines
FutureCallback class, as it is a very simple dispatch.

JIRA: OPNFLWPLUG-1047
Change-Id: Iac60a0782f210eb34944688fbf225159cbb50030
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

use annotations instead of XML for blueprint

This makes it easier to wire openflowplugin in opendaylight-simple.
(It would also be useful to write component tests.)

The autowire.xml which is now automatically generated from the
annotations at build time is, of course, 100% identical to the
hand-written (and now deleted) arbitratorreconciliation-manager.xml

JIRA: OPNFLWPLUG-1046
Change-Id: Id9eaaebf45ab718751c88cdbbac06fb400264638
Signed-off-by: Michael Vorburger <vorburger@redhat.com>

Close ReadTransactions

This handles a number of ReadTransactions using try-with-resources to
ensure they are closed in all cases.

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

Close ReadTransactions from ForwardingRulesManager

Change-Id: If8c644312ed6fd0ff76221ce2dc49ae61fda72de
JIRA: OPNFLWPLUG-1043
Signed-off-by: Stephen Kitt <skitt@redhat.com>

OPNFLWPLUG-1032: Neon-MRI: Bump odlparent, yangtools, mdsal

This patch bumps:
- odlparent to 4.0.0
- mdsal to 3.0.1

It also deals with:
- odl-guava-23 to odl-guava
- xmlunit upgrade via xmlunit-legacy
- adjust dependencies to account for ietf-{inet,yang}-types movement

Change-Id: I3936130b75afe804195ecb87c46aef46c39a7ed5
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Signed-off-by: gobinath <gobinath@ericsson.com>
Signed-off-by: Daniel Farrell <dfarrell@redhat.com>
Signed-off-by: gobinath <gobinath@ericsson.com>
Signed-off-by: Daniel Farrell <dfarrell@redhat.com>