commit 08d9898714452f71980987137c6043530edc2dd3
author alshabib <alshabibi.ali@gmail.com> Tue Apr 21 16:25:50 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Tue Apr 21 23:52:19 2015 +0000
tree 570d48f8153d5d9db6d9ec1a42ce6642718ac032
parent a668122db17564604758342c62b285666484595e

FlowRule api no longer uses TableTypes. Existing usages are converted to
integer representations via Type.ordinal() call

Change-Id: Ie2a26c5ced166e12f0e1ea22e39cd5195455a1ad

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

diff --git a/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilderVer13.java b/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilderVer13.java
index f0ce1f4..30711ad 100644
--- a/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilderVer13.java
+++ b/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilderVer13.java
@@ -124,7 +124,7 @@
                 .setMatch(match)
                 .setFlags(Collections.singleton(OFFlowModFlags.SEND_FLOW_REM))
                 .setPriority(flowRule().priority())
-                .setTableId(TableId.of(flowRule().type().ordinal()))
+                .setTableId(TableId.of(flowRule().tableId()))
                 .build();
 
         return fm;
@@ -161,7 +161,7 @@
                 .setMatch(match)
                 .setFlags(Collections.singleton(OFFlowModFlags.SEND_FLOW_REM))
                 .setPriority(flowRule().priority())
-                .setTableId(TableId.of(flowRule().type().ordinal()))
+                .setTableId(TableId.of(flowRule().tableId()))
                 .build();
 
         return fm;
@@ -180,7 +180,7 @@
                 .setMatch(match)
                 .setFlags(Collections.singleton(OFFlowModFlags.SEND_FLOW_REM))
                 .setPriority(flowRule().priority())
-                .setTableId(TableId.of(flowRule().type().ordinal()))
+                .setTableId(TableId.of(flowRule().tableId()))
                 .build();
 
         return fm;