Refactor: move LCAF related address classes under lcaf package
Change-Id: I828fe5596c84b121b9382a69107ddfce20840f99
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 d72ba55..550dd5c 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
@@ -28,9 +28,9 @@
import org.onosproject.lisp.msg.protocols.DefaultLispInfoReply.InfoReplyReader;
import org.onosproject.lisp.msg.protocols.DefaultLispInfoReply.InfoReplyWriter;
import org.onosproject.lisp.msg.types.LispIpv4Address;
-import org.onosproject.lisp.msg.types.LispNatLcafAddress;
+import org.onosproject.lisp.msg.types.lcaf.LispNatLcafAddress;
import org.onosproject.lisp.msg.protocols.LispInfoReply.InfoReplyBuilder;
-import org.onosproject.lisp.msg.types.LispNatLcafAddress.NatAddressBuilder;
+import org.onosproject.lisp.msg.types.lcaf.LispNatLcafAddress.NatAddressBuilder;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
diff --git a/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/LispAppDataLcafAddressTest.java b/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/lcaf/LispAppDataLcafAddressTest.java
similarity index 91%
rename from protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/LispAppDataLcafAddressTest.java
rename to protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/lcaf/LispAppDataLcafAddressTest.java
index 338dfb6..dffef74 100644
--- a/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/LispAppDataLcafAddressTest.java
+++ b/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/lcaf/LispAppDataLcafAddressTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.lisp.msg.types;
+package org.onosproject.lisp.msg.types.lcaf;
import com.google.common.testing.EqualsTester;
import io.netty.buffer.ByteBuf;
@@ -24,9 +24,11 @@
import org.onosproject.lisp.msg.exceptions.LispParseError;
import org.onosproject.lisp.msg.exceptions.LispReaderException;
import org.onosproject.lisp.msg.exceptions.LispWriterException;
-import org.onosproject.lisp.msg.types.LispAppDataLcafAddress.AppDataAddressBuilder;
-import org.onosproject.lisp.msg.types.LispAppDataLcafAddress.AppDataLcafAddressWriter;
-import org.onosproject.lisp.msg.types.LispAppDataLcafAddress.AppDataLcafAddressReader;
+import org.onosproject.lisp.msg.types.LispAfiAddress;
+import org.onosproject.lisp.msg.types.LispIpv4Address;
+import org.onosproject.lisp.msg.types.lcaf.LispAppDataLcafAddress.AppDataAddressBuilder;
+import org.onosproject.lisp.msg.types.lcaf.LispAppDataLcafAddress.AppDataLcafAddressWriter;
+import org.onosproject.lisp.msg.types.lcaf.LispAppDataLcafAddress.AppDataLcafAddressReader;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
diff --git a/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/LispAsLcafAddressTest.java b/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/lcaf/LispAsLcafAddressTest.java
similarity index 90%
rename from protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/LispAsLcafAddressTest.java
rename to protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/lcaf/LispAsLcafAddressTest.java
index 5cac8b89..0a95c4f 100644
--- a/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/LispAsLcafAddressTest.java
+++ b/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/lcaf/LispAsLcafAddressTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.lisp.msg.types;
+package org.onosproject.lisp.msg.types.lcaf;
import com.google.common.testing.EqualsTester;
import io.netty.buffer.ByteBuf;
@@ -24,9 +24,10 @@
import org.onosproject.lisp.msg.exceptions.LispParseError;
import org.onosproject.lisp.msg.exceptions.LispReaderException;
import org.onosproject.lisp.msg.exceptions.LispWriterException;
-import org.onosproject.lisp.msg.types.LispAsLcafAddress.AsAddressBuilder;
-import org.onosproject.lisp.msg.types.LispAsLcafAddress.AsLcafAddressReader;
-import org.onosproject.lisp.msg.types.LispAsLcafAddress.AsLcafAddressWriter;
+import org.onosproject.lisp.msg.types.LispIpv4Address;
+import org.onosproject.lisp.msg.types.lcaf.LispAsLcafAddress.AsAddressBuilder;
+import org.onosproject.lisp.msg.types.lcaf.LispAsLcafAddress.AsLcafAddressReader;
+import org.onosproject.lisp.msg.types.lcaf.LispAsLcafAddress.AsLcafAddressWriter;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
diff --git a/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/LispLcafAddressTest.java b/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/lcaf/LispLcafAddressTest.java
similarity index 97%
rename from protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/LispLcafAddressTest.java
rename to protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/lcaf/LispLcafAddressTest.java
index e0b61b2..e76ab92 100644
--- a/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/LispLcafAddressTest.java
+++ b/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/lcaf/LispLcafAddressTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.lisp.msg.types;
+package org.onosproject.lisp.msg.types.lcaf;
import com.google.common.testing.EqualsTester;
import org.junit.Before;
diff --git a/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/LispListLcafAddressTest.java b/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/lcaf/LispListLcafAddressTest.java
similarity index 90%
rename from protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/LispListLcafAddressTest.java
rename to protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/lcaf/LispListLcafAddressTest.java
index 4ffd1f1..625cf7d 100644
--- a/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/LispListLcafAddressTest.java
+++ b/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/lcaf/LispListLcafAddressTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.lisp.msg.types;
+package org.onosproject.lisp.msg.types.lcaf;
import com.google.common.collect.Lists;
import com.google.common.testing.EqualsTester;
@@ -25,9 +25,11 @@
import org.onosproject.lisp.msg.exceptions.LispParseError;
import org.onosproject.lisp.msg.exceptions.LispReaderException;
import org.onosproject.lisp.msg.exceptions.LispWriterException;
-
-import org.onosproject.lisp.msg.types.LispListLcafAddress.ListLcafAddressWriter;
-import org.onosproject.lisp.msg.types.LispListLcafAddress.ListLcafAddressReader;
+import org.onosproject.lisp.msg.types.LispAfiAddress;
+import org.onosproject.lisp.msg.types.LispIpv4Address;
+import org.onosproject.lisp.msg.types.LispIpv6Address;
+import org.onosproject.lisp.msg.types.lcaf.LispListLcafAddress.ListLcafAddressReader;
+import org.onosproject.lisp.msg.types.lcaf.LispListLcafAddress.ListLcafAddressWriter;
import java.util.List;
diff --git a/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/LispNatLcafAddressTest.java b/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/lcaf/LispNatLcafAddressTest.java
similarity index 93%
rename from protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/LispNatLcafAddressTest.java
rename to protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/lcaf/LispNatLcafAddressTest.java
index 624d7b1..d97515f 100644
--- a/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/LispNatLcafAddressTest.java
+++ b/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/lcaf/LispNatLcafAddressTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.lisp.msg.types;
+package org.onosproject.lisp.msg.types.lcaf;
import com.google.common.collect.ImmutableList;
import com.google.common.testing.EqualsTester;
@@ -25,9 +25,11 @@
import org.onosproject.lisp.msg.exceptions.LispParseError;
import org.onosproject.lisp.msg.exceptions.LispReaderException;
import org.onosproject.lisp.msg.exceptions.LispWriterException;
-import org.onosproject.lisp.msg.types.LispNatLcafAddress.NatAddressBuilder;
-import org.onosproject.lisp.msg.types.LispNatLcafAddress.NatLcafAddressReader;
-import org.onosproject.lisp.msg.types.LispNatLcafAddress.NatLcafAddressWriter;
+import org.onosproject.lisp.msg.types.LispAfiAddress;
+import org.onosproject.lisp.msg.types.LispIpv4Address;
+import org.onosproject.lisp.msg.types.lcaf.LispNatLcafAddress.NatAddressBuilder;
+import org.onosproject.lisp.msg.types.lcaf.LispNatLcafAddress.NatLcafAddressReader;
+import org.onosproject.lisp.msg.types.lcaf.LispNatLcafAddress.NatLcafAddressWriter;
import java.util.List;
diff --git a/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/LispSegmentLcafAddressTest.java b/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/lcaf/LispSegmentLcafAddressTest.java
similarity index 90%
rename from protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/LispSegmentLcafAddressTest.java
rename to protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/lcaf/LispSegmentLcafAddressTest.java
index 73246f1..865c679 100644
--- a/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/LispSegmentLcafAddressTest.java
+++ b/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/lcaf/LispSegmentLcafAddressTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.lisp.msg.types;
+package org.onosproject.lisp.msg.types.lcaf;
import com.google.common.testing.EqualsTester;
import io.netty.buffer.ByteBuf;
@@ -24,9 +24,10 @@
import org.onosproject.lisp.msg.exceptions.LispParseError;
import org.onosproject.lisp.msg.exceptions.LispReaderException;
import org.onosproject.lisp.msg.exceptions.LispWriterException;
-import org.onosproject.lisp.msg.types.LispSegmentLcafAddress.SegmentAddressBuilder;
-import org.onosproject.lisp.msg.types.LispSegmentLcafAddress.SegmentLcafAddressReader;
-import org.onosproject.lisp.msg.types.LispSegmentLcafAddress.SegmentLcafAddressWriter;
+import org.onosproject.lisp.msg.types.LispIpv4Address;
+import org.onosproject.lisp.msg.types.lcaf.LispSegmentLcafAddress.SegmentAddressBuilder;
+import org.onosproject.lisp.msg.types.lcaf.LispSegmentLcafAddress.SegmentLcafAddressReader;
+import org.onosproject.lisp.msg.types.lcaf.LispSegmentLcafAddress.SegmentLcafAddressWriter;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
diff --git a/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/LispSourceDestLcafAddressTest.java b/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/lcaf/LispSourceDestLcafAddressTest.java
similarity index 91%
rename from protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/LispSourceDestLcafAddressTest.java
rename to protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/lcaf/LispSourceDestLcafAddressTest.java
index f50c52a..7720c96 100644
--- a/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/LispSourceDestLcafAddressTest.java
+++ b/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/lcaf/LispSourceDestLcafAddressTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.lisp.msg.types;
+package org.onosproject.lisp.msg.types.lcaf;
import com.google.common.testing.EqualsTester;
import io.netty.buffer.ByteBuf;
@@ -24,9 +24,10 @@
import org.onosproject.lisp.msg.exceptions.LispParseError;
import org.onosproject.lisp.msg.exceptions.LispReaderException;
import org.onosproject.lisp.msg.exceptions.LispWriterException;
-import org.onosproject.lisp.msg.types.LispSourceDestLcafAddress.SourceDestAddressBuilder;
-import org.onosproject.lisp.msg.types.LispSourceDestLcafAddress.SourceDestLcafAddressReader;
-import org.onosproject.lisp.msg.types.LispSourceDestLcafAddress.SourceDestLcafAddressWriter;
+import org.onosproject.lisp.msg.types.LispIpv4Address;
+import org.onosproject.lisp.msg.types.lcaf.LispSourceDestLcafAddress.SourceDestAddressBuilder;
+import org.onosproject.lisp.msg.types.lcaf.LispSourceDestLcafAddress.SourceDestLcafAddressReader;
+import org.onosproject.lisp.msg.types.lcaf.LispSourceDestLcafAddress.SourceDestLcafAddressWriter;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
diff --git a/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/LispTeLcafAddressTest.java b/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/lcaf/LispTeLcafAddressTest.java
similarity index 93%
rename from protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/LispTeLcafAddressTest.java
rename to protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/lcaf/LispTeLcafAddressTest.java
index 789b2c6..0d31c08 100644
--- a/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/LispTeLcafAddressTest.java
+++ b/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/lcaf/LispTeLcafAddressTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.lisp.msg.types;
+package org.onosproject.lisp.msg.types.lcaf;
import com.google.common.collect.ImmutableList;
import com.google.common.testing.EqualsTester;
@@ -25,10 +25,11 @@
import org.onosproject.lisp.msg.exceptions.LispParseError;
import org.onosproject.lisp.msg.exceptions.LispReaderException;
import org.onosproject.lisp.msg.exceptions.LispWriterException;
-import org.onosproject.lisp.msg.types.LispTeLcafAddress.TeAddressBuilder;
-import org.onosproject.lisp.msg.types.LispTeLcafAddress.TeLcafAddressReader;
-import org.onosproject.lisp.msg.types.LispTeLcafAddress.TeLcafAddressWriter;
-import org.onosproject.lisp.msg.types.LispTeRecord.TeRecordBuilder;
+import org.onosproject.lisp.msg.types.LispIpv4Address;
+import org.onosproject.lisp.msg.types.lcaf.LispTeLcafAddress.TeAddressBuilder;
+import org.onosproject.lisp.msg.types.lcaf.LispTeLcafAddress.TeLcafAddressReader;
+import org.onosproject.lisp.msg.types.lcaf.LispTeLcafAddress.TeLcafAddressWriter;
+import org.onosproject.lisp.msg.types.lcaf.LispTeRecord.TeRecordBuilder;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;