openflowplugin.git
5 years agoMerge "Log the address and port when binding fails"
Anil Vishnoi [Thu, 10 Jan 2019 17:17:51 +0000 (17:17 +0000)]
Merge "Log the address and port when binding fails"

5 years agoRevert "Change log level for noisy disconnect log" 99/79299/2
Anil Vishnoi [Tue, 8 Jan 2019 09:14:47 +0000 (09:14 +0000)]
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>
5 years agoMerge "report diagstatus from UdpHandler/TcpHandler on Netty thread terminate"
Arunprakash D [Tue, 8 Jan 2019 08:54:09 +0000 (08:54 +0000)]
Merge "report diagstatus from UdpHandler/TcpHandler on Netty thread terminate"

5 years agoMerge "use (infrautils') Executors in SwitchConnectionProviderImpl"
Arunprakash D [Tue, 8 Jan 2019 05:59:31 +0000 (05:59 +0000)]
Merge "use (infrautils') Executors in SwitchConnectionProviderImpl"

5 years agoMerge "OPNFLWPLUG-1039: adding switch idle event registration at the end of channel...
Anil Vishnoi [Mon, 7 Jan 2019 17:08:53 +0000 (17:08 +0000)]
Merge "OPNFLWPLUG-1039: adding switch idle event registration at the end of channel initialization"

5 years agoMigrate String padding 78/79178/1
Robert Varga [Thu, 3 Jan 2019 14:06:09 +0000 (15:06 +0100)]
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>
5 years agoMerge "Bump mdsal to 3.0.3"
Robert Varga [Mon, 24 Dec 2018 14:20:32 +0000 (14:20 +0000)]
Merge "Bump mdsal to 3.0.3"

5 years agoMerge "add blueprint-maven-plugin scanPath org.opendaylight.openflowplugin.impl"
Arunprakash D [Mon, 24 Dec 2018 05:15:17 +0000 (05:15 +0000)]
Merge "add blueprint-maven-plugin scanPath org.opendaylight.openflowplugin.impl"

5 years agoBump mdsal to 3.0.3 21/79021/1
Robert Varga [Sun, 23 Dec 2018 23:21:19 +0000 (00:21 +0100)]
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>
5 years agoBump to odlparent 4.0.5 19/78919/2
Stephen Kitt [Fri, 21 Dec 2018 09:11:11 +0000 (10:11 +0100)]
Bump to odlparent 4.0.5

Change-Id: I97cb5e19308b2f25582e648ac75da984ace04362
Signed-off-by: Stephen Kitt <skitt@redhat.com>
5 years agoreport diagstatus from UdpHandler/TcpHandler on Netty thread terminate 77/78677/11
Michael Vorburger [Wed, 12 Dec 2018 11:41:56 +0000 (12:41 +0100)]
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>
5 years agouse (infrautils') Executors in SwitchConnectionProviderImpl 75/78675/4
Michael Vorburger [Wed, 12 Dec 2018 11:15:28 +0000 (12:15 +0100)]
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>
5 years agoMerge "Replace GroupingResolver with AugmentationGroupingResolver"
Arunprakash D [Wed, 19 Dec 2018 08:53:56 +0000 (08:53 +0000)]
Merge "Replace GroupingResolver with AugmentationGroupingResolver"

5 years agoadd blueprint-maven-plugin scanPath org.opendaylight.openflowplugin.impl 57/78857/1
Michael Vorburger [Tue, 18 Dec 2018 12:24:40 +0000 (13:24 +0100)]
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>
5 years agoMerge "remove "polling" from OpenflowPluginDiagStatusProvider"
Arunprakash D [Mon, 17 Dec 2018 08:42:44 +0000 (08:42 +0000)]
Merge "remove "polling" from OpenflowPluginDiagStatusProvider"

5 years agoMerge "OPNFLWPLUG-1046 : Migrate OFP from XML to annotation based blueprint"
Arunprakash D [Fri, 14 Dec 2018 04:34:17 +0000 (04:34 +0000)]
Merge "OPNFLWPLUG-1046 : Migrate OFP from XML to annotation based blueprint"

5 years agoMerge "OPNFLWPLUG-1046 : Migrate OFP from XML to annotation based blueprint"
Arunprakash D [Fri, 14 Dec 2018 04:33:45 +0000 (04:33 +0000)]
Merge "OPNFLWPLUG-1046 : Migrate OFP from XML to annotation based blueprint"

5 years agoMerge "OPNFLWPLUG-1046 : Migrate OFP from XML to annotation based blueprint"
Arunprakash D [Fri, 14 Dec 2018 04:33:14 +0000 (04:33 +0000)]
Merge "OPNFLWPLUG-1046 : Migrate OFP from XML to annotation based blueprint"

5 years agoReplace GroupingResolver with AugmentationGroupingResolver 52/77852/13
Robert Varga [Thu, 15 Nov 2018 13:46:09 +0000 (14:46 +0100)]
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>
5 years agoremove "polling" from OpenflowPluginDiagStatusProvider 77/78277/4
Michael Vorburger [Wed, 28 Nov 2018 23:04:36 +0000 (00:04 +0100)]
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>
5 years agoOPNFLWPLUG-1046 : Migrate OFP from XML to annotation based blueprint 60/78160/4
gobinath [Mon, 26 Nov 2018 12:05:46 +0000 (17:35 +0530)]
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>
5 years agoOPNFLWPLUG-1046 : Migrate OFP from XML to annotation based blueprint 62/78162/3
gobinath [Mon, 26 Nov 2018 15:08:16 +0000 (20:38 +0530)]
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>
5 years agoMerge "Change channel outbound queue size log level"
Arunprakash D [Mon, 10 Dec 2018 05:10:56 +0000 (05:10 +0000)]
Merge "Change channel outbound queue size log level"

5 years agoOPNFLWPLUG-1046 : Migrate OFP from XML to annotation based blueprint 64/78164/5
gobinath [Mon, 26 Nov 2018 15:40:16 +0000 (21:10 +0530)]
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>
5 years agoOPNFLWPLUG-1039: adding switch idle event registration at the end of 99/78199/3
Somashekhar Javalagi [Tue, 27 Nov 2018 09:50:29 +0000 (15:20 +0530)]
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>
5 years agoMerge "switch from FindBugs to SpotBugs"
Arunprakash D [Wed, 5 Dec 2018 16:00:32 +0000 (16:00 +0000)]
Merge "switch from FindBugs to SpotBugs"

5 years agoMerge "Bump to mdsal-3.0.2"
Anil Belur [Sat, 1 Dec 2018 10:20:39 +0000 (10:20 +0000)]
Merge "Bump to mdsal-3.0.2"

5 years agoChange channel outbound queue size log level 66/78266/3
Tim Rozet [Wed, 28 Nov 2018 15:20:26 +0000 (10:20 -0500)]
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>
5 years agoMerge "OPNFLWPLUG-1046 : Migrate OFP from XML to annotation based blueprint"
Arunprakash D [Thu, 29 Nov 2018 10:59:55 +0000 (10:59 +0000)]
Merge "OPNFLWPLUG-1046 : Migrate OFP from XML to annotation based blueprint"

5 years agoOPNFLWPLUG-1046 : Migrate OFP from XML to annotation based blueprint 85/78085/4
gobinath [Fri, 23 Nov 2018 10:04:45 +0000 (15:34 +0530)]
OPNFLWPLUG-1046 : Migrate OFP from XML to annotation based blueprint

Change-Id: Ib688df616d3f89b61663b78e6d2156cc50b4521d
Signed-off-by: gobinath <gobinath@ericsson.com>
5 years agoMerge "OPNFLWPLUG-1046 : Migrate OFP from XML to annotation based blueprint"
Arunprakash D [Wed, 28 Nov 2018 05:46:14 +0000 (05:46 +0000)]
Merge "OPNFLWPLUG-1046 : Migrate OFP from XML to annotation based blueprint"

5 years agoBump to mdsal-3.0.2 48/78148/2
Robert Varga [Mon, 26 Nov 2018 09:27:15 +0000 (10:27 +0100)]
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>
5 years agoLog the address and port when binding fails 12/78212/2
Stephen Kitt [Tue, 27 Nov 2018 15:07:09 +0000 (16:07 +0100)]
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>
5 years agoOPNFLWPLUG-1046 : Migrate OFP from XML to annotation based blueprint 89/78189/1
gobinath [Tue, 27 Nov 2018 05:56:35 +0000 (11:26 +0530)]
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>
5 years agoMerge "replace @SuppressFBWarnings with LoggingFutures"
Arunprakash D [Tue, 27 Nov 2018 05:38:04 +0000 (05:38 +0000)]
Merge "replace @SuppressFBWarnings with LoggingFutures"

5 years agoswitch from FindBugs to SpotBugs 02/77802/10
Michael Vorburger [Wed, 14 Nov 2018 18:28:08 +0000 (19:28 +0100)]
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>
5 years agoOPNFLWPLUG-1046 : Migrate OFP from XML to annotation based blueprint 40/77640/14
gobinath [Fri, 9 Nov 2018 06:08:10 +0000 (11:38 +0530)]
OPNFLWPLUG-1046 : Migrate OFP from XML to annotation based blueprint

JIRA: OPNFLWPLUG-1046
Change-Id: Id0387d4273e0566d2bebc75a471c6147c93b1eca
Signed-off-by: gobinath <gobinath@ericsson.com>
5 years agoMerge "Change log level for noisy disconnect log"
Arunprakash D [Mon, 26 Nov 2018 06:33:49 +0000 (06:33 +0000)]
Merge "Change log level for noisy disconnect log"

5 years agoMerge "Simplify lambdas"
Arunprakash D [Thu, 22 Nov 2018 06:31:08 +0000 (06:31 +0000)]
Merge "Simplify lambdas"

5 years agoMerge "Unwrap Optionals"
Arunprakash D [Wed, 21 Nov 2018 05:17:39 +0000 (05:17 +0000)]
Merge "Unwrap Optionals"

5 years agoSimplify lambdas 81/77981/2
Stephen Kitt [Tue, 20 Nov 2018 13:16:08 +0000 (14:16 +0100)]
Simplify lambdas

... where it makes the code more readable.

Change-Id: I96f312601e9619b7f5186f00c3e759d0faebcf84
Signed-off-by: Stephen Kitt <skitt@redhat.com>
5 years agoChange log level for noisy disconnect log 91/77991/1
Victor Pickard [Tue, 20 Nov 2018 16:06:13 +0000 (11:06 -0500)]
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>
5 years agominor clean-up of left-over un-used @Inject 00/77900/3
Michael Vorburger [Fri, 16 Nov 2018 14:00:18 +0000 (15:00 +0100)]
minor clean-up of left-over un-used @Inject

Change-Id: Ibe641924f78bd5a00c93f1e07069f838ca7b0637
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
5 years agoMerge "Use List instead of SortedMap for scenario events"
Arunprakash D [Mon, 19 Nov 2018 15:22:34 +0000 (15:22 +0000)]
Merge "Use List instead of SortedMap for scenario events"

5 years agoMerge "improve fixed incorrect Future usage in (Bundle)FlowForwarder"
Arunprakash D [Mon, 19 Nov 2018 15:21:17 +0000 (15:21 +0000)]
Merge "improve fixed incorrect Future usage in (Bundle)FlowForwarder"

5 years agoMerge "Log Future failure in NodeConfiguratorImpl"
Arunprakash D [Mon, 19 Nov 2018 15:20:03 +0000 (15:20 +0000)]
Merge "Log Future failure in NodeConfiguratorImpl"

5 years agoMerge "fix incorrect Future usage in (Bundle)FlowForwarder"
Arunprakash D [Mon, 19 Nov 2018 15:19:32 +0000 (15:19 +0000)]
Merge "fix incorrect Future usage in (Bundle)FlowForwarder"

5 years agoUnwrap Optionals 39/77939/1
Stephen Kitt [Mon, 19 Nov 2018 12:10:41 +0000 (13:10 +0100)]
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>
5 years agoUse List instead of SortedMap for scenario events 33/77933/2
Stephen Kitt [Mon, 19 Nov 2018 10:11:01 +0000 (11:11 +0100)]
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>
5 years agoreplace @SuppressFBWarnings with LoggingFutures 96/77896/3
Michael Vorburger [Fri, 16 Nov 2018 12:27:07 +0000 (13:27 +0100)]
replace @SuppressFBWarnings with LoggingFutures

Change-Id: If1f8eb290124a10da594a52be5db5713d54edf5b
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
5 years agoLog Future failure in NodeConfiguratorImpl 05/77905/1
Tom Pantelis [Fri, 16 Nov 2018 18:31:56 +0000 (13:31 -0500)]
Log Future failure in NodeConfiguratorImpl

Change-Id: I1f9ed198bfe450adb0b4189f6a9bc6b9d2ac8317
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
5 years agoMerge "Use QueuedNotificationManager to dispatch tasks"
Arunprakash D [Fri, 16 Nov 2018 17:05:06 +0000 (17:05 +0000)]
Merge "Use QueuedNotificationManager to dispatch tasks"

5 years agoimprove fixed incorrect Future usage in (Bundle)FlowForwarder 98/77898/1
Michael Vorburger [Fri, 16 Nov 2018 13:00:37 +0000 (14:00 +0100)]
improve fixed incorrect Future usage in (Bundle)FlowForwarder

Change-Id: I2dbbca1b35623c88a980aacc0a94b897f999904a
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
5 years agofix incorrect Future usage in (Bundle)FlowForwarder 59/77859/3
Tom Pantelis [Thu, 15 Nov 2018 15:18:06 +0000 (10:18 -0500)]
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>
5 years agore-activate FindBugs 96/77796/11
Michael Vorburger [Wed, 14 Nov 2018 14:48:00 +0000 (15:48 +0100)]
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>
5 years agoMerge "git rid of Blueprint openflowplugin.xml"
Arunprakash D [Thu, 15 Nov 2018 12:39:08 +0000 (12:39 +0000)]
Merge "git rid of Blueprint openflowplugin.xml"

5 years agoMerge "drop 'openflow-plugin-provider-impl' odl:type"
Arunprakash D [Thu, 15 Nov 2018 12:28:32 +0000 (12:28 +0000)]
Merge "drop 'openflow-plugin-provider-impl' odl:type"

5 years agoMerge "use annotations instead XML for BP in protocol-impl"
Arunprakash D [Thu, 15 Nov 2018 12:28:01 +0000 (12:28 +0000)]
Merge "use annotations instead XML for BP in protocol-impl"

5 years agoMerge "avoid <bean factory-ref/method> in lldp-speaker's BP XML"
Arunprakash D [Thu, 15 Nov 2018 12:25:32 +0000 (12:25 +0000)]
Merge "avoid <bean factory-ref/method> in lldp-speaker's BP XML"

5 years agoMerge "use annotations instead XML for BP in impl"
Arunprakash D [Thu, 15 Nov 2018 12:24:05 +0000 (12:24 +0000)]
Merge "use annotations instead XML for BP in impl"

5 years agoMerge "fix ArbitratorReconciliationManagerImpl endReconciliation() remove"
Arunprakash D [Thu, 15 Nov 2018 03:29:43 +0000 (03:29 +0000)]
Merge "fix ArbitratorReconciliationManagerImpl endReconciliation() remove"

5 years agofix ArbitratorReconciliationManagerImpl endReconciliation() remove 33/77833/1
Michael Vorburger [Thu, 15 Nov 2018 02:05:29 +0000 (03:05 +0100)]
fix ArbitratorReconciliationManagerImpl endReconciliation() remove

JIRA: OPNFLWPLUG-1048
Change-Id: If26656fa6f65d04435c94c0b7258144f45dc989e
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
5 years agogit rid of Blueprint openflowplugin.xml 32/77832/2
Michael Vorburger [Thu, 15 Nov 2018 00:38:06 +0000 (01:38 +0100)]
git rid of Blueprint openflowplugin.xml

JIRA: OPNFLWPLUG-1046
Change-Id: Icc6a06cba34e45a81bc5d0161bdc532a4b4012f4
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
5 years agodrop 'openflow-plugin-provider-impl' odl:type 27/77827/2
Michael Vorburger [Wed, 14 Nov 2018 21:52:34 +0000 (22:52 +0100)]
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>
5 years agouse annotations instead XML for BP in protocol-impl 23/77823/2
Michael Vorburger [Wed, 14 Nov 2018 21:12:19 +0000 (22:12 +0100)]
use annotations instead XML for BP in protocol-impl

JIRA: OPNFLWPLUG-1046
Change-Id: I96e492a39cca871600de325ac45ae1376e4a3c2e
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
5 years agouse annotations instead XML for BP in impl 00/77800/2
Michael Vorburger [Wed, 14 Nov 2018 16:15:14 +0000 (17:15 +0100)]
use annotations instead XML for BP in impl

JIRA: OPNFLWPLUG-1046
Change-Id: Idd8004a4aaac25c40fa7ec15beb1083115b0236a
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
5 years agoavoid <bean factory-ref/method> in lldp-speaker's BP XML 12/77812/2
Michael Vorburger [Wed, 14 Nov 2018 18:40:13 +0000 (19:40 +0100)]
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>
5 years agomv BP XML from org/opendaylight to OSGI-INF/ 08/77008/6
gobinath [Mon, 15 Oct 2018 17:07:58 +0000 (22:37 +0530)]
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>
5 years agoMerge "use annotations instead of XML for blueprint"
Anil Vishnoi [Wed, 14 Nov 2018 11:25:24 +0000 (11:25 +0000)]
Merge "use annotations instead of XML for blueprint"

5 years agoUse QueuedNotificationManager to dispatch tasks 32/77732/3
Robert Varga [Tue, 13 Nov 2018 16:07:40 +0000 (17:07 +0100)]
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>
5 years agoFix raw types in NodeConfiguratorImpl 31/77731/3
Robert Varga [Tue, 13 Nov 2018 15:55:19 +0000 (16:55 +0100)]
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>
5 years agouse annotations instead of XML for blueprint 86/77386/3
Michael Vorburger [Wed, 31 Oct 2018 17:50:04 +0000 (18:50 +0100)]
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>
5 years agoClose ReadTransactions 58/77458/1
Stephen Kitt [Fri, 2 Nov 2018 15:41:37 +0000 (16:41 +0100)]
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>
5 years agoClose ReadTransactions from ForwardingRulesManager 57/77457/1
Stephen Kitt [Fri, 2 Nov 2018 15:16:08 +0000 (16:16 +0100)]
Close ReadTransactions from ForwardingRulesManager

Change-Id: If8c644312ed6fd0ff76221ce2dc49ae61fda72de
JIRA: OPNFLWPLUG-1043
Signed-off-by: Stephen Kitt <skitt@redhat.com>
5 years agoOPNFLWPLUG-1032: Neon-MRI: Bump odlparent, yangtools, mdsal 36/76236/27
gobinath [Wed, 19 Sep 2018 06:05:49 +0000 (11:35 +0530)]
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>
5 years agoMerge "make ConfigurationServiceFactoryImpl independent of OSGi"
Arunprakash D [Thu, 11 Oct 2018 10:35:01 +0000 (10:35 +0000)]
Merge "make ConfigurationServiceFactoryImpl independent of OSGi"

5 years agoOPNFLWPLUG-1034 10/76210/2
gobinath [Tue, 18 Sep 2018 11:46:40 +0000 (17:16 +0530)]
OPNFLWPLUG-1034

Change-Id: I7339e8a0a5cbed0d8a70def3628a4117698113f1
Signed-off-by: gobinath <gobinath@ericsson.com>
5 years agomake ConfigurationServiceFactoryImpl independent of OSGi 88/76588/2
Michael Vorburger [Wed, 3 Oct 2018 00:33:37 +0000 (02:33 +0200)]
make ConfigurationServiceFactoryImpl independent of OSGi

so that it can be used in a standalone / JavaSE environment such as
https://github.com/vorburger/opendaylight-simple (or
https://www.lighty.io)

JIRA: OPNFLWPLUG-1037
Change-Id: I2ff54e8d9324b78ee4b0e28485f5bb40e7e40c70
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
5 years agoRefactoring the code for updating the reconciliation state 35/76435/2
eeiillu [Tue, 25 Sep 2018 08:56:04 +0000 (14:26 +0530)]
Refactoring the code for updating the reconciliation state
in the datastore during all scenarios.

Change-Id: Ia25d98053f9157101cf6684371a36696cd01d4d9
Signed-off-by: eeiillu <suja.t@ericsson.com>
5 years agoFix old odlparent dependency 24/76324/1
Stephen Kitt [Fri, 21 Sep 2018 09:01:25 +0000 (11:01 +0200)]
Fix old odlparent dependency

There was still a dependency on odlparent 3.1.2, switch that to
3.1.3.

Change-Id: I3e791d3583394026dc3b00ddb6e70eaeac8730fa
Signed-off-by: Stephen Kitt <skitt@redhat.com>
5 years agoOPNFLWPLUG-1033: Fix for StackOverflowError while stopping 09/76209/3
Somashekhar Javalagi [Tue, 18 Sep 2018 11:18:21 +0000 (16:48 +0530)]
OPNFLWPLUG-1033: Fix for StackOverflowError while stopping
forwardingrules-manager bundle

Root cause: DeviceMastershipManager will be registering to
MastershipChangeServiceManager and MastershipServiceDelegate will be
created, which will be adding DeviceMastershipManager service to
serviceGroup. But at the time of stopping forwardingrules-manager bundle
DeviceMastershipManager is trying to close MastershipServiceDelegate
registration, which in turn was trying to close the service which
created it, causing StackOverflowError.

Solution: Just removing DeviceMastershipManager from service group
while closing MastershipServiceDelegate registration and not closing the
service by registration.

Change-Id: I12609460a9a05e0d443822845582301a6eff9bf5
Signed-off-by: Somashekhar Javalagi <somashekhar.manohara.javalagi@ericsson.com>
5 years agoOPNFLWPLUG-1030: Documentation for the device connection rate limiting feature 71/75471/12
Somashekhar Javalagi [Fri, 24 Aug 2018 10:30:15 +0000 (16:00 +0530)]
OPNFLWPLUG-1030: Documentation for the device connection rate limiting feature

Change-Id: Iac21e974a71e4402ec6895042ebd2b0563987bd7
Signed-off-by: Somashekhar Javalagi <somashekhar.manohara.javalagi@ericsson.com>
5 years agoMerge "Exception while topology-manager writes flow:1 root node to operational datast...
Arunprakash D [Fri, 31 Aug 2018 06:18:17 +0000 (06:18 +0000)]
Merge "Exception while topology-manager writes flow:1 root node to operational datastore. In the clustered environment when all the 3 node comes up, all the three instances of topology-manager tries to write flow:1 node to the operational datastore that results in the OptimisticsLockFailedException. This patch fixes the issue by making Topology-Manager initialization cluster aware, so only selected instance will write the root node."

5 years agoAdd user and dev docs for Fluorine 38/75538/1
Luis Gomez [Tue, 28 Aug 2018 01:56:11 +0000 (18:56 -0700)]
Add user and dev docs for Fluorine

Change-Id: Ie279ee0a8c2f76599245bdd6b644b48c2a704d23
Signed-off-by: Luis Gomez <ecelgp@gmail.com>
5 years agoEliminate reference to nagasena 50/75450/1
Robert Varga [Thu, 23 Aug 2018 23:25:34 +0000 (01:25 +0200)]
Eliminate reference to nagasena

We no longer are using this EXI implementation, no need to pull
it in.

Change-Id: Ife88b24f83bea4d5a01e3e84275f6e28ef49af93
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
5 years agoEliminate reference to exam.version 49/75449/1
Robert Varga [Thu, 23 Aug 2018 23:24:41 +0000 (01:24 +0200)]
Eliminate reference to exam.version

odlparent already declares these artifacts, reuse scope/version.

Change-Id: I678a6af5c6b7324f1a05e4534218e58107e02e29
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
5 years agoException while topology-manager writes flow:1 43/75343/1
Anil Vishnoi [Mon, 20 Aug 2018 23:59:08 +0000 (16:59 -0700)]
Exception while topology-manager writes flow:1
root node to operational datastore.
In the clustered environment when all the 3 node
comes up, all the three instances of topology-manager
tries to write flow:1 node to the operational datastore
that results in the OptimisticsLockFailedException.
This patch fixes the issue by making Topology-Manager
initialization cluster aware, so only selected instance
will write the root node.

JIRA: OPNFLWPLUG-1022

Change-Id: Ib1a74ad44c054f9b704771aae627fe237ba889fe
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
5 years agoFix Stack overflow errors in OFP while killing karaf 25/75225/3
gobinath [Thu, 16 Aug 2018 11:43:48 +0000 (17:13 +0530)]
Fix Stack overflow errors in OFP while killing karaf

The reconciliation framework returns "NotificationRegistration" which
would be used by the registering applications to unregister by calling
close() on it. The close() in NotificationRegistration was in turn again
trying to call close() of the registered applications which resulted in
infinite recursion leading to stack overflow.

Change-Id: Ib7932c2365dc373be4e953282786e8829929869d
Signed-off-by: gobinath <gobinath@ericsson.com>
5 years agoJIRA: OPNFLWPLUG-1028 Fix for Table Miss Entry failed to program in 3 node netvirt... 07/74907/2
Somashekhar Javalagi [Tue, 7 Aug 2018 09:38:25 +0000 (15:08 +0530)]
JIRA: OPNFLWPLUG-1028 Fix for Table Miss Entry failed to program in 3 node netvirt CSIT issue

After openflowplugin-impl choosing the nodeOwner, it was publishing the
Master role to the forwardingrules-manager through yang notification, at
the same time, node information is written to the operational datastore.

Post node information written to operational datastore, applications
immediately start pushing the flows to forwardingrules-manager, by that
time yang notification was failing to reach forwardingrules-manager.
Which was causing the dealy in proving the mastership and consequesnt
flows were getting rejected.

Making DeviceMastershipManager to register for MastershipChangeService,
so that it can quickly set master role before any flow arrives

Change-Id: I4c2eaefd52d91875fb5234620c8fb5d82e8f2da4
Signed-off-by: Somashekhar Javalagi <somashekhar.manohara.javalagi@ericsson.com>
5 years agoMerge "Enhancement activity in admin reconciliation for handling consecutive triggeri...
Arunprakash D [Tue, 14 Aug 2018 08:26:04 +0000 (08:26 +0000)]
Merge "Enhancement activity in admin reconciliation for handling consecutive triggering of same node"

5 years agoMerge "OPNFLWPLUG-1004 : Spec arbitrator reconciliation"
Anil Vishnoi [Mon, 13 Aug 2018 16:27:48 +0000 (16:27 +0000)]
Merge "OPNFLWPLUG-1004 : Spec  arbitrator reconciliation"

5 years agoRemove references to mdsal-model-artifacts 17/75117/2
Robert Varga [Sat, 11 Aug 2018 07:30:16 +0000 (09:30 +0200)]
Remove references to mdsal-model-artifacts

This artifact is going away, migrate to mdsal-artifacts.

Change-Id: I50c94c324e01cbf009cda5e625a194a475b93884
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
5 years agoRemove unneeded reference to odlparent-artifacts 16/75116/1
Robert Varga [Sat, 11 Aug 2018 07:28:46 +0000 (09:28 +0200)]
Remove unneeded reference to odlparent-artifacts

This is already included in single-feature-parent, no need to
repeat it.

Change-Id: I996caecd2a484491a3bfa2e6881b2f57a01b91af
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
5 years agoBump versions by x.(y+1).z for next dev cycle 98/74998/1
Anil Belur [Thu, 9 Aug 2018 12:40:15 +0000 (18:10 +0530)]
Bump versions by x.(y+1).z for next dev cycle

Change-Id: If8f45f7b0838ad8572e0c2da72452fb226d6d3be
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
5 years agoEnhancement activity in admin reconciliation for handling consecutive 57/74557/16
eeiillu [Fri, 27 Jul 2018 07:03:32 +0000 (12:33 +0530)]
Enhancement activity in admin reconciliation for handling consecutive
triggering of same node

Change-Id: I4145f85faab738a4c81f0a2dd22d71890c70c133
Signed-off-by: eeiillu <suja.t@ericsson.com>
5 years agoOPNFLWPLUG-1004 : Spec arbitrator reconciliation 96/71096/8
D Arunprakash [Thu, 19 Apr 2018 06:46:06 +0000 (12:16 +0530)]
OPNFLWPLUG-1004 : Spec  arbitrator reconciliation

Implementation sketch for arbitrator reconciliation
for replay based controller upgrade

Change-Id: I1e7468c877e87c79dddee3276ebb9f164cbd52ea
Signed-off-by: D Arunprakash <d.arunprakash@ericsson.com>
5 years agoMerge "OPNFLWPLUG-1005 : Implementation of arbitrator reconciliation(frm changes)"
Arunprakash D [Tue, 7 Aug 2018 11:23:14 +0000 (11:23 +0000)]
Merge "OPNFLWPLUG-1005 : Implementation of arbitrator reconciliation(frm changes)"

5 years agoMerge "OPNFLWPLUG-999 Spec - Reconciliation CLI and alarm for openflow nodes"
Anil Vishnoi [Tue, 7 Aug 2018 09:11:06 +0000 (09:11 +0000)]
Merge "OPNFLWPLUG-999 Spec - Reconciliation CLI and alarm for openflow nodes"

5 years agoOPNFLWPLUG-1005 : Implementation of arbitrator reconciliation(frm changes) 90/71090/28
gobinath [Wed, 18 Apr 2018 20:16:49 +0000 (01:46 +0530)]
OPNFLWPLUG-1005 : Implementation of arbitrator reconciliation(frm changes)

This patch adds new forwarder types BundleFlowForwarder and
BundleGroupForwarder which would would be used to push the flows during
the upgrade process.

Change-Id: I7681019236aa5674c6242e39b967fda9757913b1
Signed-off-by: gobinath <gobinath@ericsson.com>
5 years agoOPNFLWPLUG-999 Spec - Reconciliation CLI and alarm for openflow nodes 97/71097/13
D Arunprakash [Thu, 19 Apr 2018 06:48:27 +0000 (12:18 +0530)]
OPNFLWPLUG-999 Spec - Reconciliation CLI and alarm for openflow nodes

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