- Supports multi-table feature in the improved batch process in the flow rule subsystem.

- Fix a bug of unsafe type conversion in OpenFlowGroupProvider.

Change-Id: I9a62f81b66d350b84296192f770dc8987aa0967b

@@ -222,7 +222,11 @@ public class OpenFlowRuleProvider extends AbstractProvider implements FlowRulePr
                               fbe.operator(), fbe);
                               fbe.operator(), fbe);
                     continue;
                     continue;
                 }
                 }
+            if (fbe.target().type() == FlowRule.Type.DEFAULT) {
                 sw.sendMsg(mod);
                 sw.sendMsg(mod);
+            } else {
+                sw.sendMsg(mod, getTableType(fbe.target().type()));
+            }
         }
         }
         OFBarrierRequest.Builder builder = sw.factory()
         OFBarrierRequest.Builder builder = sw.factory()
                 .buildBarrierRequest()
                 .buildBarrierRequest()

@@ -87,11 +87,11 @@ public class OpenFlowGroupProvider extends AbstractProvider implements GroupProv
     private static final AtomicLong XID_COUNTER = new AtomicLong(1);
     private static final AtomicLong XID_COUNTER = new AtomicLong(1);
     private final Map<Dpid, GroupStatsCollector> collectors = Maps.newHashMap();
     private final Map<Dpid, GroupStatsCollector> collectors = Maps.newHashMap();
     private final Map<Long, OFStatsReply> groupStats = Maps.newConcurrentMap();
     private final Map<Long, OFStatsReply> groupStats = Maps.newConcurrentMap();
-    private final Map<Integer, GroupOperation> pendingGroupOperations =
+    private final Map<GroupId, GroupOperation> pendingGroupOperations =
             Maps.newConcurrentMap();
             Maps.newConcurrentMap();
 
 
     /* Map<Group ID, Transaction ID> */
     /* Map<Group ID, Transaction ID> */
-    private final Map<Integer, Long> pendingXidMaps = Maps.newConcurrentMap();
+    private final Map<GroupId, Long> pendingXidMaps = Maps.newConcurrentMap();
 
 
     /**
     /**
      * Creates a OpenFlow group provider.
      * Creates a OpenFlow group provider.
@@ -157,9 +157,9 @@ public class OpenFlowGroupProvider extends AbstractProvider implements GroupProv
                     log.error("Unsupported Group operation");
                     log.error("Unsupported Group operation");
             }
             }
             sw.sendMsg(groupMod);
             sw.sendMsg(groupMod);
-            pendingGroupOperations.put(groupMod.getGroup().getGroupNumber(),
-                    groupOperation);
-            pendingXidMaps.put(groupMod.getGroup().getGroupNumber(), groupModXid);
+            GroupId groudId = new DefaultGroupId(groupMod.getGroup().getGroupNumber());
+            pendingGroupOperations.put(groudId, groupOperation);
+            pendingXidMaps.put(groudId, groupModXid);
         }
         }
      }
      }
 
 
@@ -282,14 +282,14 @@ public class OpenFlowGroupProvider extends AbstractProvider implements GroupProv
                 case ERROR:
                 case ERROR:
                     OFErrorMsg errorMsg = (OFErrorMsg) msg;
                     OFErrorMsg errorMsg = (OFErrorMsg) msg;
                     if (errorMsg.getErrType() == OFErrorType.GROUP_MOD_FAILED) {
                     if (errorMsg.getErrType() == OFErrorType.GROUP_MOD_FAILED) {
-                        int pendingGroupId = -1;
-                        for (Map.Entry<Integer, Long> entry: pendingXidMaps.entrySet()) {
+                        GroupId pendingGroupId = null;
+                        for (Map.Entry<GroupId, Long> entry: pendingXidMaps.entrySet()) {
                             if (entry.getValue() == errorMsg.getXid()) {
                             if (entry.getValue() == errorMsg.getXid()) {
                                 pendingGroupId = entry.getKey();
                                 pendingGroupId = entry.getKey();
                                 break;
                                 break;
                             }
                             }
                         }
                         }
-                        if (pendingGroupId == -1) {
+                        if (pendingGroupId == null) {
                             log.warn("Error for unknown group operation: {}",
                             log.warn("Error for unknown group operation: {}",
                                     errorMsg.getXid());
                                     errorMsg.getXid());
                         } else {
                         } else {