X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=openflow-protocol-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fopenflowjava%2Fprotocol%2Fimpl%2Fdeserialization%2Faction%2FOF13PopMplsActionDeserializer.java;fp=openflow-protocol-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fopenflowjava%2Fprotocol%2Fimpl%2Fdeserialization%2Faction%2FOF13PopMplsActionDeserializer.java;h=3ab74229b84dcd4b90d83a67ea0f43701e402a35;hb=5f5622e79402f70a944fa93fd7ee2d84d1776b08;hp=218bedbb8a6c3d79bba86e54553a51d17c3d3757;hpb=29a2a074c78708f6d18583779ece96bb6573f0c6;p=openflowjava.git

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/action/OF13PopMplsActionDeserializer.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/action/OF13PopMplsActionDeserializer.java
index 218bedbb..3ab74229 100644
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/action/OF13PopMplsActionDeserializer.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/action/OF13PopMplsActionDeserializer.java
@@ -8,18 +8,39 @@
 
 package org.opendaylight.openflowjava.protocol.impl.deserialization.action;
 
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.PopMpls;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.ActionBase;
+import io.netty.buffer.ByteBuf;
+
+import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
+import org.opendaylight.openflowjava.protocol.impl.util.ActionConstants;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.ActionChoice;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.PopMplsCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.pop.mpls._case.PopMplsActionBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.ActionBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.EtherType;
 
 /**
  * @author michal.polkorab
  *
  */
-public class OF13PopMplsActionDeserializer extends AbstractEthertypeActionDeserializer {
+public class OF13PopMplsActionDeserializer extends AbstractActionDeserializer {
+
+    @Override
+    public Action deserialize(ByteBuf input) {
+        ActionBuilder builder = new ActionBuilder();
+        input.skipBytes(2 * EncodeConstants.SIZE_OF_SHORT_IN_BYTES);
+        PopMplsCaseBuilder caseBuilder = new PopMplsCaseBuilder();
+        PopMplsActionBuilder mplsBuilder = new PopMplsActionBuilder();
+        mplsBuilder.setEthertype(new EtherType(input.readUnsignedShort()));
+        caseBuilder.setPopMplsAction(mplsBuilder.build());
+        builder.setActionChoice(caseBuilder.build());
+        input.skipBytes(ActionConstants.ETHERTYPE_ACTION_PADDING);
+        return builder.build();
+    }
 
     @Override
-    protected Class<? extends ActionBase> getType() {
-        return PopMpls.class;
+    protected ActionChoice getType() {
+        return new PopMplsCaseBuilder().build();
     }
 
 }