External api proposal
[openflowplugin.git] / openflowplugin / src / main / java / org / opendaylight / openflowplugin / openflow / md / core / sal / ModelDrivenSwitchImpl.java
index 242d17889e788e1e7303ff3e2bddf00c9b059ce6..46eca4f7d94a9b062682108337afb114da9b3002 100644 (file)
  */
 package org.opendaylight.openflowplugin.openflow.md.core.sal;
 
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
 import java.util.concurrent.Future;
-
+import java.util.concurrent.TimeUnit;
 import org.opendaylight.controller.sal.binding.api.NotificationProviderService;
-import org.opendaylight.controller.sal.common.util.Rpcs;
-import org.opendaylight.openflowjava.protocol.api.util.BinContent;
-import org.opendaylight.openflowplugin.openflow.md.OFConstants;
-import org.opendaylight.openflowplugin.openflow.md.core.SwitchConnectionDistinguisher;
-import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.FlowConvertor;
-import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.GroupConvertor;
-import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.MeterConvertor;
+import org.opendaylight.openflowplugin.api.openflow.md.core.SwitchConnectionDistinguisher;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.PacketOutConvertor;
-import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.PortConvertor;
-import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.TableFeaturesConvertor;
-import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.match.MatchReactor;
-import org.opendaylight.openflowplugin.openflow.md.core.session.IMessageDispatchService;
+import org.opendaylight.openflowplugin.api.openflow.md.core.session.IMessageDispatchService;
 import org.opendaylight.openflowplugin.openflow.md.core.session.OFSessionUtil;
-import org.opendaylight.openflowplugin.openflow.md.core.session.SessionContext;
-import org.opendaylight.openflowplugin.openflow.md.util.FlowCreatorUtil;
-import org.opendaylight.openflowplugin.openflow.md.util.InventoryDataServiceUtil;
+import org.opendaylight.openflowplugin.api.openflow.md.core.session.SessionContext;
+import org.opendaylight.openflowplugin.openflow.md.core.session.SwitchConnectionCookieOFImpl;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.AddFlowInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.AddFlowOutput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.AddFlowOutputBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.FlowAddedBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.FlowRemovedBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.FlowUpdatedBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.RemoveFlowInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.RemoveFlowOutput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.RemoveFlowOutputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.UpdateFlowInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.UpdateFlowOutput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.UpdateFlowOutputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.GetAggregateFlowStatisticsFromFlowTableForAllFlowsInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.GetAggregateFlowStatisticsFromFlowTableForAllFlowsOutput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.GetAggregateFlowStatisticsFromFlowTableForAllFlowsOutputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.GetAggregateFlowStatisticsFromFlowTableForGivenMatchInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.GetAggregateFlowStatisticsFromFlowTableForGivenMatchOutput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.GetAggregateFlowStatisticsFromFlowTableForGivenMatchOutputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.GetAllFlowStatisticsFromFlowTableInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.GetAllFlowStatisticsFromFlowTableOutput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.GetAllFlowStatisticsFromFlowTableOutputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.GetAllFlowsStatisticsFromAllFlowTablesInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.GetAllFlowsStatisticsFromAllFlowTablesOutput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.GetAllFlowsStatisticsFromAllFlowTablesOutputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.GetFlowStatisticsFromFlowTableInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.GetFlowStatisticsFromFlowTableOutput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.GetFlowStatisticsFromFlowTableOutputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.table.statistics.rev131215.GetFlowTablesStatisticsInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.table.statistics.rev131215.GetFlowTablesStatisticsOutput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.table.statistics.rev131215.GetFlowTablesStatisticsOutputBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.transaction.rev131103.TransactionId;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.port.rev130925.port.mod.port.Port;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.Flow;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918.AddGroupInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918.AddGroupOutput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918.AddGroupOutputBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918.GroupAddedBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918.GroupRemovedBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918.GroupUpdatedBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918.RemoveGroupInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918.RemoveGroupOutput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918.RemoveGroupOutputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918.UpdateGroupInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918.UpdateGroupOutput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918.UpdateGroupOutputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111.GetAllGroupStatisticsInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111.GetAllGroupStatisticsOutput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111.GetAllGroupStatisticsOutputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111.GetGroupDescriptionInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111.GetGroupDescriptionOutput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111.GetGroupDescriptionOutputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111.GetGroupFeaturesInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111.GetGroupFeaturesOutput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111.GetGroupFeaturesOutputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111.GetGroupStatisticsInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111.GetGroupStatisticsOutput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111.GetGroupStatisticsOutputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.service.rev130918.AddMeterInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.service.rev130918.AddMeterOutput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.service.rev130918.AddMeterOutputBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.service.rev130918.MeterAddedBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.service.rev130918.MeterRemovedBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.service.rev130918.MeterUpdatedBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.service.rev130918.RemoveMeterInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.service.rev130918.RemoveMeterOutput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.service.rev130918.RemoveMeterOutputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.service.rev130918.UpdateMeterInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.service.rev130918.UpdateMeterOutput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.service.rev130918.UpdateMeterOutputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.GetAllMeterConfigStatisticsInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.GetAllMeterConfigStatisticsOutput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.GetAllMeterConfigStatisticsOutputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.GetAllMeterStatisticsInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.GetAllMeterStatisticsOutput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.GetAllMeterStatisticsOutputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.GetMeterFeaturesInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.GetMeterFeaturesOutput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.GetMeterFeaturesOutputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.GetMeterStatisticsInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.GetMeterStatisticsOutput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.GetMeterStatisticsOutputBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.Group;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.GroupId;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.Meter;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.MeterId;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.MultipartRequestFlags;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.MultipartType;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.oxm.fields.MatchEntries;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.BarrierInputBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.BarrierOutput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.FlowModInputBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.GroupModInputBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.MeterModInputBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.MultipartRequestInputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.module.config.rev141015.SetConfigInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.module.config.rev141015.SetConfigOutput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.PacketOutInput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.PortModInput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.PortModInputBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.match.grouping.Match;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.match.grouping.MatchBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.MultipartRequestAggregateCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.MultipartRequestFlowCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.MultipartRequestGroupCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.MultipartRequestGroupDescCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.MultipartRequestGroupFeaturesCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.MultipartRequestMeterCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.MultipartRequestMeterConfigCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.MultipartRequestMeterFeaturesCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.MultipartRequestPortStatsCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.MultipartRequestQueueCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.MultipartRequestTableCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.MultipartRequestTableFeaturesCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.multipart.request.aggregate._case.MultipartRequestAggregateBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.multipart.request.flow._case.MultipartRequestFlowBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.multipart.request.group._case.MultipartRequestGroupBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.multipart.request.meter._case.MultipartRequestMeterBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.multipart.request.meter.config._case.MultipartRequestMeterConfigBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.multipart.request.port.stats._case.MultipartRequestPortStatsBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.multipart.request.queue._case.MultipartRequestQueueBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.multipart.request.table._case.MultipartRequestTableBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.multipart.request.table.features._case.MultipartRequestTableFeaturesBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.multipart.request.table.features._case.multipart.request.table.features.TableFeatures;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.ConnectionCookie;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.TransmitPacketInput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.port.service.rev131107.GetPortOutput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.port.service.rev131107.UpdatePortInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.port.service.rev131107.UpdatePortOutput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.port.service.rev131107.UpdatePortOutputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.port.statistics.rev131214.GetAllNodeConnectorsStatisticsInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.port.statistics.rev131214.GetAllNodeConnectorsStatisticsOutput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.port.statistics.rev131214.GetAllNodeConnectorsStatisticsOutputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.port.statistics.rev131214.GetNodeConnectorStatisticsInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.port.statistics.rev131214.GetNodeConnectorStatisticsOutput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.port.statistics.rev131214.GetNodeConnectorStatisticsOutputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.queue.statistics.rev131216.GetAllQueuesStatisticsFromAllPortsInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.queue.statistics.rev131216.GetAllQueuesStatisticsFromAllPortsOutput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.queue.statistics.rev131216.GetAllQueuesStatisticsFromAllPortsOutputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.queue.statistics.rev131216.GetAllQueuesStatisticsFromGivenPortInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.queue.statistics.rev131216.GetAllQueuesStatisticsFromGivenPortOutput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.queue.statistics.rev131216.GetAllQueuesStatisticsFromGivenPortOutputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.queue.statistics.rev131216.GetQueueStatisticsFromGivenPortInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.queue.statistics.rev131216.GetQueueStatisticsFromGivenPortOutput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.queue.statistics.rev131216.GetQueueStatisticsFromGivenPortOutputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.service.rev131026.UpdateTableInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.service.rev131026.UpdateTableOutput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.table.service.rev131026.UpdateTableOutputBuilder;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.opendaylight.yangtools.yang.common.RpcError;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 import org.slf4j.Logger;
 
-import com.google.common.base.Objects;
-import com.google.common.util.concurrent.Futures;
-
 /**
  * RPC implementation of MD-switch
  */
@@ -194,549 +98,166 @@ public class ModelDrivenSwitchImpl extends AbstractModelDrivenSwitch {
     private final NodeId nodeId;
     private final IMessageDispatchService messageService;
     private short version = 0;
-    private final SessionContext session;
-    NotificationProviderService rpcNotificationProviderService;
+    private OFRpcTaskContext rpcTaskContext;
 
-    protected ModelDrivenSwitchImpl(NodeId nodeId, InstanceIdentifier<Node> identifier, SessionContext context) {
-        super(identifier, context);
+    // TODO:read timeout from configSubsystem
+    protected long maxTimeout = 1000;
+    protected TimeUnit maxTimeoutUnit = TimeUnit.MILLISECONDS;
+
+    protected ModelDrivenSwitchImpl(final NodeId nodeId, final InstanceIdentifier<Node> identifier,
+                                    final SessionContext sessionContext) {
+        super(identifier, sessionContext);
         this.nodeId = nodeId;
         messageService = sessionContext.getMessageDispatchService();
-        version = context.getPrimaryConductor().getVersion();
-        this.session = context;
-        rpcNotificationProviderService = OFSessionUtil.getSessionManager().getNotificationProviderService();
+        version = sessionContext.getPrimaryConductor().getVersion();
+        final NotificationProviderService rpcNotificationProviderService = OFSessionUtil.getSessionManager().getNotificationProviderService();
+
+        rpcTaskContext = new OFRpcTaskContext();
+        rpcTaskContext.setSession(sessionContext);
+        rpcTaskContext.setMessageService(messageService);
+        rpcTaskContext.setRpcNotificationProviderService(rpcNotificationProviderService);
+        rpcTaskContext.setMaxTimeout(maxTimeout);
+        rpcTaskContext.setMaxTimeoutUnit(maxTimeoutUnit);
+        rpcTaskContext.setRpcPool(OFSessionUtil.getSessionManager().getRpcPool());
+        rpcTaskContext.setMessageSpy(OFSessionUtil.getSessionManager().getMessageSpy());
     }
 
     @Override
-    public Future<RpcResult<AddFlowOutput>> addFlow(AddFlowInput input) {
+    public Future<RpcResult<AddFlowOutput>> addFlow(final AddFlowInput input) {
         LOG.debug("Calling the FlowMod RPC method on MessageDispatchService");
-        Long xId = null;
-        // For Flow provisioning, the SwitchConnectionDistinguisher is set to
-        // null so
-        // the request can be routed through any connection to the switch
-
+        // use primary connection
         SwitchConnectionDistinguisher cookie = null;
-        if (Objects.firstNonNull(input.isBarrier(), Boolean.FALSE)) {
-            xId = session.getNextXid();
-            BarrierInputBuilder barrierInput = new BarrierInputBuilder();
-            barrierInput.setVersion(version);
-            barrierInput.setXid(xId);
-            @SuppressWarnings("unused")
-            Future<RpcResult<BarrierOutput>> barrierOFLib = messageService.barrier(barrierInput.build(), cookie);
-        }
-
-        // Convert the AddFlowInput to FlowModInput
-        FlowModInputBuilder ofFlowModInput = FlowConvertor.toFlowModInput(input, version, this.getSessionContext()
-                .getFeatures().getDatapathId());
-        xId = session.getNextXid();
-        ofFlowModInput.setXid(xId);
-
-        if (null != rpcNotificationProviderService) {
-            FlowAddedBuilder newFlow = new FlowAddedBuilder(
-                    (org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.Flow) input);
-            newFlow.setTransactionId(new TransactionId(BigInteger.valueOf(xId.intValue())));
-            newFlow.setFlowRef(input.getFlowRef());
-            rpcNotificationProviderService.publish(newFlow.build());
-        }
-
-        Future<RpcResult<UpdateFlowOutput>> resultFromOFLib = messageService.flowMod(ofFlowModInput.build(), cookie);
-        RpcResult<UpdateFlowOutput> rpcResultFromOFLib = null;
-
-        try {
-            rpcResultFromOFLib = resultFromOFLib.get();
-        } catch (Exception ex) {
-            LOG.error(" Error while getting result for AddFlow RPC" + ex.getMessage());
-        }
 
-        UpdateFlowOutput updateFlowOutput = rpcResultFromOFLib.getResult();
+        OFRpcTask<AddFlowInput, RpcResult<UpdateFlowOutput>> task =
+                OFRpcTaskFactory.createAddFlowTask(rpcTaskContext, input, cookie);
+        ListenableFuture<RpcResult<UpdateFlowOutput>> result = task.submit();
 
-        AddFlowOutputBuilder addFlowOutput = new AddFlowOutputBuilder();
-        addFlowOutput.setTransactionId(updateFlowOutput.getTransactionId());
-        AddFlowOutput result = addFlowOutput.build();
-
-        Collection<RpcError> errors = rpcResultFromOFLib.getErrors();
-        RpcResult<AddFlowOutput> rpcResult = Rpcs.getRpcResult(true, result, errors);
-
-        LOG.debug("Returning the Add Flow RPC result to MD-SAL");
-        return Futures.immediateFuture(rpcResult);
+        return Futures.transform(result, OFRpcFutureResultTransformFactory.createForAddFlowOutput());
     }
 
+
     @Override
-    public Future<RpcResult<AddGroupOutput>> addGroup(AddGroupInput input) {
+    public Future<RpcResult<AddGroupOutput>> addGroup(final AddGroupInput input) {
         LOG.debug("Calling the GroupMod RPC method on MessageDispatchService");
-        Long xId = null;
-
-        // For Flow provisioning, the SwitchConnectionDistinguisher is set to
-        // null so
-        // the request can be routed through any connection to the switch
 
+        // use primary connection
         SwitchConnectionDistinguisher cookie = null;
-        if (Objects.firstNonNull(input.isBarrier(), Boolean.FALSE)) {
-            xId = session.getNextXid();
-            BarrierInputBuilder barrierInput = new BarrierInputBuilder();
-            barrierInput.setVersion(version);
-            barrierInput.setXid(xId);
-            @SuppressWarnings("unused")
-            Future<RpcResult<BarrierOutput>> barrierOFLib = messageService.barrier(barrierInput.build(), cookie);
-        }
-
-        // Convert the AddGroupInput to GroupModInput
-        GroupModInputBuilder ofGroupModInput = GroupConvertor.toGroupModInput(input, version, this.getSessionContext()
-                .getFeatures().getDatapathId());
-        xId = session.getNextXid();
-        ofGroupModInput.setXid(xId);
-
-        if (null != rpcNotificationProviderService) {
-            GroupAddedBuilder groupMod = new GroupAddedBuilder(
-                    (org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.Group) input);
-            groupMod.setTransactionId(new TransactionId(BigInteger.valueOf(xId.intValue())));
-            groupMod.setGroupRef(input.getGroupRef());
-            rpcNotificationProviderService.publish(groupMod.build());
-        }
 
-        Future<RpcResult<UpdateGroupOutput>> resultFromOFLib = messageService.groupMod(ofGroupModInput.build(), cookie);
-        RpcResult<UpdateGroupOutput> rpcResultFromOFLib = null;
+        OFRpcTask<AddGroupInput, RpcResult<UpdateGroupOutput>> task =
+                OFRpcTaskFactory.createAddGroupTask(rpcTaskContext, input, cookie);
+        ListenableFuture<RpcResult<UpdateGroupOutput>> result = task.submit();
 
-        try {
-            rpcResultFromOFLib = resultFromOFLib.get();
-        } catch (Exception ex) {
-            LOG.error(" Error while getting result for AddGroup RPC" + ex.getMessage());
-        }
-
-        UpdateGroupOutput updateGroupOutput = rpcResultFromOFLib.getResult();
-
-        AddGroupOutputBuilder addGroupOutput = new AddGroupOutputBuilder();
-        addGroupOutput.setTransactionId(updateGroupOutput.getTransactionId());
-        AddGroupOutput result = addGroupOutput.build();
-
-        Collection<RpcError> errors = rpcResultFromOFLib.getErrors();
-        RpcResult<AddGroupOutput> rpcResult = Rpcs.getRpcResult(true, result, errors);
-
-        LOG.debug("Returning the Add Group RPC result to MD-SAL");
-        return Futures.immediateFuture(rpcResult);
+        return Futures.transform(result, OFRpcFutureResultTransformFactory.createForAddGroupOutput());
     }
 
     @Override
-    public Future<RpcResult<AddMeterOutput>> addMeter(AddMeterInput input) {
+    public Future<RpcResult<AddMeterOutput>> addMeter(final AddMeterInput input) {
         LOG.debug("Calling the MeterMod RPC method on MessageDispatchService");
-        Long xId = null;
-        // For Meter provisioning, the SwitchConnectionDistinguisher is set to
-        // null so
-        // the request can be routed through any connection to the switch
 
+        // use primary connection
         SwitchConnectionDistinguisher cookie = null;
-        if (Objects.firstNonNull(input.isBarrier(), Boolean.FALSE)) {
-            xId = session.getNextXid();
-            BarrierInputBuilder barrierInput = new BarrierInputBuilder();
-            barrierInput.setVersion(version);
-            barrierInput.setXid(xId);
-            @SuppressWarnings("unused")
-            Future<RpcResult<BarrierOutput>> barrierOFLib = messageService.barrier(barrierInput.build(), cookie);
-        }
 
-        // Convert the AddMeterInput to MeterModInput
-        MeterModInputBuilder ofMeterModInput = MeterConvertor.toMeterModInput(input, version);
-        xId = session.getNextXid();
-        ofMeterModInput.setXid(xId);
-
-        if (null != rpcNotificationProviderService) {
-            MeterAddedBuilder meterMod = new MeterAddedBuilder(
-                    (org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.Meter) input);
-            meterMod.setTransactionId(new TransactionId(BigInteger.valueOf(xId.intValue())));
-            meterMod.setMeterRef(input.getMeterRef());
-            rpcNotificationProviderService.publish(meterMod.build());
-        }
-
-        Future<RpcResult<UpdateMeterOutput>> resultFromOFLib = messageService.meterMod(ofMeterModInput.build(), cookie);
-
-        RpcResult<UpdateMeterOutput> rpcResultFromOFLib = null;
-
-        try {
-            rpcResultFromOFLib = resultFromOFLib.get();
-        } catch (Exception ex) {
-            LOG.error(" Error while getting result for AddMeter RPC" + ex.getMessage());
-        }
-
-        UpdateMeterOutput updateMeterOutput = rpcResultFromOFLib.getResult();
-
-        AddMeterOutputBuilder addMeterOutput = new AddMeterOutputBuilder();
-        addMeterOutput.setTransactionId(updateMeterOutput.getTransactionId());
-        AddMeterOutput result = addMeterOutput.build();
+        OFRpcTask<AddMeterInput, RpcResult<UpdateMeterOutput>> task =
+                OFRpcTaskFactory.createAddMeterTask(rpcTaskContext, input, cookie);
+        ListenableFuture<RpcResult<UpdateMeterOutput>> result = task.submit();
 
-        Collection<RpcError> errors = rpcResultFromOFLib.getErrors();
-        RpcResult<AddMeterOutput> rpcResult = Rpcs.getRpcResult(true, result, errors);
-
-        LOG.debug("Returning the Add Meter RPC result to MD-SAL");
-        return Futures.immediateFuture(rpcResult);
+        return Futures.transform(result, OFRpcFutureResultTransformFactory.createForAddMeterOutput());
     }
 
     @Override
-    public Future<RpcResult<RemoveFlowOutput>> removeFlow(RemoveFlowInput input) {
+    public Future<RpcResult<RemoveFlowOutput>> removeFlow(final RemoveFlowInput input) {
         LOG.debug("Calling the removeFlow RPC method on MessageDispatchService");
-        Long xId = null;
-        // For Flow provisioning, the SwitchConnectionDistinguisher is set to
-        // null so
-        // the request can be routed through any connection to the switch
 
+        // use primary connection
         SwitchConnectionDistinguisher cookie = null;
-        if (Objects.firstNonNull(input.isBarrier(), Boolean.FALSE)) {
-            BarrierInputBuilder barrierInput = new BarrierInputBuilder();
-            xId = session.getNextXid();
-            barrierInput.setXid(xId);
-            barrierInput.setVersion(version);
-            @SuppressWarnings("unused")
-            Future<RpcResult<BarrierOutput>> barrierOFLib = messageService.barrier(barrierInput.build(), cookie);
-        }
-
-        // Convert the RemoveFlowInput to FlowModInput
-        FlowModInputBuilder ofFlowModInput = FlowConvertor.toFlowModInput(input, version, this.getSessionContext()
-                .getFeatures().getDatapathId());
-        xId = session.getNextXid();
-        ofFlowModInput.setXid(xId);
-
-        if (null != rpcNotificationProviderService) {
-            FlowRemovedBuilder removeFlow = new FlowRemovedBuilder(
-                    (org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.Flow) input);
-            removeFlow.setTransactionId(new TransactionId(BigInteger.valueOf(xId.intValue())));
-            removeFlow.setFlowRef(input.getFlowRef());
-            rpcNotificationProviderService.publish(removeFlow.build());
-        }
-
-        Future<RpcResult<UpdateFlowOutput>> resultFromOFLib = messageService.flowMod(ofFlowModInput.build(), cookie);
-
-        RpcResult<UpdateFlowOutput> rpcResultFromOFLib = null;
+        OFRpcTask<RemoveFlowInput, RpcResult<UpdateFlowOutput>> task =
+                OFRpcTaskFactory.createRemoveFlowTask(rpcTaskContext, input, cookie);
+        ListenableFuture<RpcResult<UpdateFlowOutput>> result = task.submit();
 
-        try {
-            rpcResultFromOFLib = resultFromOFLib.get();
-        } catch (Exception ex) {
-            LOG.error(" Error while getting result for remove Flow RPC" + ex.getMessage());
-        }
-
-        UpdateFlowOutput updateFlowOutput = rpcResultFromOFLib.getResult();
-
-        RemoveFlowOutputBuilder removeFlowOutput = new RemoveFlowOutputBuilder();
-        removeFlowOutput.setTransactionId(updateFlowOutput.getTransactionId());
-        RemoveFlowOutput result = removeFlowOutput.build();
-
-        Collection<RpcError> errors = rpcResultFromOFLib.getErrors();
-        RpcResult<RemoveFlowOutput> rpcResult = Rpcs.getRpcResult(true, result, errors);
-
-        LOG.debug("Returning the Remove Flow RPC result to MD-SAL");
-        return Futures.immediateFuture(rpcResult);
+        return Futures.transform(result, OFRpcFutureResultTransformFactory.createForRemoveFlowOutput());
     }
 
     @Override
-    public Future<RpcResult<RemoveGroupOutput>> removeGroup(RemoveGroupInput input) {
+    public Future<RpcResult<RemoveGroupOutput>> removeGroup(final RemoveGroupInput input) {
         LOG.debug("Calling the Remove Group RPC method on MessageDispatchService");
-        Long xId = null;
-
-        // For Flow provisioning, the SwitchConnectionDistinguisher is set to
-        // null so
-        // the request can be routed through any connection to the switch
 
         SwitchConnectionDistinguisher cookie = null;
-        if (Objects.firstNonNull(input.isBarrier(), Boolean.FALSE)) {
-            xId = session.getNextXid();
-            BarrierInputBuilder barrierInput = new BarrierInputBuilder();
-            barrierInput.setVersion(version);
-            barrierInput.setXid(xId);
-            @SuppressWarnings("unused")
-            Future<RpcResult<BarrierOutput>> barrierOFLib = messageService.barrier(barrierInput.build(), cookie);
-        }
-
-        // Convert the RemoveGroupInput to GroupModInput
-        GroupModInputBuilder ofGroupModInput = GroupConvertor.toGroupModInput(input, version, this.getSessionContext()
-                .getFeatures().getDatapathId());
-        xId = session.getNextXid();
-        ofGroupModInput.setXid(xId);
-
-        if (null != rpcNotificationProviderService) {
-            GroupRemovedBuilder groupMod = new GroupRemovedBuilder(
-                    (org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.Group) input);
-            groupMod.setTransactionId(new TransactionId(BigInteger.valueOf(xId.intValue())));
-            groupMod.setGroupRef(input.getGroupRef());
-            rpcNotificationProviderService.publish(groupMod.build());
-        }
-
-        Future<RpcResult<UpdateGroupOutput>> resultFromOFLib = messageService.groupMod(ofGroupModInput.build(), cookie);
-
-        RpcResult<UpdateGroupOutput> rpcResultFromOFLib = null;
-
-        try {
-            rpcResultFromOFLib = resultFromOFLib.get();
-        } catch (Exception ex) {
-            LOG.error(" Error while getting result for RemoveGroup RPC" + ex.getMessage());
-        }
+        OFRpcTask<RemoveGroupInput, RpcResult<UpdateGroupOutput>> task =
+                OFRpcTaskFactory.createRemoveGroupTask(rpcTaskContext, input, cookie);
+        ListenableFuture<RpcResult<UpdateGroupOutput>> result = task.submit();
 
-        UpdateGroupOutput updateGroupOutput = rpcResultFromOFLib.getResult();
-
-        RemoveGroupOutputBuilder removeGroupOutput = new RemoveGroupOutputBuilder();
-        removeGroupOutput.setTransactionId(updateGroupOutput.getTransactionId());
-        RemoveGroupOutput result = removeGroupOutput.build();
-
-        Collection<RpcError> errors = rpcResultFromOFLib.getErrors();
-        RpcResult<RemoveGroupOutput> rpcResult = Rpcs.getRpcResult(true, result, errors);
-
-        LOG.debug("Returning the Remove Group RPC result to MD-SAL");
-        return Futures.immediateFuture(rpcResult);
+        return Futures.transform(result, OFRpcFutureResultTransformFactory.createForRemoveGroupOutput());
     }
 
     @Override
-    public Future<RpcResult<RemoveMeterOutput>> removeMeter(RemoveMeterInput input) {
+    public Future<RpcResult<RemoveMeterOutput>> removeMeter(final RemoveMeterInput input) {
         LOG.debug("Calling the Remove MeterMod RPC method on MessageDispatchService");
-        Long xId = null;
 
-        // For Meter provisioning, the SwitchConnectionDistinguisher is set to
-        // null so
-        // the request can be routed through any connection to the switch
         SwitchConnectionDistinguisher cookie = null;
-        if (Objects.firstNonNull(input.isBarrier(), Boolean.FALSE)) {
-            xId = session.getNextXid();
-            BarrierInputBuilder barrierInput = new BarrierInputBuilder();
-            barrierInput.setVersion(version);
-            barrierInput.setXid(xId);
-            @SuppressWarnings("unused")
-            Future<RpcResult<BarrierOutput>> barrierOFLib = messageService.barrier(barrierInput.build(), cookie);
-        }
-
-        // Convert the RemoveMeterInput to MeterModInput
-        MeterModInputBuilder ofMeterModInput = MeterConvertor.toMeterModInput(input, version);
-        xId = session.getNextXid();
-        ofMeterModInput.setXid(xId);
-
-        if (null != rpcNotificationProviderService) {
-            MeterRemovedBuilder meterMod = new MeterRemovedBuilder(
-                    (org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.Meter) input);
-            meterMod.setTransactionId(new TransactionId(BigInteger.valueOf(xId.intValue())));
-            meterMod.setMeterRef(input.getMeterRef());
-            rpcNotificationProviderService.publish(meterMod.build());
-        }
-
-        Future<RpcResult<UpdateMeterOutput>> resultFromOFLib = messageService.meterMod(ofMeterModInput.build(), cookie);
-
-        RpcResult<UpdateMeterOutput> rpcResultFromOFLib = null;
-
-        try {
-            rpcResultFromOFLib = resultFromOFLib.get();
-        } catch (Exception ex) {
-            LOG.error(" Error while getting result for RemoveMeter RPC" + ex.getMessage());
-        }
-
-        UpdateMeterOutput updatemeterOutput = rpcResultFromOFLib.getResult();
-
-        RemoveMeterOutputBuilder removeMeterOutput = new RemoveMeterOutputBuilder();
-        removeMeterOutput.setTransactionId(updatemeterOutput.getTransactionId());
-        RemoveMeterOutput result = removeMeterOutput.build();
-
-        Collection<RpcError> errors = rpcResultFromOFLib.getErrors();
-        RpcResult<RemoveMeterOutput> rpcResult = Rpcs.getRpcResult(true, result, errors);
+        OFRpcTask<RemoveMeterInput, RpcResult<UpdateMeterOutput>> task =
+                OFRpcTaskFactory.createRemoveMeterTask(rpcTaskContext, input, cookie);
+        ListenableFuture<RpcResult<UpdateMeterOutput>> result = task.submit();
 
-        LOG.debug("Returning the Remove Meter RPC result to MD-SAL");
-        return Futures.immediateFuture(rpcResult);
+        return Futures.transform(result, OFRpcFutureResultTransformFactory.createForRemoveMeterOutput());
     }
 
     @Override
-    public Future<RpcResult<Void>> transmitPacket(TransmitPacketInput input) {
+    public Future<RpcResult<Void>> transmitPacket(final TransmitPacketInput input) {
         LOG.debug("TransmitPacket - {}", input);
         // Convert TransmitPacket to PacketOutInput
         PacketOutInput message = PacketOutConvertor.toPacketOutInput(input, version, sessionContext.getNextXid(),
                 sessionContext.getFeatures().getDatapathId());
 
-        // TODO VD NULL for yet - find how to translate cookie from
-        // TransmitPacketInput
-        // SwitchConnectionDistinguisher cookie = ( "what is need to do" )
-        // input.getCookie();
         SwitchConnectionDistinguisher cookie = null;
+        ConnectionCookie connectionCookie = input.getConnectionCookie();
+        if (connectionCookie != null && connectionCookie.getValue() != null) {
+            cookie = new SwitchConnectionCookieOFImpl(connectionCookie.getValue());
+        }
 
         LOG.debug("Calling the transmitPacket RPC method");
         return messageService.packetOut(message, cookie);
     }
 
-    private FlowModInputBuilder toFlowModInputBuilder(Flow source) {
-        FlowModInputBuilder target = new FlowModInputBuilder();
-        target.setCookie(source.getCookie());
-        target.setIdleTimeout(source.getIdleTimeout());
-        target.setHardTimeout(source.getHardTimeout());
-        target.setMatch(toMatch(source.getMatch()));
-
-        return target;
-    }
-
-    private Match toMatch(org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.flow.Match match) {
-        MatchBuilder target = new MatchBuilder();
-
-        target.setMatchEntries(toMatchEntries(match));
-
-        return null;
-    }
-
-    private List<MatchEntries> toMatchEntries(
-            org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.flow.Match match) {
-        List<MatchEntries> entries = new ArrayList<>();
-
-        return null;
-    }
-
     @Override
-    public Future<RpcResult<UpdateFlowOutput>> updateFlow(UpdateFlowInput input) {
+    public Future<RpcResult<UpdateFlowOutput>> updateFlow(final UpdateFlowInput input) {
         LOG.debug("Calling the updateFlow RPC method on MessageDispatchService");
-        Long xId = null;
-        // Call the RPC method on MessageDispatchService
-
-        // For Flow provisioning, the SwitchConnectionDistinguisher is set to
-        // null so
-        // the request can be routed through any connection to the switch
 
+        // use primary connection
         SwitchConnectionDistinguisher cookie = null;
-        if (Objects.firstNonNull(input.getUpdatedFlow().isBarrier(), Boolean.FALSE)) {
-            BarrierInputBuilder barrierInput = new BarrierInputBuilder();
-            xId = session.getNextXid();
-            barrierInput.setVersion(version);
-            barrierInput.setXid(xId);
-            Future<RpcResult<BarrierOutput>> barrierOFLib = messageService.barrier(barrierInput.build(), cookie);
-        }
 
-        // Convert the UpdateFlowInput to FlowModInput
-        FlowModInputBuilder ofFlowModInput = FlowConvertor.toFlowModInput(input.getUpdatedFlow(), version, this
-                .getSessionContext().getFeatures().getDatapathId());
-        xId = session.getNextXid();
-        ofFlowModInput.setXid(xId);
-
-        if (null != rpcNotificationProviderService) {
-            FlowUpdatedBuilder updateFlow = new FlowUpdatedBuilder(input.getUpdatedFlow());
-            updateFlow.setTransactionId(new TransactionId(BigInteger.valueOf(xId.intValue())));
-            updateFlow.setFlowRef(input.getFlowRef());
-            rpcNotificationProviderService.publish(updateFlow.build());
-        }
-
-        Future<RpcResult<UpdateFlowOutput>> resultFromOFLib = messageService.flowMod(ofFlowModInput.build(), cookie);
-
-        RpcResult<UpdateFlowOutput> rpcResultFromOFLib = null;
-
-        try {
-            rpcResultFromOFLib = resultFromOFLib.get();
-        } catch (Exception ex) {
-            LOG.error(" Error while getting result for UpdateFlow RPC" + ex.getMessage());
-        }
-
-        UpdateFlowOutput updateFlowOutputOFLib = rpcResultFromOFLib.getResult();
-
-        UpdateFlowOutputBuilder updateFlowOutput = new UpdateFlowOutputBuilder();
-        updateFlowOutput.setTransactionId(updateFlowOutputOFLib.getTransactionId());
-        UpdateFlowOutput result = updateFlowOutput.build();
+        OFRpcTask<UpdateFlowInput, RpcResult<UpdateFlowOutput>> task =
+                OFRpcTaskFactory.createUpdateFlowTask(rpcTaskContext, input, cookie);
+        ListenableFuture<RpcResult<UpdateFlowOutput>> result = task.submit();
 
-        Collection<RpcError> errors = rpcResultFromOFLib.getErrors();
-        RpcResult<UpdateFlowOutput> rpcResult = Rpcs.getRpcResult(true, result, errors);
-
-        LOG.debug("Returning the Update Flow RPC result to MD-SAL");
-        return Futures.immediateFuture(rpcResult);
+        return result;
     }
 
     @Override
-    public Future<RpcResult<UpdateGroupOutput>> updateGroup(UpdateGroupInput input) {
+    public Future<RpcResult<UpdateGroupOutput>> updateGroup(final UpdateGroupInput input) {
         LOG.debug("Calling the update Group Mod RPC method on MessageDispatchService");
-        Long xId = null;
-
-        // For Flow provisioning, the SwitchConnectionDistinguisher is set to
-        // null so
-        // the request can be routed through any connection to the switch
 
+        // use primary connection
         SwitchConnectionDistinguisher cookie = null;
-        if (Objects.firstNonNull(input.getUpdatedGroup().isBarrier(), Boolean.FALSE)) {
-            xId = session.getNextXid();
-            BarrierInputBuilder barrierInput = new BarrierInputBuilder();
-            barrierInput.setVersion(version);
-            barrierInput.setXid(xId);
-            @SuppressWarnings("unused")
-            Future<RpcResult<BarrierOutput>> barrierOFLib = messageService.barrier(barrierInput.build(), cookie);
-        }
-
-        // Convert the UpdateGroupInput to GroupModInput
-        GroupModInputBuilder ofGroupModInput = GroupConvertor.toGroupModInput(input.getUpdatedGroup(), version, this
-                .getSessionContext().getFeatures().getDatapathId());
-        xId = session.getNextXid();
-        ofGroupModInput.setXid(xId);
-
-        if (null != rpcNotificationProviderService) {
-            GroupUpdatedBuilder groupMod = new GroupUpdatedBuilder(input.getUpdatedGroup());
-            groupMod.setTransactionId(new TransactionId(BigInteger.valueOf(xId.intValue())));
-            groupMod.setGroupRef(input.getGroupRef());
-            rpcNotificationProviderService.publish(groupMod.build());
-        }
-
-        Future<RpcResult<UpdateGroupOutput>> resultFromOFLib = messageService.groupMod(ofGroupModInput.build(), cookie);
 
-        RpcResult<UpdateGroupOutput> rpcResultFromOFLib = null;
+        OFRpcTask<UpdateGroupInput, RpcResult<UpdateGroupOutput>> task =
+                OFRpcTaskFactory.createUpdateGroupTask(rpcTaskContext, input, cookie);
+        ListenableFuture<RpcResult<UpdateGroupOutput>> result = task.submit();
 
-        try {
-            rpcResultFromOFLib = resultFromOFLib.get();
-        } catch (Exception ex) {
-            LOG.error(" Error while getting result for updateGroup RPC" + ex.getMessage());
-        }
-
-        UpdateGroupOutput updateGroupOutputOFLib = rpcResultFromOFLib.getResult();
-
-        UpdateGroupOutputBuilder updateGroupOutput = new UpdateGroupOutputBuilder();
-        updateGroupOutput.setTransactionId(updateGroupOutputOFLib.getTransactionId());
-        UpdateGroupOutput result = updateGroupOutput.build();
-
-        Collection<RpcError> errors = rpcResultFromOFLib.getErrors();
-        RpcResult<UpdateGroupOutput> rpcResult = Rpcs.getRpcResult(true, result, errors);
-
-        LOG.debug("Returning the Update Group RPC result to MD-SAL");
-        return Futures.immediateFuture(rpcResult);
+        return result;
     }
 
     @Override
-    public Future<RpcResult<UpdateMeterOutput>> updateMeter(UpdateMeterInput input) {
+    public Future<RpcResult<UpdateMeterOutput>> updateMeter(final UpdateMeterInput input) {
         LOG.debug("Calling the MeterMod RPC method on MessageDispatchService");
-        Long xId = null;
 
-        // For Meter provisioning, the SwitchConnectionDistinguisher is set to
-        // null so
-        // the request can be routed through any connection to the switch
+        // use primary connection
         SwitchConnectionDistinguisher cookie = null;
-        if (Objects.firstNonNull(input.getUpdatedMeter().isBarrier(), Boolean.FALSE)) {
-            xId = session.getNextXid();
-            BarrierInputBuilder barrierInput = new BarrierInputBuilder();
-            barrierInput.setVersion(version);
-            barrierInput.setXid(xId);
-            @SuppressWarnings("unused")
-            Future<RpcResult<BarrierOutput>> barrierOFLib = messageService.barrier(barrierInput.build(), cookie);
-        }
-
-        // Convert the UpdateMeterInput to MeterModInput
-        MeterModInputBuilder ofMeterModInput = MeterConvertor.toMeterModInput(input.getUpdatedMeter(), version);
-        xId = session.getNextXid();
-        ofMeterModInput.setXid(xId);
-
-        if (null != rpcNotificationProviderService) {
-            MeterUpdatedBuilder meterMod = new MeterUpdatedBuilder(input.getUpdatedMeter());
-            meterMod.setTransactionId(new TransactionId(BigInteger.valueOf(xId.intValue())));
-            meterMod.setMeterRef(input.getMeterRef());
-            rpcNotificationProviderService.publish(meterMod.build());
-        }
-
-        Future<RpcResult<UpdateMeterOutput>> resultFromOFLib = messageService.meterMod(ofMeterModInput.build(), cookie);
-
-        RpcResult<UpdateMeterOutput> rpcResultFromOFLib = null;
-
-        try {
-            rpcResultFromOFLib = resultFromOFLib.get();
-        } catch (Exception ex) {
-            LOG.error(" Error while getting result for UpdateMeter RPC" + ex.getMessage());
-        }
 
-        UpdateMeterOutput updateMeterOutputFromOFLib = rpcResultFromOFLib.getResult();
+        OFRpcTask<UpdateMeterInput, RpcResult<UpdateMeterOutput>> task =
+                OFRpcTaskFactory.createUpdateMeterTask(rpcTaskContext, input, cookie);
+        ListenableFuture<RpcResult<UpdateMeterOutput>> result = task.submit();
 
-        UpdateMeterOutputBuilder updateMeterOutput = new UpdateMeterOutputBuilder();
-        updateMeterOutput.setTransactionId(updateMeterOutputFromOFLib.getTransactionId());
-        UpdateMeterOutput result = updateMeterOutput.build();
-
-        Collection<RpcError> errors = rpcResultFromOFLib.getErrors();
-        RpcResult<UpdateMeterOutput> rpcResult = Rpcs.getRpcResult(true, result, errors);
-
-        LOG.debug("Returning the Update Meter RPC result to MD-SAL");
-        return Futures.immediateFuture(rpcResult);
+        return result;
     }
 
     @Override
@@ -744,1019 +265,219 @@ public class ModelDrivenSwitchImpl extends AbstractModelDrivenSwitch {
         return nodeId;
     }
 
-    /*
-     * Methods for requesting statistics from switch
-     */
-    @Override
-    public Future<RpcResult<GetAllGroupStatisticsOutput>> getAllGroupStatistics(GetAllGroupStatisticsInput input) {
-
-        GetAllGroupStatisticsOutputBuilder output = new GetAllGroupStatisticsOutputBuilder();
-        Collection<RpcError> errors = Collections.emptyList();
-
-        if (version == OFConstants.OFP_VERSION_1_0) {
-            output.setTransactionId(null);
-            output.setGroupStats(null);
-
-            RpcResult<GetAllGroupStatisticsOutput> rpcResult = Rpcs.getRpcResult(true, output.build(), errors);
-            return Futures.immediateFuture(rpcResult);
-        }
-        // Generate xid to associate it with the request
-        Long xid = this.getSessionContext().getNextXid();
 
-        LOG.debug("Prepare statistics request for all the groups - Transaction id - {}", xid);
-
-        // Create multipart request header
-        MultipartRequestInputBuilder mprInput = new MultipartRequestInputBuilder();
-        mprInput.setType(MultipartType.OFPMPGROUP);
-        mprInput.setVersion(version);
-        mprInput.setXid(xid);
-        mprInput.setFlags(new MultipartRequestFlags(false));
-
-        // Create multipart request body for fetch all the group stats
-        MultipartRequestGroupCaseBuilder caseBuilder = new MultipartRequestGroupCaseBuilder();
-        MultipartRequestGroupBuilder mprGroupBuild = new MultipartRequestGroupBuilder();
-        mprGroupBuild.setGroupId(new GroupId(BinContent.intToUnsignedLong(Group.OFPGALL.getIntValue())));
-        caseBuilder.setMultipartRequestGroup(mprGroupBuild.build());
-
-        // Set request body to main multipart request
-        mprInput.setMultipartRequestBody(caseBuilder.build());
-
-        // Send the request, no cookies associated, use any connection
-        LOG.debug("Send group statistics request to the switch :{}", mprGroupBuild);
-        this.messageService.multipartRequest(mprInput.build(), null);
+    @Override
+    public Future<RpcResult<GetAllGroupStatisticsOutput>> getAllGroupStatistics(final GetAllGroupStatisticsInput input) {
+        // use primary connection
+        LOG.debug("Calling the getAllGroupStatistics RPC method on MessageDispatchService");
+        SwitchConnectionDistinguisher cookie = null;
 
-        // Prepare rpc return output. Set xid and send it back.
-        LOG.debug("Return results and transaction id back to caller");
-        output.setTransactionId(generateTransactionId(xid));
-        output.setGroupStats(null);
+        OFRpcTask<GetAllGroupStatisticsInput, RpcResult<GetAllGroupStatisticsOutput>> task =
+                OFRpcTaskFactory.createGetAllGroupStatisticsTask(rpcTaskContext, input, cookie);
+        ListenableFuture<RpcResult<GetAllGroupStatisticsOutput>> result = task.submit();
 
-        RpcResult<GetAllGroupStatisticsOutput> rpcResult = Rpcs.getRpcResult(true, output.build(), errors);
-        return Futures.immediateFuture(rpcResult);
+        return result;
 
     }
 
     @Override
-    public Future<RpcResult<GetGroupDescriptionOutput>> getGroupDescription(GetGroupDescriptionInput input) {
-
-        GetGroupDescriptionOutputBuilder output = new GetGroupDescriptionOutputBuilder();
-        Collection<RpcError> errors = Collections.emptyList();
-
-        if (version == OFConstants.OFP_VERSION_1_0) {
-            output.setTransactionId(null);
-            output.setGroupDescStats(null);
-
-            RpcResult<GetGroupDescriptionOutput> rpcResult = Rpcs.getRpcResult(true, output.build(), errors);
-            return Futures.immediateFuture(rpcResult);
-        }
-        // Generate xid to associate it with the request
-        Long xid = this.getSessionContext().getNextXid();
-
-        LOG.debug("Prepare group description statistics request - Transaction id - {}", xid);
-
-        // Create multipart request header
-        MultipartRequestInputBuilder mprInput = new MultipartRequestInputBuilder();
-        mprInput.setType(MultipartType.OFPMPGROUPDESC);
-        mprInput.setVersion(version);
-        mprInput.setXid(xid);
-        mprInput.setFlags(new MultipartRequestFlags(false));
-
-        // Create multipart request body for fetch all the group description
-        // stats
-        MultipartRequestGroupDescCaseBuilder mprGroupDescBuild = new MultipartRequestGroupDescCaseBuilder();
-
-        // Set request body to main multipart request
-        mprInput.setMultipartRequestBody(mprGroupDescBuild.build());
-
-        // Send the request, no cookies associated, use any connection
-        LOG.debug("Send group desciption statistics request to switch : {}", mprGroupDescBuild);
-        this.messageService.multipartRequest(mprInput.build(), null);
-
-        // Prepare rpc return output. Set xid and send it back.
-        LOG.debug("Return results and transaction id back to caller");
-        output.setTransactionId(generateTransactionId(xid));
-        output.setGroupDescStats(null);
-
-        RpcResult<GetGroupDescriptionOutput> rpcResult = Rpcs.getRpcResult(true, output.build(), errors);
-        return Futures.immediateFuture(rpcResult);
+    public Future<RpcResult<GetGroupDescriptionOutput>> getGroupDescription(final GetGroupDescriptionInput input) {
+        LOG.debug("Calling the getGroupDescription RPC method on MessageDispatchService");
 
+        OFRpcTask<GetGroupDescriptionInput, RpcResult<GetGroupDescriptionOutput>> task =
+                OFRpcTaskFactory.createGetGroupDescriptionTask(rpcTaskContext, input, null);
+        return task.submit();
     }
 
     @Override
-    public Future<RpcResult<GetGroupFeaturesOutput>> getGroupFeatures(GetGroupFeaturesInput input) {
-
-        GetGroupFeaturesOutputBuilder output = new GetGroupFeaturesOutputBuilder();
-        Collection<RpcError> errors = Collections.emptyList();
-
-        if (version == OFConstants.OFP_VERSION_1_0) {
-            output.setTransactionId(null);
+    public Future<RpcResult<GetGroupFeaturesOutput>> getGroupFeatures(final GetGroupFeaturesInput input) {
+        LOG.debug("Calling the getGroupFeatures RPC method on MessageDispatchService");
 
-            RpcResult<GetGroupFeaturesOutput> rpcResult = Rpcs.getRpcResult(true, output.build(), errors);
-            return Futures.immediateFuture(rpcResult);
-        }
-        // Generate xid to associate it with the request
-        Long xid = this.getSessionContext().getNextXid();
-
-        LOG.debug("Prepare group features statistics request - Transaction id - {}", xid);
-
-        // Create multipart request header
-        MultipartRequestInputBuilder mprInput = new MultipartRequestInputBuilder();
-        mprInput.setType(MultipartType.OFPMPGROUPFEATURES);
-        mprInput.setVersion(version);
-        mprInput.setXid(xid);
-        mprInput.setFlags(new MultipartRequestFlags(false));
-
-        // Create multipart request body for fetch all the group description
-        // stats
-        MultipartRequestGroupFeaturesCaseBuilder mprGroupFeaturesBuild = new MultipartRequestGroupFeaturesCaseBuilder();
-
-        // Set request body to main multipart request
-        mprInput.setMultipartRequestBody(mprGroupFeaturesBuild.build());
-
-        // Send the request, no cookies associated, use any connection
-        LOG.debug("Send group features statistics request :{}", mprGroupFeaturesBuild);
-        this.messageService.multipartRequest(mprInput.build(), null);
-
-        // Prepare rpc return output. Set xid and send it back.
-        LOG.debug("Return results and transaction id back to caller");
-        output.setTransactionId(generateTransactionId(xid));
-
-        RpcResult<GetGroupFeaturesOutput> rpcResult = Rpcs.getRpcResult(true, output.build(), errors);
-        return Futures.immediateFuture(rpcResult);
+        OFRpcTask<GetGroupFeaturesInput, RpcResult<GetGroupFeaturesOutput>> task =
+                OFRpcTaskFactory.createGetGroupFeaturesTask(rpcTaskContext, input, null);
+        return task.submit();
     }
 
     @Override
-    public Future<RpcResult<GetGroupStatisticsOutput>> getGroupStatistics(GetGroupStatisticsInput input) {
-
-        GetGroupStatisticsOutputBuilder output = new GetGroupStatisticsOutputBuilder();
-        Collection<RpcError> errors = Collections.emptyList();
-
-        if (version == OFConstants.OFP_VERSION_1_0) {
-            output.setTransactionId(null);
-            output.setGroupStats(null);
+    public Future<RpcResult<GetGroupStatisticsOutput>> getGroupStatistics(final GetGroupStatisticsInput input) {
+        LOG.debug("Calling the getGroupStatistics RPC method on MessageDispatchService");
 
-            RpcResult<GetGroupStatisticsOutput> rpcResult = Rpcs.getRpcResult(true, output.build(), errors);
-            return Futures.immediateFuture(rpcResult);
-        }
-        // Generate xid to associate it with the request
-        Long xid = this.getSessionContext().getNextXid();
-
-        LOG.debug("Prepare statistics request for node {} group ({}) - Transaction id - {}", input.getNode(),
-                input.getGroupId(), xid);
-
-        // Create multipart request header
-        MultipartRequestInputBuilder mprInput = new MultipartRequestInputBuilder();
-        mprInput.setType(MultipartType.OFPMPGROUP);
-        mprInput.setVersion(version);
-        mprInput.setXid(xid);
-        mprInput.setFlags(new MultipartRequestFlags(false));
-
-        // Create multipart request body for fetch all the group stats
-        MultipartRequestGroupCaseBuilder caseBuilder = new MultipartRequestGroupCaseBuilder();
-        MultipartRequestGroupBuilder mprGroupBuild = new MultipartRequestGroupBuilder();
-        mprGroupBuild.setGroupId(new GroupId(input.getGroupId().getValue()));
-        caseBuilder.setMultipartRequestGroup(mprGroupBuild.build());
-
-        // Set request body to main multipart request
-        mprInput.setMultipartRequestBody(caseBuilder.build());
-
-        // Send the request, no cookies associated, use any connection
-        LOG.debug("Send group statistics request :{}", mprGroupBuild);
-        this.messageService.multipartRequest(mprInput.build(), null);
-
-        // Prepare rpc return output. Set xid and send it back.
-        LOG.debug("Return results and transaction id back to caller");
-        output.setTransactionId(generateTransactionId(xid));
-        output.setGroupStats(null);
-
-        RpcResult<GetGroupStatisticsOutput> rpcResult = Rpcs.getRpcResult(true, output.build(), errors);
-        return Futures.immediateFuture(rpcResult);
+        OFRpcTask<GetGroupStatisticsInput, RpcResult<GetGroupStatisticsOutput>> task =
+                OFRpcTaskFactory.createGetGroupStatisticsTask(rpcTaskContext, input, null);
+        return task.submit();
     }
 
     @Override
     public Future<RpcResult<GetAllMeterConfigStatisticsOutput>> getAllMeterConfigStatistics(
-            GetAllMeterConfigStatisticsInput input) {
-
-        GetAllMeterConfigStatisticsOutputBuilder output = new GetAllMeterConfigStatisticsOutputBuilder();
-        Collection<RpcError> errors = Collections.emptyList();
-
-        if (version == OFConstants.OFP_VERSION_1_0) {
-            output.setTransactionId(null);
-            output.setMeterConfigStats(null);
+            final GetAllMeterConfigStatisticsInput input) {
+        LOG.debug("Calling the getAllMeterConfigStatistics RPC method on MessageDispatchService");
 
-            RpcResult<GetAllMeterConfigStatisticsOutput> rpcResult = Rpcs.getRpcResult(true, output.build(), errors);
-            return Futures.immediateFuture(rpcResult);
-
-        }
-        // Generate xid to associate it with the request
-        Long xid = this.getSessionContext().getNextXid();
-
-        LOG.debug("Prepare config request for all the meters - Transaction id - {}", xid);
-
-        // Create multipart request header
-        MultipartRequestInputBuilder mprInput = new MultipartRequestInputBuilder();
-        mprInput.setType(MultipartType.OFPMPMETERCONFIG);
-        mprInput.setVersion(version);
-        mprInput.setXid(xid);
-        mprInput.setFlags(new MultipartRequestFlags(false));
-
-        // Create multipart request body for fetch all the meter stats
-        MultipartRequestMeterConfigCaseBuilder caseBuilder = new MultipartRequestMeterConfigCaseBuilder();
-        MultipartRequestMeterConfigBuilder mprMeterConfigBuild = new MultipartRequestMeterConfigBuilder();
-        mprMeterConfigBuild.setMeterId(new MeterId(BinContent.intToUnsignedLong(Meter.OFPMALL.getIntValue())));
-        caseBuilder.setMultipartRequestMeterConfig(mprMeterConfigBuild.build());
-
-        // Set request body to main multipart request
-        mprInput.setMultipartRequestBody(caseBuilder.build());
-
-        // Send the request, no cookies associated, use any connection
-        LOG.debug("Send meter statistics request :{}", mprMeterConfigBuild);
-        this.messageService.multipartRequest(mprInput.build(), null);
-
-        // Prepare rpc return output. Set xid and send it back.
-        LOG.debug("Return results and transaction id back to caller");
-        output.setTransactionId(generateTransactionId(xid));
-        output.setMeterConfigStats(null);
-
-        RpcResult<GetAllMeterConfigStatisticsOutput> rpcResult = Rpcs.getRpcResult(true, output.build(), errors);
-        return Futures.immediateFuture(rpcResult);
+        OFRpcTask<GetAllMeterConfigStatisticsInput, RpcResult<GetAllMeterConfigStatisticsOutput>> task =
+                OFRpcTaskFactory.createGetAllMeterConfigStatisticsTask(rpcTaskContext, input, null);
+        return task.submit();
     }
 
     @Override
-    public Future<RpcResult<GetAllMeterStatisticsOutput>> getAllMeterStatistics(GetAllMeterStatisticsInput input) {
-
-        GetAllMeterStatisticsOutputBuilder output = new GetAllMeterStatisticsOutputBuilder();
-        Collection<RpcError> errors = Collections.emptyList();
-
-        if (version == OFConstants.OFP_VERSION_1_0) {
-            output.setTransactionId(null);
-            output.setMeterStats(null);
+    public Future<RpcResult<GetAllMeterStatisticsOutput>> getAllMeterStatistics(
+            final GetAllMeterStatisticsInput input) {
+        LOG.debug("Calling the getAllMeterStatistics RPC method on MessageDispatchService");
 
-            RpcResult<GetAllMeterStatisticsOutput> rpcResult = Rpcs.getRpcResult(true, output.build(), errors);
-            return Futures.immediateFuture(rpcResult);
-        }
-        // Generate xid to associate it with the request
-        Long xid = this.getSessionContext().getNextXid();
-
-        LOG.debug("Prepare statistics request for all the meters - Transaction id - {}", xid);
-
-        // Create multipart request header
-        MultipartRequestInputBuilder mprInput = new MultipartRequestInputBuilder();
-        mprInput.setType(MultipartType.OFPMPMETER);
-        mprInput.setVersion(version);
-        mprInput.setXid(xid);
-        mprInput.setFlags(new MultipartRequestFlags(false));
-
-        // Create multipart request body for fetch all the meter stats
-        MultipartRequestMeterCaseBuilder caseBuilder = new MultipartRequestMeterCaseBuilder();
-        MultipartRequestMeterBuilder mprMeterBuild = new MultipartRequestMeterBuilder();
-        mprMeterBuild.setMeterId(new MeterId(BinContent.intToUnsignedLong(Meter.OFPMALL.getIntValue())));
-        caseBuilder.setMultipartRequestMeter(mprMeterBuild.build());
-
-        // Set request body to main multipart request
-        mprInput.setMultipartRequestBody(caseBuilder.build());
-
-        // Send the request, no cookies associated, use any connection
-        LOG.debug("Send meter statistics request :{}", mprMeterBuild);
-        this.messageService.multipartRequest(mprInput.build(), null);
-
-        // Prepare rpc return output. Set xid and send it back.
-        LOG.debug("Return results and transaction id back to caller");
-        output.setTransactionId(generateTransactionId(xid));
-        output.setMeterStats(null);
-
-        RpcResult<GetAllMeterStatisticsOutput> rpcResult = Rpcs.getRpcResult(true, output.build(), errors);
-        return Futures.immediateFuture(rpcResult);
+        OFRpcTask<GetAllMeterStatisticsInput, RpcResult<GetAllMeterStatisticsOutput>> task =
+                OFRpcTaskFactory.createGetAllMeterStatisticsTask(rpcTaskContext, input, null);
+        return task.submit();
     }
 
     @Override
-    public Future<RpcResult<GetMeterFeaturesOutput>> getMeterFeatures(GetMeterFeaturesInput input) {
-
-        GetMeterFeaturesOutputBuilder output = new GetMeterFeaturesOutputBuilder();
-        Collection<RpcError> errors = Collections.emptyList();
-
-        if (version == OFConstants.OFP_VERSION_1_0) {
-            output.setTransactionId(null);
-
-            RpcResult<GetMeterFeaturesOutput> rpcResult = Rpcs.getRpcResult(true, output.build(), errors);
-            return Futures.immediateFuture(rpcResult);
-        }
-        // Generate xid to associate it with the request
-        Long xid = this.getSessionContext().getNextXid();
-
-        LOG.debug("Prepare features statistics request for all the meters - Transaction id - {}", xid);
-
-        // Create multipart request header
-        MultipartRequestInputBuilder mprInput = new MultipartRequestInputBuilder();
-        mprInput.setType(MultipartType.OFPMPMETERFEATURES);
-        mprInput.setVersion(version);
-        mprInput.setXid(xid);
-        mprInput.setFlags(new MultipartRequestFlags(false));
-
-        // Create multipart request body for fetch all the group description
-        // stats
-        MultipartRequestMeterFeaturesCaseBuilder mprMeterFeaturesBuild = new MultipartRequestMeterFeaturesCaseBuilder();
-
-        // Set request body to main multipart request
-        mprInput.setMultipartRequestBody(mprMeterFeaturesBuild.build());
+    public Future<RpcResult<GetMeterFeaturesOutput>> getMeterFeatures(
+            final GetMeterFeaturesInput input) {
+        LOG.debug("Calling the getMeterFeatures RPC method on MessageDispatchService");
 
-        // Send the request, no cookies associated, use any connection
-        LOG.debug("Send meter features statistics request :{}", mprMeterFeaturesBuild);
-        this.messageService.multipartRequest(mprInput.build(), null);
-
-        // Prepare rpc return output. Set xid and send it back.
-        LOG.debug("Return results and transaction id back to caller");
-        output.setTransactionId(generateTransactionId(xid));
-
-        RpcResult<GetMeterFeaturesOutput> rpcResult = Rpcs.getRpcResult(true, output.build(), errors);
-        return Futures.immediateFuture(rpcResult);
+        OFRpcTask<GetMeterFeaturesInput, RpcResult<GetMeterFeaturesOutput>> task =
+                OFRpcTaskFactory.createGetMeterFeaturesTask(rpcTaskContext, input, null);
+        return task.submit();
     }
 
     @Override
-    public Future<RpcResult<GetMeterStatisticsOutput>> getMeterStatistics(GetMeterStatisticsInput input) {
-
-        GetMeterStatisticsOutputBuilder output = new GetMeterStatisticsOutputBuilder();
-        Collection<RpcError> errors = Collections.emptyList();
-
-        if (version == OFConstants.OFP_VERSION_1_0) {
-            output.setTransactionId(null);
-            output.setMeterStats(null);
+    public Future<RpcResult<GetMeterStatisticsOutput>> getMeterStatistics(
+            final GetMeterStatisticsInput input) {
+        LOG.debug("Calling the getMeterStatistics RPC method on MessageDispatchService");
 
-            RpcResult<GetMeterStatisticsOutput> rpcResult = Rpcs.getRpcResult(true, output.build(), errors);
-            return Futures.immediateFuture(rpcResult);
-
-        }
-        // Generate xid to associate it with the request
-        Long xid = this.getSessionContext().getNextXid();
-
-        LOG.debug("Preprae statistics request for Meter ({}) - Transaction id - {}", input.getMeterId().getValue(), xid);
-
-        // Create multipart request header
-        MultipartRequestInputBuilder mprInput = new MultipartRequestInputBuilder();
-        mprInput.setType(MultipartType.OFPMPMETER);
-        mprInput.setVersion(version);
-        mprInput.setXid(xid);
-        mprInput.setFlags(new MultipartRequestFlags(false));
-
-        // Create multipart request body for fetch all the meter stats
-        MultipartRequestMeterCaseBuilder caseBuilder = new MultipartRequestMeterCaseBuilder();
-        MultipartRequestMeterBuilder mprMeterBuild = new MultipartRequestMeterBuilder();
-        // Select specific meter
-        mprMeterBuild.setMeterId(new MeterId(input.getMeterId().getValue()));
-        caseBuilder.setMultipartRequestMeter(mprMeterBuild.build());
-
-        // Set request body to main multipart request
-        mprInput.setMultipartRequestBody(caseBuilder.build());
-
-        // Send the request, no cookies associated, use any connection
-        LOG.debug("Send meter statistics request :{}", mprMeterBuild);
-        this.messageService.multipartRequest(mprInput.build(), null);
-
-        // Prepare rpc return output. Set xid and send it back.
-        LOG.debug("Return results and transaction id back to caller");
-        output.setTransactionId(generateTransactionId(xid));
-        output.setMeterStats(null);
-
-        RpcResult<GetMeterStatisticsOutput> rpcResult = Rpcs.getRpcResult(true, output.build(), errors);
-        return Futures.immediateFuture(rpcResult);
+        OFRpcTask<GetMeterStatisticsInput, RpcResult<GetMeterStatisticsOutput>> task =
+                OFRpcTaskFactory.createGetMeterStatisticsTask(rpcTaskContext, input, null);
+        return task.submit();
     }
 
     @Override
     public Future<RpcResult<GetAllNodeConnectorsStatisticsOutput>> getAllNodeConnectorsStatistics(
-            GetAllNodeConnectorsStatisticsInput arg0) {
-
-        // Generate xid to associate it with the request
-        Long xid = this.getSessionContext().getNextXid();
-
-        LOG.debug("Prepare port statistics request for all ports of node {} - TrasactionId - {}", arg0.getNode()
-                .getValue(), xid);
-
-        // Create multipart request header
-        MultipartRequestInputBuilder mprInput = new MultipartRequestInputBuilder();
-        mprInput.setType(MultipartType.OFPMPPORTSTATS);
-        mprInput.setVersion(version);
-        mprInput.setXid(xid);
-        mprInput.setFlags(new MultipartRequestFlags(false));
-
-        // Create multipart request body to fetch stats for all the port of the
-        // node
-        MultipartRequestPortStatsCaseBuilder caseBuilder = new MultipartRequestPortStatsCaseBuilder();
-        MultipartRequestPortStatsBuilder mprPortStatsBuilder = new MultipartRequestPortStatsBuilder();
-        // Select all ports
-        mprPortStatsBuilder.setPortNo(OFConstants.OFPP_ANY);
-        caseBuilder.setMultipartRequestPortStats(mprPortStatsBuilder.build());
-
-        // Set request body to main multipart request
-        mprInput.setMultipartRequestBody(caseBuilder.build());
-
-        // Send the request, no cookies associated, use any connection
-        LOG.debug("Send port statistics request :{}", mprPortStatsBuilder.build().toString());
-        this.messageService.multipartRequest(mprInput.build(), null);
-
-        // Prepare rpc return output. Set xid and send it back.
-        GetAllNodeConnectorsStatisticsOutputBuilder output = new GetAllNodeConnectorsStatisticsOutputBuilder();
-        output.setTransactionId(generateTransactionId(xid));
-
-        Collection<RpcError> errors = Collections.emptyList();
-        RpcResult<GetAllNodeConnectorsStatisticsOutput> rpcResult = Rpcs.getRpcResult(true, output.build(), errors);
-        return Futures.immediateFuture(rpcResult);
+            final GetAllNodeConnectorsStatisticsInput input) {
+        LOG.debug("Calling the getAllNodeConnectorsStatistics RPC method on MessageDispatchService");
+
+        OFRpcTask<GetAllNodeConnectorsStatisticsInput, RpcResult<GetAllNodeConnectorsStatisticsOutput>> task =
+                OFRpcTaskFactory.createGetAllNodeConnectorsStatisticsTask(rpcTaskContext, input, null);
+        return task.submit();
     }
 
     @Override
     public Future<RpcResult<GetNodeConnectorStatisticsOutput>> getNodeConnectorStatistics(
-            GetNodeConnectorStatisticsInput arg0) {
-        // Generate xid to associate it with the request
-        Long xid = this.getSessionContext().getNextXid();
-
-        LOG.debug("Prepare port statistics request for port {} of node {} - TrasactionId - {}",
-                arg0.getNodeConnectorId(), arg0.getNode().getValue(), xid);
-
-        // Create multipart request header
-        MultipartRequestInputBuilder mprInput = new MultipartRequestInputBuilder();
-        mprInput.setType(MultipartType.OFPMPPORTSTATS);
-        mprInput.setVersion(version);
-        mprInput.setXid(xid);
-        mprInput.setFlags(new MultipartRequestFlags(false));
-
-        // Create multipart request body to fetch stats for all the port of the
-        // node
-        MultipartRequestPortStatsCaseBuilder caseBuilder = new MultipartRequestPortStatsCaseBuilder();
-        MultipartRequestPortStatsBuilder mprPortStatsBuilder = new MultipartRequestPortStatsBuilder();
-
-        // Set specific port
-        mprPortStatsBuilder
-                .setPortNo(InventoryDataServiceUtil.portNumberfromNodeConnectorId(arg0.getNodeConnectorId()));
-        caseBuilder.setMultipartRequestPortStats(mprPortStatsBuilder.build());
-
-        // Set request body to main multipart request
-        mprInput.setMultipartRequestBody(caseBuilder.build());
-
-        // Send the request, no cookies associated, use any connection
-        LOG.debug("Send port statistics request :{}", mprPortStatsBuilder.build().toString());
-        this.messageService.multipartRequest(mprInput.build(), null);
-
-        // Prepare rpc return output. Set xid and send it back.
-        GetNodeConnectorStatisticsOutputBuilder output = new GetNodeConnectorStatisticsOutputBuilder();
-        output.setTransactionId(generateTransactionId(xid));
-
-        Collection<RpcError> errors = Collections.emptyList();
-        RpcResult<GetNodeConnectorStatisticsOutput> rpcResult = Rpcs.getRpcResult(true, output.build(), errors);
-        return Futures.immediateFuture(rpcResult);
-    }
-
-    private TransactionId generateTransactionId(Long xid) {
-        String stringXid = xid.toString();
-        BigInteger bigIntXid = new BigInteger(stringXid);
-        return new TransactionId(bigIntXid);
-
-    }
+            final GetNodeConnectorStatisticsInput input) {
+        LOG.debug("Calling the getNodeConnectorStatistics RPC method on MessageDispatchService");
 
-    @Override
-    public Future<RpcResult<GetPortOutput>> getPort() {
-        // TODO Auto-generated method stub
-        return null;
+        OFRpcTask<GetNodeConnectorStatisticsInput, RpcResult<GetNodeConnectorStatisticsOutput>> task =
+                OFRpcTaskFactory.createGetNodeConnectorStatisticsTask(rpcTaskContext, input, null);
+        return task.submit();
     }
 
     @Override
-    public Future<RpcResult<UpdatePortOutput>> updatePort(UpdatePortInput input) {
-        PortModInput ofPortModInput = null;
-        RpcResult<UpdatePortOutput> rpcResultFromOFLib = null;
-
-        // For Flow provisioning, the SwitchConnectionDistinguisher is set to
-        // null so
-        // the request can be routed through any connection to the switch
-
-        SwitchConnectionDistinguisher cookie = null;
-
-        // NSF sends a list of port and the ModelDrivenSwitch will
-        // send one port at a time towards the switch ( mutiple RPCs calls)
-        List<Port> inputPorts = input.getUpdatedPort().getPort().getPort();
-
-        // Get the Xid. The same Xid has to be sent in all the RPCs
-        Long Xid = sessionContext.getNextXid();
-
-        for (Port inputPort : inputPorts) {
-
-            // Convert the UpdateGroupInput to GroupModInput
-            ofPortModInput = PortConvertor.toPortModInput(inputPort, version);
-
-            // Insert the Xid ( transaction Id) before calling the RPC on the
-            // OFLibrary
-
-            PortModInputBuilder mdInput = new PortModInputBuilder();
-            mdInput.setXid(Xid);
-            mdInput.setVersion(ofPortModInput.getVersion());
-            mdInput.setPortNo(ofPortModInput.getPortNo());
-            mdInput.setMaskV10(ofPortModInput.getMaskV10());
-            mdInput.setMask(ofPortModInput.getMask());
-            mdInput.setHwAddress(ofPortModInput.getHwAddress());
-            mdInput.setConfigV10(ofPortModInput.getConfigV10());
-            mdInput.setConfig(ofPortModInput.getConfig());
-            mdInput.setAdvertiseV10(ofPortModInput.getAdvertiseV10());
-            mdInput.setAdvertise(ofPortModInput.getAdvertise());
-
-            LOG.debug("Calling the PortMod RPC method on MessageDispatchService");
-            Future<RpcResult<UpdatePortOutput>> resultFromOFLib = messageService.portMod(ofPortModInput, cookie);
-
-            try {
-                rpcResultFromOFLib = resultFromOFLib.get();
-            } catch (Exception ex) {
-                LOG.error(" Error while getting result for updatePort RPC" + ex.getMessage());
-            }
-
-            // The Future response value for all the RPCs except the last one is
-            // ignored
-
-        }
-        // Extract the Xid only from the Future for the last RPC and
-        // send it back to the NSF
-        UpdatePortOutput updatePortOutputOFLib = rpcResultFromOFLib.getResult();
-
-        UpdatePortOutputBuilder updatePortOutput = new UpdatePortOutputBuilder();
-        updatePortOutput.setTransactionId(updatePortOutputOFLib.getTransactionId());
-        UpdatePortOutput result = updatePortOutput.build();
-
-        Collection<RpcError> errors = rpcResultFromOFLib.getErrors();
-        RpcResult<UpdatePortOutput> rpcResult = Rpcs.getRpcResult(true, result, errors);
-
-        LOG.debug("Returning the Update Group RPC result to MD-SAL");
-        return Futures.immediateFuture(rpcResult);
+    public Future<RpcResult<UpdatePortOutput>> updatePort(final UpdatePortInput input) {
+        LOG.debug("Calling the updatePort RPC method on MessageDispatchService");
 
+        OFRpcTask<UpdatePortInput, RpcResult<UpdatePortOutput>> task =
+                OFRpcTaskFactory.createUpdatePortTask(rpcTaskContext, input, null);
+        return task.submit();
     }
 
     @Override
-    public Future<RpcResult<UpdateTableOutput>> updateTable(UpdateTableInput input) {
-
-        // Get the Xid. The same Xid has to be sent in all the Multipart
-        // requests
-        Long xid = this.getSessionContext().getNextXid();
-
-        LOG.debug("Prepare the Multipart Table Mod requests for Transaction Id {} ", xid);
-
-        // Create multipart request header
-        MultipartRequestInputBuilder mprInput = new MultipartRequestInputBuilder();
-        mprInput.setType(MultipartType.OFPMPTABLEFEATURES);
-        mprInput.setVersion((short) 0x04);
-        mprInput.setXid(xid);
-
-        // Convert the list of all MD-SAL table feature object into OF library
-        // object
-        List<TableFeatures> ofTableFeatureList = TableFeaturesConvertor.toTableFeaturesRequest(input.getUpdatedTable());
-
-        MultipartRequestTableFeaturesCaseBuilder caseRequest = new MultipartRequestTableFeaturesCaseBuilder();
-        MultipartRequestTableFeaturesBuilder tableFeaturesRequest = new MultipartRequestTableFeaturesBuilder();
-
-        mprInput.setFlags(new MultipartRequestFlags(false));
-
-        tableFeaturesRequest.setTableFeatures(ofTableFeatureList);
-
-        // Set request body to main multipart request
-        caseRequest.setMultipartRequestTableFeatures(tableFeaturesRequest.build());
-        mprInput.setMultipartRequestBody(caseRequest.build());
-
-        // Send the request, no cookies associated, use any connection
-        LOG.debug("Send Table Feature request :{}", ofTableFeatureList);
-        this.messageService.multipartRequest(mprInput.build(), null);
-
-        // Extract the Xid only from the Future for the last RPC and
-        // send it back to the NSF
-        LOG.debug("Returning the result and transaction id to NSF");
-        LOG.debug("Return results and transaction id back to caller");
-        UpdateTableOutputBuilder output = new UpdateTableOutputBuilder();
-        output.setTransactionId(generateTransactionId(xid));
+    public Future<RpcResult<UpdateTableOutput>> updateTable(final UpdateTableInput input) {
+        LOG.debug("Calling the updateTable RPC method on MessageDispatchService");
 
-        Collection<RpcError> errors = Collections.emptyList();
-        RpcResult<UpdateTableOutput> rpcResult = Rpcs.getRpcResult(true, output.build(), errors);
-        return Futures.immediateFuture(rpcResult);
+        OFRpcTask<UpdateTableInput, RpcResult<UpdateTableOutput>> task =
+                OFRpcTaskFactory.createUpdateTableTask(rpcTaskContext, input, null);
+        return task.submit();
     }
 
     @Override
     public Future<RpcResult<GetAllFlowStatisticsFromFlowTableOutput>> getAllFlowStatisticsFromFlowTable(
-            GetAllFlowStatisticsFromFlowTableInput arg0) {
-
-        // Generate xid to associate it with the request
-        Long xid = this.getSessionContext().getNextXid();
-
-        LOG.debug("Prepare statistics request to get flow stats for switch tables {} - Transaction id - {}", arg0
-                .getTableId().getValue(), xid);
-
-        // Create multipart request header
-        MultipartRequestInputBuilder mprInput = new MultipartRequestInputBuilder();
-        mprInput.setType(MultipartType.OFPMPFLOW);
-        mprInput.setVersion(version);
-        mprInput.setXid(xid);
-        mprInput.setFlags(new MultipartRequestFlags(false));
-
-        // Create multipart request body for fetch all the group stats
-        MultipartRequestFlowCaseBuilder multipartRequestFlowCaseBuilder = new MultipartRequestFlowCaseBuilder();
-        MultipartRequestFlowBuilder mprFlowRequestBuilder = new MultipartRequestFlowBuilder();
-        mprFlowRequestBuilder.setTableId(arg0.getTableId().getValue());
-        mprFlowRequestBuilder.setOutPort(OFConstants.OFPP_ANY);
-        mprFlowRequestBuilder.setOutGroup(OFConstants.OFPG_ANY);
-        mprFlowRequestBuilder.setCookie(OFConstants.DEFAULT_COOKIE);
-        mprFlowRequestBuilder.setCookieMask(OFConstants.DEFAULT_COOKIE_MASK);
-        FlowCreatorUtil.setWildcardedFlowMatch(version, mprFlowRequestBuilder);
-
-        // Set request body to main multipart request
-        multipartRequestFlowCaseBuilder.setMultipartRequestFlow(mprFlowRequestBuilder.build());
-        mprInput.setMultipartRequestBody(multipartRequestFlowCaseBuilder.build());
-
-        // Send the request, no cookies associated, use any connection
-        LOG.debug("Send flow statistics request to the switch :{}", mprFlowRequestBuilder);
-        this.messageService.multipartRequest(mprInput.build(), null);
-
-        // Prepare rpc return output. Set xid and send it back.
-        LOG.debug("Return results and transaction id back to caller");
-        GetAllFlowStatisticsFromFlowTableOutputBuilder output = new GetAllFlowStatisticsFromFlowTableOutputBuilder();
-        output.setTransactionId(generateTransactionId(xid));
-        output.setFlowAndStatisticsMapList(null);
-
-        Collection<RpcError> errors = Collections.emptyList();
-        RpcResult<GetAllFlowStatisticsFromFlowTableOutput> rpcResult = Rpcs.getRpcResult(true, output.build(), errors);
-        return Futures.immediateFuture(rpcResult);
+            final GetAllFlowStatisticsFromFlowTableInput input) {
+        LOG.debug("Calling the getAllFlowStatisticsFromFlowTable RPC method on MessageDispatchService");
+
+        OFRpcTask<GetAllFlowStatisticsFromFlowTableInput, RpcResult<GetAllFlowStatisticsFromFlowTableOutput>> task =
+                OFRpcTaskFactory.createGetAllFlowStatisticsFromFlowTableTask(rpcTaskContext, input, null);
+        return task.submit();
     }
 
     @Override
     public Future<RpcResult<GetAllFlowsStatisticsFromAllFlowTablesOutput>> getAllFlowsStatisticsFromAllFlowTables(
-            GetAllFlowsStatisticsFromAllFlowTablesInput arg0) {
-
-        // Generate xid to associate it with the request
-        Long xid = this.getSessionContext().getNextXid();
-
-        LOG.debug("Prepare statistics request to get flow stats of all switch tables - Transaction id - {}", xid);
-
-        // Create multipart request header
-        MultipartRequestInputBuilder mprInput = new MultipartRequestInputBuilder();
-        mprInput.setType(MultipartType.OFPMPFLOW);
-        mprInput.setVersion(version);
-        mprInput.setXid(xid);
-        mprInput.setFlags(new MultipartRequestFlags(false));
-
-        // Create multipart request body for fetch all the group stats
-        MultipartRequestFlowCaseBuilder multipartRequestFlowCaseBuilder = new MultipartRequestFlowCaseBuilder();
-        MultipartRequestFlowBuilder mprFlowRequestBuilder = new MultipartRequestFlowBuilder();
-        mprFlowRequestBuilder.setTableId(OFConstants.OFPTT_ALL);
-        mprFlowRequestBuilder.setOutPort(OFConstants.OFPP_ANY);
-        mprFlowRequestBuilder.setOutGroup(OFConstants.OFPG_ANY);
-        mprFlowRequestBuilder.setCookie(OFConstants.DEFAULT_COOKIE);
-        mprFlowRequestBuilder.setCookieMask(OFConstants.DEFAULT_COOKIE_MASK);
-        mprFlowRequestBuilder.setCookieMask(OFConstants.DEFAULT_COOKIE_MASK);
-
-        FlowCreatorUtil.setWildcardedFlowMatch(version, mprFlowRequestBuilder);
-
-        // Set request body to main multipart request
-        multipartRequestFlowCaseBuilder.setMultipartRequestFlow(mprFlowRequestBuilder.build());
-        mprInput.setMultipartRequestBody(multipartRequestFlowCaseBuilder.build());
-
-        // Send the request, no cookies associated, use any connection
-        LOG.debug("Send flow statistics request to the switch :{}", mprFlowRequestBuilder);
-        this.messageService.multipartRequest(mprInput.build(), null);
-
-        // Prepare rpc return output. Set xid and send it back.
-        GetAllFlowsStatisticsFromAllFlowTablesOutputBuilder output = new GetAllFlowsStatisticsFromAllFlowTablesOutputBuilder();
-        output.setTransactionId(generateTransactionId(xid));
-        output.setFlowAndStatisticsMapList(null);
-
-        Collection<RpcError> errors = Collections.emptyList();
-        RpcResult<GetAllFlowsStatisticsFromAllFlowTablesOutput> rpcResult = Rpcs.getRpcResult(true, output.build(),
-                errors);
-        return Futures.immediateFuture(rpcResult);
+            final GetAllFlowsStatisticsFromAllFlowTablesInput input) {
+        LOG.debug("Calling the getAllFlowsStatisticsFromAllFlowTables RPC method on MessageDispatchService");
 
+        OFRpcTask<GetAllFlowsStatisticsFromAllFlowTablesInput, RpcResult<GetAllFlowsStatisticsFromAllFlowTablesOutput>> task =
+                OFRpcTaskFactory.createGetAllFlowsStatisticsFromAllFlowTablesTask(rpcTaskContext, input, null);
+        return task.submit();
     }
 
     @Override
     public Future<RpcResult<GetFlowStatisticsFromFlowTableOutput>> getFlowStatisticsFromFlowTable(
-            GetFlowStatisticsFromFlowTableInput arg0) {
-        // Generate xid to associate it with the request
-        Long xid = this.getSessionContext().getNextXid();
-
-        LOG.debug("Prepare statistics request to get stats for flow {} for switch tables {} - Transaction id - {}",
-                arg0.getMatch().toString(), arg0.getTableId(), xid);
-
-        // Create multipart request header
-        MultipartRequestInputBuilder mprInput = new MultipartRequestInputBuilder();
-        mprInput.setType(MultipartType.OFPMPFLOW);
-        mprInput.setVersion(version);
-        mprInput.setXid(xid);
-        mprInput.setFlags(new MultipartRequestFlags(false));
-
-        // Create multipart request body for fetch all the group stats
-        MultipartRequestFlowCaseBuilder multipartRequestFlowCaseBuilder = new MultipartRequestFlowCaseBuilder();
-        MultipartRequestFlowBuilder mprFlowRequestBuilder = new MultipartRequestFlowBuilder();
-        mprFlowRequestBuilder.setTableId(arg0.getTableId());
-
-        if (arg0.getOutPort() != null)
-            mprFlowRequestBuilder.setOutPort(arg0.getOutPort().longValue());
-        else
-            mprFlowRequestBuilder.setOutPort(OFConstants.OFPP_ANY);
-
-        if (arg0.getOutGroup() != null)
-            mprFlowRequestBuilder.setOutGroup(arg0.getOutGroup());
-        else
-            mprFlowRequestBuilder.setOutGroup(OFConstants.OFPG_ANY);
-
-        if (arg0.getCookie() != null)
-            mprFlowRequestBuilder.setCookie(arg0.getCookie());
-        else
-            mprFlowRequestBuilder.setCookie(OFConstants.DEFAULT_COOKIE);
-
-        if (arg0.getCookieMask() != null)
-            mprFlowRequestBuilder.setCookieMask(arg0.getCookieMask());
-        else
-            mprFlowRequestBuilder.setCookieMask(OFConstants.DEFAULT_COOKIE_MASK);
-
-        // convert and inject match
-        MatchReactor.getInstance().convert(arg0.getMatch(), version, mprFlowRequestBuilder,
-                this.getSessionContext().getFeatures().getDatapathId());
-
-        // Set request body to main multipart request
-        multipartRequestFlowCaseBuilder.setMultipartRequestFlow(mprFlowRequestBuilder.build());
-        mprInput.setMultipartRequestBody(multipartRequestFlowCaseBuilder.build());
-
-        // Send the request, no cookies associated, use any connection
-        LOG.debug("Send flow statistics request to the switch :{}", mprFlowRequestBuilder);
-        this.messageService.multipartRequest(mprInput.build(), null);
-
-        // Prepare rpc return output. Set xid and send it back.
-        GetFlowStatisticsFromFlowTableOutputBuilder output = new GetFlowStatisticsFromFlowTableOutputBuilder();
-        output.setTransactionId(generateTransactionId(xid));
-        output.setFlowAndStatisticsMapList(null);
-
-        Collection<RpcError> errors = Collections.emptyList();
-        RpcResult<GetFlowStatisticsFromFlowTableOutput> rpcResult = Rpcs.getRpcResult(true, output.build(), errors);
-        return Futures.immediateFuture(rpcResult);
+            final GetFlowStatisticsFromFlowTableInput input) {
+        LOG.debug("Calling the getFlowStatisticsFromFlowTable RPC method on MessageDispatchService");
+
+        OFRpcTask<GetFlowStatisticsFromFlowTableInput, RpcResult<GetFlowStatisticsFromFlowTableOutput>> task =
+                OFRpcTaskFactory.createGetFlowStatisticsFromFlowTableTask(rpcTaskContext, input, null);
+        return task.submit();
     }
 
     @Override
     public Future<RpcResult<GetAggregateFlowStatisticsFromFlowTableForAllFlowsOutput>> getAggregateFlowStatisticsFromFlowTableForAllFlows(
-            GetAggregateFlowStatisticsFromFlowTableForAllFlowsInput arg0) {
-        // Generate xid to associate it with the request
-        Long xid = this.getSessionContext().getNextXid();
-
-        LOG.debug(
-                "Prepare aggregate flow statistics request to get aggregate flow stats for all the flow installed on switch table {} - Transaction id - {}",
-                arg0.getTableId().getValue(), xid);
-
-        // Create multipart request header
-        MultipartRequestInputBuilder mprInput = new MultipartRequestInputBuilder();
-        mprInput.setType(MultipartType.OFPMPAGGREGATE);
-        mprInput.setVersion(version);
-        mprInput.setXid(xid);
-        mprInput.setFlags(new MultipartRequestFlags(false));
-
-        // Create multipart request body for fetch all the group stats
-        MultipartRequestAggregateCaseBuilder multipartRequestAggregateCaseBuilder = new MultipartRequestAggregateCaseBuilder();
-        MultipartRequestAggregateBuilder mprAggregateRequestBuilder = new MultipartRequestAggregateBuilder();
-        mprAggregateRequestBuilder.setTableId(arg0.getTableId().getValue());
-        mprAggregateRequestBuilder.setOutPort(OFConstants.OFPP_ANY);
-        mprAggregateRequestBuilder.setOutGroup(OFConstants.OFPG_ANY);
-        mprAggregateRequestBuilder.setCookie(OFConstants.DEFAULT_COOKIE);
-        mprAggregateRequestBuilder.setCookieMask(OFConstants.DEFAULT_COOKIE_MASK);
-
-        FlowCreatorUtil.setWildcardedFlowMatch(version, mprAggregateRequestBuilder);
-
-        // Set request body to main multipart request
-        multipartRequestAggregateCaseBuilder.setMultipartRequestAggregate(mprAggregateRequestBuilder.build());
-        mprInput.setMultipartRequestBody(multipartRequestAggregateCaseBuilder.build());
-
-        // Send the request, no cookies associated, use any connection
-        LOG.debug("Send request to the switch :{}", multipartRequestAggregateCaseBuilder.build().toString());
-        this.messageService.multipartRequest(mprInput.build(), null);
-
-        // Prepare rpc return output. Set xid and send it back.
-        GetAggregateFlowStatisticsFromFlowTableForAllFlowsOutputBuilder output = new GetAggregateFlowStatisticsFromFlowTableForAllFlowsOutputBuilder();
-        output.setTransactionId(generateTransactionId(xid));
-
-        Collection<RpcError> errors = Collections.emptyList();
-        RpcResult<GetAggregateFlowStatisticsFromFlowTableForAllFlowsOutput> rpcResult = Rpcs.getRpcResult(true,
-                output.build(), errors);
-        return Futures.immediateFuture(rpcResult);
+            final GetAggregateFlowStatisticsFromFlowTableForAllFlowsInput input) {
+        LOG.debug("Calling the getAggregateFlowStatisticsFromFlowTableForAllFlows RPC method on MessageDispatchService");
+
+        OFRpcTask<GetAggregateFlowStatisticsFromFlowTableForAllFlowsInput, RpcResult<GetAggregateFlowStatisticsFromFlowTableForAllFlowsOutput>> task =
+                OFRpcTaskFactory.createGetAggregateFlowStatisticsFromFlowTableForAllFlowsTask(rpcTaskContext, input, null);
+        return task.submit();
     }
 
     @Override
     public Future<RpcResult<GetAggregateFlowStatisticsFromFlowTableForGivenMatchOutput>> getAggregateFlowStatisticsFromFlowTableForGivenMatch(
-            GetAggregateFlowStatisticsFromFlowTableForGivenMatchInput arg0) {
-
-        // Generate xid to associate it with the request
-        Long xid = this.getSessionContext().getNextXid();
-
-        LOG.debug(
-                "Prepare aggregate statistics request to get aggregate stats for flows matching {} and installed in flow tables {} - Transaction id - {}",
-                arg0.getMatch().toString(), arg0.getTableId(), xid);
-
-        // Create multipart request header
-        MultipartRequestInputBuilder mprInput = new MultipartRequestInputBuilder();
-        mprInput.setType(MultipartType.OFPMPAGGREGATE);
-        mprInput.setVersion(version);
-        mprInput.setXid(xid);
-        mprInput.setFlags(new MultipartRequestFlags(false));
-
-        // Create multipart request body for fetch all the group stats
-        MultipartRequestAggregateCaseBuilder multipartRequestAggregateCaseBuilder = new MultipartRequestAggregateCaseBuilder();
-        MultipartRequestAggregateBuilder mprAggregateRequestBuilder = new MultipartRequestAggregateBuilder();
-        mprAggregateRequestBuilder.setTableId(arg0.getTableId());
-        mprAggregateRequestBuilder.setOutPort(arg0.getOutPort().longValue());
-        mprAggregateRequestBuilder.setOutGroup(OFConstants.OFPG_ANY);
-        mprAggregateRequestBuilder.setCookie(OFConstants.DEFAULT_COOKIE);
-        mprAggregateRequestBuilder.setCookieMask(OFConstants.DEFAULT_COOKIE_MASK);
-
-        MatchReactor.getInstance().convert(arg0.getMatch(), version, mprAggregateRequestBuilder,
-                this.getSessionContext().getFeatures().getDatapathId());
-        // TODO: repeating code
-        if (version == OFConstants.OFP_VERSION_1_3) {
-            mprAggregateRequestBuilder.setCookie(arg0.getCookie());
-            mprAggregateRequestBuilder.setCookieMask(arg0.getCookieMask());
-            mprAggregateRequestBuilder.setOutGroup(arg0.getOutGroup());
-        }
-
-        // Set request body to main multipart request
-        multipartRequestAggregateCaseBuilder.setMultipartRequestAggregate(mprAggregateRequestBuilder.build());
-        mprInput.setMultipartRequestBody(multipartRequestAggregateCaseBuilder.build());
-
-        // Send the request, no cookies associated, use any connection
-        LOG.debug("Send request to the switch :{}", multipartRequestAggregateCaseBuilder.build().toString());
-        this.messageService.multipartRequest(mprInput.build(), null);
-
-        // Prepare rpc return output. Set xid and send it back.
-        GetAggregateFlowStatisticsFromFlowTableForGivenMatchOutputBuilder output = new GetAggregateFlowStatisticsFromFlowTableForGivenMatchOutputBuilder();
-        output.setTransactionId(generateTransactionId(xid));
+            final GetAggregateFlowStatisticsFromFlowTableForGivenMatchInput input) {
+        LOG.debug("Calling the getAggregateFlowStatisticsFromFlowTableForGivenMatch RPC method on MessageDispatchService");
 
-        Collection<RpcError> errors = Collections.emptyList();
-        RpcResult<GetAggregateFlowStatisticsFromFlowTableForGivenMatchOutput> rpcResult = Rpcs.getRpcResult(true,
-                output.build(), errors);
-        return Futures.immediateFuture(rpcResult);
+        OFRpcTask<GetAggregateFlowStatisticsFromFlowTableForGivenMatchInput, RpcResult<GetAggregateFlowStatisticsFromFlowTableForGivenMatchOutput>> task =
+                OFRpcTaskFactory.createGetAggregateFlowStatisticsFromFlowTableForGivenMatchTask(rpcTaskContext, input, null);
+        return task.submit();
     }
 
     @Override
-    public Future<RpcResult<GetFlowTablesStatisticsOutput>> getFlowTablesStatistics(GetFlowTablesStatisticsInput arg0) {
-        // Generate xid to associate it with the request
-        Long xid = this.getSessionContext().getNextXid();
-
-        LOG.debug("Prepare flow table statistics request to get flow table stats for all tables "
-                + "from node {}- Transaction id - {}", arg0.getNode(), xid);
-
-        // Create multipart request header
-        MultipartRequestInputBuilder mprInput = new MultipartRequestInputBuilder();
-        mprInput.setType(MultipartType.OFPMPTABLE);
-        mprInput.setVersion(version);
-        mprInput.setXid(xid);
-        mprInput.setFlags(new MultipartRequestFlags(false));
-
-        // Create multipart request body for fetch all the group stats
-        MultipartRequestTableCaseBuilder multipartRequestTableCaseBuilder = new MultipartRequestTableCaseBuilder();
-        MultipartRequestTableBuilder multipartRequestTableBuilder = new MultipartRequestTableBuilder();
-        multipartRequestTableBuilder.setEmpty(true);
-        multipartRequestTableCaseBuilder.setMultipartRequestTable(multipartRequestTableBuilder.build());
-
-        // Set request body to main multipart request
-        mprInput.setMultipartRequestBody(multipartRequestTableCaseBuilder.build());
-
-        // Send the request, no cookies associated, use any connection
-        LOG.debug("Send request to the switch :{}", multipartRequestTableCaseBuilder.build().toString());
-        this.messageService.multipartRequest(mprInput.build(), null);
-
-        // Prepare rpc return output. Set xid and send it back.
-        GetFlowTablesStatisticsOutputBuilder output = new GetFlowTablesStatisticsOutputBuilder();
-        output.setTransactionId(generateTransactionId(xid));
-
-        Collection<RpcError> errors = Collections.emptyList();
-        RpcResult<GetFlowTablesStatisticsOutput> rpcResult = Rpcs.getRpcResult(true, output.build(), errors);
-        return Futures.immediateFuture(rpcResult);
+    public Future<RpcResult<GetFlowTablesStatisticsOutput>> getFlowTablesStatistics(
+            final GetFlowTablesStatisticsInput input) {
+        LOG.debug("Calling the getFlowTablesStatistics RPC method on MessageDispatchService");
+
+        OFRpcTask<GetFlowTablesStatisticsInput, RpcResult<GetFlowTablesStatisticsOutput>> task =
+                OFRpcTaskFactory.createGetFlowTablesStatisticsTask(rpcTaskContext, input, null);
+        return task.submit();
     }
 
     @Override
     public Future<RpcResult<GetAllQueuesStatisticsFromAllPortsOutput>> getAllQueuesStatisticsFromAllPorts(
-            GetAllQueuesStatisticsFromAllPortsInput arg0) {
-        // Generate xid to associate it with the request
-        Long xid = this.getSessionContext().getNextXid();
-
-        LOG.debug(
-                "Prepare queue statistics request to collect stats for all queues attached to all the ports of node {} - TrasactionId - {}",
-                arg0.getNode().getValue(), xid);
-
-        // Create multipart request header
-        MultipartRequestInputBuilder mprInput = new MultipartRequestInputBuilder();
-        mprInput.setType(MultipartType.OFPMPQUEUE);
-        mprInput.setVersion(version);
-        mprInput.setXid(xid);
-        mprInput.setFlags(new MultipartRequestFlags(false));
-
-        // Create multipart request body to fetch stats for all the port of the
-        // node
-        MultipartRequestQueueCaseBuilder caseBuilder = new MultipartRequestQueueCaseBuilder();
-        MultipartRequestQueueBuilder mprQueueBuilder = new MultipartRequestQueueBuilder();
-        // Select all ports
-        mprQueueBuilder.setPortNo(OFConstants.OFPP_ANY);
-        // Select all the ports
-        mprQueueBuilder.setQueueId(OFConstants.OFPQ_ANY);
-
-        caseBuilder.setMultipartRequestQueue(mprQueueBuilder.build());
-
-        // Set request body to main multipart request
-        mprInput.setMultipartRequestBody(caseBuilder.build());
-
-        // Send the request, no cookies associated, use any connection
-        LOG.debug("Send queue statistics request :{}", mprQueueBuilder.build().toString());
-        this.messageService.multipartRequest(mprInput.build(), null);
-
-        // Prepare rpc return output. Set xid and send it back.
-        GetAllQueuesStatisticsFromAllPortsOutputBuilder output = new GetAllQueuesStatisticsFromAllPortsOutputBuilder();
-        output.setTransactionId(generateTransactionId(xid));
-        output.setQueueIdAndStatisticsMap(null);
-
-        Collection<RpcError> errors = Collections.emptyList();
-        RpcResult<GetAllQueuesStatisticsFromAllPortsOutput> rpcResult = Rpcs.getRpcResult(true, output.build(), errors);
-        return Futures.immediateFuture(rpcResult);
+            final GetAllQueuesStatisticsFromAllPortsInput input) {
+        LOG.debug("Calling the getAllQueuesStatisticsFromAllPorts RPC method on MessageDispatchService");
+
+        OFRpcTask<GetAllQueuesStatisticsFromAllPortsInput, RpcResult<GetAllQueuesStatisticsFromAllPortsOutput>> task =
+                OFRpcTaskFactory.createGetAllQueuesStatisticsFromAllPortsTask(rpcTaskContext, input, null);
+        return task.submit();
     }
 
     @Override
     public Future<RpcResult<GetAllQueuesStatisticsFromGivenPortOutput>> getAllQueuesStatisticsFromGivenPort(
-            GetAllQueuesStatisticsFromGivenPortInput arg0) {
-        // Generate xid to associate it with the request
-        Long xid = this.getSessionContext().getNextXid();
-
-        LOG.debug("Prepare queue statistics request to collect stats for "
-                + "all queues attached to given port {} of node {} - TrasactionId - {}", arg0.getNodeConnectorId()
-                .toString(), arg0.getNode().getValue(), xid);
-
-        // Create multipart request header
-        MultipartRequestInputBuilder mprInput = new MultipartRequestInputBuilder();
-        mprInput.setType(MultipartType.OFPMPQUEUE);
-        mprInput.setVersion(version);
-        mprInput.setXid(xid);
-        mprInput.setFlags(new MultipartRequestFlags(false));
-
-        // Create multipart request body to fetch stats for all the port of the
-        // node
-        MultipartRequestQueueCaseBuilder caseBuilder = new MultipartRequestQueueCaseBuilder();
-        MultipartRequestQueueBuilder mprQueueBuilder = new MultipartRequestQueueBuilder();
-        // Select all queues
-        mprQueueBuilder.setQueueId(OFConstants.OFPQ_ANY);
-        // Select specific port
-        mprQueueBuilder.setPortNo(InventoryDataServiceUtil.portNumberfromNodeConnectorId(arg0.getNodeConnectorId()));
-
-        caseBuilder.setMultipartRequestQueue(mprQueueBuilder.build());
-
-        // Set request body to main multipart request
-        mprInput.setMultipartRequestBody(caseBuilder.build());
-
-        // Send the request, no cookies associated, use any connection
-        LOG.debug("Send queue statistics request :{}", mprQueueBuilder.build().toString());
-        this.messageService.multipartRequest(mprInput.build(), null);
-
-        // Prepare rpc return output. Set xid and send it back.
-        GetAllQueuesStatisticsFromGivenPortOutputBuilder output = new GetAllQueuesStatisticsFromGivenPortOutputBuilder();
-        output.setTransactionId(generateTransactionId(xid));
-        output.setQueueIdAndStatisticsMap(null);
-
-        Collection<RpcError> errors = Collections.emptyList();
-        RpcResult<GetAllQueuesStatisticsFromGivenPortOutput> rpcResult = Rpcs
-                .getRpcResult(true, output.build(), errors);
-        return Futures.immediateFuture(rpcResult);
+            final GetAllQueuesStatisticsFromGivenPortInput input) {
+        LOG.debug("Calling the getAllQueuesStatisticsFromGivenPort RPC method on MessageDispatchService");
+
+        OFRpcTask<GetAllQueuesStatisticsFromGivenPortInput, RpcResult<GetAllQueuesStatisticsFromGivenPortOutput>> task =
+                OFRpcTaskFactory.createGetAllQueuesStatisticsFromGivenPortTask(rpcTaskContext, input, null);
+        return task.submit();
     }
 
     @Override
     public Future<RpcResult<GetQueueStatisticsFromGivenPortOutput>> getQueueStatisticsFromGivenPort(
-            GetQueueStatisticsFromGivenPortInput arg0) {
-        // Generate xid to associate it with the request
-        Long xid = this.getSessionContext().getNextXid();
-
-        LOG.debug("Prepare queue statistics request to collect stats for "
-                + "given queue attached to given port {} of node {} - TrasactionId - {}", arg0.getQueueId().toString(),
-                arg0.getNodeConnectorId().toString(), arg0.getNode().getValue(), xid);
-
-        // Create multipart request header
-        MultipartRequestInputBuilder mprInput = new MultipartRequestInputBuilder();
-        mprInput.setType(MultipartType.OFPMPQUEUE);
-        mprInput.setVersion(version);
-        mprInput.setXid(xid);
-        mprInput.setFlags(new MultipartRequestFlags(false));
-
-        // Create multipart request body to fetch stats for all the port of the
-        // node
-        MultipartRequestQueueCaseBuilder caseBuilder = new MultipartRequestQueueCaseBuilder();
-        MultipartRequestQueueBuilder mprQueueBuilder = new MultipartRequestQueueBuilder();
-        // Select specific queue
-        mprQueueBuilder.setQueueId(arg0.getQueueId().getValue());
-        // Select specific port
-        mprQueueBuilder.setPortNo(InventoryDataServiceUtil.portNumberfromNodeConnectorId(arg0.getNodeConnectorId()));
-
-        caseBuilder.setMultipartRequestQueue(mprQueueBuilder.build());
-
-        // Set request body to main multipart request
-        mprInput.setMultipartRequestBody(caseBuilder.build());
-
-        // Send the request, no cookies associated, use any connection
-        LOG.debug("Send queue statistics request :{}", mprQueueBuilder.build().toString());
-        this.messageService.multipartRequest(mprInput.build(), null);
-
-        // Prepare rpc return output. Set xid and send it back.
-        GetQueueStatisticsFromGivenPortOutputBuilder output = new GetQueueStatisticsFromGivenPortOutputBuilder();
-        output.setTransactionId(generateTransactionId(xid));
-        output.setQueueIdAndStatisticsMap(null);
-
-        Collection<RpcError> errors = Collections.emptyList();
-        RpcResult<GetQueueStatisticsFromGivenPortOutput> rpcResult = Rpcs.getRpcResult(true, output.build(), errors);
-        return Futures.immediateFuture(rpcResult);
+            final GetQueueStatisticsFromGivenPortInput input) {
+        LOG.debug("Calling the getQueueStatisticsFromGivenPort RPC method on MessageDispatchService");
+
+        OFRpcTask<GetQueueStatisticsFromGivenPortInput, RpcResult<GetQueueStatisticsFromGivenPortOutput>> task =
+                OFRpcTaskFactory.createGetQueueStatisticsFromGivenPortTask(rpcTaskContext, input, null);
+        return task.submit();
     }
 
+    @Override
+    public Future<RpcResult<SetConfigOutput>> setConfig(SetConfigInput input) {
+        OFRpcTask<SetConfigInput, RpcResult<SetConfigOutput>> task = OFRpcTaskFactory.createSetNodeConfigTask(rpcTaskContext, input, null);
+        return task.submit();
+    }
 }