commit d1ce4b0bad2e96fd1a01c2a2129eb70fc912b956
author Jonathan Hart <jono@onlab.us> Mon Jan 11 13:28:36 2016 -0800
committer Gerrit Code Review <gerrit@onlab.us> Tue Jan 12 17:24:37 2016 +0000
tree 9a2ee0fc24dda0a491dfb13d8fe8daf150749bbe
parent 4ae5aa8b207090bfc9776dd802d4ada04b732d00

Ignore table ID from flow stats reply when creating OF1.0 flow rule.

Change-Id: Ife15bb7e05d78e9d505e0feb5d7381669bcc3b94

providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowEntryBuilder.java

diff --git a/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowEntryBuilder.java b/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowEntryBuilder.java
index e78b4f1..fbcd25b 100644
--- a/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowEntryBuilder.java
+++ b/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowEntryBuilder.java
@@ -168,8 +168,10 @@
                             .withTreatment(buildTreatment())
                             .withPriority(stat.getPriority())
                             .makeTemporary(stat.getIdleTimeout())
-                            .withCookie(stat.getCookie().getValue())
-                            .forTable(stat.getTableId().getValue());
+                            .withCookie(stat.getCookie().getValue());
+                    if (stat.getVersion() != OFVersion.OF_10) {
+                        builder.forTable(stat.getTableId().getValue());
+                    }
 
                     return new DefaultFlowEntry(builder.build(), FlowEntryState.ADDED,
                                                 stat.getDurationSec(),