commit 7b808c5e15d640218df50cad5f95424b67eecb93
author alshabib <alshabibi.ali@gmail.com> Fri Jun 26 14:22:24 2015 -0700
committer alshabib <alshabibi.ali@gmail.com> Mon Jun 29 15:24:35 2015 -0700
tree 4cd5eab7b45fc1e2767825c788ca3043a7d368d4
parent f3ed655a8e2fb978818b0262bddb5ad53c07a443

small fixes to ethtype pattern

Change-Id: Ic58c426821952f66aa21bc828d36fd4f83d8da0d

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 4103b02..63fc63a 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
@@ -316,12 +316,12 @@
                 PushHeaderInstructions pushHeaderInstructions =
                         (PushHeaderInstructions) l2m;
                 return factory().actions().pushMpls(EthType.of(pushHeaderInstructions
-                                                               .ethernetType()));
+                                                               .ethernetType().toShort()));
             case MPLS_POP:
                 PushHeaderInstructions popHeaderInstructions =
                         (PushHeaderInstructions) l2m;
                 return factory().actions().popMpls(EthType.of(popHeaderInstructions
-                                                              .ethernetType()));
+                                                              .ethernetType().toShort()));
             case MPLS_LABEL:
                 ModMplsLabelInstruction mplsLabel =
                         (ModMplsLabelInstruction) l2m;
@@ -335,7 +335,7 @@
             case VLAN_PUSH:
                 PushHeaderInstructions pushVlanInstruction = (PushHeaderInstructions) l2m;
                 return factory().actions().pushVlan(
-                        EthType.of(pushVlanInstruction.ethernetType()));
+                        EthType.of(pushVlanInstruction.ethernetType().toShort()));
             default:
                 log.warn("Unimplemented action type {}.", l2m.subtype());
                 break;