fix for BUG-956 - deadlock by rpc invocation
[openflowplugin.git] / openflowplugin / src / main / java / org / opendaylight / openflowplugin / openflow / md / core / sal / ModelDrivenSwitchImpl.java
index fa69121535ee2734b4254cd4cd08ce204670bae3..4b36178d2038169b066d7e06c54c8c9ecd2e1ebc 100644 (file)
@@ -13,7 +13,9 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 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;
@@ -21,22 +23,24 @@ import org.opendaylight.openflowplugin.openflow.md.core.SwitchConnectionDistingu
 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.openflow.md.core.sal.convertor.OpenflowEnumConstant;
+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.openflow.md.core.session.OFSessionUtil;
 import org.opendaylight.openflowplugin.openflow.md.core.session.SessionContext;
+import org.opendaylight.openflowplugin.openflow.md.core.session.TransactionKey;
+import org.opendaylight.openflowplugin.openflow.md.util.FlowCreatorUtil;
 import org.opendaylight.openflowplugin.openflow.md.util.InventoryDataServiceUtil;
 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.FlowRemovedBuilder;
 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;
@@ -46,23 +50,12 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.G
 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.GetAllFlowStatisticsInput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.GetAllFlowStatisticsOutput;
 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.GetAllNodeConnectorStatisticsInput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.GetAllNodeConnectorStatisticsOutput;
 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.statistics.rev130819.GetFlowStatisticsInput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.GetFlowStatisticsOutput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.GetFlowTableStatisticsInput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.GetFlowTableStatisticsOutput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.GetNodeConnectorStatisticsInput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.GetNodeConnectorStatisticsOutput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918.AddGroupOutput;
 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;
@@ -70,7 +63,11 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.transaction.rev131103.
 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;
@@ -94,6 +91,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.N
 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;
@@ -112,25 +112,24 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.
 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.FlowWildcardsV10;
 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.OxmMatchType;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.match.v10.grouping.MatchV10Builder;
-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.FlowModInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.match.grouping.Match;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.match.grouping.MatchBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.oxm.fields.grouping.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.GroupModInput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.MeterModInput;
+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.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;
@@ -140,6 +139,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
 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;
@@ -148,21 +148,29 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
 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.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.multipart.reply.table.features.TableFeatures;
 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.GetAllPortsStatisticsInput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.port.statistics.rev131214.GetAllPortsStatisticsOutput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.port.statistics.rev131214.GetAllPortsStatisticsOutputBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.port.statistics.rev131214.GetPortStatisticsInput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.port.statistics.rev131214.GetPortStatisticsOutput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.port.statistics.rev131214.GetPortStatisticsOutputBuilder;
+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;
@@ -171,90 +179,101 @@ 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;
+import com.google.common.util.concurrent.JdkFutureAdapters;
 
 /**
  * RPC implementation of MD-switch
  */
 public class ModelDrivenSwitchImpl extends AbstractModelDrivenSwitch {
 
-    private static final Logger LOG = org.slf4j.LoggerFactory
-            .getLogger(ModelDrivenSwitchImpl.class);
+    private static final Logger LOG = org.slf4j.LoggerFactory.getLogger(ModelDrivenSwitchImpl.class);
     private final NodeId nodeId;
-    private final IMessageDispatchService messageService ;
+    private final IMessageDispatchService messageService;
     private short version = 0;
-
-    protected ModelDrivenSwitchImpl(NodeId nodeId,
-            InstanceIdentifier<Node> identifier, SessionContext context) {
+    private final SessionContext session;
+    NotificationProviderService rpcNotificationProviderService;
+    private OFRpcTaskHelper rpcTaskHelper;
+    
+    // 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 context) {
         super(identifier, context);
         this.nodeId = nodeId;
-        messageService = sessionContext.getMessageDispatchService() ;
+        messageService = sessionContext.getMessageDispatchService();
         version = context.getPrimaryConductor().getVersion();
+        this.session = context;
+        rpcNotificationProviderService = OFSessionUtil.getSessionManager().getNotificationProviderService();
+        rpcTaskHelper = new OFRpcTaskHelper(messageService, context, rpcNotificationProviderService);
     }
 
     @Override
-    public Future<RpcResult<AddFlowOutput>> addFlow(AddFlowInput input) {
-       // Convert the AddFlowInput to FlowModInput
-        FlowModInput ofFlowModInput = FlowConvertor.toFlowModInput(input, version);
-
-       // For Flow provisioning, the SwitchConnectionDistinguisher is set to null so
-       // the request can be routed through any connection to the switch
-
-       SwitchConnectionDistinguisher cookie = null ;
-
-       LOG.debug("Calling the FlowMod RPC method on MessageDispatchService");
-               Future<RpcResult<UpdateFlowOutput>> resultFromOFLib = messageService.flowMod(ofFlowModInput, 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() ;
-
-       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);
+    public Future<RpcResult<AddFlowOutput>> addFlow(final AddFlowInput input) {
+        LOG.debug("Calling the FlowMod RPC method on MessageDispatchService");
+        // use primary connection
+        SwitchConnectionDistinguisher cookie = null;
+        
+        OFRpcTask<AddFlowInput, RpcResult<UpdateFlowOutput>> task = 
+                OFRpcTaskFactory.createAddFlowTask(maxTimeout, maxTimeoutUnit, rpcTaskHelper);
+        rpcTaskHelper.initTask(task, input, cookie);
+        OFSessionUtil.getSessionManager().getRpcPool().submit(task);
+        
+        return Futures.transform(JdkFutureAdapters.listenInPoolThread(task.getResult()), 
+                OFRpcFutureResultTransformFactory.createForAddFlowOutput());
     }
 
-    @Override
-    public Future<RpcResult<AddGroupOutput>> addGroup(AddGroupInput input) {
-       // Convert the AddGroupInput to GroupModInput
-        GroupModInput ofGroupModInput = GroupConvertor.toGroupModInput(input, version);
-
 
-       // For Flow provisioning, the SwitchConnectionDistinguisher is set to null so
-       // the request can be routed through any connection to the switch
+    @Override
+    public Future<RpcResult<AddGroupOutput>> addGroup(final AddGroupInput input) {
+        LOG.debug("Calling the GroupMod RPC method on MessageDispatchService");
+        Long xId = null;
 
-       SwitchConnectionDistinguisher cookie = null ;
+        // 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);
+        }
 
-       LOG.debug("Calling the GroupMod RPC method on MessageDispatchService");
-       Future<RpcResult<UpdateGroupOutput>> resultFromOFLib = messageService.groupMod(ofGroupModInput, 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());
+        }
 
-       RpcResult<UpdateGroupOutput> rpcResultFromOFLib = null ;
+        session.getbulkTransactionCache().put(new TransactionKey(xId), input);
+        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 AddGroup RPC" + ex.getMessage());
-       }
+        try {
+            rpcResultFromOFLib = resultFromOFLib.get();
+        } catch (Exception ex) {
+            LOG.error(" Error while getting result for AddGroup RPC" + ex.getMessage());
+        }
 
-       UpdateGroupOutput updateGroupOutput = rpcResultFromOFLib.getResult() ;
+        UpdateGroupOutput updateGroupOutput = rpcResultFromOFLib.getResult();
 
-       AddGroupOutputBuilder addGroupOutput = new AddGroupOutputBuilder() ;
-       addGroupOutput.setTransactionId(updateGroupOutput.getTransactionId()) ;
-       AddGroupOutput result = addGroupOutput.build();
+        AddGroupOutputBuilder addGroupOutput = new AddGroupOutputBuilder();
+        addGroupOutput.setTransactionId(updateGroupOutput.getTransactionId());
+        AddGroupOutput result = addGroupOutput.build();
 
-       Collection<RpcError> errors = rpcResultFromOFLib.getErrors() ;
+        Collection<RpcError> errors = rpcResultFromOFLib.getErrors();
         RpcResult<AddGroupOutput> rpcResult = Rpcs.getRpcResult(true, result, errors);
 
         LOG.debug("Returning the Add Group RPC result to MD-SAL");
@@ -262,34 +281,54 @@ public class ModelDrivenSwitchImpl extends AbstractModelDrivenSwitch {
     }
 
     @Override
-    public Future<RpcResult<AddMeterOutput>> addMeter(AddMeterInput input) {
-       // Convert the AddMeterInput to MeterModInput
-        MeterModInput ofMeterModInput = MeterConvertor.toMeterModInput(input, version);
-
-
-       // For Meter provisioning, the SwitchConnectionDistinguisher is set to null so
-       // the request can be routed through any connection to the switch
+    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
+
+        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);
+        }
 
-       SwitchConnectionDistinguisher cookie = null ;
+        // 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());
+        }
 
-       LOG.debug("Calling the MeterMod RPC method on MessageDispatchService");
-       Future<RpcResult<UpdateMeterOutput>> resultFromOFLib = messageService.meterMod(ofMeterModInput, cookie) ;
+        session.getbulkTransactionCache().put(new TransactionKey(xId), input);
+        Future<RpcResult<UpdateMeterOutput>> resultFromOFLib = messageService.meterMod(ofMeterModInput.build(), cookie);
 
-       RpcResult<UpdateMeterOutput> rpcResultFromOFLib = null ;
+        RpcResult<UpdateMeterOutput> rpcResultFromOFLib = null;
 
-       try {
-               rpcResultFromOFLib = resultFromOFLib.get();
-       } catch( Exception ex ) {
-               LOG.error( " Error while getting result for AddMeter RPC" + ex.getMessage());
-       }
+        try {
+            rpcResultFromOFLib = resultFromOFLib.get();
+        } catch (Exception ex) {
+            LOG.error(" Error while getting result for AddMeter RPC" + ex.getMessage());
+        }
 
-       UpdateMeterOutput updateMeterOutput = rpcResultFromOFLib.getResult() ;
+        UpdateMeterOutput updateMeterOutput = rpcResultFromOFLib.getResult();
 
-       AddMeterOutputBuilder addMeterOutput = new AddMeterOutputBuilder() ;
-       addMeterOutput.setTransactionId(updateMeterOutput.getTransactionId()) ;
-       AddMeterOutput result = addMeterOutput.build();
+        AddMeterOutputBuilder addMeterOutput = new AddMeterOutputBuilder();
+        addMeterOutput.setTransactionId(updateMeterOutput.getTransactionId());
+        AddMeterOutput result = addMeterOutput.build();
 
-       Collection<RpcError> errors = rpcResultFromOFLib.getErrors() ;
+        Collection<RpcError> errors = rpcResultFromOFLib.getErrors();
         RpcResult<AddMeterOutput> rpcResult = Rpcs.getRpcResult(true, result, errors);
 
         LOG.debug("Returning the Add Meter RPC result to MD-SAL");
@@ -297,70 +336,112 @@ public class ModelDrivenSwitchImpl extends AbstractModelDrivenSwitch {
     }
 
     @Override
-    public Future<RpcResult<RemoveFlowOutput>> removeFlow(RemoveFlowInput input) {
-       // Convert the RemoveFlowInput to FlowModInput
-        FlowModInput ofFlowModInput = FlowConvertor.toFlowModInput(input, version);
-
-
-       // For Flow provisioning, the SwitchConnectionDistinguisher is set to null so
-       // the request can be routed through any connection to the switch
+    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
+
+        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);
+        }
 
-       SwitchConnectionDistinguisher cookie = null ;
+        // 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());
+        }
 
-       LOG.debug("Calling the FlowMod RPC method on MessageDispatchService");
-               Future<RpcResult<UpdateFlowOutput>> resultFromOFLib = messageService.flowMod(ofFlowModInput, cookie) ;
+        session.getbulkTransactionCache().put(new TransactionKey(xId), input);
+        Future<RpcResult<UpdateFlowOutput>> resultFromOFLib = messageService.flowMod(ofFlowModInput.build(), cookie);
 
-               RpcResult<UpdateFlowOutput> rpcResultFromOFLib = null ;
+        RpcResult<UpdateFlowOutput> rpcResultFromOFLib = null;
 
-       try {
-               rpcResultFromOFLib = resultFromOFLib.get();
-       } catch( Exception ex ) {
-               LOG.error( " Error while getting result for remove Flow RPC" + ex.getMessage());
-       }
+        try {
+            rpcResultFromOFLib = resultFromOFLib.get();
+        } catch (Exception ex) {
+            LOG.error(" Error while getting result for remove Flow RPC" + ex.getMessage());
+        }
 
-       UpdateFlowOutput updateFlowOutput = rpcResultFromOFLib.getResult() ;
+        UpdateFlowOutput updateFlowOutput = rpcResultFromOFLib.getResult();
 
-       RemoveFlowOutputBuilder removeFlowOutput = new RemoveFlowOutputBuilder() ;
-       removeFlowOutput.setTransactionId(updateFlowOutput.getTransactionId()) ;
-       RemoveFlowOutput result = removeFlowOutput.build();
+        RemoveFlowOutputBuilder removeFlowOutput = new RemoveFlowOutputBuilder();
+        removeFlowOutput.setTransactionId(updateFlowOutput.getTransactionId());
+        RemoveFlowOutput result = removeFlowOutput.build();
 
-       Collection<RpcError> errors = rpcResultFromOFLib.getErrors() ;
+        Collection<RpcError> errors = rpcResultFromOFLib.getErrors();
         RpcResult<RemoveFlowOutput> rpcResult = Rpcs.getRpcResult(true, result, errors);
 
-       LOG.debug("Returning the Remove Flow RPC result to MD-SAL");
+        LOG.debug("Returning the Remove Flow RPC result to MD-SAL");
         return Futures.immediateFuture(rpcResult);
     }
 
     @Override
-    public Future<RpcResult<RemoveGroupOutput>> removeGroup(
-            RemoveGroupInput input) {
-       // Convert the RemoveGroupInput to GroupModInput
-        GroupModInput ofGroupModInput = GroupConvertor.toGroupModInput(input, version);
-
-
-       // For Flow provisioning, the SwitchConnectionDistinguisher is set to null so
-       // the request can be routed through any connection to the switch
+    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);
+        }
 
-       SwitchConnectionDistinguisher cookie = null ;
+        // 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());
+        }
 
-       LOG.debug("Calling the GroupMod RPC method on MessageDispatchService");
-       Future<RpcResult<UpdateGroupOutput>> resultFromOFLib = messageService.groupMod(ofGroupModInput, cookie) ;
+        session.getbulkTransactionCache().put(new TransactionKey(xId), input);
+        Future<RpcResult<UpdateGroupOutput>> resultFromOFLib = messageService.groupMod(ofGroupModInput.build(), cookie);
 
-       RpcResult<UpdateGroupOutput> rpcResultFromOFLib = null ;
+        RpcResult<UpdateGroupOutput> rpcResultFromOFLib = null;
 
-       try {
-               rpcResultFromOFLib = resultFromOFLib.get();
-       } catch( Exception ex ) {
-               LOG.error( " Error while getting result for RemoveGroup RPC" + ex.getMessage());
-       }
+        try {
+            rpcResultFromOFLib = resultFromOFLib.get();
+        } catch (Exception ex) {
+            LOG.error(" Error while getting result for RemoveGroup RPC" + ex.getMessage());
+        }
 
-       UpdateGroupOutput updateGroupOutput = rpcResultFromOFLib.getResult() ;
+        UpdateGroupOutput updateGroupOutput = rpcResultFromOFLib.getResult();
 
-       RemoveGroupOutputBuilder removeGroupOutput = new RemoveGroupOutputBuilder() ;
-       removeGroupOutput.setTransactionId(updateGroupOutput.getTransactionId()) ;
-       RemoveGroupOutput result = removeGroupOutput.build();
+        RemoveGroupOutputBuilder removeGroupOutput = new RemoveGroupOutputBuilder();
+        removeGroupOutput.setTransactionId(updateGroupOutput.getTransactionId());
+        RemoveGroupOutput result = removeGroupOutput.build();
 
-       Collection<RpcError> errors = rpcResultFromOFLib.getErrors() ;
+        Collection<RpcError> errors = rpcResultFromOFLib.getErrors();
         RpcResult<RemoveGroupOutput> rpcResult = Rpcs.getRpcResult(true, result, errors);
 
         LOG.debug("Returning the Remove Group RPC result to MD-SAL");
@@ -368,35 +449,54 @@ public class ModelDrivenSwitchImpl extends AbstractModelDrivenSwitch {
     }
 
     @Override
-    public Future<RpcResult<RemoveMeterOutput>> removeMeter(
-            RemoveMeterInput input) {
-       // Convert the RemoveMeterInput to MeterModInput
-        MeterModInput ofMeterModInput = MeterConvertor.toMeterModInput(input, version);
-
-
-       // For Meter provisioning, the SwitchConnectionDistinguisher is set to null so
-       // the request can be routed through any connection to the switch
+    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);
+        }
 
-       SwitchConnectionDistinguisher cookie = null ;
+        // 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());
+        }
 
-       LOG.debug("Calling the MeterMod RPC method on MessageDispatchService");
-       Future<RpcResult<UpdateMeterOutput>> resultFromOFLib = messageService.meterMod(ofMeterModInput, cookie) ;
+        session.getbulkTransactionCache().put(new TransactionKey(xId), input);
+        Future<RpcResult<UpdateMeterOutput>> resultFromOFLib = messageService.meterMod(ofMeterModInput.build(), cookie);
 
-       RpcResult<UpdateMeterOutput> rpcResultFromOFLib = null ;
+        RpcResult<UpdateMeterOutput> rpcResultFromOFLib = null;
 
-       try {
-               rpcResultFromOFLib = resultFromOFLib.get();
-       } catch( Exception ex ) {
-               LOG.error( " Error while getting result for RemoveMeter RPC" + ex.getMessage());
-       }
+        try {
+            rpcResultFromOFLib = resultFromOFLib.get();
+        } catch (Exception ex) {
+            LOG.error(" Error while getting result for RemoveMeter RPC" + ex.getMessage());
+        }
 
-       UpdateMeterOutput updatemeterOutput = rpcResultFromOFLib.getResult() ;
+        UpdateMeterOutput updatemeterOutput = rpcResultFromOFLib.getResult();
 
-       RemoveMeterOutputBuilder removeMeterOutput = new RemoveMeterOutputBuilder() ;
-       removeMeterOutput.setTransactionId(updatemeterOutput.getTransactionId()) ;
-       RemoveMeterOutput result = removeMeterOutput.build();
+        RemoveMeterOutputBuilder removeMeterOutput = new RemoveMeterOutputBuilder();
+        removeMeterOutput.setTransactionId(updatemeterOutput.getTransactionId());
+        RemoveMeterOutput result = removeMeterOutput.build();
 
-       Collection<RpcError> errors = rpcResultFromOFLib.getErrors() ;
+        Collection<RpcError> errors = rpcResultFromOFLib.getErrors();
         RpcResult<RemoveMeterOutput> rpcResult = Rpcs.getRpcResult(true, result, errors);
 
         LOG.debug("Returning the Remove Meter RPC result to MD-SAL");
@@ -404,14 +504,25 @@ public class ModelDrivenSwitchImpl extends AbstractModelDrivenSwitch {
     }
 
     @Override
-    public Future<RpcResult<Void>> transmitPacket(TransmitPacketInput input) {
-        // TODO Auto-generated method stub
-        return null;
+    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;
+
+        LOG.debug("Calling the transmitPacket RPC method");
+        return messageService.packetOut(message, cookie);
     }
 
-    private FlowModInputBuilder toFlowModInputBuilder(Flow source) {
+    private FlowModInputBuilder toFlowModInputBuilder(final Flow source) {
         FlowModInputBuilder target = new FlowModInputBuilder();
-        target.setCookie(source.getCookie());
+        target.setCookie(source.getCookie().getValue());
         target.setIdleTimeout(source.getIdleTimeout());
         target.setHardTimeout(source.getHardTimeout());
         target.setMatch(toMatch(source.getMatch()));
@@ -419,8 +530,7 @@ public class ModelDrivenSwitchImpl extends AbstractModelDrivenSwitch {
         return target;
     }
 
-    private Match toMatch(
-            org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.flow.Match match) {
+    private Match toMatch(final org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.flow.Match match) {
         MatchBuilder target = new MatchBuilder();
 
         target.setMatchEntries(toMatchEntries(match));
@@ -429,78 +539,77 @@ public class ModelDrivenSwitchImpl extends AbstractModelDrivenSwitch {
     }
 
     private List<MatchEntries> toMatchEntries(
-            org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.flow.Match match) {
+            final 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) {
-       // Convert the UpdateFlowInput to FlowModInput
-        FlowModInput ofFlowModInput = FlowConvertor.toFlowModInput(input.getUpdatedFlow(), version);
-
-       // 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
-
-       SwitchConnectionDistinguisher cookie = null ;
-
-       LOG.debug("Calling the FlowMod RPC method on MessageDispatchService");
-               Future<RpcResult<UpdateFlowOutput>> resultFromOFLib = messageService.flowMod(ofFlowModInput, 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();
-
-       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);
+    public Future<RpcResult<UpdateFlowOutput>> updateFlow(final UpdateFlowInput input) {
+        LOG.debug("Calling the updateFlow RPC method on MessageDispatchService");
+        
+        // use primary connection
+        SwitchConnectionDistinguisher cookie = null;
+        
+        OFRpcTask<UpdateFlowInput, RpcResult<UpdateFlowOutput>> task = 
+                OFRpcTaskFactory.createUpdateFlowTask(maxTimeout, maxTimeoutUnit, rpcTaskHelper);
+        rpcTaskHelper.initTask(task, input, cookie);
+        OFSessionUtil.getSessionManager().getRpcPool().submit(task);
+        
+        return task.getResult();
     }
 
     @Override
-    public Future<RpcResult<UpdateGroupOutput>> updateGroup(
-            UpdateGroupInput input) {
-       // Convert the UpdateGroupInput to GroupModInput
-        GroupModInput ofGroupModInput = GroupConvertor.toGroupModInput(input.getUpdatedGroup(), version);
-
-
-       // For Flow provisioning, the SwitchConnectionDistinguisher is set to null so
-       // the request can be routed through any connection to the switch
+    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
+
+        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);
+        }
 
-       SwitchConnectionDistinguisher cookie = null ;
+        // 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());
+        }
 
-       LOG.debug("Calling the GroupMod RPC method on MessageDispatchService");
-       Future<RpcResult<UpdateGroupOutput>> resultFromOFLib = messageService.groupMod(ofGroupModInput, cookie) ;
+        session.getbulkTransactionCache().put(new TransactionKey(xId), input);
+        Future<RpcResult<UpdateGroupOutput>> resultFromOFLib = messageService.groupMod(ofGroupModInput.build(), cookie);
 
-       RpcResult<UpdateGroupOutput> rpcResultFromOFLib = null ;
+        RpcResult<UpdateGroupOutput> rpcResultFromOFLib = null;
 
-       try {
-               rpcResultFromOFLib = resultFromOFLib.get();
-       } catch( Exception ex ) {
-               LOG.error( " Error while getting result for updateGroup RPC" + ex.getMessage());
-       }
+        try {
+            rpcResultFromOFLib = resultFromOFLib.get();
+        } catch (Exception ex) {
+            LOG.error(" Error while getting result for updateGroup RPC" + ex.getMessage());
+        }
 
-       UpdateGroupOutput updateGroupOutputOFLib = rpcResultFromOFLib.getResult() ;
+        UpdateGroupOutput updateGroupOutputOFLib = rpcResultFromOFLib.getResult();
 
-       UpdateGroupOutputBuilder updateGroupOutput = new UpdateGroupOutputBuilder() ;
-       updateGroupOutput.setTransactionId(updateGroupOutputOFLib.getTransactionId()) ;
-       UpdateGroupOutput result = updateGroupOutput.build();
+        UpdateGroupOutputBuilder updateGroupOutput = new UpdateGroupOutputBuilder();
+        updateGroupOutput.setTransactionId(updateGroupOutputOFLib.getTransactionId());
+        UpdateGroupOutput result = updateGroupOutput.build();
 
-       Collection<RpcError> errors = rpcResultFromOFLib.getErrors() ;
+        Collection<RpcError> errors = rpcResultFromOFLib.getErrors();
         RpcResult<UpdateGroupOutput> rpcResult = Rpcs.getRpcResult(true, result, errors);
 
         LOG.debug("Returning the Update Group RPC result to MD-SAL");
@@ -508,35 +617,53 @@ public class ModelDrivenSwitchImpl extends AbstractModelDrivenSwitch {
     }
 
     @Override
-    public Future<RpcResult<UpdateMeterOutput>> updateMeter(
-            UpdateMeterInput input) {
-       // Convert the UpdateMeterInput to MeterModInput
-        MeterModInput ofMeterModInput = MeterConvertor.toMeterModInput(input.getUpdatedMeter(), version);
-
+    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
+        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);
+        }
 
-       // For Meter provisioning, the SwitchConnectionDistinguisher is set to null so
-       // the request can be routed through any connection to the switch
+        // Convert the UpdateMeterInput to MeterModInput
+        MeterModInputBuilder ofMeterModInput = MeterConvertor.toMeterModInput(input.getUpdatedMeter(), version);
+        xId = session.getNextXid();
+        ofMeterModInput.setXid(xId);
 
-       SwitchConnectionDistinguisher cookie = null ;
+        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());
+        }
 
-       LOG.debug("Calling the MeterMod RPC method on MessageDispatchService");
-       Future<RpcResult<UpdateMeterOutput>> resultFromOFLib = messageService.meterMod(ofMeterModInput, cookie) ;
+        session.getbulkTransactionCache().put(new TransactionKey(xId), input);
+        Future<RpcResult<UpdateMeterOutput>> resultFromOFLib = messageService.meterMod(ofMeterModInput.build(), cookie);
 
-       RpcResult<UpdateMeterOutput> rpcResultFromOFLib = null ;
+        RpcResult<UpdateMeterOutput> rpcResultFromOFLib = null;
 
-       try {
-               rpcResultFromOFLib = resultFromOFLib.get();
-       } catch( Exception ex ) {
-               LOG.error( " Error while getting result for UpdateMeter RPC" + ex.getMessage());
-       }
+        try {
+            rpcResultFromOFLib = resultFromOFLib.get();
+        } catch (Exception ex) {
+            LOG.error(" Error while getting result for UpdateMeter RPC" + ex.getMessage());
+        }
 
-       UpdateMeterOutput updateMeterOutputFromOFLib = rpcResultFromOFLib.getResult() ;
+        UpdateMeterOutput updateMeterOutputFromOFLib = rpcResultFromOFLib.getResult();
 
-       UpdateMeterOutputBuilder updateMeterOutput = new UpdateMeterOutputBuilder() ;
-       updateMeterOutput.setTransactionId(updateMeterOutputFromOFLib.getTransactionId()) ;
-       UpdateMeterOutput result = updateMeterOutput.build();
+        UpdateMeterOutputBuilder updateMeterOutput = new UpdateMeterOutputBuilder();
+        updateMeterOutput.setTransactionId(updateMeterOutputFromOFLib.getTransactionId());
+        UpdateMeterOutput result = updateMeterOutput.build();
 
-       Collection<RpcError> errors = rpcResultFromOFLib.getErrors() ;
+        Collection<RpcError> errors = rpcResultFromOFLib.getErrors();
         RpcResult<UpdateMeterOutput> rpcResult = Rpcs.getRpcResult(true, result, errors);
 
         LOG.debug("Returning the Update Meter RPC result to MD-SAL");
@@ -552,12 +679,22 @@ public class ModelDrivenSwitchImpl extends AbstractModelDrivenSwitch {
      * Methods for requesting statistics from switch
      */
     @Override
-    public Future<RpcResult<GetAllGroupStatisticsOutput>> getAllGroupStatistics(GetAllGroupStatisticsInput input) {
+    public Future<RpcResult<GetAllGroupStatisticsOutput>> getAllGroupStatistics(final GetAllGroupStatisticsInput input) {
 
-        //Generate xid to associate it with the request
+        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);
+        LOG.debug("Prepare statistics request for all the groups - Transaction id - {}", xid);
 
         // Create multipart request header
         MultipartRequestInputBuilder mprInput = new MultipartRequestInputBuilder();
@@ -571,33 +708,41 @@ public class ModelDrivenSwitchImpl extends AbstractModelDrivenSwitch {
         MultipartRequestGroupBuilder mprGroupBuild = new MultipartRequestGroupBuilder();
         mprGroupBuild.setGroupId(new GroupId(BinContent.intToUnsignedLong(Group.OFPGALL.getIntValue())));
         caseBuilder.setMultipartRequestGroup(mprGroupBuild.build());
-        
-        //Set request body to main multipart request
+
+        // 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);
+        // 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);
 
         // Prepare rpc return output. Set xid and send it back.
         LOG.debug("Return results and transaction id back to caller");
-        GetAllGroupStatisticsOutputBuilder output = new GetAllGroupStatisticsOutputBuilder();
         output.setTransactionId(generateTransactionId(xid));
         output.setGroupStats(null);
 
-        Collection<RpcError> errors = Collections.emptyList();
         RpcResult<GetAllGroupStatisticsOutput> rpcResult = Rpcs.getRpcResult(true, output.build(), errors);
         return Futures.immediateFuture(rpcResult);
 
     }
 
     @Override
-    public Future<RpcResult<GetGroupDescriptionOutput>> getGroupDescription(GetGroupDescriptionInput input) {
+    public Future<RpcResult<GetGroupDescriptionOutput>> getGroupDescription(final GetGroupDescriptionInput input) {
 
-        //Generate xid to associate it with the request
+        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);
+        LOG.debug("Prepare group description statistics request - Transaction id - {}", xid);
 
         // Create multipart request header
         MultipartRequestInputBuilder mprInput = new MultipartRequestInputBuilder();
@@ -606,35 +751,43 @@ public class ModelDrivenSwitchImpl extends AbstractModelDrivenSwitch {
         mprInput.setXid(xid);
         mprInput.setFlags(new MultipartRequestFlags(false));
 
-        // Create multipart request body for fetch all the group description stats
+        // Create multipart request body for fetch all the group description
+        // stats
         MultipartRequestGroupDescCaseBuilder mprGroupDescBuild = new MultipartRequestGroupDescCaseBuilder();
 
-        //Set request body to main multipart request
+        // 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);
+        // 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");
-        GetGroupDescriptionOutputBuilder output = new GetGroupDescriptionOutputBuilder();
         output.setTransactionId(generateTransactionId(xid));
         output.setGroupDescStats(null);
 
-        Collection<RpcError> errors = Collections.emptyList();
         RpcResult<GetGroupDescriptionOutput> rpcResult = Rpcs.getRpcResult(true, output.build(), errors);
         return Futures.immediateFuture(rpcResult);
 
     }
 
     @Override
-    public Future<RpcResult<GetGroupFeaturesOutput>> getGroupFeatures(GetGroupFeaturesInput input) {
+    public Future<RpcResult<GetGroupFeaturesOutput>> getGroupFeatures(final GetGroupFeaturesInput input) {
+
+        GetGroupFeaturesOutputBuilder output = new GetGroupFeaturesOutputBuilder();
+        Collection<RpcError> errors = Collections.emptyList();
+
+        if (version == OFConstants.OFP_VERSION_1_0) {
+            output.setTransactionId(null);
 
-        //Generate xid to associate it with the request
+            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);
+        LOG.debug("Prepare group features statistics request - Transaction id - {}", xid);
 
         // Create multipart request header
         MultipartRequestInputBuilder mprInput = new MultipartRequestInputBuilder();
@@ -643,33 +796,43 @@ public class ModelDrivenSwitchImpl extends AbstractModelDrivenSwitch {
         mprInput.setXid(xid);
         mprInput.setFlags(new MultipartRequestFlags(false));
 
-        // Create multipart request body for fetch all the group description stats
+        // Create multipart request body for fetch all the group description
+        // stats
         MultipartRequestGroupFeaturesCaseBuilder mprGroupFeaturesBuild = new MultipartRequestGroupFeaturesCaseBuilder();
 
-        //Set request body to main multipart request
+        // 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);
+        // 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");
-        GetGroupFeaturesOutputBuilder output = new GetGroupFeaturesOutputBuilder();
         output.setTransactionId(generateTransactionId(xid));
 
-        Collection<RpcError> errors = Collections.emptyList();
         RpcResult<GetGroupFeaturesOutput> rpcResult = Rpcs.getRpcResult(true, output.build(), errors);
         return Futures.immediateFuture(rpcResult);
     }
 
     @Override
-    public Future<RpcResult<GetGroupStatisticsOutput>> getGroupStatistics(GetGroupStatisticsInput input) {
+    public Future<RpcResult<GetGroupStatisticsOutput>> getGroupStatistics(final GetGroupStatisticsInput input) {
+
+        GetGroupStatisticsOutputBuilder output = new GetGroupStatisticsOutputBuilder();
+        Collection<RpcError> errors = Collections.emptyList();
 
-        //Generate xid to associate it with the request
+        if (version == OFConstants.OFP_VERSION_1_0) {
+            output.setTransactionId(null);
+            output.setGroupStats(null);
+
+            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);
+        LOG.debug("Prepare statistics request for node {} group ({}) - Transaction id - {}", input.getNode(),
+                input.getGroupId(), xid);
 
         // Create multipart request header
         MultipartRequestInputBuilder mprInput = new MultipartRequestInputBuilder();
@@ -683,33 +846,42 @@ public class ModelDrivenSwitchImpl extends AbstractModelDrivenSwitch {
         MultipartRequestGroupBuilder mprGroupBuild = new MultipartRequestGroupBuilder();
         mprGroupBuild.setGroupId(new GroupId(input.getGroupId().getValue()));
         caseBuilder.setMultipartRequestGroup(mprGroupBuild.build());
-        
-        //Set request body to main multipart request
+
+        // 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);
+        // 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");
-        GetGroupStatisticsOutputBuilder output = new GetGroupStatisticsOutputBuilder();
         output.setTransactionId(generateTransactionId(xid));
         output.setGroupStats(null);
 
-        Collection<RpcError> errors = Collections.emptyList();
         RpcResult<GetGroupStatisticsOutput> rpcResult = Rpcs.getRpcResult(true, output.build(), errors);
         return Futures.immediateFuture(rpcResult);
     }
 
     @Override
     public Future<RpcResult<GetAllMeterConfigStatisticsOutput>> getAllMeterConfigStatistics(
-            GetAllMeterConfigStatisticsInput input) {
+            final GetAllMeterConfigStatisticsInput input) {
 
-        //Generate xid to associate it with the request
+        GetAllMeterConfigStatisticsOutputBuilder output = new GetAllMeterConfigStatisticsOutputBuilder();
+        Collection<RpcError> errors = Collections.emptyList();
+
+        if (version == OFConstants.OFP_VERSION_1_0) {
+            output.setTransactionId(null);
+            output.setMeterConfigStats(null);
+
+            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);
+        LOG.debug("Prepare config request for all the meters - Transaction id - {}", xid);
 
         // Create multipart request header
         MultipartRequestInputBuilder mprInput = new MultipartRequestInputBuilder();
@@ -723,32 +895,40 @@ public class ModelDrivenSwitchImpl extends AbstractModelDrivenSwitch {
         MultipartRequestMeterConfigBuilder mprMeterConfigBuild = new MultipartRequestMeterConfigBuilder();
         mprMeterConfigBuild.setMeterId(new MeterId(BinContent.intToUnsignedLong(Meter.OFPMALL.getIntValue())));
         caseBuilder.setMultipartRequestMeterConfig(mprMeterConfigBuild.build());
-        
-        //Set request body to main multipart request
+
+        // 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);
+        // 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");
-        GetAllMeterConfigStatisticsOutputBuilder output = new GetAllMeterConfigStatisticsOutputBuilder();
         output.setTransactionId(generateTransactionId(xid));
         output.setMeterConfigStats(null);
 
-        Collection<RpcError> errors = Collections.emptyList();
         RpcResult<GetAllMeterConfigStatisticsOutput> rpcResult = Rpcs.getRpcResult(true, output.build(), errors);
         return Futures.immediateFuture(rpcResult);
     }
 
     @Override
-    public Future<RpcResult<GetAllMeterStatisticsOutput>> getAllMeterStatistics(GetAllMeterStatisticsInput input) {
+    public Future<RpcResult<GetAllMeterStatisticsOutput>> getAllMeterStatistics(final GetAllMeterStatisticsInput input) {
 
-        //Generate xid to associate it with the request
+        GetAllMeterStatisticsOutputBuilder output = new GetAllMeterStatisticsOutputBuilder();
+        Collection<RpcError> errors = Collections.emptyList();
+
+        if (version == OFConstants.OFP_VERSION_1_0) {
+            output.setTransactionId(null);
+            output.setMeterStats(null);
+
+            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);
+        LOG.debug("Prepare statistics request for all the meters - Transaction id - {}", xid);
 
         // Create multipart request header
         MultipartRequestInputBuilder mprInput = new MultipartRequestInputBuilder();
@@ -762,32 +942,39 @@ public class ModelDrivenSwitchImpl extends AbstractModelDrivenSwitch {
         MultipartRequestMeterBuilder mprMeterBuild = new MultipartRequestMeterBuilder();
         mprMeterBuild.setMeterId(new MeterId(BinContent.intToUnsignedLong(Meter.OFPMALL.getIntValue())));
         caseBuilder.setMultipartRequestMeter(mprMeterBuild.build());
-        
-        //Set request body to main multipart request
+
+        // 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);
+        // 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");
-        GetAllMeterStatisticsOutputBuilder output = new GetAllMeterStatisticsOutputBuilder();
         output.setTransactionId(generateTransactionId(xid));
         output.setMeterStats(null);
 
-        Collection<RpcError> errors = Collections.emptyList();
         RpcResult<GetAllMeterStatisticsOutput> rpcResult = Rpcs.getRpcResult(true, output.build(), errors);
         return Futures.immediateFuture(rpcResult);
     }
 
     @Override
-    public Future<RpcResult<GetMeterFeaturesOutput>> getMeterFeatures(GetMeterFeaturesInput input) {
+    public Future<RpcResult<GetMeterFeaturesOutput>> getMeterFeatures(final GetMeterFeaturesInput input) {
 
-        //Generate xid to associate it with the request
+        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);
+        LOG.debug("Prepare features statistics request for all the meters - Transaction id - {}", xid);
 
         // Create multipart request header
         MultipartRequestInputBuilder mprInput = new MultipartRequestInputBuilder();
@@ -796,32 +983,43 @@ public class ModelDrivenSwitchImpl extends AbstractModelDrivenSwitch {
         mprInput.setXid(xid);
         mprInput.setFlags(new MultipartRequestFlags(false));
 
-        // Create multipart request body for fetch all the group description stats
+        // Create multipart request body for fetch all the group description
+        // stats
         MultipartRequestMeterFeaturesCaseBuilder mprMeterFeaturesBuild = new MultipartRequestMeterFeaturesCaseBuilder();
 
-        //Set request body to main multipart request
+        // Set request body to main multipart request
         mprInput.setMultipartRequestBody(mprMeterFeaturesBuild.build());
 
-        //Send the request, no cookies associated, use any connection
-        LOG.debug("Send meter features statistics request :{}",mprMeterFeaturesBuild);
+        // 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");
-        GetMeterFeaturesOutputBuilder output = new GetMeterFeaturesOutputBuilder();
         output.setTransactionId(generateTransactionId(xid));
 
-        Collection<RpcError> errors = Collections.emptyList();
         RpcResult<GetMeterFeaturesOutput> rpcResult = Rpcs.getRpcResult(true, output.build(), errors);
         return Futures.immediateFuture(rpcResult);
     }
 
     @Override
-    public Future<RpcResult<GetMeterStatisticsOutput>> getMeterStatistics(GetMeterStatisticsInput input) {
-        //Generate xid to associate it with the request
+    public Future<RpcResult<GetMeterStatisticsOutput>> getMeterStatistics(final GetMeterStatisticsInput input) {
+
+        GetMeterStatisticsOutputBuilder output = new GetMeterStatisticsOutputBuilder();
+        Collection<RpcError> errors = Collections.emptyList();
+
+        if (version == OFConstants.OFP_VERSION_1_0) {
+            output.setTransactionId(null);
+            output.setMeterStats(null);
+
+            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);
+        LOG.debug("Preprae statistics request for Meter ({}) - Transaction id - {}", input.getMeterId().getValue(), xid);
 
         // Create multipart request header
         MultipartRequestInputBuilder mprInput = new MultipartRequestInputBuilder();
@@ -833,35 +1031,35 @@ public class ModelDrivenSwitchImpl extends AbstractModelDrivenSwitch {
         // Create multipart request body for fetch all the meter stats
         MultipartRequestMeterCaseBuilder caseBuilder = new MultipartRequestMeterCaseBuilder();
         MultipartRequestMeterBuilder mprMeterBuild = new MultipartRequestMeterBuilder();
-        //Select specific meter
+        // Select specific meter
         mprMeterBuild.setMeterId(new MeterId(input.getMeterId().getValue()));
         caseBuilder.setMultipartRequestMeter(mprMeterBuild.build());
-        
-        //Set request body to main multipart request
+
+        // 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);
+        // 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");
-        GetMeterStatisticsOutputBuilder output = new GetMeterStatisticsOutputBuilder();
         output.setTransactionId(generateTransactionId(xid));
         output.setMeterStats(null);
 
-        Collection<RpcError> errors = Collections.emptyList();
         RpcResult<GetMeterStatisticsOutput> rpcResult = Rpcs.getRpcResult(true, output.build(), errors);
         return Futures.immediateFuture(rpcResult);
     }
-    
+
     @Override
-    public Future<RpcResult<GetAllPortsStatisticsOutput>> getAllPortsStatistics(GetAllPortsStatisticsInput arg0) {
+    public Future<RpcResult<GetAllNodeConnectorsStatisticsOutput>> getAllNodeConnectorsStatistics(
+            final GetAllNodeConnectorsStatisticsInput arg0) {
 
-        //Generate xid to associate it with the request
+        // Generate xid to associate it with the request
         Long xid = this.getSessionContext().getNextXid();
 
-        LOG.info("Prepare port statistics request for all ports of node {} - TrasactionId - {}",arg0.getNode().getValue(),xid);
+        LOG.debug("Prepare port statistics request for all ports of node {} - TrasactionId - {}", arg0.getNode()
+                .getValue(), xid);
 
         // Create multipart request header
         MultipartRequestInputBuilder mprInput = new MultipartRequestInputBuilder();
@@ -870,36 +1068,38 @@ public class ModelDrivenSwitchImpl extends AbstractModelDrivenSwitch {
         mprInput.setXid(xid);
         mprInput.setFlags(new MultipartRequestFlags(false));
 
-        // Create multipart request body to fetch stats for all the port of the node
+        // 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 
-        //TODO :need to change once i rebase on latest code.
-        mprPortStatsBuilder.setPortNo(OpenflowEnumConstant.OFPP_ANY);
+        // Select all ports
+        mprPortStatsBuilder.setPortNo(OFConstants.OFPP_ANY);
         caseBuilder.setMultipartRequestPortStats(mprPortStatsBuilder.build());
-        
-        //Set request body to main multipart request
+
+        // 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());
+        // 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.
-        GetAllPortsStatisticsOutputBuilder output = new GetAllPortsStatisticsOutputBuilder();
+        GetAllNodeConnectorsStatisticsOutputBuilder output = new GetAllNodeConnectorsStatisticsOutputBuilder();
         output.setTransactionId(generateTransactionId(xid));
 
         Collection<RpcError> errors = Collections.emptyList();
-        RpcResult<GetAllPortsStatisticsOutput> rpcResult = Rpcs.getRpcResult(true, output.build(), errors);
+        RpcResult<GetAllNodeConnectorsStatisticsOutput> rpcResult = Rpcs.getRpcResult(true, output.build(), errors);
         return Futures.immediateFuture(rpcResult);
     }
 
     @Override
-    public Future<RpcResult<GetPortStatisticsOutput>> getPortStatistics(GetPortStatisticsInput arg0) {
-        //Generate xid to associate it with the request
+    public Future<RpcResult<GetNodeConnectorStatisticsOutput>> getNodeConnectorStatistics(
+            final GetNodeConnectorStatisticsInput arg0) {
+        // Generate xid to associate it with the request
         Long xid = this.getSessionContext().getNextXid();
 
-        LOG.info("Prepare port statistics request for port {} of node {} - TrasactionId - {}",arg0.getNodeConnectorId(), arg0.getNode().getValue(),xid);
+        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();
@@ -908,165 +1108,133 @@ public class ModelDrivenSwitchImpl extends AbstractModelDrivenSwitch {
         mprInput.setXid(xid);
         mprInput.setFlags(new MultipartRequestFlags(false));
 
-        // Create multipart request body to fetch stats for all the port of the node
+        // 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()));
+        // Set specific port
+        mprPortStatsBuilder
+                .setPortNo(InventoryDataServiceUtil.portNumberfromNodeConnectorId(arg0.getNodeConnectorId()));
         caseBuilder.setMultipartRequestPortStats(mprPortStatsBuilder.build());
-        
-        //Set request body to main multipart request
+
+        // 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());
+        // 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.
-        GetPortStatisticsOutputBuilder output = new GetPortStatisticsOutputBuilder();
+        GetNodeConnectorStatisticsOutputBuilder output = new GetNodeConnectorStatisticsOutputBuilder();
         output.setTransactionId(generateTransactionId(xid));
 
         Collection<RpcError> errors = Collections.emptyList();
-        RpcResult<GetPortStatisticsOutput> rpcResult = Rpcs.getRpcResult(true, output.build(), errors);
+        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 );
+    private TransactionId generateTransactionId(final Long xid) {
+        String stringXid = xid.toString();
+        BigInteger bigIntXid = new BigInteger(stringXid);
         return new TransactionId(bigIntXid);
 
     }
 
     @Override
-    public Future<RpcResult<GetPortOutput>> getPort() {
-       // TODO Auto-generated method stub
-       return null;
-    }
-    
+    public Future<RpcResult<UpdatePortOutput>> updatePort(final UpdatePortInput input) {
+        PortModInput ofPortModInput = null;
+        RpcResult<UpdatePortOutput> rpcResultFromOFLib = null;
 
-    @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);
+        // 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(ofPortModInput);
+            mdInput.setXid(Xid);
+
+            LOG.debug("Calling the PortMod RPC method on MessageDispatchService");
+            Future<RpcResult<UpdatePortOutput>> resultFromOFLib = messageService.portMod(mdInput.build(), 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);
 
     }
-    
+
     @Override
-    public Future<RpcResult<UpdateTableOutput>> updateTable(
-                       UpdateTableInput input) {
+    public Future<RpcResult<UpdateTableOutput>> updateTable(final UpdateTableInput input) {
 
-        // Get the Xid. The same Xid has to be sent in all the Multipart requests
+        // 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);
+        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.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()) ;
-        int totalNoOfTableFeatureEntry = ofTableFeatureList.size();
+        // 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();
 
-        // Slice the multipart request based on the configuration parameter, which is the no. of TableFeatureList element
-        // to be put in one multipart message. Default is 5
-        // This parameter must be set based on switch's Buffer capacity
-
-        List<TableFeatures> tmpOfTableFeatureList = null ;
-        String tableFeatureListCount = System.getProperty( "of.tableFeaturesCountPerMultipart", "5") ;
-        int noOfEntriesInMPR = Integer.parseInt(tableFeatureListCount) ;
-
-        int index = 0 ;
-        while(totalNoOfTableFeatureEntry-index > 0 ) {
-               if( (totalNoOfTableFeatureEntry-index) > noOfEntriesInMPR ) {
-                       mprInput.setFlags(new MultipartRequestFlags(true));
-                       tmpOfTableFeatureList = ofTableFeatureList.subList(index, index + noOfEntriesInMPR);
-               }
-               else {
-                       // Last multipart request
-                       mprInput.setFlags(new MultipartRequestFlags(false));
-                       tmpOfTableFeatureList = ofTableFeatureList.subList(index, totalNoOfTableFeatureEntry );
-               }
-
-        tableFeaturesRequest.setTableFeatures(tmpOfTableFeatureList) ;
-        //Set request body to main multipart request
+        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 :{}",tmpOfTableFeatureList);
+        // Send the request, no cookies associated, use any connection
+        LOG.debug("Send Table Feature request :{}", ofTableFeatureList);
         this.messageService.multipartRequest(mprInput.build(), null);
-        index += noOfEntriesInMPR ;
-               tmpOfTableFeatureList = null ; // To avoid any corrupt data
-        }
-        
-        //Extract the Xid only from the Future for the last RPC and
-       // send it back to the NSF
+
+        // 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();
@@ -1079,13 +1247,13 @@ public class ModelDrivenSwitchImpl extends AbstractModelDrivenSwitch {
 
     @Override
     public Future<RpcResult<GetAllFlowStatisticsFromFlowTableOutput>> getAllFlowStatisticsFromFlowTable(
-            GetAllFlowStatisticsFromFlowTableInput arg0) {
+            final GetAllFlowStatisticsFromFlowTableInput arg0) {
 
-        //Generate xid to associate it with the request
+        // 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);
+        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();
@@ -1095,38 +1263,26 @@ public class ModelDrivenSwitchImpl extends AbstractModelDrivenSwitch {
         mprInput.setFlags(new MultipartRequestFlags(false));
 
         // Create multipart request body for fetch all the group stats
-        MultipartRequestFlowCaseBuilder multipartRequestFlowCaseBuilder  = new MultipartRequestFlowCaseBuilder (); 
+        MultipartRequestFlowCaseBuilder multipartRequestFlowCaseBuilder = new MultipartRequestFlowCaseBuilder();
         MultipartRequestFlowBuilder mprFlowRequestBuilder = new MultipartRequestFlowBuilder();
         mprFlowRequestBuilder.setTableId(arg0.getTableId().getValue());
-        mprFlowRequestBuilder.setOutPort(OpenflowEnumConstant.OFPP_ANY);
-        mprFlowRequestBuilder.setOutGroup(OpenflowEnumConstant.OFPG_ANY);
-        mprFlowRequestBuilder.setCookie(OpenflowEnumConstant.DEFAULT_COOKIE);
-        mprFlowRequestBuilder.setCookieMask(OpenflowEnumConstant.DEFAULT_COOKIE_MASK);
-        
-        //TODO: repeating code
-        if(version == OFConstants.OFP_VERSION_1_0){
-            LOG.info("Target node is running openflow version 1.0");
-            FlowWildcardsV10 wildCard = new FlowWildcardsV10(true,false,false,false,false,false,false,false,false,false,false);
-            mprFlowRequestBuilder.setMatchV10(new MatchV10Builder().setWildcards(wildCard).build());
-        }
-        if(version == OFConstants.OFP_VERSION_1_3){
-            LOG.info("Target node is running openflow version 1.3+");
-            mprFlowRequestBuilder.setMatch(new MatchBuilder().setType(OxmMatchType.class).build());
-        }
-
+        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
+        // 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);
+        // 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();
+        GetAllFlowStatisticsFromFlowTableOutputBuilder output = new GetAllFlowStatisticsFromFlowTableOutputBuilder();
         output.setTransactionId(generateTransactionId(xid));
         output.setFlowAndStatisticsMapList(null);
 
@@ -1137,12 +1293,12 @@ public class ModelDrivenSwitchImpl extends AbstractModelDrivenSwitch {
 
     @Override
     public Future<RpcResult<GetAllFlowsStatisticsFromAllFlowTablesOutput>> getAllFlowsStatisticsFromAllFlowTables(
-            GetAllFlowsStatisticsFromAllFlowTablesInput arg0) {
-        
-        //Generate xid to associate it with the request
+            final GetAllFlowsStatisticsFromAllFlowTablesInput arg0) {
+
+        // Generate xid to associate it with the request
         Long xid = this.getSessionContext().getNextXid();
 
-        LOG.info("Prepare statistics request to get flow stats of all switch tables - Transaction id - {}",xid);
+        LOG.debug("Prepare statistics request to get flow stats of all switch tables - Transaction id - {}", xid);
 
         // Create multipart request header
         MultipartRequestInputBuilder mprInput = new MultipartRequestInputBuilder();
@@ -1152,51 +1308,45 @@ public class ModelDrivenSwitchImpl extends AbstractModelDrivenSwitch {
         mprInput.setFlags(new MultipartRequestFlags(false));
 
         // Create multipart request body for fetch all the group stats
-        MultipartRequestFlowCaseBuilder  multipartRequestFlowCaseBuilder = new MultipartRequestFlowCaseBuilder();
+        MultipartRequestFlowCaseBuilder multipartRequestFlowCaseBuilder = new MultipartRequestFlowCaseBuilder();
         MultipartRequestFlowBuilder mprFlowRequestBuilder = new MultipartRequestFlowBuilder();
-        mprFlowRequestBuilder.setTableId(OpenflowEnumConstant.OFPTT_ALL);
-        mprFlowRequestBuilder.setOutPort(OpenflowEnumConstant.OFPP_ANY);
-        mprFlowRequestBuilder.setOutGroup(OpenflowEnumConstant.OFPG_ANY);
-        mprFlowRequestBuilder.setCookie(OpenflowEnumConstant.DEFAULT_COOKIE);
-        mprFlowRequestBuilder.setCookieMask(OpenflowEnumConstant.DEFAULT_COOKIE_MASK);
-        mprFlowRequestBuilder.setCookieMask(OpenflowEnumConstant.DEFAULT_COOKIE_MASK);
-        
-        //TODO: repeating code
-        if(version == OFConstants.OFP_VERSION_1_0){
-            FlowWildcardsV10 wildCard = new FlowWildcardsV10(true,false,false,false,false,false,false,false,false,false,false);
-            mprFlowRequestBuilder.setMatchV10(new MatchV10Builder().setWildcards(wildCard).build());
-        }
-        if(version == OFConstants.OFP_VERSION_1_3){
-            mprFlowRequestBuilder.setMatch(new MatchBuilder().setType(OxmMatchType.class).build());
-        }
-        //Set request body to main multipart request
+        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);
+        // 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();
+        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);
+        RpcResult<GetAllFlowsStatisticsFromAllFlowTablesOutput> rpcResult = Rpcs.getRpcResult(true, output.build(),
+                errors);
         return Futures.immediateFuture(rpcResult);
 
     }
 
     @Override
     public Future<RpcResult<GetFlowStatisticsFromFlowTableOutput>> getFlowStatisticsFromFlowTable(
-            GetFlowStatisticsFromFlowTableInput arg0) {
-        //Generate xid to associate it with the request
+            final GetFlowStatisticsFromFlowTableInput arg0) {
+        // Generate xid to associate it with the request
         Long xid = this.getSessionContext().getNextXid();
 
-        LOG.info("Prepare statistics request to get stats for flow {} for switch tables {} - Transaction id - {}"
-                ,arg0.getMatch().toString(),arg0.getTableId(),xid);
+        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();
@@ -1206,42 +1356,44 @@ public class ModelDrivenSwitchImpl extends AbstractModelDrivenSwitch {
         mprInput.setFlags(new MultipartRequestFlags(false));
 
         // Create multipart request body for fetch all the group stats
-        MultipartRequestFlowCaseBuilder  multipartRequestFlowCaseBuilder = new MultipartRequestFlowCaseBuilder();
+        MultipartRequestFlowCaseBuilder multipartRequestFlowCaseBuilder = new MultipartRequestFlowCaseBuilder();
         MultipartRequestFlowBuilder mprFlowRequestBuilder = new MultipartRequestFlowBuilder();
         mprFlowRequestBuilder.setTableId(arg0.getTableId());
-        mprFlowRequestBuilder.setOutPort(arg0.getOutPort().longValue());
-        mprFlowRequestBuilder.setOutGroup(OpenflowEnumConstant.OFPG_ANY);
-        mprFlowRequestBuilder.setCookie(OpenflowEnumConstant.DEFAULT_COOKIE);
-        mprFlowRequestBuilder.setCookieMask(OpenflowEnumConstant.DEFAULT_COOKIE_MASK);
 
-        // convert and inject match
-        MatchReactor.getInstance().convert(arg0.getMatch(), version, mprFlowRequestBuilder);
-//        if(version == OFConstants.OFP_VERSION_1_0){
-//            mprFlowRequestBuilder.setMatchV10(MatchConvertor.toMatchV10(arg0.getMatch()));
-//        }
-        //TODO: repeating code
-        if(version == OFConstants.OFP_VERSION_1_3){
-//            MatchBuilder matchBuilder = new MatchBuilder();
-//            matchBuilder.setMatchEntries(MatchConvertor.toMatch(arg0.getMatch()));
-//            matchBuilder.setType(OxmMatchType.class);
-//            mprFlowRequestBuilder.setMatch(matchBuilder.build());
-        
-            mprFlowRequestBuilder.setCookie(arg0.getCookie());
-            mprFlowRequestBuilder.setCookieMask(arg0.getCookieMask());
+        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().getValue());
+        else
+            mprFlowRequestBuilder.setCookie(OFConstants.DEFAULT_COOKIE);
+
+        if (arg0.getCookieMask() != null)
+            mprFlowRequestBuilder.setCookieMask(arg0.getCookieMask().getValue());
+        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
+        // 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);
+        // 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();
+        GetFlowStatisticsFromFlowTableOutputBuilder output = new GetFlowStatisticsFromFlowTableOutputBuilder();
         output.setTransactionId(generateTransactionId(xid));
         output.setFlowAndStatisticsMapList(null);
 
@@ -1252,12 +1404,13 @@ public class ModelDrivenSwitchImpl extends AbstractModelDrivenSwitch {
 
     @Override
     public Future<RpcResult<GetAggregateFlowStatisticsFromFlowTableForAllFlowsOutput>> getAggregateFlowStatisticsFromFlowTableForAllFlows(
-            GetAggregateFlowStatisticsFromFlowTableForAllFlowsInput arg0) {
-        //Generate xid to associate it with the request
+            final GetAggregateFlowStatisticsFromFlowTableForAllFlowsInput arg0) {
+        // Generate xid to associate it with the request
         Long xid = this.getSessionContext().getNextXid();
 
-        LOG.info("Prepare aggregate flow statistics request to get aggregate flow stats for all the flow installed on switch table {} - Transaction id - {}"
-                ,arg0.getTableId().getValue(),xid);
+        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();
@@ -1267,51 +1420,44 @@ public class ModelDrivenSwitchImpl extends AbstractModelDrivenSwitch {
         mprInput.setFlags(new MultipartRequestFlags(false));
 
         // Create multipart request body for fetch all the group stats
-        MultipartRequestAggregateCaseBuilder multipartRequestAggregateCaseBuilder  = new MultipartRequestAggregateCaseBuilder (); 
+        MultipartRequestAggregateCaseBuilder multipartRequestAggregateCaseBuilder = new MultipartRequestAggregateCaseBuilder();
         MultipartRequestAggregateBuilder mprAggregateRequestBuilder = new MultipartRequestAggregateBuilder();
         mprAggregateRequestBuilder.setTableId(arg0.getTableId().getValue());
-        mprAggregateRequestBuilder.setOutPort(OpenflowEnumConstant.OFPP_ANY);
-        mprAggregateRequestBuilder.setOutGroup(OpenflowEnumConstant.OFPG_ANY);
-        mprAggregateRequestBuilder.setCookie(OpenflowEnumConstant.DEFAULT_COOKIE);
-        mprAggregateRequestBuilder.setCookieMask(OpenflowEnumConstant.DEFAULT_COOKIE_MASK);
-        
-        //TODO: repeating code
-        if(version == OFConstants.OFP_VERSION_1_0){
-            FlowWildcardsV10 wildCard = new FlowWildcardsV10(true,false,false,false,false,false,false,false,false,false,false);
-            mprAggregateRequestBuilder.setMatchV10(new MatchV10Builder().setWildcards(wildCard).build());
-        }
-        if(version == OFConstants.OFP_VERSION_1_3){
-            mprAggregateRequestBuilder.setMatch(new MatchBuilder().setType(OxmMatchType.class).build());
-        }
+        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
+        // 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());
+        // 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();
+        GetAggregateFlowStatisticsFromFlowTableForAllFlowsOutputBuilder output = new GetAggregateFlowStatisticsFromFlowTableForAllFlowsOutputBuilder();
         output.setTransactionId(generateTransactionId(xid));
 
         Collection<RpcError> errors = Collections.emptyList();
-        RpcResult<GetAggregateFlowStatisticsFromFlowTableForAllFlowsOutput> rpcResult = Rpcs.getRpcResult(true, output.build(), errors);
+        RpcResult<GetAggregateFlowStatisticsFromFlowTableForAllFlowsOutput> rpcResult = Rpcs.getRpcResult(true,
+                output.build(), errors);
         return Futures.immediateFuture(rpcResult);
     }
 
     @Override
     public Future<RpcResult<GetAggregateFlowStatisticsFromFlowTableForGivenMatchOutput>> getAggregateFlowStatisticsFromFlowTableForGivenMatch(
-            GetAggregateFlowStatisticsFromFlowTableForGivenMatchInput arg0) {
+            final GetAggregateFlowStatisticsFromFlowTableForGivenMatchInput arg0) {
 
-        //Generate xid to associate it with the request
+        // Generate xid to associate it with the request
         Long xid = this.getSessionContext().getNextXid();
 
-        LOG.debug("Prepare agregate statistics request to get aggregate stats for flows matching {} and installed in flow tables {} - Transaction id - {}"
-                ,arg0.getMatch().toString(),arg0.getTableId(),xid);
+        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();
@@ -1321,56 +1467,48 @@ public class ModelDrivenSwitchImpl extends AbstractModelDrivenSwitch {
         mprInput.setFlags(new MultipartRequestFlags(false));
 
         // Create multipart request body for fetch all the group stats
-        MultipartRequestAggregateCaseBuilder multipartRequestAggregateCaseBuilder  = new MultipartRequestAggregateCaseBuilder (); 
+        MultipartRequestAggregateCaseBuilder multipartRequestAggregateCaseBuilder = new MultipartRequestAggregateCaseBuilder();
         MultipartRequestAggregateBuilder mprAggregateRequestBuilder = new MultipartRequestAggregateBuilder();
         mprAggregateRequestBuilder.setTableId(arg0.getTableId());
         mprAggregateRequestBuilder.setOutPort(arg0.getOutPort().longValue());
-        mprAggregateRequestBuilder.setOutGroup(OpenflowEnumConstant.OFPG_ANY);
-        mprAggregateRequestBuilder.setCookie(OpenflowEnumConstant.DEFAULT_COOKIE);
-        mprAggregateRequestBuilder.setCookieMask(OpenflowEnumConstant.DEFAULT_COOKIE_MASK);
-
-
-        MatchReactor.getInstance().convert(arg0.getMatch(), version, mprAggregateRequestBuilder);
-//        if(version == OFConstants.OFP_VERSION_1_0){
-//            mprAggregateRequestBuilder.setMatchV10(MatchConvertor.toMatchV10(arg0.getMatch()));
-//        }
-        //TODO: repeating code
-        if(version == OFConstants.OFP_VERSION_1_3){
-//            MatchBuilder matchBuilder = new MatchBuilder();
-//            matchBuilder.setMatchEntries(MatchConvertor.toMatch(arg0.getMatch()));
-//            matchBuilder.setType(OxmMatchType.class);
-//            mprAggregateRequestBuilder.setMatch(matchBuilder.build());
-        
-            mprAggregateRequestBuilder.setCookie(arg0.getCookie());
-            mprAggregateRequestBuilder.setCookieMask(arg0.getCookieMask());
+        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().getValue());
+            mprAggregateRequestBuilder.setCookieMask(arg0.getCookieMask().getValue());
             mprAggregateRequestBuilder.setOutGroup(arg0.getOutGroup());
         }
 
-        //Set request body to main multipart request
+        // 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());
+        // 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();
+        GetAggregateFlowStatisticsFromFlowTableForGivenMatchOutputBuilder output = new GetAggregateFlowStatisticsFromFlowTableForGivenMatchOutputBuilder();
         output.setTransactionId(generateTransactionId(xid));
 
         Collection<RpcError> errors = Collections.emptyList();
-        RpcResult<GetAggregateFlowStatisticsFromFlowTableForGivenMatchOutput> rpcResult = Rpcs.getRpcResult(true, output.build(), errors);
+        RpcResult<GetAggregateFlowStatisticsFromFlowTableForGivenMatchOutput> rpcResult = Rpcs.getRpcResult(true,
+                output.build(), errors);
         return Futures.immediateFuture(rpcResult);
     }
 
     @Override
-    public Future<RpcResult<GetFlowTablesStatisticsOutput>> getFlowTablesStatistics(GetFlowTablesStatisticsInput arg0) {
-        //Generate xid to associate it with the request
+    public Future<RpcResult<GetFlowTablesStatisticsOutput>> getFlowTablesStatistics(final GetFlowTablesStatisticsInput arg0) {
+        // Generate xid to associate it with the request
         Long xid = this.getSessionContext().getNextXid();
 
-        LOG.info("Prepare flow table statistics request to get flow table stats for all tables " +
-                       "from node {}- Transaction id - {}",arg0.getNode(),xid);
+        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();
@@ -1380,16 +1518,16 @@ public class ModelDrivenSwitchImpl extends AbstractModelDrivenSwitch {
         mprInput.setFlags(new MultipartRequestFlags(false));
 
         // Create multipart request body for fetch all the group stats
-        MultipartRequestTableCaseBuilder multipartRequestTableCaseBuilder  = new MultipartRequestTableCaseBuilder (); 
+        MultipartRequestTableCaseBuilder multipartRequestTableCaseBuilder = new MultipartRequestTableCaseBuilder();
         MultipartRequestTableBuilder multipartRequestTableBuilder = new MultipartRequestTableBuilder();
         multipartRequestTableBuilder.setEmpty(true);
         multipartRequestTableCaseBuilder.setMultipartRequestTable(multipartRequestTableBuilder.build());
-        
-        //Set request body to main multipart request
+
+        // 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());
+        // 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.
@@ -1402,36 +1540,155 @@ public class ModelDrivenSwitchImpl extends AbstractModelDrivenSwitch {
     }
 
     @Override
-    public Future<RpcResult<GetAllFlowStatisticsOutput>> getAllFlowStatistics(GetAllFlowStatisticsInput arg0) {
-        //TODO: Depricated, need to clean it up. Sal-Compatibility layes is dependent on it.
-        // Once sal-compatibility layer is fixed this rpc call can be removed from yang file 
-        return null;
-    }
+    public Future<RpcResult<GetAllQueuesStatisticsFromAllPortsOutput>> getAllQueuesStatisticsFromAllPorts(
+            final GetAllQueuesStatisticsFromAllPortsInput arg0) {
+        // Generate xid to associate it with the request
+        Long xid = this.getSessionContext().getNextXid();
 
-    @Override
-    public Future<RpcResult<GetAllNodeConnectorStatisticsOutput>> getAllNodeConnectorStatistics(
-            GetAllNodeConnectorStatisticsInput arg0) {
-        // TODO Auto-generated method stub
-        return null;
-    }
+        LOG.debug(
+                "Prepare queue statistics request to collect stats for all queues attached to all the ports of node {} - TrasactionId - {}",
+                arg0.getNode().getValue(), xid);
 
-    @Override
-    public Future<RpcResult<GetFlowStatisticsOutput>> getFlowStatistics(GetFlowStatisticsInput arg0) {
-        //TODO: Depricated, need to clean it up. Sal-Compatibility layes is dependent on it.
-        // Once sal-compatibility layer is fixed this rpc call can be removed from yang file 
-        return null;
+        // 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);
     }
 
     @Override
-    public Future<RpcResult<GetFlowTableStatisticsOutput>> getFlowTableStatistics(GetFlowTableStatisticsInput arg0) {
-        // TODO Auto-generated method stub
-        return null;
+    public Future<RpcResult<GetAllQueuesStatisticsFromGivenPortOutput>> getAllQueuesStatisticsFromGivenPort(
+            final 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);
     }
 
     @Override
-    public Future<RpcResult<GetNodeConnectorStatisticsOutput>> getNodeConnectorStatistics(
-            GetNodeConnectorStatisticsInput arg0) {
-        // TODO Auto-generated method stub
-        return null;
+    public Future<RpcResult<GetQueueStatisticsFromGivenPortOutput>> getQueueStatisticsFromGivenPort(
+            final 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);
     }
+    
+    /**
+     * @param input
+     * @param cookie
+     * @param session
+     * @param messageService 
+     * @return barrier result
+     */
+    public static Future<RpcResult<BarrierOutput>> sendBarrier(
+            SwitchConnectionDistinguisher cookie, SessionContext session, 
+            IMessageDispatchService messageService) {
+        BarrierInputBuilder barrierInput = new BarrierInputBuilder();
+        barrierInput.setVersion(session.getFeatures().getVersion());
+        barrierInput.setXid(session.getNextXid());
+        return messageService.barrier(barrierInput.build(), cookie);
+    }
+
 }