From 72bd2d39aefb0e36308765cd15b3bdbda8275fc7 Mon Sep 17 00:00:00 2001 From: Sam Hague Date: Fri, 16 Feb 2018 09:34:17 -0500 Subject: [PATCH] Remove redundant names in paths Change-Id: I443d41c2a994646aa4c2c2d61f114c3c50fb6d83 Signed-off-by: Sam Hague --- bgpmanager/{bgpmanager-api => api}/pom.xml | 0 .../netvirt/bgpmanager/api/IBgpManager.java | 0 bgpmanager/{bgpmanager-impl => impl}/pom.xml | 0 .../netvirt/bgpmanager/BgpConfigurationManager.java | 0 .../opendaylight/netvirt/bgpmanager/BgpManager.java | 0 .../opendaylight/netvirt/bgpmanager/BgpUtil.java | 0 .../netvirt/bgpmanager/ConfigureBgpCli.java | 0 .../netvirt/bgpmanager/DisplayBgpConfigCli.java | 0 .../netvirt/bgpmanager/EvpnRdNetworkListener.java | 0 .../netvirt/bgpmanager/FibDSWriter.java | 0 .../netvirt/bgpmanager/RetryOnException.java | 0 .../opendaylight/netvirt/bgpmanager/VtyshCli.java | 0 .../netvirt/bgpmanager/commands/Cache.java | 0 .../netvirt/bgpmanager/commands/ClearBgpCli.java | 0 .../netvirt/bgpmanager/commands/Commands.java | 0 .../netvirt/bgpmanager/commands/Connect.java | 0 .../netvirt/bgpmanager/commands/Misc.java | 0 .../netvirt/bgpmanager/commands/Multipath.java | 0 .../netvirt/bgpmanager/commands/Neighbor.java | 0 .../netvirt/bgpmanager/commands/Network.java | 0 .../netvirt/bgpmanager/commands/Router.java | 0 .../netvirt/bgpmanager/commands/Vrf.java | 0 .../netvirt/bgpmanager/oam/BgpAlarmBroadcaster.java | 0 .../bgpmanager/oam/BgpAlarmBroadcasterMBean.java | 0 .../netvirt/bgpmanager/oam/BgpAlarmErrorCodes.java | 0 .../netvirt/bgpmanager/oam/BgpAlarmStatus.java | 0 .../netvirt/bgpmanager/oam/BgpAlarms.java | 0 .../netvirt/bgpmanager/oam/BgpConstants.java | 0 .../netvirt/bgpmanager/oam/BgpCounters.java | 0 .../netvirt/bgpmanager/oam/BgpJMXAlarmAgent.java | 0 .../bgpmanager/oam/BgpNbrControlPathAlarm.java | 0 .../bgpmanager/oam/BgpNbrControlPathAlarmMBean.java | 0 .../netvirt/bgpmanager/thrift/client/BgpRouter.java | 0 .../thrift/client/BgpRouterException.java | 0 .../bgpmanager/thrift/client/BgpSyncHandle.java | 0 .../bgpmanager/thrift/gen/BgpConfigurator.java | 0 .../netvirt/bgpmanager/thrift/gen/BgpUpdater.java | 0 .../netvirt/bgpmanager/thrift/gen/Routes.java | 0 .../netvirt/bgpmanager/thrift/gen/Update.java | 0 .../netvirt/bgpmanager/thrift/gen/af_afi.java | 0 .../netvirt/bgpmanager/thrift/gen/af_safi.java | 0 .../netvirt/bgpmanager/thrift/gen/encap_type.java | 0 .../netvirt/bgpmanager/thrift/gen/layer_type.java | 0 .../bgpmanager/thrift/gen/protocol_type.java | 0 .../bgpmanager/thrift/gen/qbgpConstants.java | 0 .../netvirt/bgpmanager/thrift/idl/qbgp.thrift | 0 .../bgpmanager/thrift/server/BgpThriftService.java | 0 .../org/opendaylight/blueprint/bgpmanager.xml | 0 .../org/opendaylight/blueprint/commands.xml | 0 .../bgpmanager/test/AbstractMockFibManager.java | 0 .../netvirt/bgpmanager/test/BgpManagerTest.java | 0 .../netvirt/bgpmanager/test/MockFibManager.java | 0 .../thrift/client/BgpRouterAddNeighborTest.java | 0 bgpmanager/pom.xml | 4 ++-- .../{cloud-servicechain-api => api}/pom.xml | 0 .../cloudservicechain/api/ICloudServiceChain.java | 0 .../src/main/yang/cloud-servicechain-state.yang | 0 .../{cloud-servicechain-impl => impl}/pom.xml | 0 .../CloudServiceChainConstants.java | 0 .../CloudServiceChainProvider.java | 0 .../cloudservicechain/ElanServiceChainHandler.java | 0 .../cloudservicechain/VPNServiceChainHandler.java | 0 .../jobs/AddVpnPseudoPortDataJob.java | 0 .../jobs/RemoveVpnPseudoPortDataJob.java | 0 .../jobs/VpnPseudoPortDataBaseJob.java | 0 .../listeners/CloudScVpnInterfaceListener.java | 0 .../listeners/ElanDpnInterfacesListener.java | 0 .../listeners/VpnPseudoPortListener.java | 0 .../listeners/VpnToDpnListener.java | 0 .../listeners/VpnToElanFallbackNodeListener.java | 0 .../cloudservicechain/listeners/VrfListener.java | 0 .../utils/ElanServiceChainUtils.java | 0 .../cloudservicechain/utils/VpnPseudoPortCache.java | 0 .../utils/VpnServiceChainUtils.java | 0 .../opendaylight/blueprint/cloud-servicechain.xml | 0 .../VPNServiceChainHandlerTest.java | 0 .../matchers/FlowEntityMatcher.java | 0 .../cloudservicechain/matchers/FlowMatcher.java | 0 .../cloudservicechain/matchers/NodeIIdMatcher.java | 0 .../src/test/resources/simplelogger.properties | 0 cloud-servicechain/pom.xml | 4 ++-- dhcpservice/{dhcpservice-api => api}/pom.xml | 0 .../opendaylight/netvirt/dhcpservice/api/DHCP.java | 0 .../netvirt/dhcpservice/api/DHCPConstants.java | 0 .../netvirt/dhcpservice/api/DHCPOptions.java | 0 .../netvirt/dhcpservice/api/DHCPUtils.java | 0 .../netvirt/dhcpservice/api/DhcpMConstants.java | 0 .../src/main/yang/dhcp.yang | 0 .../src/main/yang/dhcp_allocation_pool.yang | 0 .../src/main/yang/dhcpservice-api.yang | 0 dhcpservice/{dhcpservice-impl => impl}/pom.xml | 0 .../dhcpservice/DhcpAllocationPoolListener.java | 0 .../dhcpservice/DhcpAllocationPoolManager.java | 0 .../netvirt/dhcpservice/DhcpConfigListener.java | 0 .../dhcpservice/DhcpDesignatedDpnListener.java | 0 .../dhcpservice/DhcpExternalTunnelManager.java | 0 .../opendaylight/netvirt/dhcpservice/DhcpInfo.java | 0 .../dhcpservice/DhcpInterfaceConfigListener.java | 0 .../dhcpservice/DhcpInterfaceEventListener.java | 0 .../netvirt/dhcpservice/DhcpL2GwUtil.java | 0 .../netvirt/dhcpservice/DhcpManager.java | 0 .../netvirt/dhcpservice/DhcpMcastMacListener.java | 0 .../dhcpservice/DhcpNeutronPortListener.java | 0 .../netvirt/dhcpservice/DhcpPktHandler.java | 0 .../netvirt/dhcpservice/DhcpPortCache.java | 0 .../netvirt/dhcpservice/DhcpServiceCounters.java | 0 .../netvirt/dhcpservice/DhcpServiceUtils.java | 0 .../netvirt/dhcpservice/DhcpSubnetListener.java | 0 .../netvirt/dhcpservice/DhcpUCastMacListener.java | 0 .../netvirt/dhcpservice/NodeListener.java | 0 .../dhcpservice/jobs/DhcpAllocationPoolAddJob.java | 0 .../jobs/DhcpAllocationPoolRemoveJob.java | 0 .../dhcpservice/jobs/DhcpInterfaceAddJob.java | 0 .../dhcpservice/jobs/DhcpInterfaceRemoveJob.java | 0 .../dhcpservice/jobs/DhcpInterfaceUpdateJob.java | 0 .../initial/netvirt-dhcpservice-config.xml | 0 .../org/opendaylight/blueprint/dhcpservice.xml | 0 .../src/main/yang/dhcpservice-config.yang | 0 dhcpservice/pom.xml | 4 ++-- elanmanager/{elanmanager-api => api}/pom.xml | 0 .../elan/arp/responder/ArpResponderConstant.java | 0 .../elan/arp/responder/ArpResponderInput.java | 0 .../elan/arp/responder/ArpResponderUtil.java | 0 .../netvirt/elanmanager/api/ElanHelper.java | 0 .../netvirt/elanmanager/api/IElanBridgeManager.java | 0 .../netvirt/elanmanager/api/IElanService.java | 0 .../netvirt/elanmanager/api/IEtreeService.java | 0 .../netvirt/elanmanager/api/IL2gwService.java | 0 .../exceptions/MacNotFoundException.java | 0 .../elanmanager/utils/ElanL2GwCacheUtils.java | 0 .../src/main/yang/elan-statistics.yang | 0 .../src/main/yang/elan.yang | 0 .../src/main/yang/etree.yang | 0 .../src/main/yang/scalein-rpc.yang | 0 elanmanager/{elanmanager-impl => impl}/pom.xml | 0 .../opendaylight/netvirt/elan/ElanException.java | 0 .../org/opendaylight/netvirt/elan/cli/ElanAdd.java | 0 .../opendaylight/netvirt/elan/cli/ElanDelete.java | 0 .../org/opendaylight/netvirt/elan/cli/ElanGet.java | 0 .../netvirt/elan/cli/ElanInterfaceAdd.java | 0 .../netvirt/elan/cli/ElanInterfaceDelete.java | 0 .../netvirt/elan/cli/ElanInterfaceGet.java | 0 .../netvirt/elan/cli/ElanInterfaceUpdate.java | 0 .../netvirt/elan/cli/ElanMacTableFlush.java | 0 .../netvirt/elan/cli/ElanMacTableGet.java | 0 .../opendaylight/netvirt/elan/cli/ElanUpdate.java | 0 .../opendaylight/netvirt/elan/cli/StaticMacAdd.java | 0 .../netvirt/elan/cli/StaticMacDelete.java | 0 .../netvirt/elan/cli/etree/EtreeAdd.java | 0 .../netvirt/elan/cli/etree/EtreeDelete.java | 0 .../netvirt/elan/cli/etree/EtreeGet.java | 0 .../netvirt/elan/cli/etree/EtreeInterfaceAdd.java | 0 .../elan/cli/etree/EtreeInterfaceDelete.java | 0 .../netvirt/elan/cli/etree/EtreeInterfaceGet.java | 0 .../netvirt/elan/cli/l2gw/L2GwUtilsCacheCli.java | 0 .../netvirt/elan/cli/l2gw/L2GwValidateCli.java | 0 .../elan/cli/l2gw/NetworkL2gwDeviceInfoCli.java | 0 .../elan/diagstatus/ElanDiagStatusProvider.java | 0 .../elan/evpn/listeners/ElanMacEntryListener.java | 0 .../evpn/listeners/EvpnElanInstanceListener.java | 0 .../elan/evpn/listeners/MacVrfEntryListener.java | 0 .../netvirt/elan/evpn/utils/ElanEvpnFlowUtils.java | 0 .../netvirt/elan/evpn/utils/EvpnMacVrfUtils.java | 0 .../netvirt/elan/evpn/utils/EvpnUtils.java | 0 .../netvirt/elan/internal/ElanBridgeManager.java | 0 .../internal/ElanDpnInterfaceClusteredListener.java | 0 .../elan/internal/ElanDpnInterfacesListener.java | 0 .../internal/ElanDpnToTransportZoneListener.java | 0 .../netvirt/elan/internal/ElanExtnTepListener.java | 0 .../netvirt/elan/internal/ElanInstanceManager.java | 0 .../elan/internal/ElanInterfaceConfigListener.java | 0 .../netvirt/elan/internal/ElanInterfaceManager.java | 0 .../internal/ElanInterfaceStateChangeListener.java | 0 .../ElanInterfaceStateClusteredListener.java | 0 .../netvirt/elan/internal/ElanItmEventListener.java | 0 .../internal/ElanLearntVpnVipToPortListener.java | 0 .../netvirt/elan/internal/ElanManagerCounters.java | 0 .../netvirt/elan/internal/ElanNodeListener.java | 0 .../elan/internal/ElanOvsdbNodeListener.java | 0 .../netvirt/elan/internal/ElanPacketInHandler.java | 0 .../netvirt/elan/internal/ElanServiceProvider.java | 0 .../elan/internal/ElanSmacFlowEventListener.java | 0 .../internal/ElanTunnelInterfaceStateListener.java | 0 .../elan/internal/InterfaceAddWorkerOnElan.java | 0 .../internal/InterfaceAddWorkerOnElanInterface.java | 0 .../elan/internal/InterfaceRemoveWorkerOnElan.java | 0 .../InterfaceRemoveWorkerOnElanInterface.java | 0 .../internal/VpnDpnToTransportZoneListener.java | 0 .../netvirt/elan/l2gw/ha/BatchedTransaction.java | 0 .../netvirt/elan/l2gw/ha/HwvtepHAUtil.java | 0 .../netvirt/elan/l2gw/ha/commands/BaseCommand.java | 0 .../elan/l2gw/ha/commands/IMergeCommand.java | 0 .../elan/l2gw/ha/commands/LocalMcastCmd.java | 0 .../elan/l2gw/ha/commands/LocalUcastCmd.java | 0 .../elan/l2gw/ha/commands/LogicalSwitchesCmd.java | 0 .../netvirt/elan/l2gw/ha/commands/MergeCommand.java | 0 .../elan/l2gw/ha/commands/PhysicalLocatorCmd.java | 0 .../elan/l2gw/ha/commands/RemoteMcastCmd.java | 0 .../elan/l2gw/ha/commands/RemoteUcastCmd.java | 0 .../netvirt/elan/l2gw/ha/commands/SwitchesCmd.java | 0 .../elan/l2gw/ha/commands/TerminationPointCmd.java | 0 .../netvirt/elan/l2gw/ha/commands/TunnelCmd.java | 0 .../netvirt/elan/l2gw/ha/commands/TunnelIpCmd.java | 0 .../l2gw/ha/handlers/ConfigNodeUpdatedHandler.java | 0 .../elan/l2gw/ha/handlers/HAEventHandler.java | 0 .../elan/l2gw/ha/handlers/IHAEventHandler.java | 0 .../netvirt/elan/l2gw/ha/handlers/INodeCopier.java | 0 .../elan/l2gw/ha/handlers/NodeConnectedHandler.java | 0 .../netvirt/elan/l2gw/ha/handlers/NodeCopier.java | 0 .../l2gw/ha/handlers/NodeDisconnectedHandler.java | 0 .../elan/l2gw/ha/handlers/OpNodeUpdatedHandler.java | 0 .../l2gw/ha/listeners/HAConfigNodeListener.java | 0 .../elan/l2gw/ha/listeners/HAJobScheduler.java | 0 .../netvirt/elan/l2gw/ha/listeners/HAListeners.java | 0 .../l2gw/ha/listeners/HAOpClusteredListener.java | 0 .../elan/l2gw/ha/listeners/HAOpNodeListener.java | 0 .../l2gw/ha/listeners/HwvtepNodeBaseListener.java | 0 .../l2gw/ha/listeners/HwvtepNodeDataListener.java | 0 .../l2gw/ha/merge/GlobalAugmentationMerger.java | 0 .../elan/l2gw/ha/merge/GlobalNodeMerger.java | 0 .../elan/l2gw/ha/merge/MergeCommandsAggregator.java | 0 .../elan/l2gw/ha/merge/PSAugmentationMerger.java | 0 .../netvirt/elan/l2gw/ha/merge/PSNodeMerger.java | 0 .../elan/l2gw/jobs/AssociateHwvtepToElanJob.java | 0 .../l2gw/jobs/DeleteL2GwDeviceMacsFromElanJob.java | 0 .../elan/l2gw/jobs/DeleteLogicalSwitchJob.java | 0 .../l2gw/jobs/DisAssociateHwvtepFromElanJob.java | 0 .../l2gw/jobs/HwvtepDeviceMcastMacUpdateJob.java | 0 .../elan/l2gw/jobs/LogicalSwitchAddedJob.java | 0 .../netvirt/elan/l2gw/listeners/ChildListener.java | 0 .../elan/l2gw/listeners/ElanGroupListener.java | 0 .../elan/l2gw/listeners/ElanInstanceListener.java | 0 .../l2gw/listeners/HwvtepLocalUcastMacListener.java | 0 .../l2gw/listeners/HwvtepLogicalSwitchListener.java | 0 .../listeners/HwvtepPhysicalSwitchListener.java | 0 .../listeners/HwvtepRemoteMcastMacListener.java | 0 .../listeners/HwvtepTerminationPointListener.java | 0 .../l2gw/listeners/L2GatewayConnectionListener.java | 0 .../elan/l2gw/listeners/LocalUcastMacListener.java | 0 .../l2gw/utils/ElanL2GatewayMulticastUtils.java | 0 .../netvirt/elan/l2gw/utils/ElanL2GatewayUtils.java | 0 .../elan/l2gw/utils/L2GatewayConnectionUtils.java | 0 .../netvirt/elan/l2gw/utils/L2GatewayUtils.java | 0 .../elan/l2gw/utils/L2gwServiceProvider.java | 0 .../elan/l2gw/utils/SettableFutureCallback.java | 0 .../elan/l2gw/utils/StaleVlanBindingsCleaner.java | 0 .../netvirt/elan/statisitcs/ElanStatisticsImpl.java | 0 .../elan/utils/CacheElanInstanceListener.java | 0 .../elan/utils/CacheElanInterfaceListener.java | 0 .../netvirt/elan/utils/ElanCLIUtils.java | 0 .../netvirt/elan/utils/ElanClusterUtils.java | 0 .../netvirt/elan/utils/ElanConstants.java | 0 .../netvirt/elan/utils/ElanDmacUtils.java | 0 .../netvirt/elan/utils/ElanEtreeUtils.java | 0 .../elan/utils/ElanForwardingEntriesHandler.java | 0 .../netvirt/elan/utils/ElanItmUtils.java | 0 .../opendaylight/netvirt/elan/utils/ElanUtils.java | 0 .../opendaylight/netvirt/elan/utils/Scheduler.java | 0 .../elan/utils/TransportZoneNotificationUtil.java | 0 .../initial/netvirt-elanmanager-config.xml | 0 .../org/opendaylight/blueprint/commands.xml | 0 .../org/opendaylight/blueprint/elanmanager.xml | 0 .../src/main/yang/elanmanager-config.yang | 0 .../netvirt/elan/l2gw/LogicalSwitchesCmdTest.java | 0 .../elan/l2gw/nodehandlertest/DataProvider.java | 0 .../nodehandlertest/GlobalAugmentationHelper.java | 0 .../nodehandlertest/NodeConnectedHandlerTest.java | 0 .../nodehandlertest/NodeConnectedHandlerUtils.java | 0 .../l2gw/nodehandlertest/PhysicalSwitchHelper.java | 0 .../elan/l2gw/nodehandlertest/TestBuilders.java | 0 .../elan/l2gw/nodehandlertest/TestComparators.java | 0 .../netvirt/elan/l2gw/nodehandlertest/TestUtil.java | 0 .../netvirt/elanmanager/tests/ElanServiceTest.java | 0 .../elanmanager/tests/ElanServiceTestBase.java | 0 .../elanmanager/tests/ElanServiceTestModule.java | 0 .../netvirt/elanmanager/tests/ExpectedObjects.xtend | 0 .../elanmanager/tests/utils/BgpManagerTestImpl.java | 0 .../tests/utils/ElanEgressActionsHelper.java | 0 .../elanmanager/tests/utils/EvpnTestHelper.java | 0 .../netvirt/elanmanager/tests/utils/IdHelper.java | 0 .../elanmanager/tests/utils/InterfaceHelper.java | 0 .../elanmanager/tests/utils/VpnManagerTestImpl.java | 0 .../elanmanager/tests/.ExpectedObjects.java._trace | Bin .../netvirt/elanmanager/tests/ExpectedObjects.java | 0 elanmanager/pom.xml | 4 ++-- fibmanager/{fibmanager-api => api}/pom.xml | 0 .../netvirt/fibmanager/api/FibHelper.java | 0 .../netvirt/fibmanager/api/IFibManager.java | 0 .../netvirt/fibmanager/api/L3VPNTransportTypes.java | 0 .../netvirt/fibmanager/api/RouteOrigin.java | 0 .../src/main/yang/fib-rpc.yang | 0 .../src/main/yang/l3nexthop.yang | 0 .../src/main/yang/odl-fib.yang | 0 fibmanager/{fibmanager-impl => impl}/pom.xml | 0 .../netvirt/fibmanager/BaseVrfEntryHandler.java | 0 .../netvirt/fibmanager/BgpRouteVrfEntryHandler.java | 0 .../netvirt/fibmanager/EvpnVrfEntryHandler.java | 0 .../netvirt/fibmanager/FibConstants.java | 0 .../netvirt/fibmanager/FibManagerImpl.java | 0 .../netvirt/fibmanager/FibRpcServiceImpl.java | 0 .../opendaylight/netvirt/fibmanager/FibUtil.java | 0 .../netvirt/fibmanager/IPv6Handler.java | 0 .../netvirt/fibmanager/IVrfEntryHandler.java | 0 .../netvirt/fibmanager/NexthopManager.java | 0 .../fibmanager/RouterInterfaceVrfEntryHandler.java | 0 .../netvirt/fibmanager/VrfEntryListener.java | 0 .../org/opendaylight/blueprint/fibmanager.xml | 0 .../netvirt/fibmanager/test/FibManagerTest.java | 0 fibmanager/pom.xml | 6 +++--- fibmanager/{fibmanager-shell => shell}/pom.xml | 0 .../fibmanager/shell/ConfTransportL3VPNCommand.java | 0 .../netvirt/fibmanager/shell/ShowFibCommand.java | 0 .../fibmanager/shell/ShowTransportTypeCommand.java | 0 .../org/opendaylight/blueprint/blueprint.xml | 0 natservice/{natservice-api => api}/pom.xml | 0 .../natservice/api/CentralizedSwitchScheduler.java | 0 .../netvirt/natservice/api/SnatServiceListener.java | 0 .../netvirt/natservice/api/SnatServiceManager.java | 0 .../src/main/yang/odl-nat-rpc.yang | 0 .../src/main/yang/odl-nat.yang | 0 natservice/{natservice-impl => impl}/pom.xml | 0 .../natservice/cli/DisplayNaptSwithcesCli.java | 0 .../netvirt/natservice/ha/NatDataUtil.java | 0 .../ha/SnatCentralizedSwitchChangeListener.java | 0 .../natservice/ha/SnatNodeEventListener.java | 0 .../ha/WeightedCentralizedSwitchScheduler.java | 0 .../natservice/internal/AbstractSnatService.java | 0 .../internal/ConntrackBasedSnatService.java | 0 .../natservice/internal/EventDispatcher.java | 0 .../natservice/internal/EvpnDnatFlowProgrammer.java | 0 .../natservice/internal/EvpnNaptSwitchHA.java | 0 .../natservice/internal/EvpnSnatFlowProgrammer.java | 0 .../internal/ExternalNetworkGroupInstaller.java | 0 .../internal/ExternalNetworksChangeListener.java | 0 .../internal/ExternalRoutersListener.java | 0 .../internal/ExternalSubnetVpnInstanceListener.java | 0 .../internal/FlatVlanConntrackBasedSnatService.java | 0 .../natservice/internal/FloatingIPHandler.java | 0 .../natservice/internal/FloatingIPListener.java | 0 .../netvirt/natservice/internal/IPAddress.java | 0 .../internal/InterfaceStateEventListener.java | 0 .../netvirt/natservice/internal/NAPTEntryEvent.java | 0 .../natservice/internal/NAPTSwitchSelector.java | 0 .../natservice/internal/NaptEventHandler.java | 0 .../internal/NaptFlowRemovedEventHandler.java | 0 .../netvirt/natservice/internal/NaptManager.java | 0 .../natservice/internal/NaptPacketInHandler.java | 0 .../netvirt/natservice/internal/NaptSwitchHA.java | 0 .../netvirt/natservice/internal/NatConstants.java | 0 .../netvirt/natservice/internal/NatEvpnUtil.java | 0 .../internal/NatInterfaceStateChangeListener.java | 0 .../natservice/internal/NatOverVxlanUtil.java | 0 .../internal/NatRouterInterfaceListener.java | 0 .../natservice/internal/NatServiceCounters.java | 0 .../internal/NatTunnelInterfaceStateListener.java | 0 .../netvirt/natservice/internal/NatUtil.java | 0 .../internal/RouterDpnChangeListener.java | 0 .../natservice/internal/RouterPortsListener.java | 0 .../natservice/internal/RouterToVpnListener.java | 0 .../internal/SNATDefaultRouteProgrammer.java | 0 .../netvirt/natservice/internal/SessionAddress.java | 0 .../natservice/internal/SnatServiceImplFactory.java | 0 .../natservice/internal/SnatServiceManagerImpl.java | 0 .../internal/SubnetGwMacChangeListener.java | 0 .../natservice/internal/SubnetmapListener.java | 0 .../natservice/internal/UpgradeStateListener.java | 0 .../natservice/internal/VpnFloatingIpHandler.java | 0 .../internal/VxlanGreConntrackBasedSnatService.java | 0 .../natservice/rpcservice/NatRpcServiceImpl.java | 0 .../resources/initial/netvirt-natservice-config.xml | 0 .../org/opendaylight/blueprint/commands.xml | 0 .../org/opendaylight/blueprint/natservice.xml | 0 .../src/main/yang/natservice-config.yang | 0 .../internal/AbstractSnatServiceTest.java | 0 .../test/ExternalNetworksChangeListenerTest.java | 0 .../natservice/internal/test/NaptManagerTest.java | 0 .../natservice/internal/test/NatUtilTest.java | 0 natservice/pom.xml | 4 ++-- neutronvpn/{neutronvpn-api => api}/pom.xml | 0 .../neutronvpn/api/enums/IpVersionChoice.java | 0 .../netvirt/neutronvpn/api/l2gw/L2GatewayCache.java | 0 .../neutronvpn/api/l2gw/L2GatewayDevice.java | 0 .../netvirt/neutronvpn/api/utils/ChangeUtils.java | 0 .../neutronvpn/api/utils/NeutronConstants.java | 0 .../netvirt/neutronvpn/api/utils/NeutronUtils.java | 0 .../neutronvpn/interfaces/INeutronVpnManager.java | 0 .../src/main/yang/neutronvpn.yang | 0 neutronvpn/{neutronvpn-impl => impl}/pom.xml | 0 .../netvirt/neutronvpn/HostConfigCache.java | 0 .../IPV6InternetDefaultRouteProgrammer.java | 0 .../neutronvpn/NeutronBgpvpnChangeListener.java | 0 .../neutronvpn/NeutronExternalSubnetHandler.java | 0 ...utronFloatingToFixedIpMappingChangeListener.java | 0 .../neutronvpn/NeutronHostConfigChangeListener.java | 0 .../neutronvpn/NeutronNetworkChangeListener.java | 0 .../neutronvpn/NeutronPortChangeListener.java | 0 .../neutronvpn/NeutronRouterChangeListener.java | 0 .../neutronvpn/NeutronSecurityRuleConstants.java | 0 .../neutronvpn/NeutronSecurityRuleListener.java | 0 .../neutronvpn/NeutronSubnetChangeListener.java | 0 .../neutronvpn/NeutronSubnetGwMacResolver.java | 0 .../neutronvpn/NeutronTrunkChangeListener.java | 0 .../netvirt/neutronvpn/NeutronvpnManager.java | 0 .../netvirt/neutronvpn/NeutronvpnManagerImpl.java | 0 .../netvirt/neutronvpn/NeutronvpnNatManager.java | 0 .../netvirt/neutronvpn/NeutronvpnUtils.java | 0 .../netvirt/neutronvpn/UpgradeStateListener.java | 0 .../neutronvpn/evpn/manager/NeutronEvpnManager.java | 0 .../neutronvpn/evpn/utils/NeutronEvpnUtils.java | 0 .../l2gw/AddL2GwDevicesToTransportZoneJob.java | 0 .../netvirt/neutronvpn/l2gw/L2GatewayListener.java | 0 .../netvirt/neutronvpn/l2gw/L2GatewayUtils.java | 0 .../neutronvpn/l2gw/L2GwTransportZoneListener.java | 0 .../resources/initial/netvirt-neutronvpn-config.xml | 0 .../org/opendaylight/blueprint/neutronvpn.xml | 0 .../src/main/yang/neutronvpn-config.yang | 0 .../neutronvpn/NeutronPortChangeListenerTest.java | 0 neutronvpn/pom.xml | 6 +++--- neutronvpn/{neutronvpn-shell => shell}/pom.xml | 0 .../neutronvpn/shell/ConfigureL3VpnCommand.java | 0 .../neutronvpn/shell/DhcpConfigureCommand.java | 0 .../netvirt/neutronvpn/shell/DhcpShowCommand.java | 0 .../neutronvpn/shell/ShowNeutronPortsCommand.java | 0 .../netvirt/neutronvpn/shell/ShowSubnet.java | 0 .../neutronvpn/shell/ShowVpnConfigCommand.java | 0 .../netvirt/neutronvpn/shell/ShowVpnIpToPort.java | 0 .../main/resources/OSGI-INF/blueprint/blueprint.xml | 0 vpnmanager/{vpnmanager-api => api}/pom.xml | 0 .../vpnmanager/api/ICentralizedSwitchProvider.java | 0 .../vpnmanager/api/IVpnFootprintService.java | 0 .../netvirt/vpnmanager/api/IVpnManager.java | 0 .../netvirt/vpnmanager/api/InterfaceUtils.java | 0 .../netvirt/vpnmanager/api/VpnExtraRouteHelper.java | 0 .../netvirt/vpnmanager/api/VpnHelper.java | 0 .../api/intervpnlink/IVpnLinkService.java | 0 .../api/intervpnlink/InterVpnLinkCache.java | 0 .../api/intervpnlink/InterVpnLinkDataComposite.java | 0 .../src/main/yang/inter-vpn-link.yang | 0 .../src/main/yang/l3vpn.yang | 0 .../src/main/yang/odl-l3vpn.yang | 0 .../src/main/yang/vpn-rpc.yang | 0 vpnmanager/{vpnmanager-impl => impl}/pom.xml | 0 .../netvirt/vpnmanager/AlivenessMonitorUtils.java | 0 .../netvirt/vpnmanager/ArpMonitorEventListener.java | 0 .../netvirt/vpnmanager/ArpMonitorStartTask.java | 0 .../netvirt/vpnmanager/ArpMonitorStopTask.java | 0 .../netvirt/vpnmanager/ArpMonitoringHandler.java | 0 .../netvirt/vpnmanager/ArpNotificationHandler.java | 0 .../netvirt/vpnmanager/ArpReplyOrRequest.java | 0 .../opendaylight/netvirt/vpnmanager/ArpUtils.java | 0 .../vpnmanager/CentralizedSwitchChangeListener.java | 0 .../vpnmanager/CentralizedSwitchProvider.java | 0 .../netvirt/vpnmanager/DpnInVpnChangeListener.java | 0 .../netvirt/vpnmanager/FibEntriesListener.java | 0 .../vpnmanager/InterfaceStateChangeListener.java | 0 .../opendaylight/netvirt/vpnmanager/MacEntry.java | 0 .../netvirt/vpnmanager/SubnetOpDpnManager.java | 0 .../SubnetRouteInterfaceStateChangeListener.java | 0 .../vpnmanager/SubnetRoutePacketInHandler.java | 0 .../netvirt/vpnmanager/SubnetmapChangeListener.java | 0 .../netvirt/vpnmanager/TransactionUtil.java | 0 .../vpnmanager/TunnelEndPointChangeListener.java | 0 .../vpnmanager/TunnelInterfaceStateListener.java | 0 .../opendaylight/netvirt/vpnmanager/UpdateData.java | 0 .../netvirt/vpnmanager/VpnConstants.java | 0 .../vpnmanager/VpnElanInterfaceChangeListener.java | 0 .../netvirt/vpnmanager/VpnFootprintService.java | 0 .../netvirt/vpnmanager/VpnInstanceListener.java | 0 .../netvirt/vpnmanager/VpnInterfaceManager.java | 0 .../netvirt/vpnmanager/VpnInterfaceOpListener.java | 0 .../netvirt/vpnmanager/VpnManagerImpl.java | 0 .../netvirt/vpnmanager/VpnNodeListener.java | 0 .../netvirt/vpnmanager/VpnNotifyTask.java | 0 .../netvirt/vpnmanager/VpnOpDataSyncer.java | 0 .../netvirt/vpnmanager/VpnOpStatusListener.java | 0 .../netvirt/vpnmanager/VpnOperDsUtils.java | 0 .../netvirt/vpnmanager/VpnRpcServiceImpl.java | 0 .../netvirt/vpnmanager/VpnSubnetRouteHandler.java | 0 .../opendaylight/netvirt/vpnmanager/VpnUtil.java | 0 .../arp/responder/ArpResponderHandler.java | 0 .../intervpnlink/IVpnLinkServiceImpl.java | 0 .../intervpnlink/InterVpnLinkCacheFeeder.java | 0 .../intervpnlink/InterVpnLinkCacheImpl.java | 0 .../intervpnlink/InterVpnLinkListener.java | 0 .../intervpnlink/InterVpnLinkLocator.java | 0 .../intervpnlink/InterVpnLinkNodeAddTask.java | 0 .../intervpnlink/InterVpnLinkNodeListener.java | 0 .../intervpnlink/InterVpnLinkStateCacheFeeder.java | 0 .../intervpnlink/InterVpnLinkStateListener.java | 0 .../vpnmanager/intervpnlink/InterVpnLinkUtil.java | 0 .../tasks/InterVpnLinkCleanedCheckerTask.java | 0 .../intervpnlink/tasks/InterVpnLinkCreatorTask.java | 0 .../intervpnlink/tasks/InterVpnLinkRemoverTask.java | 0 .../populator/impl/L3vpnOverMplsGrePopulator.java | 0 .../populator/impl/L3vpnOverVxlanPopulator.java | 0 .../vpnmanager/populator/impl/L3vpnPopulator.java | 0 .../vpnmanager/populator/input/L3vpnInput.java | 0 .../vpnmanager/populator/intfc/VpnPopulator.java | 0 .../populator/registry/L3vpnRegistry.java | 0 .../vpnmanager/utilities/VpnManagerCounters.java | 0 .../resources/initial/netvirt-vpnmanager-config.xml | 0 .../org/opendaylight/blueprint/vpnmanager.xml | 0 .../src/main/yang/vpnmanager-config.yang | 0 .../intervpnlink/InterVpnLinkLocatorTest.java | 0 .../intervpnlink/InterVpnLinkTestCatalog.java | 0 .../vpnmanager/intervpnlink/L3VpnTestCatalog.java | 0 .../vpnmanager/test/SubnetOpDpnManagerTest.java | 0 .../netvirt/vpnmanager/test/VpnServiceTest.java | 0 .../vpnmanager/test/VpnSubnetRouteHandlerTest.java | 0 vpnmanager/pom.xml | 6 +++--- vpnmanager/{vpnmanager-shell => shell}/pom.xml | 0 .../netvirt/vpnmanager/shell/ShowVpn.java | 0 .../vpnmanager/shell/ShowVpnInstanceOpData.java | 0 .../main/resources/OSGI-INF/blueprint/blueprint.xml | 0 514 files changed, 19 insertions(+), 19 deletions(-) rename bgpmanager/{bgpmanager-api => api}/pom.xml (100%) rename bgpmanager/{bgpmanager-api => api}/src/main/java/org/opendaylight/netvirt/bgpmanager/api/IBgpManager.java (100%) rename bgpmanager/{bgpmanager-impl => impl}/pom.xml (100%) rename bgpmanager/{bgpmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/bgpmanager/BgpConfigurationManager.java (100%) rename bgpmanager/{bgpmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/bgpmanager/BgpManager.java (100%) rename bgpmanager/{bgpmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/bgpmanager/BgpUtil.java (100%) rename bgpmanager/{bgpmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/bgpmanager/ConfigureBgpCli.java (100%) rename bgpmanager/{bgpmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/bgpmanager/DisplayBgpConfigCli.java (100%) rename bgpmanager/{bgpmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/bgpmanager/EvpnRdNetworkListener.java (100%) rename bgpmanager/{bgpmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/bgpmanager/FibDSWriter.java (100%) rename bgpmanager/{bgpmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/bgpmanager/RetryOnException.java (100%) rename bgpmanager/{bgpmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/bgpmanager/VtyshCli.java (100%) rename bgpmanager/{bgpmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Cache.java (100%) rename bgpmanager/{bgpmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/ClearBgpCli.java (100%) rename bgpmanager/{bgpmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Commands.java (100%) rename bgpmanager/{bgpmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Connect.java (100%) rename bgpmanager/{bgpmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Misc.java (100%) rename bgpmanager/{bgpmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Multipath.java (100%) rename bgpmanager/{bgpmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Neighbor.java (100%) rename bgpmanager/{bgpmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Network.java (100%) rename bgpmanager/{bgpmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Router.java (100%) rename bgpmanager/{bgpmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Vrf.java (100%) rename bgpmanager/{bgpmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpAlarmBroadcaster.java (100%) rename bgpmanager/{bgpmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpAlarmBroadcasterMBean.java (100%) rename bgpmanager/{bgpmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpAlarmErrorCodes.java (100%) rename bgpmanager/{bgpmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpAlarmStatus.java (100%) rename bgpmanager/{bgpmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpAlarms.java (100%) rename bgpmanager/{bgpmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpConstants.java (100%) rename bgpmanager/{bgpmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpCounters.java (100%) rename bgpmanager/{bgpmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpJMXAlarmAgent.java (100%) rename bgpmanager/{bgpmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpNbrControlPathAlarm.java (100%) rename bgpmanager/{bgpmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpNbrControlPathAlarmMBean.java (100%) rename bgpmanager/{bgpmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/client/BgpRouter.java (100%) rename bgpmanager/{bgpmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/client/BgpRouterException.java (100%) rename bgpmanager/{bgpmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/client/BgpSyncHandle.java (100%) rename bgpmanager/{bgpmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/BgpConfigurator.java (100%) rename bgpmanager/{bgpmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/BgpUpdater.java (100%) rename bgpmanager/{bgpmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/Routes.java (100%) rename bgpmanager/{bgpmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/Update.java (100%) rename bgpmanager/{bgpmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/af_afi.java (100%) rename bgpmanager/{bgpmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/af_safi.java (100%) rename bgpmanager/{bgpmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/encap_type.java (100%) rename bgpmanager/{bgpmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/layer_type.java (100%) rename bgpmanager/{bgpmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/protocol_type.java (100%) rename bgpmanager/{bgpmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/qbgpConstants.java (100%) rename bgpmanager/{bgpmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/idl/qbgp.thrift (100%) rename bgpmanager/{bgpmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/server/BgpThriftService.java (100%) rename bgpmanager/{bgpmanager-impl => impl}/src/main/resources/org/opendaylight/blueprint/bgpmanager.xml (100%) rename bgpmanager/{bgpmanager-impl => impl}/src/main/resources/org/opendaylight/blueprint/commands.xml (100%) rename bgpmanager/{bgpmanager-impl => impl}/src/test/java/org/opendaylight/netvirt/bgpmanager/test/AbstractMockFibManager.java (100%) rename bgpmanager/{bgpmanager-impl => impl}/src/test/java/org/opendaylight/netvirt/bgpmanager/test/BgpManagerTest.java (100%) rename bgpmanager/{bgpmanager-impl => impl}/src/test/java/org/opendaylight/netvirt/bgpmanager/test/MockFibManager.java (100%) rename bgpmanager/{bgpmanager-impl => impl}/src/test/java/org/opendaylight/netvirt/bgpmanager/thrift/client/BgpRouterAddNeighborTest.java (100%) rename cloud-servicechain/{cloud-servicechain-api => api}/pom.xml (100%) rename cloud-servicechain/{cloud-servicechain-api => api}/src/main/java/org/opendaylight/netvirt/cloudservicechain/api/ICloudServiceChain.java (100%) rename cloud-servicechain/{cloud-servicechain-api => api}/src/main/yang/cloud-servicechain-state.yang (100%) rename cloud-servicechain/{cloud-servicechain-impl => impl}/pom.xml (100%) rename cloud-servicechain/{cloud-servicechain-impl => impl}/src/main/java/org/opendaylight/netvirt/cloudservicechain/CloudServiceChainConstants.java (100%) rename cloud-servicechain/{cloud-servicechain-impl => impl}/src/main/java/org/opendaylight/netvirt/cloudservicechain/CloudServiceChainProvider.java (100%) rename cloud-servicechain/{cloud-servicechain-impl => impl}/src/main/java/org/opendaylight/netvirt/cloudservicechain/ElanServiceChainHandler.java (100%) rename cloud-servicechain/{cloud-servicechain-impl => impl}/src/main/java/org/opendaylight/netvirt/cloudservicechain/VPNServiceChainHandler.java (100%) rename cloud-servicechain/{cloud-servicechain-impl => impl}/src/main/java/org/opendaylight/netvirt/cloudservicechain/jobs/AddVpnPseudoPortDataJob.java (100%) rename cloud-servicechain/{cloud-servicechain-impl => impl}/src/main/java/org/opendaylight/netvirt/cloudservicechain/jobs/RemoveVpnPseudoPortDataJob.java (100%) rename cloud-servicechain/{cloud-servicechain-impl => impl}/src/main/java/org/opendaylight/netvirt/cloudservicechain/jobs/VpnPseudoPortDataBaseJob.java (100%) rename cloud-servicechain/{cloud-servicechain-impl => impl}/src/main/java/org/opendaylight/netvirt/cloudservicechain/listeners/CloudScVpnInterfaceListener.java (100%) rename cloud-servicechain/{cloud-servicechain-impl => impl}/src/main/java/org/opendaylight/netvirt/cloudservicechain/listeners/ElanDpnInterfacesListener.java (100%) rename cloud-servicechain/{cloud-servicechain-impl => impl}/src/main/java/org/opendaylight/netvirt/cloudservicechain/listeners/VpnPseudoPortListener.java (100%) rename cloud-servicechain/{cloud-servicechain-impl => impl}/src/main/java/org/opendaylight/netvirt/cloudservicechain/listeners/VpnToDpnListener.java (100%) rename cloud-servicechain/{cloud-servicechain-impl => impl}/src/main/java/org/opendaylight/netvirt/cloudservicechain/listeners/VpnToElanFallbackNodeListener.java (100%) rename cloud-servicechain/{cloud-servicechain-impl => impl}/src/main/java/org/opendaylight/netvirt/cloudservicechain/listeners/VrfListener.java (100%) rename cloud-servicechain/{cloud-servicechain-impl => impl}/src/main/java/org/opendaylight/netvirt/cloudservicechain/utils/ElanServiceChainUtils.java (100%) rename cloud-servicechain/{cloud-servicechain-impl => impl}/src/main/java/org/opendaylight/netvirt/cloudservicechain/utils/VpnPseudoPortCache.java (100%) rename cloud-servicechain/{cloud-servicechain-impl => impl}/src/main/java/org/opendaylight/netvirt/cloudservicechain/utils/VpnServiceChainUtils.java (100%) rename cloud-servicechain/{cloud-servicechain-impl => impl}/src/main/resources/org/opendaylight/blueprint/cloud-servicechain.xml (100%) rename cloud-servicechain/{cloud-servicechain-impl => impl}/src/test/java/org/opendaylight/netvirt/cloudservicechain/VPNServiceChainHandlerTest.java (100%) rename cloud-servicechain/{cloud-servicechain-impl => impl}/src/test/java/org/opendaylight/netvirt/cloudservicechain/matchers/FlowEntityMatcher.java (100%) rename cloud-servicechain/{cloud-servicechain-impl => impl}/src/test/java/org/opendaylight/netvirt/cloudservicechain/matchers/FlowMatcher.java (100%) rename cloud-servicechain/{cloud-servicechain-impl => impl}/src/test/java/org/opendaylight/netvirt/cloudservicechain/matchers/NodeIIdMatcher.java (100%) rename cloud-servicechain/{cloud-servicechain-impl => impl}/src/test/resources/simplelogger.properties (100%) rename dhcpservice/{dhcpservice-api => api}/pom.xml (100%) rename dhcpservice/{dhcpservice-api => api}/src/main/java/org/opendaylight/netvirt/dhcpservice/api/DHCP.java (100%) rename dhcpservice/{dhcpservice-api => api}/src/main/java/org/opendaylight/netvirt/dhcpservice/api/DHCPConstants.java (100%) rename dhcpservice/{dhcpservice-api => api}/src/main/java/org/opendaylight/netvirt/dhcpservice/api/DHCPOptions.java (100%) rename dhcpservice/{dhcpservice-api => api}/src/main/java/org/opendaylight/netvirt/dhcpservice/api/DHCPUtils.java (100%) rename dhcpservice/{dhcpservice-api => api}/src/main/java/org/opendaylight/netvirt/dhcpservice/api/DhcpMConstants.java (100%) rename dhcpservice/{dhcpservice-api => api}/src/main/yang/dhcp.yang (100%) rename dhcpservice/{dhcpservice-api => api}/src/main/yang/dhcp_allocation_pool.yang (100%) rename dhcpservice/{dhcpservice-api => api}/src/main/yang/dhcpservice-api.yang (100%) rename dhcpservice/{dhcpservice-impl => impl}/pom.xml (100%) rename dhcpservice/{dhcpservice-impl => impl}/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpAllocationPoolListener.java (100%) rename dhcpservice/{dhcpservice-impl => impl}/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpAllocationPoolManager.java (100%) rename dhcpservice/{dhcpservice-impl => impl}/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpConfigListener.java (100%) rename dhcpservice/{dhcpservice-impl => impl}/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpDesignatedDpnListener.java (100%) rename dhcpservice/{dhcpservice-impl => impl}/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpExternalTunnelManager.java (100%) rename dhcpservice/{dhcpservice-impl => impl}/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpInfo.java (100%) rename dhcpservice/{dhcpservice-impl => impl}/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpInterfaceConfigListener.java (100%) rename dhcpservice/{dhcpservice-impl => impl}/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpInterfaceEventListener.java (100%) rename dhcpservice/{dhcpservice-impl => impl}/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpL2GwUtil.java (100%) rename dhcpservice/{dhcpservice-impl => impl}/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpManager.java (100%) rename dhcpservice/{dhcpservice-impl => impl}/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpMcastMacListener.java (100%) rename dhcpservice/{dhcpservice-impl => impl}/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpNeutronPortListener.java (100%) rename dhcpservice/{dhcpservice-impl => impl}/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpPktHandler.java (100%) rename dhcpservice/{dhcpservice-impl => impl}/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpPortCache.java (100%) rename dhcpservice/{dhcpservice-impl => impl}/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpServiceCounters.java (100%) rename dhcpservice/{dhcpservice-impl => impl}/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpServiceUtils.java (100%) rename dhcpservice/{dhcpservice-impl => impl}/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpSubnetListener.java (100%) rename dhcpservice/{dhcpservice-impl => impl}/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpUCastMacListener.java (100%) rename dhcpservice/{dhcpservice-impl => impl}/src/main/java/org/opendaylight/netvirt/dhcpservice/NodeListener.java (100%) rename dhcpservice/{dhcpservice-impl => impl}/src/main/java/org/opendaylight/netvirt/dhcpservice/jobs/DhcpAllocationPoolAddJob.java (100%) rename dhcpservice/{dhcpservice-impl => impl}/src/main/java/org/opendaylight/netvirt/dhcpservice/jobs/DhcpAllocationPoolRemoveJob.java (100%) rename dhcpservice/{dhcpservice-impl => impl}/src/main/java/org/opendaylight/netvirt/dhcpservice/jobs/DhcpInterfaceAddJob.java (100%) rename dhcpservice/{dhcpservice-impl => impl}/src/main/java/org/opendaylight/netvirt/dhcpservice/jobs/DhcpInterfaceRemoveJob.java (100%) rename dhcpservice/{dhcpservice-impl => impl}/src/main/java/org/opendaylight/netvirt/dhcpservice/jobs/DhcpInterfaceUpdateJob.java (100%) rename dhcpservice/{dhcpservice-impl => impl}/src/main/resources/initial/netvirt-dhcpservice-config.xml (100%) rename dhcpservice/{dhcpservice-impl => impl}/src/main/resources/org/opendaylight/blueprint/dhcpservice.xml (100%) rename dhcpservice/{dhcpservice-impl => impl}/src/main/yang/dhcpservice-config.yang (100%) rename elanmanager/{elanmanager-api => api}/pom.xml (100%) rename elanmanager/{elanmanager-api => api}/src/main/java/org/opendaylight/netvirt/elan/arp/responder/ArpResponderConstant.java (100%) rename elanmanager/{elanmanager-api => api}/src/main/java/org/opendaylight/netvirt/elan/arp/responder/ArpResponderInput.java (100%) rename elanmanager/{elanmanager-api => api}/src/main/java/org/opendaylight/netvirt/elan/arp/responder/ArpResponderUtil.java (100%) rename elanmanager/{elanmanager-api => api}/src/main/java/org/opendaylight/netvirt/elanmanager/api/ElanHelper.java (100%) rename elanmanager/{elanmanager-api => api}/src/main/java/org/opendaylight/netvirt/elanmanager/api/IElanBridgeManager.java (100%) rename elanmanager/{elanmanager-api => api}/src/main/java/org/opendaylight/netvirt/elanmanager/api/IElanService.java (100%) rename elanmanager/{elanmanager-api => api}/src/main/java/org/opendaylight/netvirt/elanmanager/api/IEtreeService.java (100%) rename elanmanager/{elanmanager-api => api}/src/main/java/org/opendaylight/netvirt/elanmanager/api/IL2gwService.java (100%) rename elanmanager/{elanmanager-api => api}/src/main/java/org/opendaylight/netvirt/elanmanager/exceptions/MacNotFoundException.java (100%) rename elanmanager/{elanmanager-api => api}/src/main/java/org/opendaylight/netvirt/elanmanager/utils/ElanL2GwCacheUtils.java (100%) rename elanmanager/{elanmanager-api => api}/src/main/yang/elan-statistics.yang (100%) rename elanmanager/{elanmanager-api => api}/src/main/yang/elan.yang (100%) rename elanmanager/{elanmanager-api => api}/src/main/yang/etree.yang (100%) rename elanmanager/{elanmanager-api => api}/src/main/yang/scalein-rpc.yang (100%) rename elanmanager/{elanmanager-impl => impl}/pom.xml (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/ElanException.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/cli/ElanAdd.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/cli/ElanDelete.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/cli/ElanGet.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceAdd.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceDelete.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceGet.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceUpdate.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/cli/ElanMacTableFlush.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/cli/ElanMacTableGet.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/cli/ElanUpdate.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/cli/StaticMacAdd.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/cli/StaticMacDelete.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeAdd.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeDelete.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeGet.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceAdd.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceDelete.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceGet.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/cli/l2gw/L2GwUtilsCacheCli.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/cli/l2gw/L2GwValidateCli.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/cli/l2gw/NetworkL2gwDeviceInfoCli.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/diagstatus/ElanDiagStatusProvider.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/evpn/listeners/ElanMacEntryListener.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/evpn/listeners/EvpnElanInstanceListener.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/evpn/listeners/MacVrfEntryListener.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/evpn/utils/ElanEvpnFlowUtils.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/evpn/utils/EvpnMacVrfUtils.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/evpn/utils/EvpnUtils.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/internal/ElanBridgeManager.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/internal/ElanDpnInterfaceClusteredListener.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/internal/ElanDpnInterfacesListener.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/internal/ElanDpnToTransportZoneListener.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/internal/ElanExtnTepListener.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/internal/ElanInstanceManager.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/internal/ElanInterfaceConfigListener.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/internal/ElanInterfaceManager.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/internal/ElanInterfaceStateChangeListener.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/internal/ElanInterfaceStateClusteredListener.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/internal/ElanItmEventListener.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/internal/ElanLearntVpnVipToPortListener.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/internal/ElanManagerCounters.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/internal/ElanNodeListener.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/internal/ElanOvsdbNodeListener.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/internal/ElanPacketInHandler.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/internal/ElanServiceProvider.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/internal/ElanSmacFlowEventListener.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/internal/ElanTunnelInterfaceStateListener.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/internal/InterfaceAddWorkerOnElan.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/internal/InterfaceAddWorkerOnElanInterface.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/internal/InterfaceRemoveWorkerOnElan.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/internal/InterfaceRemoveWorkerOnElanInterface.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/internal/VpnDpnToTransportZoneListener.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/BatchedTransaction.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/HwvtepHAUtil.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/BaseCommand.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/IMergeCommand.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/LocalMcastCmd.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/LocalUcastCmd.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/LogicalSwitchesCmd.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/MergeCommand.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/PhysicalLocatorCmd.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/RemoteMcastCmd.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/RemoteUcastCmd.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/SwitchesCmd.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/TerminationPointCmd.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/TunnelCmd.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/TunnelIpCmd.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/ConfigNodeUpdatedHandler.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/HAEventHandler.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/IHAEventHandler.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/INodeCopier.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/NodeConnectedHandler.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/NodeCopier.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/NodeDisconnectedHandler.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/OpNodeUpdatedHandler.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAConfigNodeListener.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAJobScheduler.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAListeners.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAOpClusteredListener.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAOpNodeListener.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HwvtepNodeBaseListener.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HwvtepNodeDataListener.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/merge/GlobalAugmentationMerger.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/merge/GlobalNodeMerger.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/merge/MergeCommandsAggregator.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/merge/PSAugmentationMerger.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/merge/PSNodeMerger.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/l2gw/jobs/AssociateHwvtepToElanJob.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/l2gw/jobs/DeleteL2GwDeviceMacsFromElanJob.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/l2gw/jobs/DeleteLogicalSwitchJob.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/l2gw/jobs/DisAssociateHwvtepFromElanJob.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/l2gw/jobs/HwvtepDeviceMcastMacUpdateJob.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/l2gw/jobs/LogicalSwitchAddedJob.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/ChildListener.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/ElanGroupListener.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/ElanInstanceListener.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/HwvtepLocalUcastMacListener.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/HwvtepLogicalSwitchListener.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/HwvtepPhysicalSwitchListener.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/HwvtepRemoteMcastMacListener.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/HwvtepTerminationPointListener.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/L2GatewayConnectionListener.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/LocalUcastMacListener.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/ElanL2GatewayMulticastUtils.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/ElanL2GatewayUtils.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/L2GatewayConnectionUtils.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/L2GatewayUtils.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/L2gwServiceProvider.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/SettableFutureCallback.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/StaleVlanBindingsCleaner.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/statisitcs/ElanStatisticsImpl.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/utils/CacheElanInstanceListener.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/utils/CacheElanInterfaceListener.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/utils/ElanCLIUtils.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/utils/ElanClusterUtils.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/utils/ElanConstants.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/utils/ElanDmacUtils.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/utils/ElanEtreeUtils.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/utils/ElanForwardingEntriesHandler.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/utils/ElanItmUtils.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/utils/ElanUtils.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/utils/Scheduler.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/elan/utils/TransportZoneNotificationUtil.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/resources/initial/netvirt-elanmanager-config.xml (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/resources/org/opendaylight/blueprint/commands.xml (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/resources/org/opendaylight/blueprint/elanmanager.xml (100%) rename elanmanager/{elanmanager-impl => impl}/src/main/yang/elanmanager-config.yang (100%) rename elanmanager/{elanmanager-impl => impl}/src/test/java/org/opendaylight/netvirt/elan/l2gw/LogicalSwitchesCmdTest.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/DataProvider.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/GlobalAugmentationHelper.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/NodeConnectedHandlerTest.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/NodeConnectedHandlerUtils.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/PhysicalSwitchHelper.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/TestBuilders.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/TestComparators.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/TestUtil.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ElanServiceTest.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ElanServiceTestBase.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ElanServiceTestModule.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ExpectedObjects.xtend (100%) rename elanmanager/{elanmanager-impl => impl}/src/test/java/org/opendaylight/netvirt/elanmanager/tests/utils/BgpManagerTestImpl.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/test/java/org/opendaylight/netvirt/elanmanager/tests/utils/ElanEgressActionsHelper.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/test/java/org/opendaylight/netvirt/elanmanager/tests/utils/EvpnTestHelper.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/test/java/org/opendaylight/netvirt/elanmanager/tests/utils/IdHelper.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/test/java/org/opendaylight/netvirt/elanmanager/tests/utils/InterfaceHelper.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/test/java/org/opendaylight/netvirt/elanmanager/tests/utils/VpnManagerTestImpl.java (100%) rename elanmanager/{elanmanager-impl => impl}/src/test/xtend-gen/org/opendaylight/netvirt/elanmanager/tests/.ExpectedObjects.java._trace (100%) rename elanmanager/{elanmanager-impl => impl}/src/test/xtend-gen/org/opendaylight/netvirt/elanmanager/tests/ExpectedObjects.java (100%) rename fibmanager/{fibmanager-api => api}/pom.xml (100%) rename fibmanager/{fibmanager-api => api}/src/main/java/org/opendaylight/netvirt/fibmanager/api/FibHelper.java (100%) rename fibmanager/{fibmanager-api => api}/src/main/java/org/opendaylight/netvirt/fibmanager/api/IFibManager.java (100%) rename fibmanager/{fibmanager-api => api}/src/main/java/org/opendaylight/netvirt/fibmanager/api/L3VPNTransportTypes.java (100%) rename fibmanager/{fibmanager-api => api}/src/main/java/org/opendaylight/netvirt/fibmanager/api/RouteOrigin.java (100%) rename fibmanager/{fibmanager-api => api}/src/main/yang/fib-rpc.yang (100%) rename fibmanager/{fibmanager-api => api}/src/main/yang/l3nexthop.yang (100%) rename fibmanager/{fibmanager-api => api}/src/main/yang/odl-fib.yang (100%) rename fibmanager/{fibmanager-impl => impl}/pom.xml (100%) rename fibmanager/{fibmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/fibmanager/BaseVrfEntryHandler.java (100%) rename fibmanager/{fibmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/fibmanager/BgpRouteVrfEntryHandler.java (100%) rename fibmanager/{fibmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/fibmanager/EvpnVrfEntryHandler.java (100%) rename fibmanager/{fibmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/fibmanager/FibConstants.java (100%) rename fibmanager/{fibmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/fibmanager/FibManagerImpl.java (100%) rename fibmanager/{fibmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/fibmanager/FibRpcServiceImpl.java (100%) rename fibmanager/{fibmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/fibmanager/FibUtil.java (100%) rename fibmanager/{fibmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/fibmanager/IPv6Handler.java (100%) rename fibmanager/{fibmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/fibmanager/IVrfEntryHandler.java (100%) rename fibmanager/{fibmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/fibmanager/NexthopManager.java (100%) rename fibmanager/{fibmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/fibmanager/RouterInterfaceVrfEntryHandler.java (100%) rename fibmanager/{fibmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/fibmanager/VrfEntryListener.java (100%) rename fibmanager/{fibmanager-impl => impl}/src/main/resources/org/opendaylight/blueprint/fibmanager.xml (100%) rename fibmanager/{fibmanager-impl => impl}/src/test/java/org/opendaylight/netvirt/fibmanager/test/FibManagerTest.java (100%) rename fibmanager/{fibmanager-shell => shell}/pom.xml (100%) rename fibmanager/{fibmanager-shell => shell}/src/main/java/org/opendaylight/netvirt/fibmanager/shell/ConfTransportL3VPNCommand.java (100%) rename fibmanager/{fibmanager-shell => shell}/src/main/java/org/opendaylight/netvirt/fibmanager/shell/ShowFibCommand.java (100%) rename fibmanager/{fibmanager-shell => shell}/src/main/java/org/opendaylight/netvirt/fibmanager/shell/ShowTransportTypeCommand.java (100%) rename fibmanager/{fibmanager-shell => shell}/src/main/resources/org/opendaylight/blueprint/blueprint.xml (100%) rename natservice/{natservice-api => api}/pom.xml (100%) rename natservice/{natservice-api => api}/src/main/java/org/opendaylight/netvirt/natservice/api/CentralizedSwitchScheduler.java (100%) rename natservice/{natservice-api => api}/src/main/java/org/opendaylight/netvirt/natservice/api/SnatServiceListener.java (100%) rename natservice/{natservice-api => api}/src/main/java/org/opendaylight/netvirt/natservice/api/SnatServiceManager.java (100%) rename natservice/{natservice-api => api}/src/main/yang/odl-nat-rpc.yang (100%) rename natservice/{natservice-api => api}/src/main/yang/odl-nat.yang (100%) rename natservice/{natservice-impl => impl}/pom.xml (100%) rename natservice/{natservice-impl => impl}/src/main/java/org/opendaylight/netvirt/natservice/cli/DisplayNaptSwithcesCli.java (100%) rename natservice/{natservice-impl => impl}/src/main/java/org/opendaylight/netvirt/natservice/ha/NatDataUtil.java (100%) rename natservice/{natservice-impl => impl}/src/main/java/org/opendaylight/netvirt/natservice/ha/SnatCentralizedSwitchChangeListener.java (100%) rename natservice/{natservice-impl => impl}/src/main/java/org/opendaylight/netvirt/natservice/ha/SnatNodeEventListener.java (100%) rename natservice/{natservice-impl => impl}/src/main/java/org/opendaylight/netvirt/natservice/ha/WeightedCentralizedSwitchScheduler.java (100%) rename natservice/{natservice-impl => impl}/src/main/java/org/opendaylight/netvirt/natservice/internal/AbstractSnatService.java (100%) rename natservice/{natservice-impl => impl}/src/main/java/org/opendaylight/netvirt/natservice/internal/ConntrackBasedSnatService.java (100%) rename natservice/{natservice-impl => impl}/src/main/java/org/opendaylight/netvirt/natservice/internal/EventDispatcher.java (100%) rename natservice/{natservice-impl => impl}/src/main/java/org/opendaylight/netvirt/natservice/internal/EvpnDnatFlowProgrammer.java (100%) rename natservice/{natservice-impl => impl}/src/main/java/org/opendaylight/netvirt/natservice/internal/EvpnNaptSwitchHA.java (100%) rename natservice/{natservice-impl => impl}/src/main/java/org/opendaylight/netvirt/natservice/internal/EvpnSnatFlowProgrammer.java (100%) rename natservice/{natservice-impl => impl}/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalNetworkGroupInstaller.java (100%) rename natservice/{natservice-impl => impl}/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalNetworksChangeListener.java (100%) rename natservice/{natservice-impl => impl}/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalRoutersListener.java (100%) rename natservice/{natservice-impl => impl}/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalSubnetVpnInstanceListener.java (100%) rename natservice/{natservice-impl => impl}/src/main/java/org/opendaylight/netvirt/natservice/internal/FlatVlanConntrackBasedSnatService.java (100%) rename natservice/{natservice-impl => impl}/src/main/java/org/opendaylight/netvirt/natservice/internal/FloatingIPHandler.java (100%) rename natservice/{natservice-impl => impl}/src/main/java/org/opendaylight/netvirt/natservice/internal/FloatingIPListener.java (100%) rename natservice/{natservice-impl => impl}/src/main/java/org/opendaylight/netvirt/natservice/internal/IPAddress.java (100%) rename natservice/{natservice-impl => impl}/src/main/java/org/opendaylight/netvirt/natservice/internal/InterfaceStateEventListener.java (100%) rename natservice/{natservice-impl => impl}/src/main/java/org/opendaylight/netvirt/natservice/internal/NAPTEntryEvent.java (100%) rename natservice/{natservice-impl => impl}/src/main/java/org/opendaylight/netvirt/natservice/internal/NAPTSwitchSelector.java (100%) rename natservice/{natservice-impl => impl}/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptEventHandler.java (100%) rename natservice/{natservice-impl => impl}/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptFlowRemovedEventHandler.java (100%) rename natservice/{natservice-impl => impl}/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptManager.java (100%) rename natservice/{natservice-impl => impl}/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptPacketInHandler.java (100%) rename natservice/{natservice-impl => impl}/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptSwitchHA.java (100%) rename natservice/{natservice-impl => impl}/src/main/java/org/opendaylight/netvirt/natservice/internal/NatConstants.java (100%) rename natservice/{natservice-impl => impl}/src/main/java/org/opendaylight/netvirt/natservice/internal/NatEvpnUtil.java (100%) rename natservice/{natservice-impl => impl}/src/main/java/org/opendaylight/netvirt/natservice/internal/NatInterfaceStateChangeListener.java (100%) rename natservice/{natservice-impl => impl}/src/main/java/org/opendaylight/netvirt/natservice/internal/NatOverVxlanUtil.java (100%) rename natservice/{natservice-impl => impl}/src/main/java/org/opendaylight/netvirt/natservice/internal/NatRouterInterfaceListener.java (100%) rename natservice/{natservice-impl => impl}/src/main/java/org/opendaylight/netvirt/natservice/internal/NatServiceCounters.java (100%) rename natservice/{natservice-impl => impl}/src/main/java/org/opendaylight/netvirt/natservice/internal/NatTunnelInterfaceStateListener.java (100%) rename natservice/{natservice-impl => impl}/src/main/java/org/opendaylight/netvirt/natservice/internal/NatUtil.java (100%) rename natservice/{natservice-impl => impl}/src/main/java/org/opendaylight/netvirt/natservice/internal/RouterDpnChangeListener.java (100%) rename natservice/{natservice-impl => impl}/src/main/java/org/opendaylight/netvirt/natservice/internal/RouterPortsListener.java (100%) rename natservice/{natservice-impl => impl}/src/main/java/org/opendaylight/netvirt/natservice/internal/RouterToVpnListener.java (100%) rename natservice/{natservice-impl => impl}/src/main/java/org/opendaylight/netvirt/natservice/internal/SNATDefaultRouteProgrammer.java (100%) rename natservice/{natservice-impl => impl}/src/main/java/org/opendaylight/netvirt/natservice/internal/SessionAddress.java (100%) rename natservice/{natservice-impl => impl}/src/main/java/org/opendaylight/netvirt/natservice/internal/SnatServiceImplFactory.java (100%) rename natservice/{natservice-impl => impl}/src/main/java/org/opendaylight/netvirt/natservice/internal/SnatServiceManagerImpl.java (100%) rename natservice/{natservice-impl => impl}/src/main/java/org/opendaylight/netvirt/natservice/internal/SubnetGwMacChangeListener.java (100%) rename natservice/{natservice-impl => impl}/src/main/java/org/opendaylight/netvirt/natservice/internal/SubnetmapListener.java (100%) rename natservice/{natservice-impl => impl}/src/main/java/org/opendaylight/netvirt/natservice/internal/UpgradeStateListener.java (100%) rename natservice/{natservice-impl => impl}/src/main/java/org/opendaylight/netvirt/natservice/internal/VpnFloatingIpHandler.java (100%) rename natservice/{natservice-impl => impl}/src/main/java/org/opendaylight/netvirt/natservice/internal/VxlanGreConntrackBasedSnatService.java (100%) rename natservice/{natservice-impl => impl}/src/main/java/org/opendaylight/netvirt/natservice/rpcservice/NatRpcServiceImpl.java (100%) rename natservice/{natservice-impl => impl}/src/main/resources/initial/netvirt-natservice-config.xml (100%) rename natservice/{natservice-impl => impl}/src/main/resources/org/opendaylight/blueprint/commands.xml (100%) rename natservice/{natservice-impl => impl}/src/main/resources/org/opendaylight/blueprint/natservice.xml (100%) rename natservice/{natservice-impl => impl}/src/main/yang/natservice-config.yang (100%) rename natservice/{natservice-impl => impl}/src/test/java/org/opendaylight/netvirt/natservice/internal/AbstractSnatServiceTest.java (100%) rename natservice/{natservice-impl => impl}/src/test/java/org/opendaylight/netvirt/natservice/internal/test/ExternalNetworksChangeListenerTest.java (100%) rename natservice/{natservice-impl => impl}/src/test/java/org/opendaylight/netvirt/natservice/internal/test/NaptManagerTest.java (100%) rename natservice/{natservice-impl => impl}/src/test/java/org/opendaylight/netvirt/natservice/internal/test/NatUtilTest.java (100%) rename neutronvpn/{neutronvpn-api => api}/pom.xml (100%) rename neutronvpn/{neutronvpn-api => api}/src/main/java/org/opendaylight/netvirt/neutronvpn/api/enums/IpVersionChoice.java (100%) rename neutronvpn/{neutronvpn-api => api}/src/main/java/org/opendaylight/netvirt/neutronvpn/api/l2gw/L2GatewayCache.java (100%) rename neutronvpn/{neutronvpn-api => api}/src/main/java/org/opendaylight/netvirt/neutronvpn/api/l2gw/L2GatewayDevice.java (100%) rename neutronvpn/{neutronvpn-api => api}/src/main/java/org/opendaylight/netvirt/neutronvpn/api/utils/ChangeUtils.java (100%) rename neutronvpn/{neutronvpn-api => api}/src/main/java/org/opendaylight/netvirt/neutronvpn/api/utils/NeutronConstants.java (100%) rename neutronvpn/{neutronvpn-api => api}/src/main/java/org/opendaylight/netvirt/neutronvpn/api/utils/NeutronUtils.java (100%) rename neutronvpn/{neutronvpn-api => api}/src/main/java/org/opendaylight/netvirt/neutronvpn/interfaces/INeutronVpnManager.java (100%) rename neutronvpn/{neutronvpn-api => api}/src/main/yang/neutronvpn.yang (100%) rename neutronvpn/{neutronvpn-impl => impl}/pom.xml (100%) rename neutronvpn/{neutronvpn-impl => impl}/src/main/java/org/opendaylight/netvirt/neutronvpn/HostConfigCache.java (100%) rename neutronvpn/{neutronvpn-impl => impl}/src/main/java/org/opendaylight/netvirt/neutronvpn/IPV6InternetDefaultRouteProgrammer.java (100%) rename neutronvpn/{neutronvpn-impl => impl}/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronBgpvpnChangeListener.java (100%) rename neutronvpn/{neutronvpn-impl => impl}/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronExternalSubnetHandler.java (100%) rename neutronvpn/{neutronvpn-impl => impl}/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronFloatingToFixedIpMappingChangeListener.java (100%) rename neutronvpn/{neutronvpn-impl => impl}/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronHostConfigChangeListener.java (100%) rename neutronvpn/{neutronvpn-impl => impl}/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronNetworkChangeListener.java (100%) rename neutronvpn/{neutronvpn-impl => impl}/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronPortChangeListener.java (100%) rename neutronvpn/{neutronvpn-impl => impl}/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronRouterChangeListener.java (100%) rename neutronvpn/{neutronvpn-impl => impl}/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronSecurityRuleConstants.java (100%) rename neutronvpn/{neutronvpn-impl => impl}/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronSecurityRuleListener.java (100%) rename neutronvpn/{neutronvpn-impl => impl}/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronSubnetChangeListener.java (100%) rename neutronvpn/{neutronvpn-impl => impl}/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronSubnetGwMacResolver.java (100%) rename neutronvpn/{neutronvpn-impl => impl}/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronTrunkChangeListener.java (100%) rename neutronvpn/{neutronvpn-impl => impl}/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnManager.java (100%) rename neutronvpn/{neutronvpn-impl => impl}/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnManagerImpl.java (100%) rename neutronvpn/{neutronvpn-impl => impl}/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnNatManager.java (100%) rename neutronvpn/{neutronvpn-impl => impl}/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnUtils.java (100%) rename neutronvpn/{neutronvpn-impl => impl}/src/main/java/org/opendaylight/netvirt/neutronvpn/UpgradeStateListener.java (100%) rename neutronvpn/{neutronvpn-impl => impl}/src/main/java/org/opendaylight/netvirt/neutronvpn/evpn/manager/NeutronEvpnManager.java (100%) rename neutronvpn/{neutronvpn-impl => impl}/src/main/java/org/opendaylight/netvirt/neutronvpn/evpn/utils/NeutronEvpnUtils.java (100%) rename neutronvpn/{neutronvpn-impl => impl}/src/main/java/org/opendaylight/netvirt/neutronvpn/l2gw/AddL2GwDevicesToTransportZoneJob.java (100%) rename neutronvpn/{neutronvpn-impl => impl}/src/main/java/org/opendaylight/netvirt/neutronvpn/l2gw/L2GatewayListener.java (100%) rename neutronvpn/{neutronvpn-impl => impl}/src/main/java/org/opendaylight/netvirt/neutronvpn/l2gw/L2GatewayUtils.java (100%) rename neutronvpn/{neutronvpn-impl => impl}/src/main/java/org/opendaylight/netvirt/neutronvpn/l2gw/L2GwTransportZoneListener.java (100%) rename neutronvpn/{neutronvpn-impl => impl}/src/main/resources/initial/netvirt-neutronvpn-config.xml (100%) rename neutronvpn/{neutronvpn-impl => impl}/src/main/resources/org/opendaylight/blueprint/neutronvpn.xml (100%) rename neutronvpn/{neutronvpn-impl => impl}/src/main/yang/neutronvpn-config.yang (100%) rename neutronvpn/{neutronvpn-impl => impl}/src/test/java/org/opendaylight/netvirt/neutronvpn/NeutronPortChangeListenerTest.java (100%) rename neutronvpn/{neutronvpn-shell => shell}/pom.xml (100%) rename neutronvpn/{neutronvpn-shell => shell}/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/ConfigureL3VpnCommand.java (100%) rename neutronvpn/{neutronvpn-shell => shell}/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/DhcpConfigureCommand.java (100%) rename neutronvpn/{neutronvpn-shell => shell}/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/DhcpShowCommand.java (100%) rename neutronvpn/{neutronvpn-shell => shell}/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/ShowNeutronPortsCommand.java (100%) rename neutronvpn/{neutronvpn-shell => shell}/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/ShowSubnet.java (100%) rename neutronvpn/{neutronvpn-shell => shell}/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/ShowVpnConfigCommand.java (100%) rename neutronvpn/{neutronvpn-shell => shell}/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/ShowVpnIpToPort.java (100%) rename neutronvpn/{neutronvpn-shell => shell}/src/main/resources/OSGI-INF/blueprint/blueprint.xml (100%) rename vpnmanager/{vpnmanager-api => api}/pom.xml (100%) rename vpnmanager/{vpnmanager-api => api}/src/main/java/org/opendaylight/netvirt/vpnmanager/api/ICentralizedSwitchProvider.java (100%) rename vpnmanager/{vpnmanager-api => api}/src/main/java/org/opendaylight/netvirt/vpnmanager/api/IVpnFootprintService.java (100%) rename vpnmanager/{vpnmanager-api => api}/src/main/java/org/opendaylight/netvirt/vpnmanager/api/IVpnManager.java (100%) rename vpnmanager/{vpnmanager-api => api}/src/main/java/org/opendaylight/netvirt/vpnmanager/api/InterfaceUtils.java (100%) rename vpnmanager/{vpnmanager-api => api}/src/main/java/org/opendaylight/netvirt/vpnmanager/api/VpnExtraRouteHelper.java (100%) rename vpnmanager/{vpnmanager-api => api}/src/main/java/org/opendaylight/netvirt/vpnmanager/api/VpnHelper.java (100%) rename vpnmanager/{vpnmanager-api => api}/src/main/java/org/opendaylight/netvirt/vpnmanager/api/intervpnlink/IVpnLinkService.java (100%) rename vpnmanager/{vpnmanager-api => api}/src/main/java/org/opendaylight/netvirt/vpnmanager/api/intervpnlink/InterVpnLinkCache.java (100%) rename vpnmanager/{vpnmanager-api => api}/src/main/java/org/opendaylight/netvirt/vpnmanager/api/intervpnlink/InterVpnLinkDataComposite.java (100%) rename vpnmanager/{vpnmanager-api => api}/src/main/yang/inter-vpn-link.yang (100%) rename vpnmanager/{vpnmanager-api => api}/src/main/yang/l3vpn.yang (100%) rename vpnmanager/{vpnmanager-api => api}/src/main/yang/odl-l3vpn.yang (100%) rename vpnmanager/{vpnmanager-api => api}/src/main/yang/vpn-rpc.yang (100%) rename vpnmanager/{vpnmanager-impl => impl}/pom.xml (100%) rename vpnmanager/{vpnmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/vpnmanager/AlivenessMonitorUtils.java (100%) rename vpnmanager/{vpnmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpMonitorEventListener.java (100%) rename vpnmanager/{vpnmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpMonitorStartTask.java (100%) rename vpnmanager/{vpnmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpMonitorStopTask.java (100%) rename vpnmanager/{vpnmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpMonitoringHandler.java (100%) rename vpnmanager/{vpnmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpNotificationHandler.java (100%) rename vpnmanager/{vpnmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpReplyOrRequest.java (100%) rename vpnmanager/{vpnmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpUtils.java (100%) rename vpnmanager/{vpnmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/vpnmanager/CentralizedSwitchChangeListener.java (100%) rename vpnmanager/{vpnmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/vpnmanager/CentralizedSwitchProvider.java (100%) rename vpnmanager/{vpnmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/vpnmanager/DpnInVpnChangeListener.java (100%) rename vpnmanager/{vpnmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/vpnmanager/FibEntriesListener.java (100%) rename vpnmanager/{vpnmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/vpnmanager/InterfaceStateChangeListener.java (100%) rename vpnmanager/{vpnmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/vpnmanager/MacEntry.java (100%) rename vpnmanager/{vpnmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetOpDpnManager.java (100%) rename vpnmanager/{vpnmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetRouteInterfaceStateChangeListener.java (100%) rename vpnmanager/{vpnmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetRoutePacketInHandler.java (100%) rename vpnmanager/{vpnmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetmapChangeListener.java (100%) rename vpnmanager/{vpnmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/vpnmanager/TransactionUtil.java (100%) rename vpnmanager/{vpnmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/vpnmanager/TunnelEndPointChangeListener.java (100%) rename vpnmanager/{vpnmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/vpnmanager/TunnelInterfaceStateListener.java (100%) rename vpnmanager/{vpnmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/vpnmanager/UpdateData.java (100%) rename vpnmanager/{vpnmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnConstants.java (100%) rename vpnmanager/{vpnmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnElanInterfaceChangeListener.java (100%) rename vpnmanager/{vpnmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnFootprintService.java (100%) rename vpnmanager/{vpnmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInstanceListener.java (100%) rename vpnmanager/{vpnmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInterfaceManager.java (100%) rename vpnmanager/{vpnmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInterfaceOpListener.java (100%) rename vpnmanager/{vpnmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnManagerImpl.java (100%) rename vpnmanager/{vpnmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnNodeListener.java (100%) rename vpnmanager/{vpnmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnNotifyTask.java (100%) rename vpnmanager/{vpnmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnOpDataSyncer.java (100%) rename vpnmanager/{vpnmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnOpStatusListener.java (100%) rename vpnmanager/{vpnmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnOperDsUtils.java (100%) rename vpnmanager/{vpnmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnRpcServiceImpl.java (100%) rename vpnmanager/{vpnmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnSubnetRouteHandler.java (100%) rename vpnmanager/{vpnmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnUtil.java (100%) rename vpnmanager/{vpnmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/vpnmanager/arp/responder/ArpResponderHandler.java (100%) rename vpnmanager/{vpnmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/IVpnLinkServiceImpl.java (100%) rename vpnmanager/{vpnmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkCacheFeeder.java (100%) rename vpnmanager/{vpnmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkCacheImpl.java (100%) rename vpnmanager/{vpnmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkListener.java (100%) rename vpnmanager/{vpnmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkLocator.java (100%) rename vpnmanager/{vpnmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkNodeAddTask.java (100%) rename vpnmanager/{vpnmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkNodeListener.java (100%) rename vpnmanager/{vpnmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkStateCacheFeeder.java (100%) rename vpnmanager/{vpnmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkStateListener.java (100%) rename vpnmanager/{vpnmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkUtil.java (100%) rename vpnmanager/{vpnmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/tasks/InterVpnLinkCleanedCheckerTask.java (100%) rename vpnmanager/{vpnmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/tasks/InterVpnLinkCreatorTask.java (100%) rename vpnmanager/{vpnmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/tasks/InterVpnLinkRemoverTask.java (100%) rename vpnmanager/{vpnmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/impl/L3vpnOverMplsGrePopulator.java (100%) rename vpnmanager/{vpnmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/impl/L3vpnOverVxlanPopulator.java (100%) rename vpnmanager/{vpnmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/impl/L3vpnPopulator.java (100%) rename vpnmanager/{vpnmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/input/L3vpnInput.java (100%) rename vpnmanager/{vpnmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/intfc/VpnPopulator.java (100%) rename vpnmanager/{vpnmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/registry/L3vpnRegistry.java (100%) rename vpnmanager/{vpnmanager-impl => impl}/src/main/java/org/opendaylight/netvirt/vpnmanager/utilities/VpnManagerCounters.java (100%) rename vpnmanager/{vpnmanager-impl => impl}/src/main/resources/initial/netvirt-vpnmanager-config.xml (100%) rename vpnmanager/{vpnmanager-impl => impl}/src/main/resources/org/opendaylight/blueprint/vpnmanager.xml (100%) rename vpnmanager/{vpnmanager-impl => impl}/src/main/yang/vpnmanager-config.yang (100%) rename vpnmanager/{vpnmanager-impl => impl}/src/test/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkLocatorTest.java (100%) rename vpnmanager/{vpnmanager-impl => impl}/src/test/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkTestCatalog.java (100%) rename vpnmanager/{vpnmanager-impl => impl}/src/test/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/L3VpnTestCatalog.java (100%) rename vpnmanager/{vpnmanager-impl => impl}/src/test/java/org/opendaylight/netvirt/vpnmanager/test/SubnetOpDpnManagerTest.java (100%) rename vpnmanager/{vpnmanager-impl => impl}/src/test/java/org/opendaylight/netvirt/vpnmanager/test/VpnServiceTest.java (100%) rename vpnmanager/{vpnmanager-impl => impl}/src/test/java/org/opendaylight/netvirt/vpnmanager/test/VpnSubnetRouteHandlerTest.java (100%) rename vpnmanager/{vpnmanager-shell => shell}/pom.xml (100%) rename vpnmanager/{vpnmanager-shell => shell}/src/main/java/org/opendaylight/netvirt/vpnmanager/shell/ShowVpn.java (100%) rename vpnmanager/{vpnmanager-shell => shell}/src/main/java/org/opendaylight/netvirt/vpnmanager/shell/ShowVpnInstanceOpData.java (100%) rename vpnmanager/{vpnmanager-shell => shell}/src/main/resources/OSGI-INF/blueprint/blueprint.xml (100%) diff --git a/bgpmanager/bgpmanager-api/pom.xml b/bgpmanager/api/pom.xml similarity index 100% rename from bgpmanager/bgpmanager-api/pom.xml rename to bgpmanager/api/pom.xml diff --git a/bgpmanager/bgpmanager-api/src/main/java/org/opendaylight/netvirt/bgpmanager/api/IBgpManager.java b/bgpmanager/api/src/main/java/org/opendaylight/netvirt/bgpmanager/api/IBgpManager.java similarity index 100% rename from bgpmanager/bgpmanager-api/src/main/java/org/opendaylight/netvirt/bgpmanager/api/IBgpManager.java rename to bgpmanager/api/src/main/java/org/opendaylight/netvirt/bgpmanager/api/IBgpManager.java diff --git a/bgpmanager/bgpmanager-impl/pom.xml b/bgpmanager/impl/pom.xml similarity index 100% rename from bgpmanager/bgpmanager-impl/pom.xml rename to bgpmanager/impl/pom.xml diff --git a/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/BgpConfigurationManager.java b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/BgpConfigurationManager.java similarity index 100% rename from bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/BgpConfigurationManager.java rename to bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/BgpConfigurationManager.java diff --git a/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/BgpManager.java b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/BgpManager.java similarity index 100% rename from bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/BgpManager.java rename to bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/BgpManager.java diff --git a/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/BgpUtil.java b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/BgpUtil.java similarity index 100% rename from bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/BgpUtil.java rename to bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/BgpUtil.java diff --git a/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/ConfigureBgpCli.java b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/ConfigureBgpCli.java similarity index 100% rename from bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/ConfigureBgpCli.java rename to bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/ConfigureBgpCli.java diff --git a/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/DisplayBgpConfigCli.java b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/DisplayBgpConfigCli.java similarity index 100% rename from bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/DisplayBgpConfigCli.java rename to bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/DisplayBgpConfigCli.java diff --git a/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/EvpnRdNetworkListener.java b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/EvpnRdNetworkListener.java similarity index 100% rename from bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/EvpnRdNetworkListener.java rename to bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/EvpnRdNetworkListener.java diff --git a/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/FibDSWriter.java b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/FibDSWriter.java similarity index 100% rename from bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/FibDSWriter.java rename to bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/FibDSWriter.java diff --git a/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/RetryOnException.java b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/RetryOnException.java similarity index 100% rename from bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/RetryOnException.java rename to bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/RetryOnException.java diff --git a/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/VtyshCli.java b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/VtyshCli.java similarity index 100% rename from bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/VtyshCli.java rename to bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/VtyshCli.java diff --git a/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Cache.java b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Cache.java similarity index 100% rename from bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Cache.java rename to bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Cache.java diff --git a/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/ClearBgpCli.java b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/ClearBgpCli.java similarity index 100% rename from bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/ClearBgpCli.java rename to bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/ClearBgpCli.java diff --git a/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Commands.java b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Commands.java similarity index 100% rename from bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Commands.java rename to bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Commands.java diff --git a/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Connect.java b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Connect.java similarity index 100% rename from bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Connect.java rename to bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Connect.java diff --git a/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Misc.java b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Misc.java similarity index 100% rename from bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Misc.java rename to bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Misc.java diff --git a/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Multipath.java b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Multipath.java similarity index 100% rename from bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Multipath.java rename to bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Multipath.java diff --git a/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Neighbor.java b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Neighbor.java similarity index 100% rename from bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Neighbor.java rename to bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Neighbor.java diff --git a/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Network.java b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Network.java similarity index 100% rename from bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Network.java rename to bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Network.java diff --git a/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Router.java b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Router.java similarity index 100% rename from bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Router.java rename to bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Router.java diff --git a/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Vrf.java b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Vrf.java similarity index 100% rename from bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Vrf.java rename to bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Vrf.java diff --git a/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpAlarmBroadcaster.java b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpAlarmBroadcaster.java similarity index 100% rename from bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpAlarmBroadcaster.java rename to bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpAlarmBroadcaster.java diff --git a/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpAlarmBroadcasterMBean.java b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpAlarmBroadcasterMBean.java similarity index 100% rename from bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpAlarmBroadcasterMBean.java rename to bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpAlarmBroadcasterMBean.java diff --git a/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpAlarmErrorCodes.java b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpAlarmErrorCodes.java similarity index 100% rename from bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpAlarmErrorCodes.java rename to bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpAlarmErrorCodes.java diff --git a/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpAlarmStatus.java b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpAlarmStatus.java similarity index 100% rename from bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpAlarmStatus.java rename to bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpAlarmStatus.java diff --git a/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpAlarms.java b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpAlarms.java similarity index 100% rename from bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpAlarms.java rename to bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpAlarms.java diff --git a/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpConstants.java b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpConstants.java similarity index 100% rename from bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpConstants.java rename to bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpConstants.java diff --git a/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpCounters.java b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpCounters.java similarity index 100% rename from bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpCounters.java rename to bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpCounters.java diff --git a/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpJMXAlarmAgent.java b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpJMXAlarmAgent.java similarity index 100% rename from bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpJMXAlarmAgent.java rename to bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpJMXAlarmAgent.java diff --git a/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpNbrControlPathAlarm.java b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpNbrControlPathAlarm.java similarity index 100% rename from bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpNbrControlPathAlarm.java rename to bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpNbrControlPathAlarm.java diff --git a/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpNbrControlPathAlarmMBean.java b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpNbrControlPathAlarmMBean.java similarity index 100% rename from bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpNbrControlPathAlarmMBean.java rename to bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpNbrControlPathAlarmMBean.java diff --git a/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/client/BgpRouter.java b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/client/BgpRouter.java similarity index 100% rename from bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/client/BgpRouter.java rename to bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/client/BgpRouter.java diff --git a/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/client/BgpRouterException.java b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/client/BgpRouterException.java similarity index 100% rename from bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/client/BgpRouterException.java rename to bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/client/BgpRouterException.java diff --git a/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/client/BgpSyncHandle.java b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/client/BgpSyncHandle.java similarity index 100% rename from bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/client/BgpSyncHandle.java rename to bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/client/BgpSyncHandle.java diff --git a/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/BgpConfigurator.java b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/BgpConfigurator.java similarity index 100% rename from bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/BgpConfigurator.java rename to bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/BgpConfigurator.java diff --git a/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/BgpUpdater.java b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/BgpUpdater.java similarity index 100% rename from bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/BgpUpdater.java rename to bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/BgpUpdater.java diff --git a/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/Routes.java b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/Routes.java similarity index 100% rename from bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/Routes.java rename to bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/Routes.java diff --git a/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/Update.java b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/Update.java similarity index 100% rename from bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/Update.java rename to bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/Update.java diff --git a/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/af_afi.java b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/af_afi.java similarity index 100% rename from bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/af_afi.java rename to bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/af_afi.java diff --git a/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/af_safi.java b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/af_safi.java similarity index 100% rename from bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/af_safi.java rename to bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/af_safi.java diff --git a/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/encap_type.java b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/encap_type.java similarity index 100% rename from bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/encap_type.java rename to bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/encap_type.java diff --git a/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/layer_type.java b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/layer_type.java similarity index 100% rename from bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/layer_type.java rename to bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/layer_type.java diff --git a/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/protocol_type.java b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/protocol_type.java similarity index 100% rename from bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/protocol_type.java rename to bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/protocol_type.java diff --git a/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/qbgpConstants.java b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/qbgpConstants.java similarity index 100% rename from bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/qbgpConstants.java rename to bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/qbgpConstants.java diff --git a/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/idl/qbgp.thrift b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/idl/qbgp.thrift similarity index 100% rename from bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/idl/qbgp.thrift rename to bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/idl/qbgp.thrift diff --git a/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/server/BgpThriftService.java b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/server/BgpThriftService.java similarity index 100% rename from bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/server/BgpThriftService.java rename to bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/server/BgpThriftService.java diff --git a/bgpmanager/bgpmanager-impl/src/main/resources/org/opendaylight/blueprint/bgpmanager.xml b/bgpmanager/impl/src/main/resources/org/opendaylight/blueprint/bgpmanager.xml similarity index 100% rename from bgpmanager/bgpmanager-impl/src/main/resources/org/opendaylight/blueprint/bgpmanager.xml rename to bgpmanager/impl/src/main/resources/org/opendaylight/blueprint/bgpmanager.xml diff --git a/bgpmanager/bgpmanager-impl/src/main/resources/org/opendaylight/blueprint/commands.xml b/bgpmanager/impl/src/main/resources/org/opendaylight/blueprint/commands.xml similarity index 100% rename from bgpmanager/bgpmanager-impl/src/main/resources/org/opendaylight/blueprint/commands.xml rename to bgpmanager/impl/src/main/resources/org/opendaylight/blueprint/commands.xml diff --git a/bgpmanager/bgpmanager-impl/src/test/java/org/opendaylight/netvirt/bgpmanager/test/AbstractMockFibManager.java b/bgpmanager/impl/src/test/java/org/opendaylight/netvirt/bgpmanager/test/AbstractMockFibManager.java similarity index 100% rename from bgpmanager/bgpmanager-impl/src/test/java/org/opendaylight/netvirt/bgpmanager/test/AbstractMockFibManager.java rename to bgpmanager/impl/src/test/java/org/opendaylight/netvirt/bgpmanager/test/AbstractMockFibManager.java diff --git a/bgpmanager/bgpmanager-impl/src/test/java/org/opendaylight/netvirt/bgpmanager/test/BgpManagerTest.java b/bgpmanager/impl/src/test/java/org/opendaylight/netvirt/bgpmanager/test/BgpManagerTest.java similarity index 100% rename from bgpmanager/bgpmanager-impl/src/test/java/org/opendaylight/netvirt/bgpmanager/test/BgpManagerTest.java rename to bgpmanager/impl/src/test/java/org/opendaylight/netvirt/bgpmanager/test/BgpManagerTest.java diff --git a/bgpmanager/bgpmanager-impl/src/test/java/org/opendaylight/netvirt/bgpmanager/test/MockFibManager.java b/bgpmanager/impl/src/test/java/org/opendaylight/netvirt/bgpmanager/test/MockFibManager.java similarity index 100% rename from bgpmanager/bgpmanager-impl/src/test/java/org/opendaylight/netvirt/bgpmanager/test/MockFibManager.java rename to bgpmanager/impl/src/test/java/org/opendaylight/netvirt/bgpmanager/test/MockFibManager.java diff --git a/bgpmanager/bgpmanager-impl/src/test/java/org/opendaylight/netvirt/bgpmanager/thrift/client/BgpRouterAddNeighborTest.java b/bgpmanager/impl/src/test/java/org/opendaylight/netvirt/bgpmanager/thrift/client/BgpRouterAddNeighborTest.java similarity index 100% rename from bgpmanager/bgpmanager-impl/src/test/java/org/opendaylight/netvirt/bgpmanager/thrift/client/BgpRouterAddNeighborTest.java rename to bgpmanager/impl/src/test/java/org/opendaylight/netvirt/bgpmanager/thrift/client/BgpRouterAddNeighborTest.java diff --git a/bgpmanager/pom.xml b/bgpmanager/pom.xml index 054b6f0091..40013b6161 100644 --- a/bgpmanager/pom.xml +++ b/bgpmanager/pom.xml @@ -24,8 +24,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL 4.0.0 - bgpmanager-api - bgpmanager-impl + api + impl diff --git a/cloud-servicechain/cloud-servicechain-api/pom.xml b/cloud-servicechain/api/pom.xml similarity index 100% rename from cloud-servicechain/cloud-servicechain-api/pom.xml rename to cloud-servicechain/api/pom.xml diff --git a/cloud-servicechain/cloud-servicechain-api/src/main/java/org/opendaylight/netvirt/cloudservicechain/api/ICloudServiceChain.java b/cloud-servicechain/api/src/main/java/org/opendaylight/netvirt/cloudservicechain/api/ICloudServiceChain.java similarity index 100% rename from cloud-servicechain/cloud-servicechain-api/src/main/java/org/opendaylight/netvirt/cloudservicechain/api/ICloudServiceChain.java rename to cloud-servicechain/api/src/main/java/org/opendaylight/netvirt/cloudservicechain/api/ICloudServiceChain.java diff --git a/cloud-servicechain/cloud-servicechain-api/src/main/yang/cloud-servicechain-state.yang b/cloud-servicechain/api/src/main/yang/cloud-servicechain-state.yang similarity index 100% rename from cloud-servicechain/cloud-servicechain-api/src/main/yang/cloud-servicechain-state.yang rename to cloud-servicechain/api/src/main/yang/cloud-servicechain-state.yang diff --git a/cloud-servicechain/cloud-servicechain-impl/pom.xml b/cloud-servicechain/impl/pom.xml similarity index 100% rename from cloud-servicechain/cloud-servicechain-impl/pom.xml rename to cloud-servicechain/impl/pom.xml diff --git a/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/CloudServiceChainConstants.java b/cloud-servicechain/impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/CloudServiceChainConstants.java similarity index 100% rename from cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/CloudServiceChainConstants.java rename to cloud-servicechain/impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/CloudServiceChainConstants.java diff --git a/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/CloudServiceChainProvider.java b/cloud-servicechain/impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/CloudServiceChainProvider.java similarity index 100% rename from cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/CloudServiceChainProvider.java rename to cloud-servicechain/impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/CloudServiceChainProvider.java diff --git a/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/ElanServiceChainHandler.java b/cloud-servicechain/impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/ElanServiceChainHandler.java similarity index 100% rename from cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/ElanServiceChainHandler.java rename to cloud-servicechain/impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/ElanServiceChainHandler.java diff --git a/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/VPNServiceChainHandler.java b/cloud-servicechain/impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/VPNServiceChainHandler.java similarity index 100% rename from cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/VPNServiceChainHandler.java rename to cloud-servicechain/impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/VPNServiceChainHandler.java diff --git a/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/jobs/AddVpnPseudoPortDataJob.java b/cloud-servicechain/impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/jobs/AddVpnPseudoPortDataJob.java similarity index 100% rename from cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/jobs/AddVpnPseudoPortDataJob.java rename to cloud-servicechain/impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/jobs/AddVpnPseudoPortDataJob.java diff --git a/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/jobs/RemoveVpnPseudoPortDataJob.java b/cloud-servicechain/impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/jobs/RemoveVpnPseudoPortDataJob.java similarity index 100% rename from cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/jobs/RemoveVpnPseudoPortDataJob.java rename to cloud-servicechain/impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/jobs/RemoveVpnPseudoPortDataJob.java diff --git a/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/jobs/VpnPseudoPortDataBaseJob.java b/cloud-servicechain/impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/jobs/VpnPseudoPortDataBaseJob.java similarity index 100% rename from cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/jobs/VpnPseudoPortDataBaseJob.java rename to cloud-servicechain/impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/jobs/VpnPseudoPortDataBaseJob.java diff --git a/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/listeners/CloudScVpnInterfaceListener.java b/cloud-servicechain/impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/listeners/CloudScVpnInterfaceListener.java similarity index 100% rename from cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/listeners/CloudScVpnInterfaceListener.java rename to cloud-servicechain/impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/listeners/CloudScVpnInterfaceListener.java diff --git a/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/listeners/ElanDpnInterfacesListener.java b/cloud-servicechain/impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/listeners/ElanDpnInterfacesListener.java similarity index 100% rename from cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/listeners/ElanDpnInterfacesListener.java rename to cloud-servicechain/impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/listeners/ElanDpnInterfacesListener.java diff --git a/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/listeners/VpnPseudoPortListener.java b/cloud-servicechain/impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/listeners/VpnPseudoPortListener.java similarity index 100% rename from cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/listeners/VpnPseudoPortListener.java rename to cloud-servicechain/impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/listeners/VpnPseudoPortListener.java diff --git a/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/listeners/VpnToDpnListener.java b/cloud-servicechain/impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/listeners/VpnToDpnListener.java similarity index 100% rename from cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/listeners/VpnToDpnListener.java rename to cloud-servicechain/impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/listeners/VpnToDpnListener.java diff --git a/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/listeners/VpnToElanFallbackNodeListener.java b/cloud-servicechain/impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/listeners/VpnToElanFallbackNodeListener.java similarity index 100% rename from cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/listeners/VpnToElanFallbackNodeListener.java rename to cloud-servicechain/impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/listeners/VpnToElanFallbackNodeListener.java diff --git a/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/listeners/VrfListener.java b/cloud-servicechain/impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/listeners/VrfListener.java similarity index 100% rename from cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/listeners/VrfListener.java rename to cloud-servicechain/impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/listeners/VrfListener.java diff --git a/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/utils/ElanServiceChainUtils.java b/cloud-servicechain/impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/utils/ElanServiceChainUtils.java similarity index 100% rename from cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/utils/ElanServiceChainUtils.java rename to cloud-servicechain/impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/utils/ElanServiceChainUtils.java diff --git a/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/utils/VpnPseudoPortCache.java b/cloud-servicechain/impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/utils/VpnPseudoPortCache.java similarity index 100% rename from cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/utils/VpnPseudoPortCache.java rename to cloud-servicechain/impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/utils/VpnPseudoPortCache.java diff --git a/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/utils/VpnServiceChainUtils.java b/cloud-servicechain/impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/utils/VpnServiceChainUtils.java similarity index 100% rename from cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/utils/VpnServiceChainUtils.java rename to cloud-servicechain/impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/utils/VpnServiceChainUtils.java diff --git a/cloud-servicechain/cloud-servicechain-impl/src/main/resources/org/opendaylight/blueprint/cloud-servicechain.xml b/cloud-servicechain/impl/src/main/resources/org/opendaylight/blueprint/cloud-servicechain.xml similarity index 100% rename from cloud-servicechain/cloud-servicechain-impl/src/main/resources/org/opendaylight/blueprint/cloud-servicechain.xml rename to cloud-servicechain/impl/src/main/resources/org/opendaylight/blueprint/cloud-servicechain.xml diff --git a/cloud-servicechain/cloud-servicechain-impl/src/test/java/org/opendaylight/netvirt/cloudservicechain/VPNServiceChainHandlerTest.java b/cloud-servicechain/impl/src/test/java/org/opendaylight/netvirt/cloudservicechain/VPNServiceChainHandlerTest.java similarity index 100% rename from cloud-servicechain/cloud-servicechain-impl/src/test/java/org/opendaylight/netvirt/cloudservicechain/VPNServiceChainHandlerTest.java rename to cloud-servicechain/impl/src/test/java/org/opendaylight/netvirt/cloudservicechain/VPNServiceChainHandlerTest.java diff --git a/cloud-servicechain/cloud-servicechain-impl/src/test/java/org/opendaylight/netvirt/cloudservicechain/matchers/FlowEntityMatcher.java b/cloud-servicechain/impl/src/test/java/org/opendaylight/netvirt/cloudservicechain/matchers/FlowEntityMatcher.java similarity index 100% rename from cloud-servicechain/cloud-servicechain-impl/src/test/java/org/opendaylight/netvirt/cloudservicechain/matchers/FlowEntityMatcher.java rename to cloud-servicechain/impl/src/test/java/org/opendaylight/netvirt/cloudservicechain/matchers/FlowEntityMatcher.java diff --git a/cloud-servicechain/cloud-servicechain-impl/src/test/java/org/opendaylight/netvirt/cloudservicechain/matchers/FlowMatcher.java b/cloud-servicechain/impl/src/test/java/org/opendaylight/netvirt/cloudservicechain/matchers/FlowMatcher.java similarity index 100% rename from cloud-servicechain/cloud-servicechain-impl/src/test/java/org/opendaylight/netvirt/cloudservicechain/matchers/FlowMatcher.java rename to cloud-servicechain/impl/src/test/java/org/opendaylight/netvirt/cloudservicechain/matchers/FlowMatcher.java diff --git a/cloud-servicechain/cloud-servicechain-impl/src/test/java/org/opendaylight/netvirt/cloudservicechain/matchers/NodeIIdMatcher.java b/cloud-servicechain/impl/src/test/java/org/opendaylight/netvirt/cloudservicechain/matchers/NodeIIdMatcher.java similarity index 100% rename from cloud-servicechain/cloud-servicechain-impl/src/test/java/org/opendaylight/netvirt/cloudservicechain/matchers/NodeIIdMatcher.java rename to cloud-servicechain/impl/src/test/java/org/opendaylight/netvirt/cloudservicechain/matchers/NodeIIdMatcher.java diff --git a/cloud-servicechain/cloud-servicechain-impl/src/test/resources/simplelogger.properties b/cloud-servicechain/impl/src/test/resources/simplelogger.properties similarity index 100% rename from cloud-servicechain/cloud-servicechain-impl/src/test/resources/simplelogger.properties rename to cloud-servicechain/impl/src/test/resources/simplelogger.properties diff --git a/cloud-servicechain/pom.xml b/cloud-servicechain/pom.xml index 2e6ac26da3..e02f6448bd 100644 --- a/cloud-servicechain/pom.xml +++ b/cloud-servicechain/pom.xml @@ -23,8 +23,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL 4.0.0 - cloud-servicechain-api - cloud-servicechain-impl + api + impl diff --git a/dhcpservice/dhcpservice-api/pom.xml b/dhcpservice/api/pom.xml similarity index 100% rename from dhcpservice/dhcpservice-api/pom.xml rename to dhcpservice/api/pom.xml diff --git a/dhcpservice/dhcpservice-api/src/main/java/org/opendaylight/netvirt/dhcpservice/api/DHCP.java b/dhcpservice/api/src/main/java/org/opendaylight/netvirt/dhcpservice/api/DHCP.java similarity index 100% rename from dhcpservice/dhcpservice-api/src/main/java/org/opendaylight/netvirt/dhcpservice/api/DHCP.java rename to dhcpservice/api/src/main/java/org/opendaylight/netvirt/dhcpservice/api/DHCP.java diff --git a/dhcpservice/dhcpservice-api/src/main/java/org/opendaylight/netvirt/dhcpservice/api/DHCPConstants.java b/dhcpservice/api/src/main/java/org/opendaylight/netvirt/dhcpservice/api/DHCPConstants.java similarity index 100% rename from dhcpservice/dhcpservice-api/src/main/java/org/opendaylight/netvirt/dhcpservice/api/DHCPConstants.java rename to dhcpservice/api/src/main/java/org/opendaylight/netvirt/dhcpservice/api/DHCPConstants.java diff --git a/dhcpservice/dhcpservice-api/src/main/java/org/opendaylight/netvirt/dhcpservice/api/DHCPOptions.java b/dhcpservice/api/src/main/java/org/opendaylight/netvirt/dhcpservice/api/DHCPOptions.java similarity index 100% rename from dhcpservice/dhcpservice-api/src/main/java/org/opendaylight/netvirt/dhcpservice/api/DHCPOptions.java rename to dhcpservice/api/src/main/java/org/opendaylight/netvirt/dhcpservice/api/DHCPOptions.java diff --git a/dhcpservice/dhcpservice-api/src/main/java/org/opendaylight/netvirt/dhcpservice/api/DHCPUtils.java b/dhcpservice/api/src/main/java/org/opendaylight/netvirt/dhcpservice/api/DHCPUtils.java similarity index 100% rename from dhcpservice/dhcpservice-api/src/main/java/org/opendaylight/netvirt/dhcpservice/api/DHCPUtils.java rename to dhcpservice/api/src/main/java/org/opendaylight/netvirt/dhcpservice/api/DHCPUtils.java diff --git a/dhcpservice/dhcpservice-api/src/main/java/org/opendaylight/netvirt/dhcpservice/api/DhcpMConstants.java b/dhcpservice/api/src/main/java/org/opendaylight/netvirt/dhcpservice/api/DhcpMConstants.java similarity index 100% rename from dhcpservice/dhcpservice-api/src/main/java/org/opendaylight/netvirt/dhcpservice/api/DhcpMConstants.java rename to dhcpservice/api/src/main/java/org/opendaylight/netvirt/dhcpservice/api/DhcpMConstants.java diff --git a/dhcpservice/dhcpservice-api/src/main/yang/dhcp.yang b/dhcpservice/api/src/main/yang/dhcp.yang similarity index 100% rename from dhcpservice/dhcpservice-api/src/main/yang/dhcp.yang rename to dhcpservice/api/src/main/yang/dhcp.yang diff --git a/dhcpservice/dhcpservice-api/src/main/yang/dhcp_allocation_pool.yang b/dhcpservice/api/src/main/yang/dhcp_allocation_pool.yang similarity index 100% rename from dhcpservice/dhcpservice-api/src/main/yang/dhcp_allocation_pool.yang rename to dhcpservice/api/src/main/yang/dhcp_allocation_pool.yang diff --git a/dhcpservice/dhcpservice-api/src/main/yang/dhcpservice-api.yang b/dhcpservice/api/src/main/yang/dhcpservice-api.yang similarity index 100% rename from dhcpservice/dhcpservice-api/src/main/yang/dhcpservice-api.yang rename to dhcpservice/api/src/main/yang/dhcpservice-api.yang diff --git a/dhcpservice/dhcpservice-impl/pom.xml b/dhcpservice/impl/pom.xml similarity index 100% rename from dhcpservice/dhcpservice-impl/pom.xml rename to dhcpservice/impl/pom.xml diff --git a/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpAllocationPoolListener.java b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpAllocationPoolListener.java similarity index 100% rename from dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpAllocationPoolListener.java rename to dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpAllocationPoolListener.java diff --git a/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpAllocationPoolManager.java b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpAllocationPoolManager.java similarity index 100% rename from dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpAllocationPoolManager.java rename to dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpAllocationPoolManager.java diff --git a/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpConfigListener.java b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpConfigListener.java similarity index 100% rename from dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpConfigListener.java rename to dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpConfigListener.java diff --git a/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpDesignatedDpnListener.java b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpDesignatedDpnListener.java similarity index 100% rename from dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpDesignatedDpnListener.java rename to dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpDesignatedDpnListener.java diff --git a/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpExternalTunnelManager.java b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpExternalTunnelManager.java similarity index 100% rename from dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpExternalTunnelManager.java rename to dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpExternalTunnelManager.java diff --git a/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpInfo.java b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpInfo.java similarity index 100% rename from dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpInfo.java rename to dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpInfo.java diff --git a/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpInterfaceConfigListener.java b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpInterfaceConfigListener.java similarity index 100% rename from dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpInterfaceConfigListener.java rename to dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpInterfaceConfigListener.java diff --git a/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpInterfaceEventListener.java b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpInterfaceEventListener.java similarity index 100% rename from dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpInterfaceEventListener.java rename to dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpInterfaceEventListener.java diff --git a/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpL2GwUtil.java b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpL2GwUtil.java similarity index 100% rename from dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpL2GwUtil.java rename to dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpL2GwUtil.java diff --git a/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpManager.java b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpManager.java similarity index 100% rename from dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpManager.java rename to dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpManager.java diff --git a/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpMcastMacListener.java b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpMcastMacListener.java similarity index 100% rename from dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpMcastMacListener.java rename to dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpMcastMacListener.java diff --git a/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpNeutronPortListener.java b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpNeutronPortListener.java similarity index 100% rename from dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpNeutronPortListener.java rename to dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpNeutronPortListener.java diff --git a/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpPktHandler.java b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpPktHandler.java similarity index 100% rename from dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpPktHandler.java rename to dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpPktHandler.java diff --git a/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpPortCache.java b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpPortCache.java similarity index 100% rename from dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpPortCache.java rename to dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpPortCache.java diff --git a/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpServiceCounters.java b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpServiceCounters.java similarity index 100% rename from dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpServiceCounters.java rename to dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpServiceCounters.java diff --git a/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpServiceUtils.java b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpServiceUtils.java similarity index 100% rename from dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpServiceUtils.java rename to dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpServiceUtils.java diff --git a/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpSubnetListener.java b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpSubnetListener.java similarity index 100% rename from dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpSubnetListener.java rename to dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpSubnetListener.java diff --git a/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpUCastMacListener.java b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpUCastMacListener.java similarity index 100% rename from dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpUCastMacListener.java rename to dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpUCastMacListener.java diff --git a/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/NodeListener.java b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/NodeListener.java similarity index 100% rename from dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/NodeListener.java rename to dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/NodeListener.java diff --git a/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/jobs/DhcpAllocationPoolAddJob.java b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/jobs/DhcpAllocationPoolAddJob.java similarity index 100% rename from dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/jobs/DhcpAllocationPoolAddJob.java rename to dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/jobs/DhcpAllocationPoolAddJob.java diff --git a/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/jobs/DhcpAllocationPoolRemoveJob.java b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/jobs/DhcpAllocationPoolRemoveJob.java similarity index 100% rename from dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/jobs/DhcpAllocationPoolRemoveJob.java rename to dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/jobs/DhcpAllocationPoolRemoveJob.java diff --git a/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/jobs/DhcpInterfaceAddJob.java b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/jobs/DhcpInterfaceAddJob.java similarity index 100% rename from dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/jobs/DhcpInterfaceAddJob.java rename to dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/jobs/DhcpInterfaceAddJob.java diff --git a/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/jobs/DhcpInterfaceRemoveJob.java b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/jobs/DhcpInterfaceRemoveJob.java similarity index 100% rename from dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/jobs/DhcpInterfaceRemoveJob.java rename to dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/jobs/DhcpInterfaceRemoveJob.java diff --git a/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/jobs/DhcpInterfaceUpdateJob.java b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/jobs/DhcpInterfaceUpdateJob.java similarity index 100% rename from dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/jobs/DhcpInterfaceUpdateJob.java rename to dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/jobs/DhcpInterfaceUpdateJob.java diff --git a/dhcpservice/dhcpservice-impl/src/main/resources/initial/netvirt-dhcpservice-config.xml b/dhcpservice/impl/src/main/resources/initial/netvirt-dhcpservice-config.xml similarity index 100% rename from dhcpservice/dhcpservice-impl/src/main/resources/initial/netvirt-dhcpservice-config.xml rename to dhcpservice/impl/src/main/resources/initial/netvirt-dhcpservice-config.xml diff --git a/dhcpservice/dhcpservice-impl/src/main/resources/org/opendaylight/blueprint/dhcpservice.xml b/dhcpservice/impl/src/main/resources/org/opendaylight/blueprint/dhcpservice.xml similarity index 100% rename from dhcpservice/dhcpservice-impl/src/main/resources/org/opendaylight/blueprint/dhcpservice.xml rename to dhcpservice/impl/src/main/resources/org/opendaylight/blueprint/dhcpservice.xml diff --git a/dhcpservice/dhcpservice-impl/src/main/yang/dhcpservice-config.yang b/dhcpservice/impl/src/main/yang/dhcpservice-config.yang similarity index 100% rename from dhcpservice/dhcpservice-impl/src/main/yang/dhcpservice-config.yang rename to dhcpservice/impl/src/main/yang/dhcpservice-config.yang diff --git a/dhcpservice/pom.xml b/dhcpservice/pom.xml index a0bd91bbfc..f11478abc7 100644 --- a/dhcpservice/pom.xml +++ b/dhcpservice/pom.xml @@ -23,8 +23,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL 4.0.0 - dhcpservice-api - dhcpservice-impl + api + impl diff --git a/elanmanager/elanmanager-api/pom.xml b/elanmanager/api/pom.xml similarity index 100% rename from elanmanager/elanmanager-api/pom.xml rename to elanmanager/api/pom.xml diff --git a/elanmanager/elanmanager-api/src/main/java/org/opendaylight/netvirt/elan/arp/responder/ArpResponderConstant.java b/elanmanager/api/src/main/java/org/opendaylight/netvirt/elan/arp/responder/ArpResponderConstant.java similarity index 100% rename from elanmanager/elanmanager-api/src/main/java/org/opendaylight/netvirt/elan/arp/responder/ArpResponderConstant.java rename to elanmanager/api/src/main/java/org/opendaylight/netvirt/elan/arp/responder/ArpResponderConstant.java diff --git a/elanmanager/elanmanager-api/src/main/java/org/opendaylight/netvirt/elan/arp/responder/ArpResponderInput.java b/elanmanager/api/src/main/java/org/opendaylight/netvirt/elan/arp/responder/ArpResponderInput.java similarity index 100% rename from elanmanager/elanmanager-api/src/main/java/org/opendaylight/netvirt/elan/arp/responder/ArpResponderInput.java rename to elanmanager/api/src/main/java/org/opendaylight/netvirt/elan/arp/responder/ArpResponderInput.java diff --git a/elanmanager/elanmanager-api/src/main/java/org/opendaylight/netvirt/elan/arp/responder/ArpResponderUtil.java b/elanmanager/api/src/main/java/org/opendaylight/netvirt/elan/arp/responder/ArpResponderUtil.java similarity index 100% rename from elanmanager/elanmanager-api/src/main/java/org/opendaylight/netvirt/elan/arp/responder/ArpResponderUtil.java rename to elanmanager/api/src/main/java/org/opendaylight/netvirt/elan/arp/responder/ArpResponderUtil.java diff --git a/elanmanager/elanmanager-api/src/main/java/org/opendaylight/netvirt/elanmanager/api/ElanHelper.java b/elanmanager/api/src/main/java/org/opendaylight/netvirt/elanmanager/api/ElanHelper.java similarity index 100% rename from elanmanager/elanmanager-api/src/main/java/org/opendaylight/netvirt/elanmanager/api/ElanHelper.java rename to elanmanager/api/src/main/java/org/opendaylight/netvirt/elanmanager/api/ElanHelper.java diff --git a/elanmanager/elanmanager-api/src/main/java/org/opendaylight/netvirt/elanmanager/api/IElanBridgeManager.java b/elanmanager/api/src/main/java/org/opendaylight/netvirt/elanmanager/api/IElanBridgeManager.java similarity index 100% rename from elanmanager/elanmanager-api/src/main/java/org/opendaylight/netvirt/elanmanager/api/IElanBridgeManager.java rename to elanmanager/api/src/main/java/org/opendaylight/netvirt/elanmanager/api/IElanBridgeManager.java diff --git a/elanmanager/elanmanager-api/src/main/java/org/opendaylight/netvirt/elanmanager/api/IElanService.java b/elanmanager/api/src/main/java/org/opendaylight/netvirt/elanmanager/api/IElanService.java similarity index 100% rename from elanmanager/elanmanager-api/src/main/java/org/opendaylight/netvirt/elanmanager/api/IElanService.java rename to elanmanager/api/src/main/java/org/opendaylight/netvirt/elanmanager/api/IElanService.java diff --git a/elanmanager/elanmanager-api/src/main/java/org/opendaylight/netvirt/elanmanager/api/IEtreeService.java b/elanmanager/api/src/main/java/org/opendaylight/netvirt/elanmanager/api/IEtreeService.java similarity index 100% rename from elanmanager/elanmanager-api/src/main/java/org/opendaylight/netvirt/elanmanager/api/IEtreeService.java rename to elanmanager/api/src/main/java/org/opendaylight/netvirt/elanmanager/api/IEtreeService.java diff --git a/elanmanager/elanmanager-api/src/main/java/org/opendaylight/netvirt/elanmanager/api/IL2gwService.java b/elanmanager/api/src/main/java/org/opendaylight/netvirt/elanmanager/api/IL2gwService.java similarity index 100% rename from elanmanager/elanmanager-api/src/main/java/org/opendaylight/netvirt/elanmanager/api/IL2gwService.java rename to elanmanager/api/src/main/java/org/opendaylight/netvirt/elanmanager/api/IL2gwService.java diff --git a/elanmanager/elanmanager-api/src/main/java/org/opendaylight/netvirt/elanmanager/exceptions/MacNotFoundException.java b/elanmanager/api/src/main/java/org/opendaylight/netvirt/elanmanager/exceptions/MacNotFoundException.java similarity index 100% rename from elanmanager/elanmanager-api/src/main/java/org/opendaylight/netvirt/elanmanager/exceptions/MacNotFoundException.java rename to elanmanager/api/src/main/java/org/opendaylight/netvirt/elanmanager/exceptions/MacNotFoundException.java diff --git a/elanmanager/elanmanager-api/src/main/java/org/opendaylight/netvirt/elanmanager/utils/ElanL2GwCacheUtils.java b/elanmanager/api/src/main/java/org/opendaylight/netvirt/elanmanager/utils/ElanL2GwCacheUtils.java similarity index 100% rename from elanmanager/elanmanager-api/src/main/java/org/opendaylight/netvirt/elanmanager/utils/ElanL2GwCacheUtils.java rename to elanmanager/api/src/main/java/org/opendaylight/netvirt/elanmanager/utils/ElanL2GwCacheUtils.java diff --git a/elanmanager/elanmanager-api/src/main/yang/elan-statistics.yang b/elanmanager/api/src/main/yang/elan-statistics.yang similarity index 100% rename from elanmanager/elanmanager-api/src/main/yang/elan-statistics.yang rename to elanmanager/api/src/main/yang/elan-statistics.yang diff --git a/elanmanager/elanmanager-api/src/main/yang/elan.yang b/elanmanager/api/src/main/yang/elan.yang similarity index 100% rename from elanmanager/elanmanager-api/src/main/yang/elan.yang rename to elanmanager/api/src/main/yang/elan.yang diff --git a/elanmanager/elanmanager-api/src/main/yang/etree.yang b/elanmanager/api/src/main/yang/etree.yang similarity index 100% rename from elanmanager/elanmanager-api/src/main/yang/etree.yang rename to elanmanager/api/src/main/yang/etree.yang diff --git a/elanmanager/elanmanager-api/src/main/yang/scalein-rpc.yang b/elanmanager/api/src/main/yang/scalein-rpc.yang similarity index 100% rename from elanmanager/elanmanager-api/src/main/yang/scalein-rpc.yang rename to elanmanager/api/src/main/yang/scalein-rpc.yang diff --git a/elanmanager/elanmanager-impl/pom.xml b/elanmanager/impl/pom.xml similarity index 100% rename from elanmanager/elanmanager-impl/pom.xml rename to elanmanager/impl/pom.xml diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/ElanException.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/ElanException.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/ElanException.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/ElanException.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanAdd.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanAdd.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanAdd.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanAdd.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanDelete.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanDelete.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanDelete.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanDelete.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanGet.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanGet.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanGet.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanGet.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceAdd.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceAdd.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceAdd.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceAdd.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceDelete.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceDelete.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceDelete.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceDelete.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceGet.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceGet.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceGet.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceGet.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceUpdate.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceUpdate.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceUpdate.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceUpdate.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanMacTableFlush.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanMacTableFlush.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanMacTableFlush.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanMacTableFlush.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanMacTableGet.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanMacTableGet.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanMacTableGet.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanMacTableGet.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanUpdate.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanUpdate.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanUpdate.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanUpdate.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/StaticMacAdd.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/StaticMacAdd.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/StaticMacAdd.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/StaticMacAdd.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/StaticMacDelete.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/StaticMacDelete.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/StaticMacDelete.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/StaticMacDelete.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeAdd.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeAdd.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeAdd.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeAdd.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeDelete.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeDelete.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeDelete.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeDelete.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeGet.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeGet.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeGet.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeGet.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceAdd.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceAdd.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceAdd.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceAdd.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceDelete.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceDelete.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceDelete.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceDelete.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceGet.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceGet.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceGet.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceGet.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/l2gw/L2GwUtilsCacheCli.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/l2gw/L2GwUtilsCacheCli.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/l2gw/L2GwUtilsCacheCli.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/l2gw/L2GwUtilsCacheCli.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/l2gw/L2GwValidateCli.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/l2gw/L2GwValidateCli.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/l2gw/L2GwValidateCli.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/l2gw/L2GwValidateCli.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/l2gw/NetworkL2gwDeviceInfoCli.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/l2gw/NetworkL2gwDeviceInfoCli.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/l2gw/NetworkL2gwDeviceInfoCli.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/l2gw/NetworkL2gwDeviceInfoCli.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/diagstatus/ElanDiagStatusProvider.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/diagstatus/ElanDiagStatusProvider.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/diagstatus/ElanDiagStatusProvider.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/diagstatus/ElanDiagStatusProvider.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/evpn/listeners/ElanMacEntryListener.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/evpn/listeners/ElanMacEntryListener.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/evpn/listeners/ElanMacEntryListener.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/evpn/listeners/ElanMacEntryListener.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/evpn/listeners/EvpnElanInstanceListener.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/evpn/listeners/EvpnElanInstanceListener.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/evpn/listeners/EvpnElanInstanceListener.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/evpn/listeners/EvpnElanInstanceListener.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/evpn/listeners/MacVrfEntryListener.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/evpn/listeners/MacVrfEntryListener.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/evpn/listeners/MacVrfEntryListener.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/evpn/listeners/MacVrfEntryListener.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/evpn/utils/ElanEvpnFlowUtils.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/evpn/utils/ElanEvpnFlowUtils.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/evpn/utils/ElanEvpnFlowUtils.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/evpn/utils/ElanEvpnFlowUtils.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/evpn/utils/EvpnMacVrfUtils.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/evpn/utils/EvpnMacVrfUtils.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/evpn/utils/EvpnMacVrfUtils.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/evpn/utils/EvpnMacVrfUtils.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/evpn/utils/EvpnUtils.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/evpn/utils/EvpnUtils.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/evpn/utils/EvpnUtils.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/evpn/utils/EvpnUtils.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanBridgeManager.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanBridgeManager.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanBridgeManager.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanBridgeManager.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanDpnInterfaceClusteredListener.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanDpnInterfaceClusteredListener.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanDpnInterfaceClusteredListener.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanDpnInterfaceClusteredListener.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanDpnInterfacesListener.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanDpnInterfacesListener.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanDpnInterfacesListener.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanDpnInterfacesListener.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanDpnToTransportZoneListener.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanDpnToTransportZoneListener.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanDpnToTransportZoneListener.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanDpnToTransportZoneListener.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanExtnTepListener.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanExtnTepListener.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanExtnTepListener.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanExtnTepListener.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanInstanceManager.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanInstanceManager.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanInstanceManager.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanInstanceManager.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanInterfaceConfigListener.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanInterfaceConfigListener.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanInterfaceConfigListener.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanInterfaceConfigListener.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanInterfaceManager.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanInterfaceManager.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanInterfaceManager.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanInterfaceManager.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanInterfaceStateChangeListener.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanInterfaceStateChangeListener.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanInterfaceStateChangeListener.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanInterfaceStateChangeListener.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanInterfaceStateClusteredListener.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanInterfaceStateClusteredListener.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanInterfaceStateClusteredListener.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanInterfaceStateClusteredListener.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanItmEventListener.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanItmEventListener.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanItmEventListener.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanItmEventListener.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanLearntVpnVipToPortListener.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanLearntVpnVipToPortListener.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanLearntVpnVipToPortListener.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanLearntVpnVipToPortListener.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanManagerCounters.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanManagerCounters.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanManagerCounters.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanManagerCounters.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanNodeListener.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanNodeListener.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanNodeListener.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanNodeListener.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanOvsdbNodeListener.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanOvsdbNodeListener.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanOvsdbNodeListener.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanOvsdbNodeListener.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanPacketInHandler.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanPacketInHandler.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanPacketInHandler.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanPacketInHandler.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanServiceProvider.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanServiceProvider.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanServiceProvider.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanServiceProvider.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanSmacFlowEventListener.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanSmacFlowEventListener.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanSmacFlowEventListener.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanSmacFlowEventListener.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanTunnelInterfaceStateListener.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanTunnelInterfaceStateListener.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanTunnelInterfaceStateListener.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanTunnelInterfaceStateListener.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/InterfaceAddWorkerOnElan.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/InterfaceAddWorkerOnElan.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/InterfaceAddWorkerOnElan.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/InterfaceAddWorkerOnElan.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/InterfaceAddWorkerOnElanInterface.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/InterfaceAddWorkerOnElanInterface.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/InterfaceAddWorkerOnElanInterface.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/InterfaceAddWorkerOnElanInterface.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/InterfaceRemoveWorkerOnElan.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/InterfaceRemoveWorkerOnElan.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/InterfaceRemoveWorkerOnElan.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/InterfaceRemoveWorkerOnElan.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/InterfaceRemoveWorkerOnElanInterface.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/InterfaceRemoveWorkerOnElanInterface.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/InterfaceRemoveWorkerOnElanInterface.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/InterfaceRemoveWorkerOnElanInterface.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/VpnDpnToTransportZoneListener.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/VpnDpnToTransportZoneListener.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/VpnDpnToTransportZoneListener.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/VpnDpnToTransportZoneListener.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/BatchedTransaction.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/BatchedTransaction.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/BatchedTransaction.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/BatchedTransaction.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/HwvtepHAUtil.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/HwvtepHAUtil.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/HwvtepHAUtil.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/HwvtepHAUtil.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/BaseCommand.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/BaseCommand.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/BaseCommand.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/BaseCommand.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/IMergeCommand.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/IMergeCommand.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/IMergeCommand.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/IMergeCommand.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/LocalMcastCmd.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/LocalMcastCmd.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/LocalMcastCmd.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/LocalMcastCmd.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/LocalUcastCmd.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/LocalUcastCmd.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/LocalUcastCmd.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/LocalUcastCmd.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/LogicalSwitchesCmd.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/LogicalSwitchesCmd.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/LogicalSwitchesCmd.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/LogicalSwitchesCmd.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/MergeCommand.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/MergeCommand.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/MergeCommand.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/MergeCommand.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/PhysicalLocatorCmd.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/PhysicalLocatorCmd.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/PhysicalLocatorCmd.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/PhysicalLocatorCmd.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/RemoteMcastCmd.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/RemoteMcastCmd.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/RemoteMcastCmd.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/RemoteMcastCmd.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/RemoteUcastCmd.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/RemoteUcastCmd.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/RemoteUcastCmd.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/RemoteUcastCmd.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/SwitchesCmd.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/SwitchesCmd.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/SwitchesCmd.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/SwitchesCmd.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/TerminationPointCmd.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/TerminationPointCmd.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/TerminationPointCmd.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/TerminationPointCmd.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/TunnelCmd.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/TunnelCmd.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/TunnelCmd.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/TunnelCmd.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/TunnelIpCmd.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/TunnelIpCmd.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/TunnelIpCmd.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/TunnelIpCmd.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/ConfigNodeUpdatedHandler.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/ConfigNodeUpdatedHandler.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/ConfigNodeUpdatedHandler.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/ConfigNodeUpdatedHandler.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/HAEventHandler.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/HAEventHandler.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/HAEventHandler.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/HAEventHandler.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/IHAEventHandler.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/IHAEventHandler.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/IHAEventHandler.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/IHAEventHandler.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/INodeCopier.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/INodeCopier.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/INodeCopier.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/INodeCopier.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/NodeConnectedHandler.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/NodeConnectedHandler.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/NodeConnectedHandler.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/NodeConnectedHandler.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/NodeCopier.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/NodeCopier.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/NodeCopier.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/NodeCopier.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/NodeDisconnectedHandler.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/NodeDisconnectedHandler.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/NodeDisconnectedHandler.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/NodeDisconnectedHandler.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/OpNodeUpdatedHandler.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/OpNodeUpdatedHandler.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/OpNodeUpdatedHandler.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/OpNodeUpdatedHandler.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAConfigNodeListener.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAConfigNodeListener.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAConfigNodeListener.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAConfigNodeListener.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAJobScheduler.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAJobScheduler.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAJobScheduler.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAJobScheduler.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAListeners.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAListeners.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAListeners.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAListeners.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAOpClusteredListener.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAOpClusteredListener.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAOpClusteredListener.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAOpClusteredListener.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAOpNodeListener.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAOpNodeListener.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAOpNodeListener.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAOpNodeListener.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HwvtepNodeBaseListener.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HwvtepNodeBaseListener.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HwvtepNodeBaseListener.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HwvtepNodeBaseListener.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HwvtepNodeDataListener.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HwvtepNodeDataListener.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HwvtepNodeDataListener.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HwvtepNodeDataListener.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/merge/GlobalAugmentationMerger.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/merge/GlobalAugmentationMerger.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/merge/GlobalAugmentationMerger.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/merge/GlobalAugmentationMerger.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/merge/GlobalNodeMerger.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/merge/GlobalNodeMerger.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/merge/GlobalNodeMerger.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/merge/GlobalNodeMerger.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/merge/MergeCommandsAggregator.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/merge/MergeCommandsAggregator.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/merge/MergeCommandsAggregator.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/merge/MergeCommandsAggregator.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/merge/PSAugmentationMerger.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/merge/PSAugmentationMerger.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/merge/PSAugmentationMerger.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/merge/PSAugmentationMerger.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/merge/PSNodeMerger.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/merge/PSNodeMerger.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/merge/PSNodeMerger.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/merge/PSNodeMerger.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/jobs/AssociateHwvtepToElanJob.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/jobs/AssociateHwvtepToElanJob.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/jobs/AssociateHwvtepToElanJob.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/jobs/AssociateHwvtepToElanJob.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/jobs/DeleteL2GwDeviceMacsFromElanJob.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/jobs/DeleteL2GwDeviceMacsFromElanJob.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/jobs/DeleteL2GwDeviceMacsFromElanJob.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/jobs/DeleteL2GwDeviceMacsFromElanJob.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/jobs/DeleteLogicalSwitchJob.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/jobs/DeleteLogicalSwitchJob.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/jobs/DeleteLogicalSwitchJob.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/jobs/DeleteLogicalSwitchJob.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/jobs/DisAssociateHwvtepFromElanJob.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/jobs/DisAssociateHwvtepFromElanJob.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/jobs/DisAssociateHwvtepFromElanJob.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/jobs/DisAssociateHwvtepFromElanJob.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/jobs/HwvtepDeviceMcastMacUpdateJob.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/jobs/HwvtepDeviceMcastMacUpdateJob.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/jobs/HwvtepDeviceMcastMacUpdateJob.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/jobs/HwvtepDeviceMcastMacUpdateJob.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/jobs/LogicalSwitchAddedJob.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/jobs/LogicalSwitchAddedJob.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/jobs/LogicalSwitchAddedJob.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/jobs/LogicalSwitchAddedJob.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/ChildListener.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/ChildListener.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/ChildListener.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/ChildListener.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/ElanGroupListener.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/ElanGroupListener.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/ElanGroupListener.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/ElanGroupListener.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/ElanInstanceListener.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/ElanInstanceListener.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/ElanInstanceListener.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/ElanInstanceListener.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/HwvtepLocalUcastMacListener.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/HwvtepLocalUcastMacListener.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/HwvtepLocalUcastMacListener.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/HwvtepLocalUcastMacListener.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/HwvtepLogicalSwitchListener.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/HwvtepLogicalSwitchListener.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/HwvtepLogicalSwitchListener.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/HwvtepLogicalSwitchListener.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/HwvtepPhysicalSwitchListener.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/HwvtepPhysicalSwitchListener.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/HwvtepPhysicalSwitchListener.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/HwvtepPhysicalSwitchListener.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/HwvtepRemoteMcastMacListener.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/HwvtepRemoteMcastMacListener.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/HwvtepRemoteMcastMacListener.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/HwvtepRemoteMcastMacListener.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/HwvtepTerminationPointListener.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/HwvtepTerminationPointListener.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/HwvtepTerminationPointListener.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/HwvtepTerminationPointListener.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/L2GatewayConnectionListener.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/L2GatewayConnectionListener.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/L2GatewayConnectionListener.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/L2GatewayConnectionListener.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/LocalUcastMacListener.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/LocalUcastMacListener.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/LocalUcastMacListener.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/LocalUcastMacListener.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/ElanL2GatewayMulticastUtils.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/ElanL2GatewayMulticastUtils.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/ElanL2GatewayMulticastUtils.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/ElanL2GatewayMulticastUtils.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/ElanL2GatewayUtils.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/ElanL2GatewayUtils.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/ElanL2GatewayUtils.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/ElanL2GatewayUtils.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/L2GatewayConnectionUtils.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/L2GatewayConnectionUtils.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/L2GatewayConnectionUtils.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/L2GatewayConnectionUtils.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/L2GatewayUtils.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/L2GatewayUtils.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/L2GatewayUtils.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/L2GatewayUtils.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/L2gwServiceProvider.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/L2gwServiceProvider.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/L2gwServiceProvider.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/L2gwServiceProvider.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/SettableFutureCallback.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/SettableFutureCallback.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/SettableFutureCallback.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/SettableFutureCallback.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/StaleVlanBindingsCleaner.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/StaleVlanBindingsCleaner.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/StaleVlanBindingsCleaner.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/StaleVlanBindingsCleaner.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/statisitcs/ElanStatisticsImpl.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/statisitcs/ElanStatisticsImpl.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/statisitcs/ElanStatisticsImpl.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/statisitcs/ElanStatisticsImpl.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/CacheElanInstanceListener.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/CacheElanInstanceListener.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/CacheElanInstanceListener.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/CacheElanInstanceListener.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/CacheElanInterfaceListener.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/CacheElanInterfaceListener.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/CacheElanInterfaceListener.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/CacheElanInterfaceListener.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanCLIUtils.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanCLIUtils.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanCLIUtils.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanCLIUtils.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanClusterUtils.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanClusterUtils.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanClusterUtils.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanClusterUtils.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanConstants.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanConstants.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanConstants.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanConstants.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanDmacUtils.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanDmacUtils.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanDmacUtils.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanDmacUtils.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanEtreeUtils.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanEtreeUtils.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanEtreeUtils.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanEtreeUtils.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanForwardingEntriesHandler.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanForwardingEntriesHandler.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanForwardingEntriesHandler.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanForwardingEntriesHandler.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanItmUtils.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanItmUtils.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanItmUtils.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanItmUtils.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanUtils.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanUtils.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanUtils.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanUtils.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/Scheduler.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/Scheduler.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/Scheduler.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/Scheduler.java diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/TransportZoneNotificationUtil.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/TransportZoneNotificationUtil.java similarity index 100% rename from elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/TransportZoneNotificationUtil.java rename to elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/TransportZoneNotificationUtil.java diff --git a/elanmanager/elanmanager-impl/src/main/resources/initial/netvirt-elanmanager-config.xml b/elanmanager/impl/src/main/resources/initial/netvirt-elanmanager-config.xml similarity index 100% rename from elanmanager/elanmanager-impl/src/main/resources/initial/netvirt-elanmanager-config.xml rename to elanmanager/impl/src/main/resources/initial/netvirt-elanmanager-config.xml diff --git a/elanmanager/elanmanager-impl/src/main/resources/org/opendaylight/blueprint/commands.xml b/elanmanager/impl/src/main/resources/org/opendaylight/blueprint/commands.xml similarity index 100% rename from elanmanager/elanmanager-impl/src/main/resources/org/opendaylight/blueprint/commands.xml rename to elanmanager/impl/src/main/resources/org/opendaylight/blueprint/commands.xml diff --git a/elanmanager/elanmanager-impl/src/main/resources/org/opendaylight/blueprint/elanmanager.xml b/elanmanager/impl/src/main/resources/org/opendaylight/blueprint/elanmanager.xml similarity index 100% rename from elanmanager/elanmanager-impl/src/main/resources/org/opendaylight/blueprint/elanmanager.xml rename to elanmanager/impl/src/main/resources/org/opendaylight/blueprint/elanmanager.xml diff --git a/elanmanager/elanmanager-impl/src/main/yang/elanmanager-config.yang b/elanmanager/impl/src/main/yang/elanmanager-config.yang similarity index 100% rename from elanmanager/elanmanager-impl/src/main/yang/elanmanager-config.yang rename to elanmanager/impl/src/main/yang/elanmanager-config.yang diff --git a/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/LogicalSwitchesCmdTest.java b/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/LogicalSwitchesCmdTest.java similarity index 100% rename from elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/LogicalSwitchesCmdTest.java rename to elanmanager/impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/LogicalSwitchesCmdTest.java diff --git a/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/DataProvider.java b/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/DataProvider.java similarity index 100% rename from elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/DataProvider.java rename to elanmanager/impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/DataProvider.java diff --git a/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/GlobalAugmentationHelper.java b/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/GlobalAugmentationHelper.java similarity index 100% rename from elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/GlobalAugmentationHelper.java rename to elanmanager/impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/GlobalAugmentationHelper.java diff --git a/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/NodeConnectedHandlerTest.java b/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/NodeConnectedHandlerTest.java similarity index 100% rename from elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/NodeConnectedHandlerTest.java rename to elanmanager/impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/NodeConnectedHandlerTest.java diff --git a/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/NodeConnectedHandlerUtils.java b/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/NodeConnectedHandlerUtils.java similarity index 100% rename from elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/NodeConnectedHandlerUtils.java rename to elanmanager/impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/NodeConnectedHandlerUtils.java diff --git a/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/PhysicalSwitchHelper.java b/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/PhysicalSwitchHelper.java similarity index 100% rename from elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/PhysicalSwitchHelper.java rename to elanmanager/impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/PhysicalSwitchHelper.java diff --git a/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/TestBuilders.java b/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/TestBuilders.java similarity index 100% rename from elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/TestBuilders.java rename to elanmanager/impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/TestBuilders.java diff --git a/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/TestComparators.java b/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/TestComparators.java similarity index 100% rename from elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/TestComparators.java rename to elanmanager/impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/TestComparators.java diff --git a/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/TestUtil.java b/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/TestUtil.java similarity index 100% rename from elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/TestUtil.java rename to elanmanager/impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/TestUtil.java diff --git a/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ElanServiceTest.java b/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ElanServiceTest.java similarity index 100% rename from elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ElanServiceTest.java rename to elanmanager/impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ElanServiceTest.java diff --git a/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ElanServiceTestBase.java b/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ElanServiceTestBase.java similarity index 100% rename from elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ElanServiceTestBase.java rename to elanmanager/impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ElanServiceTestBase.java diff --git a/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ElanServiceTestModule.java b/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ElanServiceTestModule.java similarity index 100% rename from elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ElanServiceTestModule.java rename to elanmanager/impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ElanServiceTestModule.java diff --git a/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ExpectedObjects.xtend b/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ExpectedObjects.xtend similarity index 100% rename from elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ExpectedObjects.xtend rename to elanmanager/impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ExpectedObjects.xtend diff --git a/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/utils/BgpManagerTestImpl.java b/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/utils/BgpManagerTestImpl.java similarity index 100% rename from elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/utils/BgpManagerTestImpl.java rename to elanmanager/impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/utils/BgpManagerTestImpl.java diff --git a/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/utils/ElanEgressActionsHelper.java b/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/utils/ElanEgressActionsHelper.java similarity index 100% rename from elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/utils/ElanEgressActionsHelper.java rename to elanmanager/impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/utils/ElanEgressActionsHelper.java diff --git a/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/utils/EvpnTestHelper.java b/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/utils/EvpnTestHelper.java similarity index 100% rename from elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/utils/EvpnTestHelper.java rename to elanmanager/impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/utils/EvpnTestHelper.java diff --git a/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/utils/IdHelper.java b/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/utils/IdHelper.java similarity index 100% rename from elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/utils/IdHelper.java rename to elanmanager/impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/utils/IdHelper.java diff --git a/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/utils/InterfaceHelper.java b/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/utils/InterfaceHelper.java similarity index 100% rename from elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/utils/InterfaceHelper.java rename to elanmanager/impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/utils/InterfaceHelper.java diff --git a/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/utils/VpnManagerTestImpl.java b/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/utils/VpnManagerTestImpl.java similarity index 100% rename from elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/utils/VpnManagerTestImpl.java rename to elanmanager/impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/utils/VpnManagerTestImpl.java diff --git a/elanmanager/elanmanager-impl/src/test/xtend-gen/org/opendaylight/netvirt/elanmanager/tests/.ExpectedObjects.java._trace b/elanmanager/impl/src/test/xtend-gen/org/opendaylight/netvirt/elanmanager/tests/.ExpectedObjects.java._trace similarity index 100% rename from elanmanager/elanmanager-impl/src/test/xtend-gen/org/opendaylight/netvirt/elanmanager/tests/.ExpectedObjects.java._trace rename to elanmanager/impl/src/test/xtend-gen/org/opendaylight/netvirt/elanmanager/tests/.ExpectedObjects.java._trace diff --git a/elanmanager/elanmanager-impl/src/test/xtend-gen/org/opendaylight/netvirt/elanmanager/tests/ExpectedObjects.java b/elanmanager/impl/src/test/xtend-gen/org/opendaylight/netvirt/elanmanager/tests/ExpectedObjects.java similarity index 100% rename from elanmanager/elanmanager-impl/src/test/xtend-gen/org/opendaylight/netvirt/elanmanager/tests/ExpectedObjects.java rename to elanmanager/impl/src/test/xtend-gen/org/opendaylight/netvirt/elanmanager/tests/ExpectedObjects.java diff --git a/elanmanager/pom.xml b/elanmanager/pom.xml index d26f6b3747..d8037b6f1f 100644 --- a/elanmanager/pom.xml +++ b/elanmanager/pom.xml @@ -24,8 +24,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL 4.0.0 - elanmanager-api - elanmanager-impl + api + impl diff --git a/fibmanager/fibmanager-api/pom.xml b/fibmanager/api/pom.xml similarity index 100% rename from fibmanager/fibmanager-api/pom.xml rename to fibmanager/api/pom.xml diff --git a/fibmanager/fibmanager-api/src/main/java/org/opendaylight/netvirt/fibmanager/api/FibHelper.java b/fibmanager/api/src/main/java/org/opendaylight/netvirt/fibmanager/api/FibHelper.java similarity index 100% rename from fibmanager/fibmanager-api/src/main/java/org/opendaylight/netvirt/fibmanager/api/FibHelper.java rename to fibmanager/api/src/main/java/org/opendaylight/netvirt/fibmanager/api/FibHelper.java diff --git a/fibmanager/fibmanager-api/src/main/java/org/opendaylight/netvirt/fibmanager/api/IFibManager.java b/fibmanager/api/src/main/java/org/opendaylight/netvirt/fibmanager/api/IFibManager.java similarity index 100% rename from fibmanager/fibmanager-api/src/main/java/org/opendaylight/netvirt/fibmanager/api/IFibManager.java rename to fibmanager/api/src/main/java/org/opendaylight/netvirt/fibmanager/api/IFibManager.java diff --git a/fibmanager/fibmanager-api/src/main/java/org/opendaylight/netvirt/fibmanager/api/L3VPNTransportTypes.java b/fibmanager/api/src/main/java/org/opendaylight/netvirt/fibmanager/api/L3VPNTransportTypes.java similarity index 100% rename from fibmanager/fibmanager-api/src/main/java/org/opendaylight/netvirt/fibmanager/api/L3VPNTransportTypes.java rename to fibmanager/api/src/main/java/org/opendaylight/netvirt/fibmanager/api/L3VPNTransportTypes.java diff --git a/fibmanager/fibmanager-api/src/main/java/org/opendaylight/netvirt/fibmanager/api/RouteOrigin.java b/fibmanager/api/src/main/java/org/opendaylight/netvirt/fibmanager/api/RouteOrigin.java similarity index 100% rename from fibmanager/fibmanager-api/src/main/java/org/opendaylight/netvirt/fibmanager/api/RouteOrigin.java rename to fibmanager/api/src/main/java/org/opendaylight/netvirt/fibmanager/api/RouteOrigin.java diff --git a/fibmanager/fibmanager-api/src/main/yang/fib-rpc.yang b/fibmanager/api/src/main/yang/fib-rpc.yang similarity index 100% rename from fibmanager/fibmanager-api/src/main/yang/fib-rpc.yang rename to fibmanager/api/src/main/yang/fib-rpc.yang diff --git a/fibmanager/fibmanager-api/src/main/yang/l3nexthop.yang b/fibmanager/api/src/main/yang/l3nexthop.yang similarity index 100% rename from fibmanager/fibmanager-api/src/main/yang/l3nexthop.yang rename to fibmanager/api/src/main/yang/l3nexthop.yang diff --git a/fibmanager/fibmanager-api/src/main/yang/odl-fib.yang b/fibmanager/api/src/main/yang/odl-fib.yang similarity index 100% rename from fibmanager/fibmanager-api/src/main/yang/odl-fib.yang rename to fibmanager/api/src/main/yang/odl-fib.yang diff --git a/fibmanager/fibmanager-impl/pom.xml b/fibmanager/impl/pom.xml similarity index 100% rename from fibmanager/fibmanager-impl/pom.xml rename to fibmanager/impl/pom.xml diff --git a/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/BaseVrfEntryHandler.java b/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/BaseVrfEntryHandler.java similarity index 100% rename from fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/BaseVrfEntryHandler.java rename to fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/BaseVrfEntryHandler.java diff --git a/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/BgpRouteVrfEntryHandler.java b/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/BgpRouteVrfEntryHandler.java similarity index 100% rename from fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/BgpRouteVrfEntryHandler.java rename to fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/BgpRouteVrfEntryHandler.java diff --git a/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/EvpnVrfEntryHandler.java b/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/EvpnVrfEntryHandler.java similarity index 100% rename from fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/EvpnVrfEntryHandler.java rename to fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/EvpnVrfEntryHandler.java diff --git a/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/FibConstants.java b/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/FibConstants.java similarity index 100% rename from fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/FibConstants.java rename to fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/FibConstants.java diff --git a/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/FibManagerImpl.java b/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/FibManagerImpl.java similarity index 100% rename from fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/FibManagerImpl.java rename to fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/FibManagerImpl.java diff --git a/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/FibRpcServiceImpl.java b/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/FibRpcServiceImpl.java similarity index 100% rename from fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/FibRpcServiceImpl.java rename to fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/FibRpcServiceImpl.java diff --git a/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/FibUtil.java b/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/FibUtil.java similarity index 100% rename from fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/FibUtil.java rename to fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/FibUtil.java diff --git a/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/IPv6Handler.java b/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/IPv6Handler.java similarity index 100% rename from fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/IPv6Handler.java rename to fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/IPv6Handler.java diff --git a/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/IVrfEntryHandler.java b/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/IVrfEntryHandler.java similarity index 100% rename from fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/IVrfEntryHandler.java rename to fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/IVrfEntryHandler.java diff --git a/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/NexthopManager.java b/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/NexthopManager.java similarity index 100% rename from fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/NexthopManager.java rename to fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/NexthopManager.java diff --git a/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/RouterInterfaceVrfEntryHandler.java b/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/RouterInterfaceVrfEntryHandler.java similarity index 100% rename from fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/RouterInterfaceVrfEntryHandler.java rename to fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/RouterInterfaceVrfEntryHandler.java diff --git a/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/VrfEntryListener.java b/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/VrfEntryListener.java similarity index 100% rename from fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/VrfEntryListener.java rename to fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/VrfEntryListener.java diff --git a/fibmanager/fibmanager-impl/src/main/resources/org/opendaylight/blueprint/fibmanager.xml b/fibmanager/impl/src/main/resources/org/opendaylight/blueprint/fibmanager.xml similarity index 100% rename from fibmanager/fibmanager-impl/src/main/resources/org/opendaylight/blueprint/fibmanager.xml rename to fibmanager/impl/src/main/resources/org/opendaylight/blueprint/fibmanager.xml diff --git a/fibmanager/fibmanager-impl/src/test/java/org/opendaylight/netvirt/fibmanager/test/FibManagerTest.java b/fibmanager/impl/src/test/java/org/opendaylight/netvirt/fibmanager/test/FibManagerTest.java similarity index 100% rename from fibmanager/fibmanager-impl/src/test/java/org/opendaylight/netvirt/fibmanager/test/FibManagerTest.java rename to fibmanager/impl/src/test/java/org/opendaylight/netvirt/fibmanager/test/FibManagerTest.java diff --git a/fibmanager/pom.xml b/fibmanager/pom.xml index 4387ae4780..b1c91d0e0e 100644 --- a/fibmanager/pom.xml +++ b/fibmanager/pom.xml @@ -23,9 +23,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL 4.0.0 - fibmanager-api - fibmanager-impl - fibmanager-shell + api + impl + shell diff --git a/fibmanager/fibmanager-shell/pom.xml b/fibmanager/shell/pom.xml similarity index 100% rename from fibmanager/fibmanager-shell/pom.xml rename to fibmanager/shell/pom.xml diff --git a/fibmanager/fibmanager-shell/src/main/java/org/opendaylight/netvirt/fibmanager/shell/ConfTransportL3VPNCommand.java b/fibmanager/shell/src/main/java/org/opendaylight/netvirt/fibmanager/shell/ConfTransportL3VPNCommand.java similarity index 100% rename from fibmanager/fibmanager-shell/src/main/java/org/opendaylight/netvirt/fibmanager/shell/ConfTransportL3VPNCommand.java rename to fibmanager/shell/src/main/java/org/opendaylight/netvirt/fibmanager/shell/ConfTransportL3VPNCommand.java diff --git a/fibmanager/fibmanager-shell/src/main/java/org/opendaylight/netvirt/fibmanager/shell/ShowFibCommand.java b/fibmanager/shell/src/main/java/org/opendaylight/netvirt/fibmanager/shell/ShowFibCommand.java similarity index 100% rename from fibmanager/fibmanager-shell/src/main/java/org/opendaylight/netvirt/fibmanager/shell/ShowFibCommand.java rename to fibmanager/shell/src/main/java/org/opendaylight/netvirt/fibmanager/shell/ShowFibCommand.java diff --git a/fibmanager/fibmanager-shell/src/main/java/org/opendaylight/netvirt/fibmanager/shell/ShowTransportTypeCommand.java b/fibmanager/shell/src/main/java/org/opendaylight/netvirt/fibmanager/shell/ShowTransportTypeCommand.java similarity index 100% rename from fibmanager/fibmanager-shell/src/main/java/org/opendaylight/netvirt/fibmanager/shell/ShowTransportTypeCommand.java rename to fibmanager/shell/src/main/java/org/opendaylight/netvirt/fibmanager/shell/ShowTransportTypeCommand.java diff --git a/fibmanager/fibmanager-shell/src/main/resources/org/opendaylight/blueprint/blueprint.xml b/fibmanager/shell/src/main/resources/org/opendaylight/blueprint/blueprint.xml similarity index 100% rename from fibmanager/fibmanager-shell/src/main/resources/org/opendaylight/blueprint/blueprint.xml rename to fibmanager/shell/src/main/resources/org/opendaylight/blueprint/blueprint.xml diff --git a/natservice/natservice-api/pom.xml b/natservice/api/pom.xml similarity index 100% rename from natservice/natservice-api/pom.xml rename to natservice/api/pom.xml diff --git a/natservice/natservice-api/src/main/java/org/opendaylight/netvirt/natservice/api/CentralizedSwitchScheduler.java b/natservice/api/src/main/java/org/opendaylight/netvirt/natservice/api/CentralizedSwitchScheduler.java similarity index 100% rename from natservice/natservice-api/src/main/java/org/opendaylight/netvirt/natservice/api/CentralizedSwitchScheduler.java rename to natservice/api/src/main/java/org/opendaylight/netvirt/natservice/api/CentralizedSwitchScheduler.java diff --git a/natservice/natservice-api/src/main/java/org/opendaylight/netvirt/natservice/api/SnatServiceListener.java b/natservice/api/src/main/java/org/opendaylight/netvirt/natservice/api/SnatServiceListener.java similarity index 100% rename from natservice/natservice-api/src/main/java/org/opendaylight/netvirt/natservice/api/SnatServiceListener.java rename to natservice/api/src/main/java/org/opendaylight/netvirt/natservice/api/SnatServiceListener.java diff --git a/natservice/natservice-api/src/main/java/org/opendaylight/netvirt/natservice/api/SnatServiceManager.java b/natservice/api/src/main/java/org/opendaylight/netvirt/natservice/api/SnatServiceManager.java similarity index 100% rename from natservice/natservice-api/src/main/java/org/opendaylight/netvirt/natservice/api/SnatServiceManager.java rename to natservice/api/src/main/java/org/opendaylight/netvirt/natservice/api/SnatServiceManager.java diff --git a/natservice/natservice-api/src/main/yang/odl-nat-rpc.yang b/natservice/api/src/main/yang/odl-nat-rpc.yang similarity index 100% rename from natservice/natservice-api/src/main/yang/odl-nat-rpc.yang rename to natservice/api/src/main/yang/odl-nat-rpc.yang diff --git a/natservice/natservice-api/src/main/yang/odl-nat.yang b/natservice/api/src/main/yang/odl-nat.yang similarity index 100% rename from natservice/natservice-api/src/main/yang/odl-nat.yang rename to natservice/api/src/main/yang/odl-nat.yang diff --git a/natservice/natservice-impl/pom.xml b/natservice/impl/pom.xml similarity index 100% rename from natservice/natservice-impl/pom.xml rename to natservice/impl/pom.xml diff --git a/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/cli/DisplayNaptSwithcesCli.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/cli/DisplayNaptSwithcesCli.java similarity index 100% rename from natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/cli/DisplayNaptSwithcesCli.java rename to natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/cli/DisplayNaptSwithcesCli.java diff --git a/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/ha/NatDataUtil.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/ha/NatDataUtil.java similarity index 100% rename from natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/ha/NatDataUtil.java rename to natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/ha/NatDataUtil.java diff --git a/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/ha/SnatCentralizedSwitchChangeListener.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/ha/SnatCentralizedSwitchChangeListener.java similarity index 100% rename from natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/ha/SnatCentralizedSwitchChangeListener.java rename to natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/ha/SnatCentralizedSwitchChangeListener.java diff --git a/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/ha/SnatNodeEventListener.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/ha/SnatNodeEventListener.java similarity index 100% rename from natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/ha/SnatNodeEventListener.java rename to natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/ha/SnatNodeEventListener.java diff --git a/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/ha/WeightedCentralizedSwitchScheduler.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/ha/WeightedCentralizedSwitchScheduler.java similarity index 100% rename from natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/ha/WeightedCentralizedSwitchScheduler.java rename to natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/ha/WeightedCentralizedSwitchScheduler.java diff --git a/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/AbstractSnatService.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/AbstractSnatService.java similarity index 100% rename from natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/AbstractSnatService.java rename to natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/AbstractSnatService.java diff --git a/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ConntrackBasedSnatService.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ConntrackBasedSnatService.java similarity index 100% rename from natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ConntrackBasedSnatService.java rename to natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ConntrackBasedSnatService.java diff --git a/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/EventDispatcher.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/EventDispatcher.java similarity index 100% rename from natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/EventDispatcher.java rename to natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/EventDispatcher.java diff --git a/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/EvpnDnatFlowProgrammer.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/EvpnDnatFlowProgrammer.java similarity index 100% rename from natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/EvpnDnatFlowProgrammer.java rename to natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/EvpnDnatFlowProgrammer.java diff --git a/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/EvpnNaptSwitchHA.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/EvpnNaptSwitchHA.java similarity index 100% rename from natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/EvpnNaptSwitchHA.java rename to natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/EvpnNaptSwitchHA.java diff --git a/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/EvpnSnatFlowProgrammer.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/EvpnSnatFlowProgrammer.java similarity index 100% rename from natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/EvpnSnatFlowProgrammer.java rename to natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/EvpnSnatFlowProgrammer.java diff --git a/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalNetworkGroupInstaller.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalNetworkGroupInstaller.java similarity index 100% rename from natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalNetworkGroupInstaller.java rename to natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalNetworkGroupInstaller.java diff --git a/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalNetworksChangeListener.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalNetworksChangeListener.java similarity index 100% rename from natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalNetworksChangeListener.java rename to natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalNetworksChangeListener.java diff --git a/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalRoutersListener.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalRoutersListener.java similarity index 100% rename from natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalRoutersListener.java rename to natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalRoutersListener.java diff --git a/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalSubnetVpnInstanceListener.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalSubnetVpnInstanceListener.java similarity index 100% rename from natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalSubnetVpnInstanceListener.java rename to natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalSubnetVpnInstanceListener.java diff --git a/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/FlatVlanConntrackBasedSnatService.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/FlatVlanConntrackBasedSnatService.java similarity index 100% rename from natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/FlatVlanConntrackBasedSnatService.java rename to natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/FlatVlanConntrackBasedSnatService.java diff --git a/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/FloatingIPHandler.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/FloatingIPHandler.java similarity index 100% rename from natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/FloatingIPHandler.java rename to natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/FloatingIPHandler.java diff --git a/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/FloatingIPListener.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/FloatingIPListener.java similarity index 100% rename from natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/FloatingIPListener.java rename to natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/FloatingIPListener.java diff --git a/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/IPAddress.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/IPAddress.java similarity index 100% rename from natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/IPAddress.java rename to natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/IPAddress.java diff --git a/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/InterfaceStateEventListener.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/InterfaceStateEventListener.java similarity index 100% rename from natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/InterfaceStateEventListener.java rename to natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/InterfaceStateEventListener.java diff --git a/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NAPTEntryEvent.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NAPTEntryEvent.java similarity index 100% rename from natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NAPTEntryEvent.java rename to natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NAPTEntryEvent.java diff --git a/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NAPTSwitchSelector.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NAPTSwitchSelector.java similarity index 100% rename from natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NAPTSwitchSelector.java rename to natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NAPTSwitchSelector.java diff --git a/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptEventHandler.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptEventHandler.java similarity index 100% rename from natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptEventHandler.java rename to natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptEventHandler.java diff --git a/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptFlowRemovedEventHandler.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptFlowRemovedEventHandler.java similarity index 100% rename from natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptFlowRemovedEventHandler.java rename to natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptFlowRemovedEventHandler.java diff --git a/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptManager.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptManager.java similarity index 100% rename from natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptManager.java rename to natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptManager.java diff --git a/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptPacketInHandler.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptPacketInHandler.java similarity index 100% rename from natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptPacketInHandler.java rename to natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptPacketInHandler.java diff --git a/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptSwitchHA.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptSwitchHA.java similarity index 100% rename from natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptSwitchHA.java rename to natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptSwitchHA.java diff --git a/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatConstants.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatConstants.java similarity index 100% rename from natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatConstants.java rename to natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatConstants.java diff --git a/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatEvpnUtil.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatEvpnUtil.java similarity index 100% rename from natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatEvpnUtil.java rename to natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatEvpnUtil.java diff --git a/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatInterfaceStateChangeListener.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatInterfaceStateChangeListener.java similarity index 100% rename from natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatInterfaceStateChangeListener.java rename to natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatInterfaceStateChangeListener.java diff --git a/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatOverVxlanUtil.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatOverVxlanUtil.java similarity index 100% rename from natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatOverVxlanUtil.java rename to natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatOverVxlanUtil.java diff --git a/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatRouterInterfaceListener.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatRouterInterfaceListener.java similarity index 100% rename from natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatRouterInterfaceListener.java rename to natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatRouterInterfaceListener.java diff --git a/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatServiceCounters.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatServiceCounters.java similarity index 100% rename from natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatServiceCounters.java rename to natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatServiceCounters.java diff --git a/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatTunnelInterfaceStateListener.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatTunnelInterfaceStateListener.java similarity index 100% rename from natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatTunnelInterfaceStateListener.java rename to natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatTunnelInterfaceStateListener.java diff --git a/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatUtil.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatUtil.java similarity index 100% rename from natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatUtil.java rename to natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatUtil.java diff --git a/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/RouterDpnChangeListener.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/RouterDpnChangeListener.java similarity index 100% rename from natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/RouterDpnChangeListener.java rename to natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/RouterDpnChangeListener.java diff --git a/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/RouterPortsListener.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/RouterPortsListener.java similarity index 100% rename from natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/RouterPortsListener.java rename to natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/RouterPortsListener.java diff --git a/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/RouterToVpnListener.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/RouterToVpnListener.java similarity index 100% rename from natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/RouterToVpnListener.java rename to natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/RouterToVpnListener.java diff --git a/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/SNATDefaultRouteProgrammer.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/SNATDefaultRouteProgrammer.java similarity index 100% rename from natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/SNATDefaultRouteProgrammer.java rename to natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/SNATDefaultRouteProgrammer.java diff --git a/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/SessionAddress.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/SessionAddress.java similarity index 100% rename from natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/SessionAddress.java rename to natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/SessionAddress.java diff --git a/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/SnatServiceImplFactory.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/SnatServiceImplFactory.java similarity index 100% rename from natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/SnatServiceImplFactory.java rename to natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/SnatServiceImplFactory.java diff --git a/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/SnatServiceManagerImpl.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/SnatServiceManagerImpl.java similarity index 100% rename from natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/SnatServiceManagerImpl.java rename to natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/SnatServiceManagerImpl.java diff --git a/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/SubnetGwMacChangeListener.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/SubnetGwMacChangeListener.java similarity index 100% rename from natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/SubnetGwMacChangeListener.java rename to natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/SubnetGwMacChangeListener.java diff --git a/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/SubnetmapListener.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/SubnetmapListener.java similarity index 100% rename from natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/SubnetmapListener.java rename to natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/SubnetmapListener.java diff --git a/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/UpgradeStateListener.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/UpgradeStateListener.java similarity index 100% rename from natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/UpgradeStateListener.java rename to natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/UpgradeStateListener.java diff --git a/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/VpnFloatingIpHandler.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/VpnFloatingIpHandler.java similarity index 100% rename from natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/VpnFloatingIpHandler.java rename to natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/VpnFloatingIpHandler.java diff --git a/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/VxlanGreConntrackBasedSnatService.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/VxlanGreConntrackBasedSnatService.java similarity index 100% rename from natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/VxlanGreConntrackBasedSnatService.java rename to natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/VxlanGreConntrackBasedSnatService.java diff --git a/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/rpcservice/NatRpcServiceImpl.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/rpcservice/NatRpcServiceImpl.java similarity index 100% rename from natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/rpcservice/NatRpcServiceImpl.java rename to natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/rpcservice/NatRpcServiceImpl.java diff --git a/natservice/natservice-impl/src/main/resources/initial/netvirt-natservice-config.xml b/natservice/impl/src/main/resources/initial/netvirt-natservice-config.xml similarity index 100% rename from natservice/natservice-impl/src/main/resources/initial/netvirt-natservice-config.xml rename to natservice/impl/src/main/resources/initial/netvirt-natservice-config.xml diff --git a/natservice/natservice-impl/src/main/resources/org/opendaylight/blueprint/commands.xml b/natservice/impl/src/main/resources/org/opendaylight/blueprint/commands.xml similarity index 100% rename from natservice/natservice-impl/src/main/resources/org/opendaylight/blueprint/commands.xml rename to natservice/impl/src/main/resources/org/opendaylight/blueprint/commands.xml diff --git a/natservice/natservice-impl/src/main/resources/org/opendaylight/blueprint/natservice.xml b/natservice/impl/src/main/resources/org/opendaylight/blueprint/natservice.xml similarity index 100% rename from natservice/natservice-impl/src/main/resources/org/opendaylight/blueprint/natservice.xml rename to natservice/impl/src/main/resources/org/opendaylight/blueprint/natservice.xml diff --git a/natservice/natservice-impl/src/main/yang/natservice-config.yang b/natservice/impl/src/main/yang/natservice-config.yang similarity index 100% rename from natservice/natservice-impl/src/main/yang/natservice-config.yang rename to natservice/impl/src/main/yang/natservice-config.yang diff --git a/natservice/natservice-impl/src/test/java/org/opendaylight/netvirt/natservice/internal/AbstractSnatServiceTest.java b/natservice/impl/src/test/java/org/opendaylight/netvirt/natservice/internal/AbstractSnatServiceTest.java similarity index 100% rename from natservice/natservice-impl/src/test/java/org/opendaylight/netvirt/natservice/internal/AbstractSnatServiceTest.java rename to natservice/impl/src/test/java/org/opendaylight/netvirt/natservice/internal/AbstractSnatServiceTest.java diff --git a/natservice/natservice-impl/src/test/java/org/opendaylight/netvirt/natservice/internal/test/ExternalNetworksChangeListenerTest.java b/natservice/impl/src/test/java/org/opendaylight/netvirt/natservice/internal/test/ExternalNetworksChangeListenerTest.java similarity index 100% rename from natservice/natservice-impl/src/test/java/org/opendaylight/netvirt/natservice/internal/test/ExternalNetworksChangeListenerTest.java rename to natservice/impl/src/test/java/org/opendaylight/netvirt/natservice/internal/test/ExternalNetworksChangeListenerTest.java diff --git a/natservice/natservice-impl/src/test/java/org/opendaylight/netvirt/natservice/internal/test/NaptManagerTest.java b/natservice/impl/src/test/java/org/opendaylight/netvirt/natservice/internal/test/NaptManagerTest.java similarity index 100% rename from natservice/natservice-impl/src/test/java/org/opendaylight/netvirt/natservice/internal/test/NaptManagerTest.java rename to natservice/impl/src/test/java/org/opendaylight/netvirt/natservice/internal/test/NaptManagerTest.java diff --git a/natservice/natservice-impl/src/test/java/org/opendaylight/netvirt/natservice/internal/test/NatUtilTest.java b/natservice/impl/src/test/java/org/opendaylight/netvirt/natservice/internal/test/NatUtilTest.java similarity index 100% rename from natservice/natservice-impl/src/test/java/org/opendaylight/netvirt/natservice/internal/test/NatUtilTest.java rename to natservice/impl/src/test/java/org/opendaylight/netvirt/natservice/internal/test/NatUtilTest.java diff --git a/natservice/pom.xml b/natservice/pom.xml index 0994cac888..e62b811ade 100644 --- a/natservice/pom.xml +++ b/natservice/pom.xml @@ -23,8 +23,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL 4.0.0 - natservice-api - natservice-impl + api + impl diff --git a/neutronvpn/neutronvpn-api/pom.xml b/neutronvpn/api/pom.xml similarity index 100% rename from neutronvpn/neutronvpn-api/pom.xml rename to neutronvpn/api/pom.xml diff --git a/neutronvpn/neutronvpn-api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/enums/IpVersionChoice.java b/neutronvpn/api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/enums/IpVersionChoice.java similarity index 100% rename from neutronvpn/neutronvpn-api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/enums/IpVersionChoice.java rename to neutronvpn/api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/enums/IpVersionChoice.java diff --git a/neutronvpn/neutronvpn-api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/l2gw/L2GatewayCache.java b/neutronvpn/api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/l2gw/L2GatewayCache.java similarity index 100% rename from neutronvpn/neutronvpn-api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/l2gw/L2GatewayCache.java rename to neutronvpn/api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/l2gw/L2GatewayCache.java diff --git a/neutronvpn/neutronvpn-api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/l2gw/L2GatewayDevice.java b/neutronvpn/api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/l2gw/L2GatewayDevice.java similarity index 100% rename from neutronvpn/neutronvpn-api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/l2gw/L2GatewayDevice.java rename to neutronvpn/api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/l2gw/L2GatewayDevice.java diff --git a/neutronvpn/neutronvpn-api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/utils/ChangeUtils.java b/neutronvpn/api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/utils/ChangeUtils.java similarity index 100% rename from neutronvpn/neutronvpn-api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/utils/ChangeUtils.java rename to neutronvpn/api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/utils/ChangeUtils.java diff --git a/neutronvpn/neutronvpn-api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/utils/NeutronConstants.java b/neutronvpn/api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/utils/NeutronConstants.java similarity index 100% rename from neutronvpn/neutronvpn-api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/utils/NeutronConstants.java rename to neutronvpn/api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/utils/NeutronConstants.java diff --git a/neutronvpn/neutronvpn-api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/utils/NeutronUtils.java b/neutronvpn/api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/utils/NeutronUtils.java similarity index 100% rename from neutronvpn/neutronvpn-api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/utils/NeutronUtils.java rename to neutronvpn/api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/utils/NeutronUtils.java diff --git a/neutronvpn/neutronvpn-api/src/main/java/org/opendaylight/netvirt/neutronvpn/interfaces/INeutronVpnManager.java b/neutronvpn/api/src/main/java/org/opendaylight/netvirt/neutronvpn/interfaces/INeutronVpnManager.java similarity index 100% rename from neutronvpn/neutronvpn-api/src/main/java/org/opendaylight/netvirt/neutronvpn/interfaces/INeutronVpnManager.java rename to neutronvpn/api/src/main/java/org/opendaylight/netvirt/neutronvpn/interfaces/INeutronVpnManager.java diff --git a/neutronvpn/neutronvpn-api/src/main/yang/neutronvpn.yang b/neutronvpn/api/src/main/yang/neutronvpn.yang similarity index 100% rename from neutronvpn/neutronvpn-api/src/main/yang/neutronvpn.yang rename to neutronvpn/api/src/main/yang/neutronvpn.yang diff --git a/neutronvpn/neutronvpn-impl/pom.xml b/neutronvpn/impl/pom.xml similarity index 100% rename from neutronvpn/neutronvpn-impl/pom.xml rename to neutronvpn/impl/pom.xml diff --git a/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/HostConfigCache.java b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/HostConfigCache.java similarity index 100% rename from neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/HostConfigCache.java rename to neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/HostConfigCache.java diff --git a/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/IPV6InternetDefaultRouteProgrammer.java b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/IPV6InternetDefaultRouteProgrammer.java similarity index 100% rename from neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/IPV6InternetDefaultRouteProgrammer.java rename to neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/IPV6InternetDefaultRouteProgrammer.java diff --git a/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronBgpvpnChangeListener.java b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronBgpvpnChangeListener.java similarity index 100% rename from neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronBgpvpnChangeListener.java rename to neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronBgpvpnChangeListener.java diff --git a/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronExternalSubnetHandler.java b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronExternalSubnetHandler.java similarity index 100% rename from neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronExternalSubnetHandler.java rename to neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronExternalSubnetHandler.java diff --git a/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronFloatingToFixedIpMappingChangeListener.java b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronFloatingToFixedIpMappingChangeListener.java similarity index 100% rename from neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronFloatingToFixedIpMappingChangeListener.java rename to neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronFloatingToFixedIpMappingChangeListener.java diff --git a/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronHostConfigChangeListener.java b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronHostConfigChangeListener.java similarity index 100% rename from neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronHostConfigChangeListener.java rename to neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronHostConfigChangeListener.java diff --git a/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronNetworkChangeListener.java b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronNetworkChangeListener.java similarity index 100% rename from neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronNetworkChangeListener.java rename to neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronNetworkChangeListener.java diff --git a/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronPortChangeListener.java b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronPortChangeListener.java similarity index 100% rename from neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronPortChangeListener.java rename to neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronPortChangeListener.java diff --git a/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronRouterChangeListener.java b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronRouterChangeListener.java similarity index 100% rename from neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronRouterChangeListener.java rename to neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronRouterChangeListener.java diff --git a/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronSecurityRuleConstants.java b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronSecurityRuleConstants.java similarity index 100% rename from neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronSecurityRuleConstants.java rename to neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronSecurityRuleConstants.java diff --git a/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronSecurityRuleListener.java b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronSecurityRuleListener.java similarity index 100% rename from neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronSecurityRuleListener.java rename to neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronSecurityRuleListener.java diff --git a/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronSubnetChangeListener.java b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronSubnetChangeListener.java similarity index 100% rename from neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronSubnetChangeListener.java rename to neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronSubnetChangeListener.java diff --git a/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronSubnetGwMacResolver.java b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronSubnetGwMacResolver.java similarity index 100% rename from neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronSubnetGwMacResolver.java rename to neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronSubnetGwMacResolver.java diff --git a/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronTrunkChangeListener.java b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronTrunkChangeListener.java similarity index 100% rename from neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronTrunkChangeListener.java rename to neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronTrunkChangeListener.java diff --git a/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnManager.java b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnManager.java similarity index 100% rename from neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnManager.java rename to neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnManager.java diff --git a/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnManagerImpl.java b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnManagerImpl.java similarity index 100% rename from neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnManagerImpl.java rename to neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnManagerImpl.java diff --git a/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnNatManager.java b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnNatManager.java similarity index 100% rename from neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnNatManager.java rename to neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnNatManager.java diff --git a/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnUtils.java b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnUtils.java similarity index 100% rename from neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnUtils.java rename to neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnUtils.java diff --git a/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/UpgradeStateListener.java b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/UpgradeStateListener.java similarity index 100% rename from neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/UpgradeStateListener.java rename to neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/UpgradeStateListener.java diff --git a/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/evpn/manager/NeutronEvpnManager.java b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/evpn/manager/NeutronEvpnManager.java similarity index 100% rename from neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/evpn/manager/NeutronEvpnManager.java rename to neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/evpn/manager/NeutronEvpnManager.java diff --git a/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/evpn/utils/NeutronEvpnUtils.java b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/evpn/utils/NeutronEvpnUtils.java similarity index 100% rename from neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/evpn/utils/NeutronEvpnUtils.java rename to neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/evpn/utils/NeutronEvpnUtils.java diff --git a/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/l2gw/AddL2GwDevicesToTransportZoneJob.java b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/l2gw/AddL2GwDevicesToTransportZoneJob.java similarity index 100% rename from neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/l2gw/AddL2GwDevicesToTransportZoneJob.java rename to neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/l2gw/AddL2GwDevicesToTransportZoneJob.java diff --git a/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/l2gw/L2GatewayListener.java b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/l2gw/L2GatewayListener.java similarity index 100% rename from neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/l2gw/L2GatewayListener.java rename to neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/l2gw/L2GatewayListener.java diff --git a/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/l2gw/L2GatewayUtils.java b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/l2gw/L2GatewayUtils.java similarity index 100% rename from neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/l2gw/L2GatewayUtils.java rename to neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/l2gw/L2GatewayUtils.java diff --git a/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/l2gw/L2GwTransportZoneListener.java b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/l2gw/L2GwTransportZoneListener.java similarity index 100% rename from neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/l2gw/L2GwTransportZoneListener.java rename to neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/l2gw/L2GwTransportZoneListener.java diff --git a/neutronvpn/neutronvpn-impl/src/main/resources/initial/netvirt-neutronvpn-config.xml b/neutronvpn/impl/src/main/resources/initial/netvirt-neutronvpn-config.xml similarity index 100% rename from neutronvpn/neutronvpn-impl/src/main/resources/initial/netvirt-neutronvpn-config.xml rename to neutronvpn/impl/src/main/resources/initial/netvirt-neutronvpn-config.xml diff --git a/neutronvpn/neutronvpn-impl/src/main/resources/org/opendaylight/blueprint/neutronvpn.xml b/neutronvpn/impl/src/main/resources/org/opendaylight/blueprint/neutronvpn.xml similarity index 100% rename from neutronvpn/neutronvpn-impl/src/main/resources/org/opendaylight/blueprint/neutronvpn.xml rename to neutronvpn/impl/src/main/resources/org/opendaylight/blueprint/neutronvpn.xml diff --git a/neutronvpn/neutronvpn-impl/src/main/yang/neutronvpn-config.yang b/neutronvpn/impl/src/main/yang/neutronvpn-config.yang similarity index 100% rename from neutronvpn/neutronvpn-impl/src/main/yang/neutronvpn-config.yang rename to neutronvpn/impl/src/main/yang/neutronvpn-config.yang diff --git a/neutronvpn/neutronvpn-impl/src/test/java/org/opendaylight/netvirt/neutronvpn/NeutronPortChangeListenerTest.java b/neutronvpn/impl/src/test/java/org/opendaylight/netvirt/neutronvpn/NeutronPortChangeListenerTest.java similarity index 100% rename from neutronvpn/neutronvpn-impl/src/test/java/org/opendaylight/netvirt/neutronvpn/NeutronPortChangeListenerTest.java rename to neutronvpn/impl/src/test/java/org/opendaylight/netvirt/neutronvpn/NeutronPortChangeListenerTest.java diff --git a/neutronvpn/pom.xml b/neutronvpn/pom.xml index 035a9b0de4..44257e5259 100644 --- a/neutronvpn/pom.xml +++ b/neutronvpn/pom.xml @@ -24,9 +24,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html 4.0.0 - neutronvpn-api - neutronvpn-impl - neutronvpn-shell + api + impl + shell diff --git a/neutronvpn/neutronvpn-shell/pom.xml b/neutronvpn/shell/pom.xml similarity index 100% rename from neutronvpn/neutronvpn-shell/pom.xml rename to neutronvpn/shell/pom.xml diff --git a/neutronvpn/neutronvpn-shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/ConfigureL3VpnCommand.java b/neutronvpn/shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/ConfigureL3VpnCommand.java similarity index 100% rename from neutronvpn/neutronvpn-shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/ConfigureL3VpnCommand.java rename to neutronvpn/shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/ConfigureL3VpnCommand.java diff --git a/neutronvpn/neutronvpn-shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/DhcpConfigureCommand.java b/neutronvpn/shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/DhcpConfigureCommand.java similarity index 100% rename from neutronvpn/neutronvpn-shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/DhcpConfigureCommand.java rename to neutronvpn/shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/DhcpConfigureCommand.java diff --git a/neutronvpn/neutronvpn-shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/DhcpShowCommand.java b/neutronvpn/shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/DhcpShowCommand.java similarity index 100% rename from neutronvpn/neutronvpn-shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/DhcpShowCommand.java rename to neutronvpn/shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/DhcpShowCommand.java diff --git a/neutronvpn/neutronvpn-shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/ShowNeutronPortsCommand.java b/neutronvpn/shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/ShowNeutronPortsCommand.java similarity index 100% rename from neutronvpn/neutronvpn-shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/ShowNeutronPortsCommand.java rename to neutronvpn/shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/ShowNeutronPortsCommand.java diff --git a/neutronvpn/neutronvpn-shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/ShowSubnet.java b/neutronvpn/shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/ShowSubnet.java similarity index 100% rename from neutronvpn/neutronvpn-shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/ShowSubnet.java rename to neutronvpn/shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/ShowSubnet.java diff --git a/neutronvpn/neutronvpn-shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/ShowVpnConfigCommand.java b/neutronvpn/shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/ShowVpnConfigCommand.java similarity index 100% rename from neutronvpn/neutronvpn-shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/ShowVpnConfigCommand.java rename to neutronvpn/shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/ShowVpnConfigCommand.java diff --git a/neutronvpn/neutronvpn-shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/ShowVpnIpToPort.java b/neutronvpn/shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/ShowVpnIpToPort.java similarity index 100% rename from neutronvpn/neutronvpn-shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/ShowVpnIpToPort.java rename to neutronvpn/shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/ShowVpnIpToPort.java diff --git a/neutronvpn/neutronvpn-shell/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/neutronvpn/shell/src/main/resources/OSGI-INF/blueprint/blueprint.xml similarity index 100% rename from neutronvpn/neutronvpn-shell/src/main/resources/OSGI-INF/blueprint/blueprint.xml rename to neutronvpn/shell/src/main/resources/OSGI-INF/blueprint/blueprint.xml diff --git a/vpnmanager/vpnmanager-api/pom.xml b/vpnmanager/api/pom.xml similarity index 100% rename from vpnmanager/vpnmanager-api/pom.xml rename to vpnmanager/api/pom.xml diff --git a/vpnmanager/vpnmanager-api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/ICentralizedSwitchProvider.java b/vpnmanager/api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/ICentralizedSwitchProvider.java similarity index 100% rename from vpnmanager/vpnmanager-api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/ICentralizedSwitchProvider.java rename to vpnmanager/api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/ICentralizedSwitchProvider.java diff --git a/vpnmanager/vpnmanager-api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/IVpnFootprintService.java b/vpnmanager/api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/IVpnFootprintService.java similarity index 100% rename from vpnmanager/vpnmanager-api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/IVpnFootprintService.java rename to vpnmanager/api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/IVpnFootprintService.java diff --git a/vpnmanager/vpnmanager-api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/IVpnManager.java b/vpnmanager/api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/IVpnManager.java similarity index 100% rename from vpnmanager/vpnmanager-api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/IVpnManager.java rename to vpnmanager/api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/IVpnManager.java diff --git a/vpnmanager/vpnmanager-api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/InterfaceUtils.java b/vpnmanager/api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/InterfaceUtils.java similarity index 100% rename from vpnmanager/vpnmanager-api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/InterfaceUtils.java rename to vpnmanager/api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/InterfaceUtils.java diff --git a/vpnmanager/vpnmanager-api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/VpnExtraRouteHelper.java b/vpnmanager/api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/VpnExtraRouteHelper.java similarity index 100% rename from vpnmanager/vpnmanager-api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/VpnExtraRouteHelper.java rename to vpnmanager/api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/VpnExtraRouteHelper.java diff --git a/vpnmanager/vpnmanager-api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/VpnHelper.java b/vpnmanager/api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/VpnHelper.java similarity index 100% rename from vpnmanager/vpnmanager-api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/VpnHelper.java rename to vpnmanager/api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/VpnHelper.java diff --git a/vpnmanager/vpnmanager-api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/intervpnlink/IVpnLinkService.java b/vpnmanager/api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/intervpnlink/IVpnLinkService.java similarity index 100% rename from vpnmanager/vpnmanager-api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/intervpnlink/IVpnLinkService.java rename to vpnmanager/api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/intervpnlink/IVpnLinkService.java diff --git a/vpnmanager/vpnmanager-api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/intervpnlink/InterVpnLinkCache.java b/vpnmanager/api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/intervpnlink/InterVpnLinkCache.java similarity index 100% rename from vpnmanager/vpnmanager-api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/intervpnlink/InterVpnLinkCache.java rename to vpnmanager/api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/intervpnlink/InterVpnLinkCache.java diff --git a/vpnmanager/vpnmanager-api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/intervpnlink/InterVpnLinkDataComposite.java b/vpnmanager/api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/intervpnlink/InterVpnLinkDataComposite.java similarity index 100% rename from vpnmanager/vpnmanager-api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/intervpnlink/InterVpnLinkDataComposite.java rename to vpnmanager/api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/intervpnlink/InterVpnLinkDataComposite.java diff --git a/vpnmanager/vpnmanager-api/src/main/yang/inter-vpn-link.yang b/vpnmanager/api/src/main/yang/inter-vpn-link.yang similarity index 100% rename from vpnmanager/vpnmanager-api/src/main/yang/inter-vpn-link.yang rename to vpnmanager/api/src/main/yang/inter-vpn-link.yang diff --git a/vpnmanager/vpnmanager-api/src/main/yang/l3vpn.yang b/vpnmanager/api/src/main/yang/l3vpn.yang similarity index 100% rename from vpnmanager/vpnmanager-api/src/main/yang/l3vpn.yang rename to vpnmanager/api/src/main/yang/l3vpn.yang diff --git a/vpnmanager/vpnmanager-api/src/main/yang/odl-l3vpn.yang b/vpnmanager/api/src/main/yang/odl-l3vpn.yang similarity index 100% rename from vpnmanager/vpnmanager-api/src/main/yang/odl-l3vpn.yang rename to vpnmanager/api/src/main/yang/odl-l3vpn.yang diff --git a/vpnmanager/vpnmanager-api/src/main/yang/vpn-rpc.yang b/vpnmanager/api/src/main/yang/vpn-rpc.yang similarity index 100% rename from vpnmanager/vpnmanager-api/src/main/yang/vpn-rpc.yang rename to vpnmanager/api/src/main/yang/vpn-rpc.yang diff --git a/vpnmanager/vpnmanager-impl/pom.xml b/vpnmanager/impl/pom.xml similarity index 100% rename from vpnmanager/vpnmanager-impl/pom.xml rename to vpnmanager/impl/pom.xml diff --git a/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/AlivenessMonitorUtils.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/AlivenessMonitorUtils.java similarity index 100% rename from vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/AlivenessMonitorUtils.java rename to vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/AlivenessMonitorUtils.java diff --git a/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpMonitorEventListener.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpMonitorEventListener.java similarity index 100% rename from vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpMonitorEventListener.java rename to vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpMonitorEventListener.java diff --git a/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpMonitorStartTask.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpMonitorStartTask.java similarity index 100% rename from vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpMonitorStartTask.java rename to vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpMonitorStartTask.java diff --git a/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpMonitorStopTask.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpMonitorStopTask.java similarity index 100% rename from vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpMonitorStopTask.java rename to vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpMonitorStopTask.java diff --git a/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpMonitoringHandler.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpMonitoringHandler.java similarity index 100% rename from vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpMonitoringHandler.java rename to vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpMonitoringHandler.java diff --git a/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpNotificationHandler.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpNotificationHandler.java similarity index 100% rename from vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpNotificationHandler.java rename to vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpNotificationHandler.java diff --git a/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpReplyOrRequest.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpReplyOrRequest.java similarity index 100% rename from vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpReplyOrRequest.java rename to vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpReplyOrRequest.java diff --git a/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpUtils.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpUtils.java similarity index 100% rename from vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpUtils.java rename to vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpUtils.java diff --git a/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/CentralizedSwitchChangeListener.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/CentralizedSwitchChangeListener.java similarity index 100% rename from vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/CentralizedSwitchChangeListener.java rename to vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/CentralizedSwitchChangeListener.java diff --git a/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/CentralizedSwitchProvider.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/CentralizedSwitchProvider.java similarity index 100% rename from vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/CentralizedSwitchProvider.java rename to vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/CentralizedSwitchProvider.java diff --git a/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/DpnInVpnChangeListener.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/DpnInVpnChangeListener.java similarity index 100% rename from vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/DpnInVpnChangeListener.java rename to vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/DpnInVpnChangeListener.java diff --git a/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/FibEntriesListener.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/FibEntriesListener.java similarity index 100% rename from vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/FibEntriesListener.java rename to vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/FibEntriesListener.java diff --git a/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/InterfaceStateChangeListener.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/InterfaceStateChangeListener.java similarity index 100% rename from vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/InterfaceStateChangeListener.java rename to vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/InterfaceStateChangeListener.java diff --git a/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/MacEntry.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/MacEntry.java similarity index 100% rename from vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/MacEntry.java rename to vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/MacEntry.java diff --git a/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetOpDpnManager.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetOpDpnManager.java similarity index 100% rename from vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetOpDpnManager.java rename to vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetOpDpnManager.java diff --git a/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetRouteInterfaceStateChangeListener.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetRouteInterfaceStateChangeListener.java similarity index 100% rename from vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetRouteInterfaceStateChangeListener.java rename to vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetRouteInterfaceStateChangeListener.java diff --git a/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetRoutePacketInHandler.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetRoutePacketInHandler.java similarity index 100% rename from vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetRoutePacketInHandler.java rename to vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetRoutePacketInHandler.java diff --git a/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetmapChangeListener.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetmapChangeListener.java similarity index 100% rename from vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetmapChangeListener.java rename to vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetmapChangeListener.java diff --git a/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/TransactionUtil.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/TransactionUtil.java similarity index 100% rename from vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/TransactionUtil.java rename to vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/TransactionUtil.java diff --git a/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/TunnelEndPointChangeListener.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/TunnelEndPointChangeListener.java similarity index 100% rename from vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/TunnelEndPointChangeListener.java rename to vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/TunnelEndPointChangeListener.java diff --git a/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/TunnelInterfaceStateListener.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/TunnelInterfaceStateListener.java similarity index 100% rename from vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/TunnelInterfaceStateListener.java rename to vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/TunnelInterfaceStateListener.java diff --git a/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/UpdateData.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/UpdateData.java similarity index 100% rename from vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/UpdateData.java rename to vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/UpdateData.java diff --git a/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnConstants.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnConstants.java similarity index 100% rename from vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnConstants.java rename to vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnConstants.java diff --git a/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnElanInterfaceChangeListener.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnElanInterfaceChangeListener.java similarity index 100% rename from vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnElanInterfaceChangeListener.java rename to vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnElanInterfaceChangeListener.java diff --git a/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnFootprintService.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnFootprintService.java similarity index 100% rename from vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnFootprintService.java rename to vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnFootprintService.java diff --git a/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInstanceListener.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInstanceListener.java similarity index 100% rename from vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInstanceListener.java rename to vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInstanceListener.java diff --git a/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInterfaceManager.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInterfaceManager.java similarity index 100% rename from vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInterfaceManager.java rename to vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInterfaceManager.java diff --git a/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInterfaceOpListener.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInterfaceOpListener.java similarity index 100% rename from vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInterfaceOpListener.java rename to vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInterfaceOpListener.java diff --git a/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnManagerImpl.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnManagerImpl.java similarity index 100% rename from vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnManagerImpl.java rename to vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnManagerImpl.java diff --git a/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnNodeListener.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnNodeListener.java similarity index 100% rename from vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnNodeListener.java rename to vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnNodeListener.java diff --git a/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnNotifyTask.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnNotifyTask.java similarity index 100% rename from vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnNotifyTask.java rename to vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnNotifyTask.java diff --git a/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnOpDataSyncer.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnOpDataSyncer.java similarity index 100% rename from vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnOpDataSyncer.java rename to vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnOpDataSyncer.java diff --git a/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnOpStatusListener.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnOpStatusListener.java similarity index 100% rename from vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnOpStatusListener.java rename to vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnOpStatusListener.java diff --git a/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnOperDsUtils.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnOperDsUtils.java similarity index 100% rename from vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnOperDsUtils.java rename to vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnOperDsUtils.java diff --git a/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnRpcServiceImpl.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnRpcServiceImpl.java similarity index 100% rename from vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnRpcServiceImpl.java rename to vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnRpcServiceImpl.java diff --git a/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnSubnetRouteHandler.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnSubnetRouteHandler.java similarity index 100% rename from vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnSubnetRouteHandler.java rename to vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnSubnetRouteHandler.java diff --git a/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnUtil.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnUtil.java similarity index 100% rename from vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnUtil.java rename to vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnUtil.java diff --git a/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/arp/responder/ArpResponderHandler.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/arp/responder/ArpResponderHandler.java similarity index 100% rename from vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/arp/responder/ArpResponderHandler.java rename to vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/arp/responder/ArpResponderHandler.java diff --git a/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/IVpnLinkServiceImpl.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/IVpnLinkServiceImpl.java similarity index 100% rename from vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/IVpnLinkServiceImpl.java rename to vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/IVpnLinkServiceImpl.java diff --git a/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkCacheFeeder.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkCacheFeeder.java similarity index 100% rename from vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkCacheFeeder.java rename to vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkCacheFeeder.java diff --git a/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkCacheImpl.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkCacheImpl.java similarity index 100% rename from vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkCacheImpl.java rename to vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkCacheImpl.java diff --git a/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkListener.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkListener.java similarity index 100% rename from vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkListener.java rename to vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkListener.java diff --git a/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkLocator.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkLocator.java similarity index 100% rename from vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkLocator.java rename to vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkLocator.java diff --git a/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkNodeAddTask.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkNodeAddTask.java similarity index 100% rename from vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkNodeAddTask.java rename to vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkNodeAddTask.java diff --git a/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkNodeListener.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkNodeListener.java similarity index 100% rename from vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkNodeListener.java rename to vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkNodeListener.java diff --git a/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkStateCacheFeeder.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkStateCacheFeeder.java similarity index 100% rename from vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkStateCacheFeeder.java rename to vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkStateCacheFeeder.java diff --git a/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkStateListener.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkStateListener.java similarity index 100% rename from vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkStateListener.java rename to vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkStateListener.java diff --git a/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkUtil.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkUtil.java similarity index 100% rename from vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkUtil.java rename to vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkUtil.java diff --git a/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/tasks/InterVpnLinkCleanedCheckerTask.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/tasks/InterVpnLinkCleanedCheckerTask.java similarity index 100% rename from vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/tasks/InterVpnLinkCleanedCheckerTask.java rename to vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/tasks/InterVpnLinkCleanedCheckerTask.java diff --git a/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/tasks/InterVpnLinkCreatorTask.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/tasks/InterVpnLinkCreatorTask.java similarity index 100% rename from vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/tasks/InterVpnLinkCreatorTask.java rename to vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/tasks/InterVpnLinkCreatorTask.java diff --git a/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/tasks/InterVpnLinkRemoverTask.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/tasks/InterVpnLinkRemoverTask.java similarity index 100% rename from vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/tasks/InterVpnLinkRemoverTask.java rename to vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/tasks/InterVpnLinkRemoverTask.java diff --git a/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/impl/L3vpnOverMplsGrePopulator.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/impl/L3vpnOverMplsGrePopulator.java similarity index 100% rename from vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/impl/L3vpnOverMplsGrePopulator.java rename to vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/impl/L3vpnOverMplsGrePopulator.java diff --git a/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/impl/L3vpnOverVxlanPopulator.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/impl/L3vpnOverVxlanPopulator.java similarity index 100% rename from vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/impl/L3vpnOverVxlanPopulator.java rename to vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/impl/L3vpnOverVxlanPopulator.java diff --git a/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/impl/L3vpnPopulator.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/impl/L3vpnPopulator.java similarity index 100% rename from vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/impl/L3vpnPopulator.java rename to vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/impl/L3vpnPopulator.java diff --git a/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/input/L3vpnInput.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/input/L3vpnInput.java similarity index 100% rename from vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/input/L3vpnInput.java rename to vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/input/L3vpnInput.java diff --git a/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/intfc/VpnPopulator.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/intfc/VpnPopulator.java similarity index 100% rename from vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/intfc/VpnPopulator.java rename to vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/intfc/VpnPopulator.java diff --git a/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/registry/L3vpnRegistry.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/registry/L3vpnRegistry.java similarity index 100% rename from vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/registry/L3vpnRegistry.java rename to vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/registry/L3vpnRegistry.java diff --git a/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/utilities/VpnManagerCounters.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/utilities/VpnManagerCounters.java similarity index 100% rename from vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/utilities/VpnManagerCounters.java rename to vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/utilities/VpnManagerCounters.java diff --git a/vpnmanager/vpnmanager-impl/src/main/resources/initial/netvirt-vpnmanager-config.xml b/vpnmanager/impl/src/main/resources/initial/netvirt-vpnmanager-config.xml similarity index 100% rename from vpnmanager/vpnmanager-impl/src/main/resources/initial/netvirt-vpnmanager-config.xml rename to vpnmanager/impl/src/main/resources/initial/netvirt-vpnmanager-config.xml diff --git a/vpnmanager/vpnmanager-impl/src/main/resources/org/opendaylight/blueprint/vpnmanager.xml b/vpnmanager/impl/src/main/resources/org/opendaylight/blueprint/vpnmanager.xml similarity index 100% rename from vpnmanager/vpnmanager-impl/src/main/resources/org/opendaylight/blueprint/vpnmanager.xml rename to vpnmanager/impl/src/main/resources/org/opendaylight/blueprint/vpnmanager.xml diff --git a/vpnmanager/vpnmanager-impl/src/main/yang/vpnmanager-config.yang b/vpnmanager/impl/src/main/yang/vpnmanager-config.yang similarity index 100% rename from vpnmanager/vpnmanager-impl/src/main/yang/vpnmanager-config.yang rename to vpnmanager/impl/src/main/yang/vpnmanager-config.yang diff --git a/vpnmanager/vpnmanager-impl/src/test/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkLocatorTest.java b/vpnmanager/impl/src/test/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkLocatorTest.java similarity index 100% rename from vpnmanager/vpnmanager-impl/src/test/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkLocatorTest.java rename to vpnmanager/impl/src/test/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkLocatorTest.java diff --git a/vpnmanager/vpnmanager-impl/src/test/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkTestCatalog.java b/vpnmanager/impl/src/test/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkTestCatalog.java similarity index 100% rename from vpnmanager/vpnmanager-impl/src/test/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkTestCatalog.java rename to vpnmanager/impl/src/test/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkTestCatalog.java diff --git a/vpnmanager/vpnmanager-impl/src/test/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/L3VpnTestCatalog.java b/vpnmanager/impl/src/test/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/L3VpnTestCatalog.java similarity index 100% rename from vpnmanager/vpnmanager-impl/src/test/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/L3VpnTestCatalog.java rename to vpnmanager/impl/src/test/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/L3VpnTestCatalog.java diff --git a/vpnmanager/vpnmanager-impl/src/test/java/org/opendaylight/netvirt/vpnmanager/test/SubnetOpDpnManagerTest.java b/vpnmanager/impl/src/test/java/org/opendaylight/netvirt/vpnmanager/test/SubnetOpDpnManagerTest.java similarity index 100% rename from vpnmanager/vpnmanager-impl/src/test/java/org/opendaylight/netvirt/vpnmanager/test/SubnetOpDpnManagerTest.java rename to vpnmanager/impl/src/test/java/org/opendaylight/netvirt/vpnmanager/test/SubnetOpDpnManagerTest.java diff --git a/vpnmanager/vpnmanager-impl/src/test/java/org/opendaylight/netvirt/vpnmanager/test/VpnServiceTest.java b/vpnmanager/impl/src/test/java/org/opendaylight/netvirt/vpnmanager/test/VpnServiceTest.java similarity index 100% rename from vpnmanager/vpnmanager-impl/src/test/java/org/opendaylight/netvirt/vpnmanager/test/VpnServiceTest.java rename to vpnmanager/impl/src/test/java/org/opendaylight/netvirt/vpnmanager/test/VpnServiceTest.java diff --git a/vpnmanager/vpnmanager-impl/src/test/java/org/opendaylight/netvirt/vpnmanager/test/VpnSubnetRouteHandlerTest.java b/vpnmanager/impl/src/test/java/org/opendaylight/netvirt/vpnmanager/test/VpnSubnetRouteHandlerTest.java similarity index 100% rename from vpnmanager/vpnmanager-impl/src/test/java/org/opendaylight/netvirt/vpnmanager/test/VpnSubnetRouteHandlerTest.java rename to vpnmanager/impl/src/test/java/org/opendaylight/netvirt/vpnmanager/test/VpnSubnetRouteHandlerTest.java diff --git a/vpnmanager/pom.xml b/vpnmanager/pom.xml index 9b3c0d3960..db9ed32a6c 100644 --- a/vpnmanager/pom.xml +++ b/vpnmanager/pom.xml @@ -23,9 +23,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL 4.0.0 - vpnmanager-api - vpnmanager-impl - vpnmanager-shell + api + impl + shell diff --git a/vpnmanager/vpnmanager-shell/pom.xml b/vpnmanager/shell/pom.xml similarity index 100% rename from vpnmanager/vpnmanager-shell/pom.xml rename to vpnmanager/shell/pom.xml diff --git a/vpnmanager/vpnmanager-shell/src/main/java/org/opendaylight/netvirt/vpnmanager/shell/ShowVpn.java b/vpnmanager/shell/src/main/java/org/opendaylight/netvirt/vpnmanager/shell/ShowVpn.java similarity index 100% rename from vpnmanager/vpnmanager-shell/src/main/java/org/opendaylight/netvirt/vpnmanager/shell/ShowVpn.java rename to vpnmanager/shell/src/main/java/org/opendaylight/netvirt/vpnmanager/shell/ShowVpn.java diff --git a/vpnmanager/vpnmanager-shell/src/main/java/org/opendaylight/netvirt/vpnmanager/shell/ShowVpnInstanceOpData.java b/vpnmanager/shell/src/main/java/org/opendaylight/netvirt/vpnmanager/shell/ShowVpnInstanceOpData.java similarity index 100% rename from vpnmanager/vpnmanager-shell/src/main/java/org/opendaylight/netvirt/vpnmanager/shell/ShowVpnInstanceOpData.java rename to vpnmanager/shell/src/main/java/org/opendaylight/netvirt/vpnmanager/shell/ShowVpnInstanceOpData.java diff --git a/vpnmanager/vpnmanager-shell/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/vpnmanager/shell/src/main/resources/OSGI-INF/blueprint/blueprint.xml similarity index 100% rename from vpnmanager/vpnmanager-shell/src/main/resources/OSGI-INF/blueprint/blueprint.xml rename to vpnmanager/shell/src/main/resources/OSGI-INF/blueprint/blueprint.xml -- 2.36.6