commit f5bd25836fc6e3c59b5a4181d4e40f55ff17298c
author Jonathan Hart <jono@onlab.us> Wed Apr 09 17:43:41 2014 -0700
committer Gerrit Code Review <gerrit2@gerrit.onos.onlab.us> Wed Apr 23 15:16:53 2014 -0700
tree 35727d106dee73c8aaf891bd4c986c94c64b2c53
parent 28adcc3288dd6ac7dbc9fd94f4bec325e0f4ba9a

Refactored the forwarding module to use the new packet API.

It now uses PacketService for both receiving packet-ins and sending
packet-outs, so there is now no dependency on FloodlightProvider or
FlowPusher.

Fixed a bug where the packet module wasn't sending packet-outs correctly.

Change-Id: If738797cdcebabfed975875daf4b40df99226585

src/main/java/net/onrc/onos/core/packetservice/SinglePacketOutNotification.java

diff --git a/src/main/java/net/onrc/onos/core/packetservice/SinglePacketOutNotification.java b/src/main/java/net/onrc/onos/core/packetservice/SinglePacketOutNotification.java
index e6260e0..cd604ea 100644
--- a/src/main/java/net/onrc/onos/core/packetservice/SinglePacketOutNotification.java
+++ b/src/main/java/net/onrc/onos/core/packetservice/SinglePacketOutNotification.java
@@ -1,5 +1,7 @@
 package net.onrc.onos.core.packetservice;
 
+import net.onrc.onos.core.topology.NetworkGraph;
+
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
 
@@ -14,6 +16,12 @@
     private final long outSwitch;
     private final short outPort;
 
+    protected SinglePacketOutNotification() {
+        address = 0;
+        outSwitch = 0;
+        outPort = 0;
+    }
+
     /**
      * Class constructor.
      *
@@ -60,10 +68,11 @@
     }
 
     @Override
-    public Multimap<Long, Short> calculateOutPorts(Multimap<Long, Short> localSwitches) {
+    public Multimap<Long, Short> calculateOutPorts(
+            Multimap<Long, Short> localPorts, NetworkGraph networkGraph) {
         Multimap<Long, Short> outPorts = HashMultimap.create();
 
-        if (localSwitches.containsEntry(outSwitch, outPort)) {
+        if (localPorts.containsEntry(outSwitch, outPort)) {
             outPorts.put(outSwitch, outPort);
         }