NETVIRT-1630 migrate to md-sal APIs

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

diff --git a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronNetworkChangeListener.java b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronNetworkChangeListener.java
index aa2964fba2a7a1e82e21b7c82605cd6056c6d0e6..cf2511e745cbfaaa8f783684ec31adac069baae5 100644 (file)
--- a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronNetworkChangeListener.java
+++ b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronNetworkChangeListener.java
@@ -7,22 +7,24 @@
  */
 package org.opendaylight.netvirt.neutronvpn;
 
-import com.google.common.base.Optional;
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
+import java.util.concurrent.ExecutionException;
 import java.util.stream.Collectors;
-import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
-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.MDSALUtil;
+import org.opendaylight.infrautils.utils.concurrent.Executors;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.netvirt.elanmanager.api.IElanService;
 import org.opendaylight.netvirt.neutronvpn.api.utils.NeutronUtils;
+import org.opendaylight.serviceutils.tools.listener.AbstractAsyncDataTreeChangeListener;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.ElanInstances;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.SegmentTypeBase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.SegmentTypeFlat;
@@ -49,8 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @Singleton
-public class NeutronNetworkChangeListener
-        extends AsyncDataTreeChangeListenerBase<Network, NeutronNetworkChangeListener> {
+public class NeutronNetworkChangeListener extends AbstractAsyncDataTreeChangeListener<Network> {
     private static final Logger LOG = LoggerFactory.getLogger(NeutronNetworkChangeListener.class);
     private final DataBroker dataBroker;
     private final NeutronvpnManager nvpnManager;
@@ -62,7 +63,9 @@ public class NeutronNetworkChangeListener
     public NeutronNetworkChangeListener(final DataBroker dataBroker, final NeutronvpnManager neutronvpnManager,
                                         final NeutronvpnNatManager neutronvpnNatManager,
                                         final IElanService elanService, final NeutronvpnUtils neutronvpnUtils) {
-        super(Network.class, NeutronNetworkChangeListener.class);
+        super(dataBroker, LogicalDatastoreType.CONFIGURATION, InstanceIdentifier.create(Neutron.class)
+                .child(Networks.class).child(Network.class), Executors.newSingleThreadExecutor(
+                        "NeutronNetworkChangeListener", LOG));
         this.dataBroker = dataBroker;
         nvpnManager = neutronvpnManager;
         nvpnNatManager = neutronvpnNatManager;
@@ -70,26 +73,19 @@ public class NeutronNetworkChangeListener
         this.neutronvpnUtils = neutronvpnUtils;
     }
 
-    @Override
-    @PostConstruct
     public void init() {
         LOG.info("{} init", getClass().getSimpleName());
-        registerListener(LogicalDatastoreType.CONFIGURATION, dataBroker);
     }
 
     @Override
-    protected InstanceIdentifier<Network> getWildCardPath() {
-        return InstanceIdentifier.create(Neutron.class).child(Networks.class).child(Network.class);
+    @PreDestroy
+    public void close() {
+        super.close();
+        Executors.shutdownAndAwaitTermination(getExecutorService());
     }
 
     @Override
-    protected NeutronNetworkChangeListener getDataTreeChangeListener() {
-        return NeutronNetworkChangeListener.this;
-    }
-
-
-    @Override
-    protected void add(InstanceIdentifier<Network> identifier, Network input) {
+    public void add(InstanceIdentifier<Network> identifier, Network input) {
         LOG.trace("Adding Network : key: {}, value={}", identifier, input);
         String networkId = input.getUuid().getValue();
         if (!NeutronvpnUtils.isNetworkTypeSupported(input)) {
@@ -127,7 +123,7 @@ public class NeutronNetworkChangeListener
     }
 
     @Override
-    protected void remove(InstanceIdentifier<Network> identifier, Network input) {
+    public void remove(InstanceIdentifier<Network> identifier, Network input) {
         LOG.trace("Removing Network : key: {}, value={}", identifier, input);
         if (NeutronvpnUtils.getIsExternal(input)) {
             if (NeutronvpnUtils.isFlatOrVlanNetwork(input)) {
@@ -147,7 +143,7 @@ public class NeutronNetworkChangeListener
     }
 
     @Override
-    protected void update(InstanceIdentifier<Network> identifier, Network original, Network update) {
+    public void update(InstanceIdentifier<Network> identifier, Network original, Network update) {
         LOG.trace("Updating Network : key: {}, original value={}, update value={}", identifier, original, update);
         neutronvpnUtils.addToNetworkCache(update);
         String elanInstanceName = original.getUuid().getValue();
@@ -235,10 +231,15 @@ public class NeutronNetworkChangeListener
     private ElanInstance createElanInstance(Network input) {
         String elanInstanceName = input.getUuid().getValue();
         InstanceIdentifier<ElanInstance> id = createElanInstanceIdentifier(elanInstanceName);
-        Optional<ElanInstance> existingElanInstance = MDSALUtil.read(dataBroker, LogicalDatastoreType.CONFIGURATION,
-                id);
-        if (existingElanInstance.isPresent()) {
-            return existingElanInstance.get();
+        Optional<ElanInstance> existingElanInstance = null;
+        try {
+            existingElanInstance = MDSALUtil.read(dataBroker, LogicalDatastoreType.CONFIGURATION,
+                    id);
+            if (existingElanInstance.isPresent()) {
+                return existingElanInstance.get();
+            }
+        } catch (ExecutionException | InterruptedException e) {
+            LOG.error("createElanInstance: failed to read elanInstance {} due to exception ", elanInstanceName, e);
         }
         Class<? extends SegmentTypeBase> segmentType = NeutronvpnUtils.getSegmentTypeFromNeutronNetwork(input);
         String segmentationId = NeutronvpnUtils.getSegmentationIdFromNeutronNetwork(input);