Bulk merge of l2gw changes

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

diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/ConfigNodeUpdatedHandler.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/ConfigNodeUpdatedHandler.java
index 7d034ba9768c41b1088b06d1d629185b1c55190f..cdbb6bec426c81a57f54d959ae6507d2b9186fe0 100644 (file)
--- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/ConfigNodeUpdatedHandler.java
+++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/ConfigNodeUpdatedHandler.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.Configuration;
+import org.opendaylight.mdsal.binding.util.ManagedNewTransactionRunner;
 import org.opendaylight.mdsal.binding.util.TypedReadWriteTransaction;
 import org.opendaylight.netvirt.elan.l2gw.ha.merge.GlobalAugmentationMerger;
 import org.opendaylight.netvirt.elan.l2gw.ha.merge.GlobalNodeMerger;
@@ -34,10 +35,11 @@ public class ConfigNodeUpdatedHandler {
      */
     public void copyHAGlobalUpdateToChild(InstanceIdentifier<Node> haChildNodeId,
                                           DataObjectModification<Node> mod,
-                                          TypedReadWriteTransaction<Configuration> tx) {
+                                          TypedReadWriteTransaction<Configuration> tx,
+                                          ManagedNewTransactionRunner txRunner) {
         globalAugmentationMerger.mergeConfigUpdate(haChildNodeId,
-                mod.getModifiedAugmentation(HwvtepGlobalAugmentation.class), tx);
-        globalNodeMerger.mergeConfigUpdate(haChildNodeId, mod, tx);
+                mod.getModifiedAugmentation(HwvtepGlobalAugmentation.class), tx, txRunner);
+        globalNodeMerger.mergeConfigUpdate(haChildNodeId, mod, tx, txRunner);
     }
 
     /**
@@ -49,11 +51,12 @@ public class ConfigNodeUpdatedHandler {
      */
     public void copyHAPSUpdateToChild(InstanceIdentifier<Node> haChildNodeId,
                                       DataObjectModification<Node> mod,
-                                      TypedReadWriteTransaction<Configuration> tx) {
+                                      TypedReadWriteTransaction<Configuration> tx,
+                                      ManagedNewTransactionRunner txRunner) {
 
         psAugmentationMerger.mergeConfigUpdate(haChildNodeId,
-                mod.getModifiedAugmentation(PhysicalSwitchAugmentation.class), tx);
-        psNodeMerger.mergeConfigUpdate(haChildNodeId, mod, tx);
+                mod.getModifiedAugmentation(PhysicalSwitchAugmentation.class), tx, txRunner);
+        psNodeMerger.mergeConfigUpdate(haChildNodeId, mod, tx, txRunner);
     }
 
 }