1 files changed, 16 insertions, 11 deletions

diff --git a/framework/src/onos/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/IPv4AddressTlv.java b/framework/src/onos/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/IPv4AddressTlv.java
index d5f03268..4efde70e 100644
--- a/framework/src/onos/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/IPv4AddressTlv.java
+++ b/framework/src/onos/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/IPv4AddressTlv.java
@@ -20,9 +20,8 @@ import java.util.Objects;
 
 import org.jboss.netty.buffer.ChannelBuffer;
 import org.onlab.packet.Ip4Address;
-import org.onosproject.bgpio.exceptions.BGPParseException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.onosproject.bgpio.exceptions.BgpParseException;
+import org.onosproject.bgpio.util.Validation;
 
 import com.google.common.base.MoreObjects;
 import com.google.common.base.Preconditions;
@@ -30,8 +29,7 @@ import com.google.common.base.Preconditions;
 /**
  * Provides Implementation of IPv4AddressTlv.
  */
-public class IPv4AddressTlv implements BGPValueType {
-    private static final Logger log = LoggerFactory.getLogger(IPv4AddressTlv.class);
+public class IPv4AddressTlv implements BgpValueType {
     private static final int LENGTH = 4;
 
     private Ip4Address address;
@@ -53,7 +51,7 @@ public class IPv4AddressTlv implements BGPValueType {
      *
      * @return Ipv4 address of interface/neighbor
      */
-    public Ip4Address getValue() {
+    public Ip4Address address() {
         return address;
     }
 
@@ -94,13 +92,12 @@ public class IPv4AddressTlv implements BGPValueType {
      * @param cb channelBuffer
      * @param type address type
      * @return object of IPv4AddressTlv
-     * @throws BGPParseException while parsing IPv4AddressTlv
+     * @throws BgpParseException while parsing IPv4AddressTlv
      */
-    public static IPv4AddressTlv read(ChannelBuffer cb, short type) throws BGPParseException {
-        //TODO: use Validation.toInetAddress once Validation is merged
-        InetAddress ipAddress = (InetAddress) cb.readBytes(LENGTH);
+    public static IPv4AddressTlv read(ChannelBuffer cb, short type) throws BgpParseException {
+        InetAddress ipAddress = Validation.toInetAddress(LENGTH, cb);
         if (ipAddress.isMulticastAddress()) {
-            throw new BGPParseException(BGPErrorType.UPDATE_MESSAGE_ERROR, (byte) 0, null);
+            throw new BgpParseException(BgpErrorType.UPDATE_MESSAGE_ERROR, (byte) 0, null);
         }
         Ip4Address address = Ip4Address.valueOf(ipAddress);
         return IPv4AddressTlv.of(address, type);
@@ -118,6 +115,14 @@ public class IPv4AddressTlv implements BGPValueType {
     }
 
     @Override
+    public int compareTo(Object o) {
+        if (this.equals(o)) {
+            return 0;
+        }
+        return ((Ip4Address) (this.address)).compareTo((Ip4Address) (((IPv4AddressTlv) o).address));
+    }
+
+    @Override
     public String toString() {
         return MoreObjects.toStringHelper(getClass())
                 .add("type", type)