commit 67fc097a1e322820a344a4a3903473b8f553a369
author Jonathan Hart <jono@onlab.us> Thu Mar 19 15:21:20 2015 -0700
committer Jonathan Hart <jono@onlab.us> Fri Mar 20 23:50:28 2015 +0000
tree fe83e12ef11fed32a353b765f95d64e92731cd58
parent d7b4584aae785c4800ee55a2c6ea88cbd5a1476b

Remove "strip vlan" from our API because it is the same as "pop vlan".

"Strip vlan" is OF1.0 terminology, whereas by OF1.3 it is called "pop vlan".

Change-Id: I483526b39bf8ab6f9f96f251a8469e060b688878

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 dc6a857..1554fa3 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
@@ -330,12 +330,10 @@
                 return factory().actions().pushMpls(EthType.of(pushHeaderInstructions
                                                                .ethernetType()));
             case MPLS_POP:
-                PushHeaderInstructions  popHeaderInstructions =
+                PushHeaderInstructions popHeaderInstructions =
                         (PushHeaderInstructions) l2m;
                 return factory().actions().popMpls(EthType.of(popHeaderInstructions
                                                               .ethernetType()));
-            case STRIP_VLAN:
-                return factory().actions().popVlan();
             case MPLS_LABEL:
                 ModMplsLabelInstruction mplsLabel =
                         (ModMplsLabelInstruction) l2m;