commit 8ef6d3b9a09b4a9cf9d4d9e847651c87b413573b
author Jonathan Hart <jono@onlab.us> Sun Mar 08 21:21:27 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Wed Mar 11 20:08:45 2015 +0000
tree c3cda21db51433f9893df9cd57895cda995f9dc4
parent 8b6d2d44674a182b13f9ea1b50ddb1be3bf261c2

Minor tweaks to the flow layer.

Prevent DistributedStatistics store from logging "rule has no output" for
rules that transition to other tables.

Change-Id: I85e86965f5609df608cbc19551632153960a5c5b

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 79efd7c..ede50f4 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
@@ -172,8 +172,9 @@
     private List<OFInstruction> getInstructions(OFFlowMod entry) {
         switch (entry.getVersion()) {
             case OF_10:
-                return Lists.newArrayList(
-                        OFFactoryVer13.INSTANCE.instructions().applyActions(entry.getActions()));
+                return Lists.newArrayList(OFFactoryVer13.INSTANCE.instructions()
+                                                  .applyActions(
+                                                          entry.getActions()));
             case OF_11:
             case OF_12:
             case OF_13:
@@ -316,6 +317,9 @@
                 case POP_VLAN:
                     builder.popVlan();
                     break;
+                case PUSH_VLAN:
+                    builder.pushVlan();
+                    break;
                 case STRIP_VLAN:
                     builder.stripVlan();
                     break;
@@ -323,7 +327,6 @@
                 case SET_TP_SRC:
                 case POP_PBB:
                 case PUSH_PBB:
-                case PUSH_VLAN:
                 case SET_MPLS_LABEL:
                 case SET_MPLS_TC:
                 case SET_MPLS_TTL: