Merge "Fixing ForwardingRulesManager code that got lost in a previous merge"

[controller.git] / opendaylight / arphandler / src / main / java / org / opendaylight / controller / arphandler / internal / ArpHandler.java

diff --git a/opendaylight/arphandler/src/main/java/org/opendaylight/controller/arphandler/internal/ArpHandler.java b/opendaylight/arphandler/src/main/java/org/opendaylight/controller/arphandler/internal/ArpHandler.java
index da818d79eeb9914e7ffb04ef332e800b2b2f24ac..3730a71f1e05db48ca74031424feaf54a26f3317 100644 (file)
--- a/opendaylight/arphandler/src/main/java/org/opendaylight/controller/arphandler/internal/ArpHandler.java
+++ b/opendaylight/arphandler/src/main/java/org/opendaylight/controller/arphandler/internal/ArpHandler.java
@@ -130,9 +130,11 @@ public class ArpHandler implements IHostFinder, IListenDataPacket {
 
     protected void handleARPPacket(Ethernet eHeader, ARP pkt, NodeConnector p) {
         if (pkt.getOpCode() == 0x1) {
-            logger.debug("Received ARP REQUEST Packet from NodeConnector:" + p);
+            logger.debug("Received ARP REQUEST Packet from NodeConnector: {}",
+                         p);
         } else {
-            logger.debug("Received ARP REPLY Packet from NodeConnector:" + p);
+            logger.debug("Received ARP REPLY Packet from NodeConnector: {}",
+                         p);
         }
         InetAddress targetIP = null;
         try {
@@ -284,27 +286,31 @@ public class ArpHandler implements IHostFinder, IListenDataPacket {
             ARP arp = new ARP();
             byte[] senderIP = subnet.getNetworkAddress().getAddress();
             byte[] targetIPB = targetIP.getAddress();
-            arp.setHardwareType(ARP.HW_TYPE_ETHERNET).setProtocolType(
-                    EtherTypes.IPv4.shortValue()).setHardwareAddressLength(
-                    (byte) 6).setProtocolAddressLength((byte) 4).setOpCode(
-                    ARP.REQUEST).setSenderHardwareAddress(getControllerMAC())
-                    .setSenderProtocolAddress(senderIP)
-                    .setTargetHardwareAddress(
-                            new byte[] { (byte) 0, (byte) 0, (byte) 0,
-                                    (byte) 0, (byte) 0, (byte) 0 })
-                    .setTargetProtocolAddress(targetIPB);
+            arp.setHardwareType(ARP.HW_TYPE_ETHERNET)
+               .setProtocolType(EtherTypes.IPv4.shortValue())
+               .setHardwareAddressLength((byte) 6)
+               .setProtocolAddressLength((byte) 4)
+               .setOpCode(ARP.REQUEST)
+               .setSenderHardwareAddress(getControllerMAC())
+               .setSenderProtocolAddress(senderIP)
+               .setTargetHardwareAddress(new byte[] { (byte) 0, (byte) 0,
+                                                     (byte) 0, (byte) 0,
+                                                     (byte) 0, (byte) 0 })
+               .setTargetProtocolAddress(targetIPB);
 
             Ethernet ethernet = new Ethernet();
             ethernet.setSourceMACAddress(getControllerMAC())
-                    .setDestinationMACAddress(
-                            new byte[] { (byte) -1, (byte) -1, (byte) -1,
-                                    (byte) -1, (byte) -1, (byte) -1 })
+                    .setDestinationMACAddress(new byte[] { (byte) -1,
+                                                          (byte) -1,
+                                                          (byte) -1,
+                                                          (byte) -1,
+                                                          (byte) -1,
+                                                          (byte) -1 })
                     .setEtherType(EtherTypes.ARP.shortValue()).setPayload(arp);
 
             // TODO For now send port-by-port, see how to optimize to
             // send to a bunch of port on the same node in a shoot
-            RawPacket destPkt = this.dataPacketService
-                    .encodeDataPacket(ethernet);
+            RawPacket destPkt = this.dataPacketService.encodeDataPacket(ethernet);
             destPkt.setOutgoingNodeConnector(p);
 
             this.dataPacketService.transmitDataPacket(destPkt);
@@ -324,13 +330,13 @@ public class ArpHandler implements IHostFinder, IListenDataPacket {
         Node n = host.getnodeconnectorNode();
         if (n == null) {
             logger.error("cannot send UcastARP because cannot extract node "
-                    + "from HostNodeConnector:" + host);
+                    + "from HostNodeConnector: {}", host);
             return;
         }
         NodeConnector outPort = host.getnodeConnector();
         if (outPort == null) {
             logger.error("cannot send UcastARP because cannot extract "
-                    + "outPort from HostNodeConnector:" + host);
+                    + "outPort from HostNodeConnector: {}", host);
             return;
         }
 
@@ -485,8 +491,8 @@ public class ArpHandler implements IHostFinder, IListenDataPacket {
             return PacketResult.IGNORED;
         }
         logger
-                .trace("Received a frame of size:"
-                        + inPkt.getPacketData().length);
+                .trace("Received a frame of size: {}",
+                        inPkt.getPacketData().length);
         Packet formattedPak = this.dataPacketService.decodeDataPacket(inPkt);
         if (formattedPak instanceof Ethernet) {
             Object nextPak = formattedPak.getPayload();