From 53f7c0c6184692a75cf2838a60ead925073587d5 Mon Sep 17 00:00:00 2001 From: Michal Cmarada Date: Thu, 28 Feb 2019 10:32:46 +0100 Subject: HC2VPP-404: Update package names for JVPP Fix package names for JVPP so it no longer contains vpp since it has been migrated outside of VPP project. Change-Id: I1e7a3fe4713beaaf7a1a0b41e7180d03bb7b74e5 Signed-off-by: Michal Cmarada --- .../src/test/java/io/fd/hc2vpp/acl/AclModuleTest.java | 4 ++-- .../fd/hc2vpp/acl/read/AbstractAclCustomizerTest.java | 18 +++++++++--------- .../java/io/fd/hc2vpp/acl/read/AclCustomizerTest.java | 14 +++++++------- .../io/fd/hc2vpp/acl/read/EgressAclCustomizerTest.java | 2 +- .../fd/hc2vpp/acl/read/IngressAclCustomizerTest.java | 4 ++-- .../io/fd/hc2vpp/acl/read/MacIpAclCustomizerTest.java | 14 +++++++------- .../util/ace/extractor/MacIpAceDataExtractorTest.java | 2 +- .../ace/extractor/StandardAceDataExtractorTest.java | 2 +- .../iface/acl/AclInterfaceAssignmentRequestTest.java | 6 +++--- .../macip/MacIpInterfaceAssignmentRequestTest.java | 6 +++--- .../hc2vpp/acl/util/protocol/ProtocolParsingTest.java | 2 +- .../java/io/fd/hc2vpp/acl/write/AclCustomizerTest.java | 18 +++++++++--------- .../hc2vpp/acl/write/InterfaceAclCustomizerTest.java | 6 +++--- .../acl/write/InterfaceAclMacipCustomizerTest.java | 8 ++++---- 14 files changed, 53 insertions(+), 53 deletions(-) (limited to 'acl/acl-impl/src/test') diff --git a/acl/acl-impl/src/test/java/io/fd/hc2vpp/acl/AclModuleTest.java b/acl/acl-impl/src/test/java/io/fd/hc2vpp/acl/AclModuleTest.java index 498b5e02a..288305baa 100644 --- a/acl/acl-impl/src/test/java/io/fd/hc2vpp/acl/AclModuleTest.java +++ b/acl/acl-impl/src/test/java/io/fd/hc2vpp/acl/AclModuleTest.java @@ -39,8 +39,8 @@ import io.fd.honeycomb.translate.read.ReaderFactory; import io.fd.honeycomb.translate.spi.read.ListReaderCustomizer; import io.fd.honeycomb.translate.util.YangDAG; import io.fd.honeycomb.translate.write.WriterFactory; -import io.fd.vpp.jvpp.JVppRegistry; -import io.fd.vpp.jvpp.acl.future.FutureJVppAclFacade; +import io.fd.jvpp.JVppRegistry; +import io.fd.jvpp.acl.future.FutureJVppAclFacade; import java.util.HashSet; import java.util.Set; import org.junit.Before; diff --git a/acl/acl-impl/src/test/java/io/fd/hc2vpp/acl/read/AbstractAclCustomizerTest.java b/acl/acl-impl/src/test/java/io/fd/hc2vpp/acl/read/AbstractAclCustomizerTest.java index beda3ccff..d9f488fcd 100644 --- a/acl/acl-impl/src/test/java/io/fd/hc2vpp/acl/read/AbstractAclCustomizerTest.java +++ b/acl/acl-impl/src/test/java/io/fd/hc2vpp/acl/read/AbstractAclCustomizerTest.java @@ -31,15 +31,15 @@ import io.fd.hc2vpp.common.test.read.InitializingListReaderCustomizerTest; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.Initialized; -import io.fd.vpp.jvpp.acl.dto.AclDetails; -import io.fd.vpp.jvpp.acl.dto.AclDetailsReplyDump; -import io.fd.vpp.jvpp.acl.dto.AclInterfaceListDetails; -import io.fd.vpp.jvpp.acl.dto.AclInterfaceListDetailsReplyDump; -import io.fd.vpp.jvpp.acl.dto.AclInterfaceListDump; -import io.fd.vpp.jvpp.acl.dto.MacipAclInterfaceGetReply; -import io.fd.vpp.jvpp.acl.dto.MacipAclInterfaceListDetails; -import io.fd.vpp.jvpp.acl.dto.MacipAclInterfaceListDetailsReplyDump; -import io.fd.vpp.jvpp.acl.future.FutureJVppAclFacade; +import io.fd.jvpp.acl.dto.AclDetails; +import io.fd.jvpp.acl.dto.AclDetailsReplyDump; +import io.fd.jvpp.acl.dto.AclInterfaceListDetails; +import io.fd.jvpp.acl.dto.AclInterfaceListDetailsReplyDump; +import io.fd.jvpp.acl.dto.AclInterfaceListDump; +import io.fd.jvpp.acl.dto.MacipAclInterfaceGetReply; +import io.fd.jvpp.acl.dto.MacipAclInterfaceListDetails; +import io.fd.jvpp.acl.dto.MacipAclInterfaceListDetailsReplyDump; +import io.fd.jvpp.acl.future.FutureJVppAclFacade; import java.util.ArrayList; import java.util.Collections; import javax.annotation.Nonnull; diff --git a/acl/acl-impl/src/test/java/io/fd/hc2vpp/acl/read/AclCustomizerTest.java b/acl/acl-impl/src/test/java/io/fd/hc2vpp/acl/read/AclCustomizerTest.java index 7501815a6..1bbff33ba 100644 --- a/acl/acl-impl/src/test/java/io/fd/hc2vpp/acl/read/AclCustomizerTest.java +++ b/acl/acl-impl/src/test/java/io/fd/hc2vpp/acl/read/AclCustomizerTest.java @@ -24,13 +24,13 @@ import static org.mockito.Mockito.when; import io.fd.hc2vpp.acl.util.AclContextManager; import io.fd.hc2vpp.common.test.read.InitializingListReaderCustomizerTest; import io.fd.honeycomb.translate.read.ReadFailedException; -import io.fd.vpp.jvpp.acl.dto.AclDetails; -import io.fd.vpp.jvpp.acl.dto.AclDetailsReplyDump; -import io.fd.vpp.jvpp.acl.dto.MacipAclDetails; -import io.fd.vpp.jvpp.acl.dto.MacipAclDetailsReplyDump; -import io.fd.vpp.jvpp.acl.future.FutureJVppAclFacade; -import io.fd.vpp.jvpp.acl.types.AclRule; -import io.fd.vpp.jvpp.acl.types.MacipAclRule; +import io.fd.jvpp.acl.dto.AclDetails; +import io.fd.jvpp.acl.dto.AclDetailsReplyDump; +import io.fd.jvpp.acl.dto.MacipAclDetails; +import io.fd.jvpp.acl.dto.MacipAclDetailsReplyDump; +import io.fd.jvpp.acl.future.FutureJVppAclFacade; +import io.fd.jvpp.acl.types.AclRule; +import io.fd.jvpp.acl.types.MacipAclRule; import java.util.ArrayList; import java.util.List; import org.junit.Test; diff --git a/acl/acl-impl/src/test/java/io/fd/hc2vpp/acl/read/EgressAclCustomizerTest.java b/acl/acl-impl/src/test/java/io/fd/hc2vpp/acl/read/EgressAclCustomizerTest.java index 18f1978ef..e9aa3baa0 100644 --- a/acl/acl-impl/src/test/java/io/fd/hc2vpp/acl/read/EgressAclCustomizerTest.java +++ b/acl/acl-impl/src/test/java/io/fd/hc2vpp/acl/read/EgressAclCustomizerTest.java @@ -22,7 +22,7 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; import io.fd.honeycomb.translate.read.ReadFailedException; -import io.fd.vpp.jvpp.acl.dto.AclInterfaceListDetailsReplyDump; +import io.fd.jvpp.acl.dto.AclInterfaceListDetailsReplyDump; import javax.annotation.Nonnull; import org.junit.Test; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev181001.acls.attachment.points._interface.Egress; diff --git a/acl/acl-impl/src/test/java/io/fd/hc2vpp/acl/read/IngressAclCustomizerTest.java b/acl/acl-impl/src/test/java/io/fd/hc2vpp/acl/read/IngressAclCustomizerTest.java index 666f6d8c9..083095500 100644 --- a/acl/acl-impl/src/test/java/io/fd/hc2vpp/acl/read/IngressAclCustomizerTest.java +++ b/acl/acl-impl/src/test/java/io/fd/hc2vpp/acl/read/IngressAclCustomizerTest.java @@ -16,12 +16,12 @@ package io.fd.hc2vpp.acl.read; -import static io.fd.vpp.jvpp.Assertions.assertEquals; +import static io.fd.jvpp.Assertions.assertEquals; import static junit.framework.TestCase.assertTrue; import static org.mockito.Mockito.when; import io.fd.honeycomb.translate.read.ReadFailedException; -import io.fd.vpp.jvpp.acl.dto.AclInterfaceListDetailsReplyDump; +import io.fd.jvpp.acl.dto.AclInterfaceListDetailsReplyDump; import javax.annotation.Nonnull; import org.junit.Test; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev181001.acls.attachment.points._interface.Ingress; diff --git a/acl/acl-impl/src/test/java/io/fd/hc2vpp/acl/read/MacIpAclCustomizerTest.java b/acl/acl-impl/src/test/java/io/fd/hc2vpp/acl/read/MacIpAclCustomizerTest.java index 6678ab53a..70d91658a 100644 --- a/acl/acl-impl/src/test/java/io/fd/hc2vpp/acl/read/MacIpAclCustomizerTest.java +++ b/acl/acl-impl/src/test/java/io/fd/hc2vpp/acl/read/MacIpAclCustomizerTest.java @@ -30,13 +30,13 @@ import static org.mockito.Mockito.when; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.Initialized; -import io.fd.vpp.jvpp.acl.dto.AclInterfaceListDetailsReplyDump; -import io.fd.vpp.jvpp.acl.dto.MacipAclDetails; -import io.fd.vpp.jvpp.acl.dto.MacipAclDetailsReplyDump; -import io.fd.vpp.jvpp.acl.dto.MacipAclDump; -import io.fd.vpp.jvpp.acl.dto.MacipAclInterfaceGetReply; -import io.fd.vpp.jvpp.acl.dto.MacipAclInterfaceListDetailsReplyDump; -import io.fd.vpp.jvpp.acl.future.FutureJVppAclFacade; +import io.fd.jvpp.acl.dto.AclInterfaceListDetailsReplyDump; +import io.fd.jvpp.acl.dto.MacipAclDetails; +import io.fd.jvpp.acl.dto.MacipAclDetailsReplyDump; +import io.fd.jvpp.acl.dto.MacipAclDump; +import io.fd.jvpp.acl.dto.MacipAclInterfaceGetReply; +import io.fd.jvpp.acl.dto.MacipAclInterfaceListDetailsReplyDump; +import io.fd.jvpp.acl.future.FutureJVppAclFacade; import javax.annotation.Nonnull; import org.junit.Assert; import org.junit.Test; diff --git a/acl/acl-impl/src/test/java/io/fd/hc2vpp/acl/util/ace/extractor/MacIpAceDataExtractorTest.java b/acl/acl-impl/src/test/java/io/fd/hc2vpp/acl/util/ace/extractor/MacIpAceDataExtractorTest.java index 5375ee429..be6e51f21 100644 --- a/acl/acl-impl/src/test/java/io/fd/hc2vpp/acl/util/ace/extractor/MacIpAceDataExtractorTest.java +++ b/acl/acl-impl/src/test/java/io/fd/hc2vpp/acl/util/ace/extractor/MacIpAceDataExtractorTest.java @@ -21,7 +21,7 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import io.fd.hc2vpp.common.test.util.CommonTests; -import io.fd.vpp.jvpp.acl.types.MacipAclRule; +import io.fd.jvpp.acl.types.MacipAclRule; import java.util.Arrays; import org.junit.Test; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev181001.Accept; diff --git a/acl/acl-impl/src/test/java/io/fd/hc2vpp/acl/util/ace/extractor/StandardAceDataExtractorTest.java b/acl/acl-impl/src/test/java/io/fd/hc2vpp/acl/util/ace/extractor/StandardAceDataExtractorTest.java index 627dba6b0..d78bff0bb 100644 --- a/acl/acl-impl/src/test/java/io/fd/hc2vpp/acl/util/ace/extractor/StandardAceDataExtractorTest.java +++ b/acl/acl-impl/src/test/java/io/fd/hc2vpp/acl/util/ace/extractor/StandardAceDataExtractorTest.java @@ -22,7 +22,7 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import io.fd.hc2vpp.common.test.util.CommonTests; -import io.fd.vpp.jvpp.acl.types.AclRule; +import io.fd.jvpp.acl.types.AclRule; import java.util.Arrays; import org.junit.Test; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.acl.rev181022.AcceptAndReflect; diff --git a/acl/acl-impl/src/test/java/io/fd/hc2vpp/acl/util/iface/acl/AclInterfaceAssignmentRequestTest.java b/acl/acl-impl/src/test/java/io/fd/hc2vpp/acl/util/iface/acl/AclInterfaceAssignmentRequestTest.java index 1b7cf8c32..d880effc7 100644 --- a/acl/acl-impl/src/test/java/io/fd/hc2vpp/acl/util/iface/acl/AclInterfaceAssignmentRequestTest.java +++ b/acl/acl-impl/src/test/java/io/fd/hc2vpp/acl/util/iface/acl/AclInterfaceAssignmentRequestTest.java @@ -35,9 +35,9 @@ import io.fd.hc2vpp.common.test.util.NamingContextHelper; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.MappingContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.acl.dto.AclInterfaceSetAclList; -import io.fd.vpp.jvpp.acl.dto.AclInterfaceSetAclListReply; -import io.fd.vpp.jvpp.acl.future.FutureJVppAclFacade; +import io.fd.jvpp.acl.dto.AclInterfaceSetAclList; +import io.fd.jvpp.acl.dto.AclInterfaceSetAclListReply; +import io.fd.jvpp.acl.future.FutureJVppAclFacade; import java.util.Arrays; import org.junit.Before; import org.junit.Test; diff --git a/acl/acl-impl/src/test/java/io/fd/hc2vpp/acl/util/iface/macip/MacIpInterfaceAssignmentRequestTest.java b/acl/acl-impl/src/test/java/io/fd/hc2vpp/acl/util/iface/macip/MacIpInterfaceAssignmentRequestTest.java index 145eec38e..afcc23ba8 100644 --- a/acl/acl-impl/src/test/java/io/fd/hc2vpp/acl/util/iface/macip/MacIpInterfaceAssignmentRequestTest.java +++ b/acl/acl-impl/src/test/java/io/fd/hc2vpp/acl/util/iface/macip/MacIpInterfaceAssignmentRequestTest.java @@ -35,9 +35,9 @@ import io.fd.hc2vpp.common.test.util.NamingContextHelper; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.MappingContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.acl.dto.MacipAclInterfaceAddDel; -import io.fd.vpp.jvpp.acl.dto.MacipAclInterfaceAddDelReply; -import io.fd.vpp.jvpp.acl.future.FutureJVppAclFacade; +import io.fd.jvpp.acl.dto.MacipAclInterfaceAddDel; +import io.fd.jvpp.acl.dto.MacipAclInterfaceAddDelReply; +import io.fd.jvpp.acl.future.FutureJVppAclFacade; import org.junit.Before; import org.junit.Test; import org.mockito.ArgumentCaptor; diff --git a/acl/acl-impl/src/test/java/io/fd/hc2vpp/acl/util/protocol/ProtocolParsingTest.java b/acl/acl-impl/src/test/java/io/fd/hc2vpp/acl/util/protocol/ProtocolParsingTest.java index 170080b66..e8b2a6c90 100644 --- a/acl/acl-impl/src/test/java/io/fd/hc2vpp/acl/util/protocol/ProtocolParsingTest.java +++ b/acl/acl-impl/src/test/java/io/fd/hc2vpp/acl/util/protocol/ProtocolParsingTest.java @@ -21,7 +21,7 @@ import static org.junit.Assert.assertEquals; import io.fd.hc2vpp.acl.AclTestSchemaContext; import io.fd.honeycomb.test.tools.HoneycombTestRunner; import io.fd.honeycomb.test.tools.annotations.InjectTestData; -import io.fd.vpp.jvpp.acl.types.AclRule; +import io.fd.jvpp.acl.types.AclRule; import org.junit.Test; import org.junit.runner.RunWith; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.acl.rev181022.VppIcmpAceAugmentation; diff --git a/acl/acl-impl/src/test/java/io/fd/hc2vpp/acl/write/AclCustomizerTest.java b/acl/acl-impl/src/test/java/io/fd/hc2vpp/acl/write/AclCustomizerTest.java index ae7023059..5dd76d519 100644 --- a/acl/acl-impl/src/test/java/io/fd/hc2vpp/acl/write/AclCustomizerTest.java +++ b/acl/acl-impl/src/test/java/io/fd/hc2vpp/acl/write/AclCustomizerTest.java @@ -31,15 +31,15 @@ import io.fd.hc2vpp.common.test.write.WriterCustomizerTest; import io.fd.honeycomb.test.tools.HoneycombTestRunner; import io.fd.honeycomb.test.tools.annotations.InjectTestData; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.acl.dto.AclAddReplace; -import io.fd.vpp.jvpp.acl.dto.AclAddReplaceReply; -import io.fd.vpp.jvpp.acl.dto.AclDel; -import io.fd.vpp.jvpp.acl.dto.AclDelReply; -import io.fd.vpp.jvpp.acl.dto.MacipAclAdd; -import io.fd.vpp.jvpp.acl.dto.MacipAclAddReply; -import io.fd.vpp.jvpp.acl.future.FutureJVppAclFacade; -import io.fd.vpp.jvpp.acl.types.AclRule; -import io.fd.vpp.jvpp.acl.types.MacipAclRule; +import io.fd.jvpp.acl.dto.AclAddReplace; +import io.fd.jvpp.acl.dto.AclAddReplaceReply; +import io.fd.jvpp.acl.dto.AclDel; +import io.fd.jvpp.acl.dto.AclDelReply; +import io.fd.jvpp.acl.dto.MacipAclAdd; +import io.fd.jvpp.acl.dto.MacipAclAddReply; +import io.fd.jvpp.acl.future.FutureJVppAclFacade; +import io.fd.jvpp.acl.types.AclRule; +import io.fd.jvpp.acl.types.MacipAclRule; import java.nio.charset.StandardCharsets; import java.util.Arrays; import org.junit.Test; diff --git a/acl/acl-impl/src/test/java/io/fd/hc2vpp/acl/write/InterfaceAclCustomizerTest.java b/acl/acl-impl/src/test/java/io/fd/hc2vpp/acl/write/InterfaceAclCustomizerTest.java index b6c26ceeb..bfeda34e8 100644 --- a/acl/acl-impl/src/test/java/io/fd/hc2vpp/acl/write/InterfaceAclCustomizerTest.java +++ b/acl/acl-impl/src/test/java/io/fd/hc2vpp/acl/write/InterfaceAclCustomizerTest.java @@ -25,9 +25,9 @@ import io.fd.hc2vpp.acl.AclTestSchemaContext; import io.fd.hc2vpp.acl.util.AclContextManager; import io.fd.hc2vpp.common.test.write.WriterCustomizerTest; import io.fd.hc2vpp.common.translate.util.NamingContext; -import io.fd.vpp.jvpp.acl.dto.AclInterfaceSetAclList; -import io.fd.vpp.jvpp.acl.dto.AclInterfaceSetAclListReply; -import io.fd.vpp.jvpp.acl.future.FutureJVppAclFacade; +import io.fd.jvpp.acl.dto.AclInterfaceSetAclList; +import io.fd.jvpp.acl.dto.AclInterfaceSetAclListReply; +import io.fd.jvpp.acl.future.FutureJVppAclFacade; import java.util.Collections; import org.junit.Test; import org.mockito.Mock; diff --git a/acl/acl-impl/src/test/java/io/fd/hc2vpp/acl/write/InterfaceAclMacipCustomizerTest.java b/acl/acl-impl/src/test/java/io/fd/hc2vpp/acl/write/InterfaceAclMacipCustomizerTest.java index af3deaca2..ff698d500 100644 --- a/acl/acl-impl/src/test/java/io/fd/hc2vpp/acl/write/InterfaceAclMacipCustomizerTest.java +++ b/acl/acl-impl/src/test/java/io/fd/hc2vpp/acl/write/InterfaceAclMacipCustomizerTest.java @@ -25,10 +25,10 @@ import io.fd.hc2vpp.acl.AclTestSchemaContext; import io.fd.hc2vpp.acl.util.AclContextManager; import io.fd.hc2vpp.common.test.write.WriterCustomizerTest; import io.fd.hc2vpp.common.translate.util.NamingContext; -import io.fd.vpp.jvpp.acl.dto.AclInterfaceSetAclListReply; -import io.fd.vpp.jvpp.acl.dto.MacipAclInterfaceAddDel; -import io.fd.vpp.jvpp.acl.dto.MacipAclInterfaceAddDelReply; -import io.fd.vpp.jvpp.acl.future.FutureJVppAclFacade; +import io.fd.jvpp.acl.dto.AclInterfaceSetAclListReply; +import io.fd.jvpp.acl.dto.MacipAclInterfaceAddDel; +import io.fd.jvpp.acl.dto.MacipAclInterfaceAddDelReply; +import io.fd.jvpp.acl.future.FutureJVppAclFacade; import java.util.Collections; import org.junit.Test; import org.mockito.Mock; -- cgit 1.2.3-korg