diff --git a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingIcmpHandler.java b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingIcmpHandler.java
index 67cedcc..b8eb339 100644
--- a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingIcmpHandler.java
+++ b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingIcmpHandler.java
@@ -23,6 +23,7 @@
 import org.apache.felix.scr.annotations.ReferenceCardinality;
 import org.onlab.packet.Ethernet;
 import org.onlab.packet.ICMP;
+import org.onlab.packet.ICMPEcho;
 import org.onlab.packet.IPv4;
 import org.onlab.packet.IpAddress;
 import org.onlab.packet.MacAddress;
@@ -421,7 +422,7 @@
     }
 
     private short getIcmpId(ICMP icmp) {
-        return ByteBuffer.wrap(icmp.serialize(), 4, 2).getShort();
+        return ((ICMPEcho) icmp.getPayload()).getIdentifier();
     }
 
     private class InternalPacketProcessor implements PacketProcessor {
diff --git a/apps/openstacknetworking/app/src/test/java/org/onosproject/openstacknetworking/impl/IcmpEcho.java b/apps/openstacknetworking/app/src/test/java/org/onosproject/openstacknetworking/impl/IcmpEcho.java
deleted file mode 100644
index 5b78719..0000000
--- a/apps/openstacknetworking/app/src/test/java/org/onosproject/openstacknetworking/impl/IcmpEcho.java
+++ /dev/null
@@ -1,269 +0,0 @@
-/*
- * Copyright 2018-present Open Networking Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.onosproject.openstacknetworking.impl;
-
-import org.onlab.packet.Data;
-import org.onlab.packet.Deserializer;
-import org.onlab.packet.ICMP;
-import org.onlab.packet.IPv4;
-
-import java.nio.ByteBuffer;
-
-import static com.google.common.base.MoreObjects.toStringHelper;
-import static org.onlab.packet.PacketUtils.checkInput;
-
-/**
- * ICMP packet class for echo purpose.
- */
-public class IcmpEcho extends ICMP {
-    protected byte icmpType;
-    protected byte icmpCode;
-    protected short checksum;
-    protected short identifier;
-    protected short sequenceNum;
-
-    public static final short ICMP_HEADER_LENGTH = 8;
-
-    /**
-     * @return the icmpType
-     */
-    public byte getIcmpType() {
-        return this.icmpType;
-    }
-
-    /**
-     * @param icmpType to set
-     * @return this
-     */
-    public IcmpEcho setIcmpType(final byte icmpType) {
-        this.icmpType = icmpType;
-        return this;
-    }
-
-    /**
-     * @return the icmp code
-     */
-    public byte getIcmpCode() {
-        return this.icmpCode;
-    }
-
-    /**
-     * @param icmpCode code to set
-     * @return this
-     */
-    public IcmpEcho setIcmpCode(final byte icmpCode) {
-        this.icmpCode = icmpCode;
-        return this;
-    }
-
-    /**
-     * @return the checksum
-     */
-    public short getChecksum() {
-        return this.checksum;
-    }
-
-    /**
-     * @param checksum the checksum to set
-     * @return this
-     */
-    public IcmpEcho setChecksum(final short checksum) {
-        this.checksum = checksum;
-        return this;
-    }
-
-    /**
-     * Sets the identifier.
-     *
-     * @param identifier identifier
-     * @return this
-     */
-    public IcmpEcho setIdentifier(final short identifier) {
-        this.identifier = identifier;
-        return this;
-    }
-
-    /**
-     * Sets the sequencer number.
-     *
-     * @param sequenceNum sequence number
-     * @return this
-     */
-
-    public IcmpEcho setSequenceNum(final short sequenceNum) {
-        this.sequenceNum = sequenceNum;
-        return this;
-    }
-
-    /**
-     * Gets the identifier.
-     *
-     * @return identifier
-     */
-    public short getIdentifier() {
-        return this.identifier;
-    }
-
-    /**
-     * Gets the sequence number.
-     *
-     * @return sequence number
-     */
-    public short getSequenceNum() {
-        return this.sequenceNum;
-    }
-
-    /**
-     * Serializes the packet. Will compute and set the following fields if they
-     * are set to specific values at the time serialize is called: -checksum : 0
-     * -length : 0
-     */
-    @Override
-    public byte[] serialize() {
-        int length = 8;
-        byte[] payloadData = null;
-        if (this.payload != null) {
-            this.payload.setParent(this);
-            payloadData = this.payload.serialize();
-            length += payloadData.length;
-        }
-
-        final byte[] data = new byte[length];
-        final ByteBuffer bb = ByteBuffer.wrap(data);
-
-        bb.put(this.icmpType);
-        bb.put(this.icmpCode);
-        bb.putShort(this.checksum);
-        bb.putShort(this.identifier);
-        bb.putShort(this.sequenceNum);
-        if (payloadData != null) {
-            bb.put(payloadData);
-        }
-
-        if (this.parent != null && this.parent instanceof IPv4) {
-            ((IPv4) this.parent).setProtocol(IPv4.PROTOCOL_ICMP);
-        }
-
-        // compute checksum if needed
-        if (this.checksum == 0) {
-            bb.rewind();
-            int accumulation = 0;
-
-            for (int i = 0; i < length / 2; ++i) {
-                accumulation += 0xffff & bb.getShort();
-            }
-            // pad to an even number of shorts
-            if (length % 2 > 0) {
-                accumulation += (bb.get() & 0xff) << 8;
-            }
-
-            accumulation = (accumulation >> 16 & 0xffff)
-                    + (accumulation & 0xffff);
-            this.checksum = (short) (~accumulation & 0xffff);
-            bb.putShort(2, this.checksum);
-        }
-        return data;
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Object#hashCode()
-     */
-    @Override
-    public int hashCode() {
-        final int prime = 5807;
-        int result = super.hashCode();
-        result = prime * result + this.icmpType;
-        result = prime * result + this.icmpCode;
-        result = prime * result + this.checksum;
-        result = prime * result + this.identifier;
-        result = prime * result + this.sequenceNum;
-        return result;
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Object#equals(java.lang.Object)
-     */
-    @Override
-    public boolean equals(final Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (!super.equals(obj)) {
-            return false;
-        }
-        if (!(obj instanceof IcmpEcho)) {
-            return false;
-        }
-        final IcmpEcho other = (IcmpEcho) obj;
-        if (this.icmpType != other.icmpType) {
-            return false;
-        }
-        if (this.icmpCode != other.icmpCode) {
-            return false;
-        }
-        if (this.checksum != other.checksum) {
-            return false;
-        }
-        if (this.identifier != other.identifier) {
-            return false;
-        }
-        if (this.sequenceNum != other.sequenceNum) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Deserializer function for ICMP packets.
-     *
-     * @return deserializer function
-     */
-    public static Deserializer<ICMP> deserializer() {
-        return (data, offset, length) -> {
-            checkInput(data, offset, length, ICMP_HEADER_LENGTH);
-
-            IcmpEcho icmp = new IcmpEcho();
-
-            final ByteBuffer bb = ByteBuffer.wrap(data, offset, length);
-            icmp.icmpType = bb.get();
-            icmp.icmpCode = bb.get();
-            icmp.checksum = bb.getShort();
-            icmp.identifier = bb.getShort();
-            icmp.sequenceNum = bb.getShort();
-
-            icmp.payload = Data.deserializer()
-                    .deserialize(data, bb.position(), bb.limit()
-                            - bb.position());
-            icmp.payload.setParent(icmp);
-            return icmp;
-        };
-    }
-
-    @Override
-    public String toString() {
-        return toStringHelper(getClass())
-                .add("icmpType", Byte.toString(icmpType))
-                .add("icmpCode", Byte.toString(icmpCode))
-                .add("checksum", Short.toString(checksum))
-                .add("identifier", Short.toString(identifier))
-                .add("sequenceNumber", Short.toString(sequenceNum))
-                .toString();
-    }
-}
diff --git a/apps/openstacknetworking/app/src/test/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingIcmpHandlerTest.java b/apps/openstacknetworking/app/src/test/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingIcmpHandlerTest.java
index ece96ee..d5227c3 100644
--- a/apps/openstacknetworking/app/src/test/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingIcmpHandlerTest.java
+++ b/apps/openstacknetworking/app/src/test/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingIcmpHandlerTest.java
@@ -25,6 +25,7 @@
 import org.onlab.packet.DeserializationException;
 import org.onlab.packet.Ethernet;
 import org.onlab.packet.ICMP;
+import org.onlab.packet.ICMPEcho;
 import org.onlab.packet.IPv4;
 import org.onlab.packet.IpAddress;
 import org.onlab.packet.MacAddress;
@@ -197,8 +198,9 @@
 
     private void validateIcmpRespFromExternal(IPv4 ipPacket) {
         ICMP icmpResp = (ICMP) ipPacket.getPayload();
-        short icmpId = ByteBuffer.wrap(icmpResp.serialize(), 4, 2).getShort();
-        short seqNum = ByteBuffer.wrap(icmpResp.serialize(), 6, 2).getShort();
+        ICMPEcho icmpEchoResp = (ICMPEcho) icmpResp.getPayload();
+        short icmpId = icmpEchoResp.getIdentifier();
+        short seqNum = icmpEchoResp.getSequenceNum();
 
         assertEquals(icmpResp.getIcmpType(), TYPE_ECHO_REPLY);
         assertEquals(icmpResp.getIcmpCode(), CODE_ECHO_REPLY);
@@ -210,9 +212,9 @@
 
     private void validateIcmpReqToExternal(IPv4 ipPacket) {
         ICMP icmpReq = (ICMP) ipPacket.getPayload();
-        short icmpId = ByteBuffer.wrap(icmpReq.serialize(), 4, 2).getShort();
-        short seqNum = ByteBuffer.wrap(icmpReq.serialize(), 6, 2).getShort();
-
+        ICMPEcho icmpEchoReq = (ICMPEcho) icmpReq.getPayload();
+        short icmpId = icmpEchoReq.getIdentifier();
+        short seqNum = icmpEchoReq.getSequenceNum();
 
         assertEquals(icmpReq.getIcmpType(), TYPE_ECHO_REQUEST);
         assertEquals(icmpReq.getIcmpCode(), CODE_ECHO_REQUEST);
@@ -224,8 +226,9 @@
     }
     private void validateIcmpReqToGw(IPv4 ipPacket) {
         ICMP icmpReq = (ICMP) ipPacket.getPayload();
-        short icmpId = ByteBuffer.wrap(icmpReq.serialize(), 4, 2).getShort();
-        short seqNum = ByteBuffer.wrap(icmpReq.serialize(), 6, 2).getShort();
+        ICMPEcho icmpEchoReq = (ICMPEcho) icmpReq.getPayload();
+        short icmpId = icmpEchoReq.getIdentifier();
+        short seqNum = icmpEchoReq.getSequenceNum();
 
         assertEquals(icmpReq.getIcmpType(), TYPE_ECHO_REPLY);
         assertEquals(icmpReq.getIcmpCode(), CODE_ECHO_REPLY);
@@ -240,20 +243,20 @@
                                                 IpAddress dstIp,
                                                 MacAddress dstMac, byte icmpType) {
         try {
-            IcmpEcho icmp = new IcmpEcho();
-            if (icmpType == TYPE_ECHO_REQUEST) {
-                icmp.setIcmpType(TYPE_ECHO_REQUEST)
-                        .setIcmpCode(CODE_ECHO_REQUEST);
-            } else {
-                icmp.setIcmpType(TYPE_ECHO_REPLY)
-                        .setIcmpCode(CODE_ECHO_REPLY);
-            }
-
-            icmp.setChecksum((short) 0)
-                    .setIdentifier((short) 0)
+            ICMPEcho icmpEcho = new ICMPEcho();
+            icmpEcho.setIdentifier((short) 0)
                     .setSequenceNum((short) 0);
+            ByteBuffer byteBufferIcmpEcho = ByteBuffer.wrap(icmpEcho.serialize());
 
-            ByteBuffer bb = ByteBuffer.wrap(icmp.serialize());
+            ICMP icmp = new ICMP();
+            icmp.setIcmpType(icmpType)
+                    .setIcmpCode(icmpType == TYPE_ECHO_REQUEST ? CODE_ECHO_REQUEST : CODE_ECHO_REPLY)
+                    .setChecksum((short) 0);
+
+            icmp.setPayload(ICMPEcho.deserializer().deserialize(byteBufferIcmpEcho.array(),
+                    0, ICMPEcho.ICMP_ECHO_HEADER_LENGTH));
+
+            ByteBuffer byteBufferIcmp = ByteBuffer.wrap(icmp.serialize());
 
             IPv4 iPacket = new IPv4();
             iPacket.setDestinationAddress(dstIp.toString());
@@ -263,7 +266,7 @@
             iPacket.setDiffServ((byte) 0);
             iPacket.setProtocol(IPv4.PROTOCOL_ICMP);
 
-            iPacket.setPayload(ICMP.deserializer().deserialize(bb.array(), 0, 8));
+            iPacket.setPayload(ICMP.deserializer().deserialize(byteBufferIcmp.array(), 0, 8));
 
             Ethernet ethPacket = new Ethernet();