X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=openflow-protocol-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fopenflowjava%2Fprotocol%2Fimpl%2Fdeserialization%2Faction%2FOF10SetVlanVidActionDeserializer.java;h=5bef7e195cf69d61737d9539523f6251638b82f0;hb=5f5622e79402f70a944fa93fd7ee2d84d1776b08;hp=b422d881e0b82a051ab49d62b8f1358d01605820;hpb=7424f6fec6016081265f98bdd9c5b17f671c0d88;p=openflowjava.git

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/action/OF10SetVlanVidActionDeserializer.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/action/OF10SetVlanVidActionDeserializer.java
index b422d881..5bef7e19 100644
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/action/OF10SetVlanVidActionDeserializer.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/action/OF10SetVlanVidActionDeserializer.java
@@ -1,46 +1,45 @@
-/*
- * Copyright (c) 2013 Pantheon Technologies s.r.o. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-
-package org.opendaylight.openflowjava.protocol.impl.deserialization.action;
-
-import io.netty.buffer.ByteBuf;
-
-import org.opendaylight.openflowjava.protocol.impl.util.ActionConstants;
-import org.opendaylight.openflowjava.protocol.impl.util.EncodeConstants;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.VlanVidAction;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.VlanVidActionBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.SetVlanVid;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.actions.grouping.Action;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.actions.grouping.ActionBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.ActionBase;
-
-/**
- * @author michal.polkorab
- *
- */
-public class OF10SetVlanVidActionDeserializer extends AbstractActionDeserializer {
-
-    @Override
-    public Action deserialize(ByteBuf input) {
-        ActionBuilder builder = new ActionBuilder();
-        input.skipBytes(EncodeConstants.SIZE_OF_SHORT_IN_BYTES);
-        builder.setType(getType());
-        input.skipBytes(EncodeConstants.SIZE_OF_SHORT_IN_BYTES);
-        VlanVidActionBuilder vlanBuilder = new VlanVidActionBuilder();
-        vlanBuilder.setVlanVid(input.readUnsignedShort());
-        input.skipBytes(ActionConstants.PADDING_IN_SET_VLAN_VID_ACTION);
-        builder.addAugmentation(VlanVidAction.class, vlanBuilder.build());
-        return builder.build();
-    }
-
-    @Override
-    protected Class<? extends ActionBase> getType() {
-        return SetVlanVid.class;
-    }
-
-}
+/*
+ * Copyright (c) 2013 Pantheon Technologies s.r.o. and others. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+
+package org.opendaylight.openflowjava.protocol.impl.deserialization.action;
+
+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.SetVlanVidCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.set.vlan.vid._case.SetVlanVidActionBuilder;
+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;
+
+/**
+ * @author michal.polkorab
+ *
+ */
+public class OF10SetVlanVidActionDeserializer extends AbstractActionDeserializer {
+
+    @Override
+    public Action deserialize(ByteBuf input) {
+        org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.ActionBuilder builder = new ActionBuilder();
+        input.skipBytes(2 * EncodeConstants.SIZE_OF_SHORT_IN_BYTES);
+        SetVlanVidCaseBuilder caseBuilder = new SetVlanVidCaseBuilder();
+        SetVlanVidActionBuilder actionBuilder = new SetVlanVidActionBuilder();
+        actionBuilder.setVlanVid(input.readUnsignedShort());
+        caseBuilder.setSetVlanVidAction(actionBuilder.build());
+        builder.setActionChoice(caseBuilder.build());
+        input.skipBytes(ActionConstants.PADDING_IN_SET_VLAN_VID_ACTION);
+        return builder.build();
+    }
+
+    @Override
+    protected ActionChoice getType() {
+        return new SetVlanVidCaseBuilder().build();
+    }
+
+}