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 6246d9c70b5f3e7bdcfca73010ac40906c8589e7..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
@@ -1,14 +1,27 @@
+/*
+ * Copyright (c) 2015 Ericsson India Global Services Pvt Ltd. and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
 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;
@@ -27,8 +40,7 @@ public class MDSALUtilProvider implements BindingAwareConsumer, IMdsalApiManager
             final DataBroker dataBroker;
             final PacketProcessingService packetProcessingService;
             dataBroker = session.getSALService(DataBroker.class);
-             // TODO - Verify this.
-             packetProcessingService = session.getRpcService(PacketProcessingService.class);
+            packetProcessingService = session.getRpcService(PacketProcessingService.class);
              mdSalMgr = new MDSALManager( dataBroker, packetProcessingService) ;
         }catch( Exception e) {
             s_logger.error( "Error initializing MD SAL Util Services " + e );
@@ -48,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);
@@ -72,29 +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);
-    }
-
-
-    @Override
-    public void printTest() {
-        // TODO Auto-generated method stub
-        mdSalMgr.printTest();
+        mdSalMgr.sendARPPacketOutWithActions(dpnId, payload, action_info);
     }
 
 }