Bulk merge of l2gw changes

[netvirt.git] / elanmanager / impl / src / main / java / org / opendaylight / netvirt / elan / l2gw / ha / handlers / OpNodeUpdatedHandler.java

diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/OpNodeUpdatedHandler.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/OpNodeUpdatedHandler.java
index 07380d6aeca2931b9c2015d688686b67135cddf3..fe9b50fdf7f126eb8bf2e95a380a48aa30447cf3 100644 (file)
--- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/OpNodeUpdatedHandler.java
+++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/OpNodeUpdatedHandler.java
@@ -9,6 +9,7 @@ package org.opendaylight.netvirt.elan.l2gw.ha.handlers;
 
 import org.opendaylight.mdsal.binding.api.DataObjectModification;
 import org.opendaylight.mdsal.binding.util.Datastore.Operational;
+import org.opendaylight.mdsal.binding.util.ManagedNewTransactionRunner;
 import org.opendaylight.mdsal.binding.util.TypedReadWriteTransaction;
 import org.opendaylight.netvirt.elan.l2gw.ha.HwvtepHAUtil;
 import org.opendaylight.netvirt.elan.l2gw.ha.merge.GlobalAugmentationMerger;
@@ -38,13 +39,14 @@ public class OpNodeUpdatedHandler {
     public void copyChildPsOpUpdateToHAParent(Node updatedSrcPSNode,
                                               InstanceIdentifier<Node> haPath,
                                               DataObjectModification<Node> mod,
-                                              TypedReadWriteTransaction<Operational> tx) {
+                                              TypedReadWriteTransaction<Operational> tx,
+                                              ManagedNewTransactionRunner txRunner) {
 
         InstanceIdentifier<Node> haPSPath = HwvtepHAUtil.convertPsPath(updatedSrcPSNode, haPath);
 
         psAugmentationMerger.mergeOpUpdate(haPSPath,
-                mod.getModifiedAugmentation(PhysicalSwitchAugmentation.class), tx);
-        psNodeMerger.mergeOpUpdate(haPSPath, mod, tx);
+                mod.getModifiedAugmentation(PhysicalSwitchAugmentation.class), tx, txRunner);
+        psNodeMerger.mergeOpUpdate(haPSPath, mod, tx, txRunner);
     }
 
     /**
@@ -56,11 +58,12 @@ public class OpNodeUpdatedHandler {
      */
     public void copyChildGlobalOpUpdateToHAParent(InstanceIdentifier<Node> haPath,
                                                   DataObjectModification<Node> mod,
-                                                  TypedReadWriteTransaction<Operational> tx) {
+                                                  TypedReadWriteTransaction<Operational> tx,
+                                                   ManagedNewTransactionRunner txRunner) {
 
         globalAugmentationMerger.mergeOpUpdate(haPath,
-                mod.getModifiedAugmentation(HwvtepGlobalAugmentation.class), tx);
-        globalNodeMerger.mergeOpUpdate(haPath, mod, tx);
+                mod.getModifiedAugmentation(HwvtepGlobalAugmentation.class), tx, txRunner);
+        globalNodeMerger.mergeOpUpdate(haPath, mod, tx, txRunner);
     }
 
 }