Merge "creation of tunnel ingress flow and lfib table entries moved to interface...

[vpnservice.git] / mdsalutil / mdsalutil-impl / src / main / java / org / opendaylight / vpnservice / mdsalutil / internal / MDSALUtilProvider.java

diff --git a/mdsalutil/mdsalutil-impl/src/main/java/org/opendaylight/vpnservice/mdsalutil/internal/MDSALUtilProvider.java b/mdsalutil/mdsalutil-impl/src/main/java/org/opendaylight/vpnservice/mdsalutil/internal/MDSALUtilProvider.java
index 10d9b002752376ad1c62c9cadd3decc808725e5b..b75bd4c4047b67403bf8ac1f682e381305080869 100644 (file)
--- a/mdsalutil/mdsalutil-impl/src/main/java/org/opendaylight/vpnservice/mdsalutil/internal/MDSALUtilProvider.java
+++ b/mdsalutil/mdsalutil-impl/src/main/java/org/opendaylight/vpnservice/mdsalutil/internal/MDSALUtilProvider.java
@@ -7,15 +7,21 @@
  */
 package org.opendaylight.vpnservice.mdsalutil.internal;
 
+import java.math.BigInteger;
+
 import java.util.List;
 
+import com.google.common.util.concurrent.CheckedFuture;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
+import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
+import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
 import org.opendaylight.controller.sal.binding.api.BindingAwareConsumer;
 import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ConsumerContext;
 import org.opendaylight.vpnservice.mdsalutil.ActionInfo;
 import org.opendaylight.vpnservice.mdsalutil.FlowEntity;
 import org.opendaylight.vpnservice.mdsalutil.GroupEntity;
 import org.opendaylight.vpnservice.mdsalutil.interfaces.IMdsalApiManager;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.table.Flow;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.PacketProcessingService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -54,6 +60,26 @@ public class MDSALUtilProvider implements BindingAwareConsumer, IMdsalApiManager
           mdSalMgr.installFlow(flowEntity);
     }
 
+    @Override
+    public CheckedFuture<Void, TransactionCommitFailedException> installFlow(BigInteger dpId, Flow flowEntity) {
+        return mdSalMgr.installFlow(dpId, flowEntity);
+    }
+
+    @Override
+    public CheckedFuture<Void, TransactionCommitFailedException> installFlow(BigInteger dpId, FlowEntity flowEntity) {
+        return mdSalMgr.installFlow(dpId, flowEntity.getFlowBuilder().build());
+    }
+
+    @Override
+    public CheckedFuture<Void, TransactionCommitFailedException> removeFlow(BigInteger dpId, Flow flowEntity) {
+        return mdSalMgr.removeFlowNew(dpId, flowEntity);
+    }
+
+    @Override
+    public CheckedFuture<Void, TransactionCommitFailedException> removeFlow(BigInteger dpId, FlowEntity flowEntity) {
+        return mdSalMgr.removeFlowNew(dpId, flowEntity.getFlowBuilder().build());
+    }
+
     @Override
     public void removeFlow(FlowEntity flowEntity) {
         mdSalMgr.removeFlow(flowEntity);
@@ -78,22 +104,22 @@ public class MDSALUtilProvider implements BindingAwareConsumer, IMdsalApiManager
 
 
     @Override
-    public void sendPacketOut(long lDpnId, int groupId, byte[] payload) {
-        mdSalMgr.sendPacketOut(lDpnId, groupId, payload);
+    public void sendPacketOut(BigInteger dpnId, int groupId, byte[] payload) {
+        mdSalMgr.sendPacketOut(dpnId, groupId, payload);
     }
 
 
     @Override
-    public void sendPacketOutWithActions(long lDpnId, long groupId,
+    public void sendPacketOutWithActions(BigInteger dpnId, long groupId,
             byte[] payload, List<ActionInfo> actionInfos) {
-        mdSalMgr.sendPacketOutWithActions(lDpnId, groupId, payload, actionInfos);
+        mdSalMgr.sendPacketOutWithActions(dpnId, groupId, payload, actionInfos);
     }
 
 
     @Override
-    public void sendARPPacketOutWithActions(long dpid, byte[] payload,
+    public void sendARPPacketOutWithActions(BigInteger dpnId, byte[] payload,
             List<ActionInfo> action_info) {
-        mdSalMgr.sendARPPacketOutWithActions(dpid, payload, action_info);
+        mdSalMgr.sendARPPacketOutWithActions(dpnId, payload, action_info);
     }
 
 }