This should finish wiring up PacketIn

Change-Id: I0e3ddec37f4a685c374384198337e6ca18dbe14e
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 5a37b40340f1fe3e38bfe26245054ceb4f6d8e02..0309e8b46daaf4639b16c7b56c912fc8322ae40c 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,6 +7,7 @@ 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.session.SessionContext;
+import org.opendaylight.openflowplugin.openflow.md.util.InventoryDataServiceUtil;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeConnectorId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeConnectorRef;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.node.NodeConnector;
@@ -85,10 +86,7 @@ public class PacketInTranslator implements IMDMessageTranslator<OfHeader, List<D
            }else{
                LOG.info("Receive packet_in from {} on port {}", dpid, port);
            }
-
-           //TODO: need to get the NodeConnectorRef, but NodeConnectors aren't there yet
-           InstanceIdentifier<NodeConnector> nci = ncIndentifierFromDPIDandPort(dpid, port);
-           NodeConnectorRef ncr = new NodeConnectorRef(nci);
+           pktInBuilder.setIngress(InventoryDataServiceUtil.nodeConnectorRefFromDatapathIdPortno(dpid,port));
            PacketReceived pktInEvent = pktInBuilder.build();
            list.add(pktInEvent);
             return list;
@@ -96,22 +94,4 @@ public class PacketInTranslator implements IMDMessageTranslator<OfHeader, List<D
             return null;
         }
     }
-
-    public static InstanceIdentifier<NodeConnector> ncIndentifierFromDPIDandPort(BigInteger dpid, Long port) {
-        InstanceIdentifierBuilder<?> builder = InstanceIdentifier.builder().node(Node.class);
-
-        // TODO: this doesn't work yet, needs to actaully get the ref for the real NodeConnector
-        //       but that doesn't exist yet
-        NodeConnectorKey ncKey = ncKeyFromDPIDandPort(dpid, port);
-        return builder.node(NodeConnector.class, ncKey).toInstance();
-    }
-
-
-    public static NodeConnectorKey ncKeyFromDPIDandPort(BigInteger dpid, Long port){
-        return new NodeConnectorKey(ncIDfromDPIDandPort(dpid, port));
-    }
-
-    public static NodeConnectorId ncIDfromDPIDandPort(BigInteger dpid, Long port){
-        return new NodeConnectorId("openflow:"+dpid.toString()+":"+port.toString());
-    }
 }