MRI version bumpup for Aluminium

[netvirt.git] / neutronvpn / impl / src / main / java / org / opendaylight / netvirt / neutronvpn / NeutronRouterChangeListener.java

diff --git a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronRouterChangeListener.java b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronRouterChangeListener.java
index c4ab008f7471b8a1fbdd6042279dadd6ab3146fc..0473f7f52afa54cc94eadefc20d872b63d786a15 100644 (file)
--- a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronRouterChangeListener.java
+++ b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronRouterChangeListener.java
@@ -7,20 +7,21 @@
  */
 package org.opendaylight.netvirt.neutronvpn;
 
-import com.google.common.base.Optional;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
-import javax.annotation.PostConstruct;
+import java.util.Optional;
+import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import javax.inject.Singleton;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.genius.datastoreutils.AsyncDataTreeChangeListenerBase;
 import org.opendaylight.genius.mdsalutil.NwConstants;
 import org.opendaylight.infrautils.jobcoordinator.JobCoordinator;
+import org.opendaylight.infrautils.utils.concurrent.Executors;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
+import org.opendaylight.serviceutils.tools.listener.AbstractAsyncDataTreeChangeListener;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.l3.rev150712.l3.attributes.Routes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.l3.rev150712.routers.attributes.Routers;
@@ -34,7 +35,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @Singleton
-public class NeutronRouterChangeListener extends AsyncDataTreeChangeListenerBase<Router, NeutronRouterChangeListener> {
+public class NeutronRouterChangeListener extends AbstractAsyncDataTreeChangeListener<Router> {
     private static final Logger LOG = LoggerFactory.getLogger(NeutronRouterChangeListener.class);
     private final DataBroker dataBroker;
     private final NeutronvpnManager nvpnManager;
@@ -49,7 +50,9 @@ public class NeutronRouterChangeListener extends AsyncDataTreeChangeListenerBase
                                        final NeutronSubnetGwMacResolver gwMacResolver,
                                        final NeutronvpnUtils neutronvpnUtils,
                                        final JobCoordinator jobCoordinator) {
-        super(Router.class, NeutronRouterChangeListener.class);
+        super(dataBroker, LogicalDatastoreType.CONFIGURATION, InstanceIdentifier.create(Neutron.class)
+                .child(Routers.class).child(Router.class),
+                Executors.newSingleThreadExecutor("NeutronRouterChangeListener", LOG));
         this.dataBroker = dataBroker;
         nvpnManager = neutronvpnManager;
         nvpnNatManager = neutronvpnNatManager;
@@ -58,26 +61,19 @@ public class NeutronRouterChangeListener extends AsyncDataTreeChangeListenerBase
         this.jobCoordinator = jobCoordinator;
     }
 
-    @Override
-    @PostConstruct
     public void init() {
         LOG.info("{} init", getClass().getSimpleName());
-        registerListener(LogicalDatastoreType.CONFIGURATION, dataBroker);
     }
 
     @Override
-    protected InstanceIdentifier<Router> getWildCardPath() {
-        return InstanceIdentifier.create(Neutron.class).child(Routers.class).child(Router.class);
+    @PreDestroy
+    public void close() {
+        super.close();
+        Executors.shutdownAndAwaitTermination(getExecutorService());
     }
 
     @Override
-    protected NeutronRouterChangeListener getDataTreeChangeListener() {
-        return NeutronRouterChangeListener.this;
-    }
-
-
-    @Override
-    protected void add(InstanceIdentifier<Router> identifier, Router input) {
+    public void add(InstanceIdentifier<Router> identifier, Router input) {
         LOG.trace("Adding Router : key: {}, value={}", identifier, input);
         neutronvpnUtils.addToRouterCache(input);
         // Create internal VPN
@@ -90,7 +86,7 @@ public class NeutronRouterChangeListener extends AsyncDataTreeChangeListenerBase
     }
 
     @Override
-    protected void remove(InstanceIdentifier<Router> identifier, Router input) {
+    public void remove(InstanceIdentifier<Router> identifier, Router input) {
         LOG.trace("Removing router : key: {}, value={}", identifier, input);
         Uuid routerId = input.getUuid();
         // Handle router deletion for the NAT service
@@ -98,7 +94,8 @@ public class NeutronRouterChangeListener extends AsyncDataTreeChangeListenerBase
         on vpn operational data to release Lport tag in case of L3VPN over VxLAN*/
         if (input.getExternalGatewayInfo() != null) {
             Uuid extNetId = input.getExternalGatewayInfo().getExternalNetworkId();
-            List<ExternalFixedIps> externalFixedIps = input.getExternalGatewayInfo().getExternalFixedIps();
+            List<ExternalFixedIps> externalFixedIps
+                    = new ArrayList<ExternalFixedIps>(input.getExternalGatewayInfo().getExternalFixedIps().values());
             jobCoordinator.enqueueJob(input.getUuid().toString(), () -> {
                 nvpnNatManager.removeExternalNetworkFromRouter(extNetId, input, externalFixedIps);
                 return Collections.emptyList();
@@ -114,7 +111,7 @@ public class NeutronRouterChangeListener extends AsyncDataTreeChangeListenerBase
     }
 
     @Override
-    protected void update(InstanceIdentifier<Router> identifier, Router original, Router update) {
+    public void update(InstanceIdentifier<Router> identifier, Router original, Router update) {
         LOG.trace("Updating Router : key: {}, original value={}, update value={}", identifier, original, update);
         neutronvpnUtils.addToRouterCache(update);
         Uuid routerId = update.getUuid();
@@ -124,8 +121,8 @@ public class NeutronRouterChangeListener extends AsyncDataTreeChangeListenerBase
         if (vpnId == null) {
             vpnId = routerId;
         }
-        List<Routes> oldRoutes = original.getRoutes() != null ? original.getRoutes() : new ArrayList<>();
-        List<Routes> newRoutes = update.getRoutes() != null ? update.getRoutes() : new ArrayList<>();
+        List<Routes> oldRoutes = new ArrayList<>(original.nonnullRoutes().values());
+        List<Routes> newRoutes = new ArrayList<>(update.nonnullRoutes().values());
         if (!oldRoutes.equals(newRoutes)) {
             Iterator<Routes> iterator = newRoutes.iterator();
             while (iterator.hasNext()) {