commit 564d618a95ea3fde2daf1424ef53232b51f7748d
author Charles Chan <rascov@gmail.com> Wed Aug 29 13:21:46 2018 -0700
committer Charles Chan <rascov@gmail.com> Thu Aug 30 11:59:11 2018 -0700
tree cf76639b3449f44609787505cf5c223d6ac72670
parent dcac7b40db1e0ecc6c61035513a86e5f3861470d

Slience warning of MPLS_PUSH and TTL_OUT

Change-Id: I4ed38d42924782f4fa68675b3dd0b43bae6fd674

pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricTreatmentInterpreter.java

diff --git a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricTreatmentInterpreter.java b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricTreatmentInterpreter.java
index d14aa1a..0a7ba9e 100644
--- a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricTreatmentInterpreter.java
+++ b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricTreatmentInterpreter.java
@@ -31,6 +31,7 @@
 import org.onosproject.net.flow.instructions.L2ModificationInstruction.ModEtherInstruction;
 import org.onosproject.net.flow.instructions.L2ModificationInstruction.ModMplsLabelInstruction;
 import org.onosproject.net.flow.instructions.L2ModificationInstruction.ModVlanIdInstruction;
+import org.onosproject.net.flow.instructions.L3ModificationInstruction;
 import org.onosproject.net.pi.model.PiActionId;
 import org.onosproject.net.pi.model.PiPipelineInterpreter.PiInterpreterException;
 import org.onosproject.net.pi.model.PiTableId;
@@ -219,12 +220,27 @@
                         case VLAN_POP:
                             // VLAN_POP will be handled by mapEgressNextTreatment()
                             break;
+                        case MPLS_PUSH:
+                            // Ignore. fabric.p4 only needs MPLS_LABEL to push a label
+                            break;
                         default:
                             log.warn("Unsupported l2 instruction sub type {} [table={}, {}]",
                                      l2Inst.subtype(), tableId, treatment);
                             break;
                     }
                     break;
+                case L3MODIFICATION:
+                    L3ModificationInstruction l3Inst = (L3ModificationInstruction) inst;
+                    switch (l3Inst.subtype()) {
+                        case TTL_OUT:
+                            // Ignore TTL_OUT
+                            break;
+                        default:
+                            log.warn("Unsupported l3 instruction sub type {} [table={}, {}]",
+                                    l3Inst.subtype(), tableId, treatment);
+                            break;
+                    }
+                    break;
                 case OUTPUT:
                     outInst = (OutputInstruction) inst;
                     break;