Revert "Pass additional fields from OF lib to apps"

https://git.opendaylight.org/gerrit/#/c/4245/

Revert "Added null check for reason"
https://git.opendaylight.org/gerrit/#/c/4244/

These commits completely break packetIn, and thus topology.
Please revert until they can be fixed, as its also holding
up work on the adapters around arp etc.

This reverts commit c9d12e93d94189aca02073079db55e92abfed6e4.

Change-Id: I5ab801bdfa4d2c25d8563f508054391d94134df6
Signed-off-by: Ed Warnicke <eaw@cisco.com>

diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/translator/PacketInTranslator.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/translator/PacketInTranslator.java
index 236ae80e532d82924c4bf461b1d9258efe0ff8fd..b7d5f7a00bd6f955b13f95df101e1467b51c2cd5 100644 (file)
--- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/translator/PacketInTranslator.java
+++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/translator/PacketInTranslator.java
@@ -7,7 +7,6 @@ import java.util.concurrent.CopyOnWriteArrayList;
 
 import org.opendaylight.openflowplugin.openflow.md.core.IMDMessageTranslator;
 import org.opendaylight.openflowplugin.openflow.md.core.SwitchConnectionDistinguisher;
-import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.match.MatchConvertorImpl;
 import org.opendaylight.openflowplugin.openflow.md.core.session.SessionContext;
 import org.opendaylight.openflowplugin.openflow.md.util.InventoryDataServiceUtil;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.PortNumberMatchEntry;
@@ -18,10 +17,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
 import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.Cookie;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.PacketReceived;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.PacketReceivedBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.PacketInReason;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.NoMatch;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.InvalidTtl;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.SendToController;
 import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -87,37 +82,12 @@ public class PacketInTranslator implements IMDMessageTranslator<OfHeader, List<D
                }else{
                    LOG.info("Receive packet_in from {} on port {}", dpid, port);
                }
-               org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.Match match = 
-                          (org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.Match)
-                          MatchConvertorImpl.fromOFMatchToSALMatch(message.getMatch(),dpid);
-               pktInBuilder.setMatch((org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.packet.received.Match)match);
-               pktInBuilder.setPacketInReason(getPacketInReason(message.getReason()));
-               pktInBuilder.setTableId(new org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TableId(message.getTableId().getValue().shortValue()));
                pktInBuilder.setIngress(InventoryDataServiceUtil.nodeConnectorRefFromDatapathIdPortno(dpid,port));
                PacketReceived pktInEvent = pktInBuilder.build();
                list.add(pktInEvent);
-               return list;
+                return list;
            } 
         } 
         return Collections.emptyList();
     }
-    
-    private Class <?extends PacketInReason> getPacketInReason(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PacketInReason reason) {
-       
-       if (null == reason) {
-               return PacketInReason.class;
-       }
-    
-       if (reason.equals(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PacketInReason.OFPRNOMATCH)) {
-               return NoMatch.class;
-       }
-       else if (reason.equals(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PacketInReason.OFPRINVALIDTTL)) {
-               return InvalidTtl.class;
-       }
-       else if (reason.equals(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PacketInReason.OFPRACTION)) {
-               return SendToController.class;
-       }
-    
-       return PacketInReason.class;
-    }
 }