Bugfix: Parse the LCAF address by referring to length field value
Change-Id: Ia43521f531ad03f609219048f0fb1485118cd181
diff --git a/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/protocols/DefaultLispInfoReplyTest.java b/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/protocols/DefaultLispInfoReplyTest.java
index 2ab8002..7e3849a 100644
--- a/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/protocols/DefaultLispInfoReplyTest.java
+++ b/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/protocols/DefaultLispInfoReplyTest.java
@@ -30,6 +30,7 @@
import org.onosproject.lisp.msg.protocols.LispInfoReply.InfoReplyBuilder;
import org.onosproject.lisp.msg.types.LispIpv4Address;
import org.onosproject.lisp.msg.types.LispNatLcafAddress;
+import org.onosproject.lisp.msg.types.LispNatLcafAddress.NatAddressBuilder;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
@@ -58,14 +59,14 @@
LispIpv4Address address1 = new LispIpv4Address(IpAddress.valueOf("192.168.1.4"));
- LispNatLcafAddress natLcafAddress1 = new LispNatLcafAddress.NatAddressBuilder()
- .withLength((short) 0)
- .withMsUdpPortNumber(msUdpPortNumber1)
- .withEtrUdpPortNumber(etrUdpPortNumber1)
- .withGlobalEtrRlocAddress(globalEtrRlocAddress1)
- .withMsRlocAddress(msRlocAddress1)
- .withPrivateEtrRlocAddress(privateEtrRlocAddress1)
- .build();
+ LispNatLcafAddress natLcafAddress1 = new NatAddressBuilder()
+ .withLength((short) 0)
+ .withMsUdpPortNumber(msUdpPortNumber1)
+ .withEtrUdpPortNumber(etrUdpPortNumber1)
+ .withGlobalEtrRlocAddress(globalEtrRlocAddress1)
+ .withMsRlocAddress(msRlocAddress1)
+ .withPrivateEtrRlocAddress(privateEtrRlocAddress1)
+ .build();
reply1 = builder1
.withNonce(1L)
@@ -97,14 +98,14 @@
LispIpv4Address address2 = new LispIpv4Address(IpAddress.valueOf("192.168.2.4"));
- LispNatLcafAddress natLcafAddress2 = new LispNatLcafAddress.NatAddressBuilder()
- .withLength((short) 0)
- .withMsUdpPortNumber(msUdpPortNumber2)
- .withEtrUdpPortNumber(etrUdpPortNumber2)
- .withGlobalEtrRlocAddress(globalEtrRlocAddress2)
- .withMsRlocAddress(msRlocAddress2)
- .withPrivateEtrRlocAddress(privateEtrRlocAddress2)
- .build();
+ LispNatLcafAddress natLcafAddress2 = new NatAddressBuilder()
+ .withLength((short) 0)
+ .withMsUdpPortNumber(msUdpPortNumber2)
+ .withEtrUdpPortNumber(etrUdpPortNumber2)
+ .withGlobalEtrRlocAddress(globalEtrRlocAddress2)
+ .withMsRlocAddress(msRlocAddress2)
+ .withPrivateEtrRlocAddress(privateEtrRlocAddress2)
+ .build();
reply2 = builder3
.withNonce(2L)
@@ -135,7 +136,7 @@
LispIpv4Address msRlocAddress1 = new LispIpv4Address(IpAddress.valueOf("192.168.1.2"));
LispIpv4Address privateEtrRlocAddress1 = new LispIpv4Address(IpAddress.valueOf("192.168.1.3"));
- LispNatLcafAddress natLcafAddress = new LispNatLcafAddress.NatAddressBuilder()
+ LispNatLcafAddress natLcafAddress = new NatAddressBuilder()
.withLength((short) 0)
.withMsUdpPortNumber(msUdpPortNumber1)
.withEtrUdpPortNumber(etrUdpPortNumber1)