BUG-2794: incorporate openflowjava api changes to openflowplugin

[openflowplugin.git] / openflowplugin / src / main / java / org / opendaylight / openflowplugin / openflow / md / core / sal / convertor / PacketOutConvertor.java

diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/PacketOutConvertor.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/PacketOutConvertor.java
index 494844896bf9c73a7f5021a682e6d21de55a738c..5597b110a6c863a08b67c29f30d0f3cd8545cebe 100644 (file)
--- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/PacketOutConvertor.java
+++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/PacketOutConvertor.java
@@ -9,16 +9,11 @@ package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor;
 
 import org.opendaylight.controller.sal.common.util.Arguments;
 import org.opendaylight.openflowplugin.api.OFConstants;
-import org.opendaylight.openflowplugin.openflow.md.util.OpenflowPortsUtil;
 import org.opendaylight.openflowplugin.api.openflow.md.util.OpenflowVersion;
+import org.opendaylight.openflowplugin.openflow.md.util.OpenflowPortsUtil;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeConnectorRef;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.node.NodeConnectorKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.MaxLengthAction;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.MaxLengthActionBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.PortAction;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.PortActionBuilder;
 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.PortNumber;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.PacketOutInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.PacketOutInputBuilder;
@@ -27,7 +22,6 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier.PathArgument;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.List;
@@ -40,14 +34,14 @@ public final class PacketOutConvertor {
     }
 
     // Get all the data for the PacketOut from the Yang/SAL-Layer
+
     /**
      * @param version
-     * @param Yang
-     *            Data source
+     * @param Yang    Data source
      * @return PacketOutInput required by OF Library
      */
     public static PacketOutInput toPacketOutInput(TransmitPacketInput inputPacket, short version, Long xid,
-            BigInteger datapathid) {
+                                                  BigInteger datapathid) {
 
         // Build Port ID from TransmitPacketInput.Ingress
         PortNumber inPortNr = null;
@@ -82,22 +76,6 @@ public final class PacketOutConvertor {
 
         // TODO VD P! wait for way to move Actions (e.g. augmentation)
 
-        // FIXME VD implementation for testing PacketIn (REMOVE IT)
-        if (inputPacket.getAction() == null) {
-            ActionBuilder aBuild = new ActionBuilder();
-            aBuild.setType(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.Output.class);
-            PortActionBuilder paBuild = new PortActionBuilder();
-            paBuild.setPort(outPort);
-            aBuild.addAugmentation(PortAction.class, paBuild.build());
-            MaxLengthActionBuilder mlBuild = new MaxLengthActionBuilder();
-            mlBuild.setMaxLength(0xffff);
-            aBuild.addAugmentation(MaxLengthAction.class, mlBuild.build());
-            actions.add(aBuild.build());
-            builder.setAction(actions);
-        } else {
-            builder.setAction(ActionConvertor.getActions(inputPacket.getAction(), version, datapathid, null));
-        }
-
         builder.setData(inputPacket.getPayload());
         builder.setVersion(version);
         builder.setXid(xid);