Bulk merge of l2gw changes

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

diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/IMergeCommand.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/IMergeCommand.java
index 673433a9aab3a1b19f396bfea842891f2e26f0ce..53f73a9a412e0fc4f4c82f472ea5de316fb3235c 100644 (file)
--- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/IMergeCommand.java
+++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/IMergeCommand.java
@@ -7,7 +7,6 @@
  */
 package org.opendaylight.netvirt.elan.l2gw.ha.commands;
 
-import org.opendaylight.mdsal.binding.api.ReadWriteTransaction;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
 import org.opendaylight.yangtools.concepts.Builder;
 import org.opendaylight.yangtools.yang.binding.DataObject;
@@ -28,21 +27,6 @@ public interface IMergeCommand<T extends DataObject, Y extends Builder, Z extend
                               Z src,
                               InstanceIdentifier<Node> nodePath);
 
-    /**
-     * Abstract function to update data from src to dst in Operational Topology.
-     * while existing data helps in keeping track of data only updated
-     * @param existingData dataObject which are already exisitng
-     * @param updatedSrc updated data source
-     * @param origSrc original data source
-     * @param nodePath nodePath of dest
-     * @param tx ReadWriteTransaction
-     */
-    void mergeOpUpdate(Z existingData,
-                       Z updatedSrc,
-                       Z origSrc,
-                       InstanceIdentifier<Node> nodePath,
-                       ReadWriteTransaction tx);
-
     /**
      * Abstract function to merge data from src to dst in Config Topology.
      * @param dst builder which will be used to build concrete object