Bulk merge of l2gw changes

[netvirt.git] / elanmanager / impl / src / main / java / org / opendaylight / netvirt / elan / evpn / utils / EvpnMacVrfUtils.java

diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/evpn/utils/EvpnMacVrfUtils.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/evpn/utils/EvpnMacVrfUtils.java
index 666aa15cc152cd018739ef4f625dcc5682b282b0..be202388cbdf17401298f473aa51d0963773cddc 100644 (file)
--- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/evpn/utils/EvpnMacVrfUtils.java
+++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/evpn/utils/EvpnMacVrfUtils.java
@@ -7,6 +7,8 @@
  */
 package org.opendaylight.netvirt.elan.evpn.utils;
 
+import static org.opendaylight.mdsal.binding.util.Datastore.CONFIGURATION;
+
 import com.google.common.util.concurrent.ListenableFuture;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -21,7 +23,6 @@ import org.opendaylight.genius.mdsalutil.interfaces.IMdsalApiManager;
 import org.opendaylight.infrautils.jobcoordinator.JobCoordinator;
 import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.mdsal.binding.api.ReadTransaction;
-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;
@@ -181,7 +182,7 @@ public class EvpnMacVrfUtils {
             String dstMacAddress = macVrfEntry.getMac();
             long vni = macVrfEntry.getL2vni().toJava();
             jobCoordinator.enqueueJob(dstMacAddress, () -> Collections.singletonList(
-                txRunner.callWithNewWriteOnlyTransactionAndSubmit(Datastore.CONFIGURATION,
+                txRunner.callWithNewWriteOnlyTransactionAndSubmit(CONFIGURATION,
                     tx -> dpnInterfaceLists.forEach(dpnInterfaces -> {
                         Uint64 dpId = dpnInterfaces.getDpId();
                         LOG.info("ADD: Build DMAC flow with dpId {}, nexthopIP {}, elanTag {},"
@@ -255,7 +256,7 @@ public class EvpnMacVrfUtils {
             String dstMacAddress = macVrfEntry.getMac();
             long vni = macVrfEntry.getL2vni().toJava();
             jobCoordinator.enqueueJob(dstMacAddress, () -> Collections.singletonList(
-                txRunner.callWithNewWriteOnlyTransactionAndSubmit(Datastore.CONFIGURATION,
+                txRunner.callWithNewWriteOnlyTransactionAndSubmit(CONFIGURATION,
                     tx -> dpnInterfaceLists.forEach(dpnInterfaces -> {
                         Uint64 dpId = dpnInterfaces.getDpId();
                         LOG.info("ADD: Build DMAC flow with dpId {}, nexthopIP {}, elanTag {},"