Reduce liblldp usage

We can use Byte.SIZE instead of NetUtils.NUM_BITS_IN_A_BYTE.

Change-Id: Ieb3ab819d137c1a70087181f68dd4787fa0d1e2b
Signed-off-by: Stephen Kitt <skitt@redhat.com>

diff --git a/dhcpservice/api/src/main/java/org/opendaylight/netvirt/dhcpservice/api/DHCP.java b/dhcpservice/api/src/main/java/org/opendaylight/netvirt/dhcpservice/api/DHCP.java
index a648115b1a0e62fecf5d603a1c46d28e22c7d563..a735ba82c9f2f943ee516c52f73cdc2c080733a4 100644 (file)
--- a/dhcpservice/api/src/main/java/org/opendaylight/netvirt/dhcpservice/api/DHCP.java
+++ b/dhcpservice/api/src/main/java/org/opendaylight/netvirt/dhcpservice/api/DHCP.java
@@ -416,7 +416,7 @@ public class DHCP extends Packet {
 
         // Deserialize the payload now
         int payloadStart = startOffset + numBits;
-        int payloadSize = data.length * NetUtils.NUM_BITS_IN_A_BYTE - payloadStart;
+        int payloadSize = data.length * Byte.SIZE - payloadStart;
 
         if (payloadClass != null) {
             try {
@@ -432,8 +432,8 @@ public class DHCP extends Packet {
              *  The payload class was not set, it means no class for parsing
              *  this payload is present. Let's store the raw payload if any.
              */
-            int start = payloadStart / NetUtils.NUM_BITS_IN_A_BYTE;
-            int stop = start + payloadSize / NetUtils.NUM_BITS_IN_A_BYTE;
+            int start = payloadStart / Byte.SIZE;
+            int stop = start + payloadSize / Byte.SIZE;
             rawPayload = Arrays.copyOfRange(data, start, stop);
         }
         // Take care of computation that can be done only after deserialization
@@ -474,7 +474,7 @@ public class DHCP extends Packet {
     public int getfieldnumBits(String fieldName) {
         if (fieldName.equals(OPTIONS)) {
             byte[] barr = fieldValues.get(OPTIONS);
-            return (barr.length) * NetUtils.NUM_BITS_IN_A_BYTE;
+            return (barr.length) * Byte.SIZE;
         }
         return hdrFieldCoordMap.get(fieldName).getRight();
     }

diff --git a/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpPktHandler.java b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpPktHandler.java
index fc15f6c938efd0070f8a297e2cc0e2a1755b9e20..443d120160f9572dd2ed62e121681aa8023b9b16 100644 (file)
--- a/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpPktHandler.java
+++ b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpPktHandler.java
@@ -153,7 +153,7 @@ public class DhcpPktHandler implements PacketProcessingListener {
         Ethernet ethPkt = new Ethernet();
         try {
             byte[] inPayload = packet.getPayload();
-            ethPkt.deserialize(inPayload, 0, inPayload.length * NetUtils.NUM_BITS_IN_A_BYTE);
+            ethPkt.deserialize(inPayload, 0, inPayload.length * Byte.SIZE);
             return DHCPUtils.byteArrayToString(ethPkt.getSourceMACAddress());
         } catch (PacketException pktException) {
             LOG.error("Failed to parse the packet {}", packet);
@@ -172,7 +172,7 @@ public class DhcpPktHandler implements PacketProcessingListener {
             byte[] inPayload = packet.getPayload();
             Ethernet ethPkt = new Ethernet();
             try {
-                ethPkt.deserialize(inPayload, 0, inPayload.length * NetUtils.NUM_BITS_IN_A_BYTE);
+                ethPkt.deserialize(inPayload, 0, inPayload.length * Byte.SIZE);
             } catch (PacketException e) {
                 pktDropCounter.label(UNKNOWN_LABEL).label(UNKNOWN_LABEL).label(
                         PktDropReason.PKT_DESERIALIZATION_ERROR.name()).increment();

diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanPacketInHandler.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanPacketInHandler.java
index bf51464c02e9e7b2355824ade87624d65d85db12..2bd769649b82321a18235d94df93ee346879d998 100755 (executable)
--- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanPacketInHandler.java
+++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanPacketInHandler.java
@@ -12,16 +12,13 @@ import static org.opendaylight.genius.infra.Datastore.OPERATIONAL;
 
 import com.google.common.base.Optional;
 import com.google.common.util.concurrent.ListenableFuture;
-
 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-
 import java.util.Objects;
 import javax.inject.Inject;
 import javax.inject.Singleton;
-
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
 import org.opendaylight.genius.infra.ManagedNewTransactionRunner;
@@ -38,7 +35,6 @@ import org.opendaylight.netvirt.elan.cache.ElanInstanceCache;
 import org.opendaylight.netvirt.elan.evpn.utils.EvpnUtils;
 import org.opendaylight.netvirt.elan.l2gw.utils.ElanL2GatewayUtils;
 import org.opendaylight.netvirt.elan.utils.ElanUtils;
-import org.opendaylight.openflowplugin.libraries.liblldp.NetUtils;
 import org.opendaylight.openflowplugin.libraries.liblldp.PacketException;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.PhysAddress;
@@ -95,7 +91,7 @@ public class ElanPacketInHandler implements PacketProcessingListener {
                 byte[] data = notification.getPayload();
                 Ethernet res = new Ethernet();
 
-                res.deserialize(data, 0, data.length * NetUtils.NUM_BITS_IN_A_BYTE);
+                res.deserialize(data, 0, data.length * Byte.SIZE);
 
                 byte[] srcMac = res.getSourceMACAddress();
                 final String macAddress = NWUtil.toStringMacAddress(srcMac);

diff --git a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptEventHandler.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptEventHandler.java
index 1ac8cbde462615637e787e201ef820a5c4d87b1e..28d82f583449aaa99277c478ab74cef891dee355 100644 (file)
--- a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptEventHandler.java
+++ b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptEventHandler.java
@@ -69,7 +69,6 @@ import org.opendaylight.genius.mdsalutil.packet.UDP;
 import org.opendaylight.infrautils.utils.concurrent.JdkFutures;
 import org.opendaylight.netvirt.elanmanager.api.IElanService;
 import org.opendaylight.netvirt.natservice.internal.NaptPacketInHandler.NatPacketProcessingState;
-import org.opendaylight.openflowplugin.libraries.liblldp.NetUtils;
 import org.opendaylight.openflowplugin.libraries.liblldp.PacketException;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Uri;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.MacAddress;
@@ -335,7 +334,7 @@ public class NaptEventHandler {
         Ethernet ethPkt = new Ethernet();
         if (inPayload != null) {
             try {
-                ethPkt.deserialize(inPayload, 0, inPayload.length * NetUtils.NUM_BITS_IN_A_BYTE);
+                ethPkt.deserialize(inPayload, 0, inPayload.length * Byte.SIZE);
             } catch (PacketException e) {
                 LOG.error("prepareAndSendPacketOut : Failed to decode Packet", e);
                 return;

diff --git a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptPacketInHandler.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptPacketInHandler.java
index 9f7856207bd4bcd88414366b1955cf4fea716e15..4b1ac6f9781132c46f5e19ee06b0b121f4dd11f1 100644 (file)
--- a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptPacketInHandler.java
+++ b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptPacketInHandler.java
@@ -23,7 +23,6 @@ import org.opendaylight.genius.mdsalutil.packet.Ethernet;
 import org.opendaylight.genius.mdsalutil.packet.IPv4;
 import org.opendaylight.genius.mdsalutil.packet.TCP;
 import org.opendaylight.genius.mdsalutil.packet.UDP;
-import org.opendaylight.openflowplugin.libraries.liblldp.NetUtils;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.PacketProcessingListener;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.PacketReceived;
 import org.opendaylight.yangtools.util.concurrent.SpecialExecutors;
@@ -73,7 +72,7 @@ public class NaptPacketInHandler implements PacketProcessingListener {
             Ethernet ethPkt = new Ethernet();
             if (inPayload != null) {
                 try {
-                    ethPkt.deserialize(inPayload, 0, inPayload.length * NetUtils.NUM_BITS_IN_A_BYTE);
+                    ethPkt.deserialize(inPayload, 0, inPayload.length * Byte.SIZE);
                 } catch (Exception e) {
                     LOG.warn("onPacketReceived: Failed to decode Packet", e);
                     return;

diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetRoutePacketInHandler.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetRoutePacketInHandler.java
index 75caa8523ed3bac5f9b182776ef8aa6aaee105f0..af434338918e64e4709a8e27ac5ca2331b605647 100644 (file)
--- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetRoutePacketInHandler.java
+++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetRoutePacketInHandler.java
@@ -38,7 +38,6 @@ import org.opendaylight.netvirt.vpnmanager.utilities.VpnManagerCounters;
 import org.opendaylight.openflowplugin.libraries.liblldp.BitBufferHelper;
 import org.opendaylight.openflowplugin.libraries.liblldp.BufferException;
 import org.opendaylight.openflowplugin.libraries.liblldp.HexEncode;
-import org.opendaylight.openflowplugin.libraries.liblldp.NetUtils;
 import org.opendaylight.openflowplugin.libraries.liblldp.Packet;
 import org.opendaylight.openflowplugin.libraries.liblldp.PacketException;
 import org.opendaylight.yang.gen.v1.urn.huawei.params.xml.ns.yang.l3vpn.rev140815.vpn.interfaces.VpnInterface;
@@ -110,7 +109,7 @@ public class SubnetRoutePacketInHandler implements PacketProcessingListener {
         if (tableId == NwConstants.L3_SUBNET_ROUTE_TABLE) {
             LOG.trace("{} onPacketReceived: Some packet received as {}", LOGGING_PREFIX, notification);
             try {
-                res.deserialize(data, 0, data.length * NetUtils.NUM_BITS_IN_A_BYTE);
+                res.deserialize(data, 0, data.length * Byte.SIZE);
             } catch (PacketException e) {
                 LOG.error("{} onPacketReceived: Failed to decode Packet ", LOGGING_PREFIX, e);
                 vpnManagerCounters.subnetRoutePacketFailed();