Remove GENIUS UTIL References in VpnManager Module

[netvirt.git] / vpnmanager / impl / src / main / java / org / opendaylight / netvirt / vpnmanager / SubnetmapChangeListener.java

diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetmapChangeListener.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetmapChangeListener.java
index 69cee4769699db8fae2223f161d3901e30ab3d30..9adba97b22091719ed381db4d6510b1e7edfe9fb 100644 (file)
--- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetmapChangeListener.java
+++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetmapChangeListener.java
@@ -16,12 +16,13 @@ import java.util.concurrent.locks.ReentrantLock;
 import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import javax.inject.Singleton;
-import org.opendaylight.genius.infra.ManagedNewTransactionRunner;
-import org.opendaylight.genius.infra.ManagedNewTransactionRunnerImpl;
 import org.opendaylight.genius.utils.JvmGlobalLocks;
 import org.opendaylight.infrautils.utils.concurrent.Executors;
 import org.opendaylight.infrautils.utils.concurrent.LoggingFutures;
 import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.binding.util.Datastore;
+import org.opendaylight.mdsal.binding.util.ManagedNewTransactionRunner;
+import org.opendaylight.mdsal.binding.util.ManagedNewTransactionRunnerImpl;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.netvirt.vpnmanager.api.IVpnManager;
 import org.opendaylight.serviceutils.tools.listener.AbstractAsyncDataTreeChangeListener;
@@ -239,22 +240,24 @@ public class SubnetmapChangeListener extends AbstractAsyncDataTreeChangeListener
     protected long getElanTag(String elanInstanceName) {
         final long[] elanTag = {0L};
 
-        LoggingFutures.addErrorLogging(txRunner.callWithNewReadWriteTransactionAndSubmit(tx -> {
-            InstanceIdentifier<ElanInstance> elanIdentifierId = InstanceIdentifier.builder(ElanInstances.class)
-                    .child(ElanInstance.class, new ElanInstanceKey(elanInstanceName)).build();
-            ElanInstance elanInstance = tx.read(LogicalDatastoreType.CONFIGURATION, elanIdentifierId)
-                    .get().orElse(null);
-            if (elanInstance != null) {
-                if (elanInstance.getElanTag() != null) {
-                    elanTag[0] =elanInstance.getElanTag().longValue();
-                } else {
-                    LOG.error("Notification failed because of failure in fetching elanTag for ElanInstance {}",
-                            elanInstanceName);
-                }
-            } else {
-                LOG.error("Notification failed because of failure in reading ELANInstance {}", elanInstanceName);
-            }
-        }), LOG, "Error binding an ELAN tag for elanInstance {}", elanInstanceName);
+        LoggingFutures.addErrorLogging(txRunner.callWithNewReadWriteTransactionAndSubmit(Datastore.CONFIGURATION,
+                tx -> {
+                    InstanceIdentifier<ElanInstance> elanIdentifierId = InstanceIdentifier.builder(ElanInstances.class)
+                            .child(ElanInstance.class, new ElanInstanceKey(elanInstanceName)).build();
+                    ElanInstance elanInstance = tx.read(elanIdentifierId)
+                            .get().orElse(null);
+                    if (elanInstance != null) {
+                        if (elanInstance.getElanTag() != null) {
+                            elanTag[0] = elanInstance.getElanTag().longValue();
+                        } else {
+                            LOG.error("Notification failed because of failure in fetching elanTag for ElanInstance {}",
+                                    elanInstanceName);
+                        }
+                    } else {
+                        LOG.error("Notification failed because of failure in reading ELANInstance {}",
+                                elanInstanceName);
+                    }
+                }), LOG, "Error binding an ELAN tag for elanInstance {}", elanInstanceName);
 
         return elanTag[0];
     }