commit e3702f2243cb91635d8fefd85068e9ca42c2f5da
author Jonathan Hart <jono@onlab.us> Tue Apr 29 02:56:56 2014 -0700
committer Gerrit Code Review <gerrit2@gerrit.onos.onlab.us> Thu May 01 22:22:32 2014 -0700
tree 3a91b6b8ae2b317e9e0c5301c167d4ab05156ab1
parent 05721b3536b887397890e11cb2e4e70698be9227

Packet API changes.

 * Renamed 'broadcastPacket' methods to 'broadcastPacketOutEdge'
 * Changed parameter order in the 'sendPacket' methods to remain consistent
   with the 'broadcastPacketOutEdge' methods, i.e. have the Ethernet packet
   as the first parameter
 * Added unimplemented notes and exceptions for currently unimplemented methods

Change-Id: I99b14fd8bd34a9a830b301d4a5b6c51e071c0488

src/main/java/net/onrc/onos/apps/forwarding/Forwarding.java

diff --git a/src/main/java/net/onrc/onos/apps/forwarding/Forwarding.java b/src/main/java/net/onrc/onos/apps/forwarding/Forwarding.java
index a7b7fbc..4e0fd47 100644
--- a/src/main/java/net/onrc/onos/apps/forwarding/Forwarding.java
+++ b/src/main/java/net/onrc/onos/apps/forwarding/Forwarding.java
@@ -206,7 +206,7 @@
             log.trace("Sending broadcast packet to other ONOS instances");
         }
 
-        packetService.broadcastPacket(eth,
+        packetService.broadcastPacketOutEdge(eth,
                 new SwitchPort(sw.getDpid(), inPort.getNumber().shortValue()));
     }
 
@@ -339,8 +339,8 @@
                     } else {
                         log.debug("Sending packet out from sw {}, outport{}", sw, existingFlow.firstOutPort);
 
-                        packetService.sendPacket(new SwitchPort(
-                                sw.getDpid(), existingFlow.firstOutPort), eth);
+                        packetService.sendPacket(eth, new SwitchPort(
+                                        sw.getDpid(), existingFlow.firstOutPort));
                     }
                 } else {
                     // Flow path has not yet been installed to switches so save the
@@ -458,8 +458,8 @@
 
         for (PacketToPush packet : packets) {
             log.debug("Start packetToPush to sw {}, outPort {}, path {}", packet.dpid, existingFlow.firstOutPort, path);
-            packetService.sendPacket(new SwitchPort(
-                    packet.dpid, existingFlow.firstOutPort), packet.eth);
+            packetService.sendPacket(packet.eth, new SwitchPort(
+                            packet.dpid, existingFlow.firstOutPort));
         }
     }