NETVIRT-1630 migrate to md-sal APIs

[netvirt.git] / natservice / impl / src / main / java / org / opendaylight / netvirt / natservice / internal / SnatExternalRoutersListener.java

diff --git a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/SnatExternalRoutersListener.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/SnatExternalRoutersListener.java
index 2be87f8a1af9b9e46fd835c84394dc49efaf9ff7..73013b7ae27984d75a4c71e937351a8bb0ab200c 100644 (file)
--- a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/SnatExternalRoutersListener.java
+++ b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/SnatExternalRoutersListener.java
@@ -10,18 +10,18 @@ package org.opendaylight.netvirt.natservice.internal;
 import static org.opendaylight.genius.infra.Datastore.CONFIGURATION;
 
 import java.util.Objects;
-
-import javax.annotation.PostConstruct;
+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.infra.ManagedNewTransactionRunner;
 import org.opendaylight.genius.infra.ManagedNewTransactionRunnerImpl;
+import org.opendaylight.infrautils.utils.concurrent.Executors;
 import org.opendaylight.infrautils.utils.concurrent.ListenableFutures;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.netvirt.natservice.api.CentralizedSwitchScheduler;
 import org.opendaylight.netvirt.natservice.api.SnatServiceManager;
+import org.opendaylight.serviceutils.tools.listener.AbstractAsyncDataTreeChangeListener;
 import org.opendaylight.serviceutils.upgrade.UpgradeState;
 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.genius.idmanager.rev160406.IdManagerService;
@@ -35,7 +35,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @Singleton
-public class SnatExternalRoutersListener extends AsyncDataTreeChangeListenerBase<Routers, SnatExternalRoutersListener> {
+public class SnatExternalRoutersListener extends AbstractAsyncDataTreeChangeListener<Routers> {
     private static final Logger LOG = LoggerFactory.getLogger(SnatExternalRoutersListener.class);
 
     private final DataBroker dataBroker;
@@ -53,7 +53,9 @@ public class SnatExternalRoutersListener extends AsyncDataTreeChangeListenerBase
                                        final NatserviceConfig config,
                                        final SnatServiceManager natServiceManager,
                                        final UpgradeState upgradeState) {
-        super(Routers.class, SnatExternalRoutersListener.class);
+        super(dataBroker, LogicalDatastoreType.CONFIGURATION, InstanceIdentifier.create(ExtRouters.class)
+                .child(Routers.class),
+                Executors.newListeningSingleThreadExecutor("SnatExternalRoutersListener", LOG));
         this.dataBroker = dataBroker;
         this.txRunner = new ManagedNewTransactionRunnerImpl(dataBroker);
         this.idManager = idManager;
@@ -65,28 +67,31 @@ public class SnatExternalRoutersListener extends AsyncDataTreeChangeListenerBase
         } else {
             this.natMode = NatMode.Conntrack;
         }
+        init();
     }
 
-    @Override
-    @PostConstruct
     public void init() {
         LOG.info("{} init", getClass().getSimpleName());
         // This class handles ExternalRouters for Conntrack SNAT mode.
         // For Controller SNAT mode, its handled in ExternalRoutersListeners.java
         if (natMode == NatMode.Conntrack) {
-            registerListener(LogicalDatastoreType.CONFIGURATION, dataBroker);
             NatUtil.createGroupIdPool(idManager);
         }
     }
 
     @Override
-    protected InstanceIdentifier<Routers> getWildCardPath() {
-        return InstanceIdentifier.create(ExtRouters.class).child(Routers.class);
+    @PreDestroy
+    public void close() {
+        super.close();
+        Executors.shutdownAndAwaitTermination(getExecutorService());
     }
 
     @Override
     @SuppressWarnings("checkstyle:IllegalCatch")
-    protected void add(InstanceIdentifier<Routers> identifier, Routers routers) {
+    public void add(InstanceIdentifier<Routers> identifier, Routers routers) {
+        if (natMode != NatMode.Conntrack) {
+            return;
+        }
         String routerName = routers.getRouterName();
         if (upgradeState.isUpgradeInProgress()) {
             LOG.warn("add event for ext-router {}, but upgrade is in progress.", routerName);
@@ -106,7 +111,10 @@ public class SnatExternalRoutersListener extends AsyncDataTreeChangeListenerBase
     }
 
     @Override
-    protected void update(InstanceIdentifier<Routers> identifier, Routers original, Routers update) {
+    public void update(InstanceIdentifier<Routers> identifier, Routers original, Routers update) {
+        if (natMode != NatMode.Conntrack) {
+            return;
+        }
         String routerName = original.getRouterName();
         Uint32 routerId = NatUtil.getVpnId(dataBroker, routerName);
         if (routerId == NatConstants.INVALID_ID) {
@@ -128,7 +136,10 @@ public class SnatExternalRoutersListener extends AsyncDataTreeChangeListenerBase
     }
 
     @Override
-    protected void remove(InstanceIdentifier<Routers> identifier, Routers router) {
+    public void remove(InstanceIdentifier<Routers> identifier, Routers router) {
+        if (natMode != NatMode.Conntrack) {
+            return;
+        }
         if (identifier == null || router == null) {
             LOG.error("remove : returning without processing since ext-router is null");
             return;
@@ -137,9 +148,4 @@ public class SnatExternalRoutersListener extends AsyncDataTreeChangeListenerBase
         LOG.info("remove : external router event for {}", router.getRouterName());
         centralizedSwitchScheduler.releaseCentralizedSwitch(router);
     }
-
-    @Override
-    protected SnatExternalRoutersListener getDataTreeChangeListener() {
-        return SnatExternalRoutersListener.this;
-    }
 }