Upgrade to the Neon base platform

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

diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/FibEntriesListener.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/FibEntriesListener.java
index f378896dbf1022972f6ce9296021e37d4805298a..4e7b5a2b53de8e966f8632247705a90a87c18b34 100644 (file)
--- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/FibEntriesListener.java
+++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/FibEntriesListener.java
@@ -7,6 +7,8 @@
  */
 package org.opendaylight.netvirt.vpnmanager;
 
+import static org.opendaylight.genius.infra.Datastore.OPERATIONAL;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -66,7 +68,7 @@ public class FibEntriesListener extends AsyncDataTreeChangeListenerBase<VrfEntry
     protected void remove(InstanceIdentifier<VrfEntry> identifier,
         VrfEntry del) {
         LOG.trace("Remove Fib event - Key : {}, value : {} ", identifier, del);
-        final VrfTablesKey key = identifier.firstKeyOf(VrfTables.class, VrfTablesKey.class);
+        final VrfTablesKey key = identifier.firstKeyOf(VrfTables.class);
         String rd = key.getRouteDistinguisher();
         List<RoutePaths> routePaths = del.getRoutePaths();
         removeLabelFromVpnInstance(rd, routePaths);
@@ -75,7 +77,7 @@ public class FibEntriesListener extends AsyncDataTreeChangeListenerBase<VrfEntry
     @Override
     protected void update(InstanceIdentifier<VrfEntry> identifier,
         VrfEntry original, VrfEntry update) {
-        final VrfTablesKey key = identifier.firstKeyOf(VrfTables.class, VrfTablesKey.class);
+        final VrfTablesKey key = identifier.firstKeyOf(VrfTables.class);
         String rd = key.getRouteDistinguisher();
         List<RoutePaths> originalRoutePaths = new ArrayList<>(original.getRoutePaths());
         List<RoutePaths> updateRoutePaths = new ArrayList<>(update.getRoutePaths());
@@ -92,7 +94,7 @@ public class FibEntriesListener extends AsyncDataTreeChangeListenerBase<VrfEntry
     protected void add(InstanceIdentifier<VrfEntry> identifier,
         VrfEntry add) {
         LOG.trace("Add Vrf Entry event - Key : {}, value : {}", identifier, add);
-        final VrfTablesKey key = identifier.firstKeyOf(VrfTables.class, VrfTablesKey.class);
+        final VrfTablesKey key = identifier.firstKeyOf(VrfTables.class);
         String rd = key.getRouteDistinguisher();
         addLabelToVpnInstance(rd, add.getRoutePaths());
     }
@@ -110,9 +112,8 @@ public class FibEntriesListener extends AsyncDataTreeChangeListenerBase<VrfEntry
                     routeIds.add(label);
                 }
             });
-            ListenableFutures.addErrorLogging(txRunner.callWithNewWriteOnlyTransactionAndSubmit(tx ->
-                            tx.put(LogicalDatastoreType.OPERATIONAL,
-                                    VpnUtil.getVpnInstanceOpDataIdentifier(rd),
+            ListenableFutures.addErrorLogging(txRunner.callWithNewWriteOnlyTransactionAndSubmit(OPERATIONAL, tx ->
+                            tx.put(VpnUtil.getVpnInstanceOpDataIdentifier(rd),
                                     new VpnInstanceOpDataEntryBuilder(vpnInstanceOpData).setRouteEntryId(routeIds)
                                             .build())),
                     LOG, "Error adding label to VPN instance");
@@ -132,9 +133,8 @@ public class FibEntriesListener extends AsyncDataTreeChangeListenerBase<VrfEntry
             } else {
                 LOG.debug("Removing label from vpn info - {}", labels);
                 routeIds.removeAll(labels);
-                ListenableFutures.addErrorLogging(txRunner.callWithNewWriteOnlyTransactionAndSubmit(tx ->
-                                tx.put(LogicalDatastoreType.OPERATIONAL,
-                                        VpnUtil.getVpnInstanceOpDataIdentifier(rd),
+                ListenableFutures.addErrorLogging(txRunner.callWithNewWriteOnlyTransactionAndSubmit(OPERATIONAL, tx ->
+                                tx.put(VpnUtil.getVpnInstanceOpDataIdentifier(rd),
                                         new VpnInstanceOpDataEntryBuilder(vpnInstanceOpData).setRouteEntryId(routeIds)
                                                 .build())),
                         LOG, "Error removing label from VPN instance");