Default experimenters moved to separate bundle + unit tests

[openflowjava.git] / openflow-protocol-ext / src / main / java / org / opendaylight / openflowjava / protocol / ext / deserialization / OF10VendorActionDeserializer.java

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/experimenters/ExperimenterActionDeserializer.java b/openflow-protocol-ext/src/main/java/org/opendaylight/openflowjava/protocol/ext/deserialization/OF10VendorActionDeserializer.java
similarity index 80%
rename from openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/experimenters/ExperimenterActionDeserializer.java
rename to openflow-protocol-ext/src/main/java/org/opendaylight/openflowjava/protocol/ext/deserialization/OF10VendorActionDeserializer.java
index 316d970fd28ead8920f2bd88f5a7130286300d59..f52d83107600e874b12e486e5cd0ae6fa823e3db 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/experimenters/ExperimenterActionDeserializer.java
+++ b/openflow-protocol-ext/src/main/java/org/opendaylight/openflowjava/protocol/ext/deserialization/OF10VendorActionDeserializer.java
@@ -6,13 +6,13 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html\r
  */\r
 \r
-package org.opendaylight.openflowjava.protocol.impl.deserialization.experimenters;\r
+package org.opendaylight.openflowjava.protocol.ext.deserialization;\r
 \r
 import io.netty.buffer.ByteBuf;\r
 \r
 import org.opendaylight.openflowjava.protocol.api.extensibility.HeaderDeserializer;\r
 import org.opendaylight.openflowjava.protocol.api.extensibility.OFDeserializer;\r
-import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;\r
+import org.opendaylight.openflowjava.protocol.ext.util.ExtConstants;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.ExperimenterAction;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.ExperimenterActionBuilder;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.Experimenter;\r
@@ -23,15 +23,15 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev1
  * @author michal.polkorab\r
  *\r
  */\r
-public class ExperimenterActionDeserializer implements OFDeserializer<Action>,\r
+public class OF10VendorActionDeserializer implements OFDeserializer<Action>,\r
         HeaderDeserializer<Action> {\r
 \r
     @Override\r
     public Action deserializeHeader(ByteBuf input) {\r
         ActionBuilder builder = new ActionBuilder();\r
-        input.skipBytes(EncodeConstants.SIZE_OF_SHORT_IN_BYTES);\r
+        input.skipBytes(ExtConstants.SIZE_OF_SHORT_IN_BYTES);\r
         builder.setType(Experimenter.class);\r
-        input.skipBytes(EncodeConstants.SIZE_OF_SHORT_IN_BYTES);\r
+        input.skipBytes(ExtConstants.SIZE_OF_SHORT_IN_BYTES);\r
         ExperimenterActionBuilder expBuilder = new ExperimenterActionBuilder();\r
         expBuilder.setExperimenter(input.readUnsignedInt());\r
         builder.addAugmentation(ExperimenterAction.class, expBuilder.build());\r
@@ -41,11 +41,11 @@ public class ExperimenterActionDeserializer implements OFDeserializer<Action>,
     @Override\r
     public Action deserialize(ByteBuf input) {\r
         ActionBuilder builder = new ActionBuilder();\r
-        input.skipBytes(EncodeConstants.SIZE_OF_SHORT_IN_BYTES);\r
+        input.skipBytes(ExtConstants.SIZE_OF_SHORT_IN_BYTES);\r
         builder.setType(Experimenter.class);\r
         int length = input.readUnsignedShort();\r
         // subtract experimenter header length\r
-        length -= EncodeConstants.EXPERIMENTER_IDS_LENGTH;\r
+        length -= ExtConstants.EXPERIMENTER_IDS_LENGTH;\r
         ExperimenterActionBuilder expBuilder = new ExperimenterActionBuilder();\r
         expBuilder.setExperimenter(input.readUnsignedInt());\r
         if (length > 0) {\r