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/main/java/io/fd/hc2vpp/acl/AclModule.java | 2 +- .../java/io/fd/hc2vpp/acl/JVppAclProvider.java | 12 ++++----- .../fd/hc2vpp/acl/read/AbstractAclCustomizer.java | 12 ++++----- .../java/io/fd/hc2vpp/acl/read/AclCustomizer.java | 14 +++++----- .../io/fd/hc2vpp/acl/read/EgressAclCustomizer.java | 4 +-- .../fd/hc2vpp/acl/read/IngressAclCustomizer.java | 18 ++++++------- .../fd/hc2vpp/acl/read/InterfaceAclCustomizer.java | 10 ++++---- .../hc2vpp/acl/read/factory/AclReaderFactory.java | 2 +- .../read/factory/InterfaceAclReaderFactory.java | 4 +-- .../hc2vpp/acl/util/FutureJVppAclCustomizer.java | 2 +- .../io/fd/hc2vpp/acl/util/ace/AceConverter.java | 4 +-- .../util/ace/extractor/MacIpAceDataExtractor.java | 2 +- .../ace/extractor/StandardAceDataExtractor.java | 2 +- .../hc2vpp/acl/util/protocol/IpProtocolReader.java | 2 +- .../util/protocol/ProtoPreBindRuleProducer.java | 2 +- .../java/io/fd/hc2vpp/acl/write/AclCustomizer.java | 2 +- .../hc2vpp/acl/write/InterfaceAclCustomizer.java | 2 +- .../write/factory/AbstractAclWriterFactory.java | 2 +- .../acl/write/request/AclAddReplaceRequest.java | 14 +++++----- .../request/AclInterfaceAssignmentRequest.java | 4 +-- .../request/MacIpInterfaceAssignmentRequest.java | 4 +-- .../test/java/io/fd/hc2vpp/acl/AclModuleTest.java | 4 +-- .../hc2vpp/acl/read/AbstractAclCustomizerTest.java | 18 ++++++------- .../io/fd/hc2vpp/acl/read/AclCustomizerTest.java | 14 +++++----- .../hc2vpp/acl/read/EgressAclCustomizerTest.java | 2 +- .../hc2vpp/acl/read/IngressAclCustomizerTest.java | 4 +-- .../fd/hc2vpp/acl/read/MacIpAclCustomizerTest.java | 14 +++++----- .../ace/extractor/MacIpAceDataExtractorTest.java | 2 +- .../extractor/StandardAceDataExtractorTest.java | 2 +- .../acl/AclInterfaceAssignmentRequestTest.java | 6 ++--- .../macip/MacIpInterfaceAssignmentRequestTest.java | 6 ++--- .../acl/util/protocol/ProtocolParsingTest.java | 2 +- .../io/fd/hc2vpp/acl/write/AclCustomizerTest.java | 18 ++++++------- .../acl/write/InterfaceAclCustomizerTest.java | 6 ++--- .../acl/write/InterfaceAclMacipCustomizerTest.java | 8 +++--- .../bgp/prefix/sid/BgpPrefixSidMplsWriter.java | 4 +-- .../bgp/prefix/sid/BgpPrefixSidWriterFactory.java | 2 +- .../bgp/prefix/sid/IpRouteRequestProducer.java | 4 +-- .../bgp/prefix/sid/MplsRouteRequestProducer.java | 4 +-- .../bgp/prefix/sid/BgpPrefixSidMplsWriterTest.java | 12 ++++----- .../fd/hc2vpp/bgp/inet/InetRouteWriterFactory.java | 2 +- .../java/io/fd/hc2vpp/bgp/inet/Ipv4Writer.java | 4 +-- .../java/io/fd/hc2vpp/bgp/inet/Ipv6Writer.java | 4 +-- .../fd/hc2vpp/bgp/inet/RouteRequestProducer.java | 2 +- .../java/io/fd/hc2vpp/bgp/inet/Ipv4WriterTest.java | 8 +++--- .../java/io/fd/hc2vpp/bgp/inet/Ipv6WriterTest.java | 6 ++--- .../io/fd/hc2vpp/dhcp/read/DhcpReaderFactory.java | 2 +- .../fd/hc2vpp/dhcp/read/DhcpRelayCustomizer.java | 8 +++--- .../fd/hc2vpp/dhcp/write/DhcpRelayCustomizer.java | 4 +-- .../io/fd/hc2vpp/dhcp/write/DhcpWriterFactory.java | 2 +- .../java/io/fd/hc2vpp/dhcp/DhcpModuleTest.java | 2 +- .../hc2vpp/dhcp/read/DhcpRelayCustomizerTest.java | 8 +++--- .../hc2vpp/dhcp/write/DhcpRelayCustomizerTest.java | 4 +-- .../read/FibManagementReaderFactory.java | 10 ++++---- .../fib/management/read/FibTableCustomizer.java | 4 +-- .../fib/management/request/FibTableRequest.java | 4 +-- .../write/FibManagementWriterFactory.java | 2 +- .../fib/management/write/FibTableCustomizer.java | 2 +- .../fib/management/FibManagementModuleTest.java | 2 +- .../management/read/FibTableCustomizerTest.java | 10 ++++---- .../management/write/FibTableCustomizerTest.java | 4 +-- .../io/fd/hc2vpp/vppioam/impl/VppIoamModule.java | 12 ++++----- .../impl/config/IoamExportWriterCustomizer.java | 6 ++--- .../impl/config/IoamPotWriterCustomizer.java | 10 ++++---- .../impl/config/IoamTraceWriterCustomizer.java | 10 ++++---- .../vppioam/impl/config/VppIoamWriterFactory.java | 6 ++--- .../impl/oper/PotProfileReaderCustomizer.java | 8 +++--- .../impl/oper/TraceProfileReaderCustomizer.java | 6 ++--- .../vppioam/impl/oper/VppIoamReaderFactory.java | 4 +-- .../impl/util/FutureJVppIoamexportCustomizer.java | 2 +- .../impl/util/FutureJVppIoampotCustomizer.java | 2 +- .../impl/util/FutureJVppIoamtraceCustomizer.java | 2 +- .../vppioam/impl/util/JVppIoamExportProvider.java | 6 ++--- .../vppioam/impl/util/JVppIoamPotProvider.java | 6 ++--- .../vppioam/impl/util/JVppIoamTraceProvider.java | 6 ++--- .../fd/hc2vpp/vppioam/impl/VppIoamModuleTest.java | 8 +++--- .../config/IoamExportWriterCustomizerTest.java | 6 ++--- .../impl/config/IoamPotWriterCustomizerTest.java | 10 ++++---- .../impl/config/IoamTraceWriterCustomizerTest.java | 10 ++++---- .../impl/oper/PotProfileReaderCustomizerTest.java | 8 +++--- .../oper/TraceProfileReaderCustomizerTest.java | 6 ++--- .../fd/hc2vpp/ipsec/FutureJVppIkev2Customizer.java | 2 +- .../main/java/io/fd/hc2vpp/ipsec/IpsecModule.java | 2 +- .../java/io/fd/hc2vpp/ipsec/JVppIkev2Provider.java | 6 ++--- .../fd/hc2vpp/ipsec/read/IpsecReaderFactory.java | 2 +- .../fd/hc2vpp/ipsec/read/IpsecStateCustomizer.java | 12 ++++----- .../hc2vpp/ipsec/read/IpsecStateSpdCustomizer.java | 16 ++++++------ .../write/Ikev2GlobalConfigurationCustomizer.java | 4 +-- .../hc2vpp/ipsec/write/Ikev2PolicyCustomizer.java | 8 +++--- .../ipsec/write/Ikev2PolicyIdentityCustomizer.java | 4 +-- .../ipsec/write/IpsecSadEntryCustomizer.java | 18 ++++++------- .../fd/hc2vpp/ipsec/write/IpsecSpdCustomizer.java | 10 ++++---- .../fd/hc2vpp/ipsec/write/IpsecWriterFactory.java | 4 +-- .../java/io/fd/hc2vpp/ipsec/IpsecModuleTest.java | 4 +-- .../ipsec/read/IpsecStateCustomizerTest.java | 18 ++++++------- .../ipsec/read/IpsecStateSpdCustomizerTest.java | 12 ++++----- .../Ikev2GlobalConfigurationCustomizerTest.java | 6 ++--- .../ipsec/write/Ikev2PolicyCustomizerTest.java | 14 +++++----- .../write/Ikev2PolicyIdentityCustomizerTest.java | 6 ++--- .../ipsec/write/IpsecSadEntryCustomizerTest.java | 18 ++++++------- .../hc2vpp/ipsec/write/IpsecSpdCustomizerTest.java | 12 ++++----- .../java/io/fd/hc2vpp/it/JVppCoverageTest.java | 16 ++++++------ .../hc2vpp/it/jvpp/benchmark/acl/AclProvider.java | 2 +- .../it/jvpp/benchmark/acl/AclProviderImpl.java | 4 +-- .../it/jvpp/benchmark/acl/AclUpdateBenchmark.java | 24 ++++++++--------- .../benchmark/classify/ClassifyTableBenchmark.java | 8 +++--- .../benchmark/classify/ClassifyTableProvider.java | 2 +- .../classify/ClassifyTableProviderImpl.java | 2 +- .../it/jvpp/benchmark/util/JVppBenchmark.java | 6 ++--- .../it/jvpp/benchmark/acl/AclProviderImplTest.java | 2 +- .../classify/ClassifyTableProviderImplTest.java | 6 ++--- .../l3/read/factory/Ipv4StateReaderFactory.java | 2 +- .../l3/read/factory/Ipv6StateReaderFactory.java | 2 +- .../SubInterfaceStateIpv4ReaderFactory.java | 2 +- .../SubInterfaceStateIpv6ReaderFactory.java | 2 +- .../hc2vpp/l3/read/ipv4/Ipv4AddressCustomizer.java | 6 ++--- .../io/fd/hc2vpp/l3/read/ipv4/Ipv4Customizer.java | 2 +- .../l3/read/ipv4/Ipv4NeighbourCustomizer.java | 8 +++--- .../SubInterfaceIpv4AddressCustomizer.java | 6 ++--- .../SubInterfaceIpv4NeighbourCustomizer.java | 6 ++--- .../hc2vpp/l3/read/ipv6/Ipv6AddressCustomizer.java | 6 ++--- .../io/fd/hc2vpp/l3/read/ipv6/Ipv6Customizer.java | 2 +- .../l3/read/ipv6/Ipv6NeighbourCustomizer.java | 8 +++--- .../hc2vpp/l3/read/ipv6/nd/NdProxyCustomizer.java | 6 ++--- .../SubInterfaceIpv6AddressCustomizer.java | 6 ++--- .../SubInterfaceIpv6NeighbourCustomizer.java | 6 ++--- .../hc2vpp/l3/write/factory/Ipv4WriterFactory.java | 2 +- .../hc2vpp/l3/write/factory/Ipv6WriterFactory.java | 2 +- .../l3/write/factory/ProxyArpWriterFactory.java | 2 +- .../factory/SubInterfaceIpv4WriterFactory.java | 2 +- .../factory/SubInterfaceIpv6WriterFactory.java | 2 +- .../l3/write/ipv4/Ipv4AddressCustomizer.java | 2 +- .../io/fd/hc2vpp/l3/write/ipv4/Ipv4Customizer.java | 2 +- .../l3/write/ipv4/Ipv4NeighbourCustomizer.java | 4 +-- .../hc2vpp/l3/write/ipv4/ProxyArpCustomizer.java | 4 +-- .../hc2vpp/l3/write/ipv4/ProxyRangeCustomizer.java | 10 ++++---- .../SubInterfaceIpv4AddressCustomizer.java | 2 +- .../SubInterfaceIpv4NeighbourCustomizer.java | 4 +-- .../l3/write/ipv6/Ipv6AddressCustomizer.java | 2 +- .../io/fd/hc2vpp/l3/write/ipv6/Ipv6Customizer.java | 2 +- .../l3/write/ipv6/Ipv6NeighbourCustomizer.java | 6 ++--- .../hc2vpp/l3/write/ipv6/nd/NdProxyCustomizer.java | 6 ++--- .../SubInterfaceIpv6AddressCustomizer.java | 2 +- .../SubInterfaceIpv6NeighbourCustomizer.java | 4 +-- l3/impl/src/test/java/L3ModulesTest.java | 2 +- .../fd/hc2vpp/l3/read/InterfaceChildNodeTest.java | 30 +++++++++++----------- .../l3/read/ipv4/Ipv4AddressCustomizerTest.java | 6 ++--- .../SubInterfaceIpv4AddressCustomizerTest.java | 4 +-- .../l3/read/ipv6/nd/NdProxyCustomizerTest.java | 6 ++--- .../fd/hc2vpp/l3/write/ProxyArpCustomizerTest.java | 4 +-- .../hc2vpp/l3/write/ProxyRangeCustomizerTest.java | 8 +++--- .../l3/write/ipv4/Ipv4AddressCustomizerTest.java | 8 +++--- .../l3/write/ipv4/Ipv4NeighbourCustomizerTest.java | 20 +++++++-------- .../SubInterfaceIpv4AddressCustomizerTest.java | 6 ++--- .../l3/write/ipv6/Ipv6NeighbourCustomizerTest.java | 20 +++++++-------- .../l3/write/ipv6/nd/NdProxyCustomizerTest.java | 6 ++--- .../hc2vpp/l3/utils/ip/read/IpAddressReader.java | 8 +++--- .../hc2vpp/l3/utils/ip/read/IpNeighbourReader.java | 8 +++--- .../io/fd/hc2vpp/l3/utils/ip/write/IpWriter.java | 12 ++++----- .../gpe/translate/read/GpeFeatureCustomizer.java | 6 ++--- .../translate/read/GpeForwardEntryCustomizer.java | 20 +++++++-------- .../lisp/gpe/translate/read/GpeReaderFactory.java | 2 +- .../read/NativeForwardPathCustomizer.java | 8 +++--- .../read/NativeForwardPathsTableCustomizer.java | 10 ++++---- .../service/GpeStateCheckServiceImpl.java | 6 ++--- .../gpe/translate/write/GpeFeatureCustomizer.java | 6 ++--- .../translate/write/GpeForwardEntryCustomizer.java | 8 +++--- .../lisp/gpe/translate/write/GpeWriterFactory.java | 2 +- .../write/NativeForwardPathCustomizer.java | 4 +-- .../write/NativeForwardPathsTableCustomizer.java | 4 +-- .../translate/AbstractLispInfraFactoryBase.java | 2 +- .../lisp/translate/read/AdjacencyCustomizer.java | 8 +++--- .../read/BridgeDomainSubtableCustomizer.java | 6 ++--- .../lisp/translate/read/InterfaceCustomizer.java | 6 ++--- .../read/ItrRemoteLocatorSetCustomizer.java | 6 ++--- .../lisp/translate/read/LispStateCustomizer.java | 10 ++++---- .../translate/read/LocalMappingCustomizer.java | 6 ++--- .../lisp/translate/read/LocatorSetCustomizer.java | 6 ++--- .../lisp/translate/read/MapRegisterCustomizer.java | 14 +++++----- .../translate/read/MapRequestModeCustomizer.java | 6 ++--- .../lisp/translate/read/MapResolverCustomizer.java | 8 +++--- .../lisp/translate/read/MapServerCustomizer.java | 8 +++--- .../lisp/translate/read/PetrCfgCustomizer.java | 6 ++--- .../lisp/translate/read/PitrCfgCustomizer.java | 8 +++--- .../translate/read/RemoteMappingCustomizer.java | 10 ++++---- .../lisp/translate/read/RlocProbeCustomizer.java | 6 ++--- .../lisp/translate/read/VniTableCustomizer.java | 8 +++--- .../lisp/translate/read/VrfSubtableCustomizer.java | 6 ++--- .../lisp/translate/read/trait/LocatorReader.java | 6 ++--- .../translate/read/trait/LocatorSetReader.java | 6 ++--- .../lisp/translate/read/trait/MappingReader.java | 8 +++--- .../lisp/translate/read/trait/SubtableReader.java | 6 ++--- .../service/LispStateCheckServiceImpl.java | 6 ++--- .../lisp/translate/util/CheckedLispCustomizer.java | 2 +- .../lisp/translate/write/AdjacencyCustomizer.java | 6 ++--- .../write/BridgeDomainSubtableCustomizer.java | 4 +-- .../lisp/translate/write/InterfaceCustomizer.java | 6 ++--- .../write/ItrRemoteLocatorSetCustomizer.java | 6 ++--- .../lisp/translate/write/LispCustomizer.java | 8 +++--- .../translate/write/LocalMappingCustomizer.java | 6 ++--- .../lisp/translate/write/LocatorSetCustomizer.java | 4 +-- .../translate/write/MapRegisterCustomizer.java | 8 +++--- .../translate/write/MapRequestModeCustomizer.java | 6 ++--- .../translate/write/MapResolverCustomizer.java | 6 ++--- .../lisp/translate/write/MapServerCustomizer.java | 4 +-- .../lisp/translate/write/PetrCfgCustomizer.java | 4 +-- .../lisp/translate/write/PitrCfgCustomizer.java | 6 ++--- .../translate/write/RemoteMappingCustomizer.java | 8 +++--- .../lisp/translate/write/RlocProbeCustomizer.java | 4 +-- .../lisp/translate/write/VniTableCustomizer.java | 2 +- .../translate/write/VrfSubtableCustomizer.java | 4 +-- .../lisp/translate/write/trait/SubtableWriter.java | 6 ++--- .../java/io/fd/hc2vpp/lisp/LispModuleTest.java | 2 +- .../hc2vpp/lisp/gpe/translate/GpeModuleTest.java | 2 +- .../translate/read/GpeFeatureCustomizerTest.java | 2 +- .../read/GpeForwardEntryCustomizerTest.java | 16 ++++++------ .../read/NativeForwardPathCustomizerTest.java | 6 ++--- .../NativeForwardPathsTableCustomizerTest.java | 10 ++++---- .../translate/write/GpeFeatureCustomizerTest.java | 4 +-- .../write/GpeForwardEntryCustomizerTest.java | 6 ++--- .../write/NativeForwardPathCustomizerTest.java | 4 +-- .../NativeForwardPathsTableCustomizerTest.java | 6 ++--- .../translate/read/AdjacencyCustomizerTest.java | 4 +-- .../read/BridgeDomainSubtableCustomizerTest.java | 2 +- .../translate/read/InterfaceCustomizerTest.java | 4 +-- .../read/ItrRemoteLocatorSetCustomizerTest.java | 6 ++--- .../translate/read/LispStateCustomizerTest.java | 6 ++--- .../translate/read/LocalMappingCustomizerTest.java | 4 +-- .../translate/read/LocatorSetCustomizerTest.java | 4 +-- .../translate/read/MapRegisterCustomizerTest.java | 6 ++--- .../read/MapRequestModeCustomizerTest.java | 2 +- .../translate/read/MapResolverCustomizerTest.java | 4 +-- .../translate/read/MapServerCustomizerTest.java | 6 ++--- .../lisp/translate/read/PetrCfgCustomizerTest.java | 2 +- .../lisp/translate/read/PitrCfgCustomizerTest.java | 2 +- .../read/RemoteMappingCustomizerTest.java | 8 +++--- .../translate/read/RlocProbeCustomizerTest.java | 2 +- .../translate/read/VniTableCustomizerTest.java | 6 ++--- .../translate/read/VrfSubtableCustomizerTest.java | 2 +- .../read/trait/SubtableReaderTestCase.java | 6 ++--- .../service/LispStateCheckServiceImplTest.java | 4 +-- .../translate/write/AdjacencyCustomizerTest.java | 4 +-- .../write/BridgeDomainCustomizerTest.java | 2 +- .../translate/write/InterfaceCustomizerTest.java | 4 +-- .../write/ItrRemoteLocatorSetCustomizerTest.java | 6 ++--- .../lisp/translate/write/LispCustomizerTest.java | 4 +-- .../write/LocalMappingCustomizerTest.java | 4 +-- .../translate/write/LocatorSetCustomizerTest.java | 8 +++--- .../translate/write/MapRegisterCustomizerTest.java | 12 ++++----- .../write/MapRequestModeCustomizerTest.java | 4 +-- .../translate/write/MapResolverCustomizerTest.java | 4 +-- .../translate/write/MapServerCustomizerTest.java | 4 +-- .../translate/write/PetrCfgCustomizerTest.java | 4 +-- .../translate/write/PitrCfgCustomizerTest.java | 4 +-- .../write/RemoteMappingCustomizerTest.java | 6 ++--- .../translate/write/RlocProbeCustomizerTest.java | 4 +-- .../translate/write/VrfSubtableCustomizerTest.java | 2 +- .../write/trait/SubtableWriterTestCase.java | 4 +-- .../io/fd/hc2vpp/mpls/ImposeAndForwardWriter.java | 6 ++--- .../java/io/fd/hc2vpp/mpls/Ipv4LookupWriter.java | 6 ++--- .../io/fd/hc2vpp/mpls/MplsInSegmentTranslator.java | 2 +- .../io/fd/hc2vpp/mpls/MplsInterfaceCustomizer.java | 6 ++--- .../java/io/fd/hc2vpp/mpls/MplsLookupWriter.java | 6 ++--- .../java/io/fd/hc2vpp/mpls/MplsSwapWriter.java | 6 ++--- .../java/io/fd/hc2vpp/mpls/MplsWriterFactory.java | 2 +- .../io/fd/hc2vpp/mpls/StaticLspCustomizer.java | 2 +- .../io/fd/hc2vpp/mpls/ImposeAndForwardTest.java | 8 +++--- .../hc2vpp/mpls/MplsInterfaceCustomizerTest.java | 10 ++++---- .../io/fd/hc2vpp/mpls/PopAndIpv4LookupTest.java | 8 +++--- .../io/fd/hc2vpp/mpls/PopAndMplsLookupTest.java | 8 +++--- .../java/io/fd/hc2vpp/mpls/SwapAndForwardTest.java | 8 +++--- .../src/main/java/io/fd/hc2vpp/nat/NatModule.java | 2 +- .../io/fd/hc2vpp/nat/jvpp/JVppNatProvider.java | 6 ++--- .../hc2vpp/nat/read/ExternalIpPoolCustomizer.java | 14 +++++----- .../fd/hc2vpp/nat/read/MappingEntryCustomizer.java | 14 +++++----- .../hc2vpp/nat/read/Nat64PrefixesCustomizer.java | 8 +++--- .../fd/hc2vpp/nat/read/NatInstanceCustomizer.java | 4 +-- .../io/fd/hc2vpp/nat/read/NatReaderFactory.java | 9 +++---- .../read/ifc/AbstractInterfaceNatCustomizer.java | 14 +++++----- .../ifc/AbstractSubInterfaceNatCustomizer.java | 2 +- .../hc2vpp/nat/read/ifc/IfcNatReaderFactory.java | 2 +- .../read/ifc/InterfaceInboundNatCustomizer.java | 2 +- .../read/ifc/InterfaceOutboundNatCustomizer.java | 2 +- .../nat/read/ifc/SubIfcNatReaderFactory.java | 2 +- .../read/ifc/SubInterfaceInboundNatCustomizer.java | 2 +- .../ifc/SubInterfaceOutboundNatCustomizer.java | 2 +- .../io/fd/hc2vpp/nat/util/MappingEntryContext.java | 4 +-- .../hc2vpp/nat/write/ExternalIpPoolCustomizer.java | 6 ++--- .../hc2vpp/nat/write/MappingEntryCustomizer.java | 6 ++--- .../hc2vpp/nat/write/Nat64PrefixesCustomizer.java | 7 ++--- .../io/fd/hc2vpp/nat/write/NatWriterFactory.java | 2 +- .../write/ifc/AbstractInterfaceNatCustomizer.java | 8 +++--- .../ifc/AbstractSubInterfaceNatCustomizer.java | 2 +- .../hc2vpp/nat/write/ifc/IfcNatWriterFactory.java | 2 +- .../write/ifc/InterfaceInboundNatCustomizer.java | 2 +- .../write/ifc/InterfaceOutboundNatCustomizer.java | 2 +- .../nat/write/ifc/SubIfcNatWriterFactory.java | 2 +- .../ifc/SubInterfaceInboundNatCustomizer.java | 2 +- .../ifc/SubInterfaceOutboundNatCustomizer.java | 2 +- .../test/java/io/fd/hc2vpp/nat/NatModuleTest.java | 2 +- .../nat/read/ExternalIpPoolCustomizerTest.java | 10 ++++---- .../nat/read/MappingEntryCustomizerTest.java | 9 +++---- .../nat/read/Nat64PrefixesCustomizerTest.java | 6 ++--- .../hc2vpp/nat/read/NatInstanceCustomizerTest.java | 8 +++--- .../ifc/InterfaceInboundNatCustomizerTest.java | 12 ++++----- .../ifc/InterfaceOutboundNatCustomizerTest.java | 12 ++++----- .../hc2vpp/nat/util/MappingEntryContextTest.java | 2 +- .../nat/write/ExternalIpPoolCustomizerTest.java | 10 ++++---- .../nat/write/MappingEntryCustomizerTest.java | 10 ++++---- .../nat/write/MappingEntryValidatorTest.java | 2 -- .../nat/write/Nat64PrefixesCustomizerTest.java | 6 ++--- .../nat/write/ifc/AbstractNatCustomizerTest.java | 14 +++++----- .../ifc/InterfaceInboundNatCustomizerTest.java | 2 +- .../ifc/InterfaceOutboundNatCustomizerTest.java | 2 +- .../io/fd/hc2vpp/vppnsh/impl/VppNshModule.java | 8 +++--- .../impl/config/NshEntryWriterCustomizer.java | 6 ++--- .../vppnsh/impl/config/NshMapWriterCustomizer.java | 6 ++--- .../vppnsh/impl/config/VppNshWriterFactory.java | 2 +- .../vppnsh/impl/oper/NshEntryReaderCustomizer.java | 8 +++--- .../vppnsh/impl/oper/NshMapReaderCustomizer.java | 8 +++--- .../vppnsh/impl/oper/VppNshReaderFactory.java | 2 +- .../vppnsh/impl/util/FutureJVppNshCustomizer.java | 2 +- .../hc2vpp/vppnsh/impl/util/JVppNshProvider.java | 6 ++--- .../io/fd/hc2vpp/vppnsh/impl/VppNshModuleTest.java | 8 +++--- .../impl/config/NshEntryWriterCustomizerTest.java | 8 +++--- .../impl/config/NshMapWriterCustomizerTest.java | 8 +++--- .../impl/oper/NshEntryReaderCustomizerTest.java | 10 ++++---- .../impl/oper/NshMapReaderCustomizerTest.java | 10 ++++---- .../devel_guide/devel_plugin_vpp_tutorial.adoc | 18 ++++++------- .../routing/naming/Ipv4RouteNamesFactory.java | 4 +-- .../routing/naming/Ipv6RouteNamesFactory.java | 4 +-- .../read/ControlPlaneProtocolCustomizer.java | 4 +-- .../hc2vpp/routing/read/Ipv4RouteCustomizer.java | 4 +-- .../hc2vpp/routing/read/Ipv6RouteCustomizer.java | 4 +-- .../hc2vpp/routing/read/RoutingReaderFactory.java | 10 ++++---- .../hc2vpp/routing/trait/Ipv4RoutePathParser.java | 2 +- .../hc2vpp/routing/trait/Ipv6RoutePathParser.java | 2 +- .../io/fd/hc2vpp/routing/trait/RouteMapper.java | 2 +- .../hc2vpp/routing/write/Ipv4RouteCustomizer.java | 4 +-- .../hc2vpp/routing/write/Ipv6RouteCustomizer.java | 4 +-- .../fd/hc2vpp/routing/write/PrefixCustomizer.java | 4 +-- .../write/RouterAdvertisementsCustomizer.java | 4 +-- .../hc2vpp/routing/write/RoutingWriterFactory.java | 2 +- .../write/factory/MultipathHopRequestFactory.java | 2 +- .../write/factory/SimpleHopRequestFactory.java | 2 +- .../factory/SpecialNextHopRequestFactory.java | 2 +- .../write/factory/TableLookupRequestFactory.java | 2 +- .../routing/write/trait/RouteRequestProducer.java | 2 +- .../hc2vpp/routing/Ipv4RouteNamesFactoryTest.java | 4 +-- .../hc2vpp/routing/Ipv6RouteNamesFactoryTest.java | 4 +-- .../io/fd/hc2vpp/routing/RoutingModuleTest.java | 2 +- .../routing/helpers/RoutingRequestTestHelper.java | 6 ++--- .../read/ControlPlaneProtocolCustomizerTest.java | 10 ++++---- .../routing/read/Ipv4RouteCustomizerTest.java | 6 ++--- .../routing/read/Ipv6RouteCustomizerTest.java | 6 ++--- .../routing/write/Ipv4RouteCustomizerTest.java | 2 +- .../routing/write/Ipv6RouteCustomizerTest.java | 2 +- .../hc2vpp/routing/write/PrefixCustomizerTest.java | 16 ++++++------ .../write/RouterAdvertisementsCustomizerTest.java | 4 +-- .../MultipathHopRequestFactoryIpv4Test.java | 2 +- .../MultipathHopRequestFactoryIpv6Test.java | 2 +- .../factory/SimpleHopRequestFactoryIpv4Test.java | 2 +- .../factory/SimpleHopRequestFactoryIpv6Test.java | 2 +- .../SpecialNextHopRequestFactoryIpv4Test.java | 2 +- .../SpecialNextHopRequestFactoryIpv6Test.java | 2 +- .../samples/read/ModuleStateReaderFactory.java | 2 +- .../hc2vpp/samples/read/VxlanReadCustomizer.java | 8 +++--- .../hc2vpp/samples/write/ModuleWriterFactory.java | 2 +- .../hc2vpp/samples/write/VxlanWriteCustomizer.java | 6 ++--- .../hc2vpp/srv6/read/Srv6PolicyReaderFactory.java | 2 +- .../io/fd/hc2vpp/srv6/read/Srv6ReaderFactory.java | 2 +- .../srv6/read/policy/NamedSegmentCustomizer.java | 2 +- .../hc2vpp/srv6/read/policy/PolicyCustomizer.java | 2 +- .../read/policy/request/PolicyReadRequest.java | 12 ++++----- .../fd/hc2vpp/srv6/read/sid/LocatorCustomizer.java | 2 +- .../io/fd/hc2vpp/srv6/read/sid/SidCustomizer.java | 2 +- .../srv6/read/sid/request/LocalSidReadRequest.java | 8 +++--- .../srv6/read/sid/request/LocatorReadRequest.java | 8 +++--- .../srv6/read/steering/InterfaceCustomizer.java | 2 +- .../srv6/read/steering/PrefixCustomizer.java | 2 +- .../read/steering/PrefixesStateCustomizer.java | 2 +- .../read/steering/request/L2SteeringRequest.java | 4 +-- .../read/steering/request/L3SteeringRequest.java | 4 +-- .../read/steering/request/SteeringRequest.java | 6 ++--- .../java/io/fd/hc2vpp/srv6/util/JVppRequest.java | 2 +- .../util/function/LocalSidFunctionReadBinder.java | 2 +- .../LocalSidFunctionReadBindingRegistry.java | 2 +- ...ocalSidFunctionReadBindingRegistryProvider.java | 2 +- ...calSidFunctionWriteBindingRegistryProvider.java | 2 +- .../util/function/lookup/EndDT4FunctionBinder.java | 4 +-- .../util/function/lookup/EndDT6FunctionBinder.java | 4 +-- .../util/function/lookup/EndTFunctionBinder.java | 4 +-- .../function/lookup/TableLookupFunctionBinder.java | 2 +- .../function/nofunction/EndFunctionBinder.java | 4 +-- .../function/xconnect/EndDX2FunctionBinder.java | 4 +-- .../function/xconnect/EndDX4FunctionBinder.java | 4 +-- .../function/xconnect/EndDX6FunctionBinder.java | 4 +-- .../util/function/xconnect/EndXFunctionBinder.java | 4 +-- .../function/xconnect/XConnectFunctionBinder.java | 2 +- .../hc2vpp/srv6/write/Srv6PolicyWriterFactory.java | 2 +- .../io/fd/hc2vpp/srv6/write/Srv6WriterFactory.java | 2 +- .../source/EncapsulationSourceCustomizer.java | 2 +- .../request/EncapsulationSourceDeleteRequest.java | 4 +-- .../request/EncapsulationSourceWriteRequest.java | 4 +-- .../hc2vpp/srv6/write/policy/PolicyCustomizer.java | 2 +- .../write/policy/request/PolicyDeleteRequest.java | 6 ++--- .../write/policy/request/PolicyWriteRequest.java | 10 ++++---- .../hc2vpp/srv6/write/sid/LocatorCustomizer.java | 2 +- .../io/fd/hc2vpp/srv6/write/sid/SidCustomizer.java | 2 +- .../write/sid/request/LocalSidFunctionRequest.java | 6 ++--- .../sid/request/NoProtocolLocalSidRequest.java | 2 +- .../sid/request/TableLookupLocalSidRequest.java | 4 +-- .../write/sid/request/XConnectLocalSidRequest.java | 4 +-- .../write/steering/InterfacesConfigCustomizer.java | 2 +- .../srv6/write/steering/PrefixCustomizer.java | 2 +- .../write/steering/PrefixesConfigCustomizer.java | 2 +- .../write/steering/request/L2SteeringRequest.java | 4 +-- .../write/steering/request/L3SteeringRequest.java | 4 +-- .../write/steering/request/SteeringRequest.java | 2 +- .../java/io/fd/hc2vpp/srv6/Srv6ModuleTest.java | 2 +- .../fd/hc2vpp/srv6/read/policy/PoliciesTest.java | 8 +++--- .../srv6/read/sid/LocatorCustomizerTest.java | 6 ++--- .../fd/hc2vpp/srv6/read/sid/SidCustomizerTest.java | 6 ++--- .../read/sid/request/LocalSidReadRequestTest.java | 6 ++--- .../read/sid/request/LocatorReadRequestTest.java | 6 ++--- .../fd/hc2vpp/srv6/read/steering/SteeringTest.java | 6 ++--- .../io/fd/hc2vpp/srv6/util/JvppRequestTest.java | 4 +-- .../LocalSidFunctionBindingRegistryTest.java | 2 +- .../source/EncapsulationSourceCustomizerTest.java | 4 +-- .../request/EncapsulationSourceRequestTest.java | 4 +-- .../srv6/write/policy/PolicyCustomizerTest.java | 12 ++++----- .../write/sid/request/LocalSidRequestTest.java | 4 +-- .../sid/request/NoProtocolLocalSidRequestTest.java | 4 +-- .../request/TableLookupLocalSidRequestTest.java | 4 +-- .../sid/request/XConnectLocalSidRequestTest.java | 6 ++--- .../steering/InterfacesConfigCustomizerTest.java | 4 +-- .../srv6/write/steering/PrefixCustomizerTest.java | 4 +-- .../steering/PrefixesConfigCustomizerTest.java | 4 +-- .../v3po/factory/InterfacesStateReaderFactory.java | 2 +- .../v3po/factory/InterfacesWriterFactory.java | 2 +- .../v3po/factory/L2HoneycombWriterFactory.java | 2 +- .../factory/L2StateHoneycombReaderFactory.java | 2 +- .../SubinterfaceAugmentationWriterFactory.java | 2 +- ...SubinterfaceStateAugmentationReaderFactory.java | 2 +- .../interfaces/AbstractUnnumberedCustomizer.java | 4 +-- .../hc2vpp/v3po/interfaces/AfPacketCustomizer.java | 10 ++++---- .../hc2vpp/v3po/interfaces/EthernetCustomizer.java | 4 +-- .../fd/hc2vpp/v3po/interfaces/GreCustomizer.java | 6 ++--- .../v3po/interfaces/InterconnectionWriteUtils.java | 12 ++++----- .../v3po/interfaces/InterfaceCustomizer.java | 8 +++--- .../interfaces/InterfaceRoutingCustomizer.java | 2 +- .../interfaces/InterfaceUnnumberedCustomizer.java | 2 +- .../io/fd/hc2vpp/v3po/interfaces/L2Customizer.java | 2 +- .../hc2vpp/v3po/interfaces/LoopbackCustomizer.java | 8 +++--- .../hc2vpp/v3po/interfaces/RewriteCustomizer.java | 6 ++--- .../hc2vpp/v3po/interfaces/RoutingCustomizer.java | 6 ++--- .../v3po/interfaces/SubInterfaceCustomizer.java | 10 ++++---- .../v3po/interfaces/SubInterfaceL2Customizer.java | 2 +- .../interfaces/SubInterfaceRoutingCustomizer.java | 2 +- .../SubInterfaceUnnumberedCustomizer.java | 2 +- .../fd/hc2vpp/v3po/interfaces/TapV2Customizer.java | 10 ++++---- .../v3po/interfaces/VhostUserCustomizer.java | 14 +++++----- .../fd/hc2vpp/v3po/interfaces/VxlanCustomizer.java | 6 ++--- .../hc2vpp/v3po/interfaces/VxlanGpeCustomizer.java | 6 ++--- .../v3po/interfaces/pbb/PbbRewriteCustomizer.java | 6 ++--- .../span/MirroredInterfaceCustomizer.java | 4 +-- .../v3po/interfacesstate/AfPacketCustomizer.java | 10 ++++---- .../v3po/interfacesstate/EthernetCustomizer.java | 2 +- .../hc2vpp/v3po/interfacesstate/GreCustomizer.java | 8 +++--- .../interfacesstate/InterconnectionReadUtils.java | 12 ++++----- .../v3po/interfacesstate/InterfaceCustomizer.java | 2 +- .../interfacesstate/InterfaceDataTranslator.java | 2 +- .../InterfaceRoutingCustomizer.java | 2 +- .../hc2vpp/v3po/interfacesstate/L2Customizer.java | 2 +- .../v3po/interfacesstate/RewriteCustomizer.java | 2 +- .../v3po/interfacesstate/RoutingCustomizer.java | 6 ++--- .../interfacesstate/SubInterfaceCustomizer.java | 4 +-- .../interfacesstate/SubInterfaceL2Customizer.java | 2 +- .../SubInterfaceRoutingCustomizer.java | 2 +- .../v3po/interfacesstate/TapV2Customizer.java | 10 ++++---- .../v3po/interfacesstate/VhostUserCustomizer.java | 10 ++++---- .../v3po/interfacesstate/VxlanCustomizer.java | 8 +++--- .../v3po/interfacesstate/VxlanGpeCustomizer.java | 8 +++--- .../cache/InterfaceCacheDumpManager.java | 2 +- .../cache/InterfaceCacheDumpManagerImpl.java | 8 +++--- .../cache/InterfaceCacheDumpManagerProvider.java | 2 +- .../pbb/PbbRewriteStateCustomizer.java | 2 +- .../span/AbstractMirroredInterfacesCustomizer.java | 6 ++--- .../InterfaceMirroredInterfacesCustomizer.java | 2 +- .../SubInterfaceMirroredInterfacesCustomizer.java | 2 +- .../l2/ArpTerminationTableEntryCustomizer.java | 16 ++++++------ .../fd/hc2vpp/v3po/l2/BridgeDomainCustomizer.java | 6 ++--- .../io/fd/hc2vpp/v3po/l2/L2FibEntryCustomizer.java | 6 ++--- .../v3po/l2state/BridgeDomainCustomizer.java | 8 +++--- .../hc2vpp/v3po/l2state/L2FibEntryCustomizer.java | 8 +++--- .../InterfaceChangeNotificationProducer.java | 14 +++++----- ...nterfaceChangeNotificationProducerProvider.java | 2 +- .../java/io/fd/hc2vpp/v3po/V3poModuleTest.java | 2 +- .../AbstractUnnumberedCustomizerTest.java | 4 +-- .../v3po/interfaces/AfPacketCustomizerTest.java | 8 +++--- .../v3po/interfaces/EthernetCustomizerTest.java | 4 +-- .../hc2vpp/v3po/interfaces/GreCustomizerTest.java | 8 +++--- .../v3po/interfaces/InterfaceCustomizerTest.java | 6 ++--- .../interfaces/InterfaceRoutingCustomizerTest.java | 4 +-- .../hc2vpp/v3po/interfaces/L2CustomizerTest.java | 12 ++++----- .../v3po/interfaces/LoopbackCustomizerTest.java | 8 +++--- .../v3po/interfaces/RewriteCustomizerTest.java | 8 +++--- .../interfaces/SubInterfaceCustomizerTest.java | 10 ++++---- .../interfaces/SubInterfaceL2CustomizerTest.java | 6 ++--- .../SubInterfaceRoutingCustomizerTest.java | 4 +-- .../v3po/interfaces/TapV2CustomizerTest.java | 8 +++--- .../v3po/interfaces/VhostUserCustomizerTest.java | 16 ++++++------ .../v3po/interfaces/VxlanCustomizerTest.java | 8 +++--- .../v3po/interfaces/VxlanGpeCustomizerTest.java | 6 ++--- .../interfaces/pbb/PbbRewriteCustomizerTest.java | 6 ++--- .../span/MirroredInterfacesCustomizerTest.java | 4 +-- .../interfacesstate/AfPacketCustomizerTest.java | 6 ++--- .../interfacesstate/EthernetCustomizerTest.java | 2 +- .../v3po/interfacesstate/GreCustomizerTest.java | 10 ++++---- .../interfacesstate/InterfaceCustomizerTest.java | 4 +-- .../InterfaceDataTranslatorTest.java | 2 +- .../InterfaceRoutingCustomizerTest.java | 2 +- .../v3po/interfacesstate/L2CustomizerTest.java | 10 ++++---- .../interfacesstate/RewriteCustomizerTest.java | 2 +- .../SubInterfaceCustomizerTest.java | 2 +- .../SubInterfaceRoutingCustomizerTest.java | 4 +-- .../v3po/interfacesstate/TapV2CustomizerTest.java | 6 ++--- .../interfacesstate/VhostUserCustomizerTest.java | 6 ++--- .../v3po/interfacesstate/VxlanCustomizerTest.java | 10 ++++---- .../interfacesstate/VxlanGpeCustomizerTest.java | 10 ++++---- .../cache/InterfaceCacheDumpManagerImplTest.java | 8 +++--- .../span/MirroredInterfacesCustomizerTest.java | 4 +-- .../l2/ArpTerminationTableEntryCustomizerTest.java | 18 ++++++------- .../hc2vpp/v3po/l2/BridgeDomainCustomizerTest.java | 6 ++--- .../hc2vpp/v3po/l2/L2FibEntryCustomizerTest.java | 8 +++--- .../v3po/l2state/L2FibEntryCustomizerTest.java | 8 +++--- .../io/fd/hc2vpp/v3po/l2state/L2StateTest.java | 14 +++++----- .../InterfaceChangeNotificationProducerTest.java | 12 ++++----- .../policer/read/InterfacePolicerCustomizer.java | 6 ++--- .../read/InterfacePolicerReaderFactory.java | 2 +- .../fd/hc2vpp/policer/read/PolicerCustomizer.java | 8 +++--- .../hc2vpp/policer/read/PolicerReaderFactory.java | 2 +- .../policer/write/InterfacePolicerCustomizer.java | 4 +-- .../write/InterfacePolicerWriterFactory.java | 2 +- .../fd/hc2vpp/policer/write/PolicerCustomizer.java | 6 ++--- .../hc2vpp/policer/write/PolicerWriterFactory.java | 2 +- .../factory/read/InterfaceAclReaderFactory.java | 2 +- .../factory/read/SubInterfaceAclReaderFactory.java | 2 +- .../factory/read/VppClassifierReaderFactory.java | 4 +-- .../factory/write/InterfaceAclWriterFactory.java | 2 +- .../write/SubInterfaceAclWriterFactory.java | 2 +- .../write/VppClassifierHoneycombWriterFactory.java | 2 +- .../vpp/classifier/read/ClassifySessionReader.java | 8 +++--- .../vpp/classifier/read/ClassifyTableReader.java | 10 ++++---- .../vpp/classifier/read/acl/AclCustomizer.java | 6 ++--- .../read/acl/SubInterfaceAclCustomizer.java | 6 ++--- .../classifier/write/ClassifySessionWriter.java | 8 +++--- .../vpp/classifier/write/ClassifyTableWriter.java | 8 +++--- .../hc2vpp/vpp/classifier/write/VppNodeWriter.java | 8 +++--- .../write/acl/ingress/AclCustomizer.java | 2 +- .../classifier/write/acl/ingress/AclWriter.java | 6 ++--- .../acl/ingress/SubInterfaceAclCustomizer.java | 2 +- .../vpp/classifier/VppClassifierModuleTest.java | 2 +- .../classifier/read/ClassifySessionReaderTest.java | 6 ++--- .../classifier/read/ClassifyTableReaderTest.java | 8 +++--- .../vpp/classifier/read/acl/AclCustomizerTest.java | 2 +- .../read/acl/SubInterfaceAclCustomizerTest.java | 2 +- .../write/ClassifySessionWriterTest.java | 6 ++--- .../classifier/write/ClassifyTableWriterTest.java | 6 ++--- .../classifier/write/acl/AclCustomizerTest.java | 6 ++--- .../acl/ingress/SubInterfaceAclCustomizerTest.java | 4 +-- .../common/integration/JVppCoreProvider.java | 8 +++--- .../common/integration/JVppRegistryProvider.java | 6 ++--- .../hc2vpp/common/integration/VppCommonModule.java | 4 +-- .../common/test/read/JvppDumpExecutorTest.java | 6 ++--- .../common/test/read/ReaderCustomizerTest.java | 8 +++--- .../fd/hc2vpp/common/test/util/FutureProducer.java | 4 +-- .../common/test/util/InterfaceDumpHelper.java | 6 ++--- .../common/test/write/WriterCustomizerTest.java | 2 +- .../util/AbstractInterfaceTypeCustomizer.java | 2 +- .../translate/util/FutureJVppCustomizer.java | 2 +- .../common/translate/util/Ipv4Translator.java | 8 +++--- .../common/translate/util/Ipv6Translator.java | 10 ++++---- .../common/translate/util/JvppReplyConsumer.java | 4 +-- .../common/translate/util/MacTranslator.java | 2 +- .../common/translate/util/MplsLabelTranslator.java | 2 +- .../translate/util/JvppReplyConsumerTest.java | 5 +--- .../translate/util/MplsLabelTranslatorTest.java | 2 +- .../docs/scripts/ApiDocsIndexGenerator.groovy | 14 +++++----- .../docs/core/mock/binding/MockAclModule.java | 6 ++--- .../docs/core/mock/binding/MockBindingModule.java | 4 +-- .../docs/core/mock/binding/MockIoamModule.java | 10 ++++---- .../docs/core/mock/binding/MockNatModule.java | 6 ++--- .../docs/core/mock/binding/MockNshModule.java | 6 ++--- .../fd/hc2vpp/management/rpc/CliInbandService.java | 4 +-- .../management/state/StateReaderFactory.java | 2 +- .../hc2vpp/management/state/VersionCustomizer.java | 12 ++++----- .../hc2vpp/management/VppManagementModuleTest.java | 2 +- .../management/rpc/CliInbandServiceTest.java | 4 +-- .../fd/hc2vpp/management/state/VppStateTest.java | 10 ++++---- 600 files changed, 1661 insertions(+), 1675 deletions(-) diff --git a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/AclModule.java b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/AclModule.java index a21978e73..274f5f6ae 100644 --- a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/AclModule.java +++ b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/AclModule.java @@ -30,7 +30,7 @@ import io.fd.hc2vpp.acl.write.factory.AclWriterFactory; import io.fd.hc2vpp.acl.write.factory.InterfaceAclWriterFactory; import io.fd.honeycomb.translate.read.ReaderFactory; import io.fd.honeycomb.translate.write.WriterFactory; -import io.fd.vpp.jvpp.acl.future.FutureJVppAclFacade; +import io.fd.jvpp.acl.future.FutureJVppAclFacade; import javax.annotation.Nonnull; import net.jmob.guice.conf.core.ConfigurationModule; import org.slf4j.Logger; diff --git a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/JVppAclProvider.java b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/JVppAclProvider.java index 96e26a4e3..8977690e7 100644 --- a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/JVppAclProvider.java +++ b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/JVppAclProvider.java @@ -20,12 +20,12 @@ import com.google.inject.Inject; import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; import io.fd.honeycomb.binding.init.ProviderTrait; import io.fd.honeycomb.data.init.ShutdownHandler; -import io.fd.vpp.jvpp.JVppRegistry; -import io.fd.vpp.jvpp.VppBaseCallException; -import io.fd.vpp.jvpp.acl.JVppAclImpl; -import io.fd.vpp.jvpp.acl.dto.AclPluginGetVersion; -import io.fd.vpp.jvpp.acl.dto.AclPluginGetVersionReply; -import io.fd.vpp.jvpp.acl.future.FutureJVppAclFacade; +import io.fd.jvpp.JVppRegistry; +import io.fd.jvpp.VppBaseCallException; +import io.fd.jvpp.acl.JVppAclImpl; +import io.fd.jvpp.acl.dto.AclPluginGetVersion; +import io.fd.jvpp.acl.dto.AclPluginGetVersionReply; +import io.fd.jvpp.acl.future.FutureJVppAclFacade; import java.io.IOException; import java.util.concurrent.TimeoutException; import org.slf4j.Logger; diff --git a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/AbstractAclCustomizer.java b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/AbstractAclCustomizer.java index 5f6ca36b3..9cc7e7d76 100644 --- a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/AbstractAclCustomizer.java +++ b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/AbstractAclCustomizer.java @@ -30,12 +30,12 @@ import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager.DumpCacheManagerBuilder; import io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor; import io.fd.honeycomb.translate.util.read.cache.TypeAwareIdentifierCacheKeyFactory; -import io.fd.vpp.jvpp.acl.dto.AclDetailsReplyDump; -import io.fd.vpp.jvpp.acl.dto.AclDump; -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.future.FutureJVppAclFacade; +import io.fd.jvpp.acl.dto.AclDetailsReplyDump; +import io.fd.jvpp.acl.dto.AclDump; +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.future.FutureJVppAclFacade; import java.util.Arrays; import java.util.stream.Stream; import javax.annotation.Nonnull; diff --git a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/AclCustomizer.java b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/AclCustomizer.java index e1f0ccf14..3d1516fd2 100644 --- a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/AclCustomizer.java +++ b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/AclCustomizer.java @@ -30,13 +30,13 @@ import io.fd.honeycomb.translate.spi.read.Initialized; import io.fd.honeycomb.translate.spi.read.InitializingListReaderCustomizer; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; import io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor; -import io.fd.vpp.jvpp.acl.dto.AclDetails; -import io.fd.vpp.jvpp.acl.dto.AclDetailsReplyDump; -import io.fd.vpp.jvpp.acl.dto.AclDump; -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.future.FutureJVppAclFacade; +import io.fd.jvpp.acl.dto.AclDetails; +import io.fd.jvpp.acl.dto.AclDetailsReplyDump; +import io.fd.jvpp.acl.dto.AclDump; +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.future.FutureJVppAclFacade; import java.util.ArrayList; import java.util.List; import javax.annotation.Nonnull; diff --git a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/EgressAclCustomizer.java b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/EgressAclCustomizer.java index 59990d5ea..14fdad2df 100644 --- a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/EgressAclCustomizer.java +++ b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/EgressAclCustomizer.java @@ -27,8 +27,8 @@ import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.Initialized; import io.fd.honeycomb.translate.spi.read.InitializingListReaderCustomizer; -import io.fd.vpp.jvpp.acl.dto.AclInterfaceListDetailsReplyDump; -import io.fd.vpp.jvpp.acl.future.FutureJVppAclFacade; +import io.fd.jvpp.acl.dto.AclInterfaceListDetailsReplyDump; +import io.fd.jvpp.acl.future.FutureJVppAclFacade; import java.util.List; import java.util.stream.Collectors; import javax.annotation.Nonnull; diff --git a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/IngressAclCustomizer.java b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/IngressAclCustomizer.java index 467c4e5db..02f2e18f2 100644 --- a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/IngressAclCustomizer.java +++ b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/IngressAclCustomizer.java @@ -33,15 +33,15 @@ import io.fd.honeycomb.translate.spi.read.InitializingListReaderCustomizer; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; import io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor; import io.fd.honeycomb.translate.util.read.cache.TypeAwareIdentifierCacheKeyFactory; -import io.fd.vpp.jvpp.acl.dto.AclInterfaceListDetailsReplyDump; -import io.fd.vpp.jvpp.acl.dto.MacipAclDetailsReplyDump; -import io.fd.vpp.jvpp.acl.dto.MacipAclDump; -import io.fd.vpp.jvpp.acl.dto.MacipAclInterfaceGet; -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.dto.MacipAclInterfaceListDump; -import io.fd.vpp.jvpp.acl.future.FutureJVppAclFacade; +import io.fd.jvpp.acl.dto.AclInterfaceListDetailsReplyDump; +import io.fd.jvpp.acl.dto.MacipAclDetailsReplyDump; +import io.fd.jvpp.acl.dto.MacipAclDump; +import io.fd.jvpp.acl.dto.MacipAclInterfaceGet; +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.dto.MacipAclInterfaceListDump; +import io.fd.jvpp.acl.future.FutureJVppAclFacade; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; diff --git a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/InterfaceAclCustomizer.java b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/InterfaceAclCustomizer.java index 64720de5d..2cd1bdd87 100644 --- a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/InterfaceAclCustomizer.java +++ b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/InterfaceAclCustomizer.java @@ -27,11 +27,11 @@ import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.Initialized; import io.fd.honeycomb.translate.spi.read.InitializingListReaderCustomizer; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; -import io.fd.vpp.jvpp.acl.dto.AclInterfaceListDetailsReplyDump; -import io.fd.vpp.jvpp.acl.dto.AclInterfaceListDump; -import io.fd.vpp.jvpp.acl.dto.MacipAclInterfaceListDetailsReplyDump; -import io.fd.vpp.jvpp.acl.dto.MacipAclInterfaceListDump; -import io.fd.vpp.jvpp.acl.future.FutureJVppAclFacade; +import io.fd.jvpp.acl.dto.AclInterfaceListDetailsReplyDump; +import io.fd.jvpp.acl.dto.AclInterfaceListDump; +import io.fd.jvpp.acl.dto.MacipAclInterfaceListDetailsReplyDump; +import io.fd.jvpp.acl.dto.MacipAclInterfaceListDump; +import io.fd.jvpp.acl.future.FutureJVppAclFacade; import java.util.Collection; import java.util.List; import java.util.stream.Collectors; diff --git a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/factory/AclReaderFactory.java b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/factory/AclReaderFactory.java index 6a743ca80..2a09f60c5 100644 --- a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/factory/AclReaderFactory.java +++ b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/factory/AclReaderFactory.java @@ -28,7 +28,7 @@ import io.fd.hc2vpp.acl.util.AclContextManager; import io.fd.honeycomb.translate.impl.read.GenericInitListReader; import io.fd.honeycomb.translate.read.ReaderFactory; import io.fd.honeycomb.translate.read.registry.ModifiableReaderRegistryBuilder; -import io.fd.vpp.jvpp.acl.future.FutureJVppAclFacade; +import io.fd.jvpp.acl.future.FutureJVppAclFacade; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev181001.AclsBuilder; diff --git a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/factory/InterfaceAclReaderFactory.java b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/factory/InterfaceAclReaderFactory.java index 1c4f0d982..61b66730f 100644 --- a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/factory/InterfaceAclReaderFactory.java +++ b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/factory/InterfaceAclReaderFactory.java @@ -20,15 +20,15 @@ import com.google.inject.Inject; import com.google.inject.name.Named; import io.fd.hc2vpp.acl.AclIIds; import io.fd.hc2vpp.acl.AclModule; -import io.fd.hc2vpp.acl.read.InterfaceAclCustomizer; import io.fd.hc2vpp.acl.read.EgressAclCustomizer; import io.fd.hc2vpp.acl.read.IngressAclCustomizer; +import io.fd.hc2vpp.acl.read.InterfaceAclCustomizer; import io.fd.hc2vpp.acl.util.AclContextManager; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.impl.read.GenericInitListReader; import io.fd.honeycomb.translate.read.ReaderFactory; import io.fd.honeycomb.translate.read.registry.ModifiableReaderRegistryBuilder; -import io.fd.vpp.jvpp.acl.future.FutureJVppAclFacade; +import io.fd.jvpp.acl.future.FutureJVppAclFacade; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev181001.acls.AttachmentPointsBuilder; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev181001.acls.attachment.points._interface.EgressBuilder; diff --git a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/util/FutureJVppAclCustomizer.java b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/util/FutureJVppAclCustomizer.java index e2d6bee58..ab3850ed8 100644 --- a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/util/FutureJVppAclCustomizer.java +++ b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/util/FutureJVppAclCustomizer.java @@ -18,7 +18,7 @@ package io.fd.hc2vpp.acl.util; import static com.google.common.base.Preconditions.checkNotNull; -import io.fd.vpp.jvpp.acl.future.FutureJVppAclFacade; +import io.fd.jvpp.acl.future.FutureJVppAclFacade; import javax.annotation.Nonnull; /** diff --git a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/util/ace/AceConverter.java b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/util/ace/AceConverter.java index 8e774104a..543ec6a09 100644 --- a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/util/ace/AceConverter.java +++ b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/util/ace/AceConverter.java @@ -22,8 +22,8 @@ import io.fd.hc2vpp.acl.util.ace.extractor.MacIpAceDataExtractor; import io.fd.hc2vpp.acl.util.ace.extractor.StandardAceDataExtractor; import io.fd.hc2vpp.acl.util.protocol.ProtoPreBindRuleProducer; import io.fd.honeycomb.translate.MappingContext; -import io.fd.vpp.jvpp.acl.types.AclRule; -import io.fd.vpp.jvpp.acl.types.MacipAclRule; +import io.fd.jvpp.acl.types.AclRule; +import io.fd.jvpp.acl.types.MacipAclRule; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; diff --git a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/util/ace/extractor/MacIpAceDataExtractor.java b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/util/ace/extractor/MacIpAceDataExtractor.java index 0c7d761a0..96a05c09d 100644 --- a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/util/ace/extractor/MacIpAceDataExtractor.java +++ b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/util/ace/extractor/MacIpAceDataExtractor.java @@ -18,7 +18,7 @@ package io.fd.hc2vpp.acl.util.ace.extractor; import io.fd.hc2vpp.common.translate.util.MacTranslator; -import io.fd.vpp.jvpp.acl.types.MacipAclRule; +import io.fd.jvpp.acl.types.MacipAclRule; import java.util.Optional; import javax.annotation.Nonnull; 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/main/java/io/fd/hc2vpp/acl/util/ace/extractor/StandardAceDataExtractor.java b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/util/ace/extractor/StandardAceDataExtractor.java index 9f454fd38..ea601db12 100644 --- a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/util/ace/extractor/StandardAceDataExtractor.java +++ b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/util/ace/extractor/StandardAceDataExtractor.java @@ -19,7 +19,7 @@ package io.fd.hc2vpp.acl.util.ace.extractor; import com.google.common.collect.ImmutableMap; import io.fd.hc2vpp.acl.util.protocol.IpProtocolReader; import io.fd.hc2vpp.acl.util.protocol.ProtoPreBindRuleProducer; -import io.fd.vpp.jvpp.acl.types.AclRule; +import io.fd.jvpp.acl.types.AclRule; import java.util.Map; import java.util.Optional; import javax.annotation.Nonnull; diff --git a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/util/protocol/IpProtocolReader.java b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/util/protocol/IpProtocolReader.java index 3207ecd4b..e44794b3c 100644 --- a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/util/protocol/IpProtocolReader.java +++ b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/util/protocol/IpProtocolReader.java @@ -22,7 +22,7 @@ import static io.fd.hc2vpp.acl.util.protocol.ProtoPreBindRuleProducer.TCP_INDEX; import static io.fd.hc2vpp.acl.util.protocol.ProtoPreBindRuleProducer.UDP_INDEX; import com.google.common.annotations.VisibleForTesting; -import io.fd.vpp.jvpp.acl.types.AclRule; +import io.fd.jvpp.acl.types.AclRule; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.acl.rev181022.VppIcmpAceAugmentation; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.acl.rev181022.VppIcmpAceAugmentationBuilder; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.acl.rev181022.VppTcpAceAugmentation; diff --git a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/util/protocol/ProtoPreBindRuleProducer.java b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/util/protocol/ProtoPreBindRuleProducer.java index 3ca18d6e6..f7f578ff2 100644 --- a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/util/protocol/ProtoPreBindRuleProducer.java +++ b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/util/protocol/ProtoPreBindRuleProducer.java @@ -17,7 +17,7 @@ package io.fd.hc2vpp.acl.util.protocol; import com.google.common.base.Preconditions; -import io.fd.vpp.jvpp.acl.types.AclRule; +import io.fd.jvpp.acl.types.AclRule; import javax.annotation.Nonnull; import javax.annotation.Nullable; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.acl.rev181022.ValueRange; diff --git a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/write/AclCustomizer.java b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/write/AclCustomizer.java index 1161c09ef..0fa584a12 100644 --- a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/write/AclCustomizer.java +++ b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/write/AclCustomizer.java @@ -23,7 +23,7 @@ import io.fd.hc2vpp.acl.write.request.AclAddReplaceRequest; import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.acl.future.FutureJVppAclFacade; +import io.fd.jvpp.acl.future.FutureJVppAclFacade; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev181001.acls.Acl; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev181001.acls.AclKey; diff --git a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/write/InterfaceAclCustomizer.java b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/write/InterfaceAclCustomizer.java index 622a84d93..040b5253c 100644 --- a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/write/InterfaceAclCustomizer.java +++ b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/write/InterfaceAclCustomizer.java @@ -28,7 +28,7 @@ import io.fd.honeycomb.translate.MappingContext; import io.fd.honeycomb.translate.spi.write.WriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.acl.future.FutureJVppAclFacade; +import io.fd.jvpp.acl.future.FutureJVppAclFacade; import java.util.Collections; import java.util.List; import java.util.stream.Collectors; diff --git a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/write/factory/AbstractAclWriterFactory.java b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/write/factory/AbstractAclWriterFactory.java index 8944e5977..dada20523 100644 --- a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/write/factory/AbstractAclWriterFactory.java +++ b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/write/factory/AbstractAclWriterFactory.java @@ -21,7 +21,7 @@ import com.google.inject.name.Named; import io.fd.hc2vpp.acl.AclModule; import io.fd.hc2vpp.acl.util.AclContextManager; import io.fd.hc2vpp.common.translate.util.NamingContext; -import io.fd.vpp.jvpp.acl.future.FutureJVppAclFacade; +import io.fd.jvpp.acl.future.FutureJVppAclFacade; /** * Created by jsrnicek on 12.12.2016. diff --git a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/write/request/AclAddReplaceRequest.java b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/write/request/AclAddReplaceRequest.java index 29a7c7489..07ec09edc 100644 --- a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/write/request/AclAddReplaceRequest.java +++ b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/write/request/AclAddReplaceRequest.java @@ -22,13 +22,13 @@ import io.fd.hc2vpp.acl.util.acl.AclDataExtractor; import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; import io.fd.honeycomb.translate.MappingContext; 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.MacipAclAdd; -import io.fd.vpp.jvpp.acl.dto.MacipAclAddReply; -import io.fd.vpp.jvpp.acl.dto.MacipAclDel; -import io.fd.vpp.jvpp.acl.future.FutureJVppAclFacade; +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.MacipAclAdd; +import io.fd.jvpp.acl.dto.MacipAclAddReply; +import io.fd.jvpp.acl.dto.MacipAclDel; +import io.fd.jvpp.acl.future.FutureJVppAclFacade; import java.util.List; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev181001.acls.Acl; diff --git a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/write/request/AclInterfaceAssignmentRequest.java b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/write/request/AclInterfaceAssignmentRequest.java index 2d7777e35..79fb4126f 100644 --- a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/write/request/AclInterfaceAssignmentRequest.java +++ b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/write/request/AclInterfaceAssignmentRequest.java @@ -26,8 +26,8 @@ import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; 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.future.FutureJVppAclFacade; +import io.fd.jvpp.acl.dto.AclInterfaceSetAclList; +import io.fd.jvpp.acl.future.FutureJVppAclFacade; import java.util.Collections; import java.util.List; import java.util.stream.Stream; diff --git a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/write/request/MacIpInterfaceAssignmentRequest.java b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/write/request/MacIpInterfaceAssignmentRequest.java index b7849991b..9007fd755 100644 --- a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/write/request/MacIpInterfaceAssignmentRequest.java +++ b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/write/request/MacIpInterfaceAssignmentRequest.java @@ -25,8 +25,8 @@ import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; 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.future.FutureJVppAclFacade; +import io.fd.jvpp.acl.dto.MacipAclInterfaceAddDel; +import io.fd.jvpp.acl.future.FutureJVppAclFacade; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev181001.acls.attachment.points.Interface; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; 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; diff --git a/bgp/bgp-prefix-sid/src/main/java/io/fd/hc2vpp/bgp/prefix/sid/BgpPrefixSidMplsWriter.java b/bgp/bgp-prefix-sid/src/main/java/io/fd/hc2vpp/bgp/prefix/sid/BgpPrefixSidMplsWriter.java index 4d8039417..04ad02083 100644 --- a/bgp/bgp-prefix-sid/src/main/java/io/fd/hc2vpp/bgp/prefix/sid/BgpPrefixSidMplsWriter.java +++ b/bgp/bgp-prefix-sid/src/main/java/io/fd/hc2vpp/bgp/prefix/sid/BgpPrefixSidMplsWriter.java @@ -21,8 +21,8 @@ import static com.google.common.base.Preconditions.checkNotNull; import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; import io.fd.honeycomb.translate.bgp.RouteWriter; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.MplsRouteAddDel; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.MplsRouteAddDel; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.labeled.unicast.rev180329.labeled.unicast.routes.LabeledUnicastRoutes; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.labeled.unicast.rev180329.labeled.unicast.routes.list.LabeledUnicastRoute; diff --git a/bgp/bgp-prefix-sid/src/main/java/io/fd/hc2vpp/bgp/prefix/sid/BgpPrefixSidWriterFactory.java b/bgp/bgp-prefix-sid/src/main/java/io/fd/hc2vpp/bgp/prefix/sid/BgpPrefixSidWriterFactory.java index 48960651e..5ed815c85 100644 --- a/bgp/bgp-prefix-sid/src/main/java/io/fd/hc2vpp/bgp/prefix/sid/BgpPrefixSidWriterFactory.java +++ b/bgp/bgp-prefix-sid/src/main/java/io/fd/hc2vpp/bgp/prefix/sid/BgpPrefixSidWriterFactory.java @@ -19,7 +19,7 @@ package io.fd.hc2vpp.bgp.prefix.sid; import com.google.inject.Inject; import io.fd.honeycomb.translate.bgp.RibWriter; import io.fd.honeycomb.translate.bgp.RouteWriterFactory; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; final class BgpPrefixSidWriterFactory implements RouteWriterFactory { diff --git a/bgp/bgp-prefix-sid/src/main/java/io/fd/hc2vpp/bgp/prefix/sid/IpRouteRequestProducer.java b/bgp/bgp-prefix-sid/src/main/java/io/fd/hc2vpp/bgp/prefix/sid/IpRouteRequestProducer.java index bd082ff8b..137845782 100644 --- a/bgp/bgp-prefix-sid/src/main/java/io/fd/hc2vpp/bgp/prefix/sid/IpRouteRequestProducer.java +++ b/bgp/bgp-prefix-sid/src/main/java/io/fd/hc2vpp/bgp/prefix/sid/IpRouteRequestProducer.java @@ -21,8 +21,8 @@ import static io.fd.hc2vpp.bgp.prefix.sid.MplsRouteRequestProducer.MPLS_LABEL_IN import io.fd.hc2vpp.common.translate.util.Ipv4Translator; import io.fd.hc2vpp.common.translate.util.MplsLabelTranslator; -import io.fd.vpp.jvpp.core.dto.IpAddDelRoute; -import io.fd.vpp.jvpp.core.types.FibMplsLabel; +import io.fd.jvpp.core.dto.IpAddDelRoute; +import io.fd.jvpp.core.types.FibMplsLabel; import java.util.List; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpPrefix; diff --git a/bgp/bgp-prefix-sid/src/main/java/io/fd/hc2vpp/bgp/prefix/sid/MplsRouteRequestProducer.java b/bgp/bgp-prefix-sid/src/main/java/io/fd/hc2vpp/bgp/prefix/sid/MplsRouteRequestProducer.java index 3282eea5d..fd00df3e3 100644 --- a/bgp/bgp-prefix-sid/src/main/java/io/fd/hc2vpp/bgp/prefix/sid/MplsRouteRequestProducer.java +++ b/bgp/bgp-prefix-sid/src/main/java/io/fd/hc2vpp/bgp/prefix/sid/MplsRouteRequestProducer.java @@ -20,8 +20,8 @@ import static com.google.common.base.Preconditions.checkArgument; import io.fd.hc2vpp.common.translate.util.Ipv4Translator; import io.fd.hc2vpp.common.translate.util.MplsLabelTranslator; -import io.fd.vpp.jvpp.core.dto.MplsRouteAddDel; -import io.fd.vpp.jvpp.core.types.FibMplsLabel; +import io.fd.jvpp.core.dto.MplsRouteAddDel; +import io.fd.jvpp.core.types.FibMplsLabel; import java.util.List; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address; diff --git a/bgp/bgp-prefix-sid/src/test/java/io/fd/hc2vpp/bgp/prefix/sid/BgpPrefixSidMplsWriterTest.java b/bgp/bgp-prefix-sid/src/test/java/io/fd/hc2vpp/bgp/prefix/sid/BgpPrefixSidMplsWriterTest.java index 8be535adf..252e3a56c 100644 --- a/bgp/bgp-prefix-sid/src/test/java/io/fd/hc2vpp/bgp/prefix/sid/BgpPrefixSidMplsWriterTest.java +++ b/bgp/bgp-prefix-sid/src/test/java/io/fd/hc2vpp/bgp/prefix/sid/BgpPrefixSidMplsWriterTest.java @@ -30,12 +30,12 @@ import com.google.common.collect.Lists; import io.fd.hc2vpp.common.test.util.FutureProducer; import io.fd.hc2vpp.common.translate.util.ByteDataTranslator; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.IpAddDelRoute; -import io.fd.vpp.jvpp.core.dto.IpAddDelRouteReply; -import io.fd.vpp.jvpp.core.dto.MplsRouteAddDel; -import io.fd.vpp.jvpp.core.dto.MplsRouteAddDelReply; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; -import io.fd.vpp.jvpp.core.types.FibMplsLabel; +import io.fd.jvpp.core.dto.IpAddDelRoute; +import io.fd.jvpp.core.dto.IpAddDelRouteReply; +import io.fd.jvpp.core.dto.MplsRouteAddDel; +import io.fd.jvpp.core.dto.MplsRouteAddDelReply; +import io.fd.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.types.FibMplsLabel; import java.util.Collections; import org.junit.Before; import org.junit.Test; diff --git a/bgp/inet/src/main/java/io/fd/hc2vpp/bgp/inet/InetRouteWriterFactory.java b/bgp/inet/src/main/java/io/fd/hc2vpp/bgp/inet/InetRouteWriterFactory.java index 821d4364d..ae064c50e 100644 --- a/bgp/inet/src/main/java/io/fd/hc2vpp/bgp/inet/InetRouteWriterFactory.java +++ b/bgp/inet/src/main/java/io/fd/hc2vpp/bgp/inet/InetRouteWriterFactory.java @@ -19,7 +19,7 @@ package io.fd.hc2vpp.bgp.inet; import com.google.inject.Inject; import io.fd.honeycomb.translate.bgp.RibWriter; import io.fd.honeycomb.translate.bgp.RouteWriterFactory; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; final class InetRouteWriterFactory implements RouteWriterFactory { diff --git a/bgp/inet/src/main/java/io/fd/hc2vpp/bgp/inet/Ipv4Writer.java b/bgp/inet/src/main/java/io/fd/hc2vpp/bgp/inet/Ipv4Writer.java index 8180763f0..f9da5f3f1 100644 --- a/bgp/inet/src/main/java/io/fd/hc2vpp/bgp/inet/Ipv4Writer.java +++ b/bgp/inet/src/main/java/io/fd/hc2vpp/bgp/inet/Ipv4Writer.java @@ -23,8 +23,8 @@ import io.fd.hc2vpp.common.translate.util.Ipv4Translator; import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; import io.fd.honeycomb.translate.bgp.RouteWriter; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.IpAddDelRoute; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.IpAddDelRoute; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Prefix; diff --git a/bgp/inet/src/main/java/io/fd/hc2vpp/bgp/inet/Ipv6Writer.java b/bgp/inet/src/main/java/io/fd/hc2vpp/bgp/inet/Ipv6Writer.java index 6a6f5410a..e8fc193ec 100644 --- a/bgp/inet/src/main/java/io/fd/hc2vpp/bgp/inet/Ipv6Writer.java +++ b/bgp/inet/src/main/java/io/fd/hc2vpp/bgp/inet/Ipv6Writer.java @@ -23,8 +23,8 @@ import io.fd.hc2vpp.common.translate.util.Ipv6Translator; import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; import io.fd.honeycomb.translate.bgp.RouteWriter; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.IpAddDelRoute; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.IpAddDelRoute; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Address; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Prefix; diff --git a/bgp/inet/src/main/java/io/fd/hc2vpp/bgp/inet/RouteRequestProducer.java b/bgp/inet/src/main/java/io/fd/hc2vpp/bgp/inet/RouteRequestProducer.java index 2684ba5ec..b55754697 100644 --- a/bgp/inet/src/main/java/io/fd/hc2vpp/bgp/inet/RouteRequestProducer.java +++ b/bgp/inet/src/main/java/io/fd/hc2vpp/bgp/inet/RouteRequestProducer.java @@ -17,7 +17,7 @@ package io.fd.hc2vpp.bgp.inet; import io.fd.hc2vpp.common.translate.util.ByteDataTranslator; -import io.fd.vpp.jvpp.core.dto.IpAddDelRoute; +import io.fd.jvpp.core.dto.IpAddDelRoute; interface RouteRequestProducer extends ByteDataTranslator { int MPLS_LABEL_INVALID = 0x100000; diff --git a/bgp/inet/src/test/java/io/fd/hc2vpp/bgp/inet/Ipv4WriterTest.java b/bgp/inet/src/test/java/io/fd/hc2vpp/bgp/inet/Ipv4WriterTest.java index 889b845ed..762809ef1 100644 --- a/bgp/inet/src/test/java/io/fd/hc2vpp/bgp/inet/Ipv4WriterTest.java +++ b/bgp/inet/src/test/java/io/fd/hc2vpp/bgp/inet/Ipv4WriterTest.java @@ -26,9 +26,9 @@ import static org.mockito.MockitoAnnotations.initMocks; import io.fd.hc2vpp.common.test.util.FutureProducer; import io.fd.hc2vpp.common.translate.util.ByteDataTranslator; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.IpAddDelRoute; -import io.fd.vpp.jvpp.core.dto.IpAddDelRouteReply; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.IpAddDelRoute; +import io.fd.jvpp.core.dto.IpAddDelRouteReply; +import io.fd.jvpp.core.future.FutureJVppCore; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; @@ -39,8 +39,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev180329.ipv4.routes.ipv4.routes.Ipv4Route; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev180329.ipv4.routes.ipv4.routes.Ipv4RouteBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev180329.ipv4.routes.ipv4.routes.Ipv4RouteKey; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.AttributesBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.PathId; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.AttributesBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.BgpRib; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.RibId; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.bgp.rib.Rib; diff --git a/bgp/inet/src/test/java/io/fd/hc2vpp/bgp/inet/Ipv6WriterTest.java b/bgp/inet/src/test/java/io/fd/hc2vpp/bgp/inet/Ipv6WriterTest.java index 8b2169302..831e319f3 100644 --- a/bgp/inet/src/test/java/io/fd/hc2vpp/bgp/inet/Ipv6WriterTest.java +++ b/bgp/inet/src/test/java/io/fd/hc2vpp/bgp/inet/Ipv6WriterTest.java @@ -26,9 +26,9 @@ import static org.mockito.MockitoAnnotations.initMocks; import io.fd.hc2vpp.common.test.util.FutureProducer; import io.fd.hc2vpp.common.translate.util.ByteDataTranslator; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.IpAddDelRoute; -import io.fd.vpp.jvpp.core.dto.IpAddDelRouteReply; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.IpAddDelRoute; +import io.fd.jvpp.core.dto.IpAddDelRouteReply; +import io.fd.jvpp.core.future.FutureJVppCore; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; diff --git a/dhcp/dhcp-impl/src/main/java/io/fd/hc2vpp/dhcp/read/DhcpReaderFactory.java b/dhcp/dhcp-impl/src/main/java/io/fd/hc2vpp/dhcp/read/DhcpReaderFactory.java index 713ff6857..2b261b0c0 100644 --- a/dhcp/dhcp-impl/src/main/java/io/fd/hc2vpp/dhcp/read/DhcpReaderFactory.java +++ b/dhcp/dhcp-impl/src/main/java/io/fd/hc2vpp/dhcp/read/DhcpReaderFactory.java @@ -21,7 +21,7 @@ import com.google.inject.Inject; import io.fd.honeycomb.translate.impl.read.GenericInitListReader; import io.fd.honeycomb.translate.read.ReaderFactory; import io.fd.honeycomb.translate.read.registry.ModifiableReaderRegistryBuilder; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.dhcp.rev180629.Dhcp; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.dhcp.rev180629.DhcpBuilder; diff --git a/dhcp/dhcp-impl/src/main/java/io/fd/hc2vpp/dhcp/read/DhcpRelayCustomizer.java b/dhcp/dhcp-impl/src/main/java/io/fd/hc2vpp/dhcp/read/DhcpRelayCustomizer.java index cb2dace51..ec85ed369 100644 --- a/dhcp/dhcp-impl/src/main/java/io/fd/hc2vpp/dhcp/read/DhcpRelayCustomizer.java +++ b/dhcp/dhcp-impl/src/main/java/io/fd/hc2vpp/dhcp/read/DhcpRelayCustomizer.java @@ -29,10 +29,10 @@ import io.fd.honeycomb.translate.spi.read.Initialized; import io.fd.honeycomb.translate.spi.read.InitializingListReaderCustomizer; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; import io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor; -import io.fd.vpp.jvpp.core.dto.DhcpProxyDetails; -import io.fd.vpp.jvpp.core.dto.DhcpProxyDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.DhcpProxyDump; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.DhcpProxyDetails; +import io.fd.jvpp.core.dto.DhcpProxyDetailsReplyDump; +import io.fd.jvpp.core.dto.DhcpProxyDump; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.Arrays; import java.util.Collections; import java.util.List; diff --git a/dhcp/dhcp-impl/src/main/java/io/fd/hc2vpp/dhcp/write/DhcpRelayCustomizer.java b/dhcp/dhcp-impl/src/main/java/io/fd/hc2vpp/dhcp/write/DhcpRelayCustomizer.java index 80cfb2004..4c316b573 100644 --- a/dhcp/dhcp-impl/src/main/java/io/fd/hc2vpp/dhcp/write/DhcpRelayCustomizer.java +++ b/dhcp/dhcp-impl/src/main/java/io/fd/hc2vpp/dhcp/write/DhcpRelayCustomizer.java @@ -26,8 +26,8 @@ import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.DhcpProxyConfig; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.DhcpProxyConfig; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.List; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.dhcp.rev180629.dhcp.attributes.relays.Relay; diff --git a/dhcp/dhcp-impl/src/main/java/io/fd/hc2vpp/dhcp/write/DhcpWriterFactory.java b/dhcp/dhcp-impl/src/main/java/io/fd/hc2vpp/dhcp/write/DhcpWriterFactory.java index afe947af5..a09f8a278 100644 --- a/dhcp/dhcp-impl/src/main/java/io/fd/hc2vpp/dhcp/write/DhcpWriterFactory.java +++ b/dhcp/dhcp-impl/src/main/java/io/fd/hc2vpp/dhcp/write/DhcpWriterFactory.java @@ -21,7 +21,7 @@ import com.google.inject.Inject; import io.fd.honeycomb.translate.impl.write.GenericListWriter; import io.fd.honeycomb.translate.write.WriterFactory; import io.fd.honeycomb.translate.write.registry.ModifiableWriterRegistryBuilder; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.dhcp.rev180629.Dhcp; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.dhcp.rev180629.dhcp.attributes.Relays; diff --git a/dhcp/dhcp-impl/src/test/java/io/fd/hc2vpp/dhcp/DhcpModuleTest.java b/dhcp/dhcp-impl/src/test/java/io/fd/hc2vpp/dhcp/DhcpModuleTest.java index 3a3c263a9..eae20336c 100644 --- a/dhcp/dhcp-impl/src/test/java/io/fd/hc2vpp/dhcp/DhcpModuleTest.java +++ b/dhcp/dhcp-impl/src/test/java/io/fd/hc2vpp/dhcp/DhcpModuleTest.java @@ -37,7 +37,7 @@ import io.fd.honeycomb.translate.impl.write.registry.FlatWriterRegistryBuilder; import io.fd.honeycomb.translate.read.ReaderFactory; import io.fd.honeycomb.translate.util.YangDAG; import io.fd.honeycomb.translate.write.WriterFactory; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.HashSet; import java.util.Set; import org.junit.Before; diff --git a/dhcp/dhcp-impl/src/test/java/io/fd/hc2vpp/dhcp/read/DhcpRelayCustomizerTest.java b/dhcp/dhcp-impl/src/test/java/io/fd/hc2vpp/dhcp/read/DhcpRelayCustomizerTest.java index 10bd65648..eb766e5b7 100644 --- a/dhcp/dhcp-impl/src/test/java/io/fd/hc2vpp/dhcp/read/DhcpRelayCustomizerTest.java +++ b/dhcp/dhcp-impl/src/test/java/io/fd/hc2vpp/dhcp/read/DhcpRelayCustomizerTest.java @@ -24,10 +24,10 @@ import static org.mockito.Mockito.when; import io.fd.hc2vpp.common.test.read.InitializingListReaderCustomizerTest; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.vpp.jvpp.core.dto.DhcpProxyDetails; -import io.fd.vpp.jvpp.core.dto.DhcpProxyDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.DhcpProxyDump; -import io.fd.vpp.jvpp.core.types.DhcpServer; +import io.fd.jvpp.core.dto.DhcpProxyDetails; +import io.fd.jvpp.core.dto.DhcpProxyDetailsReplyDump; +import io.fd.jvpp.core.dto.DhcpProxyDump; +import io.fd.jvpp.core.types.DhcpServer; import java.util.List; import org.junit.Test; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.dhcp.rev180629.Dhcp; diff --git a/dhcp/dhcp-impl/src/test/java/io/fd/hc2vpp/dhcp/write/DhcpRelayCustomizerTest.java b/dhcp/dhcp-impl/src/test/java/io/fd/hc2vpp/dhcp/write/DhcpRelayCustomizerTest.java index 580cda303..aed31140d 100644 --- a/dhcp/dhcp-impl/src/test/java/io/fd/hc2vpp/dhcp/write/DhcpRelayCustomizerTest.java +++ b/dhcp/dhcp-impl/src/test/java/io/fd/hc2vpp/dhcp/write/DhcpRelayCustomizerTest.java @@ -25,8 +25,8 @@ import io.fd.hc2vpp.dhcp.helpers.SchemaContextTestHelper; 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.core.dto.DhcpProxyConfig; -import io.fd.vpp.jvpp.core.dto.DhcpProxyConfigReply; +import io.fd.jvpp.core.dto.DhcpProxyConfig; +import io.fd.jvpp.core.dto.DhcpProxyConfigReply; import org.junit.Test; import org.junit.runner.RunWith; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.dhcp.rev180629.Dhcp; diff --git a/fib-management/fib-management-impl/src/main/java/io/fd/hc2vpp/fib/management/read/FibManagementReaderFactory.java b/fib-management/fib-management-impl/src/main/java/io/fd/hc2vpp/fib/management/read/FibManagementReaderFactory.java index c40a1457b..047ef9512 100644 --- a/fib-management/fib-management-impl/src/main/java/io/fd/hc2vpp/fib/management/read/FibManagementReaderFactory.java +++ b/fib-management/fib-management-impl/src/main/java/io/fd/hc2vpp/fib/management/read/FibManagementReaderFactory.java @@ -23,11 +23,11 @@ import io.fd.honeycomb.translate.impl.read.GenericInitListReader; import io.fd.honeycomb.translate.read.ReaderFactory; import io.fd.honeycomb.translate.read.registry.ModifiableReaderRegistryBuilder; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; -import io.fd.vpp.jvpp.core.dto.Ip6FibDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.Ip6FibDump; -import io.fd.vpp.jvpp.core.dto.IpFibDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.IpFibDump; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.Ip6FibDetailsReplyDump; +import io.fd.jvpp.core.dto.Ip6FibDump; +import io.fd.jvpp.core.dto.IpFibDetailsReplyDump; +import io.fd.jvpp.core.dto.IpFibDump; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.fib.table.management.rev180521.FibTableManagementBuilder; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.fib.table.management.rev180521.vpp.fib.table.management.FibTablesBuilder; diff --git a/fib-management/fib-management-impl/src/main/java/io/fd/hc2vpp/fib/management/read/FibTableCustomizer.java b/fib-management/fib-management-impl/src/main/java/io/fd/hc2vpp/fib/management/read/FibTableCustomizer.java index 90de1d057..bd610f994 100644 --- a/fib-management/fib-management-impl/src/main/java/io/fd/hc2vpp/fib/management/read/FibTableCustomizer.java +++ b/fib-management/fib-management-impl/src/main/java/io/fd/hc2vpp/fib/management/read/FibTableCustomizer.java @@ -23,8 +23,8 @@ import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.Initialized; import io.fd.honeycomb.translate.spi.read.InitializingListReaderCustomizer; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; -import io.fd.vpp.jvpp.core.dto.Ip6FibDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.IpFibDetailsReplyDump; +import io.fd.jvpp.core.dto.Ip6FibDetailsReplyDump; +import io.fd.jvpp.core.dto.IpFibDetailsReplyDump; import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; diff --git a/fib-management/fib-management-impl/src/main/java/io/fd/hc2vpp/fib/management/request/FibTableRequest.java b/fib-management/fib-management-impl/src/main/java/io/fd/hc2vpp/fib/management/request/FibTableRequest.java index 6d6c69227..33ef78c56 100644 --- a/fib-management/fib-management-impl/src/main/java/io/fd/hc2vpp/fib/management/request/FibTableRequest.java +++ b/fib-management/fib-management-impl/src/main/java/io/fd/hc2vpp/fib/management/request/FibTableRequest.java @@ -23,8 +23,8 @@ import io.fd.hc2vpp.common.translate.util.AddressTranslator; import io.fd.hc2vpp.common.translate.util.ByteDataTranslator; import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.IpTableAddDel; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.IpTableAddDel; +import io.fd.jvpp.core.future.FutureJVppCore; import java.nio.charset.StandardCharsets; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; diff --git a/fib-management/fib-management-impl/src/main/java/io/fd/hc2vpp/fib/management/write/FibManagementWriterFactory.java b/fib-management/fib-management-impl/src/main/java/io/fd/hc2vpp/fib/management/write/FibManagementWriterFactory.java index 781c6706b..9dad7cde8 100644 --- a/fib-management/fib-management-impl/src/main/java/io/fd/hc2vpp/fib/management/write/FibManagementWriterFactory.java +++ b/fib-management/fib-management-impl/src/main/java/io/fd/hc2vpp/fib/management/write/FibManagementWriterFactory.java @@ -21,7 +21,7 @@ import io.fd.hc2vpp.fib.management.FibManagementIIds; import io.fd.honeycomb.translate.impl.write.GenericListWriter; import io.fd.honeycomb.translate.write.WriterFactory; import io.fd.honeycomb.translate.write.registry.ModifiableWriterRegistryBuilder; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; /** diff --git a/fib-management/fib-management-impl/src/main/java/io/fd/hc2vpp/fib/management/write/FibTableCustomizer.java b/fib-management/fib-management-impl/src/main/java/io/fd/hc2vpp/fib/management/write/FibTableCustomizer.java index c61ff399e..79df054dd 100644 --- a/fib-management/fib-management-impl/src/main/java/io/fd/hc2vpp/fib/management/write/FibTableCustomizer.java +++ b/fib-management/fib-management-impl/src/main/java/io/fd/hc2vpp/fib/management/write/FibTableCustomizer.java @@ -22,7 +22,7 @@ import io.fd.hc2vpp.fib.management.request.FibTableRequest; import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.fib.table.management.rev180521.Ipv6; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.fib.table.management.rev180521.vpp.fib.table.management.fib.tables.Table; diff --git a/fib-management/fib-management-impl/src/test/java/io/fd/hc2vpp/fib/management/FibManagementModuleTest.java b/fib-management/fib-management-impl/src/test/java/io/fd/hc2vpp/fib/management/FibManagementModuleTest.java index f1f537114..b1d1c5cde 100644 --- a/fib-management/fib-management-impl/src/test/java/io/fd/hc2vpp/fib/management/FibManagementModuleTest.java +++ b/fib-management/fib-management-impl/src/test/java/io/fd/hc2vpp/fib/management/FibManagementModuleTest.java @@ -37,7 +37,7 @@ import io.fd.honeycomb.translate.impl.write.registry.FlatWriterRegistryBuilder; import io.fd.honeycomb.translate.read.ReaderFactory; import io.fd.honeycomb.translate.util.YangDAG; import io.fd.honeycomb.translate.write.WriterFactory; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.HashSet; import java.util.Set; import org.junit.Before; diff --git a/fib-management/fib-management-impl/src/test/java/io/fd/hc2vpp/fib/management/read/FibTableCustomizerTest.java b/fib-management/fib-management-impl/src/test/java/io/fd/hc2vpp/fib/management/read/FibTableCustomizerTest.java index a2be35e03..087ad3595 100644 --- a/fib-management/fib-management-impl/src/test/java/io/fd/hc2vpp/fib/management/read/FibTableCustomizerTest.java +++ b/fib-management/fib-management-impl/src/test/java/io/fd/hc2vpp/fib/management/read/FibTableCustomizerTest.java @@ -30,11 +30,11 @@ import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; import io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor; -import io.fd.vpp.jvpp.core.dto.Ip6FibDetails; -import io.fd.vpp.jvpp.core.dto.Ip6FibDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.IpFibDetails; -import io.fd.vpp.jvpp.core.dto.IpFibDetailsReplyDump; -import io.fd.vpp.jvpp.core.types.FibPath; +import io.fd.jvpp.core.dto.Ip6FibDetails; +import io.fd.jvpp.core.dto.Ip6FibDetailsReplyDump; +import io.fd.jvpp.core.dto.IpFibDetails; +import io.fd.jvpp.core.dto.IpFibDetailsReplyDump; +import io.fd.jvpp.core.types.FibPath; import java.util.Collections; import java.util.List; import org.junit.Assert; diff --git a/fib-management/fib-management-impl/src/test/java/io/fd/hc2vpp/fib/management/write/FibTableCustomizerTest.java b/fib-management/fib-management-impl/src/test/java/io/fd/hc2vpp/fib/management/write/FibTableCustomizerTest.java index d292947f6..d21bd1802 100644 --- a/fib-management/fib-management-impl/src/test/java/io/fd/hc2vpp/fib/management/write/FibTableCustomizerTest.java +++ b/fib-management/fib-management-impl/src/test/java/io/fd/hc2vpp/fib/management/write/FibTableCustomizerTest.java @@ -28,8 +28,8 @@ import io.fd.honeycomb.test.tools.HoneycombTestRunner; import io.fd.honeycomb.test.tools.annotations.InjectTestData; import io.fd.honeycomb.translate.ModificationCache; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.IpTableAddDel; -import io.fd.vpp.jvpp.core.dto.IpTableAddDelReply; +import io.fd.jvpp.core.dto.IpTableAddDel; +import io.fd.jvpp.core.dto.IpTableAddDelReply; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; diff --git a/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/VppIoamModule.java b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/VppIoamModule.java index 1feaf9a68..6000d4f8f 100755 --- a/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/VppIoamModule.java +++ b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/VppIoamModule.java @@ -28,12 +28,12 @@ import io.fd.hc2vpp.vppioam.impl.util.JVppIoamPotProvider; import io.fd.hc2vpp.vppioam.impl.util.JVppIoamTraceProvider; import io.fd.honeycomb.translate.read.ReaderFactory; import io.fd.honeycomb.translate.write.WriterFactory; -import io.fd.vpp.jvpp.ioamexport.future.FutureJVppIoamexport; -import io.fd.vpp.jvpp.ioamexport.future.FutureJVppIoamexportFacade; -import io.fd.vpp.jvpp.ioampot.future.FutureJVppIoampot; -import io.fd.vpp.jvpp.ioampot.future.FutureJVppIoampotFacade; -import io.fd.vpp.jvpp.ioamtrace.future.FutureJVppIoamtrace; -import io.fd.vpp.jvpp.ioamtrace.future.FutureJVppIoamtraceFacade; +import io.fd.jvpp.ioamexport.future.FutureJVppIoamexport; +import io.fd.jvpp.ioamexport.future.FutureJVppIoamexportFacade; +import io.fd.jvpp.ioampot.future.FutureJVppIoampot; +import io.fd.jvpp.ioampot.future.FutureJVppIoampotFacade; +import io.fd.jvpp.ioamtrace.future.FutureJVppIoamtrace; +import io.fd.jvpp.ioamtrace.future.FutureJVppIoamtraceFacade; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/config/IoamExportWriterCustomizer.java b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/config/IoamExportWriterCustomizer.java index 1d90b0e85..095f16397 100644 --- a/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/config/IoamExportWriterCustomizer.java +++ b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/config/IoamExportWriterCustomizer.java @@ -22,9 +22,9 @@ import io.fd.hc2vpp.vppioam.impl.util.FutureJVppIoamexportCustomizer; import io.fd.honeycomb.translate.spi.write.WriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.ioamexport.dto.IoamExportIp6EnableDisable; -import io.fd.vpp.jvpp.ioamexport.dto.IoamExportIp6EnableDisableReply; -import io.fd.vpp.jvpp.ioamexport.future.FutureJVppIoamexport; +import io.fd.jvpp.ioamexport.dto.IoamExportIp6EnableDisable; +import io.fd.jvpp.ioamexport.dto.IoamExportIp6EnableDisableReply; +import io.fd.jvpp.ioamexport.future.FutureJVppIoamexport; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.ioam.sb.export.rev170206.IoamExport; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; diff --git a/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/config/IoamPotWriterCustomizer.java b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/config/IoamPotWriterCustomizer.java index 19b1069ee..2ea4d4f46 100644 --- a/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/config/IoamPotWriterCustomizer.java +++ b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/config/IoamPotWriterCustomizer.java @@ -22,11 +22,11 @@ import io.fd.hc2vpp.vppioam.impl.util.FutureJVppIoampotCustomizer; import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.ioampot.dto.PotProfileAdd; -import io.fd.vpp.jvpp.ioampot.dto.PotProfileAddReply; -import io.fd.vpp.jvpp.ioampot.dto.PotProfileDel; -import io.fd.vpp.jvpp.ioampot.dto.PotProfileDelReply; -import io.fd.vpp.jvpp.ioampot.future.FutureJVppIoampot; +import io.fd.jvpp.ioampot.dto.PotProfileAdd; +import io.fd.jvpp.ioampot.dto.PotProfileAddReply; +import io.fd.jvpp.ioampot.dto.PotProfileDel; +import io.fd.jvpp.ioampot.dto.PotProfileDelReply; +import io.fd.jvpp.ioampot.future.FutureJVppIoampot; import java.nio.charset.StandardCharsets; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.ioam.sb.pot.rev170112.pot.profile.PotProfileList; diff --git a/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/config/IoamTraceWriterCustomizer.java b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/config/IoamTraceWriterCustomizer.java index a04ef33ab..213bb4ff9 100755 --- a/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/config/IoamTraceWriterCustomizer.java +++ b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/config/IoamTraceWriterCustomizer.java @@ -22,11 +22,11 @@ import io.fd.hc2vpp.vppioam.impl.util.FutureJVppIoamtraceCustomizer; import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.ioamtrace.dto.TraceProfileAdd; -import io.fd.vpp.jvpp.ioamtrace.dto.TraceProfileAddReply; -import io.fd.vpp.jvpp.ioamtrace.dto.TraceProfileDel; -import io.fd.vpp.jvpp.ioamtrace.dto.TraceProfileDelReply; -import io.fd.vpp.jvpp.ioamtrace.future.FutureJVppIoamtrace; +import io.fd.jvpp.ioamtrace.dto.TraceProfileAdd; +import io.fd.jvpp.ioamtrace.dto.TraceProfileAddReply; +import io.fd.jvpp.ioamtrace.dto.TraceProfileDel; +import io.fd.jvpp.ioamtrace.dto.TraceProfileDelReply; +import io.fd.jvpp.ioamtrace.future.FutureJVppIoamtrace; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.ioam.sb.trace.rev170327.ioam.trace.config.TraceConfig; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.ioam.sb.trace.rev170327.ioam.trace.config.TraceConfigKey; diff --git a/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/config/VppIoamWriterFactory.java b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/config/VppIoamWriterFactory.java index 610a44ae9..6b661e083 100755 --- a/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/config/VppIoamWriterFactory.java +++ b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/config/VppIoamWriterFactory.java @@ -22,9 +22,9 @@ import io.fd.honeycomb.translate.impl.write.GenericListWriter; import io.fd.honeycomb.translate.impl.write.GenericWriter; import io.fd.honeycomb.translate.write.WriterFactory; import io.fd.honeycomb.translate.write.registry.ModifiableWriterRegistryBuilder; -import io.fd.vpp.jvpp.ioamexport.future.FutureJVppIoamexport; -import io.fd.vpp.jvpp.ioampot.future.FutureJVppIoampot; -import io.fd.vpp.jvpp.ioamtrace.future.FutureJVppIoamtrace; +import io.fd.jvpp.ioamexport.future.FutureJVppIoamexport; +import io.fd.jvpp.ioampot.future.FutureJVppIoampot; +import io.fd.jvpp.ioamtrace.future.FutureJVppIoamtrace; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.ioam.sb.export.rev170206.IoamExport; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.ioam.sb.trace.rev170327.IoamTraceConfig; diff --git a/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/oper/PotProfileReaderCustomizer.java b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/oper/PotProfileReaderCustomizer.java index f9d229a9c..ad14f2279 100644 --- a/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/oper/PotProfileReaderCustomizer.java +++ b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/oper/PotProfileReaderCustomizer.java @@ -22,10 +22,10 @@ import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.Initialized; import io.fd.honeycomb.translate.spi.read.InitializingListReaderCustomizer; -import io.fd.vpp.jvpp.ioampot.dto.PotProfileShowConfigDetails; -import io.fd.vpp.jvpp.ioampot.dto.PotProfileShowConfigDetailsReplyDump; -import io.fd.vpp.jvpp.ioampot.dto.PotProfileShowConfigDump; -import io.fd.vpp.jvpp.ioampot.future.FutureJVppIoampot; +import io.fd.jvpp.ioampot.dto.PotProfileShowConfigDetails; +import io.fd.jvpp.ioampot.dto.PotProfileShowConfigDetailsReplyDump; +import io.fd.jvpp.ioampot.dto.PotProfileShowConfigDump; +import io.fd.jvpp.ioampot.future.FutureJVppIoampot; import java.math.BigInteger; import java.util.ArrayList; import java.util.List; diff --git a/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/oper/TraceProfileReaderCustomizer.java b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/oper/TraceProfileReaderCustomizer.java index 42a80c2dd..b389eeb17 100644 --- a/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/oper/TraceProfileReaderCustomizer.java +++ b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/oper/TraceProfileReaderCustomizer.java @@ -23,9 +23,9 @@ import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.Initialized; import io.fd.honeycomb.translate.spi.read.InitializingListReaderCustomizer; -import io.fd.vpp.jvpp.ioamtrace.dto.TraceProfileShowConfig; -import io.fd.vpp.jvpp.ioamtrace.dto.TraceProfileShowConfigReply; -import io.fd.vpp.jvpp.ioamtrace.future.FutureJVppIoamtrace; +import io.fd.jvpp.ioamtrace.dto.TraceProfileShowConfig; +import io.fd.jvpp.ioamtrace.dto.TraceProfileShowConfigReply; +import io.fd.jvpp.ioamtrace.future.FutureJVppIoamtrace; import java.util.List; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.ioam.sb.trace.rev170327.IoamTraceConfigBuilder; diff --git a/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/oper/VppIoamReaderFactory.java b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/oper/VppIoamReaderFactory.java index 21f79c0e7..f9c87b669 100644 --- a/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/oper/VppIoamReaderFactory.java +++ b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/oper/VppIoamReaderFactory.java @@ -19,8 +19,8 @@ package io.fd.hc2vpp.vppioam.impl.oper; import io.fd.honeycomb.translate.impl.read.GenericInitListReader; import io.fd.honeycomb.translate.read.ReaderFactory; import io.fd.honeycomb.translate.read.registry.ModifiableReaderRegistryBuilder; -import io.fd.vpp.jvpp.ioampot.future.FutureJVppIoampot; -import io.fd.vpp.jvpp.ioamtrace.future.FutureJVppIoamtrace; +import io.fd.jvpp.ioampot.future.FutureJVppIoampot; +import io.fd.jvpp.ioamtrace.future.FutureJVppIoamtrace; import java.util.Arrays; import java.util.List; import javax.annotation.Nonnull; diff --git a/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/util/FutureJVppIoamexportCustomizer.java b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/util/FutureJVppIoamexportCustomizer.java index adc2ffc10..f103078a7 100644 --- a/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/util/FutureJVppIoamexportCustomizer.java +++ b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/util/FutureJVppIoamexportCustomizer.java @@ -17,7 +17,7 @@ package io.fd.hc2vpp.vppioam.impl.util; import com.google.common.base.Preconditions; -import io.fd.vpp.jvpp.ioamexport.future.FutureJVppIoamexport; +import io.fd.jvpp.ioamexport.future.FutureJVppIoamexport; import javax.annotation.Nonnull; public abstract class FutureJVppIoamexportCustomizer { diff --git a/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/util/FutureJVppIoampotCustomizer.java b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/util/FutureJVppIoampotCustomizer.java index f59f91e18..7dc467d34 100755 --- a/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/util/FutureJVppIoampotCustomizer.java +++ b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/util/FutureJVppIoampotCustomizer.java @@ -18,7 +18,7 @@ package io.fd.hc2vpp.vppioam.impl.util; import com.google.common.annotations.Beta; import com.google.common.base.Preconditions; -import io.fd.vpp.jvpp.ioampot.future.FutureJVppIoampot; +import io.fd.jvpp.ioampot.future.FutureJVppIoampot; import javax.annotation.Nonnull; /** diff --git a/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/util/FutureJVppIoamtraceCustomizer.java b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/util/FutureJVppIoamtraceCustomizer.java index 8a5d2833c..fc3fd4308 100755 --- a/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/util/FutureJVppIoamtraceCustomizer.java +++ b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/util/FutureJVppIoamtraceCustomizer.java @@ -18,7 +18,7 @@ package io.fd.hc2vpp.vppioam.impl.util; import com.google.common.annotations.Beta; import com.google.common.base.Preconditions; -import io.fd.vpp.jvpp.ioamtrace.future.FutureJVppIoamtrace; +import io.fd.jvpp.ioamtrace.future.FutureJVppIoamtrace; import javax.annotation.Nonnull; /** diff --git a/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/util/JVppIoamExportProvider.java b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/util/JVppIoamExportProvider.java index a90bafee2..2b8fe33b2 100644 --- a/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/util/JVppIoamExportProvider.java +++ b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/util/JVppIoamExportProvider.java @@ -19,9 +19,9 @@ package io.fd.hc2vpp.vppioam.impl.util; import com.google.inject.Inject; import io.fd.honeycomb.binding.init.ProviderTrait; import io.fd.honeycomb.data.init.ShutdownHandler; -import io.fd.vpp.jvpp.JVppRegistry; -import io.fd.vpp.jvpp.ioamexport.JVppIoamexportImpl; -import io.fd.vpp.jvpp.ioamexport.future.FutureJVppIoamexportFacade; +import io.fd.jvpp.JVppRegistry; +import io.fd.jvpp.ioamexport.JVppIoamexportImpl; +import io.fd.jvpp.ioamexport.future.FutureJVppIoamexportFacade; import java.io.IOException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/util/JVppIoamPotProvider.java b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/util/JVppIoamPotProvider.java index 03db9f01a..f5b3006fd 100644 --- a/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/util/JVppIoamPotProvider.java +++ b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/util/JVppIoamPotProvider.java @@ -19,9 +19,9 @@ package io.fd.hc2vpp.vppioam.impl.util; import com.google.inject.Inject; import io.fd.honeycomb.binding.init.ProviderTrait; import io.fd.honeycomb.data.init.ShutdownHandler; -import io.fd.vpp.jvpp.JVppRegistry; -import io.fd.vpp.jvpp.ioampot.JVppIoampotImpl; -import io.fd.vpp.jvpp.ioampot.future.FutureJVppIoampotFacade; +import io.fd.jvpp.JVppRegistry; +import io.fd.jvpp.ioampot.JVppIoampotImpl; +import io.fd.jvpp.ioampot.future.FutureJVppIoampotFacade; import java.io.IOException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/util/JVppIoamTraceProvider.java b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/util/JVppIoamTraceProvider.java index f7e15fb68..6e065c6f8 100755 --- a/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/util/JVppIoamTraceProvider.java +++ b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/util/JVppIoamTraceProvider.java @@ -19,9 +19,9 @@ package io.fd.hc2vpp.vppioam.impl.util; import com.google.inject.Inject; import io.fd.honeycomb.binding.init.ProviderTrait; import io.fd.honeycomb.data.init.ShutdownHandler; -import io.fd.vpp.jvpp.JVppRegistry; -import io.fd.vpp.jvpp.ioamtrace.JVppIoamtraceImpl; -import io.fd.vpp.jvpp.ioamtrace.future.FutureJVppIoamtraceFacade; +import io.fd.jvpp.JVppRegistry; +import io.fd.jvpp.ioamtrace.JVppIoamtraceImpl; +import io.fd.jvpp.ioamtrace.future.FutureJVppIoamtraceFacade; import java.io.IOException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ioam/impl/src/test/java/io/fd/hc2vpp/vppioam/impl/VppIoamModuleTest.java b/ioam/impl/src/test/java/io/fd/hc2vpp/vppioam/impl/VppIoamModuleTest.java index 469b9a254..4ff8d0dbd 100644 --- a/ioam/impl/src/test/java/io/fd/hc2vpp/vppioam/impl/VppIoamModuleTest.java +++ b/ioam/impl/src/test/java/io/fd/hc2vpp/vppioam/impl/VppIoamModuleTest.java @@ -35,10 +35,10 @@ import io.fd.honeycomb.translate.impl.write.registry.FlatWriterRegistryBuilder; import io.fd.honeycomb.translate.read.ReaderFactory; 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.ioamexport.future.FutureJVppIoamexportFacade; -import io.fd.vpp.jvpp.ioampot.future.FutureJVppIoampotFacade; -import io.fd.vpp.jvpp.ioamtrace.future.FutureJVppIoamtraceFacade; +import io.fd.jvpp.JVppRegistry; +import io.fd.jvpp.ioamexport.future.FutureJVppIoamexportFacade; +import io.fd.jvpp.ioampot.future.FutureJVppIoampotFacade; +import io.fd.jvpp.ioamtrace.future.FutureJVppIoamtraceFacade; import java.util.HashSet; import java.util.Set; import org.junit.Before; diff --git a/ioam/impl/src/test/java/io/fd/hc2vpp/vppioam/impl/config/IoamExportWriterCustomizerTest.java b/ioam/impl/src/test/java/io/fd/hc2vpp/vppioam/impl/config/IoamExportWriterCustomizerTest.java index d54e46a88..6c5512da8 100644 --- a/ioam/impl/src/test/java/io/fd/hc2vpp/vppioam/impl/config/IoamExportWriterCustomizerTest.java +++ b/ioam/impl/src/test/java/io/fd/hc2vpp/vppioam/impl/config/IoamExportWriterCustomizerTest.java @@ -24,9 +24,9 @@ import static org.mockito.Mockito.verify; import io.fd.hc2vpp.common.test.write.WriterCustomizerTest; import io.fd.hc2vpp.common.translate.util.Ipv4Translator; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.ioamexport.dto.IoamExportIp6EnableDisable; -import io.fd.vpp.jvpp.ioamexport.dto.IoamExportIp6EnableDisableReply; -import io.fd.vpp.jvpp.ioamexport.future.FutureJVppIoamexport; +import io.fd.jvpp.ioamexport.dto.IoamExportIp6EnableDisable; +import io.fd.jvpp.ioamexport.dto.IoamExportIp6EnableDisableReply; +import io.fd.jvpp.ioamexport.future.FutureJVppIoamexport; import org.junit.Test; import org.mockito.Mock; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.ioam.sb.export.rev170206.IoamExport; diff --git a/ioam/impl/src/test/java/io/fd/hc2vpp/vppioam/impl/config/IoamPotWriterCustomizerTest.java b/ioam/impl/src/test/java/io/fd/hc2vpp/vppioam/impl/config/IoamPotWriterCustomizerTest.java index 261a6a39e..2ae26e1a9 100644 --- a/ioam/impl/src/test/java/io/fd/hc2vpp/vppioam/impl/config/IoamPotWriterCustomizerTest.java +++ b/ioam/impl/src/test/java/io/fd/hc2vpp/vppioam/impl/config/IoamPotWriterCustomizerTest.java @@ -23,11 +23,11 @@ import static org.mockito.Mockito.verify; import io.fd.hc2vpp.common.test.write.WriterCustomizerTest; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.ioampot.dto.PotProfileAdd; -import io.fd.vpp.jvpp.ioampot.dto.PotProfileAddReply; -import io.fd.vpp.jvpp.ioampot.dto.PotProfileDel; -import io.fd.vpp.jvpp.ioampot.dto.PotProfileDelReply; -import io.fd.vpp.jvpp.ioampot.future.FutureJVppIoampot; +import io.fd.jvpp.ioampot.dto.PotProfileAdd; +import io.fd.jvpp.ioampot.dto.PotProfileAddReply; +import io.fd.jvpp.ioampot.dto.PotProfileDel; +import io.fd.jvpp.ioampot.dto.PotProfileDelReply; +import io.fd.jvpp.ioampot.future.FutureJVppIoampot; import java.math.BigInteger; import java.nio.charset.StandardCharsets; import java.util.ArrayList; diff --git a/ioam/impl/src/test/java/io/fd/hc2vpp/vppioam/impl/config/IoamTraceWriterCustomizerTest.java b/ioam/impl/src/test/java/io/fd/hc2vpp/vppioam/impl/config/IoamTraceWriterCustomizerTest.java index 1f867b2d4..233ca1eb1 100644 --- a/ioam/impl/src/test/java/io/fd/hc2vpp/vppioam/impl/config/IoamTraceWriterCustomizerTest.java +++ b/ioam/impl/src/test/java/io/fd/hc2vpp/vppioam/impl/config/IoamTraceWriterCustomizerTest.java @@ -23,11 +23,11 @@ import static org.mockito.Mockito.verify; import io.fd.hc2vpp.common.test.write.WriterCustomizerTest; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.ioamtrace.dto.TraceProfileAdd; -import io.fd.vpp.jvpp.ioamtrace.dto.TraceProfileAddReply; -import io.fd.vpp.jvpp.ioamtrace.dto.TraceProfileDel; -import io.fd.vpp.jvpp.ioamtrace.dto.TraceProfileDelReply; -import io.fd.vpp.jvpp.ioamtrace.future.FutureJVppIoamtrace; +import io.fd.jvpp.ioamtrace.dto.TraceProfileAdd; +import io.fd.jvpp.ioamtrace.dto.TraceProfileAddReply; +import io.fd.jvpp.ioamtrace.dto.TraceProfileDel; +import io.fd.jvpp.ioamtrace.dto.TraceProfileDelReply; +import io.fd.jvpp.ioamtrace.future.FutureJVppIoamtrace; import org.junit.Test; import org.mockito.Mock; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.ioam.sb.trace.rev170327.IoamTraceConfig; diff --git a/ioam/impl/src/test/java/io/fd/hc2vpp/vppioam/impl/oper/PotProfileReaderCustomizerTest.java b/ioam/impl/src/test/java/io/fd/hc2vpp/vppioam/impl/oper/PotProfileReaderCustomizerTest.java index 80e71f610..ba4d56ca5 100644 --- a/ioam/impl/src/test/java/io/fd/hc2vpp/vppioam/impl/oper/PotProfileReaderCustomizerTest.java +++ b/ioam/impl/src/test/java/io/fd/hc2vpp/vppioam/impl/oper/PotProfileReaderCustomizerTest.java @@ -25,10 +25,10 @@ import com.google.common.collect.Lists; import io.fd.hc2vpp.common.test.read.ListReaderCustomizerTest; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.vpp.jvpp.ioampot.dto.PotProfileShowConfigDetails; -import io.fd.vpp.jvpp.ioampot.dto.PotProfileShowConfigDetailsReplyDump; -import io.fd.vpp.jvpp.ioampot.dto.PotProfileShowConfigDump; -import io.fd.vpp.jvpp.ioampot.future.FutureJVppIoampot; +import io.fd.jvpp.ioampot.dto.PotProfileShowConfigDetails; +import io.fd.jvpp.ioampot.dto.PotProfileShowConfigDetailsReplyDump; +import io.fd.jvpp.ioampot.dto.PotProfileShowConfigDump; +import io.fd.jvpp.ioampot.future.FutureJVppIoampot; import org.junit.Test; import org.mockito.Mock; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.ioam.sb.pot.rev170112.PotProfiles; diff --git a/ioam/impl/src/test/java/io/fd/hc2vpp/vppioam/impl/oper/TraceProfileReaderCustomizerTest.java b/ioam/impl/src/test/java/io/fd/hc2vpp/vppioam/impl/oper/TraceProfileReaderCustomizerTest.java index ec7c0637c..84646c7a1 100644 --- a/ioam/impl/src/test/java/io/fd/hc2vpp/vppioam/impl/oper/TraceProfileReaderCustomizerTest.java +++ b/ioam/impl/src/test/java/io/fd/hc2vpp/vppioam/impl/oper/TraceProfileReaderCustomizerTest.java @@ -24,9 +24,9 @@ import static org.mockito.Mockito.verify; import io.fd.hc2vpp.common.test.read.ListReaderCustomizerTest; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.vpp.jvpp.ioamtrace.dto.TraceProfileShowConfig; -import io.fd.vpp.jvpp.ioamtrace.dto.TraceProfileShowConfigReply; -import io.fd.vpp.jvpp.ioamtrace.future.FutureJVppIoamtrace; +import io.fd.jvpp.ioamtrace.dto.TraceProfileShowConfig; +import io.fd.jvpp.ioamtrace.dto.TraceProfileShowConfigReply; +import io.fd.jvpp.ioamtrace.future.FutureJVppIoamtrace; import org.junit.Test; import org.mockito.Mock; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.ioam.sb.trace.rev170327.IoamTraceConfig; diff --git a/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/FutureJVppIkev2Customizer.java b/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/FutureJVppIkev2Customizer.java index c1453681f..c0ac2cd20 100644 --- a/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/FutureJVppIkev2Customizer.java +++ b/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/FutureJVppIkev2Customizer.java @@ -18,7 +18,7 @@ package io.fd.hc2vpp.ipsec; import static com.google.common.base.Preconditions.checkNotNull; -import io.fd.vpp.jvpp.ikev2.future.FutureJVppIkev2Facade; +import io.fd.jvpp.ikev2.future.FutureJVppIkev2Facade; import javax.annotation.Nonnull; /** diff --git a/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/IpsecModule.java b/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/IpsecModule.java index 8670eb749..dc96690d9 100644 --- a/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/IpsecModule.java +++ b/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/IpsecModule.java @@ -26,7 +26,7 @@ import io.fd.hc2vpp.ipsec.read.IpsecReaderFactory; import io.fd.hc2vpp.ipsec.write.IpsecWriterFactory; import io.fd.honeycomb.translate.read.ReaderFactory; import io.fd.honeycomb.translate.write.WriterFactory; -import io.fd.vpp.jvpp.ikev2.future.FutureJVppIkev2Facade; +import io.fd.jvpp.ikev2.future.FutureJVppIkev2Facade; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/JVppIkev2Provider.java b/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/JVppIkev2Provider.java index 5a9681a91..bf0209aa4 100644 --- a/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/JVppIkev2Provider.java +++ b/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/JVppIkev2Provider.java @@ -20,9 +20,9 @@ import com.google.inject.Inject; import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; import io.fd.honeycomb.binding.init.ProviderTrait; import io.fd.honeycomb.data.init.ShutdownHandler; -import io.fd.vpp.jvpp.JVppRegistry; -import io.fd.vpp.jvpp.ikev2.JVppIkev2Impl; -import io.fd.vpp.jvpp.ikev2.future.FutureJVppIkev2Facade; +import io.fd.jvpp.JVppRegistry; +import io.fd.jvpp.ikev2.JVppIkev2Impl; +import io.fd.jvpp.ikev2.future.FutureJVppIkev2Facade; import java.io.IOException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/read/IpsecReaderFactory.java b/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/read/IpsecReaderFactory.java index e148022e8..1a71c3a8f 100644 --- a/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/read/IpsecReaderFactory.java +++ b/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/read/IpsecReaderFactory.java @@ -22,7 +22,7 @@ import io.fd.honeycomb.translate.impl.read.GenericInitListReader; import io.fd.honeycomb.translate.impl.read.GenericReader; import io.fd.honeycomb.translate.read.ReaderFactory; import io.fd.honeycomb.translate.read.registry.ModifiableReaderRegistryBuilder; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.ipsec.rev181213.IpsecStateSpdAugmentation; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.ipsec.rev181213.IpsecStateSpdAugmentationBuilder; diff --git a/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/read/IpsecStateCustomizer.java b/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/read/IpsecStateCustomizer.java index 78a80120a..b63a7d24c 100644 --- a/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/read/IpsecStateCustomizer.java +++ b/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/read/IpsecStateCustomizer.java @@ -27,12 +27,12 @@ import io.fd.honeycomb.translate.spi.read.Initialized; import io.fd.honeycomb.translate.spi.read.InitializingReaderCustomizer; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; import io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor; -import io.fd.vpp.jvpp.core.dto.IpsecSaDetails; -import io.fd.vpp.jvpp.core.dto.IpsecSaDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.IpsecSaDump; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; -import io.fd.vpp.jvpp.core.types.IpsecCryptoAlg; -import io.fd.vpp.jvpp.core.types.IpsecIntegAlg; +import io.fd.jvpp.core.dto.IpsecSaDetails; +import io.fd.jvpp.core.dto.IpsecSaDetailsReplyDump; +import io.fd.jvpp.core.dto.IpsecSaDump; +import io.fd.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.types.IpsecCryptoAlg; +import io.fd.jvpp.core.types.IpsecIntegAlg; import java.util.LinkedList; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.ipsec.rev181213.IpsecStateSpdAugmentation; diff --git a/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/read/IpsecStateSpdCustomizer.java b/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/read/IpsecStateSpdCustomizer.java index a9a20cff0..42f495b5d 100644 --- a/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/read/IpsecStateSpdCustomizer.java +++ b/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/read/IpsecStateSpdCustomizer.java @@ -27,14 +27,14 @@ import io.fd.honeycomb.translate.spi.read.Initialized; import io.fd.honeycomb.translate.spi.read.InitializingListReaderCustomizer; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; import io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor; -import io.fd.vpp.jvpp.core.dto.IpsecSpdDetails; -import io.fd.vpp.jvpp.core.dto.IpsecSpdDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.IpsecSpdDump; -import io.fd.vpp.jvpp.core.dto.IpsecSpdsDetails; -import io.fd.vpp.jvpp.core.dto.IpsecSpdsDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.IpsecSpdsDump; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; -import io.fd.vpp.jvpp.core.types.AddressFamily; +import io.fd.jvpp.core.dto.IpsecSpdDetails; +import io.fd.jvpp.core.dto.IpsecSpdDetailsReplyDump; +import io.fd.jvpp.core.dto.IpsecSpdDump; +import io.fd.jvpp.core.dto.IpsecSpdsDetails; +import io.fd.jvpp.core.dto.IpsecSpdsDetailsReplyDump; +import io.fd.jvpp.core.dto.IpsecSpdsDump; +import io.fd.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.types.AddressFamily; import java.util.LinkedList; import java.util.List; import java.util.stream.Collectors; diff --git a/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/Ikev2GlobalConfigurationCustomizer.java b/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/Ikev2GlobalConfigurationCustomizer.java index dd7d34edb..3dc731248 100644 --- a/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/Ikev2GlobalConfigurationCustomizer.java +++ b/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/Ikev2GlobalConfigurationCustomizer.java @@ -21,8 +21,8 @@ import io.fd.hc2vpp.ipsec.FutureJVppIkev2Customizer; import io.fd.honeycomb.translate.spi.write.WriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.ikev2.dto.Ikev2SetLocalKey; -import io.fd.vpp.jvpp.ikev2.future.FutureJVppIkev2Facade; +import io.fd.jvpp.ikev2.dto.Ikev2SetLocalKey; +import io.fd.jvpp.ikev2.future.FutureJVppIkev2Facade; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.ipsec.rev181213.IpsecIkeGlobalConfAugmentation; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ipsec.rev181214.ikev2.IkeGlobalConfiguration; diff --git a/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/Ikev2PolicyCustomizer.java b/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/Ikev2PolicyCustomizer.java index 47a09c8b1..9858f22cb 100644 --- a/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/Ikev2PolicyCustomizer.java +++ b/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/Ikev2PolicyCustomizer.java @@ -24,10 +24,10 @@ import io.fd.hc2vpp.ipsec.dto.AuthMethod; import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.ikev2.dto.Ikev2ProfileAddDel; -import io.fd.vpp.jvpp.ikev2.dto.Ikev2ProfileSetAuth; -import io.fd.vpp.jvpp.ikev2.dto.Ikev2ProfileSetTs; -import io.fd.vpp.jvpp.ikev2.future.FutureJVppIkev2Facade; +import io.fd.jvpp.ikev2.dto.Ikev2ProfileAddDel; +import io.fd.jvpp.ikev2.dto.Ikev2ProfileSetAuth; +import io.fd.jvpp.ikev2.dto.Ikev2ProfileSetTs; +import io.fd.jvpp.ikev2.future.FutureJVppIkev2Facade; import java.nio.ByteBuffer; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.ipsec.rev181213.IpsecIkev2PolicyAugmentation; diff --git a/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/Ikev2PolicyIdentityCustomizer.java b/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/Ikev2PolicyIdentityCustomizer.java index 430aebc88..f85ee07f2 100644 --- a/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/Ikev2PolicyIdentityCustomizer.java +++ b/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/Ikev2PolicyIdentityCustomizer.java @@ -24,8 +24,8 @@ import io.fd.hc2vpp.ipsec.FutureJVppIkev2Customizer; import io.fd.honeycomb.translate.spi.write.WriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.ikev2.dto.Ikev2ProfileSetId; -import io.fd.vpp.jvpp.ikev2.future.FutureJVppIkev2Facade; +import io.fd.jvpp.ikev2.dto.Ikev2ProfileSetId; +import io.fd.jvpp.ikev2.future.FutureJVppIkev2Facade; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ipsec.rev181214.identity.grouping.identity.FqdnString; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ipsec.rev181214.identity.grouping.identity.Ipv4Address; diff --git a/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/IpsecSadEntryCustomizer.java b/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/IpsecSadEntryCustomizer.java index d5b41cbe1..c1e21ed7a 100644 --- a/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/IpsecSadEntryCustomizer.java +++ b/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/IpsecSadEntryCustomizer.java @@ -25,15 +25,15 @@ import io.fd.hc2vpp.common.translate.util.MultiNamingContext; import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.IpsecSadEntryAddDel; -import io.fd.vpp.jvpp.core.dto.IpsecSadEntryAddDelReply; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; -import io.fd.vpp.jvpp.core.types.IpsecCryptoAlg; -import io.fd.vpp.jvpp.core.types.IpsecIntegAlg; -import io.fd.vpp.jvpp.core.types.IpsecProto; -import io.fd.vpp.jvpp.core.types.IpsecSadEntry; -import io.fd.vpp.jvpp.core.types.IpsecSadFlags; -import io.fd.vpp.jvpp.core.types.Key; +import io.fd.jvpp.core.dto.IpsecSadEntryAddDel; +import io.fd.jvpp.core.dto.IpsecSadEntryAddDelReply; +import io.fd.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.types.IpsecCryptoAlg; +import io.fd.jvpp.core.types.IpsecIntegAlg; +import io.fd.jvpp.core.types.IpsecProto; +import io.fd.jvpp.core.types.IpsecSadEntry; +import io.fd.jvpp.core.types.IpsecSadFlags; +import io.fd.jvpp.core.types.Key; import java.util.concurrent.CompletionStage; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.ipsec.rev181213.IpsecSadEntriesAugmentation; diff --git a/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/IpsecSpdCustomizer.java b/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/IpsecSpdCustomizer.java index 870eeb776..9c7909eee 100644 --- a/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/IpsecSpdCustomizer.java +++ b/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/IpsecSpdCustomizer.java @@ -24,11 +24,11 @@ import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.IpsecSpdAddDel; -import io.fd.vpp.jvpp.core.dto.IpsecSpdEntryAddDel; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; -import io.fd.vpp.jvpp.core.types.IpsecSpdAction; -import io.fd.vpp.jvpp.core.types.IpsecSpdEntry; +import io.fd.jvpp.core.dto.IpsecSpdAddDel; +import io.fd.jvpp.core.dto.IpsecSpdEntryAddDel; +import io.fd.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.types.IpsecSpdAction; +import io.fd.jvpp.core.types.IpsecSpdEntry; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.ipsec.rev181213.IpsecSpdEntriesAugmentation; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ipsec.rev181214.ipsec.Spd; diff --git a/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/IpsecWriterFactory.java b/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/IpsecWriterFactory.java index 4dc7ff1b0..35efe0ab2 100644 --- a/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/IpsecWriterFactory.java +++ b/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/IpsecWriterFactory.java @@ -23,8 +23,8 @@ import io.fd.honeycomb.translate.impl.write.GenericListWriter; import io.fd.honeycomb.translate.impl.write.GenericWriter; import io.fd.honeycomb.translate.write.WriterFactory; import io.fd.honeycomb.translate.write.registry.ModifiableWriterRegistryBuilder; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; -import io.fd.vpp.jvpp.ikev2.future.FutureJVppIkev2Facade; +import io.fd.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.ikev2.future.FutureJVppIkev2Facade; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.ipsec.rev181213.IpsecIkeGlobalConfAugmentation; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.ipsec.rev181213.IpsecIkev2PolicyAugmentation; diff --git a/ipsec/ipsec-impl/src/test/java/io/fd/hc2vpp/ipsec/IpsecModuleTest.java b/ipsec/ipsec-impl/src/test/java/io/fd/hc2vpp/ipsec/IpsecModuleTest.java index 878edd9ac..41a8e539b 100644 --- a/ipsec/ipsec-impl/src/test/java/io/fd/hc2vpp/ipsec/IpsecModuleTest.java +++ b/ipsec/ipsec-impl/src/test/java/io/fd/hc2vpp/ipsec/IpsecModuleTest.java @@ -38,8 +38,8 @@ import io.fd.honeycomb.translate.impl.write.registry.FlatWriterRegistryBuilder; import io.fd.honeycomb.translate.read.ReaderFactory; import io.fd.honeycomb.translate.util.YangDAG; import io.fd.honeycomb.translate.write.WriterFactory; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; -import io.fd.vpp.jvpp.ikev2.future.FutureJVppIkev2Facade; +import io.fd.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.ikev2.future.FutureJVppIkev2Facade; import java.util.HashSet; import java.util.Set; import org.junit.Before; diff --git a/ipsec/ipsec-impl/src/test/java/io/fd/hc2vpp/ipsec/read/IpsecStateCustomizerTest.java b/ipsec/ipsec-impl/src/test/java/io/fd/hc2vpp/ipsec/read/IpsecStateCustomizerTest.java index 53cbb4b3e..3d60eb6d0 100644 --- a/ipsec/ipsec-impl/src/test/java/io/fd/hc2vpp/ipsec/read/IpsecStateCustomizerTest.java +++ b/ipsec/ipsec-impl/src/test/java/io/fd/hc2vpp/ipsec/read/IpsecStateCustomizerTest.java @@ -16,9 +16,9 @@ package io.fd.hc2vpp.ipsec.read; -import static io.fd.vpp.jvpp.core.types.IpsecCryptoAlg.IPSEC_API_CRYPTO_ALG_AES_CBC_128; -import static io.fd.vpp.jvpp.core.types.IpsecIntegAlg.IPSEC_API_INTEG_ALG_SHA1_96; -import static io.fd.vpp.jvpp.core.types.IpsecProto.IPSEC_API_PROTO_ESP; +import static io.fd.jvpp.core.types.IpsecCryptoAlg.IPSEC_API_CRYPTO_ALG_AES_CBC_128; +import static io.fd.jvpp.core.types.IpsecIntegAlg.IPSEC_API_INTEG_ALG_SHA1_96; +import static io.fd.jvpp.core.types.IpsecProto.IPSEC_API_PROTO_ESP; import static org.junit.Assert.assertEquals; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; @@ -29,12 +29,12 @@ import io.fd.hc2vpp.common.translate.util.Ipv4Translator; import io.fd.hc2vpp.common.translate.util.Ipv6Translator; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.vpp.jvpp.core.dto.IpsecSaDetails; -import io.fd.vpp.jvpp.core.dto.IpsecSaDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.IpsecSaDump; -import io.fd.vpp.jvpp.core.types.IpsecSadEntry; -import io.fd.vpp.jvpp.core.types.IpsecSadFlags; -import io.fd.vpp.jvpp.core.types.Key; +import io.fd.jvpp.core.dto.IpsecSaDetails; +import io.fd.jvpp.core.dto.IpsecSaDetailsReplyDump; +import io.fd.jvpp.core.dto.IpsecSaDump; +import io.fd.jvpp.core.types.IpsecSadEntry; +import io.fd.jvpp.core.types.IpsecSadFlags; +import io.fd.jvpp.core.types.Key; import java.util.LinkedList; import org.junit.Test; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4AddressNoZone; diff --git a/ipsec/ipsec-impl/src/test/java/io/fd/hc2vpp/ipsec/read/IpsecStateSpdCustomizerTest.java b/ipsec/ipsec-impl/src/test/java/io/fd/hc2vpp/ipsec/read/IpsecStateSpdCustomizerTest.java index 8c2ad09f9..87aece2f1 100644 --- a/ipsec/ipsec-impl/src/test/java/io/fd/hc2vpp/ipsec/read/IpsecStateSpdCustomizerTest.java +++ b/ipsec/ipsec-impl/src/test/java/io/fd/hc2vpp/ipsec/read/IpsecStateSpdCustomizerTest.java @@ -26,12 +26,12 @@ import io.fd.hc2vpp.common.translate.util.Ipv4Translator; import io.fd.hc2vpp.common.translate.util.Ipv6Translator; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.vpp.jvpp.core.dto.IpsecSpdDetails; -import io.fd.vpp.jvpp.core.dto.IpsecSpdDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.IpsecSpdsDetails; -import io.fd.vpp.jvpp.core.dto.IpsecSpdsDetailsReplyDump; -import io.fd.vpp.jvpp.core.types.IpsecSpdAction; -import io.fd.vpp.jvpp.core.types.IpsecSpdEntry; +import io.fd.jvpp.core.dto.IpsecSpdDetails; +import io.fd.jvpp.core.dto.IpsecSpdDetailsReplyDump; +import io.fd.jvpp.core.dto.IpsecSpdsDetails; +import io.fd.jvpp.core.dto.IpsecSpdsDetailsReplyDump; +import io.fd.jvpp.core.types.IpsecSpdAction; +import io.fd.jvpp.core.types.IpsecSpdEntry; import java.util.LinkedList; import org.junit.Test; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.ipsec.rev181213.IpsecStateSpdAugmentation; diff --git a/ipsec/ipsec-impl/src/test/java/io/fd/hc2vpp/ipsec/write/Ikev2GlobalConfigurationCustomizerTest.java b/ipsec/ipsec-impl/src/test/java/io/fd/hc2vpp/ipsec/write/Ikev2GlobalConfigurationCustomizerTest.java index 84ae9c7d6..dc703634f 100644 --- a/ipsec/ipsec-impl/src/test/java/io/fd/hc2vpp/ipsec/write/Ikev2GlobalConfigurationCustomizerTest.java +++ b/ipsec/ipsec-impl/src/test/java/io/fd/hc2vpp/ipsec/write/Ikev2GlobalConfigurationCustomizerTest.java @@ -23,9 +23,9 @@ import static org.mockito.Mockito.when; import io.fd.hc2vpp.common.test.write.WriterCustomizerTest; import io.fd.hc2vpp.ipsec.helpers.SchemaContextTestHelper; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.ikev2.dto.Ikev2SetLocalKey; -import io.fd.vpp.jvpp.ikev2.dto.Ikev2SetLocalKeyReply; -import io.fd.vpp.jvpp.ikev2.future.FutureJVppIkev2Facade; +import io.fd.jvpp.ikev2.dto.Ikev2SetLocalKey; +import io.fd.jvpp.ikev2.dto.Ikev2SetLocalKeyReply; +import io.fd.jvpp.ikev2.future.FutureJVppIkev2Facade; import org.junit.Test; import org.mockito.Mock; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.ipsec.rev181213.IpsecIkeGlobalConfAugmentation; diff --git a/ipsec/ipsec-impl/src/test/java/io/fd/hc2vpp/ipsec/write/Ikev2PolicyCustomizerTest.java b/ipsec/ipsec-impl/src/test/java/io/fd/hc2vpp/ipsec/write/Ikev2PolicyCustomizerTest.java index b53ab7024..cbab036c6 100644 --- a/ipsec/ipsec-impl/src/test/java/io/fd/hc2vpp/ipsec/write/Ikev2PolicyCustomizerTest.java +++ b/ipsec/ipsec-impl/src/test/java/io/fd/hc2vpp/ipsec/write/Ikev2PolicyCustomizerTest.java @@ -30,13 +30,13 @@ import io.fd.hc2vpp.ipsec.helpers.SchemaContextTestHelper; 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.ikev2.dto.Ikev2ProfileAddDel; -import io.fd.vpp.jvpp.ikev2.dto.Ikev2ProfileAddDelReply; -import io.fd.vpp.jvpp.ikev2.dto.Ikev2ProfileSetAuth; -import io.fd.vpp.jvpp.ikev2.dto.Ikev2ProfileSetAuthReply; -import io.fd.vpp.jvpp.ikev2.dto.Ikev2ProfileSetTs; -import io.fd.vpp.jvpp.ikev2.dto.Ikev2ProfileSetTsReply; -import io.fd.vpp.jvpp.ikev2.future.FutureJVppIkev2Facade; +import io.fd.jvpp.ikev2.dto.Ikev2ProfileAddDel; +import io.fd.jvpp.ikev2.dto.Ikev2ProfileAddDelReply; +import io.fd.jvpp.ikev2.dto.Ikev2ProfileSetAuth; +import io.fd.jvpp.ikev2.dto.Ikev2ProfileSetAuthReply; +import io.fd.jvpp.ikev2.dto.Ikev2ProfileSetTs; +import io.fd.jvpp.ikev2.dto.Ikev2ProfileSetTsReply; +import io.fd.jvpp.ikev2.future.FutureJVppIkev2Facade; import java.nio.ByteBuffer; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/ipsec/ipsec-impl/src/test/java/io/fd/hc2vpp/ipsec/write/Ikev2PolicyIdentityCustomizerTest.java b/ipsec/ipsec-impl/src/test/java/io/fd/hc2vpp/ipsec/write/Ikev2PolicyIdentityCustomizerTest.java index 2a62b9494..312d3d7bf 100644 --- a/ipsec/ipsec-impl/src/test/java/io/fd/hc2vpp/ipsec/write/Ikev2PolicyIdentityCustomizerTest.java +++ b/ipsec/ipsec-impl/src/test/java/io/fd/hc2vpp/ipsec/write/Ikev2PolicyIdentityCustomizerTest.java @@ -28,9 +28,9 @@ import io.fd.hc2vpp.ipsec.helpers.SchemaContextTestHelper; 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.ikev2.dto.Ikev2ProfileSetId; -import io.fd.vpp.jvpp.ikev2.dto.Ikev2ProfileSetIdReply; -import io.fd.vpp.jvpp.ikev2.future.FutureJVppIkev2Facade; +import io.fd.jvpp.ikev2.dto.Ikev2ProfileSetId; +import io.fd.jvpp.ikev2.dto.Ikev2ProfileSetIdReply; +import io.fd.jvpp.ikev2.future.FutureJVppIkev2Facade; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; diff --git a/ipsec/ipsec-impl/src/test/java/io/fd/hc2vpp/ipsec/write/IpsecSadEntryCustomizerTest.java b/ipsec/ipsec-impl/src/test/java/io/fd/hc2vpp/ipsec/write/IpsecSadEntryCustomizerTest.java index 9f1ef23aa..42840a0cf 100644 --- a/ipsec/ipsec-impl/src/test/java/io/fd/hc2vpp/ipsec/write/IpsecSadEntryCustomizerTest.java +++ b/ipsec/ipsec-impl/src/test/java/io/fd/hc2vpp/ipsec/write/IpsecSadEntryCustomizerTest.java @@ -30,14 +30,14 @@ import io.fd.hc2vpp.ipsec.helpers.SchemaContextTestHelper; 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.core.dto.IpsecSadEntryAddDel; -import io.fd.vpp.jvpp.core.dto.IpsecSadEntryAddDelReply; -import io.fd.vpp.jvpp.core.types.IpsecCryptoAlg; -import io.fd.vpp.jvpp.core.types.IpsecIntegAlg; -import io.fd.vpp.jvpp.core.types.IpsecProto; -import io.fd.vpp.jvpp.core.types.IpsecSadEntry; -import io.fd.vpp.jvpp.core.types.IpsecSadFlags; -import io.fd.vpp.jvpp.core.types.Key; +import io.fd.jvpp.core.dto.IpsecSadEntryAddDel; +import io.fd.jvpp.core.dto.IpsecSadEntryAddDelReply; +import io.fd.jvpp.core.types.IpsecCryptoAlg; +import io.fd.jvpp.core.types.IpsecIntegAlg; +import io.fd.jvpp.core.types.IpsecProto; +import io.fd.jvpp.core.types.IpsecSadEntry; +import io.fd.jvpp.core.types.IpsecSadFlags; +import io.fd.jvpp.core.types.Key; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -118,7 +118,7 @@ public class IpsecSadEntryCustomizerTest extends WriterCustomizerTest implements final SadEntries data = sad.getSadEntries().get(0); final IpsecSadEntryAddDel request = new IpsecSadEntryAddDel(); request.isAdd = BYTE_TRUE; - request.entry = new io.fd.vpp.jvpp.core.types.IpsecSadEntry(); + request.entry = new io.fd.jvpp.core.types.IpsecSadEntry(); request.entry.spi = SPI_1002; request.entry.sadId = SAD_ID; request.entry.integrityKey = new Key(); diff --git a/ipsec/ipsec-impl/src/test/java/io/fd/hc2vpp/ipsec/write/IpsecSpdCustomizerTest.java b/ipsec/ipsec-impl/src/test/java/io/fd/hc2vpp/ipsec/write/IpsecSpdCustomizerTest.java index da9b7425b..d531d6248 100644 --- a/ipsec/ipsec-impl/src/test/java/io/fd/hc2vpp/ipsec/write/IpsecSpdCustomizerTest.java +++ b/ipsec/ipsec-impl/src/test/java/io/fd/hc2vpp/ipsec/write/IpsecSpdCustomizerTest.java @@ -28,12 +28,12 @@ import io.fd.hc2vpp.ipsec.helpers.SchemaContextTestHelper; 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.core.dto.IpsecSpdAddDel; -import io.fd.vpp.jvpp.core.dto.IpsecSpdAddDelReply; -import io.fd.vpp.jvpp.core.dto.IpsecSpdEntryAddDel; -import io.fd.vpp.jvpp.core.dto.IpsecSpdEntryAddDelReply; -import io.fd.vpp.jvpp.core.types.IpsecSpdAction; -import io.fd.vpp.jvpp.core.types.IpsecSpdEntry; +import io.fd.jvpp.core.dto.IpsecSpdAddDel; +import io.fd.jvpp.core.dto.IpsecSpdAddDelReply; +import io.fd.jvpp.core.dto.IpsecSpdEntryAddDel; +import io.fd.jvpp.core.dto.IpsecSpdEntryAddDelReply; +import io.fd.jvpp.core.types.IpsecSpdAction; +import io.fd.jvpp.core.types.IpsecSpdEntry; import java.util.Collections; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/it/api-coverage/src/test/java/io/fd/hc2vpp/it/JVppCoverageTest.java b/it/api-coverage/src/test/java/io/fd/hc2vpp/it/JVppCoverageTest.java index ebe1123a8..c8808d2a2 100644 --- a/it/api-coverage/src/test/java/io/fd/hc2vpp/it/JVppCoverageTest.java +++ b/it/api-coverage/src/test/java/io/fd/hc2vpp/it/JVppCoverageTest.java @@ -16,14 +16,14 @@ package io.fd.hc2vpp.it; -import io.fd.vpp.jvpp.acl.JVppAcl; -import io.fd.vpp.jvpp.core.JVppCore; -import io.fd.vpp.jvpp.gtpu.JVppGtpu; -import io.fd.vpp.jvpp.ioamexport.JVppIoamexport; -import io.fd.vpp.jvpp.ioampot.JVppIoampot; -import io.fd.vpp.jvpp.ioamtrace.JVppIoamtrace; -import io.fd.vpp.jvpp.nat.JVppNat; -import io.fd.vpp.jvpp.pppoe.JVppPppoe; +import io.fd.jvpp.acl.JVppAcl; +import io.fd.jvpp.core.JVppCore; +import io.fd.jvpp.gtpu.JVppGtpu; +import io.fd.jvpp.ioamexport.JVppIoamexport; +import io.fd.jvpp.ioampot.JVppIoampot; +import io.fd.jvpp.ioamtrace.JVppIoamtrace; +import io.fd.jvpp.nat.JVppNat; +import io.fd.jvpp.pppoe.JVppPppoe; import java.io.IOException; import java.lang.reflect.Method; import java.util.Scanner; diff --git a/it/jvpp-benchmark/src/main/java/io/fd/hc2vpp/it/jvpp/benchmark/acl/AclProvider.java b/it/jvpp-benchmark/src/main/java/io/fd/hc2vpp/it/jvpp/benchmark/acl/AclProvider.java index f3459916e..3a454f809 100644 --- a/it/jvpp-benchmark/src/main/java/io/fd/hc2vpp/it/jvpp/benchmark/acl/AclProvider.java +++ b/it/jvpp-benchmark/src/main/java/io/fd/hc2vpp/it/jvpp/benchmark/acl/AclProvider.java @@ -16,7 +16,7 @@ package io.fd.hc2vpp.it.jvpp.benchmark.acl; -import io.fd.vpp.jvpp.acl.dto.AclAddReplace; +import io.fd.jvpp.acl.dto.AclAddReplace; /** * Provides ACLs for JVpp Benchmark. diff --git a/it/jvpp-benchmark/src/main/java/io/fd/hc2vpp/it/jvpp/benchmark/acl/AclProviderImpl.java b/it/jvpp-benchmark/src/main/java/io/fd/hc2vpp/it/jvpp/benchmark/acl/AclProviderImpl.java index ca0ddbb8f..35dcabfd8 100644 --- a/it/jvpp-benchmark/src/main/java/io/fd/hc2vpp/it/jvpp/benchmark/acl/AclProviderImpl.java +++ b/it/jvpp-benchmark/src/main/java/io/fd/hc2vpp/it/jvpp/benchmark/acl/AclProviderImpl.java @@ -16,8 +16,8 @@ package io.fd.hc2vpp.it.jvpp.benchmark.acl; -import io.fd.vpp.jvpp.acl.dto.AclAddReplace; -import io.fd.vpp.jvpp.acl.types.AclRule; +import io.fd.jvpp.acl.dto.AclAddReplace; +import io.fd.jvpp.acl.types.AclRule; import javax.annotation.concurrent.NotThreadSafe; @NotThreadSafe diff --git a/it/jvpp-benchmark/src/main/java/io/fd/hc2vpp/it/jvpp/benchmark/acl/AclUpdateBenchmark.java b/it/jvpp-benchmark/src/main/java/io/fd/hc2vpp/it/jvpp/benchmark/acl/AclUpdateBenchmark.java index b1f598253..1735355c4 100644 --- a/it/jvpp-benchmark/src/main/java/io/fd/hc2vpp/it/jvpp/benchmark/acl/AclUpdateBenchmark.java +++ b/it/jvpp-benchmark/src/main/java/io/fd/hc2vpp/it/jvpp/benchmark/acl/AclUpdateBenchmark.java @@ -20,18 +20,18 @@ import static io.fd.hc2vpp.it.jvpp.benchmark.acl.AclUpdateBenchmark.InterfaceMod import static io.fd.hc2vpp.it.jvpp.benchmark.acl.AclUpdateBenchmark.InterfaceMode.L3; import io.fd.hc2vpp.it.jvpp.benchmark.util.JVppBenchmark; -import io.fd.vpp.jvpp.JVppRegistry; -import io.fd.vpp.jvpp.acl.JVppAclImpl; -import io.fd.vpp.jvpp.acl.dto.AclInterfaceSetAclList; -import io.fd.vpp.jvpp.acl.future.FutureJVppAclFacade; -import io.fd.vpp.jvpp.core.JVppCoreImpl; -import io.fd.vpp.jvpp.core.dto.BridgeDomainAddDel; -import io.fd.vpp.jvpp.core.dto.CreateLoopback; -import io.fd.vpp.jvpp.core.dto.CreateLoopbackReply; -import io.fd.vpp.jvpp.core.dto.SwInterfaceAddDelAddress; -import io.fd.vpp.jvpp.core.dto.SwInterfaceSetFlags; -import io.fd.vpp.jvpp.core.dto.SwInterfaceSetL2Bridge; -import io.fd.vpp.jvpp.core.future.FutureJVppCoreFacade; +import io.fd.jvpp.JVppRegistry; +import io.fd.jvpp.acl.JVppAclImpl; +import io.fd.jvpp.acl.dto.AclInterfaceSetAclList; +import io.fd.jvpp.acl.future.FutureJVppAclFacade; +import io.fd.jvpp.core.JVppCoreImpl; +import io.fd.jvpp.core.dto.BridgeDomainAddDel; +import io.fd.jvpp.core.dto.CreateLoopback; +import io.fd.jvpp.core.dto.CreateLoopbackReply; +import io.fd.jvpp.core.dto.SwInterfaceAddDelAddress; +import io.fd.jvpp.core.dto.SwInterfaceSetFlags; +import io.fd.jvpp.core.dto.SwInterfaceSetL2Bridge; +import io.fd.jvpp.core.future.FutureJVppCoreFacade; import java.io.IOException; import java.util.concurrent.ExecutionException; import org.openjdk.jmh.annotations.Benchmark; diff --git a/it/jvpp-benchmark/src/main/java/io/fd/hc2vpp/it/jvpp/benchmark/classify/ClassifyTableBenchmark.java b/it/jvpp-benchmark/src/main/java/io/fd/hc2vpp/it/jvpp/benchmark/classify/ClassifyTableBenchmark.java index c37fa0765..f9fcc829b 100644 --- a/it/jvpp-benchmark/src/main/java/io/fd/hc2vpp/it/jvpp/benchmark/classify/ClassifyTableBenchmark.java +++ b/it/jvpp-benchmark/src/main/java/io/fd/hc2vpp/it/jvpp/benchmark/classify/ClassifyTableBenchmark.java @@ -17,10 +17,10 @@ package io.fd.hc2vpp.it.jvpp.benchmark.classify; import io.fd.hc2vpp.it.jvpp.benchmark.util.JVppBenchmark; -import io.fd.vpp.jvpp.JVppRegistry; -import io.fd.vpp.jvpp.core.JVppCoreImpl; -import io.fd.vpp.jvpp.core.dto.ClassifyAddDelTableReply; -import io.fd.vpp.jvpp.core.future.FutureJVppCoreFacade; +import io.fd.jvpp.JVppRegistry; +import io.fd.jvpp.core.JVppCoreImpl; +import io.fd.jvpp.core.dto.ClassifyAddDelTableReply; +import io.fd.jvpp.core.future.FutureJVppCoreFacade; import java.io.IOException; import java.util.concurrent.ExecutionException; import org.openjdk.jmh.annotations.Benchmark; diff --git a/it/jvpp-benchmark/src/main/java/io/fd/hc2vpp/it/jvpp/benchmark/classify/ClassifyTableProvider.java b/it/jvpp-benchmark/src/main/java/io/fd/hc2vpp/it/jvpp/benchmark/classify/ClassifyTableProvider.java index e23ecc6a1..1066c26ab 100644 --- a/it/jvpp-benchmark/src/main/java/io/fd/hc2vpp/it/jvpp/benchmark/classify/ClassifyTableProvider.java +++ b/it/jvpp-benchmark/src/main/java/io/fd/hc2vpp/it/jvpp/benchmark/classify/ClassifyTableProvider.java @@ -16,7 +16,7 @@ package io.fd.hc2vpp.it.jvpp.benchmark.classify; -import io.fd.vpp.jvpp.core.dto.ClassifyAddDelTable; +import io.fd.jvpp.core.dto.ClassifyAddDelTable; interface ClassifyTableProvider { ClassifyAddDelTable next(); diff --git a/it/jvpp-benchmark/src/main/java/io/fd/hc2vpp/it/jvpp/benchmark/classify/ClassifyTableProviderImpl.java b/it/jvpp-benchmark/src/main/java/io/fd/hc2vpp/it/jvpp/benchmark/classify/ClassifyTableProviderImpl.java index 8a737d216..15099371a 100644 --- a/it/jvpp-benchmark/src/main/java/io/fd/hc2vpp/it/jvpp/benchmark/classify/ClassifyTableProviderImpl.java +++ b/it/jvpp-benchmark/src/main/java/io/fd/hc2vpp/it/jvpp/benchmark/classify/ClassifyTableProviderImpl.java @@ -16,7 +16,7 @@ package io.fd.hc2vpp.it.jvpp.benchmark.classify; -import io.fd.vpp.jvpp.core.dto.ClassifyAddDelTable; +import io.fd.jvpp.core.dto.ClassifyAddDelTable; import java.util.Random; import javax.annotation.concurrent.NotThreadSafe; diff --git a/it/jvpp-benchmark/src/main/java/io/fd/hc2vpp/it/jvpp/benchmark/util/JVppBenchmark.java b/it/jvpp-benchmark/src/main/java/io/fd/hc2vpp/it/jvpp/benchmark/util/JVppBenchmark.java index 761ee98d0..a2f5ce171 100644 --- a/it/jvpp-benchmark/src/main/java/io/fd/hc2vpp/it/jvpp/benchmark/util/JVppBenchmark.java +++ b/it/jvpp-benchmark/src/main/java/io/fd/hc2vpp/it/jvpp/benchmark/util/JVppBenchmark.java @@ -17,9 +17,9 @@ package io.fd.hc2vpp.it.jvpp.benchmark.util; import com.google.common.io.CharStreams; -import io.fd.vpp.jvpp.JVppRegistry; -import io.fd.vpp.jvpp.JVppRegistryImpl; -import io.fd.vpp.jvpp.dto.JVppReply; +import io.fd.jvpp.JVppRegistry; +import io.fd.jvpp.JVppRegistryImpl; +import io.fd.jvpp.dto.JVppReply; import java.io.IOException; import java.io.InputStreamReader; import java.nio.charset.StandardCharsets; diff --git a/it/jvpp-benchmark/src/test/java/io/fd/hc2vpp/it/jvpp/benchmark/acl/AclProviderImplTest.java b/it/jvpp-benchmark/src/test/java/io/fd/hc2vpp/it/jvpp/benchmark/acl/AclProviderImplTest.java index d54d178e1..505c053ba 100644 --- a/it/jvpp-benchmark/src/test/java/io/fd/hc2vpp/it/jvpp/benchmark/acl/AclProviderImplTest.java +++ b/it/jvpp-benchmark/src/test/java/io/fd/hc2vpp/it/jvpp/benchmark/acl/AclProviderImplTest.java @@ -20,7 +20,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotEquals; -import io.fd.vpp.jvpp.acl.dto.AclAddReplace; +import io.fd.jvpp.acl.dto.AclAddReplace; import java.util.Arrays; import org.junit.Test; diff --git a/it/jvpp-benchmark/src/test/java/io/fd/hc2vpp/it/jvpp/benchmark/classify/ClassifyTableProviderImplTest.java b/it/jvpp-benchmark/src/test/java/io/fd/hc2vpp/it/jvpp/benchmark/classify/ClassifyTableProviderImplTest.java index 8f11077e0..042a635d1 100644 --- a/it/jvpp-benchmark/src/test/java/io/fd/hc2vpp/it/jvpp/benchmark/classify/ClassifyTableProviderImplTest.java +++ b/it/jvpp-benchmark/src/test/java/io/fd/hc2vpp/it/jvpp/benchmark/classify/ClassifyTableProviderImplTest.java @@ -16,10 +16,10 @@ package io.fd.hc2vpp.it.jvpp.benchmark.classify; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; -import io.fd.vpp.jvpp.acl.dto.AclAddReplace; -import io.fd.vpp.jvpp.core.dto.ClassifyAddDelTable; +import io.fd.jvpp.core.dto.ClassifyAddDelTable; import org.junit.Test; public class ClassifyTableProviderImplTest { diff --git a/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/factory/Ipv4StateReaderFactory.java b/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/factory/Ipv4StateReaderFactory.java index 7495baa8f..799f4a5d9 100644 --- a/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/factory/Ipv4StateReaderFactory.java +++ b/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/factory/Ipv4StateReaderFactory.java @@ -28,7 +28,7 @@ import io.fd.honeycomb.translate.impl.read.GenericListReader; import io.fd.honeycomb.translate.impl.read.GenericReader; import io.fd.honeycomb.translate.read.ReaderFactory; import io.fd.honeycomb.translate.read.registry.ModifiableReaderRegistryBuilder; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.InterfacesState; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.Interface; diff --git a/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/factory/Ipv6StateReaderFactory.java b/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/factory/Ipv6StateReaderFactory.java index b114ace30..36f048f53 100644 --- a/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/factory/Ipv6StateReaderFactory.java +++ b/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/factory/Ipv6StateReaderFactory.java @@ -28,7 +28,7 @@ import io.fd.honeycomb.translate.impl.read.GenericListReader; import io.fd.honeycomb.translate.impl.read.GenericReader; import io.fd.honeycomb.translate.read.ReaderFactory; import io.fd.honeycomb.translate.read.registry.ModifiableReaderRegistryBuilder; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.nd.proxy.rev170315.NdProxyIp6StateAugmentation; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.nd.proxy.rev170315.NdProxyIp6StateAugmentationBuilder; diff --git a/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/factory/SubInterfaceStateIpv4ReaderFactory.java b/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/factory/SubInterfaceStateIpv4ReaderFactory.java index 900bf22b5..fcb0be888 100644 --- a/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/factory/SubInterfaceStateIpv4ReaderFactory.java +++ b/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/factory/SubInterfaceStateIpv4ReaderFactory.java @@ -25,7 +25,7 @@ import io.fd.honeycomb.translate.impl.read.GenericInitListReader; import io.fd.honeycomb.translate.impl.read.GenericListReader; import io.fd.honeycomb.translate.read.ReaderFactory; import io.fd.honeycomb.translate.read.registry.ModifiableReaderRegistryBuilder; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.vlan.rev180319.SubinterfaceStateAugmentation; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.vlan.rev180319.interfaces.state._interface.SubInterfaces; diff --git a/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/factory/SubInterfaceStateIpv6ReaderFactory.java b/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/factory/SubInterfaceStateIpv6ReaderFactory.java index a8f50c01b..615590a85 100644 --- a/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/factory/SubInterfaceStateIpv6ReaderFactory.java +++ b/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/factory/SubInterfaceStateIpv6ReaderFactory.java @@ -26,7 +26,7 @@ import io.fd.honeycomb.translate.impl.read.GenericInitListReader; import io.fd.honeycomb.translate.impl.read.GenericListReader; import io.fd.honeycomb.translate.read.ReaderFactory; import io.fd.honeycomb.translate.read.registry.ModifiableReaderRegistryBuilder; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.vlan.rev180319.SubinterfaceStateAugmentation; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.vlan.rev180319.interfaces.state._interface.SubInterfaces; diff --git a/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/ipv4/Ipv4AddressCustomizer.java b/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/ipv4/Ipv4AddressCustomizer.java index 335f9ed9a..e8742e703 100644 --- a/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/ipv4/Ipv4AddressCustomizer.java +++ b/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/ipv4/Ipv4AddressCustomizer.java @@ -28,9 +28,9 @@ import io.fd.honeycomb.translate.spi.read.Initialized; import io.fd.honeycomb.translate.spi.read.InitializingListReaderCustomizer; import io.fd.honeycomb.translate.util.RWUtils; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager.DumpCacheManagerBuilder; -import io.fd.vpp.jvpp.core.dto.IpAddressDetails; -import io.fd.vpp.jvpp.core.dto.IpAddressDetailsReplyDump; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.IpAddressDetails; +import io.fd.jvpp.core.dto.IpAddressDetailsReplyDump; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.List; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.Interface; diff --git a/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/ipv4/Ipv4Customizer.java b/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/ipv4/Ipv4Customizer.java index 28a2aabdb..99a018054 100644 --- a/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/ipv4/Ipv4Customizer.java +++ b/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/ipv4/Ipv4Customizer.java @@ -20,7 +20,7 @@ import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer; import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.Interface2Builder; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces.state._interface.Ipv4; diff --git a/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/ipv4/Ipv4NeighbourCustomizer.java b/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/ipv4/Ipv4NeighbourCustomizer.java index e6f5e17b1..610304fee 100644 --- a/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/ipv4/Ipv4NeighbourCustomizer.java +++ b/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/ipv4/Ipv4NeighbourCustomizer.java @@ -27,10 +27,10 @@ import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.ListReaderCustomizer; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager.DumpCacheManagerBuilder; -import io.fd.vpp.jvpp.core.dto.IpNeighborDetails; -import io.fd.vpp.jvpp.core.dto.IpNeighborDetailsReplyDump; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; -import io.fd.vpp.jvpp.core.types.IpNeighborFlags; +import io.fd.jvpp.core.dto.IpNeighborDetails; +import io.fd.jvpp.core.dto.IpNeighborDetailsReplyDump; +import io.fd.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.types.IpNeighborFlags; import java.util.List; import java.util.function.Function; import javax.annotation.Nonnull; diff --git a/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/ipv4/subinterface/SubInterfaceIpv4AddressCustomizer.java b/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/ipv4/subinterface/SubInterfaceIpv4AddressCustomizer.java index f2f11f834..ccb29286b 100644 --- a/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/ipv4/subinterface/SubInterfaceIpv4AddressCustomizer.java +++ b/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/ipv4/subinterface/SubInterfaceIpv4AddressCustomizer.java @@ -28,9 +28,9 @@ import io.fd.honeycomb.translate.spi.read.Initialized; import io.fd.honeycomb.translate.spi.read.InitializingListReaderCustomizer; import io.fd.honeycomb.translate.util.RWUtils; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; -import io.fd.vpp.jvpp.core.dto.IpAddressDetails; -import io.fd.vpp.jvpp.core.dto.IpAddressDetailsReplyDump; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.IpAddressDetails; +import io.fd.jvpp.core.dto.IpAddressDetailsReplyDump; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.List; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.vlan.rev180319.interfaces.state._interface.sub.interfaces.SubInterface; diff --git a/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/ipv4/subinterface/SubInterfaceIpv4NeighbourCustomizer.java b/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/ipv4/subinterface/SubInterfaceIpv4NeighbourCustomizer.java index c1c2f8559..87ebd19c0 100644 --- a/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/ipv4/subinterface/SubInterfaceIpv4NeighbourCustomizer.java +++ b/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/ipv4/subinterface/SubInterfaceIpv4NeighbourCustomizer.java @@ -24,9 +24,9 @@ import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.ListReaderCustomizer; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager.DumpCacheManagerBuilder; -import io.fd.vpp.jvpp.core.dto.IpNeighborDetails; -import io.fd.vpp.jvpp.core.dto.IpNeighborDetailsReplyDump; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.IpNeighborDetails; +import io.fd.jvpp.core.dto.IpNeighborDetailsReplyDump; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.List; import java.util.function.Function; import javax.annotation.Nonnull; diff --git a/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/ipv6/Ipv6AddressCustomizer.java b/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/ipv6/Ipv6AddressCustomizer.java index 154ebcc76..b901698b2 100644 --- a/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/ipv6/Ipv6AddressCustomizer.java +++ b/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/ipv6/Ipv6AddressCustomizer.java @@ -28,9 +28,9 @@ import io.fd.honeycomb.translate.spi.read.Initialized; import io.fd.honeycomb.translate.spi.read.InitializingListReaderCustomizer; import io.fd.honeycomb.translate.util.RWUtils; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager.DumpCacheManagerBuilder; -import io.fd.vpp.jvpp.core.dto.IpAddressDetails; -import io.fd.vpp.jvpp.core.dto.IpAddressDetailsReplyDump; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.IpAddressDetails; +import io.fd.jvpp.core.dto.IpAddressDetailsReplyDump; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.List; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.Interface; diff --git a/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/ipv6/Ipv6Customizer.java b/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/ipv6/Ipv6Customizer.java index 5e0730b38..95daed566 100644 --- a/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/ipv6/Ipv6Customizer.java +++ b/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/ipv6/Ipv6Customizer.java @@ -20,7 +20,7 @@ import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer; import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.Interface2Builder; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces.state._interface.Ipv6; diff --git a/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/ipv6/Ipv6NeighbourCustomizer.java b/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/ipv6/Ipv6NeighbourCustomizer.java index 54eccce63..9cab95795 100644 --- a/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/ipv6/Ipv6NeighbourCustomizer.java +++ b/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/ipv6/Ipv6NeighbourCustomizer.java @@ -28,10 +28,10 @@ import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.ListReaderCustomizer; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; -import io.fd.vpp.jvpp.core.dto.IpNeighborDetails; -import io.fd.vpp.jvpp.core.dto.IpNeighborDetailsReplyDump; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; -import io.fd.vpp.jvpp.core.types.IpNeighborFlags; +import io.fd.jvpp.core.dto.IpNeighborDetails; +import io.fd.jvpp.core.dto.IpNeighborDetailsReplyDump; +import io.fd.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.types.IpNeighborFlags; import java.util.List; import java.util.function.Function; import javax.annotation.Nonnull; diff --git a/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/ipv6/nd/NdProxyCustomizer.java b/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/ipv6/nd/NdProxyCustomizer.java index 93e6275b9..e1c417d6e 100644 --- a/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/ipv6/nd/NdProxyCustomizer.java +++ b/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/ipv6/nd/NdProxyCustomizer.java @@ -31,9 +31,9 @@ import io.fd.honeycomb.translate.spi.read.Initialized; import io.fd.honeycomb.translate.spi.read.InitializingListReaderCustomizer; import io.fd.honeycomb.translate.util.RWUtils; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; -import io.fd.vpp.jvpp.core.dto.Ip6NdProxyDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.Ip6NdProxyDump; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.Ip6NdProxyDetailsReplyDump; +import io.fd.jvpp.core.dto.Ip6NdProxyDump; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.Collections; import java.util.List; import java.util.stream.Collectors; diff --git a/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/ipv6/subinterface/SubInterfaceIpv6AddressCustomizer.java b/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/ipv6/subinterface/SubInterfaceIpv6AddressCustomizer.java index e3768eb74..bff668eee 100644 --- a/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/ipv6/subinterface/SubInterfaceIpv6AddressCustomizer.java +++ b/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/ipv6/subinterface/SubInterfaceIpv6AddressCustomizer.java @@ -29,9 +29,9 @@ import io.fd.honeycomb.translate.spi.read.Initialized; import io.fd.honeycomb.translate.spi.read.InitializingListReaderCustomizer; import io.fd.honeycomb.translate.util.RWUtils; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; -import io.fd.vpp.jvpp.core.dto.IpAddressDetails; -import io.fd.vpp.jvpp.core.dto.IpAddressDetailsReplyDump; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.IpAddressDetails; +import io.fd.jvpp.core.dto.IpAddressDetailsReplyDump; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.List; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.vlan.rev180319.interfaces.state._interface.sub.interfaces.SubInterface; diff --git a/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/ipv6/subinterface/SubInterfaceIpv6NeighbourCustomizer.java b/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/ipv6/subinterface/SubInterfaceIpv6NeighbourCustomizer.java index 1227abc03..481b9b84d 100644 --- a/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/ipv6/subinterface/SubInterfaceIpv6NeighbourCustomizer.java +++ b/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/ipv6/subinterface/SubInterfaceIpv6NeighbourCustomizer.java @@ -24,9 +24,9 @@ import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.ListReaderCustomizer; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager.DumpCacheManagerBuilder; -import io.fd.vpp.jvpp.core.dto.IpNeighborDetails; -import io.fd.vpp.jvpp.core.dto.IpNeighborDetailsReplyDump; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.IpNeighborDetails; +import io.fd.jvpp.core.dto.IpNeighborDetailsReplyDump; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.List; import java.util.function.Function; import javax.annotation.Nonnull; diff --git a/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/factory/Ipv4WriterFactory.java b/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/factory/Ipv4WriterFactory.java index cf256274f..536dab3f6 100644 --- a/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/factory/Ipv4WriterFactory.java +++ b/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/factory/Ipv4WriterFactory.java @@ -30,7 +30,7 @@ import io.fd.honeycomb.translate.impl.write.GenericListWriter; import io.fd.honeycomb.translate.impl.write.GenericWriter; import io.fd.honeycomb.translate.write.WriterFactory; import io.fd.honeycomb.translate.write.registry.ModifiableWriterRegistryBuilder; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190128.interfaces._interface.Routing; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.Interface1; diff --git a/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/factory/Ipv6WriterFactory.java b/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/factory/Ipv6WriterFactory.java index ffd1e7269..ad1a42cdf 100644 --- a/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/factory/Ipv6WriterFactory.java +++ b/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/factory/Ipv6WriterFactory.java @@ -31,7 +31,7 @@ import io.fd.honeycomb.translate.impl.write.GenericListWriter; import io.fd.honeycomb.translate.impl.write.GenericWriter; import io.fd.honeycomb.translate.write.WriterFactory; import io.fd.honeycomb.translate.write.registry.ModifiableWriterRegistryBuilder; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.nd.proxy.rev170315.NdProxyIp6Augmentation; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.nd.proxy.rev170315.interfaces._interface.ipv6.NdProxies; diff --git a/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/factory/ProxyArpWriterFactory.java b/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/factory/ProxyArpWriterFactory.java index 9182c873c..22109c3d4 100644 --- a/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/factory/ProxyArpWriterFactory.java +++ b/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/factory/ProxyArpWriterFactory.java @@ -26,7 +26,7 @@ import io.fd.honeycomb.translate.impl.write.GenericListWriter; import io.fd.honeycomb.translate.impl.write.GenericWriter; import io.fd.honeycomb.translate.write.WriterFactory; import io.fd.honeycomb.translate.write.registry.ModifiableWriterRegistryBuilder; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.proxy.arp.rev180703.ProxyArpInterfaceAugmentation; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.proxy.arp.rev180703.ProxyRanges; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.proxy.arp.rev180703.interfaces._interface.ProxyArp; diff --git a/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/factory/SubInterfaceIpv4WriterFactory.java b/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/factory/SubInterfaceIpv4WriterFactory.java index eb4a8c3d1..f5d7dc553 100644 --- a/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/factory/SubInterfaceIpv4WriterFactory.java +++ b/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/factory/SubInterfaceIpv4WriterFactory.java @@ -29,7 +29,7 @@ import io.fd.hc2vpp.l3.write.ipv4.subinterface.SubInterfaceIpv4NeighbourCustomiz import io.fd.honeycomb.translate.impl.write.GenericListWriter; import io.fd.honeycomb.translate.write.WriterFactory; import io.fd.honeycomb.translate.write.registry.ModifiableWriterRegistryBuilder; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.vlan.rev180319.rewrite.attributes.Rewrite; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.vlan.rev180319.sub._interface.ip4.attributes.Ipv4; diff --git a/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/factory/SubInterfaceIpv6WriterFactory.java b/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/factory/SubInterfaceIpv6WriterFactory.java index 575d50f68..4e1c6792e 100644 --- a/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/factory/SubInterfaceIpv6WriterFactory.java +++ b/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/factory/SubInterfaceIpv6WriterFactory.java @@ -29,7 +29,7 @@ import io.fd.hc2vpp.l3.write.ipv6.subinterface.SubInterfaceIpv6NeighbourCustomiz import io.fd.honeycomb.translate.impl.write.GenericListWriter; import io.fd.honeycomb.translate.write.WriterFactory; import io.fd.honeycomb.translate.write.registry.ModifiableWriterRegistryBuilder; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.vlan.rev180319.rewrite.attributes.Rewrite; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.vlan.rev180319.sub._interface.ip6.attributes.Ipv6; diff --git a/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/ipv4/Ipv4AddressCustomizer.java b/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/ipv4/Ipv4AddressCustomizer.java index e7477361f..c3d5871e2 100644 --- a/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/ipv4/Ipv4AddressCustomizer.java +++ b/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/ipv4/Ipv4AddressCustomizer.java @@ -24,7 +24,7 @@ import io.fd.hc2vpp.l3.utils.ip.write.IpWriter; import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces._interface.ipv4.Address; diff --git a/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/ipv4/Ipv4Customizer.java b/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/ipv4/Ipv4Customizer.java index 6b0859ce8..f6cdf08dd 100644 --- a/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/ipv4/Ipv4Customizer.java +++ b/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/ipv4/Ipv4Customizer.java @@ -19,7 +19,7 @@ package io.fd.hc2vpp.l3.write.ipv4; import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer; import io.fd.honeycomb.translate.spi.write.WriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces._interface.Ipv4; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; diff --git a/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/ipv4/Ipv4NeighbourCustomizer.java b/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/ipv4/Ipv4NeighbourCustomizer.java index d5988fa9c..c3225395c 100644 --- a/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/ipv4/Ipv4NeighbourCustomizer.java +++ b/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/ipv4/Ipv4NeighbourCustomizer.java @@ -25,8 +25,8 @@ import io.fd.hc2vpp.l3.utils.ip.write.IpWriter; import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.IpNeighborAddDel; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.IpNeighborAddDel; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces._interface.Ipv4; diff --git a/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/ipv4/ProxyArpCustomizer.java b/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/ipv4/ProxyArpCustomizer.java index 8d40fd527..ab00df64c 100644 --- a/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/ipv4/ProxyArpCustomizer.java +++ b/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/ipv4/ProxyArpCustomizer.java @@ -22,8 +22,8 @@ import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.spi.write.WriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.ProxyArpIntfcEnableDisable; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.ProxyArpIntfcEnableDisable; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.proxy.arp.rev180703.interfaces._interface.ProxyArp; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface; diff --git a/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/ipv4/ProxyRangeCustomizer.java b/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/ipv4/ProxyRangeCustomizer.java index 461de46c3..fc9039baf 100644 --- a/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/ipv4/ProxyRangeCustomizer.java +++ b/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/ipv4/ProxyRangeCustomizer.java @@ -22,11 +22,11 @@ import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.ProxyArpAddDel; -import io.fd.vpp.jvpp.core.dto.ProxyArpAddDelReply; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; -import io.fd.vpp.jvpp.core.types.Ip4Address; -import io.fd.vpp.jvpp.core.types.ProxyArp; +import io.fd.jvpp.core.dto.ProxyArpAddDel; +import io.fd.jvpp.core.dto.ProxyArpAddDelReply; +import io.fd.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.types.Ip4Address; +import io.fd.jvpp.core.types.ProxyArp; import java.util.concurrent.Future; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.proxy.arp.rev180703.proxy.ranges.ProxyRange; diff --git a/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/ipv4/subinterface/SubInterfaceIpv4AddressCustomizer.java b/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/ipv4/subinterface/SubInterfaceIpv4AddressCustomizer.java index 833e006de..91cd41301 100644 --- a/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/ipv4/subinterface/SubInterfaceIpv4AddressCustomizer.java +++ b/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/ipv4/subinterface/SubInterfaceIpv4AddressCustomizer.java @@ -25,7 +25,7 @@ import io.fd.hc2vpp.v3po.util.SubInterfaceUtils; import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.vlan.rev180319.interfaces._interface.sub.interfaces.SubInterface; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.vlan.rev180319.interfaces._interface.sub.interfaces.SubInterfaceKey; diff --git a/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/ipv4/subinterface/SubInterfaceIpv4NeighbourCustomizer.java b/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/ipv4/subinterface/SubInterfaceIpv4NeighbourCustomizer.java index 89d6dbf51..aa11c4c27 100644 --- a/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/ipv4/subinterface/SubInterfaceIpv4NeighbourCustomizer.java +++ b/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/ipv4/subinterface/SubInterfaceIpv4NeighbourCustomizer.java @@ -25,8 +25,8 @@ import io.fd.hc2vpp.l3.utils.ip.write.IpWriter; import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.IpNeighborAddDel; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.IpNeighborAddDel; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.vlan.rev180319.sub._interface.ip4.attributes.ipv4.Neighbor; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.vlan.rev180319.sub._interface.ip4.attributes.ipv4.NeighborKey; diff --git a/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/ipv6/Ipv6AddressCustomizer.java b/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/ipv6/Ipv6AddressCustomizer.java index 0c66babc4..4dd8d5668 100644 --- a/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/ipv6/Ipv6AddressCustomizer.java +++ b/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/ipv6/Ipv6AddressCustomizer.java @@ -24,7 +24,7 @@ import io.fd.hc2vpp.l3.utils.ip.write.IpWriter; import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces._interface.ipv6.Address; diff --git a/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/ipv6/Ipv6Customizer.java b/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/ipv6/Ipv6Customizer.java index 7a4c427ea..313cbe56f 100644 --- a/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/ipv6/Ipv6Customizer.java +++ b/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/ipv6/Ipv6Customizer.java @@ -19,7 +19,7 @@ package io.fd.hc2vpp.l3.write.ipv6; import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer; import io.fd.honeycomb.translate.spi.write.WriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces._interface.Ipv6; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; diff --git a/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/ipv6/Ipv6NeighbourCustomizer.java b/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/ipv6/Ipv6NeighbourCustomizer.java index f57965778..09376d682 100644 --- a/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/ipv6/Ipv6NeighbourCustomizer.java +++ b/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/ipv6/Ipv6NeighbourCustomizer.java @@ -30,9 +30,9 @@ import io.fd.honeycomb.translate.MappingContext; import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.IpNeighborAddDel; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; -import io.fd.vpp.jvpp.core.types.IpNeighborFlags; +import io.fd.jvpp.core.dto.IpNeighborAddDel; +import io.fd.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.types.IpNeighborFlags; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces._interface.ipv6.Neighbor; diff --git a/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/ipv6/nd/NdProxyCustomizer.java b/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/ipv6/nd/NdProxyCustomizer.java index 23556a468..545c75c8f 100644 --- a/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/ipv6/nd/NdProxyCustomizer.java +++ b/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/ipv6/nd/NdProxyCustomizer.java @@ -25,9 +25,9 @@ import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.Ip6NdProxyAddDel; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; -import io.fd.vpp.jvpp.core.types.Ip6Address; +import io.fd.jvpp.core.dto.Ip6NdProxyAddDel; +import io.fd.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.types.Ip6Address; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.nd.proxy.rev170315.interfaces._interface.ipv6.nd.proxies.NdProxy; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.nd.proxy.rev170315.interfaces._interface.ipv6.nd.proxies.NdProxyKey; diff --git a/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/ipv6/subinterface/SubInterfaceIpv6AddressCustomizer.java b/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/ipv6/subinterface/SubInterfaceIpv6AddressCustomizer.java index c2f5d8639..3ae30f543 100644 --- a/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/ipv6/subinterface/SubInterfaceIpv6AddressCustomizer.java +++ b/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/ipv6/subinterface/SubInterfaceIpv6AddressCustomizer.java @@ -25,7 +25,7 @@ import io.fd.hc2vpp.l3.utils.ip.write.IpWriter; import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.vlan.rev180319.sub._interface.ip6.attributes.ipv6.Address; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.vlan.rev180319.sub._interface.ip6.attributes.ipv6.AddressKey; diff --git a/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/ipv6/subinterface/SubInterfaceIpv6NeighbourCustomizer.java b/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/ipv6/subinterface/SubInterfaceIpv6NeighbourCustomizer.java index 00e499f92..7c62980c5 100644 --- a/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/ipv6/subinterface/SubInterfaceIpv6NeighbourCustomizer.java +++ b/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/ipv6/subinterface/SubInterfaceIpv6NeighbourCustomizer.java @@ -25,8 +25,8 @@ import io.fd.hc2vpp.l3.utils.ip.write.IpWriter; import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.IpNeighborAddDel; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.IpNeighborAddDel; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.vlan.rev180319.sub._interface.ip6.attributes.ipv6.Neighbor; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.vlan.rev180319.sub._interface.ip6.attributes.ipv6.NeighborKey; diff --git a/l3/impl/src/test/java/L3ModulesTest.java b/l3/impl/src/test/java/L3ModulesTest.java index d1277ab6a..97c36a443 100644 --- a/l3/impl/src/test/java/L3ModulesTest.java +++ b/l3/impl/src/test/java/L3ModulesTest.java @@ -39,7 +39,7 @@ 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.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.HashSet; import java.util.Set; import org.junit.Before; diff --git a/l3/impl/src/test/java/io/fd/hc2vpp/l3/read/InterfaceChildNodeTest.java b/l3/impl/src/test/java/io/fd/hc2vpp/l3/read/InterfaceChildNodeTest.java index f58422066..1e0eed843 100644 --- a/l3/impl/src/test/java/io/fd/hc2vpp/l3/read/InterfaceChildNodeTest.java +++ b/l3/impl/src/test/java/io/fd/hc2vpp/l3/read/InterfaceChildNodeTest.java @@ -24,21 +24,21 @@ import static org.mockito.Mockito.when; import io.fd.hc2vpp.common.test.util.FutureProducer; import io.fd.hc2vpp.common.test.util.NamingContextHelper; import io.fd.hc2vpp.common.translate.util.NamingContext; -import io.fd.vpp.jvpp.core.dto.IpAddressDetails; -import io.fd.vpp.jvpp.core.dto.IpAddressDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.IpAddressDump; -import io.fd.vpp.jvpp.core.dto.IpNeighborDetails; -import io.fd.vpp.jvpp.core.dto.IpNeighborDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.IpNeighborDump; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; -import io.fd.vpp.jvpp.core.types.Address; -import io.fd.vpp.jvpp.core.types.AddressFamily; -import io.fd.vpp.jvpp.core.types.AddressUnion; -import io.fd.vpp.jvpp.core.types.Ip4Address; -import io.fd.vpp.jvpp.core.types.Ip6Address; -import io.fd.vpp.jvpp.core.types.IpNeighbor; -import io.fd.vpp.jvpp.core.types.IpNeighborFlags; -import io.fd.vpp.jvpp.core.types.MacAddress; +import io.fd.jvpp.core.dto.IpAddressDetails; +import io.fd.jvpp.core.dto.IpAddressDetailsReplyDump; +import io.fd.jvpp.core.dto.IpAddressDump; +import io.fd.jvpp.core.dto.IpNeighborDetails; +import io.fd.jvpp.core.dto.IpNeighborDetailsReplyDump; +import io.fd.jvpp.core.dto.IpNeighborDump; +import io.fd.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.types.Address; +import io.fd.jvpp.core.types.AddressFamily; +import io.fd.jvpp.core.types.AddressUnion; +import io.fd.jvpp.core.types.Ip4Address; +import io.fd.jvpp.core.types.Ip6Address; +import io.fd.jvpp.core.types.IpNeighbor; +import io.fd.jvpp.core.types.IpNeighborFlags; +import io.fd.jvpp.core.types.MacAddress; import java.util.Arrays; import java.util.List; import javax.annotation.Nonnull; diff --git a/l3/impl/src/test/java/io/fd/hc2vpp/l3/read/ipv4/Ipv4AddressCustomizerTest.java b/l3/impl/src/test/java/io/fd/hc2vpp/l3/read/ipv4/Ipv4AddressCustomizerTest.java index d769bd845..bf91576a4 100644 --- a/l3/impl/src/test/java/io/fd/hc2vpp/l3/read/ipv4/Ipv4AddressCustomizerTest.java +++ b/l3/impl/src/test/java/io/fd/hc2vpp/l3/read/ipv4/Ipv4AddressCustomizerTest.java @@ -37,9 +37,9 @@ import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; import io.fd.honeycomb.translate.util.read.cache.CacheKeyFactory; import io.fd.honeycomb.translate.util.read.cache.TypeAwareIdentifierCacheKeyFactory; -import io.fd.vpp.jvpp.core.dto.IpAddressDetails; -import io.fd.vpp.jvpp.core.dto.IpAddressDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.IpAddressDump; +import io.fd.jvpp.core.dto.IpAddressDetails; +import io.fd.jvpp.core.dto.IpAddressDetailsReplyDump; +import io.fd.jvpp.core.dto.IpAddressDump; import java.util.Arrays; import java.util.List; import java.util.concurrent.CompletableFuture; diff --git a/l3/impl/src/test/java/io/fd/hc2vpp/l3/read/ipv4/SubInterfaceIpv4AddressCustomizerTest.java b/l3/impl/src/test/java/io/fd/hc2vpp/l3/read/ipv4/SubInterfaceIpv4AddressCustomizerTest.java index 8b365df59..d68c1044f 100644 --- a/l3/impl/src/test/java/io/fd/hc2vpp/l3/read/ipv4/SubInterfaceIpv4AddressCustomizerTest.java +++ b/l3/impl/src/test/java/io/fd/hc2vpp/l3/read/ipv4/SubInterfaceIpv4AddressCustomizerTest.java @@ -38,8 +38,8 @@ import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.ListReaderCustomizer; import io.fd.honeycomb.translate.util.read.cache.CacheKeyFactory; import io.fd.honeycomb.translate.util.read.cache.TypeAwareIdentifierCacheKeyFactory; -import io.fd.vpp.jvpp.core.dto.IpAddressDetails; -import io.fd.vpp.jvpp.core.dto.IpAddressDetailsReplyDump; +import io.fd.jvpp.core.dto.IpAddressDetails; +import io.fd.jvpp.core.dto.IpAddressDetailsReplyDump; import java.util.Arrays; import java.util.List; import org.junit.Assert; diff --git a/l3/impl/src/test/java/io/fd/hc2vpp/l3/read/ipv6/nd/NdProxyCustomizerTest.java b/l3/impl/src/test/java/io/fd/hc2vpp/l3/read/ipv6/nd/NdProxyCustomizerTest.java index a29250783..ce125323e 100644 --- a/l3/impl/src/test/java/io/fd/hc2vpp/l3/read/ipv6/nd/NdProxyCustomizerTest.java +++ b/l3/impl/src/test/java/io/fd/hc2vpp/l3/read/ipv6/nd/NdProxyCustomizerTest.java @@ -27,9 +27,9 @@ 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.ReaderCustomizer; -import io.fd.vpp.jvpp.core.dto.Ip6NdProxyDetails; -import io.fd.vpp.jvpp.core.dto.Ip6NdProxyDetailsReplyDump; -import io.fd.vpp.jvpp.core.types.Ip6Address; +import io.fd.jvpp.core.dto.Ip6NdProxyDetails; +import io.fd.jvpp.core.dto.Ip6NdProxyDetailsReplyDump; +import io.fd.jvpp.core.types.Ip6Address; import java.util.List; import org.junit.Test; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.nd.proxy.rev170315.NdProxyIp6StateAugmentation; diff --git a/l3/impl/src/test/java/io/fd/hc2vpp/l3/write/ProxyArpCustomizerTest.java b/l3/impl/src/test/java/io/fd/hc2vpp/l3/write/ProxyArpCustomizerTest.java index 1cb99eab2..c0727da79 100644 --- a/l3/impl/src/test/java/io/fd/hc2vpp/l3/write/ProxyArpCustomizerTest.java +++ b/l3/impl/src/test/java/io/fd/hc2vpp/l3/write/ProxyArpCustomizerTest.java @@ -26,8 +26,8 @@ import io.fd.hc2vpp.common.translate.util.ByteDataTranslator; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.hc2vpp.l3.write.ipv4.ProxyArpCustomizer; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.ProxyArpIntfcEnableDisable; -import io.fd.vpp.jvpp.core.dto.ProxyArpIntfcEnableDisableReply; +import io.fd.jvpp.core.dto.ProxyArpIntfcEnableDisable; +import io.fd.jvpp.core.dto.ProxyArpIntfcEnableDisableReply; import org.junit.Test; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.proxy.arp.rev180703.ProxyArpInterfaceAugmentation; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.proxy.arp.rev180703.interfaces._interface.ProxyArp; diff --git a/l3/impl/src/test/java/io/fd/hc2vpp/l3/write/ProxyRangeCustomizerTest.java b/l3/impl/src/test/java/io/fd/hc2vpp/l3/write/ProxyRangeCustomizerTest.java index eda79fc83..3cc967086 100644 --- a/l3/impl/src/test/java/io/fd/hc2vpp/l3/write/ProxyRangeCustomizerTest.java +++ b/l3/impl/src/test/java/io/fd/hc2vpp/l3/write/ProxyRangeCustomizerTest.java @@ -24,10 +24,10 @@ import io.fd.hc2vpp.common.test.write.WriterCustomizerTest; import io.fd.hc2vpp.common.translate.util.ByteDataTranslator; import io.fd.hc2vpp.l3.write.ipv4.ProxyRangeCustomizer; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.ProxyArpAddDel; -import io.fd.vpp.jvpp.core.dto.ProxyArpAddDelReply; -import io.fd.vpp.jvpp.core.types.Ip4Address; -import io.fd.vpp.jvpp.core.types.ProxyArp; +import io.fd.jvpp.core.dto.ProxyArpAddDel; +import io.fd.jvpp.core.dto.ProxyArpAddDelReply; +import io.fd.jvpp.core.types.Ip4Address; +import io.fd.jvpp.core.types.ProxyArp; import org.junit.Test; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.proxy.arp.rev180703.ProxyRanges; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.proxy.arp.rev180703.proxy.ranges.ProxyRange; diff --git a/l3/impl/src/test/java/io/fd/hc2vpp/l3/write/ipv4/Ipv4AddressCustomizerTest.java b/l3/impl/src/test/java/io/fd/hc2vpp/l3/write/ipv4/Ipv4AddressCustomizerTest.java index efab72bb1..292fbdfb2 100644 --- a/l3/impl/src/test/java/io/fd/hc2vpp/l3/write/ipv4/Ipv4AddressCustomizerTest.java +++ b/l3/impl/src/test/java/io/fd/hc2vpp/l3/write/ipv4/Ipv4AddressCustomizerTest.java @@ -26,10 +26,10 @@ import static org.mockito.Mockito.verify; import io.fd.hc2vpp.common.test.write.WriterCustomizerTest; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.VppBaseCallException; -import io.fd.vpp.jvpp.core.dto.IpAddressDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.SwInterfaceAddDelAddress; -import io.fd.vpp.jvpp.core.dto.SwInterfaceAddDelAddressReply; +import io.fd.jvpp.VppBaseCallException; +import io.fd.jvpp.core.dto.IpAddressDetailsReplyDump; +import io.fd.jvpp.core.dto.SwInterfaceAddDelAddress; +import io.fd.jvpp.core.dto.SwInterfaceAddDelAddressReply; import org.junit.Before; import org.junit.Test; import org.mockito.ArgumentMatcher; diff --git a/l3/impl/src/test/java/io/fd/hc2vpp/l3/write/ipv4/Ipv4NeighbourCustomizerTest.java b/l3/impl/src/test/java/io/fd/hc2vpp/l3/write/ipv4/Ipv4NeighbourCustomizerTest.java index cb87b5e3e..4c400f725 100644 --- a/l3/impl/src/test/java/io/fd/hc2vpp/l3/write/ipv4/Ipv4NeighbourCustomizerTest.java +++ b/l3/impl/src/test/java/io/fd/hc2vpp/l3/write/ipv4/Ipv4NeighbourCustomizerTest.java @@ -27,16 +27,16 @@ import io.fd.hc2vpp.common.test.write.WriterCustomizerTest; import io.fd.hc2vpp.common.translate.util.Ipv4Translator; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.VppBaseCallException; -import io.fd.vpp.jvpp.core.dto.IpNeighborAddDel; -import io.fd.vpp.jvpp.core.dto.IpNeighborAddDelReply; -import io.fd.vpp.jvpp.core.types.Address; -import io.fd.vpp.jvpp.core.types.AddressFamily; -import io.fd.vpp.jvpp.core.types.AddressUnion; -import io.fd.vpp.jvpp.core.types.Ip4Address; -import io.fd.vpp.jvpp.core.types.IpNeighbor; -import io.fd.vpp.jvpp.core.types.IpNeighborFlags; -import io.fd.vpp.jvpp.core.types.MacAddress; +import io.fd.jvpp.VppBaseCallException; +import io.fd.jvpp.core.dto.IpNeighborAddDel; +import io.fd.jvpp.core.dto.IpNeighborAddDelReply; +import io.fd.jvpp.core.types.Address; +import io.fd.jvpp.core.types.AddressFamily; +import io.fd.jvpp.core.types.AddressUnion; +import io.fd.jvpp.core.types.Ip4Address; +import io.fd.jvpp.core.types.IpNeighbor; +import io.fd.jvpp.core.types.IpNeighborFlags; +import io.fd.jvpp.core.types.MacAddress; import org.junit.Test; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4AddressNoZone; diff --git a/l3/impl/src/test/java/io/fd/hc2vpp/l3/write/ipv4/SubInterfaceIpv4AddressCustomizerTest.java b/l3/impl/src/test/java/io/fd/hc2vpp/l3/write/ipv4/SubInterfaceIpv4AddressCustomizerTest.java index f4a2188c0..a09baf760 100644 --- a/l3/impl/src/test/java/io/fd/hc2vpp/l3/write/ipv4/SubInterfaceIpv4AddressCustomizerTest.java +++ b/l3/impl/src/test/java/io/fd/hc2vpp/l3/write/ipv4/SubInterfaceIpv4AddressCustomizerTest.java @@ -27,9 +27,9 @@ import io.fd.hc2vpp.common.translate.util.ByteDataTranslator; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.hc2vpp.l3.write.ipv4.subinterface.SubInterfaceIpv4AddressCustomizer; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.VppBaseCallException; -import io.fd.vpp.jvpp.core.dto.SwInterfaceAddDelAddress; -import io.fd.vpp.jvpp.core.dto.SwInterfaceAddDelAddressReply; +import io.fd.jvpp.VppBaseCallException; +import io.fd.jvpp.core.dto.SwInterfaceAddDelAddress; +import io.fd.jvpp.core.dto.SwInterfaceAddDelAddressReply; import org.junit.Test; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.vlan.rev180319.SubinterfaceAugmentation; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.vlan.rev180319.interfaces._interface.SubInterfaces; diff --git a/l3/impl/src/test/java/io/fd/hc2vpp/l3/write/ipv6/Ipv6NeighbourCustomizerTest.java b/l3/impl/src/test/java/io/fd/hc2vpp/l3/write/ipv6/Ipv6NeighbourCustomizerTest.java index f5f906155..c0f34e089 100644 --- a/l3/impl/src/test/java/io/fd/hc2vpp/l3/write/ipv6/Ipv6NeighbourCustomizerTest.java +++ b/l3/impl/src/test/java/io/fd/hc2vpp/l3/write/ipv6/Ipv6NeighbourCustomizerTest.java @@ -26,16 +26,16 @@ import io.fd.hc2vpp.common.test.write.WriterCustomizerTest; import io.fd.hc2vpp.common.translate.util.Ipv6Translator; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.VppBaseCallException; -import io.fd.vpp.jvpp.core.dto.IpNeighborAddDel; -import io.fd.vpp.jvpp.core.dto.IpNeighborAddDelReply; -import io.fd.vpp.jvpp.core.types.Address; -import io.fd.vpp.jvpp.core.types.AddressFamily; -import io.fd.vpp.jvpp.core.types.AddressUnion; -import io.fd.vpp.jvpp.core.types.Ip6Address; -import io.fd.vpp.jvpp.core.types.IpNeighbor; -import io.fd.vpp.jvpp.core.types.IpNeighborFlags; -import io.fd.vpp.jvpp.core.types.MacAddress; +import io.fd.jvpp.VppBaseCallException; +import io.fd.jvpp.core.dto.IpNeighborAddDel; +import io.fd.jvpp.core.dto.IpNeighborAddDelReply; +import io.fd.jvpp.core.types.Address; +import io.fd.jvpp.core.types.AddressFamily; +import io.fd.jvpp.core.types.AddressUnion; +import io.fd.jvpp.core.types.Ip6Address; +import io.fd.jvpp.core.types.IpNeighbor; +import io.fd.jvpp.core.types.IpNeighborFlags; +import io.fd.jvpp.core.types.MacAddress; import org.junit.Test; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Address; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6AddressNoZone; diff --git a/l3/impl/src/test/java/io/fd/hc2vpp/l3/write/ipv6/nd/NdProxyCustomizerTest.java b/l3/impl/src/test/java/io/fd/hc2vpp/l3/write/ipv6/nd/NdProxyCustomizerTest.java index 582b8e916..ed73fb783 100644 --- a/l3/impl/src/test/java/io/fd/hc2vpp/l3/write/ipv6/nd/NdProxyCustomizerTest.java +++ b/l3/impl/src/test/java/io/fd/hc2vpp/l3/write/ipv6/nd/NdProxyCustomizerTest.java @@ -24,9 +24,9 @@ import static org.mockito.Mockito.when; import io.fd.hc2vpp.common.test.write.WriterCustomizerTest; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.Ip6NdProxyAddDel; -import io.fd.vpp.jvpp.core.dto.Ip6NdProxyAddDelReply; -import io.fd.vpp.jvpp.core.types.Ip6Address; +import io.fd.jvpp.core.dto.Ip6NdProxyAddDel; +import io.fd.jvpp.core.dto.Ip6NdProxyAddDelReply; +import io.fd.jvpp.core.types.Ip6Address; import org.junit.Test; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.nd.proxy.rev170315.NdProxyIp6Augmentation; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.nd.proxy.rev170315.interfaces._interface.ipv6.NdProxies; diff --git a/l3/utils/src/main/java/io/fd/hc2vpp/l3/utils/ip/read/IpAddressReader.java b/l3/utils/src/main/java/io/fd/hc2vpp/l3/utils/ip/read/IpAddressReader.java index 131323fa2..181baf6fc 100644 --- a/l3/utils/src/main/java/io/fd/hc2vpp/l3/utils/ip/read/IpAddressReader.java +++ b/l3/utils/src/main/java/io/fd/hc2vpp/l3/utils/ip/read/IpAddressReader.java @@ -28,10 +28,10 @@ import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.util.RWUtils; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; import io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor; -import io.fd.vpp.jvpp.core.dto.IpAddressDetails; -import io.fd.vpp.jvpp.core.dto.IpAddressDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.IpAddressDump; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.IpAddressDetails; +import io.fd.jvpp.core.dto.IpAddressDetailsReplyDump; +import io.fd.jvpp.core.dto.IpAddressDump; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.Collections; import java.util.List; import java.util.function.Function; diff --git a/l3/utils/src/main/java/io/fd/hc2vpp/l3/utils/ip/read/IpNeighbourReader.java b/l3/utils/src/main/java/io/fd/hc2vpp/l3/utils/ip/read/IpNeighbourReader.java index ca45f8c7b..6eb5fd1b8 100644 --- a/l3/utils/src/main/java/io/fd/hc2vpp/l3/utils/ip/read/IpNeighbourReader.java +++ b/l3/utils/src/main/java/io/fd/hc2vpp/l3/utils/ip/read/IpNeighbourReader.java @@ -27,10 +27,10 @@ import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; import io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor; -import io.fd.vpp.jvpp.core.dto.IpNeighborDetails; -import io.fd.vpp.jvpp.core.dto.IpNeighborDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.IpNeighborDump; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.IpNeighborDetails; +import io.fd.jvpp.core.dto.IpNeighborDetailsReplyDump; +import io.fd.jvpp.core.dto.IpNeighborDump; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.Collections; import java.util.List; import java.util.function.Function; diff --git a/l3/utils/src/main/java/io/fd/hc2vpp/l3/utils/ip/write/IpWriter.java b/l3/utils/src/main/java/io/fd/hc2vpp/l3/utils/ip/write/IpWriter.java index 5bfdbd49b..aeb421c94 100644 --- a/l3/utils/src/main/java/io/fd/hc2vpp/l3/utils/ip/write/IpWriter.java +++ b/l3/utils/src/main/java/io/fd/hc2vpp/l3/utils/ip/write/IpWriter.java @@ -25,12 +25,12 @@ import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; 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.core.dto.IpNeighborAddDel; -import io.fd.vpp.jvpp.core.dto.SwInterfaceAddDelAddress; -import io.fd.vpp.jvpp.core.dto.SwInterfaceAddDelAddressReply; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; -import io.fd.vpp.jvpp.core.types.IpNeighbor; -import io.fd.vpp.jvpp.core.types.IpNeighborFlags; +import io.fd.jvpp.core.dto.IpNeighborAddDel; +import io.fd.jvpp.core.dto.SwInterfaceAddDelAddress; +import io.fd.jvpp.core.dto.SwInterfaceAddDelAddressReply; +import io.fd.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.types.IpNeighbor; +import io.fd.jvpp.core.types.IpNeighborFlags; import java.util.concurrent.CompletionStage; import java.util.function.Supplier; import javax.annotation.Nonnegative; diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/read/GpeFeatureCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/read/GpeFeatureCustomizer.java index db4631cf5..7c88123fb 100644 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/read/GpeFeatureCustomizer.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/read/GpeFeatureCustomizer.java @@ -24,9 +24,9 @@ import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.Initialized; import io.fd.honeycomb.translate.spi.read.InitializingReaderCustomizer; -import io.fd.vpp.jvpp.core.dto.ShowLispStatus; -import io.fd.vpp.jvpp.core.dto.ShowLispStatusReply; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.ShowLispStatus; +import io.fd.jvpp.core.dto.ShowLispStatusReply; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.gpe.rev170801.Gpe; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.gpe.rev170801.GpeStateBuilder; diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/read/GpeForwardEntryCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/read/GpeForwardEntryCustomizer.java index 088bccc27..a875cfd2f 100644 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/read/GpeForwardEntryCustomizer.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/read/GpeForwardEntryCustomizer.java @@ -31,16 +31,16 @@ import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.Initialized; import io.fd.honeycomb.translate.spi.read.InitializingListReaderCustomizer; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; -import io.fd.vpp.jvpp.core.dto.GpeFwdEntriesGet; -import io.fd.vpp.jvpp.core.dto.GpeFwdEntriesGetReply; -import io.fd.vpp.jvpp.core.dto.GpeFwdEntryPathDetails; -import io.fd.vpp.jvpp.core.dto.GpeFwdEntryPathDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.GpeFwdEntryPathDump; -import io.fd.vpp.jvpp.core.dto.GpeFwdEntryVnisGet; -import io.fd.vpp.jvpp.core.dto.GpeFwdEntryVnisGetReply; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; -import io.fd.vpp.jvpp.core.types.GpeFwdEntry; -import io.fd.vpp.jvpp.core.types.GpeLocator; +import io.fd.jvpp.core.dto.GpeFwdEntriesGet; +import io.fd.jvpp.core.dto.GpeFwdEntriesGetReply; +import io.fd.jvpp.core.dto.GpeFwdEntryPathDetails; +import io.fd.jvpp.core.dto.GpeFwdEntryPathDetailsReplyDump; +import io.fd.jvpp.core.dto.GpeFwdEntryPathDump; +import io.fd.jvpp.core.dto.GpeFwdEntryVnisGet; +import io.fd.jvpp.core.dto.GpeFwdEntryVnisGetReply; +import io.fd.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.types.GpeFwdEntry; +import io.fd.jvpp.core.types.GpeLocator; import java.util.Arrays; import java.util.Collections; import java.util.List; diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/read/GpeReaderFactory.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/read/GpeReaderFactory.java index 3791e1e4b..431477e03 100644 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/read/GpeReaderFactory.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/read/GpeReaderFactory.java @@ -26,7 +26,7 @@ import io.fd.honeycomb.translate.impl.read.GenericInitListReader; import io.fd.honeycomb.translate.impl.read.GenericInitReader; import io.fd.honeycomb.translate.read.ReaderFactory; import io.fd.honeycomb.translate.read.registry.ModifiableReaderRegistryBuilder; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.gpe.rev170801.GpeState; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.gpe.rev170801.GpeStateBuilder; diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/read/NativeForwardPathCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/read/NativeForwardPathCustomizer.java index e32e51f5e..5d06b4c68 100644 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/read/NativeForwardPathCustomizer.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/read/NativeForwardPathCustomizer.java @@ -28,10 +28,10 @@ import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.Initialized; import io.fd.honeycomb.translate.spi.read.InitializingListReaderCustomizer; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; -import io.fd.vpp.jvpp.core.dto.GpeNativeFwdRpathsGet; -import io.fd.vpp.jvpp.core.dto.GpeNativeFwdRpathsGetReply; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; -import io.fd.vpp.jvpp.core.types.GpeNativeFwdRpath; +import io.fd.jvpp.core.dto.GpeNativeFwdRpathsGet; +import io.fd.jvpp.core.dto.GpeNativeFwdRpathsGetReply; +import io.fd.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.types.GpeNativeFwdRpath; import java.util.Arrays; import java.util.List; import java.util.Optional; diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/read/NativeForwardPathsTableCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/read/NativeForwardPathsTableCustomizer.java index 7a770d605..6fb1f4207 100644 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/read/NativeForwardPathsTableCustomizer.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/read/NativeForwardPathsTableCustomizer.java @@ -25,11 +25,11 @@ import io.fd.honeycomb.translate.spi.read.Initialized; import io.fd.honeycomb.translate.spi.read.InitializingListReaderCustomizer; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager.DumpCacheManagerBuilder; -import io.fd.vpp.jvpp.core.dto.Ip6FibDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.Ip6FibDump; -import io.fd.vpp.jvpp.core.dto.IpFibDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.IpFibDump; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.Ip6FibDetailsReplyDump; +import io.fd.jvpp.core.dto.Ip6FibDump; +import io.fd.jvpp.core.dto.IpFibDetailsReplyDump; +import io.fd.jvpp.core.dto.IpFibDump; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.List; import java.util.OptionalLong; import java.util.stream.Collectors; diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/service/GpeStateCheckServiceImpl.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/service/GpeStateCheckServiceImpl.java index b66e4d796..5415e0fd6 100644 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/service/GpeStateCheckServiceImpl.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/service/GpeStateCheckServiceImpl.java @@ -26,9 +26,9 @@ import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager.DumpCacheManagerBuilder; import io.fd.honeycomb.translate.write.WriteContext; -import io.fd.vpp.jvpp.core.dto.ShowLispStatus; -import io.fd.vpp.jvpp.core.dto.ShowLispStatusReply; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.ShowLispStatus; +import io.fd.jvpp.core.dto.ShowLispStatusReply; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.gpe.rev170801.Gpe; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.gpe.rev170801.GpeState; diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/write/GpeFeatureCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/write/GpeFeatureCustomizer.java index 29ae84f41..e86d64207 100644 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/write/GpeFeatureCustomizer.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/write/GpeFeatureCustomizer.java @@ -22,9 +22,9 @@ import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; import io.fd.honeycomb.translate.spi.write.WriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.GpeEnableDisable; -import io.fd.vpp.jvpp.core.dto.GpeEnableDisableReply; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.GpeEnableDisable; +import io.fd.jvpp.core.dto.GpeEnableDisableReply; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.concurrent.CompletableFuture; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.gpe.rev170801.gpe.feature.data.grouping.GpeFeatureData; diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/write/GpeForwardEntryCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/write/GpeForwardEntryCustomizer.java index 2f36e87e8..261aa8467 100644 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/write/GpeForwardEntryCustomizer.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/write/GpeForwardEntryCustomizer.java @@ -29,10 +29,10 @@ import io.fd.honeycomb.translate.MappingContext; import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.GpeAddDelFwdEntry; -import io.fd.vpp.jvpp.core.dto.GpeAddDelFwdEntryReply; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; -import io.fd.vpp.jvpp.core.types.GpeLocator; +import io.fd.jvpp.core.dto.GpeAddDelFwdEntry; +import io.fd.jvpp.core.dto.GpeAddDelFwdEntryReply; +import io.fd.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.types.GpeLocator; import java.util.Collection; import java.util.List; import java.util.Optional; diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/write/GpeWriterFactory.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/write/GpeWriterFactory.java index cefae1c45..ce6eb65d9 100644 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/write/GpeWriterFactory.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/write/GpeWriterFactory.java @@ -26,7 +26,7 @@ import io.fd.honeycomb.translate.impl.write.GenericListWriter; import io.fd.honeycomb.translate.impl.write.GenericWriter; import io.fd.honeycomb.translate.write.WriterFactory; import io.fd.honeycomb.translate.write.registry.ModifiableWriterRegistryBuilder; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.gpe.rev170801.Gpe; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.gpe.rev170801.NativeForwardPathsTables; diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/write/NativeForwardPathCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/write/NativeForwardPathCustomizer.java index 9b698346d..04cb9da92 100644 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/write/NativeForwardPathCustomizer.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/write/NativeForwardPathCustomizer.java @@ -26,8 +26,8 @@ import io.fd.honeycomb.translate.MappingContext; import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.GpeAddDelNativeFwdRpath; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.GpeAddDelNativeFwdRpath; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.Optional; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.gpe.rev170801._native.forward.paths.tables._native.forward.paths.table.NativeForwardPath; diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/write/NativeForwardPathsTableCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/write/NativeForwardPathsTableCustomizer.java index 690dcf431..c8377a80c 100644 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/write/NativeForwardPathsTableCustomizer.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/write/NativeForwardPathsTableCustomizer.java @@ -22,8 +22,8 @@ import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.GpeAddDelIface; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.GpeAddDelIface; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.gpe.rev170801._native.forward.paths.tables.NativeForwardPathsTable; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.gpe.rev170801._native.forward.paths.tables.NativeForwardPathsTableKey; diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/AbstractLispInfraFactoryBase.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/AbstractLispInfraFactoryBase.java index 6d75c9270..f29edcb7c 100644 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/AbstractLispInfraFactoryBase.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/AbstractLispInfraFactoryBase.java @@ -30,7 +30,7 @@ import io.fd.hc2vpp.lisp.context.util.EidMappingContext; import io.fd.hc2vpp.lisp.translate.service.LispStateCheckService; import io.fd.honeycomb.translate.impl.write.GenericWriter; import io.fd.honeycomb.translate.spi.write.WriterCustomizer; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.lisp.rev171013.Lisp; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.lisp.rev171013.LispState; diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/AdjacencyCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/AdjacencyCustomizer.java index acc0c2d0d..600ae920f 100755 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/AdjacencyCustomizer.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/AdjacencyCustomizer.java @@ -35,10 +35,10 @@ import io.fd.honeycomb.translate.spi.read.InitializingListReaderCustomizer; import io.fd.honeycomb.translate.util.RWUtils; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; import io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor; -import io.fd.vpp.jvpp.core.dto.OneAdjacenciesGet; -import io.fd.vpp.jvpp.core.dto.OneAdjacenciesGetReply; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; -import io.fd.vpp.jvpp.core.types.OneAdjacency; +import io.fd.jvpp.core.dto.OneAdjacenciesGet; +import io.fd.jvpp.core.dto.OneAdjacenciesGetReply; +import io.fd.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.types.OneAdjacency; import java.util.Arrays; import java.util.Collections; import java.util.List; diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/BridgeDomainSubtableCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/BridgeDomainSubtableCustomizer.java index 38f4c86ed..95de31a07 100644 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/BridgeDomainSubtableCustomizer.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/BridgeDomainSubtableCustomizer.java @@ -30,9 +30,9 @@ import io.fd.honeycomb.translate.spi.read.Initialized; import io.fd.honeycomb.translate.spi.read.InitializingReaderCustomizer; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager.DumpCacheManagerBuilder; -import io.fd.vpp.jvpp.core.dto.OneEidTableMapDetails; -import io.fd.vpp.jvpp.core.dto.OneEidTableMapDetailsReplyDump; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.OneEidTableMapDetails; +import io.fd.jvpp.core.dto.OneEidTableMapDetailsReplyDump; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.List; import java.util.stream.Collectors; import javax.annotation.Nonnull; diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/InterfaceCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/InterfaceCustomizer.java index 5a0550d4b..3db6d8152 100755 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/InterfaceCustomizer.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/InterfaceCustomizer.java @@ -35,9 +35,9 @@ import io.fd.honeycomb.translate.spi.read.InitializingListReaderCustomizer; import io.fd.honeycomb.translate.util.RWUtils; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; import io.fd.honeycomb.translate.util.read.cache.TypeAwareIdentifierCacheKeyFactory; -import io.fd.vpp.jvpp.core.dto.OneLocatorDetails; -import io.fd.vpp.jvpp.core.dto.OneLocatorDetailsReplyDump; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.OneLocatorDetails; +import io.fd.jvpp.core.dto.OneLocatorDetailsReplyDump; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.Collections; import java.util.List; import java.util.stream.Collectors; diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/ItrRemoteLocatorSetCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/ItrRemoteLocatorSetCustomizer.java index 17718c2ce..d5f242979 100644 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/ItrRemoteLocatorSetCustomizer.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/ItrRemoteLocatorSetCustomizer.java @@ -29,9 +29,9 @@ import io.fd.honeycomb.translate.spi.read.Initialized; import io.fd.honeycomb.translate.spi.read.InitializingReaderCustomizer; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager.DumpCacheManagerBuilder; -import io.fd.vpp.jvpp.core.dto.OneGetMapRequestItrRlocs; -import io.fd.vpp.jvpp.core.dto.OneGetMapRequestItrRlocsReply; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.OneGetMapRequestItrRlocs; +import io.fd.jvpp.core.dto.OneGetMapRequestItrRlocsReply; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.lisp.rev171013.itr.remote.locator.sets.grouping.ItrRemoteLocatorSet; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.lisp.rev171013.itr.remote.locator.sets.grouping.ItrRemoteLocatorSetBuilder; diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/LispStateCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/LispStateCustomizer.java index 1f15299e1..8f07eed55 100755 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/LispStateCustomizer.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/LispStateCustomizer.java @@ -28,11 +28,11 @@ import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.Initialized; import io.fd.honeycomb.translate.spi.read.InitializingReaderCustomizer; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; -import io.fd.vpp.jvpp.VppBaseCallException; -import io.fd.vpp.jvpp.core.dto.OneLocatorSetDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.ShowOneStatus; -import io.fd.vpp.jvpp.core.dto.ShowOneStatusReply; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.VppBaseCallException; +import io.fd.jvpp.core.dto.OneLocatorSetDetailsReplyDump; +import io.fd.jvpp.core.dto.ShowOneStatus; +import io.fd.jvpp.core.dto.ShowOneStatusReply; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.concurrent.TimeoutException; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.lisp.rev171013.Lisp; diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/LocalMappingCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/LocalMappingCustomizer.java index cd958c326..f69d027e1 100755 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/LocalMappingCustomizer.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/LocalMappingCustomizer.java @@ -37,9 +37,9 @@ import io.fd.honeycomb.translate.spi.read.Initialized; import io.fd.honeycomb.translate.spi.read.InitializingListReaderCustomizer; import io.fd.honeycomb.translate.util.RWUtils; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; -import io.fd.vpp.jvpp.core.dto.OneEidTableDetails; -import io.fd.vpp.jvpp.core.dto.OneEidTableDetailsReplyDump; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.OneEidTableDetails; +import io.fd.jvpp.core.dto.OneEidTableDetailsReplyDump; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.Collections; import java.util.List; import java.util.stream.Collectors; diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/LocatorSetCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/LocatorSetCustomizer.java index 762c57776..3b7bf1742 100755 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/LocatorSetCustomizer.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/LocatorSetCustomizer.java @@ -27,9 +27,9 @@ import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.Initialized; import io.fd.honeycomb.translate.spi.read.InitializingListReaderCustomizer; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; -import io.fd.vpp.jvpp.core.dto.OneLocatorSetDetails; -import io.fd.vpp.jvpp.core.dto.OneLocatorSetDetailsReplyDump; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.OneLocatorSetDetails; +import io.fd.jvpp.core.dto.OneLocatorSetDetailsReplyDump; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.Collections; import java.util.List; import java.util.stream.Collectors; diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/MapRegisterCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/MapRegisterCustomizer.java index ee388a584..6e939ebd7 100644 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/MapRegisterCustomizer.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/MapRegisterCustomizer.java @@ -26,13 +26,13 @@ import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.Initialized; import io.fd.honeycomb.translate.spi.read.InitializingReaderCustomizer; -import io.fd.vpp.jvpp.core.dto.ShowOneMapRegisterFallbackThreshold; -import io.fd.vpp.jvpp.core.dto.ShowOneMapRegisterFallbackThresholdReply; -import io.fd.vpp.jvpp.core.dto.ShowOneMapRegisterState; -import io.fd.vpp.jvpp.core.dto.ShowOneMapRegisterStateReply; -import io.fd.vpp.jvpp.core.dto.ShowOneMapRegisterTtl; -import io.fd.vpp.jvpp.core.dto.ShowOneMapRegisterTtlReply; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.ShowOneMapRegisterFallbackThreshold; +import io.fd.jvpp.core.dto.ShowOneMapRegisterFallbackThresholdReply; +import io.fd.jvpp.core.dto.ShowOneMapRegisterState; +import io.fd.jvpp.core.dto.ShowOneMapRegisterStateReply; +import io.fd.jvpp.core.dto.ShowOneMapRegisterTtl; +import io.fd.jvpp.core.dto.ShowOneMapRegisterTtlReply; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.lisp.rev171013.lisp.feature.data.grouping.LispFeatureDataBuilder; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.lisp.rev171013.map.register.grouping.MapRegister; diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/MapRequestModeCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/MapRequestModeCustomizer.java index a06f31511..18e315fd5 100644 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/MapRequestModeCustomizer.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/MapRequestModeCustomizer.java @@ -24,9 +24,9 @@ import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.Initialized; import io.fd.honeycomb.translate.spi.read.InitializingReaderCustomizer; -import io.fd.vpp.jvpp.core.dto.ShowOneMapRequestMode; -import io.fd.vpp.jvpp.core.dto.ShowOneMapRequestModeReply; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.ShowOneMapRequestMode; +import io.fd.jvpp.core.dto.ShowOneMapRequestModeReply; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.lisp.rev171013.lisp.feature.data.grouping.LispFeatureDataBuilder; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.lisp.rev171013.map.request.mode.grouping.MapRequestMode; diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/MapResolverCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/MapResolverCustomizer.java index 5ecd52287..683570e88 100755 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/MapResolverCustomizer.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/MapResolverCustomizer.java @@ -28,10 +28,10 @@ import io.fd.honeycomb.translate.spi.read.Initialized; import io.fd.honeycomb.translate.spi.read.InitializingListReaderCustomizer; import io.fd.honeycomb.translate.util.RWUtils; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; -import io.fd.vpp.jvpp.core.dto.OneMapResolverDetails; -import io.fd.vpp.jvpp.core.dto.OneMapResolverDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.OneMapResolverDump; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.OneMapResolverDetails; +import io.fd.jvpp.core.dto.OneMapResolverDetailsReplyDump; +import io.fd.jvpp.core.dto.OneMapResolverDump; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.Collections; import java.util.List; import java.util.stream.Collectors; diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/MapServerCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/MapServerCustomizer.java index 80f7047ee..eeac659ea 100644 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/MapServerCustomizer.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/MapServerCustomizer.java @@ -28,10 +28,10 @@ import io.fd.honeycomb.translate.spi.read.InitializingListReaderCustomizer; import io.fd.honeycomb.translate.util.RWUtils; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager.DumpCacheManagerBuilder; -import io.fd.vpp.jvpp.core.dto.OneMapServerDetails; -import io.fd.vpp.jvpp.core.dto.OneMapServerDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.OneMapServerDump; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.OneMapServerDetails; +import io.fd.jvpp.core.dto.OneMapServerDetailsReplyDump; +import io.fd.jvpp.core.dto.OneMapServerDump; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.Collections; import java.util.List; import java.util.stream.Collectors; diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/PetrCfgCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/PetrCfgCustomizer.java index 51e8abe7d..c82da36d1 100644 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/PetrCfgCustomizer.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/PetrCfgCustomizer.java @@ -25,9 +25,9 @@ import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.Initialized; import io.fd.honeycomb.translate.spi.read.InitializingReaderCustomizer; -import io.fd.vpp.jvpp.core.dto.ShowOneUsePetr; -import io.fd.vpp.jvpp.core.dto.ShowOneUsePetrReply; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.ShowOneUsePetr; +import io.fd.jvpp.core.dto.ShowOneUsePetrReply; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.lisp.rev171013.lisp.feature.data.grouping.LispFeatureDataBuilder; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.lisp.rev171013.use.petr.cfg.grouping.PetrCfg; diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/PitrCfgCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/PitrCfgCustomizer.java index 9db045376..1355871c4 100755 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/PitrCfgCustomizer.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/PitrCfgCustomizer.java @@ -26,10 +26,10 @@ import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.Initialized; import io.fd.honeycomb.translate.spi.read.InitializingReaderCustomizer; -import io.fd.vpp.jvpp.VppBaseCallException; -import io.fd.vpp.jvpp.core.dto.ShowOnePitr; -import io.fd.vpp.jvpp.core.dto.ShowOnePitrReply; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.VppBaseCallException; +import io.fd.jvpp.core.dto.ShowOnePitr; +import io.fd.jvpp.core.dto.ShowOnePitrReply; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.concurrent.TimeoutException; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.lisp.rev171013.lisp.feature.data.grouping.LispFeatureDataBuilder; diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/RemoteMappingCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/RemoteMappingCustomizer.java index 3584e3638..7f0240990 100755 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/RemoteMappingCustomizer.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/RemoteMappingCustomizer.java @@ -46,11 +46,11 @@ import io.fd.honeycomb.translate.spi.read.InitializingListReaderCustomizer; import io.fd.honeycomb.translate.util.RWUtils; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; import io.fd.honeycomb.translate.util.read.cache.TypeAwareIdentifierCacheKeyFactory; -import io.fd.vpp.jvpp.core.dto.OneEidTableDetails; -import io.fd.vpp.jvpp.core.dto.OneEidTableDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.OneLocatorDetails; -import io.fd.vpp.jvpp.core.dto.OneLocatorDetailsReplyDump; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.OneEidTableDetails; +import io.fd.jvpp.core.dto.OneEidTableDetailsReplyDump; +import io.fd.jvpp.core.dto.OneLocatorDetails; +import io.fd.jvpp.core.dto.OneLocatorDetailsReplyDump; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.Collections; import java.util.List; import java.util.stream.Collectors; diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/RlocProbeCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/RlocProbeCustomizer.java index 308ed7e4f..585c6542b 100644 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/RlocProbeCustomizer.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/RlocProbeCustomizer.java @@ -25,9 +25,9 @@ import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.Initialized; import io.fd.honeycomb.translate.spi.read.InitializingReaderCustomizer; -import io.fd.vpp.jvpp.core.dto.ShowOneRlocProbeState; -import io.fd.vpp.jvpp.core.dto.ShowOneRlocProbeStateReply; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.ShowOneRlocProbeState; +import io.fd.jvpp.core.dto.ShowOneRlocProbeStateReply; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.lisp.rev171013.lisp.feature.data.grouping.LispFeatureDataBuilder; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.lisp.rev171013.rloc.probing.grouping.RlocProbe; diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/VniTableCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/VniTableCustomizer.java index 0be8fd487..7eb4a3a88 100755 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/VniTableCustomizer.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/VniTableCustomizer.java @@ -28,10 +28,10 @@ import io.fd.honeycomb.translate.spi.read.Initialized; import io.fd.honeycomb.translate.spi.read.InitializingListReaderCustomizer; import io.fd.honeycomb.translate.util.RWUtils; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; -import io.fd.vpp.jvpp.core.dto.OneEidTableVniDetails; -import io.fd.vpp.jvpp.core.dto.OneEidTableVniDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.OneEidTableVniDump; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.OneEidTableVniDetails; +import io.fd.jvpp.core.dto.OneEidTableVniDetailsReplyDump; +import io.fd.jvpp.core.dto.OneEidTableVniDump; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.Collections; import java.util.List; import java.util.stream.Collectors; diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/VrfSubtableCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/VrfSubtableCustomizer.java index 342b3a6c0..ac20f494f 100644 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/VrfSubtableCustomizer.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/VrfSubtableCustomizer.java @@ -29,9 +29,9 @@ import io.fd.honeycomb.translate.spi.read.Initialized; import io.fd.honeycomb.translate.spi.read.InitializingReaderCustomizer; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager.DumpCacheManagerBuilder; -import io.fd.vpp.jvpp.core.dto.OneEidTableMapDetails; -import io.fd.vpp.jvpp.core.dto.OneEidTableMapDetailsReplyDump; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.OneEidTableMapDetails; +import io.fd.jvpp.core.dto.OneEidTableMapDetailsReplyDump; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.List; import java.util.stream.Collectors; import javax.annotation.Nonnull; diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/trait/LocatorReader.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/trait/LocatorReader.java index 609bcb90b..5153916c3 100644 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/trait/LocatorReader.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/trait/LocatorReader.java @@ -21,9 +21,9 @@ import static com.google.common.base.Preconditions.checkNotNull; import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; import io.fd.hc2vpp.lisp.translate.read.dump.executor.params.LocatorDumpParams; import io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor; -import io.fd.vpp.jvpp.core.dto.OneLocatorDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.OneLocatorDump; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.OneLocatorDetailsReplyDump; +import io.fd.jvpp.core.dto.OneLocatorDump; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; /** diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/trait/LocatorSetReader.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/trait/LocatorSetReader.java index bcc4b6b59..3f819b83a 100644 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/trait/LocatorSetReader.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/trait/LocatorSetReader.java @@ -18,9 +18,9 @@ package io.fd.hc2vpp.lisp.translate.read.trait; import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; import io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor; -import io.fd.vpp.jvpp.core.dto.OneLocatorSetDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.OneLocatorSetDump; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.OneLocatorSetDetailsReplyDump; +import io.fd.jvpp.core.dto.OneLocatorSetDump; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.lisp.rev171013.locator.sets.grouping.locator.sets.LocatorSet; diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/trait/MappingReader.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/trait/MappingReader.java index 947b4e6c2..ee0308bb3 100644 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/trait/MappingReader.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/trait/MappingReader.java @@ -24,10 +24,10 @@ import static io.fd.hc2vpp.lisp.translate.read.dump.executor.params.MappingsDump import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; import io.fd.hc2vpp.lisp.translate.read.dump.executor.params.MappingsDumpParams; import io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor; -import io.fd.vpp.jvpp.core.dto.OneEidTableDetails; -import io.fd.vpp.jvpp.core.dto.OneEidTableDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.OneEidTableDump; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.OneEidTableDetails; +import io.fd.jvpp.core.dto.OneEidTableDetailsReplyDump; +import io.fd.jvpp.core.dto.OneEidTableDump; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.function.Predicate; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.lisp.rev171013.dp.subtable.grouping.local.mappings.LocalMapping; diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/trait/SubtableReader.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/trait/SubtableReader.java index 1ae0f1047..02ebc8bb8 100644 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/trait/SubtableReader.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/trait/SubtableReader.java @@ -25,9 +25,9 @@ import static io.fd.hc2vpp.lisp.translate.read.dump.executor.params.SubtableDump import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; import io.fd.hc2vpp.lisp.translate.read.dump.executor.params.SubtableDumpParams; import io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor; -import io.fd.vpp.jvpp.core.dto.OneEidTableMapDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.OneEidTableMapDump; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.OneEidTableMapDetailsReplyDump; +import io.fd.jvpp.core.dto.OneEidTableMapDump; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; /** diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/service/LispStateCheckServiceImpl.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/service/LispStateCheckServiceImpl.java index 9116f50ca..d6bad6403 100644 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/service/LispStateCheckServiceImpl.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/service/LispStateCheckServiceImpl.java @@ -26,9 +26,9 @@ import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager.DumpCacheManagerBuilder; import io.fd.honeycomb.translate.write.WriteContext; -import io.fd.vpp.jvpp.core.dto.ShowOneStatus; -import io.fd.vpp.jvpp.core.dto.ShowOneStatusReply; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.ShowOneStatus; +import io.fd.jvpp.core.dto.ShowOneStatusReply; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.lisp.rev171013.Lisp; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.lisp.rev171013.LispBuilder; diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/util/CheckedLispCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/util/CheckedLispCustomizer.java index 008e20c11..fa9596fda 100644 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/util/CheckedLispCustomizer.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/util/CheckedLispCustomizer.java @@ -19,7 +19,7 @@ package io.fd.hc2vpp.lisp.translate.util; import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer; import io.fd.hc2vpp.lisp.translate.service.LispStateCheckService; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; public abstract class CheckedLispCustomizer extends FutureJVppCustomizer { diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/AdjacencyCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/AdjacencyCustomizer.java index 1829df9c3..86c6631b9 100755 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/AdjacencyCustomizer.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/AdjacencyCustomizer.java @@ -30,9 +30,9 @@ import io.fd.hc2vpp.lisp.translate.util.EidTranslator; import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.VppBaseCallException; -import io.fd.vpp.jvpp.core.dto.OneAddDelAdjacency; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.VppBaseCallException; +import io.fd.jvpp.core.dto.OneAddDelAdjacency; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.concurrent.TimeoutException; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.lisp.rev171013.adjacencies.grouping.adjacencies.Adjacency; diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/BridgeDomainSubtableCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/BridgeDomainSubtableCustomizer.java index 4028ff82e..cce2dbaa6 100644 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/BridgeDomainSubtableCustomizer.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/BridgeDomainSubtableCustomizer.java @@ -26,8 +26,8 @@ import io.fd.honeycomb.translate.MappingContext; import io.fd.honeycomb.translate.spi.write.WriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.VppBaseCallException; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.VppBaseCallException; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.concurrent.TimeoutException; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.lisp.rev171013.eid.table.grouping.eid.table.vni.table.BridgeDomainSubtable; diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/InterfaceCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/InterfaceCustomizer.java index 75d175648..587fe1e00 100755 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/InterfaceCustomizer.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/InterfaceCustomizer.java @@ -27,9 +27,9 @@ import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.VppBaseCallException; -import io.fd.vpp.jvpp.core.dto.OneAddDelLocator; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.VppBaseCallException; +import io.fd.jvpp.core.dto.OneAddDelLocator; +import io.fd.jvpp.core.future.FutureJVppCore; import java.io.UnsupportedEncodingException; import java.util.concurrent.TimeoutException; import javax.annotation.Nonnull; diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/ItrRemoteLocatorSetCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/ItrRemoteLocatorSetCustomizer.java index 91dae7610..864a0937a 100644 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/ItrRemoteLocatorSetCustomizer.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/ItrRemoteLocatorSetCustomizer.java @@ -24,9 +24,9 @@ import io.fd.hc2vpp.lisp.translate.util.CheckedLispCustomizer; import io.fd.honeycomb.translate.spi.write.WriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.VppBaseCallException; -import io.fd.vpp.jvpp.core.dto.OneAddDelMapRequestItrRlocs; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.VppBaseCallException; +import io.fd.jvpp.core.dto.OneAddDelMapRequestItrRlocs; +import io.fd.jvpp.core.future.FutureJVppCore; import java.nio.charset.StandardCharsets; import java.util.concurrent.TimeoutException; import javax.annotation.Nonnull; diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/LispCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/LispCustomizer.java index 02483c180..470a55ce6 100755 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/LispCustomizer.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/LispCustomizer.java @@ -23,10 +23,10 @@ import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; import io.fd.honeycomb.translate.spi.write.WriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.VppBaseCallException; -import io.fd.vpp.jvpp.core.dto.OneEnableDisable; -import io.fd.vpp.jvpp.core.dto.OneEnableDisableReply; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.VppBaseCallException; +import io.fd.jvpp.core.dto.OneEnableDisable; +import io.fd.jvpp.core.dto.OneEnableDisableReply; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.concurrent.CompletionStage; import java.util.concurrent.TimeoutException; import javax.annotation.Nonnull; diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/LocalMappingCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/LocalMappingCustomizer.java index 638d9c70c..c2035a44e 100755 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/LocalMappingCustomizer.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/LocalMappingCustomizer.java @@ -29,9 +29,9 @@ import io.fd.hc2vpp.lisp.translate.util.EidTranslator; import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.VppBaseCallException; -import io.fd.vpp.jvpp.core.dto.OneAddDelLocalEid; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.VppBaseCallException; +import io.fd.jvpp.core.dto.OneAddDelLocalEid; +import io.fd.jvpp.core.future.FutureJVppCore; import java.io.UnsupportedEncodingException; import java.nio.charset.StandardCharsets; import java.util.concurrent.TimeoutException; diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/LocatorSetCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/LocatorSetCustomizer.java index 806716f56..6b21c1871 100755 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/LocatorSetCustomizer.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/LocatorSetCustomizer.java @@ -30,8 +30,8 @@ import io.fd.hc2vpp.lisp.translate.util.CheckedLispCustomizer; import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.OneAddDelLocatorSet; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.OneAddDelLocatorSet; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.Collection; import java.util.Collections; import java.util.List; diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/MapRegisterCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/MapRegisterCustomizer.java index ecf1617db..0bafabff7 100644 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/MapRegisterCustomizer.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/MapRegisterCustomizer.java @@ -23,10 +23,10 @@ import io.fd.hc2vpp.lisp.translate.util.CheckedLispCustomizer; import io.fd.honeycomb.translate.spi.write.WriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.OneMapRegisterEnableDisable; -import io.fd.vpp.jvpp.core.dto.OneMapRegisterFallbackThreshold; -import io.fd.vpp.jvpp.core.dto.OneMapRegisterSetTtl; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.OneMapRegisterEnableDisable; +import io.fd.jvpp.core.dto.OneMapRegisterFallbackThreshold; +import io.fd.jvpp.core.dto.OneMapRegisterSetTtl; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.lisp.rev171013.map.register.grouping.MapRegister; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/MapRequestModeCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/MapRequestModeCustomizer.java index 42cf27a58..5991c47ff 100644 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/MapRequestModeCustomizer.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/MapRequestModeCustomizer.java @@ -25,9 +25,9 @@ import io.fd.hc2vpp.lisp.translate.util.CheckedLispCustomizer; import io.fd.honeycomb.translate.spi.write.WriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.OneMapRequestMode; -import io.fd.vpp.jvpp.core.dto.OneMapRequestModeReply; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.OneMapRequestMode; +import io.fd.jvpp.core.dto.OneMapRequestModeReply; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.concurrent.CompletableFuture; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.lisp.rev171013.map.request.mode.grouping.MapRequestMode; diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/MapResolverCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/MapResolverCustomizer.java index bccf90b03..de5a51393 100755 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/MapResolverCustomizer.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/MapResolverCustomizer.java @@ -25,9 +25,9 @@ import io.fd.hc2vpp.lisp.translate.util.CheckedLispCustomizer; import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.VppBaseCallException; -import io.fd.vpp.jvpp.core.dto.OneAddDelMapResolver; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.VppBaseCallException; +import io.fd.jvpp.core.dto.OneAddDelMapResolver; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.concurrent.TimeoutException; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.lisp.rev171013.map.resolvers.grouping.map.resolvers.MapResolver; diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/MapServerCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/MapServerCustomizer.java index c0a7268a2..23a490c46 100644 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/MapServerCustomizer.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/MapServerCustomizer.java @@ -23,8 +23,8 @@ import io.fd.hc2vpp.lisp.translate.util.CheckedLispCustomizer; import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.OneAddDelMapServer; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.OneAddDelMapServer; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.lisp.rev171013.map.servers.grouping.map.servers.MapServer; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.lisp.rev171013.map.servers.grouping.map.servers.MapServerKey; diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/PetrCfgCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/PetrCfgCustomizer.java index 26bd0598d..7562bb7f3 100644 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/PetrCfgCustomizer.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/PetrCfgCustomizer.java @@ -25,8 +25,8 @@ import io.fd.hc2vpp.lisp.translate.util.CheckedLispCustomizer; import io.fd.honeycomb.translate.spi.write.WriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.OneUsePetr; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.OneUsePetr; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.lisp.rev171013.use.petr.cfg.grouping.PetrCfg; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress; diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/PitrCfgCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/PitrCfgCustomizer.java index b5db7b21b..ea7edeb05 100755 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/PitrCfgCustomizer.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/PitrCfgCustomizer.java @@ -26,9 +26,9 @@ import io.fd.hc2vpp.lisp.translate.util.CheckedLispCustomizer; import io.fd.honeycomb.translate.spi.write.WriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.VppBaseCallException; -import io.fd.vpp.jvpp.core.dto.OnePitrSetLocatorSet; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.VppBaseCallException; +import io.fd.jvpp.core.dto.OnePitrSetLocatorSet; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.concurrent.TimeoutException; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.lisp.rev171013.pitr.cfg.grouping.PitrCfg; diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/RemoteMappingCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/RemoteMappingCustomizer.java index 4b99a2be0..9e0c880b8 100755 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/RemoteMappingCustomizer.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/RemoteMappingCustomizer.java @@ -33,10 +33,10 @@ import io.fd.hc2vpp.lisp.translate.util.EidTranslator; import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.VppBaseCallException; -import io.fd.vpp.jvpp.core.dto.OneAddDelRemoteMapping; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; -import io.fd.vpp.jvpp.core.types.OneRemoteLocator; +import io.fd.jvpp.VppBaseCallException; +import io.fd.jvpp.core.dto.OneAddDelRemoteMapping; +import io.fd.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.types.OneRemoteLocator; import java.io.IOException; import java.util.Optional; import java.util.concurrent.TimeoutException; diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/RlocProbeCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/RlocProbeCustomizer.java index 60b89ac71..9daf5834b 100644 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/RlocProbeCustomizer.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/RlocProbeCustomizer.java @@ -23,8 +23,8 @@ import io.fd.hc2vpp.lisp.translate.util.CheckedLispCustomizer; import io.fd.honeycomb.translate.spi.write.WriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.OneRlocProbeEnableDisable; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.OneRlocProbeEnableDisable; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.lisp.rev171013.rloc.probing.grouping.RlocProbe; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/VniTableCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/VniTableCustomizer.java index 62427cac0..4a135ae01 100755 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/VniTableCustomizer.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/VniTableCustomizer.java @@ -25,7 +25,7 @@ import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer; import io.fd.honeycomb.translate.util.RWUtils; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.lisp.rev171013.eid.table.grouping.eid.table.VniTable; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.lisp.rev171013.eid.table.grouping.eid.table.VniTableKey; diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/VrfSubtableCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/VrfSubtableCustomizer.java index 7bb50aedf..1b9721490 100644 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/VrfSubtableCustomizer.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/VrfSubtableCustomizer.java @@ -23,8 +23,8 @@ import io.fd.hc2vpp.lisp.translate.write.trait.SubtableWriter; import io.fd.honeycomb.translate.spi.write.WriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.VppBaseCallException; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.VppBaseCallException; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.concurrent.TimeoutException; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.lisp.rev171013.eid.table.grouping.eid.table.vni.table.VrfSubtable; diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/trait/SubtableWriter.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/trait/SubtableWriter.java index 0591706ba..22fe61398 100644 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/trait/SubtableWriter.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/trait/SubtableWriter.java @@ -21,9 +21,9 @@ import static com.google.common.base.Preconditions.checkNotNull; import io.fd.hc2vpp.common.translate.util.ByteDataTranslator; import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; -import io.fd.vpp.jvpp.VppBaseCallException; -import io.fd.vpp.jvpp.core.dto.OneEidTableAddDelMap; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.VppBaseCallException; +import io.fd.jvpp.core.dto.OneEidTableAddDelMap; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.concurrent.TimeoutException; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.lisp.rev171013.eid.table.grouping.eid.table.VniTable; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/LispModuleTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/LispModuleTest.java index 10d4833e5..ffaf3206b 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/LispModuleTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/LispModuleTest.java @@ -34,7 +34,7 @@ import io.fd.honeycomb.translate.impl.write.registry.FlatWriterRegistryBuilder; import io.fd.honeycomb.translate.read.ReaderFactory; import io.fd.honeycomb.translate.util.YangDAG; import io.fd.honeycomb.translate.write.WriterFactory; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.HashSet; import java.util.Set; import org.junit.Before; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/GpeModuleTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/GpeModuleTest.java index 982239c80..c6d3e73e3 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/GpeModuleTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/GpeModuleTest.java @@ -35,7 +35,7 @@ import io.fd.honeycomb.translate.impl.write.registry.FlatWriterRegistryBuilder; import io.fd.honeycomb.translate.read.ReaderFactory; import io.fd.honeycomb.translate.util.YangDAG; import io.fd.honeycomb.translate.write.WriterFactory; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.HashSet; import java.util.Set; import org.junit.Before; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/read/GpeFeatureCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/read/GpeFeatureCustomizerTest.java index 40f350652..a6dce4257 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/read/GpeFeatureCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/read/GpeFeatureCustomizerTest.java @@ -23,7 +23,7 @@ import static org.mockito.Mockito.when; import io.fd.hc2vpp.common.test.read.InitializingReaderCustomizerTest; import io.fd.honeycomb.translate.read.ReadFailedException; -import io.fd.vpp.jvpp.core.dto.ShowLispStatusReply; +import io.fd.jvpp.core.dto.ShowLispStatusReply; import org.junit.Test; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.gpe.rev170801.Gpe; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.gpe.rev170801.GpeState; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/read/GpeForwardEntryCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/read/GpeForwardEntryCustomizerTest.java index 87c91a782..2447c0e15 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/read/GpeForwardEntryCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/read/GpeForwardEntryCustomizerTest.java @@ -29,14 +29,14 @@ import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.hc2vpp.lisp.gpe.translate.service.GpeStateCheckService; import io.fd.hc2vpp.lisp.translate.util.EidTranslator; import io.fd.honeycomb.translate.read.ReadFailedException; -import io.fd.vpp.jvpp.core.dto.GpeFwdEntriesGet; -import io.fd.vpp.jvpp.core.dto.GpeFwdEntriesGetReply; -import io.fd.vpp.jvpp.core.dto.GpeFwdEntryPathDetails; -import io.fd.vpp.jvpp.core.dto.GpeFwdEntryPathDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.GpeFwdEntryPathDump; -import io.fd.vpp.jvpp.core.dto.GpeFwdEntryVnisGetReply; -import io.fd.vpp.jvpp.core.types.GpeFwdEntry; -import io.fd.vpp.jvpp.core.types.GpeLocator; +import io.fd.jvpp.core.dto.GpeFwdEntriesGet; +import io.fd.jvpp.core.dto.GpeFwdEntriesGetReply; +import io.fd.jvpp.core.dto.GpeFwdEntryPathDetails; +import io.fd.jvpp.core.dto.GpeFwdEntryPathDetailsReplyDump; +import io.fd.jvpp.core.dto.GpeFwdEntryPathDump; +import io.fd.jvpp.core.dto.GpeFwdEntryVnisGetReply; +import io.fd.jvpp.core.types.GpeFwdEntry; +import io.fd.jvpp.core.types.GpeLocator; import java.util.Arrays; import java.util.Collections; import java.util.List; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/read/NativeForwardPathCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/read/NativeForwardPathCustomizerTest.java index 4ed94e838..5c15ec0bd 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/read/NativeForwardPathCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/read/NativeForwardPathCustomizerTest.java @@ -26,9 +26,9 @@ 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.ReaderCustomizer; -import io.fd.vpp.jvpp.core.dto.GpeNativeFwdRpathsGet; -import io.fd.vpp.jvpp.core.dto.GpeNativeFwdRpathsGetReply; -import io.fd.vpp.jvpp.core.types.GpeNativeFwdRpath; +import io.fd.jvpp.core.dto.GpeNativeFwdRpathsGet; +import io.fd.jvpp.core.dto.GpeNativeFwdRpathsGetReply; +import io.fd.jvpp.core.types.GpeNativeFwdRpath; import java.util.List; import org.junit.Test; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.gpe.rev170801.NativeForwardPathsTablesState; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/read/NativeForwardPathsTableCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/read/NativeForwardPathsTableCustomizerTest.java index fd7301996..7a96a8290 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/read/NativeForwardPathsTableCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/read/NativeForwardPathsTableCustomizerTest.java @@ -24,11 +24,11 @@ import static org.mockito.Mockito.when; import io.fd.hc2vpp.common.test.read.InitializingListReaderCustomizerTest; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.vpp.jvpp.core.dto.GpeNativeFwdRpathsGet; -import io.fd.vpp.jvpp.core.dto.Ip6FibDetails; -import io.fd.vpp.jvpp.core.dto.Ip6FibDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.IpFibDetails; -import io.fd.vpp.jvpp.core.dto.IpFibDetailsReplyDump; +import io.fd.jvpp.core.dto.GpeNativeFwdRpathsGet; +import io.fd.jvpp.core.dto.Ip6FibDetails; +import io.fd.jvpp.core.dto.Ip6FibDetailsReplyDump; +import io.fd.jvpp.core.dto.IpFibDetails; +import io.fd.jvpp.core.dto.IpFibDetailsReplyDump; import java.util.Arrays; import java.util.List; import org.junit.Test; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/write/GpeFeatureCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/write/GpeFeatureCustomizerTest.java index 41a662322..c9540e0a9 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/write/GpeFeatureCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/write/GpeFeatureCustomizerTest.java @@ -24,8 +24,8 @@ import static org.mockito.Mockito.when; import io.fd.hc2vpp.common.test.write.WriterCustomizerTest; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.GpeEnableDisable; -import io.fd.vpp.jvpp.core.dto.GpeEnableDisableReply; +import io.fd.jvpp.core.dto.GpeEnableDisable; +import io.fd.jvpp.core.dto.GpeEnableDisableReply; import org.junit.Test; import org.mockito.ArgumentCaptor; import org.mockito.Captor; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/write/GpeForwardEntryCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/write/GpeForwardEntryCustomizerTest.java index 11d38cf3d..920b0bcbb 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/write/GpeForwardEntryCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/write/GpeForwardEntryCustomizerTest.java @@ -34,9 +34,9 @@ import io.fd.honeycomb.test.tools.HoneycombTestRunner; import io.fd.honeycomb.test.tools.annotations.InjectTestData; import io.fd.honeycomb.test.tools.annotations.InjectablesProcessor; import io.fd.honeycomb.test.tools.annotations.SchemaContextProvider; -import io.fd.vpp.jvpp.core.dto.GpeAddDelFwdEntry; -import io.fd.vpp.jvpp.core.dto.GpeAddDelFwdEntryReply; -import io.fd.vpp.jvpp.core.types.GpeLocator; +import io.fd.jvpp.core.dto.GpeAddDelFwdEntry; +import io.fd.jvpp.core.dto.GpeAddDelFwdEntryReply; +import io.fd.jvpp.core.types.GpeLocator; import java.util.Arrays; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/write/NativeForwardPathCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/write/NativeForwardPathCustomizerTest.java index 938812d4e..0b6df3a8c 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/write/NativeForwardPathCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/write/NativeForwardPathCustomizerTest.java @@ -25,8 +25,8 @@ import static org.mockito.Mockito.when; import io.fd.hc2vpp.common.test.write.WriterCustomizerTest; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.GpeAddDelNativeFwdRpath; -import io.fd.vpp.jvpp.core.dto.GpeAddDelNativeFwdRpathReply; +import io.fd.jvpp.core.dto.GpeAddDelNativeFwdRpath; +import io.fd.jvpp.core.dto.GpeAddDelNativeFwdRpathReply; import org.junit.Test; import org.mockito.ArgumentCaptor; import org.mockito.Captor; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/write/NativeForwardPathsTableCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/write/NativeForwardPathsTableCustomizerTest.java index 479e4db20..87b0fbd81 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/write/NativeForwardPathsTableCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/write/NativeForwardPathsTableCustomizerTest.java @@ -24,9 +24,9 @@ import static org.mockito.Mockito.when; import io.fd.hc2vpp.common.test.write.WriterCustomizerTest; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.GpeAddDelIface; -import io.fd.vpp.jvpp.core.dto.GpeAddDelIfaceReply; -import io.fd.vpp.jvpp.core.dto.GpeAddDelNativeFwdRpathReply; +import io.fd.jvpp.core.dto.GpeAddDelIface; +import io.fd.jvpp.core.dto.GpeAddDelIfaceReply; +import io.fd.jvpp.core.dto.GpeAddDelNativeFwdRpathReply; import java.util.List; import org.junit.Test; import org.mockito.ArgumentCaptor; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/AdjacencyCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/AdjacencyCustomizerTest.java index 55c7d2e7f..a5b37d893 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/AdjacencyCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/AdjacencyCustomizerTest.java @@ -41,8 +41,8 @@ import io.fd.hc2vpp.lisp.translate.util.EidMetadataProvider; import io.fd.hc2vpp.lisp.util.AdjacencyMappingContextTestHelper; import io.fd.hc2vpp.lisp.util.EidMappingContextHelper; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.vpp.jvpp.core.dto.OneAdjacenciesGetReply; -import io.fd.vpp.jvpp.core.types.OneAdjacency; +import io.fd.jvpp.core.dto.OneAdjacenciesGetReply; +import io.fd.jvpp.core.types.OneAdjacency; import java.util.List; import org.junit.Before; import org.junit.Test; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/BridgeDomainSubtableCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/BridgeDomainSubtableCustomizerTest.java index c6c879152..8e6258f64 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/BridgeDomainSubtableCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/BridgeDomainSubtableCustomizerTest.java @@ -28,7 +28,7 @@ import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.hc2vpp.lisp.translate.read.trait.SubtableReaderTestCase; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.vpp.jvpp.VppCallbackException; +import io.fd.jvpp.VppCallbackException; import org.junit.Test; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.lisp.rev171013.eid.table.grouping.EidTable; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.lisp.rev171013.eid.table.grouping.eid.table.VniTable; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/InterfaceCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/InterfaceCustomizerTest.java index 80718299f..7662e0362 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/InterfaceCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/InterfaceCustomizerTest.java @@ -24,8 +24,8 @@ import io.fd.hc2vpp.common.test.read.ListReaderCustomizerTest; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.vpp.jvpp.core.dto.OneLocatorDetails; -import io.fd.vpp.jvpp.core.dto.OneLocatorDetailsReplyDump; +import io.fd.jvpp.core.dto.OneLocatorDetails; +import io.fd.jvpp.core.dto.OneLocatorDetailsReplyDump; import java.util.List; import org.junit.Before; import org.junit.Test; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/ItrRemoteLocatorSetCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/ItrRemoteLocatorSetCustomizerTest.java index d5fd198ea..c7a560794 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/ItrRemoteLocatorSetCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/ItrRemoteLocatorSetCustomizerTest.java @@ -28,9 +28,9 @@ import static org.mockito.Mockito.when; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.vpp.jvpp.VppCallbackException; -import io.fd.vpp.jvpp.core.dto.OneGetMapRequestItrRlocs; -import io.fd.vpp.jvpp.core.dto.OneGetMapRequestItrRlocsReply; +import io.fd.jvpp.VppCallbackException; +import io.fd.jvpp.core.dto.OneGetMapRequestItrRlocs; +import io.fd.jvpp.core.dto.OneGetMapRequestItrRlocsReply; import java.nio.charset.StandardCharsets; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/LispStateCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/LispStateCustomizerTest.java index d0232d248..4ac7a241a 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/LispStateCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/LispStateCustomizerTest.java @@ -34,9 +34,9 @@ import io.fd.honeycomb.test.tools.annotations.InjectablesProcessor; import io.fd.honeycomb.test.tools.annotations.SchemaContextProvider; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.vpp.jvpp.core.dto.OneLocatorSetDetails; -import io.fd.vpp.jvpp.core.dto.OneLocatorSetDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.ShowOneStatusReply; +import io.fd.jvpp.core.dto.OneLocatorSetDetails; +import io.fd.jvpp.core.dto.OneLocatorSetDetailsReplyDump; +import io.fd.jvpp.core.dto.ShowOneStatusReply; import java.nio.charset.StandardCharsets; import java.util.Arrays; import org.junit.Before; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/LocalMappingCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/LocalMappingCustomizerTest.java index 3357f9bbb..3ccea1104 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/LocalMappingCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/LocalMappingCustomizerTest.java @@ -31,8 +31,8 @@ import io.fd.hc2vpp.lisp.translate.util.EidTranslator; import io.fd.honeycomb.translate.MappingContext; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.vpp.jvpp.core.dto.OneEidTableDetails; -import io.fd.vpp.jvpp.core.dto.OneEidTableDetailsReplyDump; +import io.fd.jvpp.core.dto.OneEidTableDetails; +import io.fd.jvpp.core.dto.OneEidTableDetailsReplyDump; import java.nio.charset.StandardCharsets; import java.util.List; import org.junit.Test; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/LocatorSetCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/LocatorSetCustomizerTest.java index 1c4a8a900..6752a5643 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/LocatorSetCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/LocatorSetCustomizerTest.java @@ -25,8 +25,8 @@ import com.google.common.collect.ImmutableList; import io.fd.honeycomb.test.tools.HoneycombTestRunner; import io.fd.honeycomb.test.tools.annotations.InjectTestData; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.vpp.jvpp.core.dto.OneLocatorSetDetails; -import io.fd.vpp.jvpp.core.dto.OneLocatorSetDetailsReplyDump; +import io.fd.jvpp.core.dto.OneLocatorSetDetails; +import io.fd.jvpp.core.dto.OneLocatorSetDetailsReplyDump; import java.nio.charset.StandardCharsets; import java.util.List; import org.junit.Before; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/MapRegisterCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/MapRegisterCustomizerTest.java index 6b8cc768d..bc87147b7 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/MapRegisterCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/MapRegisterCustomizerTest.java @@ -23,9 +23,9 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.vpp.jvpp.core.dto.ShowOneMapRegisterFallbackThresholdReply; -import io.fd.vpp.jvpp.core.dto.ShowOneMapRegisterStateReply; -import io.fd.vpp.jvpp.core.dto.ShowOneMapRegisterTtlReply; +import io.fd.jvpp.core.dto.ShowOneMapRegisterFallbackThresholdReply; +import io.fd.jvpp.core.dto.ShowOneMapRegisterStateReply; +import io.fd.jvpp.core.dto.ShowOneMapRegisterTtlReply; import org.junit.Before; import org.junit.Test; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.lisp.rev171013.lisp.feature.data.grouping.LispFeatureDataBuilder; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/MapRequestModeCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/MapRequestModeCustomizerTest.java index ea27d2ec5..c4e1238f5 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/MapRequestModeCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/MapRequestModeCustomizerTest.java @@ -22,7 +22,7 @@ import static org.mockito.Mockito.when; import static org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.lisp.rev171013.MapRequestMode.DestinationOnly; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.vpp.jvpp.core.dto.ShowOneMapRequestModeReply; +import io.fd.jvpp.core.dto.ShowOneMapRequestModeReply; import org.junit.Before; import org.junit.Test; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.lisp.rev171013.lisp.feature.data.grouping.LispFeatureDataBuilder; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/MapResolverCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/MapResolverCustomizerTest.java index d69e3b42c..4419b481e 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/MapResolverCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/MapResolverCustomizerTest.java @@ -23,8 +23,8 @@ import static org.mockito.Mockito.when; import com.google.common.collect.ImmutableList; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.vpp.jvpp.core.dto.OneMapResolverDetails; -import io.fd.vpp.jvpp.core.dto.OneMapResolverDetailsReplyDump; +import io.fd.jvpp.core.dto.OneMapResolverDetails; +import io.fd.jvpp.core.dto.OneMapResolverDetailsReplyDump; import java.util.List; import org.junit.Before; import org.junit.Test; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/MapServerCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/MapServerCustomizerTest.java index cba9d71c9..711a0d632 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/MapServerCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/MapServerCustomizerTest.java @@ -24,9 +24,9 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.vpp.jvpp.core.dto.OneMapServerDetails; -import io.fd.vpp.jvpp.core.dto.OneMapServerDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.OneMapServerDump; +import io.fd.jvpp.core.dto.OneMapServerDetails; +import io.fd.jvpp.core.dto.OneMapServerDetailsReplyDump; +import io.fd.jvpp.core.dto.OneMapServerDump; import java.util.Arrays; import java.util.List; import org.junit.Before; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/PetrCfgCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/PetrCfgCustomizerTest.java index 1bdd9b7bf..b196fad5e 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/PetrCfgCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/PetrCfgCustomizerTest.java @@ -22,7 +22,7 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.vpp.jvpp.core.dto.ShowOneUsePetrReply; +import io.fd.jvpp.core.dto.ShowOneUsePetrReply; import org.junit.Test; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.lisp.rev171013.lisp.feature.data.grouping.LispFeatureDataBuilder; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.lisp.rev171013.use.petr.cfg.grouping.PetrCfg; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/PitrCfgCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/PitrCfgCustomizerTest.java index d67ff2425..2897e3cc1 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/PitrCfgCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/PitrCfgCustomizerTest.java @@ -22,7 +22,7 @@ import static org.mockito.Matchers.any; import static org.mockito.Mockito.when; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.vpp.jvpp.core.dto.ShowOnePitrReply; +import io.fd.jvpp.core.dto.ShowOnePitrReply; import java.nio.charset.StandardCharsets; import org.junit.Before; import org.junit.Test; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/RemoteMappingCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/RemoteMappingCustomizerTest.java index 14b03fe2b..57cd7fd58 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/RemoteMappingCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/RemoteMappingCustomizerTest.java @@ -29,10 +29,10 @@ import io.fd.hc2vpp.lisp.context.util.EidMappingContext; import io.fd.hc2vpp.lisp.translate.util.EidTranslator; import io.fd.honeycomb.translate.MappingContext; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.vpp.jvpp.core.dto.OneEidTableDetails; -import io.fd.vpp.jvpp.core.dto.OneEidTableDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.OneLocatorDetails; -import io.fd.vpp.jvpp.core.dto.OneLocatorDetailsReplyDump; +import io.fd.jvpp.core.dto.OneEidTableDetails; +import io.fd.jvpp.core.dto.OneEidTableDetailsReplyDump; +import io.fd.jvpp.core.dto.OneLocatorDetails; +import io.fd.jvpp.core.dto.OneLocatorDetailsReplyDump; import java.util.Collections; import java.util.List; import org.junit.Before; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/RlocProbeCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/RlocProbeCustomizerTest.java index 91b8038af..263483f7c 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/RlocProbeCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/RlocProbeCustomizerTest.java @@ -21,7 +21,7 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.vpp.jvpp.core.dto.ShowOneRlocProbeStateReply; +import io.fd.jvpp.core.dto.ShowOneRlocProbeStateReply; import org.junit.Before; import org.junit.Test; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.lisp.rev171013.lisp.feature.data.grouping.LispFeatureDataBuilder; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/VniTableCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/VniTableCustomizerTest.java index 6f5d7344c..ce2b6a99d 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/VniTableCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/VniTableCustomizerTest.java @@ -26,9 +26,9 @@ import static org.mockito.Mockito.when; import com.google.common.collect.ImmutableList; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.vpp.jvpp.VppCallbackException; -import io.fd.vpp.jvpp.core.dto.OneEidTableVniDetails; -import io.fd.vpp.jvpp.core.dto.OneEidTableVniDetailsReplyDump; +import io.fd.jvpp.VppCallbackException; +import io.fd.jvpp.core.dto.OneEidTableVniDetails; +import io.fd.jvpp.core.dto.OneEidTableVniDetailsReplyDump; import java.util.List; import java.util.concurrent.CompletableFuture; import org.junit.Before; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/VrfSubtableCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/VrfSubtableCustomizerTest.java index c08f85098..57b553657 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/VrfSubtableCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/VrfSubtableCustomizerTest.java @@ -27,7 +27,7 @@ import static org.junit.Assert.fail; import io.fd.hc2vpp.lisp.translate.read.trait.SubtableReaderTestCase; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.vpp.jvpp.VppCallbackException; +import io.fd.jvpp.VppCallbackException; import org.junit.Before; import org.junit.Test; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.lisp.rev171013.eid.table.grouping.EidTable; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/trait/SubtableReaderTestCase.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/trait/SubtableReaderTestCase.java index 225b2c39e..8cd2235a5 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/trait/SubtableReaderTestCase.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/trait/SubtableReaderTestCase.java @@ -26,9 +26,9 @@ import static org.mockito.Mockito.when; import com.google.common.collect.ImmutableList; import io.fd.hc2vpp.common.test.read.ReaderCustomizerTest; -import io.fd.vpp.jvpp.core.dto.OneEidTableMapDetails; -import io.fd.vpp.jvpp.core.dto.OneEidTableMapDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.OneEidTableMapDump; +import io.fd.jvpp.core.dto.OneEidTableMapDetails; +import io.fd.jvpp.core.dto.OneEidTableMapDetailsReplyDump; +import io.fd.jvpp.core.dto.OneEidTableMapDump; import java.util.Collections; import javax.annotation.Nonnull; import org.mockito.ArgumentCaptor; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/service/LispStateCheckServiceImplTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/service/LispStateCheckServiceImplTest.java index b65a0b8a6..294bd5466 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/service/LispStateCheckServiceImplTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/service/LispStateCheckServiceImplTest.java @@ -27,8 +27,8 @@ import io.fd.hc2vpp.common.test.util.FutureProducer; import io.fd.honeycomb.translate.ModificationCache; import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.write.WriteContext; -import io.fd.vpp.jvpp.core.dto.ShowOneStatusReply; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.ShowOneStatusReply; +import io.fd.jvpp.core.future.FutureJVppCore; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/AdjacencyCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/AdjacencyCustomizerTest.java index 810d4c112..af8305946 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/AdjacencyCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/AdjacencyCustomizerTest.java @@ -37,8 +37,8 @@ import io.fd.hc2vpp.common.test.write.WriterCustomizerTest; import io.fd.hc2vpp.lisp.context.util.AdjacenciesMappingContext; import io.fd.hc2vpp.lisp.context.util.EidMappingContext; import io.fd.hc2vpp.lisp.util.EidMappingContextHelper; -import io.fd.vpp.jvpp.core.dto.OneAddDelAdjacency; -import io.fd.vpp.jvpp.core.dto.OneAddDelAdjacencyReply; +import io.fd.jvpp.core.dto.OneAddDelAdjacency; +import io.fd.jvpp.core.dto.OneAddDelAdjacencyReply; import org.junit.Before; import org.junit.Test; import org.mockito.ArgumentCaptor; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/BridgeDomainCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/BridgeDomainCustomizerTest.java index 940b9bd02..11fc3d30e 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/BridgeDomainCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/BridgeDomainCustomizerTest.java @@ -23,7 +23,7 @@ import static org.junit.Assert.fail; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.hc2vpp.lisp.translate.write.trait.SubtableWriterTestCase; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.VppCallbackException; +import io.fd.jvpp.VppCallbackException; import org.junit.Before; import org.junit.Test; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.lisp.rev171013.eid.table.grouping.EidTable; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/InterfaceCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/InterfaceCustomizerTest.java index 5f18852f8..70c24a4b3 100755 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/InterfaceCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/InterfaceCustomizerTest.java @@ -28,8 +28,8 @@ import io.fd.hc2vpp.common.test.write.WriterCustomizerTest; import io.fd.hc2vpp.common.translate.util.ByteDataTranslator; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.OneAddDelLocator; -import io.fd.vpp.jvpp.core.dto.OneAddDelLocatorReply; +import io.fd.jvpp.core.dto.OneAddDelLocator; +import io.fd.jvpp.core.dto.OneAddDelLocatorReply; import org.junit.Test; import org.mockito.ArgumentCaptor; import org.mockito.Captor; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/ItrRemoteLocatorSetCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/ItrRemoteLocatorSetCustomizerTest.java index f1fa8de24..7f401a8d3 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/ItrRemoteLocatorSetCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/ItrRemoteLocatorSetCustomizerTest.java @@ -28,9 +28,9 @@ import static org.mockito.MockitoAnnotations.initMocks; import io.fd.hc2vpp.common.translate.util.ByteDataTranslator; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.VppCallbackException; -import io.fd.vpp.jvpp.core.dto.OneAddDelMapRequestItrRlocs; -import io.fd.vpp.jvpp.core.dto.OneAddDelMapRequestItrRlocsReply; +import io.fd.jvpp.VppCallbackException; +import io.fd.jvpp.core.dto.OneAddDelMapRequestItrRlocs; +import io.fd.jvpp.core.dto.OneAddDelMapRequestItrRlocsReply; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/LispCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/LispCustomizerTest.java index 193fd95e3..bc9443a49 100755 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/LispCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/LispCustomizerTest.java @@ -25,8 +25,8 @@ import static org.mockito.Mockito.when; import io.fd.hc2vpp.common.test.write.WriterCustomizerTest; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.OneEnableDisable; -import io.fd.vpp.jvpp.core.dto.OneEnableDisableReply; +import io.fd.jvpp.core.dto.OneEnableDisable; +import io.fd.jvpp.core.dto.OneEnableDisableReply; import org.junit.Test; import org.mockito.ArgumentCaptor; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.lisp.rev171013.Lisp; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/LocalMappingCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/LocalMappingCustomizerTest.java index c645d710f..8a6076e8b 100755 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/LocalMappingCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/LocalMappingCustomizerTest.java @@ -32,8 +32,8 @@ import io.fd.hc2vpp.common.translate.util.ByteDataTranslator; import io.fd.hc2vpp.common.translate.util.Ipv4Translator; import io.fd.hc2vpp.lisp.context.util.EidMappingContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.OneAddDelLocalEid; -import io.fd.vpp.jvpp.core.dto.OneAddDelLocalEidReply; +import io.fd.jvpp.core.dto.OneAddDelLocalEid; +import io.fd.jvpp.core.dto.OneAddDelLocalEidReply; import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.concurrent.ExecutionException; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/LocatorSetCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/LocatorSetCustomizerTest.java index 02f5f78a1..b8ad46b6f 100755 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/LocatorSetCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/LocatorSetCustomizerTest.java @@ -30,10 +30,10 @@ import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.OneAddDelLocatorSet; -import io.fd.vpp.jvpp.core.dto.OneAddDelLocatorSetReply; -import io.fd.vpp.jvpp.core.dto.OneLocatorSetDetails; -import io.fd.vpp.jvpp.core.dto.OneLocatorSetDetailsReplyDump; +import io.fd.jvpp.core.dto.OneAddDelLocatorSet; +import io.fd.jvpp.core.dto.OneAddDelLocatorSetReply; +import io.fd.jvpp.core.dto.OneLocatorSetDetails; +import io.fd.jvpp.core.dto.OneLocatorSetDetailsReplyDump; import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.concurrent.ExecutionException; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/MapRegisterCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/MapRegisterCustomizerTest.java index 729758be6..52873f9dd 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/MapRegisterCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/MapRegisterCustomizerTest.java @@ -27,12 +27,12 @@ import static org.mockito.Mockito.when; import io.fd.hc2vpp.common.translate.util.ByteDataTranslator; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.OneMapRegisterEnableDisable; -import io.fd.vpp.jvpp.core.dto.OneMapRegisterEnableDisableReply; -import io.fd.vpp.jvpp.core.dto.OneMapRegisterFallbackThreshold; -import io.fd.vpp.jvpp.core.dto.OneMapRegisterFallbackThresholdReply; -import io.fd.vpp.jvpp.core.dto.OneMapRegisterSetTtl; -import io.fd.vpp.jvpp.core.dto.OneMapRegisterSetTtlReply; +import io.fd.jvpp.core.dto.OneMapRegisterEnableDisable; +import io.fd.jvpp.core.dto.OneMapRegisterEnableDisableReply; +import io.fd.jvpp.core.dto.OneMapRegisterFallbackThreshold; +import io.fd.jvpp.core.dto.OneMapRegisterFallbackThresholdReply; +import io.fd.jvpp.core.dto.OneMapRegisterSetTtl; +import io.fd.jvpp.core.dto.OneMapRegisterSetTtlReply; import org.junit.Test; import org.mockito.ArgumentCaptor; import org.mockito.Captor; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/MapRequestModeCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/MapRequestModeCustomizerTest.java index ba6d9714e..776c3029d 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/MapRequestModeCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/MapRequestModeCustomizerTest.java @@ -27,8 +27,8 @@ import static org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.lisp.rev171013 import static org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.lisp.rev171013.MapRequestMode.SourceDestination; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.OneMapRequestMode; -import io.fd.vpp.jvpp.core.dto.OneMapRequestModeReply; +import io.fd.jvpp.core.dto.OneMapRequestMode; +import io.fd.jvpp.core.dto.OneMapRequestModeReply; import org.junit.Test; import org.mockito.ArgumentCaptor; import org.mockito.Captor; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/MapResolverCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/MapResolverCustomizerTest.java index dbd371800..7ecbc8ad7 100755 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/MapResolverCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/MapResolverCustomizerTest.java @@ -26,8 +26,8 @@ import static org.mockito.Mockito.when; import io.fd.hc2vpp.common.translate.util.Ipv4Translator; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.OneAddDelMapResolver; -import io.fd.vpp.jvpp.core.dto.OneAddDelMapResolverReply; +import io.fd.jvpp.core.dto.OneAddDelMapResolver; +import io.fd.jvpp.core.dto.OneAddDelMapResolverReply; import java.util.concurrent.ExecutionException; import org.junit.Test; import org.mockito.ArgumentCaptor; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/MapServerCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/MapServerCustomizerTest.java index ba21d22b7..c0cfb5752 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/MapServerCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/MapServerCustomizerTest.java @@ -27,8 +27,8 @@ import static org.mockito.Mockito.when; import io.fd.hc2vpp.common.translate.util.ByteDataTranslator; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.OneAddDelMapServer; -import io.fd.vpp.jvpp.core.dto.OneAddDelMapServerReply; +import io.fd.jvpp.core.dto.OneAddDelMapServer; +import io.fd.jvpp.core.dto.OneAddDelMapServerReply; import java.util.Arrays; import org.junit.Test; import org.mockito.ArgumentCaptor; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/PetrCfgCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/PetrCfgCustomizerTest.java index 8b37a7e71..b33511348 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/PetrCfgCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/PetrCfgCustomizerTest.java @@ -27,8 +27,8 @@ import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.OneUsePetr; -import io.fd.vpp.jvpp.core.dto.OneUsePetrReply; +import io.fd.jvpp.core.dto.OneUsePetr; +import io.fd.jvpp.core.dto.OneUsePetrReply; import java.util.Arrays; import org.junit.Test; import org.mockito.ArgumentCaptor; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/PitrCfgCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/PitrCfgCustomizerTest.java index e9ee71a2c..5fb7f958b 100755 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/PitrCfgCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/PitrCfgCustomizerTest.java @@ -26,8 +26,8 @@ import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.OnePitrSetLocatorSet; -import io.fd.vpp.jvpp.core.dto.OnePitrSetLocatorSetReply; +import io.fd.jvpp.core.dto.OnePitrSetLocatorSet; +import io.fd.jvpp.core.dto.OnePitrSetLocatorSetReply; import java.util.concurrent.ExecutionException; import org.junit.Test; import org.mockito.ArgumentCaptor; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/RemoteMappingCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/RemoteMappingCustomizerTest.java index ee3b85318..52e7eb94c 100755 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/RemoteMappingCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/RemoteMappingCustomizerTest.java @@ -33,9 +33,9 @@ import io.fd.hc2vpp.common.test.write.WriterCustomizerTest; import io.fd.hc2vpp.common.translate.util.Ipv4Translator; import io.fd.hc2vpp.lisp.context.util.EidMappingContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.OneAddDelRemoteMapping; -import io.fd.vpp.jvpp.core.dto.OneAddDelRemoteMappingReply; -import io.fd.vpp.jvpp.core.types.OneRemoteLocator; +import io.fd.jvpp.core.dto.OneAddDelRemoteMapping; +import io.fd.jvpp.core.dto.OneAddDelRemoteMappingReply; +import io.fd.jvpp.core.types.OneRemoteLocator; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/RlocProbeCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/RlocProbeCustomizerTest.java index e1303179e..9b2c9ccb8 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/RlocProbeCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/RlocProbeCustomizerTest.java @@ -26,8 +26,8 @@ import static org.mockito.Mockito.when; import io.fd.hc2vpp.common.translate.util.ByteDataTranslator; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.OneRlocProbeEnableDisable; -import io.fd.vpp.jvpp.core.dto.OneRlocProbeEnableDisableReply; +import io.fd.jvpp.core.dto.OneRlocProbeEnableDisable; +import io.fd.jvpp.core.dto.OneRlocProbeEnableDisableReply; import org.junit.Test; import org.mockito.ArgumentCaptor; import org.mockito.Captor; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/VrfSubtableCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/VrfSubtableCustomizerTest.java index 80987e5fe..d9ec3375e 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/VrfSubtableCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/VrfSubtableCustomizerTest.java @@ -22,7 +22,7 @@ import static org.junit.Assert.fail; import io.fd.hc2vpp.lisp.translate.write.trait.SubtableWriterTestCase; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.VppCallbackException; +import io.fd.jvpp.VppCallbackException; import org.junit.Before; import org.junit.Test; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.lisp.rev171013.eid.table.grouping.EidTable; diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/trait/SubtableWriterTestCase.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/trait/SubtableWriterTestCase.java index 64fd742e0..f9c0815bd 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/trait/SubtableWriterTestCase.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/trait/SubtableWriterTestCase.java @@ -24,8 +24,8 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import io.fd.hc2vpp.common.test.write.WriterCustomizerTest; -import io.fd.vpp.jvpp.core.dto.OneEidTableAddDelMap; -import io.fd.vpp.jvpp.core.dto.OneEidTableAddDelMapReply; +import io.fd.jvpp.core.dto.OneEidTableAddDelMap; +import io.fd.jvpp.core.dto.OneEidTableAddDelMapReply; import org.mockito.ArgumentCaptor; import org.mockito.Captor; import org.mockito.Mockito; diff --git a/mpls/impl/src/main/java/io/fd/hc2vpp/mpls/ImposeAndForwardWriter.java b/mpls/impl/src/main/java/io/fd/hc2vpp/mpls/ImposeAndForwardWriter.java index 3402f8526..2525d94d2 100644 --- a/mpls/impl/src/main/java/io/fd/hc2vpp/mpls/ImposeAndForwardWriter.java +++ b/mpls/impl/src/main/java/io/fd/hc2vpp/mpls/ImposeAndForwardWriter.java @@ -23,9 +23,9 @@ import io.fd.hc2vpp.common.translate.util.MplsLabelTranslator; 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.core.dto.IpAddDelRoute; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; -import io.fd.vpp.jvpp.core.types.FibMplsLabel; +import io.fd.jvpp.core.dto.IpAddDelRoute; +import io.fd.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.types.FibMplsLabel; import java.util.List; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress; diff --git a/mpls/impl/src/main/java/io/fd/hc2vpp/mpls/Ipv4LookupWriter.java b/mpls/impl/src/main/java/io/fd/hc2vpp/mpls/Ipv4LookupWriter.java index 338e2bcf8..ae695c561 100644 --- a/mpls/impl/src/main/java/io/fd/hc2vpp/mpls/Ipv4LookupWriter.java +++ b/mpls/impl/src/main/java/io/fd/hc2vpp/mpls/Ipv4LookupWriter.java @@ -20,9 +20,9 @@ import static com.google.common.base.Preconditions.checkArgument; import io.fd.honeycomb.translate.MappingContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.MplsRouteAddDel; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; -import io.fd.vpp.jvpp.core.types.FibMplsLabel; +import io.fd.jvpp.core.dto.MplsRouteAddDel; +import io.fd.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.types.FibMplsLabel; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.mpls.rev171120.LookupType; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.mpls.rev171120.StaticLspVppLookupAugmentation; diff --git a/mpls/impl/src/main/java/io/fd/hc2vpp/mpls/MplsInSegmentTranslator.java b/mpls/impl/src/main/java/io/fd/hc2vpp/mpls/MplsInSegmentTranslator.java index 110d3714e..b56543a5a 100644 --- a/mpls/impl/src/main/java/io/fd/hc2vpp/mpls/MplsInSegmentTranslator.java +++ b/mpls/impl/src/main/java/io/fd/hc2vpp/mpls/MplsInSegmentTranslator.java @@ -18,7 +18,7 @@ package io.fd.hc2vpp.mpls; import static com.google.common.base.Preconditions.checkArgument; -import io.fd.vpp.jvpp.core.dto.MplsRouteAddDel; +import io.fd.jvpp.core.dto.MplsRouteAddDel; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.mpls._static.rev170702.in.segment.InSegment; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.mpls._static.rev170702.in.segment_config.Type; diff --git a/mpls/impl/src/main/java/io/fd/hc2vpp/mpls/MplsInterfaceCustomizer.java b/mpls/impl/src/main/java/io/fd/hc2vpp/mpls/MplsInterfaceCustomizer.java index 718a69924..6864d6bf4 100644 --- a/mpls/impl/src/main/java/io/fd/hc2vpp/mpls/MplsInterfaceCustomizer.java +++ b/mpls/impl/src/main/java/io/fd/hc2vpp/mpls/MplsInterfaceCustomizer.java @@ -26,9 +26,9 @@ import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.MplsTableAddDel; -import io.fd.vpp.jvpp.core.dto.SwInterfaceSetMplsEnable; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.MplsTableAddDel; +import io.fd.jvpp.core.dto.SwInterfaceSetMplsEnable; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.mpls.rev170702.interfaces.mpls.Interface; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.mpls.rev170702.interfaces.mpls.InterfaceKey; diff --git a/mpls/impl/src/main/java/io/fd/hc2vpp/mpls/MplsLookupWriter.java b/mpls/impl/src/main/java/io/fd/hc2vpp/mpls/MplsLookupWriter.java index fff0624cd..e47e2df5b 100644 --- a/mpls/impl/src/main/java/io/fd/hc2vpp/mpls/MplsLookupWriter.java +++ b/mpls/impl/src/main/java/io/fd/hc2vpp/mpls/MplsLookupWriter.java @@ -20,9 +20,9 @@ import static com.google.common.base.Preconditions.checkArgument; import io.fd.honeycomb.translate.MappingContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.MplsRouteAddDel; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; -import io.fd.vpp.jvpp.core.types.FibMplsLabel; +import io.fd.jvpp.core.dto.MplsRouteAddDel; +import io.fd.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.types.FibMplsLabel; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.mpls.rev171120.LookupType; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.mpls.rev171120.StaticLspVppLookupAugmentation; diff --git a/mpls/impl/src/main/java/io/fd/hc2vpp/mpls/MplsSwapWriter.java b/mpls/impl/src/main/java/io/fd/hc2vpp/mpls/MplsSwapWriter.java index 170cffd40..3365286d5 100644 --- a/mpls/impl/src/main/java/io/fd/hc2vpp/mpls/MplsSwapWriter.java +++ b/mpls/impl/src/main/java/io/fd/hc2vpp/mpls/MplsSwapWriter.java @@ -23,9 +23,9 @@ import io.fd.hc2vpp.common.translate.util.MplsLabelTranslator; 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.core.dto.MplsRouteAddDel; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; -import io.fd.vpp.jvpp.core.types.FibMplsLabel; +import io.fd.jvpp.core.dto.MplsRouteAddDel; +import io.fd.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.types.FibMplsLabel; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address; diff --git a/mpls/impl/src/main/java/io/fd/hc2vpp/mpls/MplsWriterFactory.java b/mpls/impl/src/main/java/io/fd/hc2vpp/mpls/MplsWriterFactory.java index 7d24dd08c..987f6b636 100644 --- a/mpls/impl/src/main/java/io/fd/hc2vpp/mpls/MplsWriterFactory.java +++ b/mpls/impl/src/main/java/io/fd/hc2vpp/mpls/MplsWriterFactory.java @@ -24,7 +24,7 @@ import io.fd.honeycomb.translate.impl.write.GenericListWriter; import io.fd.honeycomb.translate.impl.write.GenericWriter; import io.fd.honeycomb.translate.write.WriterFactory; import io.fd.honeycomb.translate.write.registry.ModifiableWriterRegistryBuilder; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.mpls.rev171120.StaticLspVppLookupAugmentation; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.mpls.rev171120.vpp.label.lookup.attributes.LabelLookup; diff --git a/mpls/impl/src/main/java/io/fd/hc2vpp/mpls/StaticLspCustomizer.java b/mpls/impl/src/main/java/io/fd/hc2vpp/mpls/StaticLspCustomizer.java index 29fa006a2..b079b62bc 100644 --- a/mpls/impl/src/main/java/io/fd/hc2vpp/mpls/StaticLspCustomizer.java +++ b/mpls/impl/src/main/java/io/fd/hc2vpp/mpls/StaticLspCustomizer.java @@ -27,7 +27,7 @@ import io.fd.honeycomb.translate.MappingContext; import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.mpls.rev171120.LookupType; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.mpls.rev171120.StaticLspVppLookupAugmentation; diff --git a/mpls/impl/src/test/java/io/fd/hc2vpp/mpls/ImposeAndForwardTest.java b/mpls/impl/src/test/java/io/fd/hc2vpp/mpls/ImposeAndForwardTest.java index bcd888bef..13ec86056 100644 --- a/mpls/impl/src/test/java/io/fd/hc2vpp/mpls/ImposeAndForwardTest.java +++ b/mpls/impl/src/test/java/io/fd/hc2vpp/mpls/ImposeAndForwardTest.java @@ -26,10 +26,10 @@ import io.fd.hc2vpp.common.translate.util.ByteDataTranslator; import io.fd.hc2vpp.common.translate.util.MplsLabelTranslator; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.IpAddDelRoute; -import io.fd.vpp.jvpp.core.dto.IpAddDelRouteReply; -import io.fd.vpp.jvpp.core.future.FutureJVppCoreFacade; -import io.fd.vpp.jvpp.core.types.FibMplsLabel; +import io.fd.jvpp.core.dto.IpAddDelRoute; +import io.fd.jvpp.core.dto.IpAddDelRouteReply; +import io.fd.jvpp.core.future.FutureJVppCoreFacade; +import io.fd.jvpp.core.types.FibMplsLabel; import java.util.Arrays; import java.util.Collections; import org.junit.Test; diff --git a/mpls/impl/src/test/java/io/fd/hc2vpp/mpls/MplsInterfaceCustomizerTest.java b/mpls/impl/src/test/java/io/fd/hc2vpp/mpls/MplsInterfaceCustomizerTest.java index 1a86102cc..d3850305a 100644 --- a/mpls/impl/src/test/java/io/fd/hc2vpp/mpls/MplsInterfaceCustomizerTest.java +++ b/mpls/impl/src/test/java/io/fd/hc2vpp/mpls/MplsInterfaceCustomizerTest.java @@ -24,11 +24,11 @@ import io.fd.hc2vpp.common.test.write.WriterCustomizerTest; import io.fd.hc2vpp.common.translate.util.ByteDataTranslator; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.MplsTableAddDel; -import io.fd.vpp.jvpp.core.dto.MplsTableAddDelReply; -import io.fd.vpp.jvpp.core.dto.SwInterfaceSetMplsEnable; -import io.fd.vpp.jvpp.core.dto.SwInterfaceSetMplsEnableReply; -import io.fd.vpp.jvpp.core.future.FutureJVppCoreFacade; +import io.fd.jvpp.core.dto.MplsTableAddDel; +import io.fd.jvpp.core.dto.MplsTableAddDelReply; +import io.fd.jvpp.core.dto.SwInterfaceSetMplsEnable; +import io.fd.jvpp.core.dto.SwInterfaceSetMplsEnableReply; +import io.fd.jvpp.core.future.FutureJVppCoreFacade; import org.junit.Test; import org.mockito.Mock; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.mpls.rev170702.Routing1; diff --git a/mpls/impl/src/test/java/io/fd/hc2vpp/mpls/PopAndIpv4LookupTest.java b/mpls/impl/src/test/java/io/fd/hc2vpp/mpls/PopAndIpv4LookupTest.java index 6aade405d..18f5e736f 100644 --- a/mpls/impl/src/test/java/io/fd/hc2vpp/mpls/PopAndIpv4LookupTest.java +++ b/mpls/impl/src/test/java/io/fd/hc2vpp/mpls/PopAndIpv4LookupTest.java @@ -24,10 +24,10 @@ import io.fd.hc2vpp.common.test.write.WriterCustomizerTest; import io.fd.hc2vpp.common.translate.util.ByteDataTranslator; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.MplsRouteAddDel; -import io.fd.vpp.jvpp.core.dto.MplsRouteAddDelReply; -import io.fd.vpp.jvpp.core.future.FutureJVppCoreFacade; -import io.fd.vpp.jvpp.core.types.FibMplsLabel; +import io.fd.jvpp.core.dto.MplsRouteAddDel; +import io.fd.jvpp.core.dto.MplsRouteAddDelReply; +import io.fd.jvpp.core.future.FutureJVppCoreFacade; +import io.fd.jvpp.core.types.FibMplsLabel; import org.junit.Test; import org.mockito.Mock; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.mpls.rev171120.LookupType; diff --git a/mpls/impl/src/test/java/io/fd/hc2vpp/mpls/PopAndMplsLookupTest.java b/mpls/impl/src/test/java/io/fd/hc2vpp/mpls/PopAndMplsLookupTest.java index 096f035c1..d09e1a56c 100644 --- a/mpls/impl/src/test/java/io/fd/hc2vpp/mpls/PopAndMplsLookupTest.java +++ b/mpls/impl/src/test/java/io/fd/hc2vpp/mpls/PopAndMplsLookupTest.java @@ -24,10 +24,10 @@ import io.fd.hc2vpp.common.test.write.WriterCustomizerTest; import io.fd.hc2vpp.common.translate.util.ByteDataTranslator; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.MplsRouteAddDel; -import io.fd.vpp.jvpp.core.dto.MplsRouteAddDelReply; -import io.fd.vpp.jvpp.core.future.FutureJVppCoreFacade; -import io.fd.vpp.jvpp.core.types.FibMplsLabel; +import io.fd.jvpp.core.dto.MplsRouteAddDel; +import io.fd.jvpp.core.dto.MplsRouteAddDelReply; +import io.fd.jvpp.core.future.FutureJVppCoreFacade; +import io.fd.jvpp.core.types.FibMplsLabel; import org.junit.Test; import org.mockito.Mock; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.mpls.rev171120.LookupType; diff --git a/mpls/impl/src/test/java/io/fd/hc2vpp/mpls/SwapAndForwardTest.java b/mpls/impl/src/test/java/io/fd/hc2vpp/mpls/SwapAndForwardTest.java index 0ed07097e..c3dc6e499 100644 --- a/mpls/impl/src/test/java/io/fd/hc2vpp/mpls/SwapAndForwardTest.java +++ b/mpls/impl/src/test/java/io/fd/hc2vpp/mpls/SwapAndForwardTest.java @@ -25,10 +25,10 @@ import io.fd.hc2vpp.common.translate.util.ByteDataTranslator; import io.fd.hc2vpp.common.translate.util.MplsLabelTranslator; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.MplsRouteAddDel; -import io.fd.vpp.jvpp.core.dto.MplsRouteAddDelReply; -import io.fd.vpp.jvpp.core.future.FutureJVppCoreFacade; -import io.fd.vpp.jvpp.core.types.FibMplsLabel; +import io.fd.jvpp.core.dto.MplsRouteAddDel; +import io.fd.jvpp.core.dto.MplsRouteAddDelReply; +import io.fd.jvpp.core.future.FutureJVppCoreFacade; +import io.fd.jvpp.core.types.FibMplsLabel; import org.junit.Test; import org.mockito.Mock; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddressBuilder; diff --git a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/NatModule.java b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/NatModule.java index bfc502e89..d90ec1978 100644 --- a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/NatModule.java +++ b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/NatModule.java @@ -31,7 +31,7 @@ import io.fd.hc2vpp.nat.write.ifc.IfcNatWriterFactory; import io.fd.hc2vpp.nat.write.ifc.SubIfcNatWriterFactory; import io.fd.honeycomb.translate.read.ReaderFactory; import io.fd.honeycomb.translate.write.WriterFactory; -import io.fd.vpp.jvpp.nat.future.FutureJVppNatFacade; +import io.fd.jvpp.nat.future.FutureJVppNatFacade; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/jvpp/JVppNatProvider.java b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/jvpp/JVppNatProvider.java index 97c5ebb3e..f8dd73de1 100755 --- a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/jvpp/JVppNatProvider.java +++ b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/jvpp/JVppNatProvider.java @@ -19,9 +19,9 @@ package io.fd.hc2vpp.nat.jvpp; import com.google.inject.Inject; import io.fd.honeycomb.binding.init.ProviderTrait; import io.fd.honeycomb.data.init.ShutdownHandler; -import io.fd.vpp.jvpp.JVppRegistry; -import io.fd.vpp.jvpp.nat.JVppNatImpl; -import io.fd.vpp.jvpp.nat.future.FutureJVppNatFacade; +import io.fd.jvpp.JVppRegistry; +import io.fd.jvpp.nat.JVppNatImpl; +import io.fd.jvpp.nat.future.FutureJVppNatFacade; import java.io.IOException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ExternalIpPoolCustomizer.java b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ExternalIpPoolCustomizer.java index e9bfa2f79..7592db69b 100644 --- a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ExternalIpPoolCustomizer.java +++ b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ExternalIpPoolCustomizer.java @@ -25,13 +25,13 @@ import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.Initialized; import io.fd.honeycomb.translate.spi.read.InitializingListReaderCustomizer; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; -import io.fd.vpp.jvpp.nat.dto.Nat44AddressDetails; -import io.fd.vpp.jvpp.nat.dto.Nat44AddressDetailsReplyDump; -import io.fd.vpp.jvpp.nat.dto.Nat44AddressDump; -import io.fd.vpp.jvpp.nat.dto.Nat64PoolAddrDetails; -import io.fd.vpp.jvpp.nat.dto.Nat64PoolAddrDetailsReplyDump; -import io.fd.vpp.jvpp.nat.dto.Nat64PoolAddrDump; -import io.fd.vpp.jvpp.nat.future.FutureJVppNatFacade; +import io.fd.jvpp.nat.dto.Nat44AddressDetails; +import io.fd.jvpp.nat.dto.Nat44AddressDetailsReplyDump; +import io.fd.jvpp.nat.dto.Nat44AddressDump; +import io.fd.jvpp.nat.dto.Nat64PoolAddrDetails; +import io.fd.jvpp.nat.dto.Nat64PoolAddrDetailsReplyDump; +import io.fd.jvpp.nat.dto.Nat64PoolAddrDump; +import io.fd.jvpp.nat.future.FutureJVppNatFacade; import java.util.Collections; import java.util.List; import java.util.stream.Collectors; diff --git a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/MappingEntryCustomizer.java b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/MappingEntryCustomizer.java index 7409a959f..2be7392d7 100644 --- a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/MappingEntryCustomizer.java +++ b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/MappingEntryCustomizer.java @@ -26,13 +26,13 @@ import io.fd.honeycomb.translate.spi.read.Initialized; import io.fd.honeycomb.translate.spi.read.InitializingListReaderCustomizer; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; import io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor; -import io.fd.vpp.jvpp.nat.dto.Nat44StaticMappingDetails; -import io.fd.vpp.jvpp.nat.dto.Nat44StaticMappingDetailsReplyDump; -import io.fd.vpp.jvpp.nat.dto.Nat44StaticMappingDump; -import io.fd.vpp.jvpp.nat.dto.Nat64BibDetails; -import io.fd.vpp.jvpp.nat.dto.Nat64BibDetailsReplyDump; -import io.fd.vpp.jvpp.nat.dto.Nat64BibDump; -import io.fd.vpp.jvpp.nat.future.FutureJVppNatFacade; +import io.fd.jvpp.nat.dto.Nat44StaticMappingDetails; +import io.fd.jvpp.nat.dto.Nat44StaticMappingDetailsReplyDump; +import io.fd.jvpp.nat.dto.Nat44StaticMappingDump; +import io.fd.jvpp.nat.dto.Nat64BibDetails; +import io.fd.jvpp.nat.dto.Nat64BibDetailsReplyDump; +import io.fd.jvpp.nat.dto.Nat64BibDump; +import io.fd.jvpp.nat.future.FutureJVppNatFacade; import java.util.List; import java.util.Optional; import java.util.stream.Collectors; diff --git a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/Nat64PrefixesCustomizer.java b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/Nat64PrefixesCustomizer.java index 874a7ee02..6e955ea64 100644 --- a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/Nat64PrefixesCustomizer.java +++ b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/Nat64PrefixesCustomizer.java @@ -29,10 +29,10 @@ import io.fd.honeycomb.translate.spi.read.ListReaderCustomizer; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; import io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor; import io.fd.honeycomb.translate.util.read.cache.StaticCacheKeyFactory; -import io.fd.vpp.jvpp.nat.dto.Nat64PrefixDetails; -import io.fd.vpp.jvpp.nat.dto.Nat64PrefixDetailsReplyDump; -import io.fd.vpp.jvpp.nat.dto.Nat64PrefixDump; -import io.fd.vpp.jvpp.nat.future.FutureJVppNatFacade; +import io.fd.jvpp.nat.dto.Nat64PrefixDetails; +import io.fd.jvpp.nat.dto.Nat64PrefixDetailsReplyDump; +import io.fd.jvpp.nat.dto.Nat64PrefixDump; +import io.fd.jvpp.nat.future.FutureJVppNatFacade; import java.util.Collections; import java.util.List; import java.util.Map; diff --git a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/NatInstanceCustomizer.java b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/NatInstanceCustomizer.java index 610c31d79..81a978559 100644 --- a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/NatInstanceCustomizer.java +++ b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/NatInstanceCustomizer.java @@ -21,8 +21,8 @@ import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.Initialized; import io.fd.honeycomb.translate.spi.read.InitializingListReaderCustomizer; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; -import io.fd.vpp.jvpp.nat.dto.Nat44StaticMappingDetailsReplyDump; -import io.fd.vpp.jvpp.nat.dto.Nat64BibDetailsReplyDump; +import io.fd.jvpp.nat.dto.Nat44StaticMappingDetailsReplyDump; +import io.fd.jvpp.nat.dto.Nat64BibDetailsReplyDump; import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; diff --git a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/NatReaderFactory.java b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/NatReaderFactory.java index 390d85918..606f41895 100644 --- a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/NatReaderFactory.java +++ b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/NatReaderFactory.java @@ -33,18 +33,15 @@ import io.fd.honeycomb.translate.impl.read.GenericListReader; import io.fd.honeycomb.translate.read.ReaderFactory; import io.fd.honeycomb.translate.read.registry.ModifiableReaderRegistryBuilder; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; -import io.fd.vpp.jvpp.nat.dto.Nat44StaticMappingDetailsReplyDump; -import io.fd.vpp.jvpp.nat.dto.Nat64BibDetailsReplyDump; -import io.fd.vpp.jvpp.nat.future.FutureJVppNatFacade; -import java.util.Collections; +import io.fd.jvpp.nat.dto.Nat44StaticMappingDetailsReplyDump; +import io.fd.jvpp.nat.dto.Nat64BibDetailsReplyDump; +import io.fd.jvpp.nat.future.FutureJVppNatFacade; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.nat.rev180628.NatBuilder; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.nat.rev180628.mapping.entry.ExternalSrcPort; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.nat.rev180628.mapping.entry.InternalSrcPort; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.nat.rev180628.nat.InstancesBuilder; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.nat.rev180628.nat.instances.instance.MappingTableBuilder; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.nat.rev180628.nat.instances.instance.PolicyBuilder; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.nat.rev180628.nat.instances.instance.PolicyKey; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.nat.rev180628.nat.instances.instance.mapping.table.MappingEntry; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.nat.rev180628.nat.instances.instance.policy.Nat64Prefixes; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.nat.rev180628.nat.instances.instance.policy.nat64.prefixes.DestinationIpv4Prefix; diff --git a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/AbstractInterfaceNatCustomizer.java b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/AbstractInterfaceNatCustomizer.java index 6225851e6..91e2a8bb7 100644 --- a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/AbstractInterfaceNatCustomizer.java +++ b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/AbstractInterfaceNatCustomizer.java @@ -25,13 +25,13 @@ import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.InitializingReaderCustomizer; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; -import io.fd.vpp.jvpp.nat.dto.Nat44InterfaceDetailsReplyDump; -import io.fd.vpp.jvpp.nat.dto.Nat44InterfaceDump; -import io.fd.vpp.jvpp.nat.dto.Nat44InterfaceOutputFeatureDetailsReplyDump; -import io.fd.vpp.jvpp.nat.dto.Nat44InterfaceOutputFeatureDump; -import io.fd.vpp.jvpp.nat.dto.Nat64InterfaceDetailsReplyDump; -import io.fd.vpp.jvpp.nat.dto.Nat64InterfaceDump; -import io.fd.vpp.jvpp.nat.future.FutureJVppNatFacade; +import io.fd.jvpp.nat.dto.Nat44InterfaceDetailsReplyDump; +import io.fd.jvpp.nat.dto.Nat44InterfaceDump; +import io.fd.jvpp.nat.dto.Nat44InterfaceOutputFeatureDetailsReplyDump; +import io.fd.jvpp.nat.dto.Nat44InterfaceOutputFeatureDump; +import io.fd.jvpp.nat.dto.Nat64InterfaceDetailsReplyDump; +import io.fd.jvpp.nat.dto.Nat64InterfaceDump; +import io.fd.jvpp.nat.future.FutureJVppNatFacade; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.Interface; import org.opendaylight.yangtools.concepts.Builder; diff --git a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/AbstractSubInterfaceNatCustomizer.java b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/AbstractSubInterfaceNatCustomizer.java index 7758a18a3..4bfe04e3a 100644 --- a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/AbstractSubInterfaceNatCustomizer.java +++ b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/AbstractSubInterfaceNatCustomizer.java @@ -19,7 +19,7 @@ package io.fd.hc2vpp.nat.read.ifc; import static com.google.common.base.Preconditions.checkNotNull; import io.fd.hc2vpp.common.translate.util.NamingContext; -import io.fd.vpp.jvpp.nat.future.FutureJVppNatFacade; +import io.fd.jvpp.nat.future.FutureJVppNatFacade; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.vlan.rev180319.interfaces.state._interface.sub.interfaces.SubInterface; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.Interface; diff --git a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/IfcNatReaderFactory.java b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/IfcNatReaderFactory.java index b5d3c3173..a550f26be 100644 --- a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/IfcNatReaderFactory.java +++ b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/IfcNatReaderFactory.java @@ -22,7 +22,7 @@ import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.impl.read.GenericInitReader; import io.fd.honeycomb.translate.read.ReaderFactory; import io.fd.honeycomb.translate.read.registry.ModifiableReaderRegistryBuilder; -import io.fd.vpp.jvpp.nat.future.FutureJVppNatFacade; +import io.fd.jvpp.nat.future.FutureJVppNatFacade; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang._interface.nat.rev170816.NatInterfaceStateAugmentation; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang._interface.nat.rev170816.NatInterfaceStateAugmentationBuilder; diff --git a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/InterfaceInboundNatCustomizer.java b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/InterfaceInboundNatCustomizer.java index 0a89f4aa1..76a20a94c 100644 --- a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/InterfaceInboundNatCustomizer.java +++ b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/InterfaceInboundNatCustomizer.java @@ -19,7 +19,7 @@ package io.fd.hc2vpp.nat.read.ifc; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.spi.read.Initialized; -import io.fd.vpp.jvpp.nat.future.FutureJVppNatFacade; +import io.fd.jvpp.nat.future.FutureJVppNatFacade; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang._interface.nat.rev170816.NatInterfaceAugmentation; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang._interface.nat.rev170816._interface.nat.attributes.Nat; diff --git a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/InterfaceOutboundNatCustomizer.java b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/InterfaceOutboundNatCustomizer.java index eda05a08c..68c0cb1ce 100644 --- a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/InterfaceOutboundNatCustomizer.java +++ b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/InterfaceOutboundNatCustomizer.java @@ -19,7 +19,7 @@ package io.fd.hc2vpp.nat.read.ifc; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.spi.read.Initialized; -import io.fd.vpp.jvpp.nat.future.FutureJVppNatFacade; +import io.fd.jvpp.nat.future.FutureJVppNatFacade; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang._interface.nat.rev170816.NatInterfaceAugmentation; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang._interface.nat.rev170816._interface.nat.attributes.Nat; diff --git a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/SubIfcNatReaderFactory.java b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/SubIfcNatReaderFactory.java index 60c2d99e7..b443ca68c 100644 --- a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/SubIfcNatReaderFactory.java +++ b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/SubIfcNatReaderFactory.java @@ -23,7 +23,7 @@ import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.impl.read.GenericInitReader; import io.fd.honeycomb.translate.read.ReaderFactory; import io.fd.honeycomb.translate.read.registry.ModifiableReaderRegistryBuilder; -import io.fd.vpp.jvpp.nat.future.FutureJVppNatFacade; +import io.fd.jvpp.nat.future.FutureJVppNatFacade; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang._interface.nat.rev170816._interface.nat.attributes.Nat; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang._interface.nat.rev170816._interface.nat.attributes.NatBuilder; diff --git a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/SubInterfaceInboundNatCustomizer.java b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/SubInterfaceInboundNatCustomizer.java index 504313df2..0ca344419 100644 --- a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/SubInterfaceInboundNatCustomizer.java +++ b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/SubInterfaceInboundNatCustomizer.java @@ -19,7 +19,7 @@ package io.fd.hc2vpp.nat.read.ifc; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.spi.read.Initialized; -import io.fd.vpp.jvpp.nat.future.FutureJVppNatFacade; +import io.fd.jvpp.nat.future.FutureJVppNatFacade; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang._interface.nat.rev170816._interface.nat.attributes.Nat; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang._interface.nat.rev170816._interface.nat.attributes.NatBuilder; diff --git a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/SubInterfaceOutboundNatCustomizer.java b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/SubInterfaceOutboundNatCustomizer.java index 58ff72543..92d829987 100644 --- a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/SubInterfaceOutboundNatCustomizer.java +++ b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/SubInterfaceOutboundNatCustomizer.java @@ -19,7 +19,7 @@ package io.fd.hc2vpp.nat.read.ifc; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.spi.read.Initialized; -import io.fd.vpp.jvpp.nat.future.FutureJVppNatFacade; +import io.fd.jvpp.nat.future.FutureJVppNatFacade; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang._interface.nat.rev170816._interface.nat.attributes.Nat; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang._interface.nat.rev170816._interface.nat.attributes.NatBuilder; diff --git a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/util/MappingEntryContext.java b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/util/MappingEntryContext.java index 5df15dbc6..14bf3f0a3 100644 --- a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/util/MappingEntryContext.java +++ b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/util/MappingEntryContext.java @@ -23,8 +23,8 @@ import com.google.common.base.Optional; import io.fd.hc2vpp.common.translate.util.Ipv4Translator; import io.fd.hc2vpp.common.translate.util.Ipv6Translator; import io.fd.honeycomb.translate.MappingContext; -import io.fd.vpp.jvpp.nat.dto.Nat44StaticMappingDetails; -import io.fd.vpp.jvpp.nat.dto.Nat64BibDetails; +import io.fd.jvpp.nat.dto.Nat44StaticMappingDetails; +import io.fd.jvpp.nat.dto.Nat64BibDetails; import java.util.Collections; import java.util.Comparator; import java.util.List; diff --git a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/ExternalIpPoolCustomizer.java b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/ExternalIpPoolCustomizer.java index 975763a4e..38d2f5a60 100644 --- a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/ExternalIpPoolCustomizer.java +++ b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/ExternalIpPoolCustomizer.java @@ -25,9 +25,9 @@ import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.nat.dto.Nat44AddDelAddressRange; -import io.fd.vpp.jvpp.nat.dto.Nat64AddDelPoolAddrRange; -import io.fd.vpp.jvpp.nat.future.FutureJVppNatFacade; +import io.fd.jvpp.nat.dto.Nat44AddDelAddressRange; +import io.fd.jvpp.nat.dto.Nat64AddDelPoolAddrRange; +import io.fd.jvpp.nat.future.FutureJVppNatFacade; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.nat.rev180510.ExternalIpAddressPoolAugmentation; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Prefix; diff --git a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/MappingEntryCustomizer.java b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/MappingEntryCustomizer.java index e51d610e1..924f6a6a1 100644 --- a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/MappingEntryCustomizer.java +++ b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/MappingEntryCustomizer.java @@ -25,9 +25,9 @@ import io.fd.hc2vpp.nat.util.MappingEntryContext; import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.nat.dto.Nat44AddDelStaticMapping; -import io.fd.vpp.jvpp.nat.dto.Nat64AddDelStaticBib; -import io.fd.vpp.jvpp.nat.future.FutureJVppNatFacade; +import io.fd.jvpp.nat.dto.Nat44AddDelStaticMapping; +import io.fd.jvpp.nat.dto.Nat64AddDelStaticBib; +import io.fd.jvpp.nat.future.FutureJVppNatFacade; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpPrefix; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Prefix; diff --git a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/Nat64PrefixesCustomizer.java b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/Nat64PrefixesCustomizer.java index 13a5845e3..df8af8550 100644 --- a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/Nat64PrefixesCustomizer.java +++ b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/Nat64PrefixesCustomizer.java @@ -16,7 +16,6 @@ package io.fd.hc2vpp.nat.write; -import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; import io.fd.hc2vpp.common.translate.util.ByteDataTranslator; @@ -25,15 +24,13 @@ import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.nat.dto.Nat64AddDelPrefix; -import io.fd.vpp.jvpp.nat.future.FutureJVppNatFacade; -import java.util.List; +import io.fd.jvpp.nat.dto.Nat64AddDelPrefix; +import io.fd.jvpp.nat.future.FutureJVppNatFacade; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Prefix; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.nat.rev180628.nat.instances.Instance; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.nat.rev180628.nat.instances.instance.policy.Nat64Prefixes; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.nat.rev180628.nat.instances.instance.policy.Nat64PrefixesKey; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.nat.rev180628.nat.instances.instance.policy.nat64.prefixes.DestinationIpv4Prefix; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/NatWriterFactory.java b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/NatWriterFactory.java index 159208ff7..6d3f768ca 100644 --- a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/NatWriterFactory.java +++ b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/NatWriterFactory.java @@ -28,7 +28,7 @@ import io.fd.hc2vpp.nat.util.MappingEntryContext; import io.fd.honeycomb.translate.impl.write.GenericListWriter; import io.fd.honeycomb.translate.write.WriterFactory; import io.fd.honeycomb.translate.write.registry.ModifiableWriterRegistryBuilder; -import io.fd.vpp.jvpp.nat.future.FutureJVppNatFacade; +import io.fd.jvpp.nat.future.FutureJVppNatFacade; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.nat.rev180510.ExternalIpAddressPoolAugmentation; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.nat.rev180628.mapping.entry.ExternalSrcPort; diff --git a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/ifc/AbstractInterfaceNatCustomizer.java b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/ifc/AbstractInterfaceNatCustomizer.java index 3082103da..336b17a6f 100644 --- a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/ifc/AbstractInterfaceNatCustomizer.java +++ b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/ifc/AbstractInterfaceNatCustomizer.java @@ -24,10 +24,10 @@ import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.spi.write.WriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.nat.dto.Nat44InterfaceAddDelFeature; -import io.fd.vpp.jvpp.nat.dto.Nat44InterfaceAddDelOutputFeature; -import io.fd.vpp.jvpp.nat.dto.Nat64AddDelInterface; -import io.fd.vpp.jvpp.nat.future.FutureJVppNatFacade; +import io.fd.jvpp.nat.dto.Nat44InterfaceAddDelFeature; +import io.fd.jvpp.nat.dto.Nat44InterfaceAddDelOutputFeature; +import io.fd.jvpp.nat.dto.Nat64AddDelInterface; +import io.fd.jvpp.nat.future.FutureJVppNatFacade; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang._interface.nat.rev170816.InterfaceNatVppFeatureAttributes; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface; diff --git a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/ifc/AbstractSubInterfaceNatCustomizer.java b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/ifc/AbstractSubInterfaceNatCustomizer.java index 4febdff2e..a7c818d27 100644 --- a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/ifc/AbstractSubInterfaceNatCustomizer.java +++ b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/ifc/AbstractSubInterfaceNatCustomizer.java @@ -34,7 +34,7 @@ package io.fd.hc2vpp.nat.write.ifc; import static com.google.common.base.Preconditions.checkNotNull; import io.fd.hc2vpp.common.translate.util.NamingContext; -import io.fd.vpp.jvpp.nat.future.FutureJVppNatFacade; +import io.fd.jvpp.nat.future.FutureJVppNatFacade; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang._interface.nat.rev170816.InterfaceNatVppFeatureAttributes; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.vlan.rev180319.interfaces._interface.sub.interfaces.SubInterface; diff --git a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/ifc/IfcNatWriterFactory.java b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/ifc/IfcNatWriterFactory.java index 8ec04115f..b89b527c6 100644 --- a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/ifc/IfcNatWriterFactory.java +++ b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/ifc/IfcNatWriterFactory.java @@ -22,7 +22,7 @@ import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.impl.write.GenericWriter; import io.fd.honeycomb.translate.write.WriterFactory; import io.fd.honeycomb.translate.write.registry.ModifiableWriterRegistryBuilder; -import io.fd.vpp.jvpp.nat.future.FutureJVppNatFacade; +import io.fd.jvpp.nat.future.FutureJVppNatFacade; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang._interface.nat.rev170816.NatInterfaceAugmentation; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang._interface.nat.rev170816._interface.nat.attributes.Nat; diff --git a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/ifc/InterfaceInboundNatCustomizer.java b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/ifc/InterfaceInboundNatCustomizer.java index 944b00610..f47113c8a 100644 --- a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/ifc/InterfaceInboundNatCustomizer.java +++ b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/ifc/InterfaceInboundNatCustomizer.java @@ -17,7 +17,7 @@ package io.fd.hc2vpp.nat.write.ifc; import io.fd.hc2vpp.common.translate.util.NamingContext; -import io.fd.vpp.jvpp.nat.future.FutureJVppNatFacade; +import io.fd.jvpp.nat.future.FutureJVppNatFacade; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang._interface.nat.rev170816._interface.nat.attributes.nat.Inbound; import org.slf4j.Logger; diff --git a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/ifc/InterfaceOutboundNatCustomizer.java b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/ifc/InterfaceOutboundNatCustomizer.java index c19b2a7c6..eed4c37db 100644 --- a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/ifc/InterfaceOutboundNatCustomizer.java +++ b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/ifc/InterfaceOutboundNatCustomizer.java @@ -17,7 +17,7 @@ package io.fd.hc2vpp.nat.write.ifc; import io.fd.hc2vpp.common.translate.util.NamingContext; -import io.fd.vpp.jvpp.nat.future.FutureJVppNatFacade; +import io.fd.jvpp.nat.future.FutureJVppNatFacade; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang._interface.nat.rev170816._interface.nat.attributes.nat.Outbound; import org.slf4j.Logger; diff --git a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/ifc/SubIfcNatWriterFactory.java b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/ifc/SubIfcNatWriterFactory.java index 70511d22c..f659c7bd2 100644 --- a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/ifc/SubIfcNatWriterFactory.java +++ b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/ifc/SubIfcNatWriterFactory.java @@ -22,7 +22,7 @@ import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.impl.write.GenericWriter; import io.fd.honeycomb.translate.write.WriterFactory; import io.fd.honeycomb.translate.write.registry.ModifiableWriterRegistryBuilder; -import io.fd.vpp.jvpp.nat.future.FutureJVppNatFacade; +import io.fd.jvpp.nat.future.FutureJVppNatFacade; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang._interface.nat.rev170816._interface.nat.attributes.Nat; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang._interface.nat.rev170816._interface.nat.attributes.nat.Inbound; diff --git a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/ifc/SubInterfaceInboundNatCustomizer.java b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/ifc/SubInterfaceInboundNatCustomizer.java index d2a180e5d..1fea8afc1 100644 --- a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/ifc/SubInterfaceInboundNatCustomizer.java +++ b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/ifc/SubInterfaceInboundNatCustomizer.java @@ -17,7 +17,7 @@ package io.fd.hc2vpp.nat.write.ifc; import io.fd.hc2vpp.common.translate.util.NamingContext; -import io.fd.vpp.jvpp.nat.future.FutureJVppNatFacade; +import io.fd.jvpp.nat.future.FutureJVppNatFacade; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang._interface.nat.rev170816._interface.nat.attributes.nat.Inbound; import org.slf4j.Logger; diff --git a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/ifc/SubInterfaceOutboundNatCustomizer.java b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/ifc/SubInterfaceOutboundNatCustomizer.java index 16705b4f6..3b1c4a9b1 100644 --- a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/ifc/SubInterfaceOutboundNatCustomizer.java +++ b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/ifc/SubInterfaceOutboundNatCustomizer.java @@ -17,7 +17,7 @@ package io.fd.hc2vpp.nat.write.ifc; import io.fd.hc2vpp.common.translate.util.NamingContext; -import io.fd.vpp.jvpp.nat.future.FutureJVppNatFacade; +import io.fd.jvpp.nat.future.FutureJVppNatFacade; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang._interface.nat.rev170816._interface.nat.attributes.nat.Outbound; import org.slf4j.Logger; diff --git a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/NatModuleTest.java b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/NatModuleTest.java index f8d384bd5..c997e5c37 100644 --- a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/NatModuleTest.java +++ b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/NatModuleTest.java @@ -39,7 +39,7 @@ 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.nat.future.FutureJVppNatFacade; +import io.fd.jvpp.nat.future.FutureJVppNatFacade; import java.util.HashSet; import java.util.Set; import org.junit.Before; diff --git a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/read/ExternalIpPoolCustomizerTest.java b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/read/ExternalIpPoolCustomizerTest.java index daae91c7c..db23b7a24 100644 --- a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/read/ExternalIpPoolCustomizerTest.java +++ b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/read/ExternalIpPoolCustomizerTest.java @@ -28,11 +28,11 @@ import static org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.nat.rev180 import io.fd.hc2vpp.common.test.read.ListReaderCustomizerTest; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.vpp.jvpp.nat.dto.Nat44AddressDetails; -import io.fd.vpp.jvpp.nat.dto.Nat44AddressDetailsReplyDump; -import io.fd.vpp.jvpp.nat.dto.Nat64PoolAddrDetails; -import io.fd.vpp.jvpp.nat.dto.Nat64PoolAddrDetailsReplyDump; -import io.fd.vpp.jvpp.nat.future.FutureJVppNatFacade; +import io.fd.jvpp.nat.dto.Nat44AddressDetails; +import io.fd.jvpp.nat.dto.Nat44AddressDetailsReplyDump; +import io.fd.jvpp.nat.dto.Nat64PoolAddrDetails; +import io.fd.jvpp.nat.dto.Nat64PoolAddrDetailsReplyDump; +import io.fd.jvpp.nat.future.FutureJVppNatFacade; import java.util.Arrays; import java.util.List; import java.util.stream.LongStream; diff --git a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/read/MappingEntryCustomizerTest.java b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/read/MappingEntryCustomizerTest.java index 919f7b362..d0541dc24 100644 --- a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/read/MappingEntryCustomizerTest.java +++ b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/read/MappingEntryCustomizerTest.java @@ -18,7 +18,6 @@ package io.fd.hc2vpp.nat.read; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.IsCollectionContaining.hasItems; -import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.when; @@ -27,10 +26,10 @@ import io.fd.hc2vpp.nat.util.MappingEntryContext; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; import io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor; -import io.fd.vpp.jvpp.nat.dto.Nat44StaticMappingDetails; -import io.fd.vpp.jvpp.nat.dto.Nat44StaticMappingDetailsReplyDump; -import io.fd.vpp.jvpp.nat.dto.Nat64BibDetails; -import io.fd.vpp.jvpp.nat.dto.Nat64BibDetailsReplyDump; +import io.fd.jvpp.nat.dto.Nat44StaticMappingDetails; +import io.fd.jvpp.nat.dto.Nat44StaticMappingDetailsReplyDump; +import io.fd.jvpp.nat.dto.Nat64BibDetails; +import io.fd.jvpp.nat.dto.Nat64BibDetailsReplyDump; import java.util.Arrays; import java.util.List; import java.util.Optional; diff --git a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/read/Nat64PrefixesCustomizerTest.java b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/read/Nat64PrefixesCustomizerTest.java index 5ba5d7bdf..a3f757389 100644 --- a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/read/Nat64PrefixesCustomizerTest.java +++ b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/read/Nat64PrefixesCustomizerTest.java @@ -26,9 +26,9 @@ import static org.mockito.Mockito.when; import io.fd.hc2vpp.common.test.read.ListReaderCustomizerTest; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.vpp.jvpp.nat.dto.Nat64PrefixDetails; -import io.fd.vpp.jvpp.nat.dto.Nat64PrefixDetailsReplyDump; -import io.fd.vpp.jvpp.nat.future.FutureJVppNatFacade; +import io.fd.jvpp.nat.dto.Nat64PrefixDetails; +import io.fd.jvpp.nat.dto.Nat64PrefixDetailsReplyDump; +import io.fd.jvpp.nat.future.FutureJVppNatFacade; import java.util.List; import org.junit.Test; import org.mockito.Mock; diff --git a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/read/NatInstanceCustomizerTest.java b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/read/NatInstanceCustomizerTest.java index 9f81ab388..0bd68ba70 100644 --- a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/read/NatInstanceCustomizerTest.java +++ b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/read/NatInstanceCustomizerTest.java @@ -27,10 +27,10 @@ import io.fd.hc2vpp.common.test.read.InitializingListReaderCustomizerTest; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; import io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor; -import io.fd.vpp.jvpp.nat.dto.Nat44StaticMappingDetails; -import io.fd.vpp.jvpp.nat.dto.Nat44StaticMappingDetailsReplyDump; -import io.fd.vpp.jvpp.nat.dto.Nat64BibDetails; -import io.fd.vpp.jvpp.nat.dto.Nat64BibDetailsReplyDump; +import io.fd.jvpp.nat.dto.Nat44StaticMappingDetails; +import io.fd.jvpp.nat.dto.Nat44StaticMappingDetailsReplyDump; +import io.fd.jvpp.nat.dto.Nat64BibDetails; +import io.fd.jvpp.nat.dto.Nat64BibDetailsReplyDump; import java.util.Arrays; import java.util.List; import org.junit.Test; diff --git a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/read/ifc/InterfaceInboundNatCustomizerTest.java b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/read/ifc/InterfaceInboundNatCustomizerTest.java index 9afd69235..8d62782a2 100644 --- a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/read/ifc/InterfaceInboundNatCustomizerTest.java +++ b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/read/ifc/InterfaceInboundNatCustomizerTest.java @@ -28,12 +28,12 @@ import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.impl.read.GenericReader; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; import io.fd.honeycomb.translate.util.RWUtils; -import io.fd.vpp.jvpp.nat.dto.Nat44InterfaceDetails; -import io.fd.vpp.jvpp.nat.dto.Nat44InterfaceDetailsReplyDump; -import io.fd.vpp.jvpp.nat.dto.Nat44InterfaceOutputFeatureDetails; -import io.fd.vpp.jvpp.nat.dto.Nat44InterfaceOutputFeatureDetailsReplyDump; -import io.fd.vpp.jvpp.nat.dto.Nat64InterfaceDetailsReplyDump; -import io.fd.vpp.jvpp.nat.future.FutureJVppNatFacade; +import io.fd.jvpp.nat.dto.Nat44InterfaceDetails; +import io.fd.jvpp.nat.dto.Nat44InterfaceDetailsReplyDump; +import io.fd.jvpp.nat.dto.Nat44InterfaceOutputFeatureDetails; +import io.fd.jvpp.nat.dto.Nat44InterfaceOutputFeatureDetailsReplyDump; +import io.fd.jvpp.nat.dto.Nat64InterfaceDetailsReplyDump; +import io.fd.jvpp.nat.future.FutureJVppNatFacade; import org.junit.Test; import org.mockito.Mock; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang._interface.nat.rev170816.NatInterfaceStateAugmentation; diff --git a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/read/ifc/InterfaceOutboundNatCustomizerTest.java b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/read/ifc/InterfaceOutboundNatCustomizerTest.java index db2900fb2..dcf3a3c2b 100644 --- a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/read/ifc/InterfaceOutboundNatCustomizerTest.java +++ b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/read/ifc/InterfaceOutboundNatCustomizerTest.java @@ -29,12 +29,12 @@ import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.impl.read.GenericReader; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; import io.fd.honeycomb.translate.util.RWUtils; -import io.fd.vpp.jvpp.nat.dto.Nat44InterfaceDetails; -import io.fd.vpp.jvpp.nat.dto.Nat44InterfaceDetailsReplyDump; -import io.fd.vpp.jvpp.nat.dto.Nat44InterfaceOutputFeatureDetails; -import io.fd.vpp.jvpp.nat.dto.Nat44InterfaceOutputFeatureDetailsReplyDump; -import io.fd.vpp.jvpp.nat.dto.Nat64InterfaceDetailsReplyDump; -import io.fd.vpp.jvpp.nat.future.FutureJVppNatFacade; +import io.fd.jvpp.nat.dto.Nat44InterfaceDetails; +import io.fd.jvpp.nat.dto.Nat44InterfaceDetailsReplyDump; +import io.fd.jvpp.nat.dto.Nat44InterfaceOutputFeatureDetails; +import io.fd.jvpp.nat.dto.Nat44InterfaceOutputFeatureDetailsReplyDump; +import io.fd.jvpp.nat.dto.Nat64InterfaceDetailsReplyDump; +import io.fd.jvpp.nat.future.FutureJVppNatFacade; import org.junit.Test; import org.mockito.Mock; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang._interface.nat.rev170816._interface.nat.attributes.NatBuilder; diff --git a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/util/MappingEntryContextTest.java b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/util/MappingEntryContextTest.java index 2de42953c..871225a29 100644 --- a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/util/MappingEntryContextTest.java +++ b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/util/MappingEntryContextTest.java @@ -28,7 +28,7 @@ import com.google.common.base.Optional; import com.google.common.collect.Lists; import io.fd.hc2vpp.common.translate.util.Ipv4Translator; import io.fd.honeycomb.translate.MappingContext; -import io.fd.vpp.jvpp.nat.dto.Nat44StaticMappingDetails; +import io.fd.jvpp.nat.dto.Nat44StaticMappingDetails; import java.util.Collections; import java.util.List; import org.junit.Before; diff --git a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/ExternalIpPoolCustomizerTest.java b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/ExternalIpPoolCustomizerTest.java index 42d34fc6d..9da83bf76 100644 --- a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/ExternalIpPoolCustomizerTest.java +++ b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/ExternalIpPoolCustomizerTest.java @@ -28,11 +28,11 @@ import io.fd.hc2vpp.nat.NatTestSchemaContext; 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.nat.dto.Nat44AddDelAddressRange; -import io.fd.vpp.jvpp.nat.dto.Nat44AddDelAddressRangeReply; -import io.fd.vpp.jvpp.nat.dto.Nat64AddDelPoolAddrRange; -import io.fd.vpp.jvpp.nat.dto.Nat64AddDelPoolAddrRangeReply; -import io.fd.vpp.jvpp.nat.future.FutureJVppNatFacade; +import io.fd.jvpp.nat.dto.Nat44AddDelAddressRange; +import io.fd.jvpp.nat.dto.Nat44AddDelAddressRangeReply; +import io.fd.jvpp.nat.dto.Nat64AddDelPoolAddrRange; +import io.fd.jvpp.nat.dto.Nat64AddDelPoolAddrRangeReply; +import io.fd.jvpp.nat.future.FutureJVppNatFacade; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; diff --git a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/MappingEntryCustomizerTest.java b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/MappingEntryCustomizerTest.java index ede39e4b3..129fb8f2c 100644 --- a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/MappingEntryCustomizerTest.java +++ b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/MappingEntryCustomizerTest.java @@ -27,11 +27,11 @@ import io.fd.hc2vpp.nat.util.MappingEntryContext; 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.nat.dto.Nat44AddDelStaticMapping; -import io.fd.vpp.jvpp.nat.dto.Nat44AddDelStaticMappingReply; -import io.fd.vpp.jvpp.nat.dto.Nat64AddDelStaticBib; -import io.fd.vpp.jvpp.nat.dto.Nat64AddDelStaticBibReply; -import io.fd.vpp.jvpp.nat.future.FutureJVppNatFacade; +import io.fd.jvpp.nat.dto.Nat44AddDelStaticMapping; +import io.fd.jvpp.nat.dto.Nat44AddDelStaticMappingReply; +import io.fd.jvpp.nat.dto.Nat64AddDelStaticBib; +import io.fd.jvpp.nat.dto.Nat64AddDelStaticBibReply; +import io.fd.jvpp.nat.future.FutureJVppNatFacade; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; diff --git a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/MappingEntryValidatorTest.java b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/MappingEntryValidatorTest.java index 1cb98cc0e..a7b5b9e68 100644 --- a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/MappingEntryValidatorTest.java +++ b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/MappingEntryValidatorTest.java @@ -20,7 +20,6 @@ import static io.fd.hc2vpp.nat.write.MappingEntryCustomizerTest.IID; import static io.fd.hc2vpp.nat.write.MappingEntryCustomizerTest.MAPPING_TABLE_PATH; import static io.fd.hc2vpp.nat.write.MappingEntryCustomizerTest.extractMappingEntry; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static org.mockito.MockitoAnnotations.initMocks; @@ -30,7 +29,6 @@ import io.fd.honeycomb.test.tools.annotations.InjectTestData; import io.fd.honeycomb.translate.write.DataValidationFailedException; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.nat.dto.Nat44AddDelStaticMapping; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/Nat64PrefixesCustomizerTest.java b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/Nat64PrefixesCustomizerTest.java index 8d64b6cb2..b16de9032 100644 --- a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/Nat64PrefixesCustomizerTest.java +++ b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/Nat64PrefixesCustomizerTest.java @@ -23,9 +23,9 @@ import static org.mockito.Mockito.when; import io.fd.hc2vpp.common.test.write.WriterCustomizerTest; import io.fd.hc2vpp.common.translate.util.ByteDataTranslator; -import io.fd.vpp.jvpp.nat.dto.Nat64AddDelPrefix; -import io.fd.vpp.jvpp.nat.dto.Nat64AddDelPrefixReply; -import io.fd.vpp.jvpp.nat.future.FutureJVppNatFacade; +import io.fd.jvpp.nat.dto.Nat64AddDelPrefix; +import io.fd.jvpp.nat.dto.Nat64AddDelPrefixReply; +import io.fd.jvpp.nat.future.FutureJVppNatFacade; import org.junit.Test; import org.mockito.Mock; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Prefix; diff --git a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/ifc/AbstractNatCustomizerTest.java b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/ifc/AbstractNatCustomizerTest.java index 4f3041441..52eeb82a3 100644 --- a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/ifc/AbstractNatCustomizerTest.java +++ b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/ifc/AbstractNatCustomizerTest.java @@ -24,13 +24,13 @@ import static org.mockito.Mockito.when; import io.fd.hc2vpp.common.test.write.WriterCustomizerTest; import io.fd.hc2vpp.common.translate.util.ByteDataTranslator; import io.fd.hc2vpp.common.translate.util.NamingContext; -import io.fd.vpp.jvpp.nat.dto.Nat44InterfaceAddDelFeature; -import io.fd.vpp.jvpp.nat.dto.Nat44InterfaceAddDelFeatureReply; -import io.fd.vpp.jvpp.nat.dto.Nat44InterfaceAddDelOutputFeature; -import io.fd.vpp.jvpp.nat.dto.Nat44InterfaceAddDelOutputFeatureReply; -import io.fd.vpp.jvpp.nat.dto.Nat64AddDelInterface; -import io.fd.vpp.jvpp.nat.dto.Nat64AddDelInterfaceReply; -import io.fd.vpp.jvpp.nat.future.FutureJVppNatFacade; +import io.fd.jvpp.nat.dto.Nat44InterfaceAddDelFeature; +import io.fd.jvpp.nat.dto.Nat44InterfaceAddDelFeatureReply; +import io.fd.jvpp.nat.dto.Nat44InterfaceAddDelOutputFeature; +import io.fd.jvpp.nat.dto.Nat44InterfaceAddDelOutputFeatureReply; +import io.fd.jvpp.nat.dto.Nat64AddDelInterface; +import io.fd.jvpp.nat.dto.Nat64AddDelInterfaceReply; +import io.fd.jvpp.nat.future.FutureJVppNatFacade; import org.junit.Test; import org.mockito.Mock; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang._interface.nat.rev170816.InterfaceNatVppFeatureAttributes; diff --git a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/ifc/InterfaceInboundNatCustomizerTest.java b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/ifc/InterfaceInboundNatCustomizerTest.java index d0a36f63b..fdeec629d 100644 --- a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/ifc/InterfaceInboundNatCustomizerTest.java +++ b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/ifc/InterfaceInboundNatCustomizerTest.java @@ -17,7 +17,7 @@ package io.fd.hc2vpp.nat.write.ifc; import io.fd.hc2vpp.common.translate.util.NamingContext; -import io.fd.vpp.jvpp.nat.future.FutureJVppNatFacade; +import io.fd.jvpp.nat.future.FutureJVppNatFacade; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang._interface.nat.rev170816.NatInterfaceAugmentation; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang._interface.nat.rev170816._interface.nat.attributes.Nat; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang._interface.nat.rev170816._interface.nat.attributes.nat.Inbound; diff --git a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/ifc/InterfaceOutboundNatCustomizerTest.java b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/ifc/InterfaceOutboundNatCustomizerTest.java index 277e0f3db..83c155876 100644 --- a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/ifc/InterfaceOutboundNatCustomizerTest.java +++ b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/ifc/InterfaceOutboundNatCustomizerTest.java @@ -17,7 +17,7 @@ package io.fd.hc2vpp.nat.write.ifc; import io.fd.hc2vpp.common.translate.util.NamingContext; -import io.fd.vpp.jvpp.nat.future.FutureJVppNatFacade; +import io.fd.jvpp.nat.future.FutureJVppNatFacade; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang._interface.nat.rev170816.NatInterfaceAugmentation; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang._interface.nat.rev170816._interface.nat.attributes.Nat; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang._interface.nat.rev170816._interface.nat.attributes.nat.Outbound; diff --git a/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/VppNshModule.java b/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/VppNshModule.java index aaa1d6c4e..a6fb70407 100755 --- a/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/VppNshModule.java +++ b/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/VppNshModule.java @@ -22,14 +22,14 @@ import com.google.inject.Provider; import com.google.inject.Singleton; import com.google.inject.multibindings.Multibinder; import com.google.inject.name.Names; -import io.fd.honeycomb.translate.read.ReaderFactory; import io.fd.hc2vpp.common.translate.util.NamingContext; -import io.fd.honeycomb.translate.write.WriterFactory; import io.fd.hc2vpp.vppnsh.impl.config.VppNshWriterFactory; import io.fd.hc2vpp.vppnsh.impl.oper.VppNshReaderFactory; import io.fd.hc2vpp.vppnsh.impl.util.JVppNshProvider; -import io.fd.vpp.jvpp.nsh.future.FutureJVppNsh; -import io.fd.vpp.jvpp.nsh.future.FutureJVppNshFacade; +import io.fd.honeycomb.translate.read.ReaderFactory; +import io.fd.honeycomb.translate.write.WriterFactory; +import io.fd.jvpp.nsh.future.FutureJVppNsh; +import io.fd.jvpp.nsh.future.FutureJVppNshFacade; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/config/NshEntryWriterCustomizer.java b/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/config/NshEntryWriterCustomizer.java index 540ba48e8..deac9beab 100755 --- a/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/config/NshEntryWriterCustomizer.java +++ b/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/config/NshEntryWriterCustomizer.java @@ -26,9 +26,9 @@ import io.fd.hc2vpp.vppnsh.impl.util.FutureJVppNshCustomizer; import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.nsh.dto.NshAddDelEntry; -import io.fd.vpp.jvpp.nsh.dto.NshAddDelEntryReply; -import io.fd.vpp.jvpp.nsh.future.FutureJVppNsh; +import io.fd.jvpp.nsh.dto.NshAddDelEntry; +import io.fd.jvpp.nsh.dto.NshAddDelEntryReply; +import io.fd.jvpp.nsh.future.FutureJVppNsh; import java.util.List; import java.util.concurrent.CompletionStage; import javax.annotation.Nonnull; diff --git a/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/config/NshMapWriterCustomizer.java b/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/config/NshMapWriterCustomizer.java index 91be553a6..75fe90768 100755 --- a/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/config/NshMapWriterCustomizer.java +++ b/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/config/NshMapWriterCustomizer.java @@ -27,9 +27,9 @@ import io.fd.honeycomb.translate.MappingContext; import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.nsh.dto.NshAddDelMap; -import io.fd.vpp.jvpp.nsh.dto.NshAddDelMapReply; -import io.fd.vpp.jvpp.nsh.future.FutureJVppNsh; +import io.fd.jvpp.nsh.dto.NshAddDelMap; +import io.fd.jvpp.nsh.dto.NshAddDelMapReply; +import io.fd.jvpp.nsh.future.FutureJVppNsh; import java.util.concurrent.CompletionStage; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.nsh.rev170315.None; diff --git a/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/config/VppNshWriterFactory.java b/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/config/VppNshWriterFactory.java index 9ab086ca8..430eeabd1 100755 --- a/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/config/VppNshWriterFactory.java +++ b/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/config/VppNshWriterFactory.java @@ -23,7 +23,7 @@ import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.impl.write.GenericListWriter; import io.fd.honeycomb.translate.write.WriterFactory; import io.fd.honeycomb.translate.write.registry.ModifiableWriterRegistryBuilder; -import io.fd.vpp.jvpp.nsh.future.FutureJVppNsh; +import io.fd.jvpp.nsh.future.FutureJVppNsh; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.nsh.rev170315.NshMdType1Augment; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.nsh.rev170315.NshMdType2Augment; diff --git a/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/oper/NshEntryReaderCustomizer.java b/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/oper/NshEntryReaderCustomizer.java index 011672749..d3b4838fe 100755 --- a/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/oper/NshEntryReaderCustomizer.java +++ b/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/oper/NshEntryReaderCustomizer.java @@ -26,10 +26,10 @@ import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.Initialized; import io.fd.honeycomb.translate.spi.read.InitializingListReaderCustomizer; -import io.fd.vpp.jvpp.nsh.dto.NshEntryDetails; -import io.fd.vpp.jvpp.nsh.dto.NshEntryDetailsReplyDump; -import io.fd.vpp.jvpp.nsh.dto.NshEntryDump; -import io.fd.vpp.jvpp.nsh.future.FutureJVppNsh; +import io.fd.jvpp.nsh.dto.NshEntryDetails; +import io.fd.jvpp.nsh.dto.NshEntryDetailsReplyDump; +import io.fd.jvpp.nsh.dto.NshEntryDump; +import io.fd.jvpp.nsh.future.FutureJVppNsh; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; diff --git a/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/oper/NshMapReaderCustomizer.java b/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/oper/NshMapReaderCustomizer.java index 4e8d31b3f..a23fa155b 100755 --- a/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/oper/NshMapReaderCustomizer.java +++ b/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/oper/NshMapReaderCustomizer.java @@ -27,10 +27,10 @@ import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.Initialized; import io.fd.honeycomb.translate.spi.read.InitializingListReaderCustomizer; -import io.fd.vpp.jvpp.nsh.dto.NshMapDetails; -import io.fd.vpp.jvpp.nsh.dto.NshMapDetailsReplyDump; -import io.fd.vpp.jvpp.nsh.dto.NshMapDump; -import io.fd.vpp.jvpp.nsh.future.FutureJVppNsh; +import io.fd.jvpp.nsh.dto.NshMapDetails; +import io.fd.jvpp.nsh.dto.NshMapDetailsReplyDump; +import io.fd.jvpp.nsh.dto.NshMapDump; +import io.fd.jvpp.nsh.future.FutureJVppNsh; import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/oper/VppNshReaderFactory.java b/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/oper/VppNshReaderFactory.java index 41027c24c..ba098fca4 100755 --- a/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/oper/VppNshReaderFactory.java +++ b/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/oper/VppNshReaderFactory.java @@ -22,7 +22,7 @@ import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.impl.read.GenericInitListReader; import io.fd.honeycomb.translate.read.ReaderFactory; import io.fd.honeycomb.translate.read.registry.ModifiableReaderRegistryBuilder; -import io.fd.vpp.jvpp.nsh.future.FutureJVppNsh; +import io.fd.jvpp.nsh.future.FutureJVppNsh; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.nsh.rev170315.VppNshState; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.nsh.rev170315.VppNshStateBuilder; diff --git a/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/util/FutureJVppNshCustomizer.java b/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/util/FutureJVppNshCustomizer.java index ced6fa7ee..f5f8782a1 100755 --- a/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/util/FutureJVppNshCustomizer.java +++ b/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/util/FutureJVppNshCustomizer.java @@ -18,7 +18,7 @@ package io.fd.hc2vpp.vppnsh.impl.util; import com.google.common.annotations.Beta; import com.google.common.base.Preconditions; -import io.fd.vpp.jvpp.nsh.future.FutureJVppNsh; +import io.fd.jvpp.nsh.future.FutureJVppNsh; import javax.annotation.Nonnull; /** diff --git a/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/util/JVppNshProvider.java b/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/util/JVppNshProvider.java index 8f25a44e9..2f4977b50 100755 --- a/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/util/JVppNshProvider.java +++ b/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/util/JVppNshProvider.java @@ -19,9 +19,9 @@ package io.fd.hc2vpp.vppnsh.impl.util; import com.google.inject.Inject; import io.fd.honeycomb.binding.init.ProviderTrait; import io.fd.honeycomb.data.init.ShutdownHandler; -import io.fd.vpp.jvpp.JVppRegistry; -import io.fd.vpp.jvpp.nsh.JVppNshImpl; -import io.fd.vpp.jvpp.nsh.future.FutureJVppNshFacade; +import io.fd.jvpp.JVppRegistry; +import io.fd.jvpp.nsh.JVppNshImpl; +import io.fd.jvpp.nsh.future.FutureJVppNshFacade; import java.io.IOException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/nsh/impl/src/test/java/io/fd/hc2vpp/vppnsh/impl/VppNshModuleTest.java b/nsh/impl/src/test/java/io/fd/hc2vpp/vppnsh/impl/VppNshModuleTest.java index c4b526cfd..f2e10ad88 100644 --- a/nsh/impl/src/test/java/io/fd/hc2vpp/vppnsh/impl/VppNshModuleTest.java +++ b/nsh/impl/src/test/java/io/fd/hc2vpp/vppnsh/impl/VppNshModuleTest.java @@ -30,14 +30,14 @@ import com.google.inject.Provider; import com.google.inject.name.Named; import com.google.inject.testing.fieldbinder.Bind; import com.google.inject.testing.fieldbinder.BoundFieldModule; -import io.fd.honeycomb.translate.read.ReaderFactory; +import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.impl.read.registry.CompositeReaderRegistryBuilder; import io.fd.honeycomb.translate.impl.write.registry.FlatWriterRegistryBuilder; -import io.fd.hc2vpp.common.translate.util.NamingContext; +import io.fd.honeycomb.translate.read.ReaderFactory; 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.nsh.future.FutureJVppNshFacade; +import io.fd.jvpp.JVppRegistry; +import io.fd.jvpp.nsh.future.FutureJVppNshFacade; import java.util.HashSet; import java.util.Set; import org.junit.Before; diff --git a/nsh/impl/src/test/java/io/fd/hc2vpp/vppnsh/impl/config/NshEntryWriterCustomizerTest.java b/nsh/impl/src/test/java/io/fd/hc2vpp/vppnsh/impl/config/NshEntryWriterCustomizerTest.java index 27a6899fb..28e9cd45d 100644 --- a/nsh/impl/src/test/java/io/fd/hc2vpp/vppnsh/impl/config/NshEntryWriterCustomizerTest.java +++ b/nsh/impl/src/test/java/io/fd/hc2vpp/vppnsh/impl/config/NshEntryWriterCustomizerTest.java @@ -25,10 +25,10 @@ import static org.mockito.Mockito.verify; import io.fd.hc2vpp.common.test.write.WriterCustomizerTest; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.VppBaseCallException; -import io.fd.vpp.jvpp.nsh.dto.NshAddDelEntry; -import io.fd.vpp.jvpp.nsh.dto.NshAddDelEntryReply; -import io.fd.vpp.jvpp.nsh.future.FutureJVppNsh; +import io.fd.jvpp.VppBaseCallException; +import io.fd.jvpp.nsh.dto.NshAddDelEntry; +import io.fd.jvpp.nsh.dto.NshAddDelEntryReply; +import io.fd.jvpp.nsh.future.FutureJVppNsh; import org.junit.Test; import org.mockito.Mock; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.nsh.rev170315.Ethernet; diff --git a/nsh/impl/src/test/java/io/fd/hc2vpp/vppnsh/impl/config/NshMapWriterCustomizerTest.java b/nsh/impl/src/test/java/io/fd/hc2vpp/vppnsh/impl/config/NshMapWriterCustomizerTest.java index 8343c1481..963e38106 100644 --- a/nsh/impl/src/test/java/io/fd/hc2vpp/vppnsh/impl/config/NshMapWriterCustomizerTest.java +++ b/nsh/impl/src/test/java/io/fd/hc2vpp/vppnsh/impl/config/NshMapWriterCustomizerTest.java @@ -25,10 +25,10 @@ import static org.mockito.Mockito.verify; import io.fd.hc2vpp.common.test.write.WriterCustomizerTest; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.VppBaseCallException; -import io.fd.vpp.jvpp.nsh.dto.NshAddDelMap; -import io.fd.vpp.jvpp.nsh.dto.NshAddDelMapReply; -import io.fd.vpp.jvpp.nsh.future.FutureJVppNsh; +import io.fd.jvpp.VppBaseCallException; +import io.fd.jvpp.nsh.dto.NshAddDelMap; +import io.fd.jvpp.nsh.dto.NshAddDelMapReply; +import io.fd.jvpp.nsh.future.FutureJVppNsh; import org.junit.Test; import org.mockito.Mock; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.nsh.rev170315.Swap; diff --git a/nsh/impl/src/test/java/io/fd/hc2vpp/vppnsh/impl/oper/NshEntryReaderCustomizerTest.java b/nsh/impl/src/test/java/io/fd/hc2vpp/vppnsh/impl/oper/NshEntryReaderCustomizerTest.java index 555e7bf34..ffe6802f9 100644 --- a/nsh/impl/src/test/java/io/fd/hc2vpp/vppnsh/impl/oper/NshEntryReaderCustomizerTest.java +++ b/nsh/impl/src/test/java/io/fd/hc2vpp/vppnsh/impl/oper/NshEntryReaderCustomizerTest.java @@ -26,11 +26,11 @@ import io.fd.hc2vpp.common.test.read.ListReaderCustomizerTest; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.vpp.jvpp.VppBaseCallException; -import io.fd.vpp.jvpp.nsh.dto.NshEntryDetails; -import io.fd.vpp.jvpp.nsh.dto.NshEntryDetailsReplyDump; -import io.fd.vpp.jvpp.nsh.dto.NshEntryDump; -import io.fd.vpp.jvpp.nsh.future.FutureJVppNsh; +import io.fd.jvpp.VppBaseCallException; +import io.fd.jvpp.nsh.dto.NshEntryDetails; +import io.fd.jvpp.nsh.dto.NshEntryDetailsReplyDump; +import io.fd.jvpp.nsh.dto.NshEntryDump; +import io.fd.jvpp.nsh.future.FutureJVppNsh; import java.util.List; import org.junit.Test; import org.mockito.Mock; diff --git a/nsh/impl/src/test/java/io/fd/hc2vpp/vppnsh/impl/oper/NshMapReaderCustomizerTest.java b/nsh/impl/src/test/java/io/fd/hc2vpp/vppnsh/impl/oper/NshMapReaderCustomizerTest.java index 33b432825..245eeac07 100644 --- a/nsh/impl/src/test/java/io/fd/hc2vpp/vppnsh/impl/oper/NshMapReaderCustomizerTest.java +++ b/nsh/impl/src/test/java/io/fd/hc2vpp/vppnsh/impl/oper/NshMapReaderCustomizerTest.java @@ -26,11 +26,11 @@ import io.fd.hc2vpp.common.test.read.ListReaderCustomizerTest; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.vpp.jvpp.VppBaseCallException; -import io.fd.vpp.jvpp.nsh.dto.NshMapDetails; -import io.fd.vpp.jvpp.nsh.dto.NshMapDetailsReplyDump; -import io.fd.vpp.jvpp.nsh.dto.NshMapDump; -import io.fd.vpp.jvpp.nsh.future.FutureJVppNsh; +import io.fd.jvpp.VppBaseCallException; +import io.fd.jvpp.nsh.dto.NshMapDetails; +import io.fd.jvpp.nsh.dto.NshMapDetailsReplyDump; +import io.fd.jvpp.nsh.dto.NshMapDump; +import io.fd.jvpp.nsh.future.FutureJVppNsh; import java.util.List; import org.junit.Test; import org.mockito.Mock; diff --git a/release-notes/src/main/asciidoc/devel_guide/devel_plugin_vpp_tutorial.adoc b/release-notes/src/main/asciidoc/devel_guide/devel_plugin_vpp_tutorial.adoc index dc0185b9f..01a2e3a83 100644 --- a/release-notes/src/main/asciidoc/devel_guide/devel_plugin_vpp_tutorial.adoc +++ b/release-notes/src/main/asciidoc/devel_guide/devel_plugin_vpp_tutorial.adoc @@ -115,10 +115,10 @@ import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.ListReaderCustomizer; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; -import io.fd.vpp.jvpp.core.dto.VxlanTunnelDetails; -import io.fd.vpp.jvpp.core.dto.VxlanTunnelDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.VxlanTunnelDump; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.VxlanTunnelDetails; +import io.fd.jvpp.core.dto.VxlanTunnelDetailsReplyDump; +import io.fd.jvpp.core.dto.VxlanTunnelDump; +import io.fd.jvpp.core.future.FutureJVppCore; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.sample.plugin.rev161214.sample.plugin.params.VxlansBuilder; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.sample.plugin.rev161214.sample.plugin.params.vxlans.VxlanTunnel; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.sample.plugin.rev161214.sample.plugin.params.vxlans.VxlanTunnelBuilder; @@ -273,7 +273,7 @@ import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.impl.read.GenericListReader; import io.fd.honeycomb.translate.read.ReaderFactory; import io.fd.honeycomb.translate.read.registry.ModifiableReaderRegistryBuilder; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.sample.plugin.rev161214.SamplePluginState; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.sample.plugin.rev161214.SamplePluginStateBuilder; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.sample.plugin.rev161214.sample.plugin.params.Vxlans; @@ -339,9 +339,9 @@ import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.VxlanAddDelTunnel; -import io.fd.vpp.jvpp.core.dto.VxlanAddDelTunnelReply; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.VxlanAddDelTunnel; +import io.fd.jvpp.core.dto.VxlanAddDelTunnelReply; +import io.fd.jvpp.core.future.FutureJVppCore; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.sample.plugin.rev161214.sample.plugin.params.vxlans.VxlanTunnel; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.sample.plugin.rev161214.sample.plugin.params.vxlans.VxlanTunnelKey; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; @@ -433,7 +433,7 @@ import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.impl.write.GenericWriter; import io.fd.honeycomb.translate.write.WriterFactory; import io.fd.honeycomb.translate.write.registry.ModifiableWriterRegistryBuilder; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.sample.plugin.rev161214.SamplePlugin; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.sample.plugin.rev161214.sample.plugin.params.Vxlans; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.sample.plugin.rev161214.sample.plugin.params.vxlans.VxlanTunnel; diff --git a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/naming/Ipv4RouteNamesFactory.java b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/naming/Ipv4RouteNamesFactory.java index d68fd675e..7498c394b 100644 --- a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/naming/Ipv4RouteNamesFactory.java +++ b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/naming/Ipv4RouteNamesFactory.java @@ -20,8 +20,8 @@ import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.hc2vpp.routing.trait.RouteMapper; import io.fd.hc2vpp.routing.write.trait.RouteRequestProducer; import io.fd.honeycomb.translate.MappingContext; -import io.fd.vpp.jvpp.core.dto.IpFibDetails; -import io.fd.vpp.jvpp.core.types.FibPath; +import io.fd.jvpp.core.dto.IpFibDetails; +import io.fd.jvpp.core.types.FibPath; import java.net.InetAddress; import java.net.UnknownHostException; import java.util.Arrays; diff --git a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/naming/Ipv6RouteNamesFactory.java b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/naming/Ipv6RouteNamesFactory.java index 3d17d28e1..83d54bcc9 100644 --- a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/naming/Ipv6RouteNamesFactory.java +++ b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/naming/Ipv6RouteNamesFactory.java @@ -21,8 +21,8 @@ import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.hc2vpp.routing.trait.RouteMapper; import io.fd.hc2vpp.routing.write.trait.RouteRequestProducer; import io.fd.honeycomb.translate.MappingContext; -import io.fd.vpp.jvpp.core.dto.Ip6FibDetails; -import io.fd.vpp.jvpp.core.types.FibPath; +import io.fd.jvpp.core.dto.Ip6FibDetails; +import io.fd.jvpp.core.types.FibPath; import java.net.InetAddress; import java.net.UnknownHostException; import javax.annotation.Nonnull; diff --git a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/read/ControlPlaneProtocolCustomizer.java b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/read/ControlPlaneProtocolCustomizer.java index 005577fb4..3fde2da4c 100644 --- a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/read/ControlPlaneProtocolCustomizer.java +++ b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/read/ControlPlaneProtocolCustomizer.java @@ -24,8 +24,8 @@ import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.ListReaderCustomizer; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; -import io.fd.vpp.jvpp.core.dto.Ip6FibDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.IpFibDetailsReplyDump; +import io.fd.jvpp.core.dto.Ip6FibDetailsReplyDump; +import io.fd.jvpp.core.dto.IpFibDetailsReplyDump; import java.util.Collection; import java.util.Collections; import java.util.List; diff --git a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/read/Ipv4RouteCustomizer.java b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/read/Ipv4RouteCustomizer.java index 2f7590421..a78668d3d 100644 --- a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/read/Ipv4RouteCustomizer.java +++ b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/read/Ipv4RouteCustomizer.java @@ -28,8 +28,8 @@ import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.ListReaderCustomizer; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; -import io.fd.vpp.jvpp.core.dto.IpFibDetails; -import io.fd.vpp.jvpp.core.dto.IpFibDetailsReplyDump; +import io.fd.jvpp.core.dto.IpFibDetails; +import io.fd.jvpp.core.dto.IpFibDetailsReplyDump; import java.util.Arrays; import java.util.Collections; import java.util.List; diff --git a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/read/Ipv6RouteCustomizer.java b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/read/Ipv6RouteCustomizer.java index bd90f8bfa..3ff34abbd 100644 --- a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/read/Ipv6RouteCustomizer.java +++ b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/read/Ipv6RouteCustomizer.java @@ -28,8 +28,8 @@ import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.ListReaderCustomizer; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; -import io.fd.vpp.jvpp.core.dto.Ip6FibDetails; -import io.fd.vpp.jvpp.core.dto.Ip6FibDetailsReplyDump; +import io.fd.jvpp.core.dto.Ip6FibDetails; +import io.fd.jvpp.core.dto.Ip6FibDetailsReplyDump; import java.util.Arrays; import java.util.Collections; import java.util.List; diff --git a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/read/RoutingReaderFactory.java b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/read/RoutingReaderFactory.java index 9ec765c86..d259b264c 100644 --- a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/read/RoutingReaderFactory.java +++ b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/read/RoutingReaderFactory.java @@ -28,11 +28,11 @@ import io.fd.honeycomb.translate.impl.read.GenericListReader; import io.fd.honeycomb.translate.read.ReaderFactory; import io.fd.honeycomb.translate.read.registry.ModifiableReaderRegistryBuilder; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; -import io.fd.vpp.jvpp.core.dto.Ip6FibDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.Ip6FibDump; -import io.fd.vpp.jvpp.core.dto.IpFibDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.IpFibDump; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.Ip6FibDetailsReplyDump; +import io.fd.jvpp.core.dto.Ip6FibDump; +import io.fd.jvpp.core.dto.IpFibDetailsReplyDump; +import io.fd.jvpp.core.dto.IpFibDump; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ipv4.unicast.routing.rev180313.StaticRoutes1; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ipv4.unicast.routing.rev180313.StaticRoutes1Builder; diff --git a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/trait/Ipv4RoutePathParser.java b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/trait/Ipv4RoutePathParser.java index afcd62940..63453682c 100644 --- a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/trait/Ipv4RoutePathParser.java +++ b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/trait/Ipv4RoutePathParser.java @@ -23,7 +23,7 @@ import io.fd.hc2vpp.common.translate.util.MultiNamingContext; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.hc2vpp.routing.naming.Ipv4RouteNamesFactory; import io.fd.honeycomb.translate.MappingContext; -import io.fd.vpp.jvpp.core.types.FibPath; +import io.fd.jvpp.core.types.FibPath; import java.util.List; import java.util.stream.Collectors; import javax.annotation.Nonnull; diff --git a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/trait/Ipv6RoutePathParser.java b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/trait/Ipv6RoutePathParser.java index 2e259cd16..2a2c2cbf0 100644 --- a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/trait/Ipv6RoutePathParser.java +++ b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/trait/Ipv6RoutePathParser.java @@ -23,7 +23,7 @@ import io.fd.hc2vpp.common.translate.util.MultiNamingContext; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.hc2vpp.routing.naming.Ipv6RouteNamesFactory; import io.fd.honeycomb.translate.MappingContext; -import io.fd.vpp.jvpp.core.types.FibPath; +import io.fd.jvpp.core.types.FibPath; import java.util.List; import java.util.stream.Collectors; import javax.annotation.Nonnull; diff --git a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/trait/RouteMapper.java b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/trait/RouteMapper.java index 14b4d0727..b45382fcf 100644 --- a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/trait/RouteMapper.java +++ b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/trait/RouteMapper.java @@ -18,7 +18,7 @@ package io.fd.hc2vpp.routing.trait; import io.fd.hc2vpp.common.translate.util.AddressTranslator; import io.fd.hc2vpp.common.translate.util.ByteDataTranslator; -import io.fd.vpp.jvpp.core.types.FibPath; +import io.fd.jvpp.core.types.FibPath; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.routing.rev180313.SpecialNextHop; diff --git a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/Ipv4RouteCustomizer.java b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/Ipv4RouteCustomizer.java index 35f534ff5..77e0d1a3c 100644 --- a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/Ipv4RouteCustomizer.java +++ b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/Ipv4RouteCustomizer.java @@ -34,8 +34,8 @@ import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer; import io.fd.honeycomb.translate.util.RWUtils; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.IpAddDelRoute; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.IpAddDelRoute; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.Comparator; import java.util.List; import java.util.stream.Collectors; diff --git a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/Ipv6RouteCustomizer.java b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/Ipv6RouteCustomizer.java index 3b6c1bafc..d6fc3e6c6 100644 --- a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/Ipv6RouteCustomizer.java +++ b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/Ipv6RouteCustomizer.java @@ -35,8 +35,8 @@ import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer; import io.fd.honeycomb.translate.util.RWUtils; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.IpAddDelRoute; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.IpAddDelRoute; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.Comparator; import java.util.List; import java.util.stream.Collectors; diff --git a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/PrefixCustomizer.java b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/PrefixCustomizer.java index e818be893..c396fe735 100644 --- a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/PrefixCustomizer.java +++ b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/PrefixCustomizer.java @@ -27,8 +27,8 @@ import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.SwInterfaceIp6NdRaPrefix; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.SwInterfaceIp6NdRaPrefix; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.routing.ra.rev180319.ControlAdvPrefixesVppAugmentation; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface; diff --git a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/RouterAdvertisementsCustomizer.java b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/RouterAdvertisementsCustomizer.java index 43afd7b94..2ba99c507 100644 --- a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/RouterAdvertisementsCustomizer.java +++ b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/RouterAdvertisementsCustomizer.java @@ -24,8 +24,8 @@ import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.spi.write.WriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.SwInterfaceIp6NdRaConfig; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.SwInterfaceIp6NdRaConfig; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.routing.ra.rev180319.Ipv6RouterAdvertisementsVppAugmentation; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface; diff --git a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/RoutingWriterFactory.java b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/RoutingWriterFactory.java index 05eaa0eff..2f318d3db 100644 --- a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/RoutingWriterFactory.java +++ b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/RoutingWriterFactory.java @@ -33,7 +33,7 @@ import io.fd.hc2vpp.vpp.classifier.context.VppClassifierContextManager; import io.fd.honeycomb.translate.impl.write.GenericWriter; import io.fd.honeycomb.translate.write.WriterFactory; import io.fd.honeycomb.translate.write.registry.ModifiableWriterRegistryBuilder; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.Set; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.routing.ra.rev180319.ControlAdvPrefixesVppAugmentation; diff --git a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/factory/MultipathHopRequestFactory.java b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/factory/MultipathHopRequestFactory.java index 8f3d65d0f..ede0c078f 100644 --- a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/factory/MultipathHopRequestFactory.java +++ b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/factory/MultipathHopRequestFactory.java @@ -21,7 +21,7 @@ import io.fd.hc2vpp.routing.write.factory.base.BasicHopRequestFactory; import io.fd.hc2vpp.routing.write.trait.RouteRequestProducer; import io.fd.hc2vpp.vpp.classifier.context.VppClassifierContextManager; import io.fd.honeycomb.translate.MappingContext; -import io.fd.vpp.jvpp.core.dto.IpAddDelRoute; +import io.fd.jvpp.core.dto.IpAddDelRoute; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.ipv4.unicast.routing.rev180319.VppIpv4NextHopAugmentation; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.ipv4.unicast.routing.rev180319.VppIpv4RouteAttributesAugmentation; diff --git a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/factory/SimpleHopRequestFactory.java b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/factory/SimpleHopRequestFactory.java index a2ebbac5c..2edf96106 100644 --- a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/factory/SimpleHopRequestFactory.java +++ b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/factory/SimpleHopRequestFactory.java @@ -21,7 +21,7 @@ import io.fd.hc2vpp.routing.write.factory.base.BasicHopRequestFactory; import io.fd.hc2vpp.routing.write.trait.RouteRequestProducer; import io.fd.hc2vpp.vpp.classifier.context.VppClassifierContextManager; import io.fd.honeycomb.translate.MappingContext; -import io.fd.vpp.jvpp.core.dto.IpAddDelRoute; +import io.fd.jvpp.core.dto.IpAddDelRoute; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.ipv4.unicast.routing.rev180319.VppIpv4RouteAttributesAugmentation; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.ipv4.unicast.routing.rev180319.routing.control.plane.protocols.control.plane.protocol._static.routes.ipv4.route.VppIpv4Route; diff --git a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/factory/SpecialNextHopRequestFactory.java b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/factory/SpecialNextHopRequestFactory.java index 85b998204..cd79e197c 100644 --- a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/factory/SpecialNextHopRequestFactory.java +++ b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/factory/SpecialNextHopRequestFactory.java @@ -23,7 +23,7 @@ import io.fd.hc2vpp.routing.write.factory.base.BasicHopRequestFactory; import io.fd.hc2vpp.routing.write.trait.RouteRequestProducer; import io.fd.hc2vpp.vpp.classifier.context.VppClassifierContextManager; import io.fd.honeycomb.translate.MappingContext; -import io.fd.vpp.jvpp.core.dto.IpAddDelRoute; +import io.fd.jvpp.core.dto.IpAddDelRoute; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Prefix; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Prefix; diff --git a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/factory/TableLookupRequestFactory.java b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/factory/TableLookupRequestFactory.java index a10919a04..cbb28441f 100644 --- a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/factory/TableLookupRequestFactory.java +++ b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/factory/TableLookupRequestFactory.java @@ -22,7 +22,7 @@ import io.fd.hc2vpp.routing.write.factory.base.BasicHopRequestFactory; import io.fd.hc2vpp.routing.write.trait.RouteRequestProducer; import io.fd.hc2vpp.vpp.classifier.context.VppClassifierContextManager; import io.fd.honeycomb.translate.write.WriteContext; -import io.fd.vpp.jvpp.core.dto.IpAddDelRoute; +import io.fd.jvpp.core.dto.IpAddDelRoute; import java.util.Optional; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.fib.table.management.rev180521.Ipv4; diff --git a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/trait/RouteRequestProducer.java b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/trait/RouteRequestProducer.java index 449a925b0..d9cd5d1ee 100644 --- a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/trait/RouteRequestProducer.java +++ b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/trait/RouteRequestProducer.java @@ -25,7 +25,7 @@ import io.fd.hc2vpp.common.translate.util.ByteDataTranslator; import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; import io.fd.hc2vpp.vpp.classifier.context.VppClassifierContextManager; import io.fd.honeycomb.translate.MappingContext; -import io.fd.vpp.jvpp.core.dto.IpAddDelRoute; +import io.fd.jvpp.core.dto.IpAddDelRoute; import java.util.Set; import java.util.regex.Pattern; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Prefix; diff --git a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/Ipv4RouteNamesFactoryTest.java b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/Ipv4RouteNamesFactoryTest.java index 0b1e1adb9..1bfe0c799 100644 --- a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/Ipv4RouteNamesFactoryTest.java +++ b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/Ipv4RouteNamesFactoryTest.java @@ -26,8 +26,8 @@ import io.fd.hc2vpp.routing.naming.Ipv4RouteNamesFactory; import io.fd.honeycomb.test.tools.HoneycombTestRunner; import io.fd.honeycomb.test.tools.annotations.InjectTestData; import io.fd.honeycomb.translate.MappingContext; -import io.fd.vpp.jvpp.core.dto.IpFibDetails; -import io.fd.vpp.jvpp.core.types.FibPath; +import io.fd.jvpp.core.dto.IpFibDetails; +import io.fd.jvpp.core.types.FibPath; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/Ipv6RouteNamesFactoryTest.java b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/Ipv6RouteNamesFactoryTest.java index 2bf3018d7..412b7f223 100644 --- a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/Ipv6RouteNamesFactoryTest.java +++ b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/Ipv6RouteNamesFactoryTest.java @@ -27,8 +27,8 @@ import io.fd.hc2vpp.routing.naming.Ipv6RouteNamesFactory; import io.fd.honeycomb.test.tools.HoneycombTestRunner; import io.fd.honeycomb.test.tools.annotations.InjectTestData; import io.fd.honeycomb.translate.MappingContext; -import io.fd.vpp.jvpp.core.dto.Ip6FibDetails; -import io.fd.vpp.jvpp.core.types.FibPath; +import io.fd.jvpp.core.dto.Ip6FibDetails; +import io.fd.jvpp.core.types.FibPath; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/RoutingModuleTest.java b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/RoutingModuleTest.java index 679b90316..103044fbe 100644 --- a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/RoutingModuleTest.java +++ b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/RoutingModuleTest.java @@ -39,7 +39,7 @@ import io.fd.honeycomb.translate.impl.write.registry.FlatWriterRegistryBuilder; import io.fd.honeycomb.translate.read.ReaderFactory; import io.fd.honeycomb.translate.util.YangDAG; import io.fd.honeycomb.translate.write.WriterFactory; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.HashSet; import java.util.Set; import org.junit.Before; diff --git a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/helpers/RoutingRequestTestHelper.java b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/helpers/RoutingRequestTestHelper.java index 052a7f2ec..cee89241d 100644 --- a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/helpers/RoutingRequestTestHelper.java +++ b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/helpers/RoutingRequestTestHelper.java @@ -27,9 +27,9 @@ import io.fd.hc2vpp.common.translate.util.ByteDataTranslator; import io.fd.hc2vpp.routing.trait.RouteMapper; import io.fd.hc2vpp.routing.write.trait.RouteRequestProducer; import io.fd.honeycomb.translate.util.RWUtils; -import io.fd.vpp.jvpp.core.dto.IpAddDelRoute; -import io.fd.vpp.jvpp.core.dto.IpAddDelRouteReply; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.IpAddDelRoute; +import io.fd.jvpp.core.dto.IpAddDelRouteReply; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.List; import org.mockito.ArgumentCaptor; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Prefix; diff --git a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/read/ControlPlaneProtocolCustomizerTest.java b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/read/ControlPlaneProtocolCustomizerTest.java index 61338e1e6..99c5b6981 100644 --- a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/read/ControlPlaneProtocolCustomizerTest.java +++ b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/read/ControlPlaneProtocolCustomizerTest.java @@ -32,11 +32,11 @@ import io.fd.hc2vpp.routing.Ipv6RouteData; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; import io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor; -import io.fd.vpp.jvpp.core.dto.Ip6FibDetails; -import io.fd.vpp.jvpp.core.dto.Ip6FibDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.IpFibDetails; -import io.fd.vpp.jvpp.core.dto.IpFibDetailsReplyDump; -import io.fd.vpp.jvpp.core.types.FibPath; +import io.fd.jvpp.core.dto.Ip6FibDetails; +import io.fd.jvpp.core.dto.Ip6FibDetailsReplyDump; +import io.fd.jvpp.core.dto.IpFibDetails; +import io.fd.jvpp.core.dto.IpFibDetailsReplyDump; +import io.fd.jvpp.core.types.FibPath; import java.util.Arrays; import java.util.List; import org.junit.Test; diff --git a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/read/Ipv4RouteCustomizerTest.java b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/read/Ipv4RouteCustomizerTest.java index 052dcb7ef..f6d0b6335 100644 --- a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/read/Ipv4RouteCustomizerTest.java +++ b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/read/Ipv4RouteCustomizerTest.java @@ -38,9 +38,9 @@ import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; import io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor; -import io.fd.vpp.jvpp.core.dto.IpFibDetails; -import io.fd.vpp.jvpp.core.dto.IpFibDetailsReplyDump; -import io.fd.vpp.jvpp.core.types.FibPath; +import io.fd.jvpp.core.dto.IpFibDetails; +import io.fd.jvpp.core.dto.IpFibDetailsReplyDump; +import io.fd.jvpp.core.types.FibPath; import java.util.Arrays; import java.util.List; import org.apache.commons.lang3.builder.EqualsBuilder; diff --git a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/read/Ipv6RouteCustomizerTest.java b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/read/Ipv6RouteCustomizerTest.java index b0f15e1d3..6927c6c1f 100644 --- a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/read/Ipv6RouteCustomizerTest.java +++ b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/read/Ipv6RouteCustomizerTest.java @@ -39,9 +39,9 @@ import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; import io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor; -import io.fd.vpp.jvpp.core.dto.Ip6FibDetails; -import io.fd.vpp.jvpp.core.dto.Ip6FibDetailsReplyDump; -import io.fd.vpp.jvpp.core.types.FibPath; +import io.fd.jvpp.core.dto.Ip6FibDetails; +import io.fd.jvpp.core.dto.Ip6FibDetailsReplyDump; +import io.fd.jvpp.core.types.FibPath; import java.util.Arrays; import java.util.List; import org.apache.commons.lang3.builder.EqualsBuilder; diff --git a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/Ipv4RouteCustomizerTest.java b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/Ipv4RouteCustomizerTest.java index 07d16610a..2220a042e 100644 --- a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/Ipv4RouteCustomizerTest.java +++ b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/Ipv4RouteCustomizerTest.java @@ -33,7 +33,7 @@ import io.fd.hc2vpp.routing.naming.Ipv4RouteNamesFactory; 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.core.dto.IpAddDelRoute; +import io.fd.jvpp.core.dto.IpAddDelRoute; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; diff --git a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/Ipv6RouteCustomizerTest.java b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/Ipv6RouteCustomizerTest.java index 1a56ced1b..ec748e59f 100644 --- a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/Ipv6RouteCustomizerTest.java +++ b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/Ipv6RouteCustomizerTest.java @@ -27,7 +27,7 @@ import io.fd.hc2vpp.routing.naming.Ipv6RouteNamesFactory; 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.core.dto.IpAddDelRoute; +import io.fd.jvpp.core.dto.IpAddDelRoute; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; diff --git a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/PrefixCustomizerTest.java b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/PrefixCustomizerTest.java index 3f99b791d..67cb15790 100644 --- a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/PrefixCustomizerTest.java +++ b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/PrefixCustomizerTest.java @@ -27,12 +27,12 @@ import io.fd.hc2vpp.routing.helpers.SchemaContextTestHelper; 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.core.dto.SwInterfaceIp6NdRaPrefix; -import io.fd.vpp.jvpp.core.dto.SwInterfaceIp6NdRaPrefixReply; -import io.fd.vpp.jvpp.core.types.Address; -import io.fd.vpp.jvpp.core.types.AddressFamily; -import io.fd.vpp.jvpp.core.types.AddressUnion; -import io.fd.vpp.jvpp.core.types.Ip6Address; +import io.fd.jvpp.core.dto.SwInterfaceIp6NdRaPrefix; +import io.fd.jvpp.core.dto.SwInterfaceIp6NdRaPrefixReply; +import io.fd.jvpp.core.types.Address; +import io.fd.jvpp.core.types.AddressFamily; +import io.fd.jvpp.core.types.AddressUnion; +import io.fd.jvpp.core.types.Ip6Address; import org.junit.Test; import org.junit.runner.RunWith; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.Interfaces; @@ -94,8 +94,8 @@ public class PrefixCustomizerTest extends WriterCustomizerTest implements Schema verify(api).swInterfaceIp6NdRaPrefix(request); } - public io.fd.vpp.jvpp.core.types.Prefix getPrefix(byte[] ip6address, byte length) { - io.fd.vpp.jvpp.core.types.Prefix prefix = new io.fd.vpp.jvpp.core.types.Prefix(); + public io.fd.jvpp.core.types.Prefix getPrefix(byte[] ip6address, byte length) { + io.fd.jvpp.core.types.Prefix prefix = new io.fd.jvpp.core.types.Prefix(); Address address = new Address(); address.af = AddressFamily.ADDRESS_IP6; Ip6Address ip6Address = new Ip6Address(); diff --git a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/RouterAdvertisementsCustomizerTest.java b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/RouterAdvertisementsCustomizerTest.java index 1bec72e19..300281430 100644 --- a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/RouterAdvertisementsCustomizerTest.java +++ b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/RouterAdvertisementsCustomizerTest.java @@ -27,8 +27,8 @@ import io.fd.hc2vpp.routing.helpers.SchemaContextTestHelper; 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.core.dto.SwInterfaceIp6NdRaConfig; -import io.fd.vpp.jvpp.core.dto.SwInterfaceIp6NdRaConfigReply; +import io.fd.jvpp.core.dto.SwInterfaceIp6NdRaConfig; +import io.fd.jvpp.core.dto.SwInterfaceIp6NdRaConfigReply; import org.junit.Test; import org.junit.runner.RunWith; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.Interfaces; diff --git a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/factory/MultipathHopRequestFactoryIpv4Test.java b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/factory/MultipathHopRequestFactoryIpv4Test.java index b4ec3d91d..a58ef8e2d 100644 --- a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/factory/MultipathHopRequestFactoryIpv4Test.java +++ b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/factory/MultipathHopRequestFactoryIpv4Test.java @@ -28,7 +28,7 @@ import io.fd.hc2vpp.vpp.classifier.context.VppClassifierContextManager; import io.fd.honeycomb.test.tools.HoneycombTestRunner; import io.fd.honeycomb.test.tools.annotations.InjectTestData; import io.fd.honeycomb.translate.MappingContext; -import io.fd.vpp.jvpp.core.dto.IpAddDelRoute; +import io.fd.jvpp.core.dto.IpAddDelRoute; import java.util.List; import org.junit.Before; import org.junit.Test; diff --git a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/factory/MultipathHopRequestFactoryIpv6Test.java b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/factory/MultipathHopRequestFactoryIpv6Test.java index 50ada6ef3..42a1376a5 100644 --- a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/factory/MultipathHopRequestFactoryIpv6Test.java +++ b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/factory/MultipathHopRequestFactoryIpv6Test.java @@ -28,7 +28,7 @@ import io.fd.hc2vpp.vpp.classifier.context.VppClassifierContextManager; import io.fd.honeycomb.test.tools.HoneycombTestRunner; import io.fd.honeycomb.test.tools.annotations.InjectTestData; import io.fd.honeycomb.translate.MappingContext; -import io.fd.vpp.jvpp.core.dto.IpAddDelRoute; +import io.fd.jvpp.core.dto.IpAddDelRoute; import java.util.List; import org.junit.Before; import org.junit.Test; diff --git a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/factory/SimpleHopRequestFactoryIpv4Test.java b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/factory/SimpleHopRequestFactoryIpv4Test.java index 5f3632b77..cbe5f3782 100644 --- a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/factory/SimpleHopRequestFactoryIpv4Test.java +++ b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/factory/SimpleHopRequestFactoryIpv4Test.java @@ -28,7 +28,7 @@ import io.fd.hc2vpp.vpp.classifier.context.VppClassifierContextManager; import io.fd.honeycomb.test.tools.HoneycombTestRunner; import io.fd.honeycomb.test.tools.annotations.InjectTestData; import io.fd.honeycomb.translate.MappingContext; -import io.fd.vpp.jvpp.core.dto.IpAddDelRoute; +import io.fd.jvpp.core.dto.IpAddDelRoute; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/factory/SimpleHopRequestFactoryIpv6Test.java b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/factory/SimpleHopRequestFactoryIpv6Test.java index f0a2998e3..b85e5a1cf 100644 --- a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/factory/SimpleHopRequestFactoryIpv6Test.java +++ b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/factory/SimpleHopRequestFactoryIpv6Test.java @@ -28,7 +28,7 @@ import io.fd.hc2vpp.vpp.classifier.context.VppClassifierContextManager; import io.fd.honeycomb.test.tools.HoneycombTestRunner; import io.fd.honeycomb.test.tools.annotations.InjectTestData; import io.fd.honeycomb.translate.MappingContext; -import io.fd.vpp.jvpp.core.dto.IpAddDelRoute; +import io.fd.jvpp.core.dto.IpAddDelRoute; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/factory/SpecialNextHopRequestFactoryIpv4Test.java b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/factory/SpecialNextHopRequestFactoryIpv4Test.java index c8cffa7e5..578121b92 100644 --- a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/factory/SpecialNextHopRequestFactoryIpv4Test.java +++ b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/factory/SpecialNextHopRequestFactoryIpv4Test.java @@ -35,7 +35,7 @@ import io.fd.honeycomb.test.tools.HoneycombTestRunner; import io.fd.honeycomb.test.tools.annotations.InjectTestData; import io.fd.honeycomb.translate.MappingContext; import io.fd.honeycomb.translate.util.RWUtils; -import io.fd.vpp.jvpp.core.dto.IpAddDelRoute; +import io.fd.jvpp.core.dto.IpAddDelRoute; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/factory/SpecialNextHopRequestFactoryIpv6Test.java b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/factory/SpecialNextHopRequestFactoryIpv6Test.java index 9f435d21b..14252d9d2 100644 --- a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/factory/SpecialNextHopRequestFactoryIpv6Test.java +++ b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/factory/SpecialNextHopRequestFactoryIpv6Test.java @@ -34,7 +34,7 @@ import io.fd.honeycomb.test.tools.HoneycombTestRunner; import io.fd.honeycomb.test.tools.annotations.InjectTestData; import io.fd.honeycomb.translate.MappingContext; import io.fd.honeycomb.translate.util.RWUtils; -import io.fd.vpp.jvpp.core.dto.IpAddDelRoute; +import io.fd.jvpp.core.dto.IpAddDelRoute; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/samples/samples-impl/src/main/java/io/fd/hc2vpp/samples/read/ModuleStateReaderFactory.java b/samples/samples-impl/src/main/java/io/fd/hc2vpp/samples/read/ModuleStateReaderFactory.java index 063520f84..13ee8330e 100644 --- a/samples/samples-impl/src/main/java/io/fd/hc2vpp/samples/read/ModuleStateReaderFactory.java +++ b/samples/samples-impl/src/main/java/io/fd/hc2vpp/samples/read/ModuleStateReaderFactory.java @@ -20,7 +20,7 @@ import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.impl.read.GenericListReader; import io.fd.honeycomb.translate.read.ReaderFactory; import io.fd.honeycomb.translate.read.registry.ModifiableReaderRegistryBuilder; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.sample.plugin.rev161214.SamplePluginState; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.sample.plugin.rev161214.SamplePluginStateBuilder; diff --git a/samples/samples-impl/src/main/java/io/fd/hc2vpp/samples/read/VxlanReadCustomizer.java b/samples/samples-impl/src/main/java/io/fd/hc2vpp/samples/read/VxlanReadCustomizer.java index d1ae0ae4e..8a67942bd 100644 --- a/samples/samples-impl/src/main/java/io/fd/hc2vpp/samples/read/VxlanReadCustomizer.java +++ b/samples/samples-impl/src/main/java/io/fd/hc2vpp/samples/read/VxlanReadCustomizer.java @@ -26,10 +26,10 @@ import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.ListReaderCustomizer; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; -import io.fd.vpp.jvpp.core.dto.VxlanTunnelDetails; -import io.fd.vpp.jvpp.core.dto.VxlanTunnelDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.VxlanTunnelDump; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.VxlanTunnelDetails; +import io.fd.jvpp.core.dto.VxlanTunnelDetailsReplyDump; +import io.fd.jvpp.core.dto.VxlanTunnelDump; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.Collections; import java.util.List; import java.util.stream.Collectors; diff --git a/samples/samples-impl/src/main/java/io/fd/hc2vpp/samples/write/ModuleWriterFactory.java b/samples/samples-impl/src/main/java/io/fd/hc2vpp/samples/write/ModuleWriterFactory.java index 8f7983b55..c7e514d14 100644 --- a/samples/samples-impl/src/main/java/io/fd/hc2vpp/samples/write/ModuleWriterFactory.java +++ b/samples/samples-impl/src/main/java/io/fd/hc2vpp/samples/write/ModuleWriterFactory.java @@ -20,7 +20,7 @@ import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.impl.write.GenericWriter; import io.fd.honeycomb.translate.write.WriterFactory; import io.fd.honeycomb.translate.write.registry.ModifiableWriterRegistryBuilder; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.sample.plugin.rev161214.SamplePlugin; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.sample.plugin.rev161214.sample.plugin.params.Vxlans; diff --git a/samples/samples-impl/src/main/java/io/fd/hc2vpp/samples/write/VxlanWriteCustomizer.java b/samples/samples-impl/src/main/java/io/fd/hc2vpp/samples/write/VxlanWriteCustomizer.java index d135f206b..6fbf5367d 100644 --- a/samples/samples-impl/src/main/java/io/fd/hc2vpp/samples/write/VxlanWriteCustomizer.java +++ b/samples/samples-impl/src/main/java/io/fd/hc2vpp/samples/write/VxlanWriteCustomizer.java @@ -23,9 +23,9 @@ import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.VxlanAddDelTunnel; -import io.fd.vpp.jvpp.core.dto.VxlanAddDelTunnelReply; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.VxlanAddDelTunnel; +import io.fd.jvpp.core.dto.VxlanAddDelTunnelReply; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.sample.plugin.rev161214.sample.plugin.params.vxlans.VxlanTunnel; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.sample.plugin.rev161214.sample.plugin.params.vxlans.VxlanTunnelKey; diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/Srv6PolicyReaderFactory.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/Srv6PolicyReaderFactory.java index ef15dcf55..ba74b5696 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/Srv6PolicyReaderFactory.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/Srv6PolicyReaderFactory.java @@ -33,7 +33,7 @@ import io.fd.honeycomb.translate.impl.read.GenericListReader; import io.fd.honeycomb.translate.impl.read.GenericReader; import io.fd.honeycomb.translate.read.ReaderFactory; import io.fd.honeycomb.translate.read.registry.ModifiableReaderRegistryBuilder; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.cisco.com.ns.yang.oc.srte.policy.rev170918.SegmentRoutingBuilder; import org.opendaylight.yang.gen.v1.http.cisco.com.ns.yang.oc.srte.policy.rev170918.autoroute.include.AutorouteIncludeBuilder; diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/Srv6ReaderFactory.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/Srv6ReaderFactory.java index 41c33f98b..b99dffebd 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/Srv6ReaderFactory.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/Srv6ReaderFactory.java @@ -25,7 +25,7 @@ import io.fd.hc2vpp.srv6.util.function.LocalSidFunctionReadBindingRegistry; import io.fd.honeycomb.translate.impl.read.GenericInitListReader; import io.fd.honeycomb.translate.read.ReaderFactory; import io.fd.honeycomb.translate.read.registry.ModifiableReaderRegistryBuilder; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.srv6._static.rev180301.Locator1Builder; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.srv6._static.rev180301.routing.srv6.locators.locator.StaticBuilder; diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/policy/NamedSegmentCustomizer.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/policy/NamedSegmentCustomizer.java index 9f9c0e2ab..a847b46b5 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/policy/NamedSegmentCustomizer.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/policy/NamedSegmentCustomizer.java @@ -24,7 +24,7 @@ import io.fd.hc2vpp.srv6.util.PolicyContextManager; import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.ListReaderCustomizer; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.List; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.cisco.com.ns.yang.oc.srte.policy.rev170918.named.segment.lists.NamedSegmentListsBuilder; diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/policy/PolicyCustomizer.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/policy/PolicyCustomizer.java index c4c323b52..d804174c8 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/policy/PolicyCustomizer.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/policy/PolicyCustomizer.java @@ -23,7 +23,7 @@ import io.fd.hc2vpp.srv6.util.PolicyContextManager; import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.ListReaderCustomizer; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.List; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.cisco.com.ns.yang.oc.srte.policy.rev170918.policies.PoliciesBuilder; diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/policy/request/PolicyReadRequest.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/policy/request/PolicyReadRequest.java index a3c6306c3..680216522 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/policy/request/PolicyReadRequest.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/policy/request/PolicyReadRequest.java @@ -25,12 +25,12 @@ import io.fd.hc2vpp.srv6.util.Srv6Util; import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; -import io.fd.vpp.jvpp.core.dto.SrPoliciesDetails; -import io.fd.vpp.jvpp.core.dto.SrPoliciesDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.SrPoliciesDump; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; -import io.fd.vpp.jvpp.core.types.Srv6Sid; -import io.fd.vpp.jvpp.core.types.Srv6SidList; +import io.fd.jvpp.core.dto.SrPoliciesDetails; +import io.fd.jvpp.core.dto.SrPoliciesDetailsReplyDump; +import io.fd.jvpp.core.dto.SrPoliciesDump; +import io.fd.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.types.Srv6Sid; +import io.fd.jvpp.core.types.Srv6SidList; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/sid/LocatorCustomizer.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/sid/LocatorCustomizer.java index 3fc33988c..5133a6864 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/sid/LocatorCustomizer.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/sid/LocatorCustomizer.java @@ -23,7 +23,7 @@ import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.Initialized; import io.fd.honeycomb.translate.spi.read.InitializingListReaderCustomizer; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.List; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.srv6.base.rev180301.srv6.locators.LocatorsBuilder; diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/sid/SidCustomizer.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/sid/SidCustomizer.java index 58beb9df3..e6c506dc6 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/sid/SidCustomizer.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/sid/SidCustomizer.java @@ -24,7 +24,7 @@ import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.Initialized; import io.fd.honeycomb.translate.spi.read.InitializingListReaderCustomizer; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.List; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.srv6._static.rev180301.routing.srv6.locators.locator._static.LocalSidsBuilder; diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/sid/request/LocalSidReadRequest.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/sid/request/LocalSidReadRequest.java index 044f237fb..418e5d52d 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/sid/request/LocalSidReadRequest.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/sid/request/LocalSidReadRequest.java @@ -29,10 +29,10 @@ import io.fd.honeycomb.translate.MappingContext; import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; -import io.fd.vpp.jvpp.core.dto.SrLocalsidsDetails; -import io.fd.vpp.jvpp.core.dto.SrLocalsidsDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.SrLocalsidsDump; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.SrLocalsidsDetails; +import io.fd.jvpp.core.dto.SrLocalsidsDetailsReplyDump; +import io.fd.jvpp.core.dto.SrLocalsidsDump; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.Arrays; import java.util.List; import java.util.Map; diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/sid/request/LocatorReadRequest.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/sid/request/LocatorReadRequest.java index 63d243a69..cadc348d1 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/sid/request/LocatorReadRequest.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/sid/request/LocatorReadRequest.java @@ -27,10 +27,10 @@ import io.fd.honeycomb.translate.MappingContext; import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; -import io.fd.vpp.jvpp.core.dto.SrLocalsidsDetails; -import io.fd.vpp.jvpp.core.dto.SrLocalsidsDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.SrLocalsidsDump; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.SrLocalsidsDetails; +import io.fd.jvpp.core.dto.SrLocalsidsDetailsReplyDump; +import io.fd.jvpp.core.dto.SrLocalsidsDump; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.List; import java.util.stream.Collectors; import javax.annotation.Nonnull; diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/steering/InterfaceCustomizer.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/steering/InterfaceCustomizer.java index af1420efb..dd89a476b 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/steering/InterfaceCustomizer.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/steering/InterfaceCustomizer.java @@ -22,7 +22,7 @@ import io.fd.hc2vpp.srv6.read.steering.request.L2SteeringRequest; import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.ListReaderCustomizer; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.List; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.oc.srte.policy.rev180514.segment.routing.traffic.engineering.policies.policy.autoroute.include.InterfacesBuilder; diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/steering/PrefixCustomizer.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/steering/PrefixCustomizer.java index b0ee7c3f8..274ffc371 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/steering/PrefixCustomizer.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/steering/PrefixCustomizer.java @@ -21,7 +21,7 @@ import io.fd.hc2vpp.srv6.read.steering.request.L3SteeringRequest; import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.ListReaderCustomizer; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.List; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.cisco.com.ns.yang.oc.srte.policy.rev170918.prefixes.properties.PrefixesBuilder; diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/steering/PrefixesStateCustomizer.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/steering/PrefixesStateCustomizer.java index b099939eb..1e4a09a94 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/steering/PrefixesStateCustomizer.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/steering/PrefixesStateCustomizer.java @@ -24,7 +24,7 @@ import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; import io.fd.honeycomb.translate.util.RWUtils; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.List; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.cisco.com.ns.yang.oc.srte.policy.rev170918.prefixes.properties.Prefixes; diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/steering/request/L2SteeringRequest.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/steering/request/L2SteeringRequest.java index e421158bc..b6554ce13 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/steering/request/L2SteeringRequest.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/steering/request/L2SteeringRequest.java @@ -20,8 +20,8 @@ import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.hc2vpp.srv6.read.ReadRequest; import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; -import io.fd.vpp.jvpp.core.dto.SrSteeringPolDetails; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.SrSteeringPolDetails; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.List; import java.util.stream.Collectors; import javax.annotation.Nonnull; diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/steering/request/L3SteeringRequest.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/steering/request/L3SteeringRequest.java index 4c7c943e6..2c3631d1e 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/steering/request/L3SteeringRequest.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/steering/request/L3SteeringRequest.java @@ -20,8 +20,8 @@ import com.google.common.base.Preconditions; import io.fd.hc2vpp.srv6.read.ReadRequest; import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; -import io.fd.vpp.jvpp.core.dto.SrSteeringPolDetails; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.SrSteeringPolDetails; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.List; import java.util.stream.Collectors; import javax.annotation.Nonnull; diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/steering/request/SteeringRequest.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/steering/request/SteeringRequest.java index 04b67f67e..14f824069 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/steering/request/SteeringRequest.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/steering/request/SteeringRequest.java @@ -18,9 +18,9 @@ package io.fd.hc2vpp.srv6.read.steering.request; import io.fd.hc2vpp.srv6.util.JVppRequest; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; -import io.fd.vpp.jvpp.core.dto.SrSteeringPolDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.SrSteeringPolDump; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.SrSteeringPolDetailsReplyDump; +import io.fd.jvpp.core.dto.SrSteeringPolDump; +import io.fd.jvpp.core.future.FutureJVppCore; /** * General template for steering requests diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/JVppRequest.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/JVppRequest.java index 9ea9fff30..340396ef7 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/JVppRequest.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/JVppRequest.java @@ -18,7 +18,7 @@ package io.fd.hc2vpp.srv6.util; import io.fd.hc2vpp.common.translate.util.AddressTranslator; import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; public abstract class JVppRequest implements AddressTranslator, JvppReplyConsumer { diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/LocalSidFunctionReadBinder.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/LocalSidFunctionReadBinder.java index ab624fbf7..0bc769f98 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/LocalSidFunctionReadBinder.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/LocalSidFunctionReadBinder.java @@ -17,7 +17,7 @@ package io.fd.hc2vpp.srv6.util.function; import io.fd.honeycomb.translate.read.ReadContext; -import io.fd.vpp.jvpp.core.dto.SrLocalsidsDetails; +import io.fd.jvpp.core.dto.SrLocalsidsDetails; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.srv6._static.rev180301.srv6._static.cfg.SidBuilder; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.srv6.types.rev180301.Srv6EndpointType; diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/LocalSidFunctionReadBindingRegistry.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/LocalSidFunctionReadBindingRegistry.java index 66586b9c2..945e09e18 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/LocalSidFunctionReadBindingRegistry.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/LocalSidFunctionReadBindingRegistry.java @@ -19,7 +19,7 @@ package io.fd.hc2vpp.srv6.util.function; import io.fd.hc2vpp.srv6.write.sid.request.LocalSidFunctionRequest; import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.util.RWUtils; -import io.fd.vpp.jvpp.core.dto.SrLocalsidsDetails; +import io.fd.jvpp.core.dto.SrLocalsidsDetails; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.srv6._static.rev180301.srv6._static.cfg.SidBuilder; diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/LocalSidFunctionReadBindingRegistryProvider.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/LocalSidFunctionReadBindingRegistryProvider.java index 40e305371..cdaf7bed8 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/LocalSidFunctionReadBindingRegistryProvider.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/LocalSidFunctionReadBindingRegistryProvider.java @@ -27,7 +27,7 @@ import io.fd.hc2vpp.srv6.util.function.xconnect.EndDX2FunctionBinder; import io.fd.hc2vpp.srv6.util.function.xconnect.EndDX4FunctionBinder; import io.fd.hc2vpp.srv6.util.function.xconnect.EndDX6FunctionBinder; import io.fd.hc2vpp.srv6.util.function.xconnect.EndXFunctionBinder; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.inject.Named; public class LocalSidFunctionReadBindingRegistryProvider implements Provider { diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/LocalSidFunctionWriteBindingRegistryProvider.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/LocalSidFunctionWriteBindingRegistryProvider.java index ead94c90f..532046707 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/LocalSidFunctionWriteBindingRegistryProvider.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/LocalSidFunctionWriteBindingRegistryProvider.java @@ -27,7 +27,7 @@ import io.fd.hc2vpp.srv6.util.function.xconnect.EndDX2FunctionBinder; import io.fd.hc2vpp.srv6.util.function.xconnect.EndDX4FunctionBinder; import io.fd.hc2vpp.srv6.util.function.xconnect.EndDX6FunctionBinder; import io.fd.hc2vpp.srv6.util.function.xconnect.EndXFunctionBinder; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.inject.Named; public class LocalSidFunctionWriteBindingRegistryProvider implements Provider { diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/lookup/EndDT4FunctionBinder.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/lookup/EndDT4FunctionBinder.java index 67b739161..7b89d9bb2 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/lookup/EndDT4FunctionBinder.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/lookup/EndDT4FunctionBinder.java @@ -20,8 +20,8 @@ import com.google.common.base.Preconditions; import io.fd.hc2vpp.srv6.write.sid.request.TableLookupLocalSidRequest; import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.write.WriteContext; -import io.fd.vpp.jvpp.core.dto.SrLocalsidsDetails; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.SrLocalsidsDetails; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.srv6._static.rev180301.srv6._static.cfg.Sid; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.srv6._static.rev180301.srv6._static.cfg.SidBuilder; diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/lookup/EndDT6FunctionBinder.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/lookup/EndDT6FunctionBinder.java index d9782a1af..743662115 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/lookup/EndDT6FunctionBinder.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/lookup/EndDT6FunctionBinder.java @@ -20,8 +20,8 @@ import com.google.common.base.Preconditions; import io.fd.hc2vpp.srv6.write.sid.request.TableLookupLocalSidRequest; import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.write.WriteContext; -import io.fd.vpp.jvpp.core.dto.SrLocalsidsDetails; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.SrLocalsidsDetails; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.srv6._static.rev180301.srv6._static.cfg.Sid; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.srv6._static.rev180301.srv6._static.cfg.SidBuilder; diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/lookup/EndTFunctionBinder.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/lookup/EndTFunctionBinder.java index cd9a37c48..957180f35 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/lookup/EndTFunctionBinder.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/lookup/EndTFunctionBinder.java @@ -20,8 +20,8 @@ import com.google.common.base.Preconditions; import io.fd.hc2vpp.srv6.write.sid.request.TableLookupLocalSidRequest; import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.write.WriteContext; -import io.fd.vpp.jvpp.core.dto.SrLocalsidsDetails; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.SrLocalsidsDetails; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.srv6._static.rev180301.srv6._static.cfg.Sid; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.srv6._static.rev180301.srv6._static.cfg.SidBuilder; diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/lookup/TableLookupFunctionBinder.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/lookup/TableLookupFunctionBinder.java index 31eacc558..fba75ecab 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/lookup/TableLookupFunctionBinder.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/lookup/TableLookupFunctionBinder.java @@ -22,7 +22,7 @@ import io.fd.hc2vpp.srv6.util.function.LocalSidFunctionReadBinder; import io.fd.hc2vpp.srv6.util.function.LocalSidFunctionWriteBinder; import io.fd.hc2vpp.srv6.write.sid.request.TableLookupLocalSidRequest; import io.fd.honeycomb.translate.write.WriteContext; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.fib.table.management.rev180521.AddressFamilyIdentity; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.fib.table.management.rev180521.Ipv4; diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/nofunction/EndFunctionBinder.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/nofunction/EndFunctionBinder.java index 4d7ad69fe..47450cb49 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/nofunction/EndFunctionBinder.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/nofunction/EndFunctionBinder.java @@ -23,8 +23,8 @@ import io.fd.hc2vpp.srv6.util.function.LocalSidFunctionWriteBinder; import io.fd.hc2vpp.srv6.write.sid.request.NoProtocolLocalSidRequest; import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.write.WriteContext; -import io.fd.vpp.jvpp.core.dto.SrLocalsidsDetails; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.SrLocalsidsDetails; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.srv6._static.rev180301.srv6._static.cfg.Sid; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.srv6._static.rev180301.srv6._static.cfg.SidBuilder; diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/xconnect/EndDX2FunctionBinder.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/xconnect/EndDX2FunctionBinder.java index 5321bffcf..c0010a912 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/xconnect/EndDX2FunctionBinder.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/xconnect/EndDX2FunctionBinder.java @@ -21,8 +21,8 @@ import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.hc2vpp.srv6.write.sid.request.XConnectLocalSidRequest; import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.write.WriteContext; -import io.fd.vpp.jvpp.core.dto.SrLocalsidsDetails; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.SrLocalsidsDetails; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.srv6._static.rev180301.srv6._static.cfg.Sid; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.srv6._static.rev180301.srv6._static.cfg.SidBuilder; diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/xconnect/EndDX4FunctionBinder.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/xconnect/EndDX4FunctionBinder.java index cb8dbfeb1..506b5aa51 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/xconnect/EndDX4FunctionBinder.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/xconnect/EndDX4FunctionBinder.java @@ -21,8 +21,8 @@ import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.hc2vpp.srv6.write.sid.request.XConnectLocalSidRequest; import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.write.WriteContext; -import io.fd.vpp.jvpp.core.dto.SrLocalsidsDetails; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.SrLocalsidsDetails; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.Collections; import java.util.Optional; import javax.annotation.Nonnull; diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/xconnect/EndDX6FunctionBinder.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/xconnect/EndDX6FunctionBinder.java index 3c1218005..727fdce63 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/xconnect/EndDX6FunctionBinder.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/xconnect/EndDX6FunctionBinder.java @@ -21,8 +21,8 @@ import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.hc2vpp.srv6.write.sid.request.XConnectLocalSidRequest; import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.write.WriteContext; -import io.fd.vpp.jvpp.core.dto.SrLocalsidsDetails; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.SrLocalsidsDetails; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.Collections; import java.util.Optional; import javax.annotation.Nonnull; diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/xconnect/EndXFunctionBinder.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/xconnect/EndXFunctionBinder.java index e153bd5f8..5bfbb167d 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/xconnect/EndXFunctionBinder.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/xconnect/EndXFunctionBinder.java @@ -21,8 +21,8 @@ import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.hc2vpp.srv6.write.sid.request.XConnectLocalSidRequest; import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.write.WriteContext; -import io.fd.vpp.jvpp.core.dto.SrLocalsidsDetails; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.SrLocalsidsDetails; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.Collections; import java.util.Optional; import javax.annotation.Nonnull; diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/xconnect/XConnectFunctionBinder.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/xconnect/XConnectFunctionBinder.java index eef5d9622..3be28392e 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/xconnect/XConnectFunctionBinder.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/util/function/xconnect/XConnectFunctionBinder.java @@ -25,7 +25,7 @@ import io.fd.hc2vpp.srv6.util.function.LocalSidFunctionReadBinder; import io.fd.hc2vpp.srv6.util.function.LocalSidFunctionWriteBinder; import io.fd.hc2vpp.srv6.write.sid.request.XConnectLocalSidRequest; import io.fd.honeycomb.translate.MappingContext; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; abstract class XConnectFunctionBinder extends FutureJVppCustomizer diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/Srv6PolicyWriterFactory.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/Srv6PolicyWriterFactory.java index 87e07d216..642086b8e 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/Srv6PolicyWriterFactory.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/Srv6PolicyWriterFactory.java @@ -33,7 +33,7 @@ import io.fd.honeycomb.translate.impl.write.GenericListWriter; import io.fd.honeycomb.translate.impl.write.GenericWriter; import io.fd.honeycomb.translate.write.WriterFactory; import io.fd.honeycomb.translate.write.registry.ModifiableWriterRegistryBuilder; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; public class Srv6PolicyWriterFactory implements WriterFactory { diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/Srv6WriterFactory.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/Srv6WriterFactory.java index bb2619755..29e6d9f7e 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/Srv6WriterFactory.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/Srv6WriterFactory.java @@ -28,7 +28,7 @@ import io.fd.honeycomb.translate.impl.write.GenericListWriter; import io.fd.honeycomb.translate.impl.write.GenericWriter; import io.fd.honeycomb.translate.write.WriterFactory; import io.fd.honeycomb.translate.write.registry.ModifiableWriterRegistryBuilder; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; public class Srv6WriterFactory implements WriterFactory { diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/encap/source/EncapsulationSourceCustomizer.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/encap/source/EncapsulationSourceCustomizer.java index 375aad0f9..adefcf45c 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/encap/source/EncapsulationSourceCustomizer.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/encap/source/EncapsulationSourceCustomizer.java @@ -23,7 +23,7 @@ import io.fd.hc2vpp.srv6.write.encap.source.request.EncapsulationSourceWriteRequ import io.fd.honeycomb.translate.spi.write.WriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.srv6.base.rev180301.srv6.encap.Encapsulation; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/encap/source/request/EncapsulationSourceDeleteRequest.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/encap/source/request/EncapsulationSourceDeleteRequest.java index e8877a956..9b839f39c 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/encap/source/request/EncapsulationSourceDeleteRequest.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/encap/source/request/EncapsulationSourceDeleteRequest.java @@ -19,8 +19,8 @@ package io.fd.hc2vpp.srv6.write.encap.source.request; import io.fd.hc2vpp.srv6.util.JVppRequest; import io.fd.hc2vpp.srv6.write.DeleteRequest; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.SrSetEncapSource; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.SrSetEncapSource; +import io.fd.jvpp.core.future.FutureJVppCore; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; public class EncapsulationSourceDeleteRequest extends JVppRequest implements DeleteRequest { diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/encap/source/request/EncapsulationSourceWriteRequest.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/encap/source/request/EncapsulationSourceWriteRequest.java index 0ecf13108..b2c114d9c 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/encap/source/request/EncapsulationSourceWriteRequest.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/encap/source/request/EncapsulationSourceWriteRequest.java @@ -21,8 +21,8 @@ import static com.google.common.base.Preconditions.checkNotNull; import io.fd.hc2vpp.srv6.util.JVppRequest; import io.fd.hc2vpp.srv6.write.WriteRequest; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.SrSetEncapSource; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.SrSetEncapSource; +import io.fd.jvpp.core.future.FutureJVppCore; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Address; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/policy/PolicyCustomizer.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/policy/PolicyCustomizer.java index f1a5c7de0..9072e3991 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/policy/PolicyCustomizer.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/policy/PolicyCustomizer.java @@ -30,7 +30,7 @@ import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.ArrayList; import java.util.Comparator; import java.util.List; diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/policy/request/PolicyDeleteRequest.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/policy/request/PolicyDeleteRequest.java index 71b9d72e8..d3981ca23 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/policy/request/PolicyDeleteRequest.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/policy/request/PolicyDeleteRequest.java @@ -21,9 +21,9 @@ import static com.google.common.base.Preconditions.checkNotNull; import io.fd.hc2vpp.srv6.util.JVppRequest; import io.fd.hc2vpp.srv6.write.DeleteRequest; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.SrPolicyDel; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; -import io.fd.vpp.jvpp.core.types.Srv6Sid; +import io.fd.jvpp.core.dto.SrPolicyDel; +import io.fd.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.types.Srv6Sid; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Address; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/policy/request/PolicyWriteRequest.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/policy/request/PolicyWriteRequest.java index a1523043d..3e2f622c3 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/policy/request/PolicyWriteRequest.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/policy/request/PolicyWriteRequest.java @@ -24,11 +24,11 @@ import io.fd.hc2vpp.srv6.util.JVppRequest; import io.fd.hc2vpp.srv6.write.WriteRequest; import io.fd.hc2vpp.srv6.write.policy.request.dto.SidList; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.SrPolicyAdd; -import io.fd.vpp.jvpp.core.dto.SrPolicyMod; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; -import io.fd.vpp.jvpp.core.types.Srv6Sid; -import io.fd.vpp.jvpp.core.types.Srv6SidList; +import io.fd.jvpp.core.dto.SrPolicyAdd; +import io.fd.jvpp.core.dto.SrPolicyMod; +import io.fd.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.types.Srv6Sid; +import io.fd.jvpp.core.types.Srv6SidList; import java.util.ArrayList; import java.util.Comparator; import java.util.List; diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/sid/LocatorCustomizer.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/sid/LocatorCustomizer.java index 41e838ee7..0510fdddf 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/sid/LocatorCustomizer.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/sid/LocatorCustomizer.java @@ -21,7 +21,7 @@ import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer; import io.fd.hc2vpp.srv6.util.LocatorContextManager; import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Address; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Prefix; diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/sid/SidCustomizer.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/sid/SidCustomizer.java index 83db74364..e29b623c4 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/sid/SidCustomizer.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/sid/SidCustomizer.java @@ -27,7 +27,7 @@ import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer; import io.fd.honeycomb.translate.util.RWUtils; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.fib.table.management.rev180521.vpp.fib.table.management.fib.tables.Table; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.fib.table.management.rev180521.vpp.fib.table.management.fib.tables.TableKey; diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/sid/request/LocalSidFunctionRequest.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/sid/request/LocalSidFunctionRequest.java index e3d64ea6c..f4d96a77d 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/sid/request/LocalSidFunctionRequest.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/sid/request/LocalSidFunctionRequest.java @@ -23,9 +23,9 @@ import io.fd.hc2vpp.srv6.util.JVppRequest; import io.fd.hc2vpp.srv6.write.DeleteRequest; import io.fd.hc2vpp.srv6.write.WriteRequest; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.SrLocalsidAddDel; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; -import io.fd.vpp.jvpp.core.types.Srv6Sid; +import io.fd.jvpp.core.dto.SrLocalsidAddDel; +import io.fd.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.types.Srv6Sid; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Address; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.srv6._static.rev180301.Srv6SidConfig; import org.opendaylight.yangtools.yang.binding.ChildOf; diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/sid/request/NoProtocolLocalSidRequest.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/sid/request/NoProtocolLocalSidRequest.java index 18630ccc2..67c7aa158 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/sid/request/NoProtocolLocalSidRequest.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/sid/request/NoProtocolLocalSidRequest.java @@ -16,7 +16,7 @@ package io.fd.hc2vpp.srv6.write.sid.request; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; /** * Local SID using End function diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/sid/request/TableLookupLocalSidRequest.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/sid/request/TableLookupLocalSidRequest.java index 4642b3349..48dceb161 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/sid/request/TableLookupLocalSidRequest.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/sid/request/TableLookupLocalSidRequest.java @@ -16,8 +16,8 @@ package io.fd.hc2vpp.srv6.write.sid.request; -import io.fd.vpp.jvpp.core.dto.SrLocalsidAddDel; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.SrLocalsidAddDel; +import io.fd.jvpp.core.future.FutureJVppCore; /** * Request for Local SID using table lookup functions diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/sid/request/XConnectLocalSidRequest.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/sid/request/XConnectLocalSidRequest.java index 38208aaf1..c5748ef4f 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/sid/request/XConnectLocalSidRequest.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/sid/request/XConnectLocalSidRequest.java @@ -17,8 +17,8 @@ package io.fd.hc2vpp.srv6.write.sid.request; import io.fd.hc2vpp.common.translate.util.AddressTranslator; -import io.fd.vpp.jvpp.core.dto.SrLocalsidAddDel; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.SrLocalsidAddDel; +import io.fd.jvpp.core.future.FutureJVppCore; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress; /** diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/steering/InterfacesConfigCustomizer.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/steering/InterfacesConfigCustomizer.java index 3f22e0678..a5913ef03 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/steering/InterfacesConfigCustomizer.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/steering/InterfacesConfigCustomizer.java @@ -24,7 +24,7 @@ import io.fd.hc2vpp.srv6.write.steering.request.L2SteeringRequest; import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.oc.srte.policy.rev180514.sr.interfaces.Interface; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.oc.srte.policy.rev180514.sr.interfaces.InterfaceKey; diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/steering/PrefixCustomizer.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/steering/PrefixCustomizer.java index 7973c3203..ec6a1288b 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/steering/PrefixCustomizer.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/steering/PrefixCustomizer.java @@ -23,7 +23,7 @@ import io.fd.hc2vpp.srv6.write.steering.request.L3SteeringRequest; import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.cisco.com.ns.yang.oc.srte.policy.rev170918.prefixes.properties.prefixes.Prefix; import org.opendaylight.yang.gen.v1.http.cisco.com.ns.yang.oc.srte.policy.rev170918.prefixes.properties.prefixes.PrefixKey; diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/steering/PrefixesConfigCustomizer.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/steering/PrefixesConfigCustomizer.java index e366db3a3..ba01fafc2 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/steering/PrefixesConfigCustomizer.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/steering/PrefixesConfigCustomizer.java @@ -23,7 +23,7 @@ import io.fd.hc2vpp.srv6.write.steering.request.L3SteeringRequest; import io.fd.honeycomb.translate.spi.write.WriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.cisco.com.ns.yang.oc.srte.policy.rev170918.prefixes.properties.prefixes.Config; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpPrefix; diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/steering/request/L2SteeringRequest.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/steering/request/L2SteeringRequest.java index 960d17bb9..577935a8f 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/steering/request/L2SteeringRequest.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/steering/request/L2SteeringRequest.java @@ -19,8 +19,8 @@ package io.fd.hc2vpp.srv6.write.steering.request; import io.fd.hc2vpp.srv6.write.DeleteRequest; import io.fd.hc2vpp.srv6.write.WriteRequest; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.SrSteeringAddDel; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.SrSteeringAddDel; +import io.fd.jvpp.core.future.FutureJVppCore; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; /** diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/steering/request/L3SteeringRequest.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/steering/request/L3SteeringRequest.java index 850234c41..abf9d901b 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/steering/request/L3SteeringRequest.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/steering/request/L3SteeringRequest.java @@ -22,8 +22,8 @@ import static com.google.common.base.Preconditions.checkNotNull; import io.fd.hc2vpp.srv6.write.DeleteRequest; import io.fd.hc2vpp.srv6.write.WriteRequest; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.SrSteeringAddDel; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.SrSteeringAddDel; +import io.fd.jvpp.core.future.FutureJVppCore; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpPrefix; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/steering/request/SteeringRequest.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/steering/request/SteeringRequest.java index 2078ade5b..d2a84ae5e 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/steering/request/SteeringRequest.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/steering/request/SteeringRequest.java @@ -19,7 +19,7 @@ package io.fd.hc2vpp.srv6.write.steering.request; import static com.google.common.base.Preconditions.checkNotNull; import io.fd.hc2vpp.srv6.util.JVppRequest; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Address; /** diff --git a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/Srv6ModuleTest.java b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/Srv6ModuleTest.java index 068ea128a..b1610a8fa 100644 --- a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/Srv6ModuleTest.java +++ b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/Srv6ModuleTest.java @@ -42,7 +42,7 @@ import io.fd.honeycomb.translate.impl.write.registry.FlatWriterRegistryBuilder; import io.fd.honeycomb.translate.read.ReaderFactory; import io.fd.honeycomb.translate.util.YangDAG; import io.fd.honeycomb.translate.write.WriterFactory; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.HashSet; import java.util.Iterator; import java.util.Set; diff --git a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/read/policy/PoliciesTest.java b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/read/policy/PoliciesTest.java index d1abd15e8..cc16964bb 100644 --- a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/read/policy/PoliciesTest.java +++ b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/read/policy/PoliciesTest.java @@ -28,10 +28,10 @@ import io.fd.hc2vpp.srv6.util.PolicyContextManager; import io.fd.hc2vpp.srv6.write.sid.request.LocalSidRequestTest; import io.fd.honeycomb.translate.ModificationCache; import io.fd.honeycomb.translate.read.ReadContext; -import io.fd.vpp.jvpp.core.dto.SrPoliciesDetails; -import io.fd.vpp.jvpp.core.dto.SrPoliciesDetailsReplyDump; -import io.fd.vpp.jvpp.core.types.Srv6Sid; -import io.fd.vpp.jvpp.core.types.Srv6SidList; +import io.fd.jvpp.core.dto.SrPoliciesDetails; +import io.fd.jvpp.core.dto.SrPoliciesDetailsReplyDump; +import io.fd.jvpp.core.types.Srv6Sid; +import io.fd.jvpp.core.types.Srv6SidList; import java.util.Arrays; import org.mockito.Mock; import org.opendaylight.yang.gen.v1.http.cisco.com.ns.yang.oc.srte.policy.rev170918.ProvisioningMethodConfig; diff --git a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/read/sid/LocatorCustomizerTest.java b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/read/sid/LocatorCustomizerTest.java index 963bc664d..80df9940b 100644 --- a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/read/sid/LocatorCustomizerTest.java +++ b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/read/sid/LocatorCustomizerTest.java @@ -25,9 +25,9 @@ import io.fd.hc2vpp.srv6.write.sid.request.LocalSidRequestTest; import io.fd.honeycomb.translate.ModificationCache; import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; -import io.fd.vpp.jvpp.core.dto.SrLocalsidsDetails; -import io.fd.vpp.jvpp.core.dto.SrLocalsidsDetailsReplyDump; -import io.fd.vpp.jvpp.core.types.Srv6Sid; +import io.fd.jvpp.core.dto.SrLocalsidsDetails; +import io.fd.jvpp.core.dto.SrLocalsidsDetailsReplyDump; +import io.fd.jvpp.core.types.Srv6Sid; import java.util.Collections; import java.util.List; import org.junit.Assert; diff --git a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/read/sid/SidCustomizerTest.java b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/read/sid/SidCustomizerTest.java index 237a158dc..e27cd67da 100644 --- a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/read/sid/SidCustomizerTest.java +++ b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/read/sid/SidCustomizerTest.java @@ -27,9 +27,9 @@ import io.fd.honeycomb.translate.MappingContext; import io.fd.honeycomb.translate.ModificationCache; import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; -import io.fd.vpp.jvpp.core.dto.SrLocalsidsDetails; -import io.fd.vpp.jvpp.core.dto.SrLocalsidsDetailsReplyDump; -import io.fd.vpp.jvpp.core.types.Srv6Sid; +import io.fd.jvpp.core.dto.SrLocalsidsDetails; +import io.fd.jvpp.core.dto.SrLocalsidsDetailsReplyDump; +import io.fd.jvpp.core.types.Srv6Sid; import java.util.Collections; import java.util.List; import org.junit.Assert; diff --git a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/read/sid/request/LocalSidReadRequestTest.java b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/read/sid/request/LocalSidReadRequestTest.java index 21668e3b1..c73972964 100644 --- a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/read/sid/request/LocalSidReadRequestTest.java +++ b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/read/sid/request/LocalSidReadRequestTest.java @@ -26,9 +26,9 @@ import io.fd.honeycomb.translate.MappingContext; import io.fd.honeycomb.translate.ModificationCache; import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; -import io.fd.vpp.jvpp.core.dto.SrLocalsidsDetails; -import io.fd.vpp.jvpp.core.dto.SrLocalsidsDetailsReplyDump; -import io.fd.vpp.jvpp.core.types.Srv6Sid; +import io.fd.jvpp.core.dto.SrLocalsidsDetails; +import io.fd.jvpp.core.dto.SrLocalsidsDetailsReplyDump; +import io.fd.jvpp.core.types.Srv6Sid; import java.util.ArrayList; import java.util.List; import java.util.concurrent.CompletableFuture; diff --git a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/read/sid/request/LocatorReadRequestTest.java b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/read/sid/request/LocatorReadRequestTest.java index 68806c2af..fd76f9685 100644 --- a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/read/sid/request/LocatorReadRequestTest.java +++ b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/read/sid/request/LocatorReadRequestTest.java @@ -25,9 +25,9 @@ import io.fd.hc2vpp.srv6.write.sid.request.LocalSidRequestTest; import io.fd.honeycomb.translate.ModificationCache; import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; -import io.fd.vpp.jvpp.core.dto.SrLocalsidsDetails; -import io.fd.vpp.jvpp.core.dto.SrLocalsidsDetailsReplyDump; -import io.fd.vpp.jvpp.core.types.Srv6Sid; +import io.fd.jvpp.core.dto.SrLocalsidsDetails; +import io.fd.jvpp.core.dto.SrLocalsidsDetailsReplyDump; +import io.fd.jvpp.core.types.Srv6Sid; import java.util.ArrayList; import java.util.List; import java.util.concurrent.CompletableFuture; diff --git a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/read/steering/SteeringTest.java b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/read/steering/SteeringTest.java index 57f4fe806..87cb260f3 100644 --- a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/read/steering/SteeringTest.java +++ b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/read/steering/SteeringTest.java @@ -24,9 +24,9 @@ import io.fd.hc2vpp.common.translate.util.AddressTranslator; import io.fd.hc2vpp.srv6.write.sid.request.LocalSidRequestTest; import io.fd.honeycomb.translate.ModificationCache; import io.fd.honeycomb.translate.read.ReadContext; -import io.fd.vpp.jvpp.core.dto.SrSteeringPolDetails; -import io.fd.vpp.jvpp.core.dto.SrSteeringPolDetailsReplyDump; -import io.fd.vpp.jvpp.core.types.Srv6Sid; +import io.fd.jvpp.core.dto.SrSteeringPolDetails; +import io.fd.jvpp.core.dto.SrSteeringPolDetailsReplyDump; +import io.fd.jvpp.core.types.Srv6Sid; import java.util.ArrayList; import org.mockito.Mock; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress; diff --git a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/util/JvppRequestTest.java b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/util/JvppRequestTest.java index c4b77a263..7a1e9896c 100644 --- a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/util/JvppRequestTest.java +++ b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/util/JvppRequestTest.java @@ -36,8 +36,8 @@ import io.fd.honeycomb.test.tools.HoneycombTestRunner; import io.fd.honeycomb.test.tools.annotations.SchemaContextProvider; import io.fd.honeycomb.translate.MappingContext; import io.fd.honeycomb.translate.write.WriteContext; -import io.fd.vpp.jvpp.core.dto.SrSteeringAddDel; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.SrSteeringAddDel; +import io.fd.jvpp.core.future.FutureJVppCore; import org.junit.Assert; import org.junit.Before; import org.junit.runner.RunWith; diff --git a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/util/function/LocalSidFunctionBindingRegistryTest.java b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/util/function/LocalSidFunctionBindingRegistryTest.java index 1a1622c2e..7045c8d6f 100644 --- a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/util/function/LocalSidFunctionBindingRegistryTest.java +++ b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/util/function/LocalSidFunctionBindingRegistryTest.java @@ -27,7 +27,7 @@ import io.fd.hc2vpp.srv6.write.sid.request.NoProtocolLocalSidRequest; import io.fd.hc2vpp.srv6.write.sid.request.TableLookupLocalSidRequest; import io.fd.hc2vpp.srv6.write.sid.request.XConnectLocalSidRequest; import io.fd.honeycomb.translate.read.ReadContext; -import io.fd.vpp.jvpp.core.dto.SrLocalsidsDetails; +import io.fd.jvpp.core.dto.SrLocalsidsDetails; import java.util.Collections; import org.junit.Assert; import org.junit.Test; diff --git a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/encap/source/EncapsulationSourceCustomizerTest.java b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/encap/source/EncapsulationSourceCustomizerTest.java index 0daef976a..201314c6a 100644 --- a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/encap/source/EncapsulationSourceCustomizerTest.java +++ b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/encap/source/EncapsulationSourceCustomizerTest.java @@ -23,8 +23,8 @@ import io.fd.hc2vpp.common.test.util.FutureProducer; import io.fd.hc2vpp.srv6.Srv6IIds; import io.fd.hc2vpp.srv6.util.JvppRequestTest; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.SrSetEncapSource; -import io.fd.vpp.jvpp.core.dto.SrSetEncapSourceReply; +import io.fd.jvpp.core.dto.SrSetEncapSource; +import io.fd.jvpp.core.dto.SrSetEncapSourceReply; import java.util.Arrays; import org.junit.Assert; import org.junit.Test; diff --git a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/encap/source/request/EncapsulationSourceRequestTest.java b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/encap/source/request/EncapsulationSourceRequestTest.java index 442b87cdd..2a3cb200e 100644 --- a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/encap/source/request/EncapsulationSourceRequestTest.java +++ b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/encap/source/request/EncapsulationSourceRequestTest.java @@ -23,8 +23,8 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import io.fd.hc2vpp.srv6.Srv6IIds; import io.fd.hc2vpp.srv6.util.JvppRequestTest; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.SrSetEncapSource; -import io.fd.vpp.jvpp.core.dto.SrSetEncapSourceReply; +import io.fd.jvpp.core.dto.SrSetEncapSource; +import io.fd.jvpp.core.dto.SrSetEncapSourceReply; import java.util.Arrays; import org.junit.Assert; import org.junit.Test; diff --git a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/policy/PolicyCustomizerTest.java b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/policy/PolicyCustomizerTest.java index 37aee2271..8f974542c 100644 --- a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/policy/PolicyCustomizerTest.java +++ b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/policy/PolicyCustomizerTest.java @@ -32,12 +32,12 @@ import io.fd.hc2vpp.srv6.util.JvppRequestTest; import io.fd.hc2vpp.srv6.util.PolicyContextManager; import io.fd.honeycomb.test.tools.annotations.InjectTestData; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.SrPolicyAdd; -import io.fd.vpp.jvpp.core.dto.SrPolicyAddReply; -import io.fd.vpp.jvpp.core.dto.SrPolicyDel; -import io.fd.vpp.jvpp.core.dto.SrPolicyDelReply; -import io.fd.vpp.jvpp.core.dto.SrPolicyMod; -import io.fd.vpp.jvpp.core.dto.SrPolicyModReply; +import io.fd.jvpp.core.dto.SrPolicyAdd; +import io.fd.jvpp.core.dto.SrPolicyAddReply; +import io.fd.jvpp.core.dto.SrPolicyDel; +import io.fd.jvpp.core.dto.SrPolicyDelReply; +import io.fd.jvpp.core.dto.SrPolicyMod; +import io.fd.jvpp.core.dto.SrPolicyModReply; import org.junit.Assert; import org.junit.Test; import org.mockito.ArgumentCaptor; diff --git a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/sid/request/LocalSidRequestTest.java b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/sid/request/LocalSidRequestTest.java index fa30c07fb..dceeb6434 100644 --- a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/sid/request/LocalSidRequestTest.java +++ b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/sid/request/LocalSidRequestTest.java @@ -26,8 +26,8 @@ import io.fd.hc2vpp.common.translate.util.ByteDataTranslator; import io.fd.hc2vpp.srv6.Srv6IIds; import io.fd.hc2vpp.srv6.util.JvppRequestTest; import io.fd.hc2vpp.srv6.util.LocatorContextManager; -import io.fd.vpp.jvpp.core.dto.SrLocalsidAddDel; -import io.fd.vpp.jvpp.core.dto.SrLocalsidAddDelReply; +import io.fd.jvpp.core.dto.SrLocalsidAddDel; +import io.fd.jvpp.core.dto.SrLocalsidAddDelReply; import java.util.Arrays; import org.junit.Assert; import org.mockito.ArgumentCaptor; diff --git a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/sid/request/NoProtocolLocalSidRequestTest.java b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/sid/request/NoProtocolLocalSidRequestTest.java index a53fc09ba..b3c92cb5e 100644 --- a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/sid/request/NoProtocolLocalSidRequestTest.java +++ b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/sid/request/NoProtocolLocalSidRequestTest.java @@ -23,8 +23,8 @@ import static org.mockito.Mockito.verify; import io.fd.hc2vpp.srv6.Srv6IIds; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.SrLocalsidAddDel; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.SrLocalsidAddDel; +import io.fd.jvpp.core.future.FutureJVppCore; import org.junit.Test; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Address; diff --git a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/sid/request/TableLookupLocalSidRequestTest.java b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/sid/request/TableLookupLocalSidRequestTest.java index 0cedec73b..4380a5c16 100644 --- a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/sid/request/TableLookupLocalSidRequestTest.java +++ b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/sid/request/TableLookupLocalSidRequestTest.java @@ -16,13 +16,13 @@ package io.fd.hc2vpp.srv6.write.sid.request; -import static io.fd.vpp.jvpp.Assertions.assertEquals; +import static io.fd.jvpp.Assertions.assertEquals; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import io.fd.hc2vpp.srv6.Srv6IIds; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.SrLocalsidAddDel; +import io.fd.jvpp.core.dto.SrLocalsidAddDel; import org.junit.Test; public class TableLookupLocalSidRequestTest extends LocalSidRequestTest { diff --git a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/sid/request/XConnectLocalSidRequestTest.java b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/sid/request/XConnectLocalSidRequestTest.java index 970295001..73c0f072b 100644 --- a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/sid/request/XConnectLocalSidRequestTest.java +++ b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/sid/request/XConnectLocalSidRequestTest.java @@ -16,15 +16,15 @@ package io.fd.hc2vpp.srv6.write.sid.request; -import static io.fd.vpp.jvpp.Assertions.assertEquals; +import static io.fd.jvpp.Assertions.assertEquals; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import io.fd.hc2vpp.srv6.Srv6IIds; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.SrLocalsidAddDel; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.SrLocalsidAddDel; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.Arrays; import org.junit.Test; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress; diff --git a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/steering/InterfacesConfigCustomizerTest.java b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/steering/InterfacesConfigCustomizerTest.java index d980dc4f0..738a970f5 100644 --- a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/steering/InterfacesConfigCustomizerTest.java +++ b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/steering/InterfacesConfigCustomizerTest.java @@ -29,8 +29,8 @@ import io.fd.hc2vpp.srv6.Srv6PolicyIIds; import io.fd.hc2vpp.srv6.util.JvppRequestTest; import io.fd.honeycomb.test.tools.annotations.InjectTestData; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.SrSteeringAddDel; -import io.fd.vpp.jvpp.core.dto.SrSteeringAddDelReply; +import io.fd.jvpp.core.dto.SrSteeringAddDel; +import io.fd.jvpp.core.dto.SrSteeringAddDelReply; import org.junit.Assert; import org.junit.Test; import org.mockito.ArgumentCaptor; diff --git a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/steering/PrefixCustomizerTest.java b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/steering/PrefixCustomizerTest.java index 9335ab61c..d70813844 100644 --- a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/steering/PrefixCustomizerTest.java +++ b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/steering/PrefixCustomizerTest.java @@ -27,8 +27,8 @@ import io.fd.hc2vpp.srv6.Srv6PolicyIIds; import io.fd.hc2vpp.srv6.util.JvppRequestTest; import io.fd.honeycomb.test.tools.annotations.InjectTestData; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.SrSteeringAddDel; -import io.fd.vpp.jvpp.core.dto.SrSteeringAddDelReply; +import io.fd.jvpp.core.dto.SrSteeringAddDel; +import io.fd.jvpp.core.dto.SrSteeringAddDelReply; import org.junit.Test; import org.mockito.ArgumentCaptor; import org.mockito.Captor; diff --git a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/steering/PrefixesConfigCustomizerTest.java b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/steering/PrefixesConfigCustomizerTest.java index 64e0032e9..10ab55b39 100644 --- a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/steering/PrefixesConfigCustomizerTest.java +++ b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/steering/PrefixesConfigCustomizerTest.java @@ -28,8 +28,8 @@ import io.fd.hc2vpp.srv6.util.JvppRequestTest; import io.fd.hc2vpp.srv6.write.steering.request.L3SteeringRequest; import io.fd.honeycomb.test.tools.annotations.InjectTestData; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.SrSteeringAddDel; -import io.fd.vpp.jvpp.core.dto.SrSteeringAddDelReply; +import io.fd.jvpp.core.dto.SrSteeringAddDel; +import io.fd.jvpp.core.dto.SrSteeringAddDelReply; import java.util.List; import org.junit.Test; import org.mockito.ArgumentCaptor; diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/factory/InterfacesStateReaderFactory.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/factory/InterfacesStateReaderFactory.java index a54f04d0d..843edd4d6 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/factory/InterfacesStateReaderFactory.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/factory/InterfacesStateReaderFactory.java @@ -39,7 +39,7 @@ import io.fd.honeycomb.translate.impl.read.GenericInitReader; import io.fd.honeycomb.translate.impl.read.GenericReader; import io.fd.honeycomb.translate.read.ReaderFactory; import io.fd.honeycomb.translate.read.registry.ModifiableReaderRegistryBuilder; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190128.VppInterfaceStateAugmentation; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190128.VppInterfaceStateAugmentationBuilder; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190128.interfaces.state._interface.AfPacket; diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/factory/InterfacesWriterFactory.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/factory/InterfacesWriterFactory.java index cad0a723e..86f313129 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/factory/InterfacesWriterFactory.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/factory/InterfacesWriterFactory.java @@ -39,7 +39,7 @@ import io.fd.honeycomb.translate.impl.write.GenericListWriter; import io.fd.honeycomb.translate.impl.write.GenericWriter; import io.fd.honeycomb.translate.write.WriterFactory; import io.fd.honeycomb.translate.write.registry.ModifiableWriterRegistryBuilder; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.Set; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.unnumbered.interfaces.rev180103.InterfaceUnnumberedAugmentation; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.unnumbered.interfaces.rev180103.unnumbered.config.attributes.Unnumbered; diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/factory/L2HoneycombWriterFactory.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/factory/L2HoneycombWriterFactory.java index b7501ac7a..0a484289d 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/factory/L2HoneycombWriterFactory.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/factory/L2HoneycombWriterFactory.java @@ -26,7 +26,7 @@ import io.fd.hc2vpp.v3po.l2.L2FibEntryCustomizer; import io.fd.honeycomb.translate.impl.write.GenericListWriter; import io.fd.honeycomb.translate.write.WriterFactory; import io.fd.honeycomb.translate.write.registry.ModifiableWriterRegistryBuilder; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190128.BridgeDomains; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190128.bridge.domain.attributes.ArpTerminationTable; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190128.bridge.domain.attributes.arp.termination.table.ArpTerminationTableEntry; diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/factory/L2StateHoneycombReaderFactory.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/factory/L2StateHoneycombReaderFactory.java index 7ae4fbc0f..851bdb38f 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/factory/L2StateHoneycombReaderFactory.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/factory/L2StateHoneycombReaderFactory.java @@ -24,7 +24,7 @@ import io.fd.hc2vpp.v3po.l2state.L2FibEntryCustomizer; import io.fd.honeycomb.translate.impl.read.GenericInitListReader; import io.fd.honeycomb.translate.read.ReaderFactory; import io.fd.honeycomb.translate.read.registry.ModifiableReaderRegistryBuilder; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190128.BridgeDomainsState; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190128.BridgeDomainsStateBuilder; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190128.bridge.domains.state.BridgeDomain; diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/factory/SubinterfaceAugmentationWriterFactory.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/factory/SubinterfaceAugmentationWriterFactory.java index 49c7d21c7..87dbc2733 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/factory/SubinterfaceAugmentationWriterFactory.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/factory/SubinterfaceAugmentationWriterFactory.java @@ -31,7 +31,7 @@ import io.fd.honeycomb.translate.impl.write.GenericListWriter; import io.fd.honeycomb.translate.impl.write.GenericWriter; import io.fd.honeycomb.translate.write.WriterFactory; import io.fd.honeycomb.translate.write.registry.ModifiableWriterRegistryBuilder; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.subinterface.span.rev170607.VppSubinterfaceSpanAugmentation; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.subinterface.span.rev170607.interfaces._interface.sub.interfaces.sub._interface.Span; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.unnumbered.interfaces.rev180103.SubinterfaceUnnumberedAugmentation; diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/factory/SubinterfaceStateAugmentationReaderFactory.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/factory/SubinterfaceStateAugmentationReaderFactory.java index 6a17f73fa..5eb8bc4cd 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/factory/SubinterfaceStateAugmentationReaderFactory.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/factory/SubinterfaceStateAugmentationReaderFactory.java @@ -31,7 +31,7 @@ import io.fd.honeycomb.translate.impl.read.GenericInitReader; import io.fd.honeycomb.translate.impl.read.GenericReader; import io.fd.honeycomb.translate.read.ReaderFactory; import io.fd.honeycomb.translate.read.registry.ModifiableReaderRegistryBuilder; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.subinterface.span.rev170607.VppSubinterfaceSpanStateAugmentation; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.subinterface.span.rev170607.VppSubinterfaceSpanStateAugmentationBuilder; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.subinterface.span.rev170607.interfaces.state._interface.sub.interfaces.sub._interface.SpanState; diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/AbstractUnnumberedCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/AbstractUnnumberedCustomizer.java index c54d0553f..1f71e88f3 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/AbstractUnnumberedCustomizer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/AbstractUnnumberedCustomizer.java @@ -25,8 +25,8 @@ import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.spi.write.WriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.SwInterfaceSetUnnumbered; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.SwInterfaceSetUnnumbered; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.unnumbered.interfaces.rev180103.unnumbered.config.attributes.Unnumbered; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/AfPacketCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/AfPacketCustomizer.java index 33877aa9f..e333ed75e 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/AfPacketCustomizer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/AfPacketCustomizer.java @@ -25,11 +25,11 @@ import io.fd.hc2vpp.common.translate.util.MacTranslator; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.AfPacketCreate; -import io.fd.vpp.jvpp.core.dto.AfPacketCreateReply; -import io.fd.vpp.jvpp.core.dto.AfPacketDelete; -import io.fd.vpp.jvpp.core.dto.AfPacketDeleteReply; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.AfPacketCreate; +import io.fd.jvpp.core.dto.AfPacketCreateReply; +import io.fd.jvpp.core.dto.AfPacketDelete; +import io.fd.jvpp.core.dto.AfPacketDeleteReply; +import io.fd.jvpp.core.future.FutureJVppCore; import java.nio.charset.StandardCharsets; import java.util.concurrent.CompletionStage; import javax.annotation.Nonnull; diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/EthernetCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/EthernetCustomizer.java index 365193c00..93b1fd825 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/EthernetCustomizer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/EthernetCustomizer.java @@ -21,8 +21,8 @@ import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.HwInterfaceSetMtu; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.HwInterfaceSetMtu; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190128.interfaces._interface.Ethernet; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev140508.EthernetCsmacd; diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/GreCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/GreCustomizer.java index 637511938..e44909752 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/GreCustomizer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/GreCustomizer.java @@ -24,9 +24,9 @@ import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.GreAddDelTunnel; -import io.fd.vpp.jvpp.core.dto.GreAddDelTunnelReply; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.GreAddDelTunnel; +import io.fd.jvpp.core.dto.GreAddDelTunnelReply; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.concurrent.CompletionStage; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190128.GreTunnel; diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/InterconnectionWriteUtils.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/InterconnectionWriteUtils.java index 3fe1ea5dc..a497d8b4a 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/InterconnectionWriteUtils.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/InterconnectionWriteUtils.java @@ -23,12 +23,12 @@ import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.SwInterfaceSetL2Bridge; -import io.fd.vpp.jvpp.core.dto.SwInterfaceSetL2BridgeReply; -import io.fd.vpp.jvpp.core.dto.SwInterfaceSetL2Xconnect; -import io.fd.vpp.jvpp.core.dto.SwInterfaceSetL2XconnectReply; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; -import io.fd.vpp.jvpp.core.types.L2PortType; +import io.fd.jvpp.core.dto.SwInterfaceSetL2Bridge; +import io.fd.jvpp.core.dto.SwInterfaceSetL2BridgeReply; +import io.fd.jvpp.core.dto.SwInterfaceSetL2Xconnect; +import io.fd.jvpp.core.dto.SwInterfaceSetL2XconnectReply; +import io.fd.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.types.L2PortType; import java.util.concurrent.CompletionStage; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190128.l2.config.attributes.Interconnection; diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/InterfaceCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/InterfaceCustomizer.java index 2f155bb87..fc26d5154 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/InterfaceCustomizer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/InterfaceCustomizer.java @@ -16,15 +16,15 @@ package io.fd.hc2vpp.v3po.interfaces; -import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer; import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer; import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; import io.fd.hc2vpp.common.translate.util.NamingContext; +import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.SwInterfaceSetFlags; -import io.fd.vpp.jvpp.core.dto.SwInterfaceSetFlagsReply; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.SwInterfaceSetFlags; +import io.fd.jvpp.core.dto.SwInterfaceSetFlagsReply; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.concurrent.CompletionStage; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface; diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/InterfaceRoutingCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/InterfaceRoutingCustomizer.java index 31c78b981..79f4f785e 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/InterfaceRoutingCustomizer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/InterfaceRoutingCustomizer.java @@ -24,7 +24,7 @@ import io.fd.honeycomb.translate.spi.write.WriterCustomizer; import io.fd.honeycomb.translate.util.RWUtils; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.List; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190128.interfaces._interface.Routing; diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/InterfaceUnnumberedCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/InterfaceUnnumberedCustomizer.java index 14abb4e35..44eeef1dc 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/InterfaceUnnumberedCustomizer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/InterfaceUnnumberedCustomizer.java @@ -19,7 +19,7 @@ package io.fd.hc2vpp.v3po.interfaces; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.unnumbered.interfaces.rev180103.unnumbered.config.attributes.Unnumbered; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface; diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/L2Customizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/L2Customizer.java index b324ae2cc..7c4f542f9 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/L2Customizer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/L2Customizer.java @@ -21,7 +21,7 @@ import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.spi.write.WriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190128.interfaces._interface.L2; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface; diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/LoopbackCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/LoopbackCustomizer.java index b7309bd91..3cf876cc7 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/LoopbackCustomizer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/LoopbackCustomizer.java @@ -22,10 +22,10 @@ import io.fd.hc2vpp.common.translate.util.MacTranslator; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.CreateLoopback; -import io.fd.vpp.jvpp.core.dto.CreateLoopbackReply; -import io.fd.vpp.jvpp.core.dto.DeleteLoopback; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.CreateLoopback; +import io.fd.jvpp.core.dto.CreateLoopbackReply; +import io.fd.jvpp.core.dto.DeleteLoopback; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190128.interfaces._interface.Loopback; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.InterfaceType; diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/RewriteCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/RewriteCustomizer.java index 002b60719..293976e0f 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/RewriteCustomizer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/RewriteCustomizer.java @@ -26,9 +26,9 @@ import io.fd.hc2vpp.v3po.util.SubInterfaceUtils; import io.fd.honeycomb.translate.spi.write.WriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.L2InterfaceVlanTagRewrite; -import io.fd.vpp.jvpp.core.dto.L2InterfaceVlanTagRewriteReply; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.L2InterfaceVlanTagRewrite; +import io.fd.jvpp.core.dto.L2InterfaceVlanTagRewriteReply; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.List; import java.util.concurrent.CompletionStage; import javax.annotation.Nonnull; diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/RoutingCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/RoutingCustomizer.java index a23c876b5..993f1a4af 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/RoutingCustomizer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/RoutingCustomizer.java @@ -24,9 +24,9 @@ import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.SwInterfaceSetTable; -import io.fd.vpp.jvpp.core.dto.SwInterfaceSetTableReply; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.SwInterfaceSetTable; +import io.fd.jvpp.core.dto.SwInterfaceSetTableReply; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.concurrent.CompletionStage; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190128.RoutingBaseAttributes; diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/SubInterfaceCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/SubInterfaceCustomizer.java index 445742a4f..91a3da83f 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/SubInterfaceCustomizer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/SubInterfaceCustomizer.java @@ -28,11 +28,11 @@ import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.CreateSubif; -import io.fd.vpp.jvpp.core.dto.CreateSubifReply; -import io.fd.vpp.jvpp.core.dto.SwInterfaceSetFlags; -import io.fd.vpp.jvpp.core.dto.SwInterfaceSetFlagsReply; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.CreateSubif; +import io.fd.jvpp.core.dto.CreateSubifReply; +import io.fd.jvpp.core.dto.SwInterfaceSetFlags; +import io.fd.jvpp.core.dto.SwInterfaceSetFlagsReply; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.concurrent.CompletionStage; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/SubInterfaceL2Customizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/SubInterfaceL2Customizer.java index 20a579228..042d977c8 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/SubInterfaceL2Customizer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/SubInterfaceL2Customizer.java @@ -22,7 +22,7 @@ import io.fd.hc2vpp.v3po.util.SubInterfaceUtils; import io.fd.honeycomb.translate.spi.write.WriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.vlan.rev180319.interfaces._interface.sub.interfaces.SubInterface; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.vlan.rev180319.interfaces._interface.sub.interfaces.SubInterfaceKey; diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/SubInterfaceRoutingCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/SubInterfaceRoutingCustomizer.java index 8dcd9b177..f52543d71 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/SubInterfaceRoutingCustomizer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/SubInterfaceRoutingCustomizer.java @@ -25,7 +25,7 @@ import io.fd.honeycomb.translate.spi.write.WriterCustomizer; import io.fd.honeycomb.translate.util.RWUtils; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.List; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.vlan.rev180319.interfaces._interface.sub.interfaces.SubInterface; diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/SubInterfaceUnnumberedCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/SubInterfaceUnnumberedCustomizer.java index 61da73e64..58614060f 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/SubInterfaceUnnumberedCustomizer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/SubInterfaceUnnumberedCustomizer.java @@ -21,7 +21,7 @@ import static io.fd.hc2vpp.v3po.util.SubInterfaceUtils.subInterfaceFullNameConfi import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.unnumbered.interfaces.rev180103.unnumbered.config.attributes.Unnumbered; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/TapV2Customizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/TapV2Customizer.java index 3b553fd0c..679e2d2ca 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/TapV2Customizer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/TapV2Customizer.java @@ -26,11 +26,11 @@ import io.fd.hc2vpp.common.translate.util.MacTranslator; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.TapCreateV2; -import io.fd.vpp.jvpp.core.dto.TapCreateV2Reply; -import io.fd.vpp.jvpp.core.dto.TapDeleteV2; -import io.fd.vpp.jvpp.core.dto.TapDeleteV2Reply; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.TapCreateV2; +import io.fd.jvpp.core.dto.TapCreateV2Reply; +import io.fd.jvpp.core.dto.TapDeleteV2; +import io.fd.jvpp.core.dto.TapDeleteV2Reply; +import io.fd.jvpp.core.future.FutureJVppCore; import java.nio.charset.StandardCharsets; import java.util.concurrent.CompletionStage; import javax.annotation.Nonnull; diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/VhostUserCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/VhostUserCustomizer.java index aea1c0890..021b4beed 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/VhostUserCustomizer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/VhostUserCustomizer.java @@ -23,13 +23,13 @@ import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.CreateVhostUserIf; -import io.fd.vpp.jvpp.core.dto.CreateVhostUserIfReply; -import io.fd.vpp.jvpp.core.dto.DeleteVhostUserIf; -import io.fd.vpp.jvpp.core.dto.DeleteVhostUserIfReply; -import io.fd.vpp.jvpp.core.dto.ModifyVhostUserIf; -import io.fd.vpp.jvpp.core.dto.ModifyVhostUserIfReply; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.CreateVhostUserIf; +import io.fd.jvpp.core.dto.CreateVhostUserIfReply; +import io.fd.jvpp.core.dto.DeleteVhostUserIf; +import io.fd.jvpp.core.dto.DeleteVhostUserIfReply; +import io.fd.jvpp.core.dto.ModifyVhostUserIf; +import io.fd.jvpp.core.dto.ModifyVhostUserIfReply; +import io.fd.jvpp.core.future.FutureJVppCore; import java.nio.charset.StandardCharsets; import java.util.concurrent.CompletionStage; import javax.annotation.Nonnull; diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/VxlanCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/VxlanCustomizer.java index 4d9a3ceee..d4ec08a75 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/VxlanCustomizer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/VxlanCustomizer.java @@ -25,9 +25,9 @@ import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.hc2vpp.v3po.DisabledInterfacesManager; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.VxlanAddDelTunnel; -import io.fd.vpp.jvpp.core.dto.VxlanAddDelTunnelReply; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.VxlanAddDelTunnel; +import io.fd.jvpp.core.dto.VxlanAddDelTunnelReply; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.concurrent.CompletionStage; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190128.L2Input; diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/VxlanGpeCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/VxlanGpeCustomizer.java index f73dbe0f6..956f08239 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/VxlanGpeCustomizer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/VxlanGpeCustomizer.java @@ -25,9 +25,9 @@ import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.hc2vpp.v3po.DisabledInterfacesManager; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.VxlanGpeAddDelTunnel; -import io.fd.vpp.jvpp.core.dto.VxlanGpeAddDelTunnelReply; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.VxlanGpeAddDelTunnel; +import io.fd.jvpp.core.dto.VxlanGpeAddDelTunnelReply; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.concurrent.CompletionStage; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190128.VxlanGpeTunnel; diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/pbb/PbbRewriteCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/pbb/PbbRewriteCustomizer.java index 44967b1da..1684bd0d0 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/pbb/PbbRewriteCustomizer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/pbb/PbbRewriteCustomizer.java @@ -25,9 +25,9 @@ import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.spi.write.WriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.VppBaseCallException; -import io.fd.vpp.jvpp.core.dto.L2InterfacePbbTagRewrite; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.VppBaseCallException; +import io.fd.jvpp.core.dto.L2InterfacePbbTagRewrite; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.concurrent.TimeoutException; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.pbb.rev161214.interfaces._interface.PbbRewrite; diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/span/MirroredInterfaceCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/span/MirroredInterfaceCustomizer.java index d10feaf73..7b6db504b 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/span/MirroredInterfaceCustomizer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/span/MirroredInterfaceCustomizer.java @@ -24,8 +24,8 @@ import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.SwInterfaceSpanEnableDisable; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.SwInterfaceSpanEnableDisable; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.function.Function; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/AfPacketCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/AfPacketCustomizer.java index 479acc305..edf3ab66f 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/AfPacketCustomizer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/AfPacketCustomizer.java @@ -29,11 +29,11 @@ import io.fd.honeycomb.translate.spi.read.InitializingReaderCustomizer; import io.fd.honeycomb.translate.util.RWUtils; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; import io.fd.honeycomb.translate.util.read.cache.StaticCacheKeyFactory; -import io.fd.vpp.jvpp.core.dto.AfPacketDetails; -import io.fd.vpp.jvpp.core.dto.AfPacketDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.AfPacketDump; -import io.fd.vpp.jvpp.core.dto.SwInterfaceDetails; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.AfPacketDetails; +import io.fd.jvpp.core.dto.AfPacketDetailsReplyDump; +import io.fd.jvpp.core.dto.AfPacketDump; +import io.fd.jvpp.core.dto.SwInterfaceDetails; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.concurrent.CompletionStage; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190128.VppInterfaceAugmentation; diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/EthernetCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/EthernetCustomizer.java index 71d98a99f..6f1de6cc4 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/EthernetCustomizer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/EthernetCustomizer.java @@ -22,7 +22,7 @@ import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.Initialized; import io.fd.honeycomb.translate.spi.read.InitializingReaderCustomizer; import io.fd.honeycomb.translate.util.RWUtils; -import io.fd.vpp.jvpp.core.dto.SwInterfaceDetails; +import io.fd.jvpp.core.dto.SwInterfaceDetails; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190128.VppInterfaceAugmentation; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190128.VppInterfaceStateAugmentationBuilder; diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/GreCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/GreCustomizer.java index a185c6218..874330ff6 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/GreCustomizer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/GreCustomizer.java @@ -28,10 +28,10 @@ import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.Initialized; import io.fd.honeycomb.translate.spi.read.InitializingReaderCustomizer; import io.fd.honeycomb.translate.util.RWUtils; -import io.fd.vpp.jvpp.core.dto.GreTunnelDetails; -import io.fd.vpp.jvpp.core.dto.GreTunnelDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.GreTunnelDump; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.GreTunnelDetails; +import io.fd.jvpp.core.dto.GreTunnelDetailsReplyDump; +import io.fd.jvpp.core.dto.GreTunnelDump; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.concurrent.CompletionStage; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190128.GreTunnel; diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/InterconnectionReadUtils.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/InterconnectionReadUtils.java index 17825c0e2..8fe0f0379 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/InterconnectionReadUtils.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/InterconnectionReadUtils.java @@ -24,12 +24,12 @@ import io.fd.hc2vpp.v3po.interfacesstate.cache.InterfaceCacheDumpManager; import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; -import io.fd.vpp.jvpp.core.dto.BridgeDomainDetails; -import io.fd.vpp.jvpp.core.dto.BridgeDomainDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.BridgeDomainDump; -import io.fd.vpp.jvpp.core.dto.SwInterfaceDetails; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; -import io.fd.vpp.jvpp.core.types.BridgeDomainSwIf; +import io.fd.jvpp.core.dto.BridgeDomainDetails; +import io.fd.jvpp.core.dto.BridgeDomainDetailsReplyDump; +import io.fd.jvpp.core.dto.BridgeDomainDump; +import io.fd.jvpp.core.dto.SwInterfaceDetails; +import io.fd.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.types.BridgeDomainSwIf; import java.util.Arrays; import java.util.Optional; import java.util.concurrent.CompletableFuture; diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/InterfaceCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/InterfaceCustomizer.java index 5ec0082e4..4c02f496a 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/InterfaceCustomizer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/InterfaceCustomizer.java @@ -25,7 +25,7 @@ import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.Initialized; import io.fd.honeycomb.translate.spi.read.InitializingListReaderCustomizer; -import io.fd.vpp.jvpp.core.dto.SwInterfaceDetails; +import io.fd.jvpp.core.dto.SwInterfaceDetails; import java.util.List; import java.util.Set; import java.util.stream.Collectors; diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/InterfaceDataTranslator.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/InterfaceDataTranslator.java index 794507adc..5e025c5cc 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/InterfaceDataTranslator.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/InterfaceDataTranslator.java @@ -24,7 +24,7 @@ import io.fd.hc2vpp.v3po.interfacesstate.cache.InterfaceCacheDumpManager; import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.util.RWUtils; -import io.fd.vpp.jvpp.core.dto.SwInterfaceDetails; +import io.fd.jvpp.core.dto.SwInterfaceDetails; import java.math.BigInteger; import java.util.Objects; import java.util.stream.Collector; diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/InterfaceRoutingCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/InterfaceRoutingCustomizer.java index ab63397c6..609f30eb9 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/InterfaceRoutingCustomizer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/InterfaceRoutingCustomizer.java @@ -22,7 +22,7 @@ import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.Initialized; import io.fd.honeycomb.translate.spi.read.InitializingReaderCustomizer; import io.fd.honeycomb.translate.util.RWUtils; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190128.VppInterfaceAugmentation; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190128.VppInterfaceStateAugmentationBuilder; diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/L2Customizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/L2Customizer.java index 7a1873ee8..e46590de7 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/L2Customizer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/L2Customizer.java @@ -24,7 +24,7 @@ import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.Initialized; import io.fd.honeycomb.translate.spi.read.InitializingReaderCustomizer; import io.fd.honeycomb.translate.util.RWUtils; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190128.VppInterfaceAugmentation; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190128.VppInterfaceStateAugmentationBuilder; diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/RewriteCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/RewriteCustomizer.java index ff50c6900..f85a12850 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/RewriteCustomizer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/RewriteCustomizer.java @@ -25,7 +25,7 @@ import io.fd.hc2vpp.v3po.util.SubInterfaceUtils; import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.vpp.jvpp.core.dto.SwInterfaceDetails; +import io.fd.jvpp.core.dto.SwInterfaceDetails; import java.util.ArrayList; import java.util.List; import javax.annotation.Nonnull; diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/RoutingCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/RoutingCustomizer.java index 6766d3dc9..72dcbda50 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/RoutingCustomizer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/RoutingCustomizer.java @@ -22,9 +22,9 @@ import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; -import io.fd.vpp.jvpp.core.dto.SwInterfaceGetTable; -import io.fd.vpp.jvpp.core.dto.SwInterfaceGetTableReply; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.SwInterfaceGetTable; +import io.fd.jvpp.core.dto.SwInterfaceGetTableReply; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.function.Consumer; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190128.RoutingBaseAttributes; diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/SubInterfaceCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/SubInterfaceCustomizer.java index 0067b1747..f2584084c 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/SubInterfaceCustomizer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/SubInterfaceCustomizer.java @@ -29,8 +29,8 @@ import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.Initialized; import io.fd.honeycomb.translate.spi.read.InitializingListReaderCustomizer; import io.fd.honeycomb.translate.util.RWUtils; -import io.fd.vpp.jvpp.core.dto.SwInterfaceDetails; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.SwInterfaceDetails; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.ArrayList; import java.util.List; import java.util.Objects; diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/SubInterfaceL2Customizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/SubInterfaceL2Customizer.java index 29c89260a..dd5f2758d 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/SubInterfaceL2Customizer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/SubInterfaceL2Customizer.java @@ -25,7 +25,7 @@ import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.Initialized; import io.fd.honeycomb.translate.spi.read.InitializingReaderCustomizer; import io.fd.honeycomb.translate.util.RWUtils; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190128.l2.state.attributes.interconnection.BridgeBased; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190128.l2.state.attributes.interconnection.XconnectBased; diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/SubInterfaceRoutingCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/SubInterfaceRoutingCustomizer.java index 25ceb4a1f..2a6c7406e 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/SubInterfaceRoutingCustomizer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/SubInterfaceRoutingCustomizer.java @@ -23,7 +23,7 @@ import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.Initialized; import io.fd.honeycomb.translate.spi.read.InitializingReaderCustomizer; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.vlan.rev180319.interfaces.state._interface.sub.interfaces.SubInterfaceBuilder; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.vlan.rev180319.sub._interface.routing.attributes.Routing; diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/TapV2Customizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/TapV2Customizer.java index 15d909b6a..6919c94fe 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/TapV2Customizer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/TapV2Customizer.java @@ -34,11 +34,11 @@ import io.fd.honeycomb.translate.spi.read.InitializingReaderCustomizer; import io.fd.honeycomb.translate.util.RWUtils; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; import io.fd.honeycomb.translate.util.read.cache.StaticCacheKeyFactory; -import io.fd.vpp.jvpp.core.dto.SwInterfaceDetails; -import io.fd.vpp.jvpp.core.dto.SwInterfaceTapV2Details; -import io.fd.vpp.jvpp.core.dto.SwInterfaceTapV2DetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.SwInterfaceTapV2Dump; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.SwInterfaceDetails; +import io.fd.jvpp.core.dto.SwInterfaceTapV2Details; +import io.fd.jvpp.core.dto.SwInterfaceTapV2DetailsReplyDump; +import io.fd.jvpp.core.dto.SwInterfaceTapV2Dump; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.Optional; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190128.VppInterfaceAugmentation; diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/VhostUserCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/VhostUserCustomizer.java index 01b00b5c4..d0e8bd50a 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/VhostUserCustomizer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/VhostUserCustomizer.java @@ -28,11 +28,11 @@ import io.fd.honeycomb.translate.spi.read.InitializingReaderCustomizer; import io.fd.honeycomb.translate.util.RWUtils; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; import io.fd.honeycomb.translate.util.read.cache.StaticCacheKeyFactory; -import io.fd.vpp.jvpp.core.dto.SwInterfaceDetails; -import io.fd.vpp.jvpp.core.dto.SwInterfaceVhostUserDetails; -import io.fd.vpp.jvpp.core.dto.SwInterfaceVhostUserDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.SwInterfaceVhostUserDump; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.SwInterfaceDetails; +import io.fd.jvpp.core.dto.SwInterfaceVhostUserDetails; +import io.fd.jvpp.core.dto.SwInterfaceVhostUserDetailsReplyDump; +import io.fd.jvpp.core.dto.SwInterfaceVhostUserDump; +import io.fd.jvpp.core.future.FutureJVppCore; import java.math.BigInteger; import java.util.concurrent.CompletionStage; import javax.annotation.Nonnull; diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/VxlanCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/VxlanCustomizer.java index 3d5ef9974..a820b4ff2 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/VxlanCustomizer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/VxlanCustomizer.java @@ -30,10 +30,10 @@ import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.Initialized; import io.fd.honeycomb.translate.spi.read.InitializingReaderCustomizer; import io.fd.honeycomb.translate.util.RWUtils; -import io.fd.vpp.jvpp.core.dto.VxlanTunnelDetails; -import io.fd.vpp.jvpp.core.dto.VxlanTunnelDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.VxlanTunnelDump; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.VxlanTunnelDetails; +import io.fd.jvpp.core.dto.VxlanTunnelDetailsReplyDump; +import io.fd.jvpp.core.dto.VxlanTunnelDump; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.concurrent.CompletionStage; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190128.L2Input; diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/VxlanGpeCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/VxlanGpeCustomizer.java index 845108f5c..874c4b425 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/VxlanGpeCustomizer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/VxlanGpeCustomizer.java @@ -29,10 +29,10 @@ import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.Initialized; import io.fd.honeycomb.translate.spi.read.InitializingReaderCustomizer; import io.fd.honeycomb.translate.util.RWUtils; -import io.fd.vpp.jvpp.core.dto.VxlanGpeTunnelDetails; -import io.fd.vpp.jvpp.core.dto.VxlanGpeTunnelDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.VxlanGpeTunnelDump; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.VxlanGpeTunnelDetails; +import io.fd.jvpp.core.dto.VxlanGpeTunnelDetailsReplyDump; +import io.fd.jvpp.core.dto.VxlanGpeTunnelDump; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.concurrent.CompletionStage; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190128.VppInterfaceAugmentation; diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/cache/InterfaceCacheDumpManager.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/cache/InterfaceCacheDumpManager.java index 589d59024..c570e0d80 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/cache/InterfaceCacheDumpManager.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/cache/InterfaceCacheDumpManager.java @@ -18,7 +18,7 @@ package io.fd.hc2vpp.v3po.interfacesstate.cache; import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; -import io.fd.vpp.jvpp.core.dto.SwInterfaceDetails; +import io.fd.jvpp.core.dto.SwInterfaceDetails; import java.util.stream.Stream; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/cache/InterfaceCacheDumpManagerImpl.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/cache/InterfaceCacheDumpManagerImpl.java index 536c2bb58..b6e850982 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/cache/InterfaceCacheDumpManagerImpl.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/cache/InterfaceCacheDumpManagerImpl.java @@ -27,10 +27,10 @@ import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; import io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor; import io.fd.honeycomb.translate.util.read.cache.StaticCacheKeyFactory; -import io.fd.vpp.jvpp.core.dto.SwInterfaceDetails; -import io.fd.vpp.jvpp.core.dto.SwInterfaceDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.SwInterfaceDump; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.SwInterfaceDetails; +import io.fd.jvpp.core.dto.SwInterfaceDetailsReplyDump; +import io.fd.jvpp.core.dto.SwInterfaceDump; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.stream.Stream; diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/cache/InterfaceCacheDumpManagerProvider.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/cache/InterfaceCacheDumpManagerProvider.java index 7a6119bf1..b5a010670 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/cache/InterfaceCacheDumpManagerProvider.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/cache/InterfaceCacheDumpManagerProvider.java @@ -19,7 +19,7 @@ package io.fd.hc2vpp.v3po.interfacesstate.cache; import com.google.inject.Inject; import com.google.inject.Provider; import io.fd.hc2vpp.common.translate.util.NamingContext; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.inject.Named; public class InterfaceCacheDumpManagerProvider implements Provider { diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/pbb/PbbRewriteStateCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/pbb/PbbRewriteStateCustomizer.java index e0dd69fa2..cd1c9d571 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/pbb/PbbRewriteStateCustomizer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/pbb/PbbRewriteStateCustomizer.java @@ -20,7 +20,7 @@ import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer; import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.pbb.rev161214.PbbRewriteStateInterfaceAugmentationBuilder; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.pbb.rev161214.interfaces.state._interface.PbbRewriteState; diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/span/AbstractMirroredInterfacesCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/span/AbstractMirroredInterfacesCustomizer.java index 9039e1995..c409ae298 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/span/AbstractMirroredInterfacesCustomizer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/span/AbstractMirroredInterfacesCustomizer.java @@ -23,9 +23,9 @@ import io.fd.honeycomb.translate.MappingContext; import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.InitializingReaderCustomizer; -import io.fd.vpp.jvpp.core.dto.SwInterfaceSpanDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.SwInterfaceSpanDump; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.SwInterfaceSpanDetailsReplyDump; +import io.fd.jvpp.core.dto.SwInterfaceSpanDump; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.List; import java.util.function.Function; import java.util.stream.Collectors; diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/span/InterfaceMirroredInterfacesCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/span/InterfaceMirroredInterfacesCustomizer.java index e6c177d7e..a73de1ba3 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/span/InterfaceMirroredInterfacesCustomizer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/span/InterfaceMirroredInterfacesCustomizer.java @@ -21,7 +21,7 @@ import io.fd.hc2vpp.v3po.interfacesstate.InterfaceCustomizer; import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.spi.read.Initialized; import io.fd.honeycomb.translate.util.RWUtils; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.Collections; import java.util.Optional; import java.util.stream.Collectors; diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/span/SubInterfaceMirroredInterfacesCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/span/SubInterfaceMirroredInterfacesCustomizer.java index 4af0276c1..5e490de6f 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/span/SubInterfaceMirroredInterfacesCustomizer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/span/SubInterfaceMirroredInterfacesCustomizer.java @@ -23,7 +23,7 @@ import io.fd.hc2vpp.v3po.util.SubInterfaceUtils; import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.spi.read.Initialized; import io.fd.honeycomb.translate.util.RWUtils; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.Collections; import java.util.Optional; import java.util.stream.Collectors; diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/l2/ArpTerminationTableEntryCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/l2/ArpTerminationTableEntryCustomizer.java index c8120fcf4..7f1ac1bee 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/l2/ArpTerminationTableEntryCustomizer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/l2/ArpTerminationTableEntryCustomizer.java @@ -25,14 +25,14 @@ import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.BdIpMacAddDel; -import io.fd.vpp.jvpp.core.dto.BdIpMacAddDelReply; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; -import io.fd.vpp.jvpp.core.types.Address; -import io.fd.vpp.jvpp.core.types.AddressFamily; -import io.fd.vpp.jvpp.core.types.AddressUnion; -import io.fd.vpp.jvpp.core.types.Ip4Address; -import io.fd.vpp.jvpp.core.types.MacAddress; +import io.fd.jvpp.core.dto.BdIpMacAddDel; +import io.fd.jvpp.core.dto.BdIpMacAddDelReply; +import io.fd.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.types.Address; +import io.fd.jvpp.core.types.AddressFamily; +import io.fd.jvpp.core.types.AddressUnion; +import io.fd.jvpp.core.types.Ip4Address; +import io.fd.jvpp.core.types.MacAddress; import java.util.concurrent.CompletionStage; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190128.bridge.domain.attributes.arp.termination.table.ArpTerminationTableEntry; diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/l2/BridgeDomainCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/l2/BridgeDomainCustomizer.java index 96748d3c3..f961027b6 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/l2/BridgeDomainCustomizer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/l2/BridgeDomainCustomizer.java @@ -29,9 +29,9 @@ import io.fd.hc2vpp.common.translate.util.ReferenceCheck; import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.BridgeDomainAddDel; -import io.fd.vpp.jvpp.core.dto.BridgeDomainAddDelReply; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.BridgeDomainAddDel; +import io.fd.jvpp.core.dto.BridgeDomainAddDelReply; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.Collections; import java.util.Optional; import javax.annotation.Nonnull; diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/l2/L2FibEntryCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/l2/L2FibEntryCustomizer.java index 641e309cf..511564b61 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/l2/L2FibEntryCustomizer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/l2/L2FibEntryCustomizer.java @@ -28,9 +28,9 @@ import io.fd.honeycomb.translate.MappingContext; import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.L2FibAddDel; -import io.fd.vpp.jvpp.core.dto.L2FibAddDelReply; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.L2FibAddDel; +import io.fd.jvpp.core.dto.L2FibAddDelReply; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.concurrent.CompletionStage; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190128.L2FibFilter; diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/l2state/BridgeDomainCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/l2state/BridgeDomainCustomizer.java index 31cf89f9b..f30464543 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/l2state/BridgeDomainCustomizer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/l2state/BridgeDomainCustomizer.java @@ -25,10 +25,10 @@ import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.Initialized; import io.fd.honeycomb.translate.spi.read.InitializingListReaderCustomizer; -import io.fd.vpp.jvpp.core.dto.BridgeDomainDetails; -import io.fd.vpp.jvpp.core.dto.BridgeDomainDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.BridgeDomainDump; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.BridgeDomainDetails; +import io.fd.jvpp.core.dto.BridgeDomainDetailsReplyDump; +import io.fd.jvpp.core.dto.BridgeDomainDump; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/l2state/L2FibEntryCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/l2state/L2FibEntryCustomizer.java index 40c407af6..2a0ab3ce1 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/l2state/L2FibEntryCustomizer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/l2state/L2FibEntryCustomizer.java @@ -26,10 +26,10 @@ import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.Initialized; import io.fd.honeycomb.translate.spi.read.InitializingListReaderCustomizer; import io.fd.honeycomb.translate.util.RWUtils; -import io.fd.vpp.jvpp.core.dto.L2FibTableDetails; -import io.fd.vpp.jvpp.core.dto.L2FibTableDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.L2FibTableDump; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.L2FibTableDetails; +import io.fd.jvpp.core.dto.L2FibTableDetailsReplyDump; +import io.fd.jvpp.core.dto.L2FibTableDump; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.Collections; import java.util.List; import java.util.concurrent.CompletableFuture; diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/notification/InterfaceChangeNotificationProducer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/notification/InterfaceChangeNotificationProducer.java index 9f2dec06b..07b846365 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/notification/InterfaceChangeNotificationProducer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/notification/InterfaceChangeNotificationProducer.java @@ -24,13 +24,13 @@ import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.notification.ManagedNotificationProducer; import io.fd.honeycomb.notification.NotificationCollector; import io.fd.honeycomb.translate.MappingContext; -import io.fd.vpp.jvpp.VppBaseCallException; -import io.fd.vpp.jvpp.VppCallbackException; -import io.fd.vpp.jvpp.core.callback.SwInterfaceEventCallback; -import io.fd.vpp.jvpp.core.dto.SwInterfaceEvent; -import io.fd.vpp.jvpp.core.dto.WantInterfaceEvents; -import io.fd.vpp.jvpp.core.dto.WantInterfaceEventsReply; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.VppBaseCallException; +import io.fd.jvpp.VppCallbackException; +import io.fd.jvpp.core.callback.SwInterfaceEventCallback; +import io.fd.jvpp.core.dto.SwInterfaceEvent; +import io.fd.jvpp.core.dto.WantInterfaceEvents; +import io.fd.jvpp.core.dto.WantInterfaceEventsReply; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.ArrayList; import java.util.Collection; import java.util.concurrent.CompletionStage; diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/notification/InterfaceChangeNotificationProducerProvider.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/notification/InterfaceChangeNotificationProducerProvider.java index 9f3988cbf..dacda3c0b 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/notification/InterfaceChangeNotificationProducerProvider.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/notification/InterfaceChangeNotificationProducerProvider.java @@ -22,7 +22,7 @@ import com.google.inject.name.Named; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.data.init.ShutdownHandler; import io.fd.honeycomb.translate.MappingContext; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; public class InterfaceChangeNotificationProducerProvider implements Provider { diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/V3poModuleTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/V3poModuleTest.java index 414658ec6..09d641584 100644 --- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/V3poModuleTest.java +++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/V3poModuleTest.java @@ -35,7 +35,7 @@ import io.fd.honeycomb.translate.impl.write.registry.FlatWriterRegistryBuilder; import io.fd.honeycomb.translate.read.ReaderFactory; import io.fd.honeycomb.translate.util.YangDAG; import io.fd.honeycomb.translate.write.WriterFactory; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.HashSet; import java.util.Set; import org.junit.Before; diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/AbstractUnnumberedCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/AbstractUnnumberedCustomizerTest.java index 3ac55d48d..112ae8bd3 100644 --- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/AbstractUnnumberedCustomizerTest.java +++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/AbstractUnnumberedCustomizerTest.java @@ -22,8 +22,8 @@ import static org.mockito.Mockito.when; import io.fd.hc2vpp.common.test.write.WriterCustomizerTest; import io.fd.hc2vpp.common.translate.util.ByteDataTranslator; -import io.fd.vpp.jvpp.core.dto.SwInterfaceSetUnnumbered; -import io.fd.vpp.jvpp.core.dto.SwInterfaceSetUnnumberedReply; +import io.fd.jvpp.core.dto.SwInterfaceSetUnnumbered; +import io.fd.jvpp.core.dto.SwInterfaceSetUnnumberedReply; import org.junit.Test; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.unnumbered.interfaces.rev180103.unnumbered.config.attributes.Unnumbered; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.unnumbered.interfaces.rev180103.unnumbered.config.attributes.UnnumberedBuilder; diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/AfPacketCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/AfPacketCustomizerTest.java index 29b562f02..71e70d3b4 100644 --- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/AfPacketCustomizerTest.java +++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/AfPacketCustomizerTest.java @@ -25,10 +25,10 @@ import io.fd.hc2vpp.common.test.write.WriterCustomizerTest; import io.fd.hc2vpp.common.translate.util.Ipv4Translator; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.AfPacketCreate; -import io.fd.vpp.jvpp.core.dto.AfPacketCreateReply; -import io.fd.vpp.jvpp.core.dto.AfPacketDelete; -import io.fd.vpp.jvpp.core.dto.AfPacketDeleteReply; +import io.fd.jvpp.core.dto.AfPacketCreate; +import io.fd.jvpp.core.dto.AfPacketCreateReply; +import io.fd.jvpp.core.dto.AfPacketDelete; +import io.fd.jvpp.core.dto.AfPacketDeleteReply; import java.nio.charset.StandardCharsets; import org.junit.Test; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190128.VppInterfaceAugmentation; diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/EthernetCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/EthernetCustomizerTest.java index c948eb243..335d4b62c 100644 --- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/EthernetCustomizerTest.java +++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/EthernetCustomizerTest.java @@ -24,8 +24,8 @@ import static org.mockito.Mockito.when; import io.fd.hc2vpp.common.test.write.WriterCustomizerTest; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.HwInterfaceSetMtu; -import io.fd.vpp.jvpp.core.dto.HwInterfaceSetMtuReply; +import io.fd.jvpp.core.dto.HwInterfaceSetMtu; +import io.fd.jvpp.core.dto.HwInterfaceSetMtuReply; import org.junit.Test; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190128.VppInterfaceAugmentation; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190128.interfaces._interface.Ethernet; diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/GreCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/GreCustomizerTest.java index 932f3065c..133e5ec54 100644 --- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/GreCustomizerTest.java +++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/GreCustomizerTest.java @@ -30,10 +30,10 @@ import io.fd.hc2vpp.common.test.write.WriterCustomizerTest; import io.fd.hc2vpp.common.translate.util.AddressTranslator; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.VppBaseCallException; -import io.fd.vpp.jvpp.VppInvocationException; -import io.fd.vpp.jvpp.core.dto.GreAddDelTunnel; -import io.fd.vpp.jvpp.core.dto.GreAddDelTunnelReply; +import io.fd.jvpp.VppBaseCallException; +import io.fd.jvpp.VppInvocationException; +import io.fd.jvpp.core.dto.GreAddDelTunnel; +import io.fd.jvpp.core.dto.GreAddDelTunnelReply; import org.junit.Test; import org.mockito.ArgumentCaptor; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190128.VppInterfaceAugmentation; diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/InterfaceCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/InterfaceCustomizerTest.java index 6a659f484..092c58af1 100644 --- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/InterfaceCustomizerTest.java +++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/InterfaceCustomizerTest.java @@ -28,9 +28,9 @@ import io.fd.hc2vpp.common.test.write.WriterCustomizerTest; import io.fd.hc2vpp.common.translate.util.ByteDataTranslator; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.VppBaseCallException; -import io.fd.vpp.jvpp.core.dto.SwInterfaceSetFlags; -import io.fd.vpp.jvpp.core.dto.SwInterfaceSetFlagsReply; +import io.fd.jvpp.VppBaseCallException; +import io.fd.jvpp.core.dto.SwInterfaceSetFlags; +import io.fd.jvpp.core.dto.SwInterfaceSetFlagsReply; import org.junit.Test; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.Interfaces; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface; diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/InterfaceRoutingCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/InterfaceRoutingCustomizerTest.java index e78eb2fd7..495918d60 100644 --- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/InterfaceRoutingCustomizerTest.java +++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/InterfaceRoutingCustomizerTest.java @@ -25,8 +25,8 @@ import io.fd.hc2vpp.common.test.write.WriterCustomizerTest; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.util.RWUtils; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.SwInterfaceSetTable; -import io.fd.vpp.jvpp.core.dto.SwInterfaceSetTableReply; +import io.fd.jvpp.core.dto.SwInterfaceSetTable; +import io.fd.jvpp.core.dto.SwInterfaceSetTableReply; import java.util.Collections; import org.junit.Test; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190128.VppInterfaceAugmentation; diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/L2CustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/L2CustomizerTest.java index 78ede7e3e..be6955d3e 100644 --- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/L2CustomizerTest.java +++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/L2CustomizerTest.java @@ -26,12 +26,12 @@ import io.fd.hc2vpp.common.test.write.WriterCustomizerTest; import io.fd.hc2vpp.common.translate.util.ByteDataTranslator; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.VppBaseCallException; -import io.fd.vpp.jvpp.core.dto.SwInterfaceSetL2Bridge; -import io.fd.vpp.jvpp.core.dto.SwInterfaceSetL2BridgeReply; -import io.fd.vpp.jvpp.core.dto.SwInterfaceSetL2Xconnect; -import io.fd.vpp.jvpp.core.dto.SwInterfaceSetL2XconnectReply; -import io.fd.vpp.jvpp.core.types.L2PortType; +import io.fd.jvpp.VppBaseCallException; +import io.fd.jvpp.core.dto.SwInterfaceSetL2Bridge; +import io.fd.jvpp.core.dto.SwInterfaceSetL2BridgeReply; +import io.fd.jvpp.core.dto.SwInterfaceSetL2Xconnect; +import io.fd.jvpp.core.dto.SwInterfaceSetL2XconnectReply; +import io.fd.jvpp.core.types.L2PortType; import org.junit.Test; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190128.VppInterfaceAugmentation; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190128.interfaces._interface.L2; diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/LoopbackCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/LoopbackCustomizerTest.java index 7b7eec7d1..3941f1c88 100644 --- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/LoopbackCustomizerTest.java +++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/LoopbackCustomizerTest.java @@ -25,10 +25,10 @@ import static org.mockito.Mockito.verify; import io.fd.hc2vpp.common.test.write.WriterCustomizerTest; import io.fd.hc2vpp.common.translate.util.NamingContext; -import io.fd.vpp.jvpp.core.dto.CreateLoopback; -import io.fd.vpp.jvpp.core.dto.CreateLoopbackReply; -import io.fd.vpp.jvpp.core.dto.DeleteLoopback; -import io.fd.vpp.jvpp.core.dto.DeleteLoopbackReply; +import io.fd.jvpp.core.dto.CreateLoopback; +import io.fd.jvpp.core.dto.CreateLoopbackReply; +import io.fd.jvpp.core.dto.DeleteLoopback; +import io.fd.jvpp.core.dto.DeleteLoopbackReply; import org.junit.Test; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/RewriteCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/RewriteCustomizerTest.java index 3d12720b0..4fa720eb1 100644 --- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/RewriteCustomizerTest.java +++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/RewriteCustomizerTest.java @@ -26,10 +26,10 @@ import io.fd.hc2vpp.common.test.write.WriterCustomizerTest; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.hc2vpp.common.translate.util.TagRewriteOperation; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.VppBaseCallException; -import io.fd.vpp.jvpp.VppInvocationException; -import io.fd.vpp.jvpp.core.dto.L2InterfaceVlanTagRewrite; -import io.fd.vpp.jvpp.core.dto.L2InterfaceVlanTagRewriteReply; +import io.fd.jvpp.VppBaseCallException; +import io.fd.jvpp.VppInvocationException; +import io.fd.jvpp.core.dto.L2InterfaceVlanTagRewrite; +import io.fd.jvpp.core.dto.L2InterfaceVlanTagRewriteReply; import org.junit.Assert; import org.junit.Test; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.vlan.rev180319.SubinterfaceAugmentation; diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/SubInterfaceCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/SubInterfaceCustomizerTest.java index 63563502d..d94068576 100644 --- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/SubInterfaceCustomizerTest.java +++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/SubInterfaceCustomizerTest.java @@ -28,11 +28,11 @@ import static org.mockito.Mockito.verify; import io.fd.hc2vpp.common.test.write.WriterCustomizerTest; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.VppBaseCallException; -import io.fd.vpp.jvpp.core.dto.CreateSubif; -import io.fd.vpp.jvpp.core.dto.CreateSubifReply; -import io.fd.vpp.jvpp.core.dto.SwInterfaceSetFlags; -import io.fd.vpp.jvpp.core.dto.SwInterfaceSetFlagsReply; +import io.fd.jvpp.VppBaseCallException; +import io.fd.jvpp.core.dto.CreateSubif; +import io.fd.jvpp.core.dto.CreateSubifReply; +import io.fd.jvpp.core.dto.SwInterfaceSetFlags; +import io.fd.jvpp.core.dto.SwInterfaceSetFlagsReply; import java.util.Arrays; import java.util.List; import org.junit.Test; diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/SubInterfaceL2CustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/SubInterfaceL2CustomizerTest.java index 95b477646..b8aab9d1d 100644 --- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/SubInterfaceL2CustomizerTest.java +++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/SubInterfaceL2CustomizerTest.java @@ -24,9 +24,9 @@ import io.fd.hc2vpp.common.test.write.WriterCustomizerTest; import io.fd.hc2vpp.common.translate.util.ByteDataTranslator; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.SwInterfaceSetL2Bridge; -import io.fd.vpp.jvpp.core.dto.SwInterfaceSetL2BridgeReply; -import io.fd.vpp.jvpp.core.types.L2PortType; +import io.fd.jvpp.core.dto.SwInterfaceSetL2Bridge; +import io.fd.jvpp.core.dto.SwInterfaceSetL2BridgeReply; +import io.fd.jvpp.core.types.L2PortType; import org.junit.Test; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190128.l2.config.attributes.interconnection.BridgeBasedBuilder; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.vlan.rev180319.SubinterfaceAugmentation; diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/SubInterfaceRoutingCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/SubInterfaceRoutingCustomizerTest.java index e0834ca00..298a824e6 100644 --- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/SubInterfaceRoutingCustomizerTest.java +++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/SubInterfaceRoutingCustomizerTest.java @@ -27,8 +27,8 @@ import io.fd.hc2vpp.common.test.write.WriterCustomizerTest; import io.fd.hc2vpp.common.translate.util.ByteDataTranslator; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.SwInterfaceSetTable; -import io.fd.vpp.jvpp.core.dto.SwInterfaceSetTableReply; +import io.fd.jvpp.core.dto.SwInterfaceSetTable; +import io.fd.jvpp.core.dto.SwInterfaceSetTableReply; import java.util.Collections; import java.util.Set; import org.junit.Test; diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/TapV2CustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/TapV2CustomizerTest.java index 799214950..06b2d445f 100644 --- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/TapV2CustomizerTest.java +++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/TapV2CustomizerTest.java @@ -28,10 +28,10 @@ import io.fd.hc2vpp.common.translate.util.Ipv4Translator; import io.fd.hc2vpp.common.translate.util.Ipv6Translator; import io.fd.hc2vpp.common.translate.util.MacTranslator; import io.fd.hc2vpp.common.translate.util.NamingContext; -import io.fd.vpp.jvpp.core.dto.TapCreateV2; -import io.fd.vpp.jvpp.core.dto.TapCreateV2Reply; -import io.fd.vpp.jvpp.core.dto.TapDeleteV2; -import io.fd.vpp.jvpp.core.dto.TapDeleteV2Reply; +import io.fd.jvpp.core.dto.TapCreateV2; +import io.fd.jvpp.core.dto.TapCreateV2Reply; +import io.fd.jvpp.core.dto.TapDeleteV2; +import io.fd.jvpp.core.dto.TapDeleteV2Reply; import java.util.concurrent.atomic.AtomicInteger; import org.junit.Assert; import org.junit.Test; diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/VhostUserCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/VhostUserCustomizerTest.java index 712965b52..0b26433f3 100644 --- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/VhostUserCustomizerTest.java +++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/VhostUserCustomizerTest.java @@ -33,14 +33,14 @@ import io.fd.hc2vpp.common.test.write.WriterCustomizerTest; import io.fd.hc2vpp.common.translate.util.Ipv4Translator; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.VppBaseCallException; -import io.fd.vpp.jvpp.VppInvocationException; -import io.fd.vpp.jvpp.core.dto.CreateVhostUserIf; -import io.fd.vpp.jvpp.core.dto.CreateVhostUserIfReply; -import io.fd.vpp.jvpp.core.dto.DeleteVhostUserIf; -import io.fd.vpp.jvpp.core.dto.DeleteVhostUserIfReply; -import io.fd.vpp.jvpp.core.dto.ModifyVhostUserIf; -import io.fd.vpp.jvpp.core.dto.ModifyVhostUserIfReply; +import io.fd.jvpp.VppBaseCallException; +import io.fd.jvpp.VppInvocationException; +import io.fd.jvpp.core.dto.CreateVhostUserIf; +import io.fd.jvpp.core.dto.CreateVhostUserIfReply; +import io.fd.jvpp.core.dto.DeleteVhostUserIf; +import io.fd.jvpp.core.dto.DeleteVhostUserIfReply; +import io.fd.jvpp.core.dto.ModifyVhostUserIf; +import io.fd.jvpp.core.dto.ModifyVhostUserIfReply; import org.junit.Test; import org.mockito.ArgumentCaptor; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190128.VhostUserRole; diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/VxlanCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/VxlanCustomizerTest.java index b4880d7df..3618a2335 100644 --- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/VxlanCustomizerTest.java +++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/VxlanCustomizerTest.java @@ -32,10 +32,10 @@ import io.fd.hc2vpp.common.translate.util.AddressTranslator; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.hc2vpp.v3po.DisabledInterfacesManager; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.VppBaseCallException; -import io.fd.vpp.jvpp.VppInvocationException; -import io.fd.vpp.jvpp.core.dto.VxlanAddDelTunnel; -import io.fd.vpp.jvpp.core.dto.VxlanAddDelTunnelReply; +import io.fd.jvpp.VppBaseCallException; +import io.fd.jvpp.VppInvocationException; +import io.fd.jvpp.core.dto.VxlanAddDelTunnel; +import io.fd.jvpp.core.dto.VxlanAddDelTunnelReply; import org.junit.Test; import org.mockito.ArgumentCaptor; import org.mockito.Mock; diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/VxlanGpeCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/VxlanGpeCustomizerTest.java index d3806b54a..6b0dc85b5 100644 --- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/VxlanGpeCustomizerTest.java +++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/VxlanGpeCustomizerTest.java @@ -32,9 +32,9 @@ import io.fd.hc2vpp.common.translate.util.AddressTranslator; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.hc2vpp.v3po.DisabledInterfacesManager; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.VppBaseCallException; -import io.fd.vpp.jvpp.core.dto.VxlanGpeAddDelTunnel; -import io.fd.vpp.jvpp.core.dto.VxlanGpeAddDelTunnelReply; +import io.fd.jvpp.VppBaseCallException; +import io.fd.jvpp.core.dto.VxlanGpeAddDelTunnel; +import io.fd.jvpp.core.dto.VxlanGpeAddDelTunnelReply; import org.junit.Test; import org.mockito.ArgumentCaptor; import org.mockito.Mock; diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/pbb/PbbRewriteCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/pbb/PbbRewriteCustomizerTest.java index 73ab3e270..7f10c3578 100644 --- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/pbb/PbbRewriteCustomizerTest.java +++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/pbb/PbbRewriteCustomizerTest.java @@ -29,9 +29,9 @@ import static org.mockito.Mockito.when; import io.fd.hc2vpp.common.test.write.WriterCustomizerTest; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.VppCallbackException; -import io.fd.vpp.jvpp.core.dto.L2InterfacePbbTagRewrite; -import io.fd.vpp.jvpp.core.dto.L2InterfacePbbTagRewriteReply; +import io.fd.jvpp.VppCallbackException; +import io.fd.jvpp.core.dto.L2InterfacePbbTagRewrite; +import io.fd.jvpp.core.dto.L2InterfacePbbTagRewriteReply; import org.junit.Test; import org.mockito.ArgumentCaptor; import org.mockito.Captor; diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/span/MirroredInterfacesCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/span/MirroredInterfacesCustomizerTest.java index 712c6ac9e..c75083760 100644 --- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/span/MirroredInterfacesCustomizerTest.java +++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/span/MirroredInterfacesCustomizerTest.java @@ -25,8 +25,8 @@ import static org.mockito.Mockito.when; import io.fd.hc2vpp.common.test.write.WriterCustomizerTest; import io.fd.hc2vpp.common.translate.util.NamingContext; -import io.fd.vpp.jvpp.core.dto.SwInterfaceSpanEnableDisable; -import io.fd.vpp.jvpp.core.dto.SwInterfaceSpanEnableDisableReply; +import io.fd.jvpp.core.dto.SwInterfaceSpanEnableDisable; +import io.fd.jvpp.core.dto.SwInterfaceSpanEnableDisableReply; import org.junit.Test; import org.mockito.ArgumentCaptor; import org.mockito.Captor; diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/AfPacketCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/AfPacketCustomizerTest.java index 107032f9b..5a4ef63b4 100644 --- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/AfPacketCustomizerTest.java +++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/AfPacketCustomizerTest.java @@ -29,9 +29,9 @@ import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.hc2vpp.v3po.interfacesstate.cache.InterfaceCacheDumpManager; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.vpp.jvpp.core.dto.AfPacketDetails; -import io.fd.vpp.jvpp.core.dto.AfPacketDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.SwInterfaceDetails; +import io.fd.jvpp.core.dto.AfPacketDetails; +import io.fd.jvpp.core.dto.AfPacketDetailsReplyDump; +import io.fd.jvpp.core.dto.SwInterfaceDetails; import java.util.Collections; import org.junit.Test; import org.mockito.Mock; diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/EthernetCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/EthernetCustomizerTest.java index 7b0b28cb3..957cc7909 100644 --- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/EthernetCustomizerTest.java +++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/EthernetCustomizerTest.java @@ -27,7 +27,7 @@ import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.hc2vpp.v3po.interfacesstate.cache.InterfaceCacheDumpManager; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.vpp.jvpp.core.dto.SwInterfaceDetails; +import io.fd.jvpp.core.dto.SwInterfaceDetails; import org.junit.Test; import org.mockito.Mock; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190128.EthernetStateAttributes; diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/GreCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/GreCustomizerTest.java index 90c4b8782..0e0775916 100644 --- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/GreCustomizerTest.java +++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/GreCustomizerTest.java @@ -32,11 +32,11 @@ import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.hc2vpp.v3po.interfacesstate.cache.InterfaceCacheDumpManager; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.vpp.jvpp.VppInvocationException; -import io.fd.vpp.jvpp.core.dto.GreTunnelDetails; -import io.fd.vpp.jvpp.core.dto.GreTunnelDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.GreTunnelDump; -import io.fd.vpp.jvpp.core.dto.SwInterfaceDetails; +import io.fd.jvpp.VppInvocationException; +import io.fd.jvpp.core.dto.GreTunnelDetails; +import io.fd.jvpp.core.dto.GreTunnelDetailsReplyDump; +import io.fd.jvpp.core.dto.GreTunnelDump; +import io.fd.jvpp.core.dto.SwInterfaceDetails; import org.junit.Test; import org.mockito.Mock; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190128.VppInterfaceStateAugmentation; diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/InterfaceCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/InterfaceCustomizerTest.java index d8fa719ff..5baf2d962 100644 --- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/InterfaceCustomizerTest.java +++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/InterfaceCustomizerTest.java @@ -30,8 +30,8 @@ import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.hc2vpp.v3po.DisabledInterfacesManager; import io.fd.hc2vpp.v3po.interfacesstate.cache.InterfaceCacheDumpManager; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.vpp.jvpp.core.dto.SwInterfaceDetails; -import io.fd.vpp.jvpp.core.dto.SwInterfaceDump; +import io.fd.jvpp.core.dto.SwInterfaceDetails; +import io.fd.jvpp.core.dto.SwInterfaceDump; import java.util.Arrays; import java.util.List; import java.util.stream.Stream; diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/InterfaceDataTranslatorTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/InterfaceDataTranslatorTest.java index 315ba7d16..29be588a8 100644 --- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/InterfaceDataTranslatorTest.java +++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/InterfaceDataTranslatorTest.java @@ -25,7 +25,7 @@ import static org.mockito.Mockito.when; import io.fd.hc2vpp.v3po.interfacesstate.cache.InterfaceCacheDumpManager; import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; -import io.fd.vpp.jvpp.core.dto.SwInterfaceDetails; +import io.fd.jvpp.core.dto.SwInterfaceDetails; import java.nio.charset.StandardCharsets; import org.junit.Test; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190128.AfPacket; diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/InterfaceRoutingCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/InterfaceRoutingCustomizerTest.java index 805f0c546..9f7794059 100644 --- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/InterfaceRoutingCustomizerTest.java +++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/InterfaceRoutingCustomizerTest.java @@ -25,7 +25,7 @@ import static org.mockito.Mockito.when; import io.fd.hc2vpp.common.test.read.ReaderCustomizerTest; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.vpp.jvpp.core.dto.SwInterfaceGetTableReply; +import io.fd.jvpp.core.dto.SwInterfaceGetTableReply; import org.junit.Test; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190128.VppInterfaceStateAugmentation; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190128.VppInterfaceStateAugmentationBuilder; diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/L2CustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/L2CustomizerTest.java index 9c6a2c9d3..cc73e5a32 100644 --- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/L2CustomizerTest.java +++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/L2CustomizerTest.java @@ -25,11 +25,11 @@ import io.fd.hc2vpp.common.test.read.ReaderCustomizerTest; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.hc2vpp.v3po.interfacesstate.cache.InterfaceCacheDumpManager; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.vpp.jvpp.core.dto.BridgeDomainDetails; -import io.fd.vpp.jvpp.core.dto.BridgeDomainDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.BridgeDomainDump; -import io.fd.vpp.jvpp.core.dto.SwInterfaceDetails; -import io.fd.vpp.jvpp.core.types.BridgeDomainSwIf; +import io.fd.jvpp.core.dto.BridgeDomainDetails; +import io.fd.jvpp.core.dto.BridgeDomainDetailsReplyDump; +import io.fd.jvpp.core.dto.BridgeDomainDump; +import io.fd.jvpp.core.dto.SwInterfaceDetails; +import io.fd.jvpp.core.types.BridgeDomainSwIf; import java.util.Collections; import java.util.HashMap; import java.util.List; diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/RewriteCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/RewriteCustomizerTest.java index 0e34725d9..0cb90c1b8 100644 --- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/RewriteCustomizerTest.java +++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/RewriteCustomizerTest.java @@ -27,7 +27,7 @@ import io.fd.hc2vpp.common.translate.util.TagRewriteOperation; import io.fd.hc2vpp.v3po.interfacesstate.cache.InterfaceCacheDumpManager; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.vpp.jvpp.core.dto.SwInterfaceDetails; +import io.fd.jvpp.core.dto.SwInterfaceDetails; import java.util.List; import org.junit.Test; import org.mockito.ArgumentCaptor; diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/SubInterfaceCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/SubInterfaceCustomizerTest.java index cf6eb39df..2ed85688f 100644 --- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/SubInterfaceCustomizerTest.java +++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/SubInterfaceCustomizerTest.java @@ -28,7 +28,7 @@ import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.hc2vpp.v3po.interfacesstate.cache.InterfaceCacheDumpManager; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.vpp.jvpp.core.dto.SwInterfaceDetails; +import io.fd.jvpp.core.dto.SwInterfaceDetails; import java.util.List; import java.util.stream.Stream; import org.junit.Test; diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/SubInterfaceRoutingCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/SubInterfaceRoutingCustomizerTest.java index 86bb7ef67..8be81a5d2 100644 --- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/SubInterfaceRoutingCustomizerTest.java +++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/SubInterfaceRoutingCustomizerTest.java @@ -26,8 +26,8 @@ import io.fd.hc2vpp.common.translate.util.ByteDataTranslator; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.vpp.jvpp.core.dto.SwInterfaceGetTable; -import io.fd.vpp.jvpp.core.dto.SwInterfaceGetTableReply; +import io.fd.jvpp.core.dto.SwInterfaceGetTable; +import io.fd.jvpp.core.dto.SwInterfaceGetTableReply; import org.junit.Test; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.vlan.rev180319.SubinterfaceStateAugmentation; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.vlan.rev180319.interfaces.state._interface.SubInterfaces; diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/TapV2CustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/TapV2CustomizerTest.java index 96db206c4..d64b837ba 100644 --- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/TapV2CustomizerTest.java +++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/TapV2CustomizerTest.java @@ -31,9 +31,9 @@ import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.hc2vpp.v3po.interfacesstate.cache.InterfaceCacheDumpManager; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.vpp.jvpp.core.dto.SwInterfaceDetails; -import io.fd.vpp.jvpp.core.dto.SwInterfaceTapV2Details; -import io.fd.vpp.jvpp.core.dto.SwInterfaceTapV2DetailsReplyDump; +import io.fd.jvpp.core.dto.SwInterfaceDetails; +import io.fd.jvpp.core.dto.SwInterfaceTapV2Details; +import io.fd.jvpp.core.dto.SwInterfaceTapV2DetailsReplyDump; import org.junit.Test; import org.mockito.Mock; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190128.VppInterfaceStateAugmentation; diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/VhostUserCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/VhostUserCustomizerTest.java index e78796fdc..064b6cbfe 100644 --- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/VhostUserCustomizerTest.java +++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/VhostUserCustomizerTest.java @@ -27,9 +27,9 @@ import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.hc2vpp.v3po.interfacesstate.cache.InterfaceCacheDumpManager; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.vpp.jvpp.core.dto.SwInterfaceDetails; -import io.fd.vpp.jvpp.core.dto.SwInterfaceVhostUserDetails; -import io.fd.vpp.jvpp.core.dto.SwInterfaceVhostUserDetailsReplyDump; +import io.fd.jvpp.core.dto.SwInterfaceDetails; +import io.fd.jvpp.core.dto.SwInterfaceVhostUserDetails; +import io.fd.jvpp.core.dto.SwInterfaceVhostUserDetailsReplyDump; import java.math.BigInteger; import org.junit.Test; import org.mockito.Mock; diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/VxlanCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/VxlanCustomizerTest.java index b02b14a00..86e26ed82 100644 --- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/VxlanCustomizerTest.java +++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/VxlanCustomizerTest.java @@ -32,11 +32,11 @@ import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.hc2vpp.v3po.interfacesstate.cache.InterfaceCacheDumpManager; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.vpp.jvpp.VppInvocationException; -import io.fd.vpp.jvpp.core.dto.SwInterfaceDetails; -import io.fd.vpp.jvpp.core.dto.VxlanTunnelDetails; -import io.fd.vpp.jvpp.core.dto.VxlanTunnelDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.VxlanTunnelDump; +import io.fd.jvpp.VppInvocationException; +import io.fd.jvpp.core.dto.SwInterfaceDetails; +import io.fd.jvpp.core.dto.VxlanTunnelDetails; +import io.fd.jvpp.core.dto.VxlanTunnelDetailsReplyDump; +import io.fd.jvpp.core.dto.VxlanTunnelDump; import org.junit.Test; import org.mockito.Mock; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190128.L2Input; diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/VxlanGpeCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/VxlanGpeCustomizerTest.java index 52558bc96..99b1834f0 100644 --- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/VxlanGpeCustomizerTest.java +++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/VxlanGpeCustomizerTest.java @@ -33,11 +33,11 @@ import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.hc2vpp.v3po.interfacesstate.cache.InterfaceCacheDumpManager; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.vpp.jvpp.VppBaseCallException; -import io.fd.vpp.jvpp.core.dto.SwInterfaceDetails; -import io.fd.vpp.jvpp.core.dto.VxlanGpeTunnelDetails; -import io.fd.vpp.jvpp.core.dto.VxlanGpeTunnelDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.VxlanGpeTunnelDump; +import io.fd.jvpp.VppBaseCallException; +import io.fd.jvpp.core.dto.SwInterfaceDetails; +import io.fd.jvpp.core.dto.VxlanGpeTunnelDetails; +import io.fd.jvpp.core.dto.VxlanGpeTunnelDetailsReplyDump; +import io.fd.jvpp.core.dto.VxlanGpeTunnelDump; import org.junit.Test; import org.mockito.Mock; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190128.VppInterfaceStateAugmentation; diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/cache/InterfaceCacheDumpManagerImplTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/cache/InterfaceCacheDumpManagerImplTest.java index 6f47f162d..c319cc6d4 100644 --- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/cache/InterfaceCacheDumpManagerImplTest.java +++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/cache/InterfaceCacheDumpManagerImplTest.java @@ -33,10 +33,10 @@ import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.MappingContext; import io.fd.honeycomb.translate.ModificationCache; import io.fd.honeycomb.translate.read.ReadContext; -import io.fd.vpp.jvpp.core.dto.SwInterfaceDetails; -import io.fd.vpp.jvpp.core.dto.SwInterfaceDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.SwInterfaceDump; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.SwInterfaceDetails; +import io.fd.jvpp.core.dto.SwInterfaceDetailsReplyDump; +import io.fd.jvpp.core.dto.SwInterfaceDump; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.Arrays; import java.util.HashMap; import java.util.List; diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/span/MirroredInterfacesCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/span/MirroredInterfacesCustomizerTest.java index 4e0b66637..d04a71bf4 100644 --- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/span/MirroredInterfacesCustomizerTest.java +++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/span/MirroredInterfacesCustomizerTest.java @@ -25,8 +25,8 @@ import static org.mockito.Mockito.when; import io.fd.hc2vpp.common.test.read.ReaderCustomizerTest; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.vpp.jvpp.core.dto.SwInterfaceSpanDetails; -import io.fd.vpp.jvpp.core.dto.SwInterfaceSpanDetailsReplyDump; +import io.fd.jvpp.core.dto.SwInterfaceSpanDetails; +import io.fd.jvpp.core.dto.SwInterfaceSpanDetailsReplyDump; import java.util.Arrays; import org.junit.Test; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190128.SpanState; diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/l2/ArpTerminationTableEntryCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/l2/ArpTerminationTableEntryCustomizerTest.java index a42d91ab2..6b839ae56 100644 --- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/l2/ArpTerminationTableEntryCustomizerTest.java +++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/l2/ArpTerminationTableEntryCustomizerTest.java @@ -28,15 +28,15 @@ import static org.mockito.Mockito.verify; import io.fd.hc2vpp.common.test.write.WriterCustomizerTest; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.VppBaseCallException; -import io.fd.vpp.jvpp.VppInvocationException; -import io.fd.vpp.jvpp.core.dto.BdIpMacAddDel; -import io.fd.vpp.jvpp.core.dto.BdIpMacAddDelReply; -import io.fd.vpp.jvpp.core.types.Address; -import io.fd.vpp.jvpp.core.types.AddressFamily; -import io.fd.vpp.jvpp.core.types.AddressUnion; -import io.fd.vpp.jvpp.core.types.Ip4Address; -import io.fd.vpp.jvpp.core.types.MacAddress; +import io.fd.jvpp.VppBaseCallException; +import io.fd.jvpp.VppInvocationException; +import io.fd.jvpp.core.dto.BdIpMacAddDel; +import io.fd.jvpp.core.dto.BdIpMacAddDelReply; +import io.fd.jvpp.core.types.Address; +import io.fd.jvpp.core.types.AddressFamily; +import io.fd.jvpp.core.types.AddressUnion; +import io.fd.jvpp.core.types.Ip4Address; +import io.fd.jvpp.core.types.MacAddress; import org.junit.Test; import org.mockito.ArgumentCaptor; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190128.BridgeDomains; diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/l2/BridgeDomainCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/l2/BridgeDomainCustomizerTest.java index 39c36b2a4..3f914f63d 100644 --- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/l2/BridgeDomainCustomizerTest.java +++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/l2/BridgeDomainCustomizerTest.java @@ -28,9 +28,9 @@ import io.fd.hc2vpp.common.test.write.WriterCustomizerTest; import io.fd.hc2vpp.common.translate.util.ByteDataTranslator; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.VppInvocationException; -import io.fd.vpp.jvpp.core.dto.BridgeDomainAddDel; -import io.fd.vpp.jvpp.core.dto.BridgeDomainAddDelReply; +import io.fd.jvpp.VppInvocationException; +import io.fd.jvpp.core.dto.BridgeDomainAddDel; +import io.fd.jvpp.core.dto.BridgeDomainAddDelReply; import java.util.Arrays; import javax.annotation.Nullable; import org.junit.Test; diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/l2/L2FibEntryCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/l2/L2FibEntryCustomizerTest.java index ac0572521..a379866cf 100644 --- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/l2/L2FibEntryCustomizerTest.java +++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/l2/L2FibEntryCustomizerTest.java @@ -28,10 +28,10 @@ import static org.mockito.Mockito.verify; import io.fd.hc2vpp.common.test.write.WriterCustomizerTest; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.VppBaseCallException; -import io.fd.vpp.jvpp.VppInvocationException; -import io.fd.vpp.jvpp.core.dto.L2FibAddDel; -import io.fd.vpp.jvpp.core.dto.L2FibAddDelReply; +import io.fd.jvpp.VppBaseCallException; +import io.fd.jvpp.VppInvocationException; +import io.fd.jvpp.core.dto.L2FibAddDel; +import io.fd.jvpp.core.dto.L2FibAddDelReply; import org.junit.Test; import org.mockito.ArgumentCaptor; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190128.BridgeDomains; diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/l2state/L2FibEntryCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/l2state/L2FibEntryCustomizerTest.java index 2f7825fab..1d6a7c8c3 100644 --- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/l2state/L2FibEntryCustomizerTest.java +++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/l2state/L2FibEntryCustomizerTest.java @@ -25,10 +25,10 @@ import static org.mockito.Mockito.when; import io.fd.hc2vpp.common.test.read.ListReaderCustomizerTest; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.vpp.jvpp.VppInvocationException; -import io.fd.vpp.jvpp.core.dto.L2FibTableDetails; -import io.fd.vpp.jvpp.core.dto.L2FibTableDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.L2FibTableDump; +import io.fd.jvpp.VppInvocationException; +import io.fd.jvpp.core.dto.L2FibTableDetails; +import io.fd.jvpp.core.dto.L2FibTableDetailsReplyDump; +import io.fd.jvpp.core.dto.L2FibTableDump; import java.util.Collections; import java.util.List; import java.util.concurrent.ExecutionException; diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/l2state/L2StateTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/l2state/L2StateTest.java index 5c3a05854..3a73abdff 100644 --- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/l2state/L2StateTest.java +++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/l2state/L2StateTest.java @@ -38,13 +38,13 @@ import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.read.registry.ReaderRegistry; import io.fd.honeycomb.translate.util.YangDAG; -import io.fd.vpp.jvpp.core.dto.BridgeDomainDetails; -import io.fd.vpp.jvpp.core.dto.BridgeDomainDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.BridgeDomainDump; -import io.fd.vpp.jvpp.core.dto.L2FibTableDetails; -import io.fd.vpp.jvpp.core.dto.L2FibTableDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.L2FibTableDump; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.BridgeDomainDetails; +import io.fd.jvpp.core.dto.BridgeDomainDetailsReplyDump; +import io.fd.jvpp.core.dto.BridgeDomainDump; +import io.fd.jvpp.core.dto.L2FibTableDetails; +import io.fd.jvpp.core.dto.L2FibTableDetailsReplyDump; +import io.fd.jvpp.core.dto.L2FibTableDump; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.Arrays; import java.util.Collections; import java.util.List; diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/notification/InterfaceChangeNotificationProducerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/notification/InterfaceChangeNotificationProducerTest.java index 202b9b2dc..fc2c2f946 100644 --- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/notification/InterfaceChangeNotificationProducerTest.java +++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/notification/InterfaceChangeNotificationProducerTest.java @@ -27,12 +27,12 @@ import io.fd.hc2vpp.common.test.util.NamingContextHelper; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.notification.NotificationCollector; import io.fd.honeycomb.translate.MappingContext; -import io.fd.vpp.jvpp.core.callback.SwInterfaceEventCallback; -import io.fd.vpp.jvpp.core.dto.SwInterfaceEvent; -import io.fd.vpp.jvpp.core.dto.WantInterfaceEvents; -import io.fd.vpp.jvpp.core.dto.WantInterfaceEventsReply; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; -import io.fd.vpp.jvpp.core.notification.CoreEventRegistry; +import io.fd.jvpp.core.callback.SwInterfaceEventCallback; +import io.fd.jvpp.core.dto.SwInterfaceEvent; +import io.fd.jvpp.core.dto.WantInterfaceEvents; +import io.fd.jvpp.core.dto.WantInterfaceEventsReply; +import io.fd.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.notification.CoreEventRegistry; import org.junit.Before; import org.junit.Test; import org.mockito.ArgumentCaptor; diff --git a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/policer/read/InterfacePolicerCustomizer.java b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/policer/read/InterfacePolicerCustomizer.java index 391caf5d8..62a4f79fd 100644 --- a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/policer/read/InterfacePolicerCustomizer.java +++ b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/policer/read/InterfacePolicerCustomizer.java @@ -29,9 +29,9 @@ import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; import io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor; -import io.fd.vpp.jvpp.core.dto.PolicerClassifyDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.PolicerClassifyDump; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.PolicerClassifyDetailsReplyDump; +import io.fd.jvpp.core.dto.PolicerClassifyDump; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.Optional; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang._interface.policer.rev170315.PolicerInterfaceStateAugmentationBuilder; diff --git a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/policer/read/InterfacePolicerReaderFactory.java b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/policer/read/InterfacePolicerReaderFactory.java index d725a4a12..42ae28b42 100644 --- a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/policer/read/InterfacePolicerReaderFactory.java +++ b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/policer/read/InterfacePolicerReaderFactory.java @@ -23,7 +23,7 @@ import io.fd.hc2vpp.vpp.classifier.context.VppClassifierContextManager; import io.fd.honeycomb.translate.impl.read.GenericReader; import io.fd.honeycomb.translate.read.ReaderFactory; import io.fd.honeycomb.translate.read.registry.ModifiableReaderRegistryBuilder; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang._interface.policer.rev170315.PolicerInterfaceStateAugmentation; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang._interface.policer.rev170315.PolicerInterfaceStateAugmentationBuilder; diff --git a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/policer/read/PolicerCustomizer.java b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/policer/read/PolicerCustomizer.java index dba22b7f0..6445828c0 100644 --- a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/policer/read/PolicerCustomizer.java +++ b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/policer/read/PolicerCustomizer.java @@ -27,10 +27,10 @@ import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.Initialized; import io.fd.honeycomb.translate.spi.read.InitializingListReaderCustomizer; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; -import io.fd.vpp.jvpp.core.dto.PolicerDetails; -import io.fd.vpp.jvpp.core.dto.PolicerDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.PolicerDump; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.PolicerDetails; +import io.fd.jvpp.core.dto.PolicerDetailsReplyDump; +import io.fd.jvpp.core.dto.PolicerDump; +import io.fd.jvpp.core.future.FutureJVppCore; import java.math.BigInteger; import java.util.Collections; import java.util.List; diff --git a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/policer/read/PolicerReaderFactory.java b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/policer/read/PolicerReaderFactory.java index 8e8df880f..481fe726a 100644 --- a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/policer/read/PolicerReaderFactory.java +++ b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/policer/read/PolicerReaderFactory.java @@ -21,7 +21,7 @@ import com.google.inject.Inject; import io.fd.honeycomb.translate.impl.read.GenericInitListReader; import io.fd.honeycomb.translate.read.ReaderFactory; import io.fd.honeycomb.translate.read.registry.ModifiableReaderRegistryBuilder; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.policer.rev170315.PolicersState; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.policer.rev170315.PolicersStateBuilder; diff --git a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/policer/write/InterfacePolicerCustomizer.java b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/policer/write/InterfacePolicerCustomizer.java index 5b3bf8785..a3df551f0 100644 --- a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/policer/write/InterfacePolicerCustomizer.java +++ b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/policer/write/InterfacePolicerCustomizer.java @@ -27,8 +27,8 @@ import io.fd.honeycomb.translate.MappingContext; import io.fd.honeycomb.translate.spi.write.WriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.PolicerClassifySetInterface; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.PolicerClassifySetInterface; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang._interface.policer.rev170315._interface.policer.attributes.Policer; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface; diff --git a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/policer/write/InterfacePolicerWriterFactory.java b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/policer/write/InterfacePolicerWriterFactory.java index c9616d043..641b00d79 100644 --- a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/policer/write/InterfacePolicerWriterFactory.java +++ b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/policer/write/InterfacePolicerWriterFactory.java @@ -27,7 +27,7 @@ import io.fd.hc2vpp.vpp.classifier.context.VppClassifierContextManager; import io.fd.honeycomb.translate.impl.write.GenericWriter; import io.fd.honeycomb.translate.write.WriterFactory; import io.fd.honeycomb.translate.write.registry.ModifiableWriterRegistryBuilder; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang._interface.policer.rev170315.PolicerInterfaceAugmentation; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang._interface.policer.rev170315._interface.policer.attributes.Policer; diff --git a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/policer/write/PolicerCustomizer.java b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/policer/write/PolicerCustomizer.java index 1c4f93c8d..8cad88f2a 100644 --- a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/policer/write/PolicerCustomizer.java +++ b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/policer/write/PolicerCustomizer.java @@ -26,9 +26,9 @@ import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.PolicerAddDel; -import io.fd.vpp.jvpp.core.dto.PolicerAddDelReply; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.PolicerAddDel; +import io.fd.jvpp.core.dto.PolicerAddDelReply; +import io.fd.jvpp.core.future.FutureJVppCore; import java.nio.charset.StandardCharsets; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.policer.rev170315.DscpType; diff --git a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/policer/write/PolicerWriterFactory.java b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/policer/write/PolicerWriterFactory.java index 8f7979a30..0b6532fe3 100644 --- a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/policer/write/PolicerWriterFactory.java +++ b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/policer/write/PolicerWriterFactory.java @@ -23,7 +23,7 @@ import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.impl.write.GenericListWriter; import io.fd.honeycomb.translate.write.WriterFactory; import io.fd.honeycomb.translate.write.registry.ModifiableWriterRegistryBuilder; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.policer.rev170315.Policers; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.policer.rev170315.policer.base.attributes.ConformAction; diff --git a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/factory/read/InterfaceAclReaderFactory.java b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/factory/read/InterfaceAclReaderFactory.java index 3edb6152b..35d0c380a 100644 --- a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/factory/read/InterfaceAclReaderFactory.java +++ b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/factory/read/InterfaceAclReaderFactory.java @@ -25,7 +25,7 @@ import io.fd.hc2vpp.vpp.classifier.read.acl.AclCustomizer; import io.fd.honeycomb.translate.impl.read.GenericInitReader; import io.fd.honeycomb.translate.read.ReaderFactory; import io.fd.honeycomb.translate.read.registry.ModifiableReaderRegistryBuilder; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp._interface.acl.rev170315.VppInterfaceAclStateAugmentation; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp._interface.acl.rev170315.VppInterfaceAclStateAugmentationBuilder; diff --git a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/factory/read/SubInterfaceAclReaderFactory.java b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/factory/read/SubInterfaceAclReaderFactory.java index f5532fc2d..e93c9f022 100644 --- a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/factory/read/SubInterfaceAclReaderFactory.java +++ b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/factory/read/SubInterfaceAclReaderFactory.java @@ -25,7 +25,7 @@ import io.fd.hc2vpp.vpp.classifier.read.acl.SubInterfaceAclCustomizer; import io.fd.honeycomb.translate.impl.read.GenericInitReader; import io.fd.honeycomb.translate.read.ReaderFactory; import io.fd.honeycomb.translate.read.registry.ModifiableReaderRegistryBuilder; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.classifier.acl.rev170503.acl.base.attributes.Ip4Acl; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.classifier.acl.rev170503.acl.base.attributes.Ip6Acl; diff --git a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/factory/read/VppClassifierReaderFactory.java b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/factory/read/VppClassifierReaderFactory.java index 73cee5cfb..ad2bb5b28 100644 --- a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/factory/read/VppClassifierReaderFactory.java +++ b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/factory/read/VppClassifierReaderFactory.java @@ -25,10 +25,10 @@ import io.fd.honeycomb.translate.impl.read.GenericInitListReader; import io.fd.honeycomb.translate.impl.read.GenericListReader; import io.fd.honeycomb.translate.read.ReaderFactory; import io.fd.honeycomb.translate.read.registry.ModifiableReaderRegistryBuilder; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; -import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.classifier.rev170327.VppClassifierStateBuilder; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.classifier.rev170327.VppClassifierState; +import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.classifier.rev170327.VppClassifierStateBuilder; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.classifier.rev170327.classify.table.base.attributes.ClassifySession; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.classifier.rev170327.vpp.classifier.state.ClassifyTable; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; diff --git a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/factory/write/InterfaceAclWriterFactory.java b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/factory/write/InterfaceAclWriterFactory.java index 578db89ec..164815265 100644 --- a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/factory/write/InterfaceAclWriterFactory.java +++ b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/factory/write/InterfaceAclWriterFactory.java @@ -28,7 +28,7 @@ import io.fd.hc2vpp.vpp.classifier.write.acl.ingress.AclCustomizer; import io.fd.honeycomb.translate.impl.write.GenericWriter; import io.fd.honeycomb.translate.write.WriterFactory; import io.fd.honeycomb.translate.write.registry.ModifiableWriterRegistryBuilder; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp._interface.acl.rev170315.VppInterfaceAclAugmentation; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.classifier.acl.rev170503.acl.base.attributes.Ip4Acl; diff --git a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/factory/write/SubInterfaceAclWriterFactory.java b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/factory/write/SubInterfaceAclWriterFactory.java index f2932e157..e283618b6 100644 --- a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/factory/write/SubInterfaceAclWriterFactory.java +++ b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/factory/write/SubInterfaceAclWriterFactory.java @@ -26,7 +26,7 @@ import io.fd.hc2vpp.vpp.classifier.write.acl.ingress.SubInterfaceAclCustomizer; import io.fd.honeycomb.translate.impl.write.GenericWriter; import io.fd.honeycomb.translate.write.WriterFactory; import io.fd.honeycomb.translate.write.registry.ModifiableWriterRegistryBuilder; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.classifier.acl.rev170503.acl.base.attributes.Ip4Acl; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.classifier.acl.rev170503.acl.base.attributes.Ip6Acl; diff --git a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/factory/write/VppClassifierHoneycombWriterFactory.java b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/factory/write/VppClassifierHoneycombWriterFactory.java index b73dd8353..724849885 100644 --- a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/factory/write/VppClassifierHoneycombWriterFactory.java +++ b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/factory/write/VppClassifierHoneycombWriterFactory.java @@ -25,7 +25,7 @@ import io.fd.hc2vpp.vpp.classifier.write.ClassifyTableWriter; import io.fd.honeycomb.translate.impl.write.GenericListWriter; import io.fd.honeycomb.translate.write.WriterFactory; import io.fd.honeycomb.translate.write.registry.ModifiableWriterRegistryBuilder; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.classifier.rev170327.VppClassifier; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.classifier.rev170327.classify.table.base.attributes.ClassifySession; diff --git a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/read/ClassifySessionReader.java b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/read/ClassifySessionReader.java index e7df04850..ffe6b263c 100644 --- a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/read/ClassifySessionReader.java +++ b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/read/ClassifySessionReader.java @@ -29,10 +29,10 @@ import io.fd.honeycomb.translate.MappingContext; import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.ListReaderCustomizer; -import io.fd.vpp.jvpp.core.dto.ClassifySessionDetails; -import io.fd.vpp.jvpp.core.dto.ClassifySessionDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.ClassifySessionDump; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.ClassifySessionDetails; +import io.fd.jvpp.core.dto.ClassifySessionDetailsReplyDump; +import io.fd.jvpp.core.dto.ClassifySessionDump; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.Arrays; import java.util.Collections; import java.util.List; diff --git a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/read/ClassifyTableReader.java b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/read/ClassifyTableReader.java index 55d1f9dbb..4139a7187 100644 --- a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/read/ClassifyTableReader.java +++ b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/read/ClassifyTableReader.java @@ -30,11 +30,11 @@ import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.Initialized; import io.fd.honeycomb.translate.spi.read.InitializingListReaderCustomizer; -import io.fd.vpp.jvpp.core.dto.ClassifyTableIds; -import io.fd.vpp.jvpp.core.dto.ClassifyTableIdsReply; -import io.fd.vpp.jvpp.core.dto.ClassifyTableInfo; -import io.fd.vpp.jvpp.core.dto.ClassifyTableInfoReply; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.ClassifyTableIds; +import io.fd.jvpp.core.dto.ClassifyTableIdsReply; +import io.fd.jvpp.core.dto.ClassifyTableInfo; +import io.fd.jvpp.core.dto.ClassifyTableInfoReply; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.Arrays; import java.util.Collections; import java.util.List; diff --git a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/read/acl/AclCustomizer.java b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/read/acl/AclCustomizer.java index 07bb3c5b1..3f7554cee 100644 --- a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/read/acl/AclCustomizer.java +++ b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/read/acl/AclCustomizer.java @@ -29,9 +29,9 @@ import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.Initialized; import io.fd.honeycomb.translate.spi.read.InitializingReaderCustomizer; import io.fd.honeycomb.translate.util.RWUtils; -import io.fd.vpp.jvpp.core.dto.ClassifyTableByInterface; -import io.fd.vpp.jvpp.core.dto.ClassifyTableByInterfaceReply; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.ClassifyTableByInterface; +import io.fd.jvpp.core.dto.ClassifyTableByInterfaceReply; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp._interface.acl.rev170315.VppInterfaceAclAugmentation; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.classifier.acl.rev170503.vpp.acl.attributes.Acl; diff --git a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/read/acl/SubInterfaceAclCustomizer.java b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/read/acl/SubInterfaceAclCustomizer.java index 6a4fb85c6..96d555a92 100644 --- a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/read/acl/SubInterfaceAclCustomizer.java +++ b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/read/acl/SubInterfaceAclCustomizer.java @@ -30,9 +30,9 @@ import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.Initialized; import io.fd.honeycomb.translate.spi.read.InitializingReaderCustomizer; import io.fd.honeycomb.translate.util.RWUtils; -import io.fd.vpp.jvpp.core.dto.ClassifyTableByInterface; -import io.fd.vpp.jvpp.core.dto.ClassifyTableByInterfaceReply; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.ClassifyTableByInterface; +import io.fd.jvpp.core.dto.ClassifyTableByInterfaceReply; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.classifier.acl.rev170503.vpp.acl.attributes.Acl; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.classifier.acl.rev170503.vpp.acl.attributes.AclBuilder; diff --git a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/ClassifySessionWriter.java b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/ClassifySessionWriter.java index 808fc91ec..bc5951cbb 100644 --- a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/ClassifySessionWriter.java +++ b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/ClassifySessionWriter.java @@ -28,10 +28,10 @@ import io.fd.honeycomb.translate.MappingContext; import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.VppBaseCallException; -import io.fd.vpp.jvpp.core.dto.ClassifyAddDelSession; -import io.fd.vpp.jvpp.core.dto.ClassifyAddDelSessionReply; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.VppBaseCallException; +import io.fd.jvpp.core.dto.ClassifyAddDelSession; +import io.fd.jvpp.core.dto.ClassifyAddDelSessionReply; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.concurrent.CompletionStage; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/ClassifyTableWriter.java b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/ClassifyTableWriter.java index 21f9f4f58..1b072bf91 100644 --- a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/ClassifyTableWriter.java +++ b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/ClassifyTableWriter.java @@ -27,10 +27,10 @@ import io.fd.honeycomb.translate.MappingContext; import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.VppBaseCallException; -import io.fd.vpp.jvpp.core.dto.ClassifyAddDelTable; -import io.fd.vpp.jvpp.core.dto.ClassifyAddDelTableReply; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.VppBaseCallException; +import io.fd.jvpp.core.dto.ClassifyAddDelTable; +import io.fd.jvpp.core.dto.ClassifyAddDelTableReply; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.concurrent.CompletionStage; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.classifier.rev170327.vpp.classifier.ClassifyTable; diff --git a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/VppNodeWriter.java b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/VppNodeWriter.java index 928ccf36a..b276bd50a 100644 --- a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/VppNodeWriter.java +++ b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/VppNodeWriter.java @@ -24,10 +24,10 @@ import io.fd.hc2vpp.vpp.classifier.context.VppClassifierContextManager; import io.fd.honeycomb.translate.MappingContext; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.VppBaseCallException; -import io.fd.vpp.jvpp.core.dto.GetNextIndex; -import io.fd.vpp.jvpp.core.dto.GetNextIndexReply; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.VppBaseCallException; +import io.fd.jvpp.core.dto.GetNextIndex; +import io.fd.jvpp.core.dto.GetNextIndexReply; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.concurrent.CompletionStage; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.classifier.rev170327.VppNode; diff --git a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/acl/ingress/AclCustomizer.java b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/acl/ingress/AclCustomizer.java index bb1a785ba..fe66c9944 100644 --- a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/acl/ingress/AclCustomizer.java +++ b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/acl/ingress/AclCustomizer.java @@ -24,7 +24,7 @@ import io.fd.hc2vpp.vpp.classifier.context.VppClassifierContextManager; import io.fd.honeycomb.translate.spi.write.WriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.classifier.acl.rev170503.vpp.acl.attributes.acl.Ingress; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface; diff --git a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/acl/ingress/AclWriter.java b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/acl/ingress/AclWriter.java index c3b250fd7..2bc423390 100644 --- a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/acl/ingress/AclWriter.java +++ b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/acl/ingress/AclWriter.java @@ -23,9 +23,9 @@ import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; import io.fd.hc2vpp.vpp.classifier.context.VppClassifierContextManager; import io.fd.honeycomb.translate.MappingContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.InputAclSetInterface; -import io.fd.vpp.jvpp.core.dto.InputAclSetInterfaceReply; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.InputAclSetInterface; +import io.fd.jvpp.core.dto.InputAclSetInterfaceReply; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.concurrent.CompletionStage; import javax.annotation.Nonnegative; import javax.annotation.Nonnull; diff --git a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/acl/ingress/SubInterfaceAclCustomizer.java b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/acl/ingress/SubInterfaceAclCustomizer.java index 446b35530..b669d93a5 100644 --- a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/acl/ingress/SubInterfaceAclCustomizer.java +++ b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/acl/ingress/SubInterfaceAclCustomizer.java @@ -25,7 +25,7 @@ import io.fd.hc2vpp.vpp.classifier.context.VppClassifierContextManager; import io.fd.honeycomb.translate.spi.write.WriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.classifier.acl.rev170503.vpp.acl.attributes.acl.Ingress; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.vlan.rev180319.interfaces._interface.sub.interfaces.SubInterface; diff --git a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/VppClassifierModuleTest.java b/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/VppClassifierModuleTest.java index 08d4869eb..d6e990ec4 100644 --- a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/VppClassifierModuleTest.java +++ b/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/VppClassifierModuleTest.java @@ -32,7 +32,7 @@ import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.impl.write.registry.FlatWriterRegistryBuilder; import io.fd.honeycomb.translate.util.YangDAG; import io.fd.honeycomb.translate.write.WriterFactory; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.HashSet; import java.util.Set; import org.junit.Before; diff --git a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/read/ClassifySessionReaderTest.java b/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/read/ClassifySessionReaderTest.java index b9f72e483..81f46a1d8 100644 --- a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/read/ClassifySessionReaderTest.java +++ b/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/read/ClassifySessionReaderTest.java @@ -26,9 +26,9 @@ import io.fd.hc2vpp.vpp.classifier.context.VppClassifierContextManager; import io.fd.honeycomb.translate.ModificationCache; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.vpp.jvpp.core.dto.ClassifySessionDetails; -import io.fd.vpp.jvpp.core.dto.ClassifySessionDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.ClassifySessionDump; +import io.fd.jvpp.core.dto.ClassifySessionDetails; +import io.fd.jvpp.core.dto.ClassifySessionDetailsReplyDump; +import io.fd.jvpp.core.dto.ClassifySessionDump; import java.util.Arrays; import java.util.Collections; import java.util.List; diff --git a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/read/ClassifyTableReaderTest.java b/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/read/ClassifyTableReaderTest.java index 1d114149e..b2accdcba 100644 --- a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/read/ClassifyTableReaderTest.java +++ b/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/read/ClassifyTableReaderTest.java @@ -28,10 +28,10 @@ import io.fd.hc2vpp.common.test.read.ListReaderCustomizerTest; import io.fd.hc2vpp.vpp.classifier.context.VppClassifierContextManager; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.vpp.jvpp.core.dto.ClassifyTableIds; -import io.fd.vpp.jvpp.core.dto.ClassifyTableIdsReply; -import io.fd.vpp.jvpp.core.dto.ClassifyTableInfo; -import io.fd.vpp.jvpp.core.dto.ClassifyTableInfoReply; +import io.fd.jvpp.core.dto.ClassifyTableIds; +import io.fd.jvpp.core.dto.ClassifyTableIdsReply; +import io.fd.jvpp.core.dto.ClassifyTableInfo; +import io.fd.jvpp.core.dto.ClassifyTableInfoReply; import java.util.List; import org.junit.Test; import org.mockito.ArgumentMatchers; diff --git a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/read/acl/AclCustomizerTest.java b/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/read/acl/AclCustomizerTest.java index ee46da168..6f7f09d6c 100644 --- a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/read/acl/AclCustomizerTest.java +++ b/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/read/acl/AclCustomizerTest.java @@ -26,7 +26,7 @@ import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.hc2vpp.vpp.classifier.context.VppClassifierContextManager; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.vpp.jvpp.core.dto.ClassifyTableByInterfaceReply; +import io.fd.jvpp.core.dto.ClassifyTableByInterfaceReply; import org.junit.Test; import org.mockito.Mock; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp._interface.acl.rev170315.VppInterfaceAclStateAugmentation; diff --git a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/read/acl/SubInterfaceAclCustomizerTest.java b/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/read/acl/SubInterfaceAclCustomizerTest.java index 3a2aec9e9..19613d6f7 100644 --- a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/read/acl/SubInterfaceAclCustomizerTest.java +++ b/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/read/acl/SubInterfaceAclCustomizerTest.java @@ -26,7 +26,7 @@ import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.hc2vpp.vpp.classifier.context.VppClassifierContextManager; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.vpp.jvpp.core.dto.ClassifyTableByInterfaceReply; +import io.fd.jvpp.core.dto.ClassifyTableByInterfaceReply; import org.junit.Test; import org.mockito.Mock; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.classifier.acl.rev170503.acl.base.attributes.Ip4AclBuilder; diff --git a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/ClassifySessionWriterTest.java b/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/ClassifySessionWriterTest.java index 39411075e..631ce2edb 100644 --- a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/ClassifySessionWriterTest.java +++ b/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/ClassifySessionWriterTest.java @@ -28,9 +28,9 @@ import io.fd.hc2vpp.common.test.write.WriterCustomizerTest; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.hc2vpp.vpp.classifier.context.VppClassifierContextManager; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.VppBaseCallException; -import io.fd.vpp.jvpp.core.dto.ClassifyAddDelSession; -import io.fd.vpp.jvpp.core.dto.ClassifyAddDelSessionReply; +import io.fd.jvpp.VppBaseCallException; +import io.fd.jvpp.core.dto.ClassifyAddDelSession; +import io.fd.jvpp.core.dto.ClassifyAddDelSessionReply; import org.junit.Test; import org.mockito.ArgumentMatchers; import org.mockito.Mock; diff --git a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/ClassifyTableWriterTest.java b/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/ClassifyTableWriterTest.java index 17be1ff86..536a4ae6e 100644 --- a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/ClassifyTableWriterTest.java +++ b/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/ClassifyTableWriterTest.java @@ -27,9 +27,9 @@ import static org.mockito.Mockito.when; import io.fd.hc2vpp.common.test.write.WriterCustomizerTest; import io.fd.hc2vpp.vpp.classifier.context.VppClassifierContextManager; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.VppBaseCallException; -import io.fd.vpp.jvpp.core.dto.ClassifyAddDelTable; -import io.fd.vpp.jvpp.core.dto.ClassifyAddDelTableReply; +import io.fd.jvpp.VppBaseCallException; +import io.fd.jvpp.core.dto.ClassifyAddDelTable; +import io.fd.jvpp.core.dto.ClassifyAddDelTableReply; import org.junit.Test; import org.mockito.ArgumentMatchers; import org.mockito.Mock; diff --git a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/AclCustomizerTest.java b/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/AclCustomizerTest.java index 90d6e1ff2..2ab556780 100644 --- a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/AclCustomizerTest.java +++ b/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/AclCustomizerTest.java @@ -27,9 +27,9 @@ import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.hc2vpp.vpp.classifier.context.VppClassifierContextManager; import io.fd.hc2vpp.vpp.classifier.write.acl.ingress.AclCustomizer; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.VppBaseCallException; -import io.fd.vpp.jvpp.core.dto.InputAclSetInterface; -import io.fd.vpp.jvpp.core.dto.InputAclSetInterfaceReply; +import io.fd.jvpp.VppBaseCallException; +import io.fd.jvpp.core.dto.InputAclSetInterface; +import io.fd.jvpp.core.dto.InputAclSetInterfaceReply; import org.junit.Test; import org.mockito.Mock; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp._interface.acl.rev170315.VppInterfaceAclAugmentation; diff --git a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/ingress/SubInterfaceAclCustomizerTest.java b/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/ingress/SubInterfaceAclCustomizerTest.java index 626c596ed..2675c9f22 100644 --- a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/ingress/SubInterfaceAclCustomizerTest.java +++ b/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/ingress/SubInterfaceAclCustomizerTest.java @@ -24,8 +24,8 @@ import io.fd.hc2vpp.common.test.write.WriterCustomizerTest; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.hc2vpp.vpp.classifier.context.VppClassifierContextManager; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.InputAclSetInterface; -import io.fd.vpp.jvpp.core.dto.InputAclSetInterfaceReply; +import io.fd.jvpp.core.dto.InputAclSetInterface; +import io.fd.jvpp.core.dto.InputAclSetInterfaceReply; import org.junit.Test; import org.mockito.Mock; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.classifier.acl.rev170503.acl.base.attributes.Ip4Acl; diff --git a/vpp-common/vpp-common-integration/src/main/java/io/fd/hc2vpp/common/integration/JVppCoreProvider.java b/vpp-common/vpp-common-integration/src/main/java/io/fd/hc2vpp/common/integration/JVppCoreProvider.java index 609611252..6bb4f5282 100644 --- a/vpp-common/vpp-common-integration/src/main/java/io/fd/hc2vpp/common/integration/JVppCoreProvider.java +++ b/vpp-common/vpp-common-integration/src/main/java/io/fd/hc2vpp/common/integration/JVppCoreProvider.java @@ -19,10 +19,10 @@ package io.fd.hc2vpp.common.integration; import com.google.inject.Inject; import io.fd.honeycomb.binding.init.ProviderTrait; import io.fd.honeycomb.data.init.ShutdownHandler; -import io.fd.vpp.jvpp.JVppRegistry; -import io.fd.vpp.jvpp.core.JVppCoreImpl; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; -import io.fd.vpp.jvpp.core.future.FutureJVppCoreFacade; +import io.fd.jvpp.JVppRegistry; +import io.fd.jvpp.core.JVppCoreImpl; +import io.fd.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCoreFacade; import java.io.IOException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/vpp-common/vpp-common-integration/src/main/java/io/fd/hc2vpp/common/integration/JVppRegistryProvider.java b/vpp-common/vpp-common-integration/src/main/java/io/fd/hc2vpp/common/integration/JVppRegistryProvider.java index 1432f2c53..510d60509 100644 --- a/vpp-common/vpp-common-integration/src/main/java/io/fd/hc2vpp/common/integration/JVppRegistryProvider.java +++ b/vpp-common/vpp-common-integration/src/main/java/io/fd/hc2vpp/common/integration/JVppRegistryProvider.java @@ -25,9 +25,9 @@ import com.google.common.primitives.UnsignedInts; import com.google.inject.Inject; import io.fd.honeycomb.binding.init.ProviderTrait; import io.fd.honeycomb.data.init.ShutdownHandler; -import io.fd.vpp.jvpp.JVppRegistry; -import io.fd.vpp.jvpp.JVppRegistryImpl; -import io.fd.vpp.jvpp.VppJNIConnection; +import io.fd.jvpp.JVppRegistry; +import io.fd.jvpp.JVppRegistryImpl; +import io.fd.jvpp.VppJNIConnection; import java.io.BufferedInputStream; import java.io.IOException; import java.io.InputStreamReader; diff --git a/vpp-common/vpp-common-integration/src/main/java/io/fd/hc2vpp/common/integration/VppCommonModule.java b/vpp-common/vpp-common-integration/src/main/java/io/fd/hc2vpp/common/integration/VppCommonModule.java index e66a72327..c76d10cae 100644 --- a/vpp-common/vpp-common-integration/src/main/java/io/fd/hc2vpp/common/integration/VppCommonModule.java +++ b/vpp-common/vpp-common-integration/src/main/java/io/fd/hc2vpp/common/integration/VppCommonModule.java @@ -21,8 +21,8 @@ import com.google.inject.Singleton; import com.google.inject.multibindings.Multibinder; import io.fd.hc2vpp.common.translate.util.VppStatusListener; import io.fd.honeycomb.translate.read.ReaderFactory; -import io.fd.vpp.jvpp.JVppRegistry; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.JVppRegistry; +import io.fd.jvpp.core.future.FutureJVppCore; import net.jmob.guice.conf.core.ConfigurationModule; public final class VppCommonModule extends AbstractModule { diff --git a/vpp-common/vpp-translate-test/src/main/java/io/fd/hc2vpp/common/test/read/JvppDumpExecutorTest.java b/vpp-common/vpp-translate-test/src/main/java/io/fd/hc2vpp/common/test/read/JvppDumpExecutorTest.java index 1259e89c8..45c28aace 100644 --- a/vpp-common/vpp-translate-test/src/main/java/io/fd/hc2vpp/common/test/read/JvppDumpExecutorTest.java +++ b/vpp-common/vpp-translate-test/src/main/java/io/fd/hc2vpp/common/test/read/JvppDumpExecutorTest.java @@ -22,10 +22,10 @@ import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor; import io.fd.hc2vpp.common.test.util.FutureProducer; -import io.fd.vpp.jvpp.VppInvocationException; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor; +import io.fd.jvpp.VppInvocationException; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; diff --git a/vpp-common/vpp-translate-test/src/main/java/io/fd/hc2vpp/common/test/read/ReaderCustomizerTest.java b/vpp-common/vpp-translate-test/src/main/java/io/fd/hc2vpp/common/test/read/ReaderCustomizerTest.java index d403dce55..7e3658847 100644 --- a/vpp-common/vpp-translate-test/src/main/java/io/fd/hc2vpp/common/test/read/ReaderCustomizerTest.java +++ b/vpp-common/vpp-translate-test/src/main/java/io/fd/hc2vpp/common/test/read/ReaderCustomizerTest.java @@ -20,14 +20,13 @@ import static org.junit.Assert.assertNotNull; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; +import io.fd.hc2vpp.common.test.util.FutureProducer; +import io.fd.hc2vpp.common.test.util.NamingContextHelper; import io.fd.honeycomb.translate.MappingContext; import io.fd.honeycomb.translate.ModificationCache; import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.honeycomb.translate.read.ReadContext; -import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.hc2vpp.common.test.util.FutureProducer; -import io.fd.hc2vpp.common.test.util.NamingContextHelper; +import io.fd.jvpp.core.future.FutureJVppCore; import java.lang.reflect.Method; import org.junit.Before; import org.junit.Test; @@ -37,7 +36,6 @@ import org.mockito.MockitoAnnotations; import org.opendaylight.yangtools.concepts.Builder; import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; /** * Generic test for classes implementing {@link ReaderCustomizer} interface. diff --git a/vpp-common/vpp-translate-test/src/main/java/io/fd/hc2vpp/common/test/util/FutureProducer.java b/vpp-common/vpp-translate-test/src/main/java/io/fd/hc2vpp/common/test/util/FutureProducer.java index bdce21f77..b2771239d 100644 --- a/vpp-common/vpp-translate-test/src/main/java/io/fd/hc2vpp/common/test/util/FutureProducer.java +++ b/vpp-common/vpp-translate-test/src/main/java/io/fd/hc2vpp/common/test/util/FutureProducer.java @@ -16,10 +16,10 @@ package io.fd.hc2vpp.common.test.util; +import io.fd.jvpp.VppCallbackException; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.concurrent.CompletableFuture; import javax.annotation.Nonnull; -import io.fd.vpp.jvpp.VppCallbackException; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; /** *

VPP translation test helper, that produces instances of {@link CompletableFuture} with desired results.

diff --git a/vpp-common/vpp-translate-test/src/main/java/io/fd/hc2vpp/common/test/util/InterfaceDumpHelper.java b/vpp-common/vpp-translate-test/src/main/java/io/fd/hc2vpp/common/test/util/InterfaceDumpHelper.java index 81d29c8f4..7977acbc7 100644 --- a/vpp-common/vpp-translate-test/src/main/java/io/fd/hc2vpp/common/test/util/InterfaceDumpHelper.java +++ b/vpp-common/vpp-translate-test/src/main/java/io/fd/hc2vpp/common/test/util/InterfaceDumpHelper.java @@ -19,11 +19,11 @@ package io.fd.hc2vpp.common.test.util; import static org.mockito.Matchers.any; import static org.mockito.Mockito.when; +import io.fd.jvpp.core.dto.SwInterfaceDetails; +import io.fd.jvpp.core.dto.SwInterfaceDetailsReplyDump; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.Collections; import javax.annotation.Nonnull; -import io.fd.vpp.jvpp.core.dto.SwInterfaceDetails; -import io.fd.vpp.jvpp.core.dto.SwInterfaceDetailsReplyDump; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; /** * VPP translation test helper, that helps stubbing {@link FutureJVppCore#swInterfaceDump}. diff --git a/vpp-common/vpp-translate-test/src/main/java/io/fd/hc2vpp/common/test/write/WriterCustomizerTest.java b/vpp-common/vpp-translate-test/src/main/java/io/fd/hc2vpp/common/test/write/WriterCustomizerTest.java index e3467e643..6a8fc2410 100644 --- a/vpp-common/vpp-translate-test/src/main/java/io/fd/hc2vpp/common/test/write/WriterCustomizerTest.java +++ b/vpp-common/vpp-translate-test/src/main/java/io/fd/hc2vpp/common/test/write/WriterCustomizerTest.java @@ -22,7 +22,7 @@ import io.fd.honeycomb.translate.MappingContext; import io.fd.honeycomb.translate.ModificationCache; import io.fd.honeycomb.translate.spi.write.WriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import org.junit.Before; import org.mockito.Mock; import org.mockito.Mockito; diff --git a/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/AbstractInterfaceTypeCustomizer.java b/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/AbstractInterfaceTypeCustomizer.java index 2a9af4604..9227ddd32 100644 --- a/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/AbstractInterfaceTypeCustomizer.java +++ b/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/AbstractInterfaceTypeCustomizer.java @@ -23,7 +23,7 @@ import com.google.common.base.Optional; import io.fd.honeycomb.translate.spi.write.WriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.InterfaceType; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface; diff --git a/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/FutureJVppCustomizer.java b/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/FutureJVppCustomizer.java index 6d527c702..f9ab8a897 100644 --- a/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/FutureJVppCustomizer.java +++ b/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/FutureJVppCustomizer.java @@ -18,8 +18,8 @@ package io.fd.hc2vpp.common.translate.util; import com.google.common.annotations.Beta; import com.google.common.base.Preconditions; +import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; /** * Abstract utility to hold the vppApi reference. diff --git a/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/Ipv4Translator.java b/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/Ipv4Translator.java index 5f8a283ed..88085db78 100644 --- a/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/Ipv4Translator.java +++ b/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/Ipv4Translator.java @@ -18,10 +18,10 @@ package io.fd.hc2vpp.common.translate.util; import static com.google.common.base.Preconditions.checkNotNull; -import io.fd.vpp.jvpp.core.types.Address; -import io.fd.vpp.jvpp.core.types.AddressFamily; -import io.fd.vpp.jvpp.core.types.AddressUnion; -import io.fd.vpp.jvpp.core.types.Ip4Address; +import io.fd.jvpp.core.types.Address; +import io.fd.jvpp.core.types.AddressFamily; +import io.fd.jvpp.core.types.AddressUnion; +import io.fd.jvpp.core.types.Ip4Address; import java.util.Arrays; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IetfInetUtil; diff --git a/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/Ipv6Translator.java b/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/Ipv6Translator.java index d5c0ae2e3..153143910 100644 --- a/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/Ipv6Translator.java +++ b/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/Ipv6Translator.java @@ -21,11 +21,11 @@ import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; import com.google.common.net.InetAddresses; -import io.fd.vpp.jvpp.core.types.Address; -import io.fd.vpp.jvpp.core.types.AddressFamily; -import io.fd.vpp.jvpp.core.types.AddressUnion; -import io.fd.vpp.jvpp.core.types.Ip6Address; -import io.fd.vpp.jvpp.core.types.Prefix; +import io.fd.jvpp.core.types.Address; +import io.fd.jvpp.core.types.AddressFamily; +import io.fd.jvpp.core.types.AddressUnion; +import io.fd.jvpp.core.types.Ip6Address; +import io.fd.jvpp.core.types.Prefix; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IetfInetUtil; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress; diff --git a/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/JvppReplyConsumer.java b/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/JvppReplyConsumer.java index 1674dc9ee..392fa2973 100644 --- a/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/JvppReplyConsumer.java +++ b/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/JvppReplyConsumer.java @@ -20,8 +20,8 @@ import static com.google.common.base.Preconditions.checkArgument; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.VppBaseCallException; -import io.fd.vpp.jvpp.dto.JVppReply; +import io.fd.jvpp.VppBaseCallException; +import io.fd.jvpp.dto.JVppReply; import java.util.Optional; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; diff --git a/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/MacTranslator.java b/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/MacTranslator.java index 657029eb3..d12c1d539 100644 --- a/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/MacTranslator.java +++ b/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/MacTranslator.java @@ -20,7 +20,7 @@ import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; import com.google.common.base.Splitter; -import io.fd.vpp.jvpp.core.types.MacAddress; +import io.fd.jvpp.core.types.MacAddress; import java.util.Arrays; import java.util.List; import java.util.function.BiConsumer; diff --git a/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/MplsLabelTranslator.java b/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/MplsLabelTranslator.java index 00653738d..274e188a2 100644 --- a/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/MplsLabelTranslator.java +++ b/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/MplsLabelTranslator.java @@ -18,7 +18,7 @@ package io.fd.hc2vpp.common.translate.util; import static com.google.common.base.Preconditions.checkNotNull; -import io.fd.vpp.jvpp.core.types.FibMplsLabel; +import io.fd.jvpp.core.types.FibMplsLabel; import javax.annotation.Nonnull; /** diff --git a/vpp-common/vpp-translate-utils/src/test/java/io/fd/hc2vpp/common/translate/util/JvppReplyConsumerTest.java b/vpp-common/vpp-translate-utils/src/test/java/io/fd/hc2vpp/common/translate/util/JvppReplyConsumerTest.java index daf68d2b6..4cc6edb57 100644 --- a/vpp-common/vpp-translate-utils/src/test/java/io/fd/hc2vpp/common/translate/util/JvppReplyConsumerTest.java +++ b/vpp-common/vpp-translate-utils/src/test/java/io/fd/hc2vpp/common/translate/util/JvppReplyConsumerTest.java @@ -24,9 +24,7 @@ import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; -import io.fd.hc2vpp.common.translate.util.ReadTimeoutException; -import io.fd.hc2vpp.common.translate.util.WriteTimeoutException; +import io.fd.jvpp.dto.JVppReply; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; @@ -34,7 +32,6 @@ import org.junit.Test; import org.opendaylight.yangtools.yang.binding.DataContainer; import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import io.fd.vpp.jvpp.dto.JVppReply; public class JvppReplyConsumerTest implements JvppReplyConsumer { diff --git a/vpp-common/vpp-translate-utils/src/test/java/io/fd/hc2vpp/common/translate/util/MplsLabelTranslatorTest.java b/vpp-common/vpp-translate-utils/src/test/java/io/fd/hc2vpp/common/translate/util/MplsLabelTranslatorTest.java index b0e7dd658..9c3b1ebd1 100644 --- a/vpp-common/vpp-translate-utils/src/test/java/io/fd/hc2vpp/common/translate/util/MplsLabelTranslatorTest.java +++ b/vpp-common/vpp-translate-utils/src/test/java/io/fd/hc2vpp/common/translate/util/MplsLabelTranslatorTest.java @@ -18,7 +18,7 @@ package io.fd.hc2vpp.common.translate.util; import static org.junit.Assert.assertEquals; -import io.fd.vpp.jvpp.core.types.FibMplsLabel; +import io.fd.jvpp.core.types.FibMplsLabel; import org.junit.Test; public class MplsLabelTranslatorTest implements MplsLabelTranslator { diff --git a/vpp-integration/api-docs/scripts/src/main/groovy/io/fd/hc2vpp/docs/scripts/ApiDocsIndexGenerator.groovy b/vpp-integration/api-docs/scripts/src/main/groovy/io/fd/hc2vpp/docs/scripts/ApiDocsIndexGenerator.groovy index 65ee2ed1e..2c6b24f42 100644 --- a/vpp-integration/api-docs/scripts/src/main/groovy/io/fd/hc2vpp/docs/scripts/ApiDocsIndexGenerator.groovy +++ b/vpp-integration/api-docs/scripts/src/main/groovy/io/fd/hc2vpp/docs/scripts/ApiDocsIndexGenerator.groovy @@ -21,13 +21,13 @@ import io.fd.hc2vpp.docs.api.* import io.fd.hc2vpp.docs.core.ClassPathTypeIndex import io.fd.hc2vpp.docs.core.CoverageGenerator import io.fd.hc2vpp.docs.core.YangTypeLinkIndex -import io.fd.vpp.jvpp.acl.future.FutureJVppAcl -import io.fd.vpp.jvpp.core.future.FutureJVppCore -import io.fd.vpp.jvpp.ioamexport.future.FutureJVppIoamexport -import io.fd.vpp.jvpp.ioampot.future.FutureJVppIoampot -import io.fd.vpp.jvpp.ioamtrace.future.FutureJVppIoamtrace -import io.fd.vpp.jvpp.nsh.future.FutureJVppNsh -import io.fd.vpp.jvpp.nat.future.FutureJVppNat +import io.fd.jvpp.acl.future.FutureJVppAcl +import io.fd.jvpp.core.future.FutureJVppCore +import io.fd.jvpp.ioamexport.future.FutureJVppIoamexport +import io.fd.jvpp.ioampot.future.FutureJVppIoampot +import io.fd.jvpp.ioamtrace.future.FutureJVppIoamtrace +import io.fd.jvpp.nat.future.FutureJVppNat +import io.fd.jvpp.nsh.future.FutureJVppNsh import java.nio.charset.StandardCharsets import java.nio.file.Files diff --git a/vpp-integration/api-docs/scripts/src/main/java/io/fd/hc2vpp/docs/core/mock/binding/MockAclModule.java b/vpp-integration/api-docs/scripts/src/main/java/io/fd/hc2vpp/docs/core/mock/binding/MockAclModule.java index 436061850..c1cd88a6e 100644 --- a/vpp-integration/api-docs/scripts/src/main/java/io/fd/hc2vpp/docs/core/mock/binding/MockAclModule.java +++ b/vpp-integration/api-docs/scripts/src/main/java/io/fd/hc2vpp/docs/core/mock/binding/MockAclModule.java @@ -20,9 +20,9 @@ import static io.fd.hc2vpp.docs.core.mock.binding.MockBindingModule.noOpProxy; import com.google.inject.Provider; import io.fd.hc2vpp.acl.AclModule; -import io.fd.vpp.jvpp.JVpp; -import io.fd.vpp.jvpp.JVppRegistry; -import io.fd.vpp.jvpp.acl.future.FutureJVppAclFacade; +import io.fd.jvpp.JVpp; +import io.fd.jvpp.JVppRegistry; +import io.fd.jvpp.acl.future.FutureJVppAclFacade; import java.io.IOException; /** diff --git a/vpp-integration/api-docs/scripts/src/main/java/io/fd/hc2vpp/docs/core/mock/binding/MockBindingModule.java b/vpp-integration/api-docs/scripts/src/main/java/io/fd/hc2vpp/docs/core/mock/binding/MockBindingModule.java index 9e49879b7..5ffea516d 100644 --- a/vpp-integration/api-docs/scripts/src/main/java/io/fd/hc2vpp/docs/core/mock/binding/MockBindingModule.java +++ b/vpp-integration/api-docs/scripts/src/main/java/io/fd/hc2vpp/docs/core/mock/binding/MockBindingModule.java @@ -21,8 +21,8 @@ import static com.google.inject.name.Names.named; import com.google.inject.AbstractModule; import io.fd.honeycomb.data.init.ShutdownHandler; import io.fd.honeycomb.translate.MappingContext; -import io.fd.vpp.jvpp.JVppRegistry; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.JVppRegistry; +import io.fd.jvpp.core.future.FutureJVppCore; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Proxy; import org.opendaylight.controller.md.sal.binding.api.DataBroker; diff --git a/vpp-integration/api-docs/scripts/src/main/java/io/fd/hc2vpp/docs/core/mock/binding/MockIoamModule.java b/vpp-integration/api-docs/scripts/src/main/java/io/fd/hc2vpp/docs/core/mock/binding/MockIoamModule.java index f3f06195d..5b30f2348 100644 --- a/vpp-integration/api-docs/scripts/src/main/java/io/fd/hc2vpp/docs/core/mock/binding/MockIoamModule.java +++ b/vpp-integration/api-docs/scripts/src/main/java/io/fd/hc2vpp/docs/core/mock/binding/MockIoamModule.java @@ -20,11 +20,11 @@ import static io.fd.hc2vpp.docs.core.mock.binding.MockBindingModule.noOpProxy; import com.google.inject.Provider; import io.fd.hc2vpp.vppioam.impl.VppIoamModule; -import io.fd.vpp.jvpp.JVpp; -import io.fd.vpp.jvpp.JVppRegistry; -import io.fd.vpp.jvpp.ioamexport.future.FutureJVppIoamexportFacade; -import io.fd.vpp.jvpp.ioampot.future.FutureJVppIoampotFacade; -import io.fd.vpp.jvpp.ioamtrace.future.FutureJVppIoamtraceFacade; +import io.fd.jvpp.JVpp; +import io.fd.jvpp.JVppRegistry; +import io.fd.jvpp.ioamexport.future.FutureJVppIoamexportFacade; +import io.fd.jvpp.ioampot.future.FutureJVppIoampotFacade; +import io.fd.jvpp.ioamtrace.future.FutureJVppIoamtraceFacade; import java.io.IOException; /** diff --git a/vpp-integration/api-docs/scripts/src/main/java/io/fd/hc2vpp/docs/core/mock/binding/MockNatModule.java b/vpp-integration/api-docs/scripts/src/main/java/io/fd/hc2vpp/docs/core/mock/binding/MockNatModule.java index 4f0a0fc87..0bd8944da 100644 --- a/vpp-integration/api-docs/scripts/src/main/java/io/fd/hc2vpp/docs/core/mock/binding/MockNatModule.java +++ b/vpp-integration/api-docs/scripts/src/main/java/io/fd/hc2vpp/docs/core/mock/binding/MockNatModule.java @@ -20,9 +20,9 @@ import static io.fd.hc2vpp.docs.core.mock.binding.MockBindingModule.noOpProxy; import com.google.inject.Provider; import io.fd.hc2vpp.nat.NatModule; -import io.fd.vpp.jvpp.JVpp; -import io.fd.vpp.jvpp.JVppRegistry; -import io.fd.vpp.jvpp.nat.future.FutureJVppNatFacade; +import io.fd.jvpp.JVpp; +import io.fd.jvpp.JVppRegistry; +import io.fd.jvpp.nat.future.FutureJVppNatFacade; import java.io.IOException; /** diff --git a/vpp-integration/api-docs/scripts/src/main/java/io/fd/hc2vpp/docs/core/mock/binding/MockNshModule.java b/vpp-integration/api-docs/scripts/src/main/java/io/fd/hc2vpp/docs/core/mock/binding/MockNshModule.java index dace214e8..505b3aa54 100644 --- a/vpp-integration/api-docs/scripts/src/main/java/io/fd/hc2vpp/docs/core/mock/binding/MockNshModule.java +++ b/vpp-integration/api-docs/scripts/src/main/java/io/fd/hc2vpp/docs/core/mock/binding/MockNshModule.java @@ -20,9 +20,9 @@ import static io.fd.hc2vpp.docs.core.mock.binding.MockBindingModule.noOpProxy; import com.google.inject.Provider; import io.fd.hc2vpp.vppnsh.impl.VppNshModule; -import io.fd.vpp.jvpp.JVpp; -import io.fd.vpp.jvpp.JVppRegistry; -import io.fd.vpp.jvpp.nsh.future.FutureJVppNshFacade; +import io.fd.jvpp.JVpp; +import io.fd.jvpp.JVppRegistry; +import io.fd.jvpp.nsh.future.FutureJVppNshFacade; import java.io.IOException; /** diff --git a/vpp-management/impl/src/main/java/io/fd/hc2vpp/management/rpc/CliInbandService.java b/vpp-management/impl/src/main/java/io/fd/hc2vpp/management/rpc/CliInbandService.java index 0450771fc..ebb0ffc13 100644 --- a/vpp-management/impl/src/main/java/io/fd/hc2vpp/management/rpc/CliInbandService.java +++ b/vpp-management/impl/src/main/java/io/fd/hc2vpp/management/rpc/CliInbandService.java @@ -19,8 +19,8 @@ package io.fd.hc2vpp.management.rpc; import com.google.inject.Inject; import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; import io.fd.honeycomb.rpc.RpcService; -import io.fd.vpp.jvpp.core.dto.CliInband; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.CliInband; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.concurrent.CompletionStage; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.management.rev170315.CliInbandInput; diff --git a/vpp-management/impl/src/main/java/io/fd/hc2vpp/management/state/StateReaderFactory.java b/vpp-management/impl/src/main/java/io/fd/hc2vpp/management/state/StateReaderFactory.java index c8eb916e4..d15745723 100644 --- a/vpp-management/impl/src/main/java/io/fd/hc2vpp/management/state/StateReaderFactory.java +++ b/vpp-management/impl/src/main/java/io/fd/hc2vpp/management/state/StateReaderFactory.java @@ -24,7 +24,7 @@ import io.fd.honeycomb.translate.impl.read.GenericReader; import io.fd.honeycomb.translate.read.ReaderFactory; import io.fd.honeycomb.translate.read.registry.ModifiableReaderRegistryBuilder; import io.fd.honeycomb.translate.util.read.KeepaliveReaderWrapper; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.concurrent.ScheduledExecutorService; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.management.rev170315.VppState; diff --git a/vpp-management/impl/src/main/java/io/fd/hc2vpp/management/state/VersionCustomizer.java b/vpp-management/impl/src/main/java/io/fd/hc2vpp/management/state/VersionCustomizer.java index 5c0687865..1fbab489f 100644 --- a/vpp-management/impl/src/main/java/io/fd/hc2vpp/management/state/VersionCustomizer.java +++ b/vpp-management/impl/src/main/java/io/fd/hc2vpp/management/state/VersionCustomizer.java @@ -23,12 +23,12 @@ import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.vpp.jvpp.core.dto.ShowVersion; -import io.fd.vpp.jvpp.core.dto.ShowVersionReply; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; -import io.fd.vpp.jvpp.dto.ControlPing; -import io.fd.vpp.jvpp.dto.ControlPingReply; -import io.fd.vpp.jvpp.dto.JVppReply; +import io.fd.jvpp.core.dto.ShowVersion; +import io.fd.jvpp.core.dto.ShowVersionReply; +import io.fd.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.dto.ControlPing; +import io.fd.jvpp.dto.ControlPingReply; +import io.fd.jvpp.dto.JVppReply; import java.util.concurrent.CompletionStage; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.management.rev170315.VppStateBuilder; diff --git a/vpp-management/impl/src/test/java/io/fd/hc2vpp/management/VppManagementModuleTest.java b/vpp-management/impl/src/test/java/io/fd/hc2vpp/management/VppManagementModuleTest.java index 8e06e0bc3..938596ba3 100644 --- a/vpp-management/impl/src/test/java/io/fd/hc2vpp/management/VppManagementModuleTest.java +++ b/vpp-management/impl/src/test/java/io/fd/hc2vpp/management/VppManagementModuleTest.java @@ -28,7 +28,7 @@ import com.google.inject.testing.fieldbinder.BoundFieldModule; import io.fd.honeycomb.translate.impl.read.registry.CompositeReaderRegistryBuilder; import io.fd.honeycomb.translate.read.ReaderFactory; import io.fd.honeycomb.translate.util.YangDAG; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.future.FutureJVppCore; import java.util.HashSet; import java.util.Set; import org.junit.Before; diff --git a/vpp-management/impl/src/test/java/io/fd/hc2vpp/management/rpc/CliInbandServiceTest.java b/vpp-management/impl/src/test/java/io/fd/hc2vpp/management/rpc/CliInbandServiceTest.java index 91f353bbc..0caae42f2 100644 --- a/vpp-management/impl/src/test/java/io/fd/hc2vpp/management/rpc/CliInbandServiceTest.java +++ b/vpp-management/impl/src/test/java/io/fd/hc2vpp/management/rpc/CliInbandServiceTest.java @@ -22,8 +22,8 @@ import static org.mockito.Mockito.when; import static org.mockito.MockitoAnnotations.initMocks; import io.fd.hc2vpp.common.test.util.FutureProducer; -import io.fd.vpp.jvpp.core.dto.CliInbandReply; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.dto.CliInbandReply; +import io.fd.jvpp.core.future.FutureJVppCore; import org.junit.Test; import org.mockito.Mock; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.management.rev170315.CliInbandInput; diff --git a/vpp-management/impl/src/test/java/io/fd/hc2vpp/management/state/VppStateTest.java b/vpp-management/impl/src/test/java/io/fd/hc2vpp/management/state/VppStateTest.java index 0caae2c2e..087efee1b 100644 --- a/vpp-management/impl/src/test/java/io/fd/hc2vpp/management/state/VppStateTest.java +++ b/vpp-management/impl/src/test/java/io/fd/hc2vpp/management/state/VppStateTest.java @@ -33,11 +33,11 @@ import io.fd.honeycomb.translate.impl.read.registry.CompositeReaderRegistryBuild import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.registry.ReaderRegistry; import io.fd.honeycomb.translate.util.YangDAG; -import io.fd.vpp.jvpp.core.dto.ShowVersion; -import io.fd.vpp.jvpp.core.dto.ShowVersionReply; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; -import io.fd.vpp.jvpp.dto.ControlPing; -import io.fd.vpp.jvpp.dto.ControlPingReply; +import io.fd.jvpp.core.dto.ShowVersion; +import io.fd.jvpp.core.dto.ShowVersionReply; +import io.fd.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.dto.ControlPing; +import io.fd.jvpp.dto.ControlPingReply; import javax.annotation.Nonnull; import org.junit.Before; import org.junit.Test; -- cgit 1.2.3-korg