Unblock the Aluminium Auto relase from Netvirt project

Issue:
=====
Due to recent changes in GENIUS resource batching manager
modules[0] netvirt build is getting failed sue to absence
of new changes in netvirt project.

[0]https://git.opendaylight.org/gerrit/c/genius/+/85415

Jenkins Build:
https://jenkins.opendaylight.org/releng/job/autorelease-release-aluminium-mvn35-openjdk11/163/

Solution:
========
Have changed the appropriate fix to solve this issue from
netvirt application side.

Old Code:
Change-Id: I7579a6474c9e6b21f28090af3010f727fd1f3ebf
---------
BlockingQueue<ActionableResource>

New Code:
---------
BlockingQueue<ActionableResource<?>>

Change-Id: Icbd6716cf051180da35517aa3df5b9bb3df071f8
Signed-off-by: Karthikeyan Krishnan <karthikeyangceb007@gmail.com>

diff --git a/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/BgpUtil.java b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/BgpUtil.java
index 9c043cef101e9994335409e83fc1ddc588a287a3..3d72b6f4675e9fa07f97fa911a5dd3fe576f2d45 100755 (executable)
--- a/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/BgpUtil.java
+++ b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/BgpUtil.java
@@ -89,7 +89,7 @@ public class BgpUtil implements AutoCloseable {
     private final IFibManager fibManager;
 
 
-    private final BlockingQueue<ActionableResource> bgpResourcesBufferQ = new LinkedBlockingQueue<>();
+    private final BlockingQueue<ActionableResource<?>> bgpResourcesBufferQ = new LinkedBlockingQueue<>();
 
     @Inject
     public BgpUtil(DataBroker dataBroker, final IFibManager fibManager) {

diff --git a/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/BgpRouteVrfEntryHandler.java b/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/BgpRouteVrfEntryHandler.java
index 1f1463246ef68dbb31b4001cb0c87acbe0d6b449..4b012fdc68de58c9ee9937b74d7219b925adb5c8 100644 (file)
--- a/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/BgpRouteVrfEntryHandler.java
+++ b/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/BgpRouteVrfEntryHandler.java
@@ -109,7 +109,7 @@ public class BgpRouteVrfEntryHandler extends BaseVrfEntryHandler implements Reso
 
     private final DataBroker dataBroker;
     private final ManagedNewTransactionRunner txRunner;
-    private final BlockingQueue<ActionableResource> vrfEntryBufferQ = new LinkedBlockingQueue<>();
+    private final BlockingQueue<ActionableResource<?>> vrfEntryBufferQ = new LinkedBlockingQueue<>();
     private final ResourceBatchingManager resourceBatchingManager;
     private final NexthopManager nexthopManager;